diff --git a/mappings/net/minecraft/nbt/TagList.mapping b/mappings/net/minecraft/nbt/TagList.mapping index c6397aac91..d2bc969812 100644 --- a/mappings/net/minecraft/nbt/TagList.mapping +++ b/mappings/net/minecraft/nbt/TagList.mapping @@ -8,6 +8,8 @@ CLASS hr net/minecraft/nbt/TagList METHOD a setRaw (ILib;)V ARG 0 index ARG 1 tag + METHOD a add (Lib;)Z + ARG 0 tag METHOD a read (Ljava/io/DataInput;ILhu;)V ARG 0 input ARG 1 depth @@ -21,7 +23,7 @@ CLASS hr net/minecraft/nbt/TagList METHOD b append (ILib;)V ARG 0 index ARG 1 value - METHOD b add (Lib;)Z + METHOD b canAdd (Lib;)Z ARG 0 tag METHOD c copy ()Lhr; METHOD c getRaw (I)Lib; diff --git a/mappings/net/minecraft/server/rcon/BufferHelper.mapping b/mappings/net/minecraft/server/rcon/BufferHelper.mapping index 8fdda971e2..ce4c9f2af3 100644 --- a/mappings/net/minecraft/server/rcon/BufferHelper.mapping +++ b/mappings/net/minecraft/server/rcon/BufferHelper.mapping @@ -4,9 +4,6 @@ CLASS wn net/minecraft/server/rcon/BufferHelper ARG 0 b METHOD a getString ([BII)Ljava/lang/String; ARG 0 buf - METHOD b getIntLE ([BI)I - ARG 0 buf - ARG 1 start METHOD b gutIntLE ([BII)I ARG 0 buf ARG 1 start diff --git a/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping b/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping index 3e3b2c9376..386f8b2cd8 100644 --- a/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping +++ b/mappings/net/minecraft/server/rcon/QueryResponseHandler.mapping @@ -4,9 +4,6 @@ CLASS wr net/minecraft/server/rcon/QueryResponseHandler FIELD o packetBuffer [B FIELD p currentPacket Ljava/net/DatagramPacket; FIELD s hostname Ljava/lang/String; - FIELD v streamHelper Lpt; - METHOD (Lns;)V - ARG 0 server METHOD a start ()V METHOD a reply ([BLjava/net/DatagramPacket;)V ARG 0 buf diff --git a/mappings/net/minecraft/server/rcon/RconBase.mapping b/mappings/net/minecraft/server/rcon/RconBase.mapping index e2b61a9e9c..bec98b7a92 100644 --- a/mappings/net/minecraft/server/rcon/RconBase.mapping +++ b/mappings/net/minecraft/server/rcon/RconBase.mapping @@ -1,13 +1,9 @@ CLASS wq net/minecraft/server/rcon/RconBase FIELD a running Z - FIELD b server Lns; FIELD c description Ljava/lang/String; FIELD d thread Ljava/lang/Thread; FIELD f sockets Ljava/util/List; FIELD g serverSockets Ljava/util/List; - METHOD (Lns;Ljava/lang/String;)V - ARG 0 server - ARG 1 description METHOD a start ()V METHOD a log (Ljava/lang/String;)V ARG 0 msg diff --git a/mappings/net/minecraft/server/rcon/RconClient.mapping b/mappings/net/minecraft/server/rcon/RconClient.mapping index 86e6dbffbb..55430e32da 100644 --- a/mappings/net/minecraft/server/rcon/RconClient.mapping +++ b/mappings/net/minecraft/server/rcon/RconClient.mapping @@ -4,8 +4,5 @@ CLASS ws net/minecraft/server/rcon/RconClient FIELD j socket Ljava/net/Socket; FIELD k packetBuffer [B FIELD l password Ljava/lang/String; - METHOD (Lns;Ljava/net/Socket;)V - ARG 0 server - ARG 1 socket METHOD g close ()V METHOD run run ()V diff --git a/mappings/net/minecraft/server/rcon/RconServer.mapping b/mappings/net/minecraft/server/rcon/RconServer.mapping index 680193dc7c..c901f5f734 100644 --- a/mappings/net/minecraft/server/rcon/RconServer.mapping +++ b/mappings/net/minecraft/server/rcon/RconServer.mapping @@ -3,8 +3,6 @@ CLASS wt net/minecraft/server/rcon/RconServer FIELD i serverPort I FIELD k listener Ljava/net/ServerSocket; FIELD m clients Ljava/util/Map; - METHOD (Lns;)V - ARG 0 server METHOD a start ()V METHOD f cleanClientList ()V METHOD g removeStoppedClients ()V diff --git a/mappings/net/minecraft/util/DamagePredicate.mapping b/mappings/net/minecraft/util/DamagePredicate.mapping index 9d7d0d160c..7c33916bde 100644 --- a/mappings/net/minecraft/util/DamagePredicate.mapping +++ b/mappings/net/minecraft/util/DamagePredicate.mapping @@ -1,4 +1,21 @@ CLASS ah net/minecraft/util/DamagePredicate + CLASS ah$a Builder + METHOD a create ()Lah$a; + METHOD a setProjectile (Ljava/lang/Boolean;)Lah$a; + METHOD b build ()Lah; + METHOD h setLightning (Ljava/lang/Boolean;)Lah$a; + FIELD a EMPTY Lah; + FIELD b isProjectile Ljava/lang/Boolean; + FIELD c isExplosion Ljava/lang/Boolean; + FIELD d bypassesArmor Ljava/lang/Boolean; + FIELD e bypassesInvulnerability Ljava/lang/Boolean; + FIELD f bypassesMagic Ljava/lang/Boolean; + FIELD g isFire Ljava/lang/Boolean; + FIELD h isMagic Ljava/lang/Boolean; + FIELD i isLightning Ljava/lang/Boolean; + METHOD a serialize ()Lcom/google/gson/JsonElement; + METHOD a deserialize (Lcom/google/gson/JsonElement;)Lah; + ARG 0 element METHOD a getBoolean (Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/lang/Boolean; ARG 0 obj ARG 1 name diff --git a/mappings/net/minecraft/util/HitResult.mapping b/mappings/net/minecraft/util/HitResult.mapping index cc107c5895..b0bdac0455 100644 --- a/mappings/net/minecraft/util/HitResult.mapping +++ b/mappings/net/minecraft/util/HitResult.mapping @@ -4,6 +4,7 @@ CLASS cgz net/minecraft/util/HitResult FIELD b BLOCK Lcgz$a; FIELD c ENTITY Lcgz$a; FIELD a type Lcgz$a; + FIELD b side Lev; FIELD c pos Lchc; FIELD d entity Lafh; FIELD e blockPos Leq; diff --git a/mappings/net/minecraft/util/JsonHelper.mapping b/mappings/net/minecraft/util/JsonHelper.mapping new file mode 100644 index 0000000000..d95e07dd7c --- /dev/null +++ b/mappings/net/minecraft/util/JsonHelper.mapping @@ -0,0 +1,120 @@ +CLASS xx net/minecraft/util/JsonHelper + FIELD a GSON Lcom/google/gson/Gson; + METHOD a deserialize (Lcom/google/gson/Gson;Ljava/io/Reader;Ljava/lang/Class;)Ljava/lang/Object; + METHOD a deserialize (Lcom/google/gson/Gson;Ljava/io/Reader;Ljava/lang/Class;Z)Ljava/lang/Object; + ARG 2 type + METHOD a deserialize (Lcom/google/gson/Gson;Ljava/io/Reader;Ljava/lang/reflect/Type;)Ljava/lang/Object; + METHOD a deserialize (Lcom/google/gson/Gson;Ljava/io/Reader;Ljava/lang/reflect/Type;Z)Ljava/lang/Object; + METHOD a deserialize (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/Class;)Ljava/lang/Object; + ARG 2 type + METHOD a deserialize (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/Class;Z)Ljava/lang/Object; + ARG 2 type + METHOD a deserialize (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/reflect/Type;)Ljava/lang/Object; + METHOD a deserialize (Lcom/google/gson/Gson;Ljava/lang/String;Ljava/lang/reflect/Type;Z)Ljava/lang/Object; + METHOD a isString (Lcom/google/gson/JsonElement;)Z + ARG 0 element + METHOD a asString (Lcom/google/gson/JsonElement;Ljava/lang/String;)Ljava/lang/String; + ARG 0 element + ARG 1 name + METHOD a deserialize (Lcom/google/gson/JsonElement;Ljava/lang/String;Lcom/google/gson/JsonDeserializationContext;Ljava/lang/Class;)Ljava/lang/Object; + ARG 3 type + METHOD a (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z + ARG 0 object + ARG 1 element + METHOD a getByte (Lcom/google/gson/JsonObject;Ljava/lang/String;B)B + METHOD a getFloat (Lcom/google/gson/JsonObject;Ljava/lang/String;F)F + ARG 0 object + ARG 1 element + METHOD a getInt (Lcom/google/gson/JsonObject;Ljava/lang/String;I)I + ARG 0 object + ARG 1 element + ARG 2 defaultInt + METHOD a getLong (Lcom/google/gson/JsonObject;Ljava/lang/String;J)J + METHOD a getArray (Lcom/google/gson/JsonObject;Ljava/lang/String;Lcom/google/gson/JsonArray;)Lcom/google/gson/JsonArray; + ARG 0 object + ARG 1 name + ARG 2 defaultArray + METHOD a deserialize (Lcom/google/gson/JsonObject;Ljava/lang/String;Lcom/google/gson/JsonDeserializationContext;Ljava/lang/Class;)Ljava/lang/Object; + ARG 0 object + ARG 1 element + ARG 2 context + ARG 3 type + METHOD a getObject (Lcom/google/gson/JsonObject;Ljava/lang/String;Lcom/google/gson/JsonObject;)Lcom/google/gson/JsonObject; + ARG 0 object + ARG 1 element + ARG 2 defaultObject + METHOD a deserialize (Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/lang/Object;Lcom/google/gson/JsonDeserializationContext;Ljava/lang/Class;)Ljava/lang/Object; + ARG 0 object + ARG 1 element + ARG 2 defaultValue + ARG 3 context + ARG 4 type + METHOD a getString (Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 0 object + ARG 1 element + ARG 2 defaultStr + METHOD a getBoolean (Lcom/google/gson/JsonObject;Ljava/lang/String;Z)Z + ARG 0 object + ARG 1 element + ARG 2 defaultBoolean + METHOD a deserialize (Ljava/io/Reader;)Lcom/google/gson/JsonObject; + METHOD a deserialize (Ljava/io/Reader;Z)Lcom/google/gson/JsonObject; + METHOD a deserialize (Ljava/lang/String;)Lcom/google/gson/JsonObject; + METHOD a deserialize (Ljava/lang/String;Z)Lcom/google/gson/JsonObject; + METHOD b isNumber (Lcom/google/gson/JsonElement;)Z + ARG 0 element + METHOD b asItem (Lcom/google/gson/JsonElement;Ljava/lang/String;)Latx; + ARG 0 element + ARG 1 name + METHOD c asBoolean (Lcom/google/gson/JsonElement;Ljava/lang/String;)Z + ARG 0 element + ARG 1 name + METHOD c isBoolean (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z + ARG 0 object + ARG 1 element + METHOD d getType (Lcom/google/gson/JsonElement;)Ljava/lang/String; + ARG 0 element + METHOD d isArray (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z + ARG 0 object + ARG 1 element + METHOD e asFloat (Lcom/google/gson/JsonElement;Ljava/lang/String;)F + ARG 0 element + ARG 1 name + METHOD f asLong (Lcom/google/gson/JsonElement;Ljava/lang/String;)J + METHOD f isPrimitive (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z + ARG 0 object + ARG 1 element + METHOD g asInt (Lcom/google/gson/JsonElement;Ljava/lang/String;)I + ARG 0 element + ARG 1 name + METHOD g hasElement (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z + ARG 0 object + ARG 1 lement + METHOD h asByte (Lcom/google/gson/JsonElement;Ljava/lang/String;)B + METHOD h getString (Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/lang/String; + ARG 0 object + ARG 1 element + METHOD i getItem (Lcom/google/gson/JsonObject;Ljava/lang/String;)Latx; + ARG 0 object + ARG 1 key + METHOD j getBoolean (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z + ARG 0 object + ARG 1 element + METHOD l getFloat (Lcom/google/gson/JsonObject;Ljava/lang/String;)F + ARG 0 object + ARG 1 element + METHOD m asObject (Lcom/google/gson/JsonElement;Ljava/lang/String;)Lcom/google/gson/JsonObject; + ARG 0 element + ARG 1 name + METHOD n asArray (Lcom/google/gson/JsonElement;Ljava/lang/String;)Lcom/google/gson/JsonArray; + ARG 0 element + ARG 1 name + METHOD n getInt (Lcom/google/gson/JsonObject;Ljava/lang/String;)I + ARG 0 object + ARG 1 element + METHOD t getObject (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lcom/google/gson/JsonObject; + ARG 0 object + ARG 1 element + METHOD u getArray (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lcom/google/gson/JsonArray; + ARG 0 object + ARG 1 element diff --git a/mappings/net/minecraft/util/NumberRange.mapping b/mappings/net/minecraft/util/NumberRange.mapping new file mode 100644 index 0000000000..1b0aa06f45 --- /dev/null +++ b/mappings/net/minecraft/util/NumberRange.mapping @@ -0,0 +1,53 @@ +CLASS bc net/minecraft/util/NumberRange + CLASS bc$c Float + FIELD e ANY Lbc$c; + FIELD f minSquared Ljava/lang/Double; + FIELD g maxSquared Ljava/lang/Double; + METHOD (Ljava/lang/Float;Ljava/lang/Float;)V + ARG 0 min + ARG 1 max + METHOD a matchesSquared (D)Z + ARG 0 value + METHOD a fromJson (Lcom/google/gson/JsonElement;)Lbc$c; + ARG 0 element + METHOD a (Lcom/mojang/brigadier/StringReader;Ljava/lang/Float;Ljava/lang/Float;)Lbc$c; + ARG 1 min + ARG 2 max + METHOD a squared (Ljava/lang/Float;)Ljava/lang/Double; + ARG 0 value + METHOD b atLeast (F)Lbc$c; + ARG 0 value + METHOD d matches (F)Z + ARG 0 value + CLASS bc$d Integer + FIELD e ANY Lbc$d; + FIELD f minSquared Ljava/lang/Long; + FIELD g maxSquared Ljava/lang/Long; + METHOD (Ljava/lang/Integer;Ljava/lang/Integer;)V + ARG 0 min + ARG 1 max + METHOD a exactly (I)Lbc$d; + ARG 0 value + METHOD a fromJson (Lcom/google/gson/JsonElement;)Lbc$d; + ARG 0 element + METHOD a (Lcom/mojang/brigadier/StringReader;Ljava/lang/Integer;Ljava/lang/Integer;)Lbc$d; + ARG 1 min + ARG 2 max + METHOD a squared (Ljava/lang/Integer;)Ljava/lang/Long; + ARG 0 value + METHOD b atLeast (I)Lbc$d; + ARG 0 value + METHOD d matches (I)Z + ARG 0 value + FIELD a EXCEPTION_EMPTY Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD b EXCEPTION_SWAPPED Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD c min Ljava/lang/Number; + FIELD d max Ljava/lang/Number; + METHOD (Ljava/lang/Number;Ljava/lang/Number;)V + ARG 0 min + ARG 1 max + METHOD a getMin ()Ljava/lang/Number; + METHOD a (Lcom/google/gson/JsonElement;Lbc;Ljava/util/function/BiFunction;Lbc$a;)Lbc; + METHOD b getMax ()Ljava/lang/Number; + METHOD c isDummy ()Z + METHOD d serialize ()Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index a6624f569f..a237a7824f 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -1,4 +1,22 @@ CLASS eq net/minecraft/util/math/BlockPos + CLASS eq$1 + FIELD a minX I + FIELD b minY I + FIELD c minZ I + FIELD d maxX I + FIELD e maxY I + FIELD f maxZ I + FIELD h x I + FIELD i y I + FIELD j z I + CLASS eq$2 + FIELD a minX I + FIELD b minY I + FIELD c minZ I + FIELD d maxX I + FIELD e maxY I + FIELD f maxZ I + FIELD g pos Leq$a; CLASS eq$a Mutable FIELD b x I FIELD c y I @@ -52,8 +70,16 @@ CLASS eq net/minecraft/util/math/BlockPos METHOD j set (Lfk;)Leq$b; METHOD r get ()Leq$b; FIELD a ORIGIN Leq; - FIELD c BITS_X I - FIELD f BITS_Y I + FIELD b LOGGER Lorg/apache/logging/log4j/Logger; + FIELD c SIZE_BITS_X I + FIELD d SIZE_BITS_Z I + FIELD f SIZE_BITS_Y I + FIELD g BITS_X J + FIELD h BITS_Y J + FIELD i BITS_Z J + FIELD j BIT_SHIFT_Z I + FIELD k BIT_SHIFT_X I + FIELD l BIT_MASK_CHUNK_SECTION J METHOD (DDD)V ARG 0 x ARG 1 y @@ -68,10 +94,23 @@ CLASS eq net/minecraft/util/math/BlockPos ARG 0 vec METHOD (Lfk;)V ARG 0 vec + METHOD a asLong ()J METHOD a add (DDD)Leq; ARG 0 x ARG 1 y ARG 2 z + METHOD a asLong (III)J + ARG 0 x + ARG 1 y + ARG 2 z + METHOD a add (JIII)J + ARG 0 value + ARG 1 x + ARG 2 y + ARG 3 z + METHOD a offset (JLev;)J + ARG 0 value + ARG 1 facing METHOD a iterateBoxPositions (Leq;Leq;)Ljava/lang/Iterable; ARG 0 pos1 ARG 1 pos2 @@ -97,19 +136,24 @@ CLASS eq net/minecraft/util/math/BlockPos METHOD c down ()Leq; METHOD c down (I)Leq; ARG 0 distance + METHOD c unpackLongX (J)I METHOD c crossProduct (Lfk;)Leq; ARG 0 vec METHOD d north ()Leq; METHOD d north (I)Leq; ARG 0 distance + METHOD d unpackLongY (J)I METHOD d crossProduct (Lfk;)Lfk; ARG 0 vec METHOD e south ()Leq; METHOD e south (I)Leq; ARG 0 distance + METHOD e unpackLongZ (J)I METHOD f west ()Leq; METHOD f west (I)Leq; ARG 0 distance + METHOD f fromLong (J)Leq; + ARG 0 value METHOD g east ()Leq; METHOD g east (I)Leq; ARG 0 distance diff --git a/mappings/net/minecraft/util/math/BoundingBox.mapping b/mappings/net/minecraft/util/math/BoundingBox.mapping index 7b17d0d971..3706092ae0 100644 --- a/mappings/net/minecraft/util/math/BoundingBox.mapping +++ b/mappings/net/minecraft/util/math/BoundingBox.mapping @@ -55,6 +55,10 @@ CLASS cgy net/minecraft/util/math/BoundingBox ARG 2 z METHOD equals (Ljava/lang/Object;)Z ARG 0 object + METHOD f contract (DDD)Lcgy; + ARG 0 x + ARG 1 y + ARG 2 z METHOD g expand (D)Lcgy; ARG 0 value METHOD h contract (D)Lcgy; diff --git a/mappings/net/minecraft/util/math/Facing.mapping b/mappings/net/minecraft/util/math/Facing.mapping index b30c7b90b1..86669bf2f6 100644 --- a/mappings/net/minecraft/util/math/Facing.mapping +++ b/mappings/net/minecraft/util/math/Facing.mapping @@ -1,8 +1,52 @@ CLASS ev net/minecraft/util/math/Facing CLASS ev$a Axis + CLASS ev$a$1 + METHOD a choose (DDD)D + ARG 0 x + ARG 1 y + ARG 2 z + METHOD a choose (III)I + ARG 0 x + ARG 1 y + ARG 2 z + CLASS ev$a$2 + METHOD a choose (DDD)D + ARG 0 x + ARG 1 y + ARG 2 z + METHOD a choose (III)I + ARG 0 x + ARG 1 y + ARG 2 z + CLASS ev$a$3 + METHOD a choose (DDD)D + ARG 0 x + ARG 1 y + ARG 2 z + METHOD a choose (III)I + ARG 0 x + ARG 1 y + ARG 2 z FIELD a X Lev$a; FIELD b Y Lev$a; FIELD c Z Lev$a; + FIELD d BY_NAME Ljava/util/Map; + FIELD e name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 0 name + METHOD a getName ()Ljava/lang/String; + METHOD a choose (DDD)D + ARG 0 x + ARG 1 y + ARG 2 z + METHOD a choose (III)I + ARG 0 x + ARG 1 y + ARG 2 z + METHOD a fromName (Ljava/lang/String;)Lev$a; + ARG 0 name + METHOD b isVertical ()Z + METHOD c isHorizontal ()Z METHOD m asString ()Ljava/lang/String; CLASS ev$b Direction FIELD a POSITIVE Lev$b; @@ -11,6 +55,8 @@ CLASS ev net/minecraft/util/math/Facing FIELD d desc Ljava/lang/String; METHOD a offset ()I CLASS ev$c + FIELD a HORIZONTAL Lev$c; + FIELD b VERTICAL Lev$c; FIELD a DOWN Lev; FIELD b UP Lev; FIELD c NORTH Lev; @@ -43,6 +89,8 @@ CLASS ev net/minecraft/util/math/Facing ARG 2 z METHOD a byId (I)Lev; ARG 0 id + METHOD a getEntityFacingOrder (Lafh;)[Lev; + ARG 0 entity METHOD a rotateClockwise (Lev$a;)Lev; ARG 0 axis METHOD a get (Lev$b;Lev$a;)Lev; diff --git a/mappings/net/minecraft/util/math/Vec3i.mapping b/mappings/net/minecraft/util/math/Vec3i.mapping index 5459716bf0..73e8f19efe 100644 --- a/mappings/net/minecraft/util/math/Vec3i.mapping +++ b/mappings/net/minecraft/util/math/Vec3i.mapping @@ -27,6 +27,8 @@ CLASS fk net/minecraft/util/math/Vec3i ARG 0 x ARG 1 y ARG 2 z + METHOD m distanceTo (Lfk;)D + ARG 0 vec METHOD n squaredDistanceTo (Lfk;)D ARG 0 vec METHOD o getX ()I