diff --git a/mappings/bqz.mapping b/mappings/bqz.mapping deleted file mode 100644 index 1326fb8633..0000000000 --- a/mappings/bqz.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS bqz - FIELD b world Lban; - FIELD f dimension Lbra; - METHOD d getForcedSpawnPoint ()Let; - METHOD j createWorldBorder ()Lbps; - METHOD n hasVisibleSky ()Z - METHOD p getDimension ()Lbra; diff --git a/mappings/brb.mapping b/mappings/brb.mapping deleted file mode 100644 index 6c2989fdad..0000000000 --- a/mappings/brb.mapping +++ /dev/null @@ -1,7 +0,0 @@ -CLASS brb - CLASS brb$1 - METHOD f getCenterX ()D - METHOD g getCenterZ ()D - METHOD j createWorldBorder ()Lbps; - METHOD n hasVisibleSky ()Z - METHOD p getDimension ()Lbra; diff --git a/mappings/brc.mapping b/mappings/brc.mapping deleted file mode 100644 index eda0fd12cf..0000000000 --- a/mappings/brc.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS brc - METHOD n hasVisibleSky ()Z - METHOD p getDimension ()Lbra; diff --git a/mappings/brf.mapping b/mappings/brf.mapping deleted file mode 100644 index 45e15b07a2..0000000000 --- a/mappings/brf.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS brf - METHOD d getForcedSpawnPoint ()Let; - METHOD n hasVisibleSky ()Z - METHOD p getDimension ()Lbra; diff --git a/mappings/net/minecraft/util/EntityFlagsJsonPredicate.mapping b/mappings/net/minecraft/util/EntityFlagsJsonPredicate.mapping index 40271af568..3f07331fe7 100644 --- a/mappings/net/minecraft/util/EntityFlagsJsonPredicate.mapping +++ b/mappings/net/minecraft/util/EntityFlagsJsonPredicate.mapping @@ -7,5 +7,6 @@ CLASS aq net/minecraft/util/EntityFlagsJsonPredicate FIELD d isSprinting Ljava/lang/Boolean; FIELD e isSwimming Ljava/lang/Boolean; FIELD f isBaby Ljava/lang/Boolean; + METHOD a serialize ()Lcom/google/gson/JsonElement; METHOD a matches (Lagf;)Z METHOD a fromJson (Lcom/google/gson/JsonElement;)Laq; diff --git a/mappings/net/minecraft/util/LocationPredicate.mapping b/mappings/net/minecraft/util/LocationPredicate.mapping index 8d3f6141ed..a8aacfdfee 100644 --- a/mappings/net/minecraft/util/LocationPredicate.mapping +++ b/mappings/net/minecraft/util/LocationPredicate.mapping @@ -4,12 +4,22 @@ CLASS bd net/minecraft/util/LocationPredicate FIELD c y Lbf$c; FIELD d z Lbf$c; FIELD e biome Lbbm; + FIELD f feature Lbwu; FIELD g dimension Lbra; METHOD (Lbf$c;Lbf$c;Lbf$c;Lbbm;Lbwu;Lbra;)V ARG 1 x ARG 2 y ARG 3 z ARG 4 biome + ARG 5 feature + ARG 6 dimension + METHOD a serialize ()Lcom/google/gson/JsonElement; + METHOD a (Lbbm;)Lbd; + ARG 0 biome + METHOD a (Lbra;)Lbd; + ARG 0 dimension + METHOD a (Lbwu;)Lbd; + ARG 0 feature METHOD a deserialize (Lcom/google/gson/JsonElement;)Lbd; METHOD a matches (Luh;DDD)Z ARG 1 world diff --git a/mappings/net/minecraft/util/NbtPredicate.mapping b/mappings/net/minecraft/util/NbtPredicate.mapping index 120b96e7a3..f1161fb1c2 100644 --- a/mappings/net/minecraft/util/NbtPredicate.mapping +++ b/mappings/net/minecraft/util/NbtPredicate.mapping @@ -1,6 +1,7 @@ CLASS bh net/minecraft/util/NbtPredicate FIELD a ANY Lbh; FIELD b tag Lhp; + METHOD a serialize ()Lcom/google/gson/JsonElement; METHOD a matches (Lagf;)Z METHOD a matches (Lavo;)Z METHOD a deserialize (Lcom/google/gson/JsonElement;)Lbh; diff --git a/mappings/net/minecraft/util/json/DamageJsonPredicate.mapping b/mappings/net/minecraft/util/json/DamageJsonPredicate.mapping index 2c963be4f7..fc78f3b8ff 100644 --- a/mappings/net/minecraft/util/json/DamageJsonPredicate.mapping +++ b/mappings/net/minecraft/util/json/DamageJsonPredicate.mapping @@ -1,9 +1,23 @@ CLASS aj net/minecraft/util/json/DamageJsonPredicate CLASS aj$a Builder + FIELD a isProjectile Ljava/lang/Boolean; + FIELD b isExplosion Ljava/lang/Boolean; + FIELD c bypassesArmor Ljava/lang/Boolean; + FIELD d bypassesInvulnerability Ljava/lang/Boolean; + FIELD e bypassesMagic Ljava/lang/Boolean; + FIELD f isFire Ljava/lang/Boolean; + FIELD g isMagic Ljava/lang/Boolean; + FIELD h isLightning Ljava/lang/Boolean; + FIELD i directEntity Las; + FIELD j sourceEntity Las; METHOD a create ()Laj$a; - METHOD a setProjectile (Ljava/lang/Boolean;)Laj$a; + METHOD a directEntity (Las$a;)Laj$a; + ARG 1 directEntity + METHOD a projectile (Ljava/lang/Boolean;)Laj$a; + ARG 1 isProjectile METHOD b build ()Laj; - METHOD h setLightning (Ljava/lang/Boolean;)Laj$a; + METHOD h lightning (Ljava/lang/Boolean;)Laj$a; + ARG 1 isLightning FIELD a EMPTY Laj; FIELD b isProjectile Ljava/lang/Boolean; FIELD c isExplosion Ljava/lang/Boolean; @@ -15,9 +29,26 @@ CLASS aj net/minecraft/util/json/DamageJsonPredicate FIELD i isLightning Ljava/lang/Boolean; FIELD j directEntity Las; FIELD k sourceEntity Las; + METHOD (Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Las;Las;)V + ARG 1 isProjectile + ARG 2 isExplosion + ARG 3 bypassesArmor + ARG 4 bypassesInvulnerability + ARG 5 bypassesMagic + ARG 6 isFire + ARG 7 isMagic + ARG 8 isLightning + ARG 9 directEntity + ARG 10 sourceEntity METHOD a serialize ()Lcom/google/gson/JsonElement; METHOD a deserialize (Lcom/google/gson/JsonElement;)Laj; ARG 0 element METHOD a getBoolean (Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/lang/Boolean; ARG 0 obj ARG 1 name + METHOD a test (Luh;Lcjy;Lafo;)Z + ARG 1 world + ARG 3 source + METHOD a test (Luj;Lafo;)Z + ARG 1 player + ARG 2 source diff --git a/mappings/net/minecraft/util/json/DistanceJsonPredicate.mapping b/mappings/net/minecraft/util/json/DistanceJsonPredicate.mapping index 9009829631..2f23d305cb 100644 --- a/mappings/net/minecraft/util/json/DistanceJsonPredicate.mapping +++ b/mappings/net/minecraft/util/json/DistanceJsonPredicate.mapping @@ -10,6 +10,12 @@ CLASS ak net/minecraft/util/json/DistanceJsonPredicate ARG 2 y ARG 3 z ARG 4 horizontal + ARG 5 absolute + METHOD a serialize ()Lcom/google/gson/JsonElement; METHOD a matches (DDDDDD)Z + METHOD a (Lbf$c;)Lak; + ARG 0 horizontal METHOD a deserialize (Lcom/google/gson/JsonElement;)Lak; ARG 0 el + METHOD b (Lbf$c;)Lak; + ARG 0 y diff --git a/mappings/net/minecraft/util/json/EnchantmentJsonPredicate.mapping b/mappings/net/minecraft/util/json/EnchantmentJsonPredicate.mapping index c281f777fa..0292a6053b 100644 --- a/mappings/net/minecraft/util/json/EnchantmentJsonPredicate.mapping +++ b/mappings/net/minecraft/util/json/EnchantmentJsonPredicate.mapping @@ -1,9 +1,10 @@ CLASS an net/minecraft/util/json/EnchantmentJsonPredicate FIELD a ANY Lan; - FIELD b enchantmeny Layq; + FIELD b enchantment Layq; FIELD c levels Lbf$d; METHOD (Layq;Lbf$d;)V ARG 1 enchantment + METHOD a serialize ()Lcom/google/gson/JsonElement; METHOD a deserialize (Lcom/google/gson/JsonElement;)Lan; ARG 0 el METHOD a matches (Ljava/util/Map;)Z diff --git a/mappings/net/minecraft/util/json/EntityEffectJsonPredicate.mapping b/mappings/net/minecraft/util/json/EntityEffectJsonPredicate.mapping index 198c86fc60..890a3dc6d9 100644 --- a/mappings/net/minecraft/util/json/EntityEffectJsonPredicate.mapping +++ b/mappings/net/minecraft/util/json/EntityEffectJsonPredicate.mapping @@ -4,8 +4,11 @@ CLASS bg net/minecraft/util/json/EntityEffectJsonPredicate FIELD b duration Lbf$d; FIELD c ambient Ljava/lang/Boolean; FIELD d visible Ljava/lang/Boolean; + METHOD a serialize ()Lcom/google/gson/JsonElement; + METHOD a deserialize (Lcom/google/gson/JsonObject;)Lbg$a; FIELD a EMPTY Lbg; METHOD a create ()Lbg; METHOD a matches (Lagf;)Z METHOD a matches (Lago;)Z METHOD a matches (Ljava/util/Map;)Z + METHOD b serialize ()Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/util/json/EntityEquipmentPredicate.mapping b/mappings/net/minecraft/util/json/EntityEquipmentPredicate.mapping new file mode 100644 index 0000000000..865dd7fb19 --- /dev/null +++ b/mappings/net/minecraft/util/json/EntityEquipmentPredicate.mapping @@ -0,0 +1,18 @@ +CLASS ap net/minecraft/util/json/EntityEquipmentPredicate + FIELD a ANY Lap; + FIELD b head Laz; + FIELD c chest Laz; + FIELD d legs Laz; + FIELD e feet Laz; + FIELD f mainhand Laz; + FIELD g offhand Laz; + METHOD (Laz;Laz;Laz;Laz;Laz;Laz;)V + ARG 1 head + ARG 2 chest + ARG 3 legs + ARG 4 feet + ARG 5 mainhand + ARG 6 offhand + METHOD a serialize ()Lcom/google/gson/JsonElement; + METHOD a test (Lagf;)Z + METHOD a deserialize (Lcom/google/gson/JsonElement;)Lap; diff --git a/mappings/net/minecraft/util/json/EntityJsonPredicate.mapping b/mappings/net/minecraft/util/json/EntityJsonPredicate.mapping index da5daacbc0..7281b8bfd8 100644 --- a/mappings/net/minecraft/util/json/EntityJsonPredicate.mapping +++ b/mappings/net/minecraft/util/json/EntityJsonPredicate.mapping @@ -1,4 +1,37 @@ CLASS as net/minecraft/util/json/EntityJsonPredicate + CLASS as$a Builder + FIELD a type Lat; + FIELD b distance Lak; + FIELD c location Lbd; + FIELD d effects Lbg; + FIELD e nbt Lbh; + FIELD f flags Laq; + FIELD g equipment Lap; + FIELD h catType Lpy; + METHOD a create ()Las$a; + METHOD a type (Lagj;)Las$a; + ARG 1 type + METHOD a distance (Lak;)Las$a; + ARG 1 distance + METHOD a equipment (Lap;)Las$a; + ARG 1 equipment + METHOD a flags (Laq;)Las$a; + ARG 1 flags + METHOD a type (Lat;)Las$a; + ARG 1 type + METHOD a location (Lbd;)Las$a; + ARG 1 location + METHOD a effects (Lbg;)Las$a; + ARG 1 effects + METHOD a nbt (Lbh;)Las$a; + ARG 1 nbt + METHOD a type (Lpy;)Las$a; + ARG 1 catType + METHOD a type (Lxv;)Las$a; + ARG 1 type + METHOD b build ()Las; + METHOD b catType (Lpy;)Las$a; + ARG 1 catType FIELD a ANY Las; FIELD b EMPTY [Las; FIELD c type Lat; @@ -7,5 +40,25 @@ CLASS as net/minecraft/util/json/EntityJsonPredicate FIELD f effects Lbg; FIELD g nbt Lbh; FIELD h flags Laq; + FIELD i equipment Lap; + FIELD j catType Lpy; + METHOD (Lat;Lak;Lbd;Lbg;Lbh;Laq;Lap;Lpy;)V + ARG 1 type + ARG 2 distance + ARG 3 location + ARG 4 effects + ARG 5 nbt + ARG 6 flags + ARG 7 equipment + ARG 8 catType + METHOD a serialize ()Lcom/google/gson/JsonElement; METHOD a deserialize (Lcom/google/gson/JsonElement;)Las; ARG 0 el + METHOD a test (Luh;Lcjy;Lagf;)Z + ARG 1 world + ARG 2 pos + ARG 3 entity + METHOD a test (Luj;Lagf;)Z + ARG 1 player + ARG 2 entity + METHOD b deserializeAll (Lcom/google/gson/JsonElement;)[Las; diff --git a/mappings/net/minecraft/util/json/EntityTypeJsonPredicate.mapping b/mappings/net/minecraft/util/json/EntityTypeJsonPredicate.mapping index ebb683aba3..4ceb60fac5 100644 --- a/mappings/net/minecraft/util/json/EntityTypeJsonPredicate.mapping +++ b/mappings/net/minecraft/util/json/EntityTypeJsonPredicate.mapping @@ -2,18 +2,26 @@ CLASS at net/minecraft/util/json/EntityTypeJsonPredicate CLASS at$1 METHOD a toJson ()Lcom/google/gson/JsonElement; METHOD a matches (Lagj;)Z + ARG 1 type CLASS at$a Tagged FIELD b tag Lxv; + METHOD (Lxv;)V + ARG 1 tag METHOD a toJson ()Lcom/google/gson/JsonElement; METHOD a matches (Lagj;)Z + ARG 1 type CLASS at$b Single FIELD b type Lagj; + METHOD (Lagj;)V + ARG 1 type METHOD a toJson ()Lcom/google/gson/JsonElement; METHOD a matches (Lagj;)Z + ARG 1 type FIELD a ANY Lat; FIELD b COMMA_JOINER Lcom/google/common/base/Joiner; METHOD a toJson ()Lcom/google/gson/JsonElement; METHOD a matches (Lagj;)Z + ARG 1 type METHOD a fromJson (Lcom/google/gson/JsonElement;)Lat; METHOD a create (Lxv;)Lat; METHOD b create (Lagj;)Lat; diff --git a/mappings/net/minecraft/util/json/ItemPredicate.mapping b/mappings/net/minecraft/util/json/ItemPredicate.mapping index d31f218b98..a1b90bb0ae 100644 --- a/mappings/net/minecraft/util/json/ItemPredicate.mapping +++ b/mappings/net/minecraft/util/json/ItemPredicate.mapping @@ -1,25 +1,41 @@ CLASS az net/minecraft/util/json/ItemPredicate CLASS az$a Builder - FIELD a enchantment Ljava/util/List; + FIELD a enchantments Ljava/util/List; FIELD b item Lavj; + FIELD c tag Lxv; FIELD d count Lbf$d; + FIELD e durability Lbf$d; + FIELD f potion Laxf; + FIELD g nbt Lbh; METHOD a create ()Laz$a; METHOD a enchantment (Lan;)Laz$a; + ARG 1 enchantment METHOD a item (Lbam;)Laz$a; + ARG 1 item METHOD a count (Lbf$d;)Laz$a; + ARG 1 count + METHOD a tag (Lxv;)Laz$a; + ARG 1 tag METHOD b build ()Laz; FIELD a ANY Laz; - FIELD b potion Lxv; + FIELD b tag Lxv; FIELD c item Lavj; FIELD d count Lbf$d; + FIELD e durability Lbf$d; FIELD f enchantments [Lan; - FIELD h tag Lbh; + FIELD g potion Laxf; + FIELD h nbt Lbh; METHOD (Lxv;Lavj;Lbf$d;Lbf$d;[Lan;Laxf;Lbh;)V + ARG 1 tag ARG 2 item ARG 3 count + ARG 4 durability ARG 5 enchantments ARG 6 potion + ARG 7 nbt + METHOD a serialize ()Lcom/google/gson/JsonElement; METHOD a matches (Lavo;)Z + ARG 1 stack METHOD a deserialize (Lcom/google/gson/JsonElement;)Laz; ARG 0 el METHOD b deserializeAll (Lcom/google/gson/JsonElement;)[Laz; diff --git a/mappings/net/minecraft/world/dimension/Dimension.mapping b/mappings/net/minecraft/world/dimension/Dimension.mapping new file mode 100644 index 0000000000..35890fd68b --- /dev/null +++ b/mappings/net/minecraft/world/dimension/Dimension.mapping @@ -0,0 +1,10 @@ +CLASS bqz net/minecraft/world/dimension/Dimension + FIELD b world Lban; + FIELD f type Lbra; + METHOD (Lban;Lbra;)V + ARG 1 world + ARG 2 type + METHOD d getForcedSpawnPoint ()Let; + METHOD j createWorldBorder ()Lbps; + METHOD n hasVisibleSky ()Z + METHOD p getType ()Lbra; diff --git a/mappings/net/minecraft/world/Dimension.mapping b/mappings/net/minecraft/world/dimension/DimensionType.mapping similarity index 74% rename from mappings/net/minecraft/world/Dimension.mapping rename to mappings/net/minecraft/world/dimension/DimensionType.mapping index 292232ecde..c8a580c403 100644 --- a/mappings/net/minecraft/world/Dimension.mapping +++ b/mappings/net/minecraft/world/dimension/DimensionType.mapping @@ -1,16 +1,19 @@ -CLASS bra net/minecraft/world/Dimension +CLASS bra net/minecraft/world/dimension/DimensionType FIELD a OVERWORLD Lbra; - FIELD b NETHER Lbra; - FIELD c END Lbra; + FIELD b THE_NETHER Lbra; + FIELD c THE_END Lbra; FIELD d id I FIELD e suffix Ljava/lang/String; FIELD f saveDir Ljava/lang/String; + FIELD g factory Ljava/util/function/BiFunction; METHOD (ILjava/lang/String;Ljava/lang/String;Ljava/util/function/BiFunction;Z)V ARG 1 dimensionId ARG 2 suffix ARG 3 saveDir + ARG 4 factory METHOD a getRegistry ()Ljava/lang/Iterable; METHOD a byRawId (I)Lbra; + METHOD a create (Lban;)Lbqz; METHOD a getId (Lbra;)Lpy; METHOD a getFile (Ljava/io/File;)Ljava/io/File; METHOD a register (Ljava/lang/String;Lbra;)Lbra; diff --git a/mappings/net/minecraft/world/dimension/OverworldDimension.mapping b/mappings/net/minecraft/world/dimension/OverworldDimension.mapping new file mode 100644 index 0000000000..7b1ed8e75f --- /dev/null +++ b/mappings/net/minecraft/world/dimension/OverworldDimension.mapping @@ -0,0 +1,6 @@ +CLASS brc net/minecraft/world/dimension/OverworldDimension + METHOD (Lban;Lbra;)V + ARG 1 world + ARG 2 type + METHOD n hasVisibleSky ()Z + METHOD p getType ()Lbra; diff --git a/mappings/net/minecraft/world/dimension/TheEndDimension.mapping b/mappings/net/minecraft/world/dimension/TheEndDimension.mapping new file mode 100644 index 0000000000..d5fbecbd18 --- /dev/null +++ b/mappings/net/minecraft/world/dimension/TheEndDimension.mapping @@ -0,0 +1,7 @@ +CLASS brf net/minecraft/world/dimension/TheEndDimension + METHOD (Lban;Lbra;)V + ARG 1 world + ARG 2 type + METHOD d getForcedSpawnPoint ()Let; + METHOD n hasVisibleSky ()Z + METHOD p getType ()Lbra; diff --git a/mappings/net/minecraft/world/dimension/TheNetherDimension.mapping b/mappings/net/minecraft/world/dimension/TheNetherDimension.mapping new file mode 100644 index 0000000000..a1eaf169cb --- /dev/null +++ b/mappings/net/minecraft/world/dimension/TheNetherDimension.mapping @@ -0,0 +1,10 @@ +CLASS brb net/minecraft/world/dimension/TheNetherDimension + CLASS brb$1 + METHOD f getCenterX ()D + METHOD g getCenterZ ()D + METHOD (Lban;Lbra;)V + ARG 1 world + ARG 2 type + METHOD j createWorldBorder ()Lbps; + METHOD n hasVisibleSky ()Z + METHOD p getType ()Lbra;