diff --git a/build.gradle b/build.gradle index f08db9cb6d..440b56ddfa 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w31a" +def minecraft_version = "23w32a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping index 59da275ace..f51cba727a 100644 --- a/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_4558 net/minecraft/advancement/criterion/AbstractCrite ARG 2 predicate METHOD method_22512 (Lnet/minecraft/class_2985;)Ljava/util/Set; ARG 0 managerx - METHOD method_27854 conditionsFromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;Lnet/minecraft/class_5257;)Lnet/minecraft/class_195; + METHOD method_27854 conditionsFromJson (Lcom/google/gson/JsonObject;Ljava/util/Optional;Lnet/minecraft/class_5257;)Lnet/minecraft/class_195; ARG 1 obj - ARG 2 playerPredicate ARG 3 predicateDeserializer diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping index 737a8233af..1f4c20c9df 100644 --- a/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping +++ b/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_195 net/minecraft/advancement/criterion/AbstractCriterionConditions FIELD field_1270 id Lnet/minecraft/class_2960; - FIELD field_24381 playerPredicate Lnet/minecraft/class_5258; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_5258;)V + FIELD field_24381 playerPredicate Ljava/util/Optional; + METHOD (Lnet/minecraft/class_2960;Ljava/util/Optional;)V ARG 1 id - ARG 2 entity - METHOD method_27790 getPlayerPredicate ()Lnet/minecraft/class_5258; + METHOD method_27790 getPlayerPredicate ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping index ea03726d71..f5ad36ba26 100644 --- a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping @@ -11,16 +11,13 @@ CLASS net/minecraft/class_4708 net/minecraft/advancement/criterion/BeeNestDestro ARG 4 beeCount CLASS class_4709 Conditions FIELD field_21569 block Lnet/minecraft/class_2248; - FIELD field_21570 item Lnet/minecraft/class_2073; + FIELD field_21570 item Ljava/util/Optional; FIELD field_21571 beeCount Lnet/minecraft/class_2096$class_2100; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2248;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)V - ARG 1 player + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2248;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V ARG 2 block - ARG 3 item ARG 4 beeCount METHOD method_23878 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_1799;I)Z ARG 1 state - ARG 2 stack ARG 3 count METHOD method_23879 create (Lnet/minecraft/class_2248;Lnet/minecraft/class_2073$class_2074;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_4708$class_4709; ARG 0 block diff --git a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping index 87fe66980c..867e246ce9 100644 --- a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping @@ -8,18 +8,10 @@ CLASS net/minecraft/class_196 net/minecraft/advancement/criterion/BredAnimalsCri ARG 3 partner ARG 4 child CLASS class_198 Conditions - FIELD field_1275 child Lnet/minecraft/class_5258; - FIELD field_1276 parent Lnet/minecraft/class_5258; - FIELD field_1277 partner Lnet/minecraft/class_5258; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;)V - ARG 1 player - ARG 2 parent - ARG 3 partner - ARG 4 child - METHOD method_29918 create (Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;)Lnet/minecraft/class_196$class_198; - ARG 0 parent - ARG 1 partner - ARG 2 child + FIELD field_1275 child Ljava/util/Optional; + FIELD field_1276 parent Ljava/util/Optional; + FIELD field_1277 partner Ljava/util/Optional; + METHOD method_29918 create (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_196$class_198; METHOD method_860 any ()Lnet/minecraft/class_196$class_198; METHOD method_861 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_196$class_198; ARG 0 child diff --git a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping index f6ca6117e7..504b44f8b6 100644 --- a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping @@ -7,8 +7,7 @@ CLASS net/minecraft/class_1996 net/minecraft/advancement/criterion/BrewedPotionC ARG 2 potion CLASS class_1998 Conditions FIELD field_9492 potion Lnet/minecraft/class_1842; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_1842;)V - ARG 1 player + METHOD (Ljava/util/Optional;Lnet/minecraft/class_1842;)V ARG 2 potion METHOD method_8790 matches (Lnet/minecraft/class_1842;)Z ARG 1 potion diff --git a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping index af2f19ca34..3cd8070592 100644 --- a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping @@ -9,8 +9,7 @@ CLASS net/minecraft/class_1999 net/minecraft/advancement/criterion/ChangedDimens CLASS class_2001 Conditions FIELD field_9497 from Lnet/minecraft/class_5321; FIELD field_9498 to Lnet/minecraft/class_5321; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V - ARG 1 player + METHOD (Ljava/util/Optional;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V ARG 2 from ARG 3 to METHOD method_35068 create (Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)Lnet/minecraft/class_1999$class_2001; diff --git a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping index 488d53eb56..0d6ab71799 100644 --- a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping @@ -8,11 +8,7 @@ CLASS net/minecraft/class_2002 net/minecraft/advancement/criterion/ChanneledLigh ARG 1 player ARG 2 victims CLASS class_2004 Conditions - FIELD field_9503 victims [Lnet/minecraft/class_5258; - METHOD (Lnet/minecraft/class_5258;[Lnet/minecraft/class_5258;)V - ARG 1 player - ARG 2 victims + FIELD field_9503 victims Ljava/util/List; METHOD method_8808 matches (Ljava/util/Collection;)Z ARG 1 victims - METHOD method_8809 create ([Lnet/minecraft/class_2048;)Lnet/minecraft/class_2002$class_2004; - ARG 0 victims + METHOD method_8809 create ([Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2002$class_2004; diff --git a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping index 2a83254cfa..32a34d9fa6 100644 --- a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping @@ -7,8 +7,7 @@ CLASS net/minecraft/class_2006 net/minecraft/advancement/criterion/ConstructBeac ARG 2 level CLASS class_2008 Conditions FIELD field_9508 level Lnet/minecraft/class_2096$class_2100; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2096$class_2100;)V - ARG 1 player + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V ARG 2 level METHOD method_35110 create ()Lnet/minecraft/class_2006$class_2008; METHOD method_8817 matches (I)Z diff --git a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping index 0c941cde20..c0d3ec72b7 100644 --- a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping @@ -6,14 +6,10 @@ CLASS net/minecraft/class_2010 net/minecraft/advancement/criterion/ConsumeItemCr ARG 1 player ARG 2 stack CLASS class_2012 Conditions - FIELD field_9513 item Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;)V - ARG 1 player - ARG 2 item + FIELD field_9513 item Ljava/util/Optional; METHOD method_35112 predicate (Lnet/minecraft/class_2073;)Lnet/minecraft/class_2010$class_2012; ARG 0 predicate METHOD method_8826 matches (Lnet/minecraft/class_1799;)Z - ARG 1 stack METHOD method_8827 any ()Lnet/minecraft/class_2010$class_2012; METHOD method_8828 item (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2010$class_2012; ARG 0 item diff --git a/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping b/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping index f40987c768..7bf99e90ae 100644 --- a/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping +++ b/mappings/net/minecraft/advancement/criterion/CriterionConditions.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_184 net/minecraft/advancement/criterion/CriterionConditions METHOD method_806 getId ()Lnet/minecraft/class_2960; - METHOD method_807 toJson (Lnet/minecraft/class_5267;)Lcom/google/gson/JsonObject; - ARG 1 predicateSerializer + METHOD method_807 toJson ()Lcom/google/gson/JsonObject; diff --git a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping index f3ed36f384..fc70733374 100644 --- a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping @@ -7,13 +7,7 @@ CLASS net/minecraft/class_2014 net/minecraft/advancement/criterion/CuredZombieVi ARG 2 zombie ARG 3 villager CLASS class_2016 Conditions - FIELD field_9518 zombie Lnet/minecraft/class_5258; - FIELD field_9519 villager Lnet/minecraft/class_5258; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;)V - ARG 1 player - ARG 2 zombie - ARG 3 villager + FIELD field_9518 zombie Ljava/util/Optional; + FIELD field_9519 villager Ljava/util/Optional; METHOD method_8836 any ()Lnet/minecraft/class_2014$class_2016; METHOD method_8837 matches (Lnet/minecraft/class_47;Lnet/minecraft/class_47;)Z - ARG 1 zombieContext - ARG 2 villagerContext diff --git a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping index 32425c7cab..7f0a1462b0 100644 --- a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping @@ -6,16 +6,10 @@ CLASS net/minecraft/class_2027 net/minecraft/advancement/criterion/EffectsChange ARG 1 player ARG 2 source CLASS class_2029 Conditions - FIELD field_33909 source Lnet/minecraft/class_5258; - FIELD field_9562 effects Lnet/minecraft/class_2102; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2102;Lnet/minecraft/class_5258;)V - ARG 1 player - ARG 2 effects - ARG 3 source - METHOD method_37224 create (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2027$class_2029; - ARG 0 source + FIELD field_33909 source Ljava/util/Optional; + FIELD field_9562 effects Ljava/util/Optional; + METHOD method_37224 create (Ljava/util/Optional;)Lnet/minecraft/class_2027$class_2029; METHOD method_8868 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;)Z - ARG 1 player ARG 2 context - METHOD method_8869 create (Lnet/minecraft/class_2102;)Lnet/minecraft/class_2027$class_2029; + METHOD method_8869 create (Lnet/minecraft/class_2102$class_8748;)Lnet/minecraft/class_2027$class_2029; ARG 0 effects diff --git a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping index cddb66f3fc..cf28ee99cd 100644 --- a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping @@ -7,13 +7,10 @@ CLASS net/minecraft/class_2030 net/minecraft/advancement/criterion/EnchantedItem ARG 2 stack ARG 3 levels CLASS class_2032 Conditions - FIELD field_9567 item Lnet/minecraft/class_2073; + FIELD field_9567 item Ljava/util/Optional; FIELD field_9568 levels Lnet/minecraft/class_2096$class_2100; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)V - ARG 1 player - ARG 2 item + METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V ARG 3 levels METHOD method_8877 any ()Lnet/minecraft/class_2030$class_2032; METHOD method_8878 matches (Lnet/minecraft/class_1799;I)Z - ARG 1 stack ARG 2 levels diff --git a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping index 35296711d4..79573632e7 100644 --- a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping @@ -11,12 +11,9 @@ CLASS net/minecraft/class_2037 net/minecraft/advancement/criterion/EnterBlockCri ARG 2 state CLASS class_2039 Conditions FIELD field_9576 block Lnet/minecraft/class_2248; - FIELD field_9577 state Lnet/minecraft/class_4559; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;)V - ARG 1 player + FIELD field_9577 state Ljava/util/Optional; + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2248;Ljava/util/Optional;)V ARG 2 block - ARG 3 state METHOD method_8890 block (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2037$class_2039; ARG 0 block METHOD method_8891 matches (Lnet/minecraft/class_2680;)Z - ARG 1 state diff --git a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping index 0302d3a176..d2d7cc0177 100644 --- a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping @@ -9,16 +9,11 @@ CLASS net/minecraft/class_2044 net/minecraft/advancement/criterion/EntityHurtPla METHOD method_22468 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZLnet/minecraft/class_2044$class_2046;)Z ARG 5 conditions CLASS class_2046 Conditions - FIELD field_9593 damage Lnet/minecraft/class_2019; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2019;)V - ARG 1 player - ARG 2 damage + FIELD field_9593 damage Ljava/util/Optional; METHOD method_35209 create (Lnet/minecraft/class_2019;)Lnet/minecraft/class_2044$class_2046; ARG 0 predicate METHOD method_35210 create ()Lnet/minecraft/class_2044$class_2046; METHOD method_8907 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZ)Z - ARG 1 player - ARG 2 source ARG 3 dealt ARG 4 taken ARG 5 blocked diff --git a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping index e56a1ef9aa..05ea95c524 100644 --- a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping @@ -6,11 +6,6 @@ CLASS net/minecraft/class_2054 net/minecraft/advancement/criterion/FilledBucketC ARG 1 player ARG 2 stack CLASS class_2056 Conditions - FIELD field_9616 item Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;)V - ARG 1 player - ARG 2 item - METHOD method_8937 create (Lnet/minecraft/class_2073;)Lnet/minecraft/class_2054$class_2056; - ARG 0 item + FIELD field_9616 item Ljava/util/Optional; + METHOD method_8937 create (Ljava/util/Optional;)Lnet/minecraft/class_2054$class_2056; METHOD method_8938 matches (Lnet/minecraft/class_1799;)Z - ARG 1 stack diff --git a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping index 2178ccbcae..f69fd528a2 100644 --- a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping @@ -8,19 +8,9 @@ CLASS net/minecraft/class_2058 net/minecraft/advancement/criterion/FishingRodHoo ARG 3 bobber ARG 4 fishingLoots CLASS class_2060 Conditions - FIELD field_24391 hookedEntity Lnet/minecraft/class_5258; - FIELD field_9621 rod Lnet/minecraft/class_2073; - FIELD field_9623 caughtItem Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;)V - ARG 1 player - ARG 2 rod - ARG 3 hookedEntity - ARG 4 caughtItem + FIELD field_24391 hookedEntity Ljava/util/Optional; + FIELD field_9621 rod Ljava/util/Optional; + FIELD field_9623 caughtItem Ljava/util/Optional; METHOD method_27810 matches (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;Ljava/util/Collection;)Z - ARG 1 rod - ARG 2 hookedEntityContext ARG 3 fishingLoots - METHOD method_8947 create (Lnet/minecraft/class_2073;Lnet/minecraft/class_2048;Lnet/minecraft/class_2073;)Lnet/minecraft/class_2058$class_2060; - ARG 0 rod - ARG 1 bobber - ARG 2 item + METHOD method_8947 create (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2058$class_2060; diff --git a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping index 1d97a2dbe1..a8cb3b0500 100644 --- a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping @@ -17,13 +17,11 @@ CLASS net/minecraft/class_2066 net/minecraft/advancement/criterion/InventoryChan FIELD field_9629 occupied Lnet/minecraft/class_2096$class_2100; FIELD field_9630 full Lnet/minecraft/class_2096$class_2100; FIELD field_9631 empty Lnet/minecraft/class_2096$class_2100; - FIELD field_9632 items [Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;[Lnet/minecraft/class_2073;)V - ARG 1 player + FIELD field_9632 items Ljava/util/List; + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Ljava/util/List;)V ARG 2 occupied ARG 3 full ARG 4 empty - ARG 5 items METHOD method_24363 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2073;)Z ARG 1 item METHOD method_8957 items ([Lnet/minecraft/class_2073;)Lnet/minecraft/class_2066$class_2068; diff --git a/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping index 3ce2cfd638..e54d6ffd39 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping @@ -9,11 +9,9 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemCriterion ARG 2 pos ARG 3 stack CLASS class_4712 Conditions - FIELD field_24495 location Lnet/minecraft/class_5258; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;)V + FIELD field_24495 location Ljava/util/Optional; + METHOD (Lnet/minecraft/class_2960;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 id - ARG 2 entity - ARG 3 location METHOD method_27981 createItemUsedOnBlock (Lnet/minecraft/class_2090$class_2091;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_4711$class_4712; ARG 0 location ARG 1 item @@ -27,6 +25,5 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemCriterion METHOD method_51710 createPlacedBlock (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4711$class_4712; ARG 0 block METHOD method_51711 test (Lnet/minecraft/class_47;)Z - ARG 1 context METHOD method_51712 createPlacedBlock ([Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_4711$class_4712; ARG 0 locationConditions diff --git a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping index c7ce6e9fc2..790a327f66 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping @@ -7,21 +7,15 @@ CLASS net/minecraft/class_2069 net/minecraft/advancement/criterion/ItemDurabilit ARG 2 stack ARG 3 durability CLASS class_2071 Conditions - FIELD field_9637 item Lnet/minecraft/class_2073; + FIELD field_9637 item Ljava/util/Optional; FIELD field_9638 durability Lnet/minecraft/class_2096$class_2100; FIELD field_9639 delta Lnet/minecraft/class_2096$class_2100; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;)V - ARG 1 player - ARG 2 item + METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;)V ARG 3 durability ARG 4 delta - METHOD method_35229 create (Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2069$class_2071; - ARG 0 item + METHOD method_35229 create (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2069$class_2071; ARG 1 durability - METHOD method_8967 create (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2069$class_2071; - ARG 0 player - ARG 1 item + METHOD method_8967 create (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2069$class_2071; ARG 2 durability METHOD method_8968 matches (Lnet/minecraft/class_1799;I)Z - ARG 1 stack ARG 2 durability diff --git a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping index 0d21d18319..eefdcd8520 100644 --- a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping @@ -7,10 +7,8 @@ CLASS net/minecraft/class_2076 net/minecraft/advancement/criterion/KilledByCross ARG 2 piercingKilledEntities CLASS class_2078 Conditions FIELD field_9659 uniqueEntityTypes Lnet/minecraft/class_2096$class_2100; - FIELD field_9660 victims [Lnet/minecraft/class_5258; - METHOD (Lnet/minecraft/class_5258;[Lnet/minecraft/class_5258;Lnet/minecraft/class_2096$class_2100;)V - ARG 1 player - ARG 2 victims + FIELD field_9660 victims Ljava/util/List; + METHOD (Ljava/util/Optional;Ljava/util/List;Lnet/minecraft/class_2096$class_2100;)V ARG 3 uniqueEntityTypes METHOD method_8986 create ([Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2076$class_2078; ARG 0 victimPredicates diff --git a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping index 5b69bebe80..20a00dc940 100644 --- a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping @@ -7,15 +7,12 @@ CLASS net/minecraft/class_2085 net/minecraft/advancement/criterion/LevitationCri ARG 2 startPos ARG 3 duration CLASS class_2087 Conditions - FIELD field_9675 distance Lnet/minecraft/class_2025; + FIELD field_9675 distance Ljava/util/Optional; FIELD field_9676 duration Lnet/minecraft/class_2096$class_2100; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2025;Lnet/minecraft/class_2096$class_2100;)V - ARG 1 player - ARG 2 distance + METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V ARG 3 duration METHOD method_9013 create (Lnet/minecraft/class_2025;)Lnet/minecraft/class_2085$class_2087; ARG 0 distance METHOD method_9014 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_243;I)Z ARG 1 player - ARG 2 startPos ARG 3 duration diff --git a/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping index 2bcb30fbf7..ec0398e1d9 100644 --- a/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping @@ -9,15 +9,8 @@ CLASS net/minecraft/class_6405 net/minecraft/advancement/criterion/LightningStri METHOD method_37242 (Lnet/minecraft/class_47;Ljava/util/List;Lnet/minecraft/class_6405$class_6406;)Z ARG 2 conditions CLASS class_6406 Conditions - FIELD field_33926 lightning Lnet/minecraft/class_5258; - FIELD field_33927 bystander Lnet/minecraft/class_5258; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;)V - ARG 1 player - ARG 2 lightning - ARG 3 bystander - METHOD method_37243 create (Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;)Lnet/minecraft/class_6405$class_6406; - ARG 0 lightning - ARG 1 bystander + FIELD field_33926 lightning Ljava/util/Optional; + FIELD field_33927 bystander Ljava/util/Optional; + METHOD method_37243 create (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_6405$class_6406; METHOD method_37244 test (Lnet/minecraft/class_47;Ljava/util/List;)Z - ARG 1 lightning ARG 2 bystanders diff --git a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping index bcec25931e..160a7acfbf 100644 --- a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping @@ -9,49 +9,33 @@ CLASS net/minecraft/class_2080 net/minecraft/advancement/criterion/OnKilledCrite ARG 2 entity ARG 3 killingDamage CLASS class_2083 Conditions - FIELD field_9667 killingBlow Lnet/minecraft/class_2022; - FIELD field_9668 entity Lnet/minecraft/class_5258; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;Lnet/minecraft/class_2022;)V + FIELD field_9667 killingBlow Ljava/util/Optional; + FIELD field_9668 entity Ljava/util/Optional; + METHOD (Lnet/minecraft/class_2960;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 id - ARG 2 player - ARG 3 entity - ARG 4 killingBlow - METHOD method_35247 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2022;)Lnet/minecraft/class_2080$class_2083; + METHOD method_35247 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;Ljava/util/Optional;)Lnet/minecraft/class_2080$class_2083; ARG 0 killedEntityPredicateBuilder - ARG 1 damageSourcePredicate - METHOD method_35248 createPlayerKilledEntity (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2080$class_2083; - ARG 0 killedEntityPredicate - METHOD method_35249 createPlayerKilledEntity (Lnet/minecraft/class_2048;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2080$class_2083; - ARG 0 killedEntityPredicate + METHOD method_35248 createPlayerKilledEntity (Ljava/util/Optional;)Lnet/minecraft/class_2080$class_2083; + METHOD method_35249 createPlayerKilledEntity (Ljava/util/Optional;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2080$class_2083; ARG 1 damageSourcePredicateBuilder - METHOD method_35250 createPlayerKilledEntity (Lnet/minecraft/class_2048;Lnet/minecraft/class_2022;)Lnet/minecraft/class_2080$class_2083; - ARG 0 killedEntityPredicate - ARG 1 damageSourcePredicate + METHOD method_35250 createPlayerKilledEntity (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2080$class_2083; METHOD method_35251 createEntityKilledPlayer (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2080$class_2083; ARG 0 killerEntityPredicateBuilder METHOD method_35252 createEntityKilledPlayer (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2080$class_2083; ARG 0 killerEntityPredicateBuilder ARG 1 damageSourcePredicateBuilder - METHOD method_35253 createEntityKilledPlayer (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2022;)Lnet/minecraft/class_2080$class_2083; + METHOD method_35253 createEntityKilledPlayer (Lnet/minecraft/class_2048$class_2049;Ljava/util/Optional;)Lnet/minecraft/class_2080$class_2083; ARG 0 killerEntityPredicateBuilder - ARG 1 damageSourcePredicate - METHOD method_35254 createEntityKilledPlayer (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2080$class_2083; - ARG 0 killerEntityPredicate - METHOD method_35255 createEntityKilledPlayer (Lnet/minecraft/class_2048;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2080$class_2083; - ARG 0 killerEntityPredicate + METHOD method_35254 createEntityKilledPlayer (Ljava/util/Optional;)Lnet/minecraft/class_2080$class_2083; + METHOD method_35255 createEntityKilledPlayer (Ljava/util/Optional;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2080$class_2083; ARG 1 damageSourcePredicateBuilder - METHOD method_35256 createEntityKilledPlayer (Lnet/minecraft/class_2048;Lnet/minecraft/class_2022;)Lnet/minecraft/class_2080$class_2083; - ARG 0 killerEntityPredicate - ARG 1 damageSourcePredicate + METHOD method_35256 createEntityKilledPlayer (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2080$class_2083; METHOD method_42671 createKillMobNearSculkCatalyst ()Lnet/minecraft/class_2080$class_2083; METHOD method_8997 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2080$class_2083; ARG 0 killedEntityPredicateBuilder METHOD method_8998 createEntityKilledPlayer ()Lnet/minecraft/class_2080$class_2083; METHOD method_8999 createPlayerKilledEntity ()Lnet/minecraft/class_2080$class_2083; METHOD method_9000 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;Lnet/minecraft/class_1282;)Z - ARG 1 player - ARG 2 killedEntityContext - ARG 3 killingBlow METHOD method_9001 createPlayerKilledEntity (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2080$class_2083; ARG 0 killedEntityPredicateBuilder ARG 1 killingBlowBuilder diff --git a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping index d295ded6a4..41a1d9e3fc 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping @@ -7,8 +7,7 @@ CLASS net/minecraft/class_5282 net/minecraft/advancement/criterion/PlayerGenerat ARG 2 id CLASS class_5283 Conditions FIELD field_24503 lootTable Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2960;)V - ARG 1 entity + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2960;)V ARG 2 lootTable METHOD method_27995 create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5282$class_5283; ARG 0 lootTable diff --git a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping index c64f4fd7b9..e50f6dc5f5 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping @@ -10,29 +10,16 @@ CLASS net/minecraft/class_2115 net/minecraft/advancement/criterion/PlayerHurtEnt ARG 5 taken ARG 6 blocked CLASS class_2117 Conditions - FIELD field_9736 damage Lnet/minecraft/class_2019; - FIELD field_9737 entity Lnet/minecraft/class_5258; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2019;Lnet/minecraft/class_5258;)V - ARG 1 player - ARG 2 damage - ARG 3 entity - METHOD method_35294 create (Lnet/minecraft/class_2019$class_2020;Lnet/minecraft/class_2048;)Lnet/minecraft/class_2115$class_2117; - ARG 0 damagePredicateBuilder - ARG 1 hurtEntityPredicate - METHOD method_35295 create (Lnet/minecraft/class_2019;)Lnet/minecraft/class_2115$class_2117; - ARG 0 damagePredicate - METHOD method_35296 create (Lnet/minecraft/class_2019;Lnet/minecraft/class_2048;)Lnet/minecraft/class_2115$class_2117; - ARG 0 damagePredicate - ARG 1 hurtEntityPredicate - METHOD method_35297 create (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2115$class_2117; - ARG 0 hurtEntityPredicate + FIELD field_9736 damage Ljava/util/Optional; + FIELD field_9737 entity Ljava/util/Optional; + METHOD method_35294 create (Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2115$class_2117; + METHOD method_35295 create (Ljava/util/Optional;)Lnet/minecraft/class_2115$class_2117; + METHOD method_35296 create (Ljava/util/Optional;)Lnet/minecraft/class_2115$class_2117; + METHOD method_35297 create (Lnet/minecraft/class_2019$class_2020;)Lnet/minecraft/class_2115$class_2117; METHOD method_35298 create ()Lnet/minecraft/class_2115$class_2117; - METHOD method_9103 create (Lnet/minecraft/class_2019$class_2020;)Lnet/minecraft/class_2115$class_2117; + METHOD method_9103 create (Lnet/minecraft/class_2019$class_2020;Ljava/util/Optional;)Lnet/minecraft/class_2115$class_2117; ARG 0 damagePredicateBuilder METHOD method_9104 matches (Lnet/minecraft/class_3222;Lnet/minecraft/class_47;Lnet/minecraft/class_1282;FFZ)Z - ARG 1 player - ARG 2 entityContext - ARG 3 source ARG 4 dealt ARG 5 taken ARG 6 blocked diff --git a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping index a0cace6fb2..7c9fcfc9db 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping @@ -7,19 +7,10 @@ CLASS net/minecraft/class_5409 net/minecraft/advancement/criterion/PlayerInterac ARG 2 stack ARG 3 entity CLASS class_5410 Conditions - FIELD field_25700 item Lnet/minecraft/class_2073; - FIELD field_25701 entity Lnet/minecraft/class_5258; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_5258;)V - ARG 1 player - ARG 2 item - ARG 3 entity - METHOD method_30099 create (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073$class_2074;Lnet/minecraft/class_5258;)Lnet/minecraft/class_5409$class_5410; - ARG 0 player + FIELD field_25700 item Ljava/util/Optional; + FIELD field_25701 entity Ljava/util/Optional; + METHOD method_30099 create (Ljava/util/Optional;Lnet/minecraft/class_2073$class_2074;Ljava/util/Optional;)Lnet/minecraft/class_5409$class_5410; ARG 1 itemBuilder - ARG 2 entity METHOD method_30100 test (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Z - ARG 1 stack - ARG 2 context - METHOD method_43278 create (Lnet/minecraft/class_2073$class_2074;Lnet/minecraft/class_5258;)Lnet/minecraft/class_5409$class_5410; + METHOD method_43278 create (Lnet/minecraft/class_2073$class_2074;Ljava/util/Optional;)Lnet/minecraft/class_5409$class_5410; ARG 0 itemBuilder - ARG 1 entity diff --git a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping index ce93eefd9a..d4fd740bcd 100644 --- a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping @@ -9,8 +9,7 @@ CLASS net/minecraft/class_8508 net/minecraft/advancement/criterion/RecipeCrafted CLASS class_8509 Conditions FIELD field_44605 recipeId Lnet/minecraft/class_2960; FIELD field_44606 ingredients Ljava/util/List; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2960;Ljava/util/List;)V - ARG 1 player + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2960;Ljava/util/List;)V ARG 2 recipeId ARG 3 ingredients METHOD method_51352 create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_8508$class_8509; diff --git a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping index d538f7b5ec..b6cab58288 100644 --- a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping @@ -9,8 +9,7 @@ CLASS net/minecraft/class_2119 net/minecraft/advancement/criterion/RecipeUnlocke ARG 2 recipe CLASS class_2121 Conditions FIELD field_9742 recipe Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2960;)V - ARG 1 player + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2960;)V ARG 2 recipe METHOD method_9112 matches (Lnet/minecraft/class_1860;)Z ARG 1 recipe diff --git a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping index 746cc51a36..382848fc5b 100644 --- a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping @@ -6,13 +6,8 @@ CLASS net/minecraft/class_2123 net/minecraft/advancement/criterion/ShotCrossbowC ARG 1 player ARG 2 stack CLASS class_2125 Conditions - FIELD field_9747 item Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;)V - ARG 1 player - ARG 2 item - METHOD method_35323 create (Lnet/minecraft/class_2073;)Lnet/minecraft/class_2123$class_2125; - ARG 0 itemPredicate + FIELD field_9747 item Ljava/util/Optional; + METHOD method_35323 create (Ljava/util/Optional;)Lnet/minecraft/class_2123$class_2125; METHOD method_9120 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2123$class_2125; ARG 0 item METHOD method_9121 matches (Lnet/minecraft/class_1799;)Z - ARG 1 stack diff --git a/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping index bec209beff..e215028458 100644 --- a/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping @@ -11,12 +11,9 @@ CLASS net/minecraft/class_4713 net/minecraft/advancement/criterion/SlideDownBloc ARG 2 state CLASS class_4714 Conditions FIELD field_21587 block Lnet/minecraft/class_2248; - FIELD field_21588 state Lnet/minecraft/class_4559; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;)V - ARG 1 player + FIELD field_21588 state Ljava/util/Optional; + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2248;Ljava/util/Optional;)V ARG 2 block - ARG 3 state METHOD method_23912 create (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4713$class_4714; ARG 0 block METHOD method_23913 test (Lnet/minecraft/class_2680;)Z - ARG 1 state diff --git a/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping b/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping index 47906ea585..844562ab87 100644 --- a/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping @@ -5,7 +5,5 @@ CLASS net/minecraft/class_6407 net/minecraft/advancement/criterion/StartedRiding METHOD method_37259 (Lnet/minecraft/class_6407$class_6408;)Z ARG 0 conditions CLASS class_6408 Conditions - METHOD (Lnet/minecraft/class_5258;)V - ARG 1 player METHOD method_37260 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_6407$class_6408; ARG 0 player diff --git a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping index a40e00df4e..d943635697 100644 --- a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping @@ -6,11 +6,7 @@ CLASS net/minecraft/class_2128 net/minecraft/advancement/criterion/SummonedEntit ARG 1 player ARG 2 entity CLASS class_2130 Conditions - FIELD field_9752 entity Lnet/minecraft/class_5258; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;)V - ARG 1 player - ARG 2 entity + FIELD field_9752 entity Ljava/util/Optional; METHOD method_9129 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2128$class_2130; ARG 0 summonedEntityPredicateBuilder METHOD method_9130 matches (Lnet/minecraft/class_47;)Z - ARG 1 summonedEntityContext diff --git a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping index 8431e91ade..74f3b51302 100644 --- a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping @@ -6,12 +6,7 @@ CLASS net/minecraft/class_2131 net/minecraft/advancement/criterion/TameAnimalCri ARG 1 player ARG 2 entity CLASS class_2133 Conditions - FIELD field_9757 entity Lnet/minecraft/class_5258; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;)V - ARG 1 player - ARG 2 entity - METHOD method_16114 create (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2131$class_2133; - ARG 0 entity + FIELD field_9757 entity Ljava/util/Optional; + METHOD method_16114 create (Ljava/util/Optional;)Lnet/minecraft/class_2131$class_2133; METHOD method_9138 any ()Lnet/minecraft/class_2131$class_2133; METHOD method_9139 matches (Lnet/minecraft/class_47;)Z - ARG 1 tamedEntityContext diff --git a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping index ea51239ead..3107fac310 100644 --- a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping @@ -9,15 +9,11 @@ CLASS net/minecraft/class_4851 net/minecraft/advancement/criterion/TargetHitCrit ARG 3 conditions CLASS class_4852 Conditions FIELD field_22430 signalStrength Lnet/minecraft/class_2096$class_2100; - FIELD field_22512 projectile Lnet/minecraft/class_5258; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_5258;)V - ARG 1 player + FIELD field_22512 projectile Ljava/util/Optional; + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;)V ARG 2 signalStrength - ARG 3 projectile - METHOD method_24865 create (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_5258;)Lnet/minecraft/class_4851$class_4852; + METHOD method_24865 create (Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;)Lnet/minecraft/class_4851$class_4852; ARG 0 signalStrength - ARG 1 projectile METHOD method_24952 test (Lnet/minecraft/class_47;Lnet/minecraft/class_243;I)Z - ARG 1 projectileContext ARG 2 hitPos ARG 3 signalStrength diff --git a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping index f7bedc44de..6854129a00 100644 --- a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping @@ -9,22 +9,12 @@ CLASS net/minecraft/class_5279 net/minecraft/advancement/criterion/ThrownItemPic METHOD method_27976 (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;Lnet/minecraft/class_5279$class_5280;)Z ARG 3 conditions CLASS class_5280 Conditions - FIELD field_24493 item Lnet/minecraft/class_2073; - FIELD field_24494 entity Lnet/minecraft/class_5258; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_5258;)V + FIELD field_24493 item Ljava/util/Optional; + FIELD field_24494 entity Ljava/util/Optional; + METHOD (Lnet/minecraft/class_2960;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 id - ARG 2 player - ARG 3 item - ARG 4 entity - METHOD method_27978 createThrownItemPickedUpByEntity (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_5258;)Lnet/minecraft/class_5279$class_5280; + METHOD method_27978 createThrownItemPickedUpByEntity (Lnet/minecraft/class_5258;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_5279$class_5280; ARG 0 player - ARG 1 item - ARG 2 entity METHOD method_27979 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Z ARG 1 player - ARG 2 stack - ARG 3 entityContext - METHOD method_43277 createThrownItemPickedUpByPlayer (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_5258;)Lnet/minecraft/class_5279$class_5280; - ARG 0 player - ARG 1 item - ARG 2 entity + METHOD method_43277 createThrownItemPickedUpByPlayer (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_5279$class_5280; diff --git a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping index a94397d65b..f0db499104 100644 --- a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping @@ -7,13 +7,11 @@ CLASS net/minecraft/class_2135 net/minecraft/advancement/criterion/TickCriterion METHOD method_9141 trigger (Lnet/minecraft/class_3222;)V ARG 1 player CLASS class_2137 Conditions - METHOD method_43135 createLocation (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2135$class_2137; - ARG 0 entity + METHOD method_43135 createLocation (Ljava/util/Optional;)Lnet/minecraft/class_2135$class_2137; METHOD method_43136 createLocation (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792;)Lnet/minecraft/class_2135$class_2137; ARG 0 block ARG 1 item - METHOD method_43137 createLocation (Lnet/minecraft/class_2090;)Lnet/minecraft/class_2135$class_2137; - ARG 0 location + METHOD method_43137 createLocation (Lnet/minecraft/class_2090$class_2091;)Lnet/minecraft/class_2135$class_2137; METHOD method_43138 createSleptInBed ()Lnet/minecraft/class_2135$class_2137; METHOD method_43139 createHeroOfTheVillage ()Lnet/minecraft/class_2135$class_2137; METHOD method_43279 createAvoidVibration ()Lnet/minecraft/class_2135$class_2137; diff --git a/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping index 2a847d8036..c301b6acee 100644 --- a/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping @@ -8,23 +8,17 @@ CLASS net/minecraft/class_2108 net/minecraft/advancement/criterion/TravelCriteri ARG 1 player ARG 2 startPos CLASS class_2110 Conditions - FIELD field_35040 startPos Lnet/minecraft/class_2090; - FIELD field_9723 distance Lnet/minecraft/class_2025; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_5258;Lnet/minecraft/class_2090;Lnet/minecraft/class_2025;)V + FIELD field_35040 startPos Ljava/util/Optional; + FIELD field_9723 distance Ljava/util/Optional; + METHOD (Lnet/minecraft/class_2960;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 id - ARG 2 entity - ARG 3 startPos - ARG 4 distance METHOD method_38850 rideEntityInLava (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2025;)Lnet/minecraft/class_2108$class_2110; ARG 0 entity ARG 1 distance - METHOD method_38851 fallFromHeight (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;)Lnet/minecraft/class_2108$class_2110; + METHOD method_38851 fallFromHeight (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090$class_2091;)Lnet/minecraft/class_2108$class_2110; ARG 0 entity ARG 1 distance - ARG 2 startPos METHOD method_9085 netherTravel (Lnet/minecraft/class_2025;)Lnet/minecraft/class_2108$class_2110; ARG 0 distance METHOD method_9086 matches (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_243;)Z - ARG 1 world - ARG 2 startPos ARG 3 endPos diff --git a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping index a63b720623..3f8d6f7ecb 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping @@ -7,8 +7,7 @@ CLASS net/minecraft/class_2143 net/minecraft/advancement/criterion/UsedEnderEyeC ARG 2 strongholdPos CLASS class_2145 Conditions FIELD field_9772 distance Lnet/minecraft/class_2096$class_2099; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2096$class_2099;)V - ARG 1 player + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2099;)V ARG 2 distance METHOD method_9162 matches (D)Z ARG 1 distance diff --git a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping index 7045f59d84..fd7804a706 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping @@ -6,13 +6,9 @@ CLASS net/minecraft/class_2148 net/minecraft/advancement/criterion/UsedTotemCrit ARG 1 player ARG 2 stack CLASS class_2150 Conditions - FIELD field_9777 item Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;)V - ARG 1 player - ARG 2 item + FIELD field_9777 item Ljava/util/Optional; METHOD method_35399 create (Lnet/minecraft/class_2073;)Lnet/minecraft/class_2148$class_2150; ARG 0 itemPredicate METHOD method_9170 create (Lnet/minecraft/class_1935;)Lnet/minecraft/class_2148$class_2150; ARG 0 item METHOD method_9171 matches (Lnet/minecraft/class_1799;)Z - ARG 1 stack diff --git a/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping index 2731da6184..308315b256 100644 --- a/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping @@ -6,12 +6,8 @@ CLASS net/minecraft/class_6409 net/minecraft/advancement/criterion/UsingItemCrit METHOD method_37263 (Lnet/minecraft/class_1799;Lnet/minecraft/class_6409$class_6410;)Z ARG 1 conditions CLASS class_6410 Conditions - FIELD field_33938 item Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;)V - ARG 1 player - ARG 2 item + FIELD field_33938 item Ljava/util/Optional; METHOD method_37265 create (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_6409$class_6410; ARG 0 player ARG 1 item METHOD method_37266 test (Lnet/minecraft/class_1799;)Z - ARG 1 stack diff --git a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping index fda399664d..af8dafb933 100644 --- a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping @@ -7,15 +7,9 @@ CLASS net/minecraft/class_2140 net/minecraft/advancement/criterion/VillagerTrade ARG 2 merchant ARG 3 stack CLASS class_2142 Conditions - FIELD field_9766 item Lnet/minecraft/class_2073; - FIELD field_9767 villager Lnet/minecraft/class_5258; - METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;)V - ARG 1 player - ARG 2 villager - ARG 3 item + FIELD field_9766 item Ljava/util/Optional; + FIELD field_9767 villager Ljava/util/Optional; METHOD method_38914 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2140$class_2142; ARG 0 playerPredicate METHOD method_9153 any ()Lnet/minecraft/class_2140$class_2142; METHOD method_9154 matches (Lnet/minecraft/class_47;Lnet/minecraft/class_1799;)Z - ARG 1 merchantContext - ARG 2 stack diff --git a/mappings/net/minecraft/block/FlowerBlock.mapping b/mappings/net/minecraft/block/FlowerBlock.mapping index ab39e47971..6fbb697efc 100644 --- a/mappings/net/minecraft/block/FlowerBlock.mapping +++ b/mappings/net/minecraft/block/FlowerBlock.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_2356 net/minecraft/block/FlowerBlock FIELD field_11085 SHAPE Lnet/minecraft/class_265; - FIELD field_11086 effectInStewDuration I - FIELD field_11087 effectInStew Lnet/minecraft/class_1291; METHOD (Lnet/minecraft/class_1291;ILnet/minecraft/class_4970$class_2251;)V ARG 1 suspiciousStewEffect ARG 2 effectDuration diff --git a/mappings/net/minecraft/block/SuspiciousStewIngredient.mapping b/mappings/net/minecraft/block/SuspiciousStewIngredient.mapping index abd5c2782f..f8b89c0931 100644 --- a/mappings/net/minecraft/block/SuspiciousStewIngredient.mapping +++ b/mappings/net/minecraft/block/SuspiciousStewIngredient.mapping @@ -1,6 +1,4 @@ CLASS net/minecraft/class_7917 net/minecraft/block/SuspiciousStewIngredient - METHOD method_10187 getEffectInStewDuration ()I - METHOD method_10188 getEffectInStew ()Lnet/minecraft/class_1291; METHOD method_47379 getAll ()Ljava/util/List; METHOD method_47380 of (Lnet/minecraft/class_1935;)Lnet/minecraft/class_7917; ARG 0 item diff --git a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping index 53f1045f4d..7ac391eb44 100644 --- a/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeaconBlockEntity.mapping @@ -17,8 +17,6 @@ CLASS net/minecraft/class_2580 net/minecraft/block/entity/BeaconBlockEntity METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - METHOD method_10934 getPotionEffectById (I)Lnet/minecraft/class_1291; - ARG 0 id METHOD method_10936 setCustomName (Lnet/minecraft/class_2561;)V ARG 1 customName METHOD method_10937 getBeamSegments ()Ljava/util/List; diff --git a/mappings/net/minecraft/block/entity/BlockEntityType.mapping b/mappings/net/minecraft/block/entity/BlockEntityType.mapping index 692ebe5381..2fb331c530 100644 --- a/mappings/net/minecraft/block/entity/BlockEntityType.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntityType.mapping @@ -19,7 +19,6 @@ CLASS net/minecraft/class_2591 net/minecraft/block/entity/BlockEntityType FIELD field_11909 type Lcom/mojang/datafixers/types/Type; FIELD field_19315 blocks Ljava/util/Set; METHOD (Lnet/minecraft/class_2591$class_5559;Ljava/util/Set;Lcom/mojang/datafixers/types/Type;)V - ARG 1 factory ARG 2 blocks ARG 3 type METHOD method_11030 create (Ljava/lang/String;Lnet/minecraft/class_2591$class_2592;)Lnet/minecraft/class_2591; diff --git a/mappings/net/minecraft/class_4559.mapping b/mappings/net/minecraft/class_4559.mapping new file mode 100644 index 0000000000..1b199ebd8a --- /dev/null +++ b/mappings/net/minecraft/class_4559.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_4559 + CLASS class_8750 + METHOD method_22532 test (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;)Z diff --git a/mappings/net/minecraft/class_7380.mapping b/mappings/net/minecraft/class_7380.mapping new file mode 100644 index 0000000000..77de937616 --- /dev/null +++ b/mappings/net/minecraft/class_7380.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_7380 + CLASS class_8746 + FIELD comp_1776 getDeserializer Lnet/minecraft/class_7376$class_8745; diff --git a/mappings/net/minecraft/class_8740.mapping b/mappings/net/minecraft/class_8740.mapping new file mode 100644 index 0000000000..aba5140d87 --- /dev/null +++ b/mappings/net/minecraft/class_8740.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_8740 + METHOD method_12697 onPing (Lnet/minecraft/class_2935;)V diff --git a/mappings/net/minecraft/class_8763.mapping b/mappings/net/minecraft/class_8763.mapping new file mode 100644 index 0000000000..84deea52a9 --- /dev/null +++ b/mappings/net/minecraft/class_8763.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_8763 + METHOD method_12666 onPong (Lnet/minecraft/class_2923;)V diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 6a7303cbd1..baa4c63902 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -44,12 +44,10 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1687 world Lnet/minecraft/class_638; COMMENT Represents the world the client is currently viewing. COMMENT This field is not null when in game. - FIELD field_1688 metricsData Lnet/minecraft/class_3517; FIELD field_1689 framebuffer Lnet/minecraft/class_276; FIELD field_1690 options Lnet/minecraft/class_315; FIELD field_1692 targetedEntity Lnet/minecraft/class_1297; FIELD field_1693 is64Bit Z - FIELD field_1694 sessionPropertyMap Lcom/mojang/authlib/properties/PropertyMap; FIELD field_1695 windowFocused Z FIELD field_1696 thread Ljava/lang/Thread; FIELD field_1697 runDirectory Ljava/io/File; @@ -95,7 +93,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1741 pausedTickDelta F FIELD field_1742 itemRenderer Lnet/minecraft/class_918; FIELD field_1743 skipGameRender Z - FIELD field_1744 connectedToRealms Z FIELD field_1745 resourceManager Lnet/minecraft/class_3304; FIELD field_1746 integratedServerConnection Lnet/minecraft/class_2535; COMMENT The client connection to the integrated server. @@ -258,7 +255,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient METHOD method_1534 getLastFrameDuration ()F METHOD method_1536 doAttack ()Z METHOD method_1538 getMusicTracker ()Lnet/minecraft/class_1142; - METHOD method_1539 getSessionProperties ()Lcom/mojang/authlib/properties/PropertyMap; METHOD method_1540 is64Bit ()Z METHOD method_1541 getBlockRenderManager ()Lnet/minecraft/class_776; METHOD method_1542 isInSingleplayer ()Z @@ -282,7 +278,6 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient ARG 0 report METHOD method_1566 getToastManager ()Lnet/minecraft/class_374; METHOD method_1569 isWindowFocused ()Z - METHOD method_1570 getMetricsData ()Lnet/minecraft/class_3517; METHOD method_1571 getCreativeHotbarStorage ()Lnet/minecraft/class_302; METHOD method_1573 forcesUnicodeFont ()Z METHOD method_1574 tick ()V diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index 62023244fd..4094d741be 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -8,23 +8,9 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud FIELD field_2084 chunk Lnet/minecraft/class_2818; FIELD field_2085 pos Lnet/minecraft/class_1923; FIELD field_32187 TEXT_COLOR I - FIELD field_32191 METRICS_RED I - FIELD field_32192 METRICS_YELLOW I - FIELD field_32193 METRICS_GREEN I FIELD field_38985 allocationRateCalculator Lnet/minecraft/class_340$class_7412; METHOD (Lnet/minecraft/class_310;)V ARG 1 client - METHOD method_15870 drawMetricsData (Lnet/minecraft/class_332;Lnet/minecraft/class_3517;IIZ)V - ARG 1 context - ARG 2 metricsData - ARG 3 x - ARG 4 width - ARG 5 showFps - METHOD method_1833 getMetricsLineColor (IIII)I - ARG 1 value - ARG 2 greenValue - ARG 3 yellowValue - ARG 4 redValue METHOD method_1834 getChunk ()Lnet/minecraft/class_2818; METHOD method_1835 getLeftText ()Ljava/util/List; METHOD method_1836 getClientChunk ()Lnet/minecraft/class_2818; @@ -35,10 +21,6 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud METHOD method_1841 (Lnet/minecraft/class_1132;)Ljava/util/Optional; ARG 1 server METHOD method_1842 resetChunk ()V - METHOD method_1843 interpolateColor (IIF)I - ARG 1 color1 - ARG 2 color2 - ARG 3 dt METHOD method_1845 propertyToString (Ljava/util/Map$Entry;)Ljava/lang/String; ARG 1 propEntry METHOD method_1846 render (Lnet/minecraft/class_332;)V diff --git a/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping index 6ee969ef49..d5198e6d33 100644 --- a/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/ScrollableWidget.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_7528 net/minecraft/client/gui/widget/ScrollableWidget COMMENT A widget that can be focused and vertically scrolled. - FIELD field_39493 FOCUSED_BORDER_COLOR I - FIELD field_39494 UNFOCUSED_BORDER_COLOR I - FIELD field_39495 BOX_COLOR I FIELD field_39496 PADDING I FIELD field_39497 scrollY D FIELD field_39498 scrollbarDragged Z @@ -46,8 +43,5 @@ CLASS net/minecraft/class_7528 net/minecraft/client/gui/widget/ScrollableWidget METHOD method_44396 drawScrollbar (Lnet/minecraft/class_332;)V ARG 1 context METHOD method_52233 drawBox (Lnet/minecraft/class_332;IIII)V - ARG 1 context - ARG 2 x - ARG 3 y ARG 4 width ARG 5 height diff --git a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping index 0392e2ee58..d35dae86c5 100644 --- a/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/TextFieldWidget.mapping @@ -18,8 +18,6 @@ CLASS net/minecraft/class_342 net/minecraft/client/gui/widget/TextFieldWidget FIELD field_32196 DEFAULT_EDITABLE_COLOR I FIELD field_32198 VERTICAL_CURSOR_COLOR I FIELD field_32199 HORIZONTAL_CURSOR Ljava/lang/String; - FIELD field_32202 BORDER_COLOR I - FIELD field_32203 BACKGROUND_COLOR I FIELD field_41100 placeholder Lnet/minecraft/class_2561; FIELD field_45352 lastSwitchFocusTime J METHOD (Lnet/minecraft/class_327;IIIILnet/minecraft/class_2561;)V diff --git a/mappings/net/minecraft/client/network/ChunkBatchSizeCalculator.mapping b/mappings/net/minecraft/client/network/ChunkBatchSizeCalculator.mapping deleted file mode 100644 index dbba130469..0000000000 --- a/mappings/net/minecraft/client/network/ChunkBatchSizeCalculator.mapping +++ /dev/null @@ -1 +0,0 @@ -CLASS net/minecraft/class_8672 net/minecraft/client/network/ChunkBatchSizeCalculator diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index daaace88f9..dba88605be 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -26,8 +26,6 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand FIELD field_40489 listedPlayerListEntries Ljava/util/Set; FIELD field_40799 session Lnet/minecraft/class_7818; FIELD field_45600 enabledFeatures Lnet/minecraft/class_7699; - FIELD field_45601 chunkSendStartTime J - FIELD field_45602 chunkBatchSizeCalculator Lnet/minecraft/class_8672; FIELD field_45603 RECONFIGURING_TEXT Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_2535;Lnet/minecraft/class_8675;)V ARG 1 client diff --git a/mappings/net/minecraft/client/network/PlayerListEntry.mapping b/mappings/net/minecraft/client/network/PlayerListEntry.mapping index d28a32f9d2..673d3acd1c 100644 --- a/mappings/net/minecraft/client/network/PlayerListEntry.mapping +++ b/mappings/net/minecraft/client/network/PlayerListEntry.mapping @@ -31,11 +31,4 @@ CLASS net/minecraft/class_640 net/minecraft/client/network/PlayerListEntry ARG 0 secureChatEnforced METHOD method_52803 texturesSupplier (Lcom/mojang/authlib/GameProfile;)Ljava/util/function/Supplier; ARG 0 profile - METHOD method_52804 fetchProfile (Lcom/mojang/authlib/GameProfile;Lcom/mojang/authlib/minecraft/MinecraftSessionService;)Lcom/mojang/authlib/GameProfile; - ARG 0 profile - ARG 1 sessionService - METHOD method_52805 fetchSkinTextures (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_1071;Lcom/mojang/authlib/minecraft/MinecraftSessionService;)Ljava/util/concurrent/CompletableFuture; - ARG 0 profiles - ARG 1 skinProvider - ARG 2 sessionService METHOD method_52810 getSkinTextures ()Lnet/minecraft/class_8685; diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping index af4bccf3f6..0cfac11c19 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsConfigureWorldScreen.mapping @@ -42,13 +42,6 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf ARG 3 y ARG 4 mouseX ARG 5 mouseY - METHOD method_21202 drawExpiring (Lnet/minecraft/class_332;IIIII)V - ARG 1 context - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY - ARG 6 remainingDays METHOD method_21203 switchToFullSlot (ILnet/minecraft/class_4877;)V ARG 1 selectedSlot ARG 2 serverData @@ -69,12 +62,6 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf METHOD method_21219 getNewScreen ()Lnet/minecraft/class_4388; METHOD method_21220 buttonLeft (I)I ARG 1 i - METHOD method_21221 drawExpired (Lnet/minecraft/class_332;IIII)V - ARG 1 context - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD method_21222 switchToEmptySlot (ILnet/minecraft/class_4877;)V ARG 1 selectedSlot ARG 2 serverData @@ -82,12 +69,6 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf ARG 1 button METHOD method_21228 frame (I)I ARG 1 ordinal - METHOD method_21229 drawOpen (Lnet/minecraft/class_332;IIII)V - ARG 1 context - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD method_21231 backButtonClicked ()V METHOD method_21234 disableButtons ()V METHOD method_21236 switchToMinigame ()V @@ -108,12 +89,6 @@ CLASS net/minecraft/class_4388 net/minecraft/client/realms/gui/screen/RealmsConf ARG 1 button METHOD method_25142 (Lnet/minecraft/class_4185;)V ARG 1 button - METHOD method_25143 drawClosed (Lnet/minecraft/class_332;IIII)V - ARG 1 context - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD method_25144 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_25145 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateRealmScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateRealmScreen.mapping index da71d02283..962f85f013 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateRealmScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsCreateRealmScreen.mapping @@ -18,7 +18,3 @@ CLASS net/minecraft/class_4390 net/minecraft/client/realms/gui/screen/RealmsCrea ARG 1 button METHOD method_52667 (Lnet/minecraft/class_4185;Ljava/lang/String;)V ARG 1 name - METHOD method_52668 (Lnet/minecraft/class_7847;)V - ARG 0 positioner - METHOD method_52669 (Lnet/minecraft/class_7847;)V - ARG 0 positioner diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping index e5ad47d861..482f17fafc 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsMainScreen.mapping @@ -58,29 +58,11 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain FIELD field_45219 OPEN_STATUS_TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_437;)V ARG 1 parent - METHOD method_20846 drawExpired (Lnet/minecraft/class_332;IIII)V - ARG 1 context - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD method_20853 play (Lnet/minecraft/class_4877;Lnet/minecraft/class_437;)V ARG 1 serverData ARG 2 parent - METHOD method_20873 drawOpen (Lnet/minecraft/class_332;IIII)V - ARG 1 context - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD method_20874 shouldPlayButtonBeActive (Lnet/minecraft/class_4877;)Z ARG 1 server - METHOD method_20883 drawClose (Lnet/minecraft/class_332;IIII)V - ARG 1 context - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY METHOD method_20884 shouldRenewButtonBeActive (Lnet/minecraft/class_4877;)Z ARG 1 server METHOD method_20902 newScreen ()Lnet/minecraft/class_4325; @@ -94,13 +76,6 @@ CLASS net/minecraft/class_4325 net/minecraft/client/realms/gui/screen/RealmsMain METHOD method_20924 getOwnedNonExpiredWorldIds ()Ljava/util/List; METHOD method_20928 onRenew (Lnet/minecraft/class_4877;)V ARG 1 realmsServer - METHOD method_24987 drawExpiring (Lnet/minecraft/class_332;IIIII)V - ARG 1 context - ARG 2 x - ARG 3 y - ARG 4 mouseX - ARG 5 mouseY - ARG 6 remainingDays METHOD method_24991 leaveServer (ZLnet/minecraft/class_4877;)V ARG 1 confirmed ARG 2 realmsServer diff --git a/mappings/net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen.mapping index e1a9cf1baa..5d8e9cf196 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsResetNormalWorldScreen.mapping @@ -22,5 +22,3 @@ CLASS net/minecraft/class_4409 net/minecraft/client/realms/gui/screen/RealmsRese METHOD method_52693 createResetWorldInfo ()Lnet/minecraft/class_4413; METHOD method_52694 (Lnet/minecraft/class_4409;Lnet/minecraft/class_364;)V ARG 1 child - METHOD method_52695 (Lnet/minecraft/class_7847;)V - ARG 0 positioner diff --git a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping index ccf8f1e2e0..4b8c938b12 100644 --- a/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping +++ b/mappings/net/minecraft/client/texture/PlayerSkinProvider.mapping @@ -18,8 +18,6 @@ CLASS net/minecraft/class_1071 net/minecraft/client/texture/PlayerSkinProvider ARG 1 profile METHOD method_52863 fetchSkinTextures (Lcom/mojang/authlib/GameProfile;)Ljava/util/concurrent/CompletableFuture; ARG 1 profile - METHOD method_52864 areTexturesSigned (Lcom/mojang/authlib/GameProfile;)Z - ARG 1 profile METHOD method_52865 getTextureEntry (Lcom/mojang/authlib/GameProfile;)Lcom/mojang/authlib/properties/Property; ARG 0 profile CLASS 1 diff --git a/mappings/net/minecraft/client/util/Session.mapping b/mappings/net/minecraft/client/util/Session.mapping index ca34f2c965..d59d96cbd3 100644 --- a/mappings/net/minecraft/client/util/Session.mapping +++ b/mappings/net/minecraft/client/util/Session.mapping @@ -15,7 +15,6 @@ CLASS net/minecraft/class_320 net/minecraft/client/util/Session METHOD method_1674 getAccessToken ()Ljava/lang/String; METHOD method_1675 getSessionId ()Ljava/lang/String; METHOD method_1676 getUsername ()Ljava/lang/String; - METHOD method_1677 getProfile ()Lcom/mojang/authlib/GameProfile; METHOD method_35718 getAccountType ()Lnet/minecraft/class_320$class_321; METHOD method_38740 getClientId ()Ljava/util/Optional; METHOD method_38741 getXuid ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/command/FloatRangeArgument.mapping b/mappings/net/minecraft/command/FloatRangeArgument.mapping index 4cb5a73fb1..7b78dea6b1 100644 --- a/mappings/net/minecraft/command/FloatRangeArgument.mapping +++ b/mappings/net/minecraft/command/FloatRangeArgument.mapping @@ -1,11 +1,13 @@ CLASS net/minecraft/class_2152 net/minecraft/command/FloatRangeArgument - FIELD field_9778 min Ljava/lang/Float; - FIELD field_9779 max Ljava/lang/Float; + FIELD comp_1840 min Ljava/lang/Float; + FIELD comp_1841 max Ljava/lang/Float; FIELD field_9780 ANY Lnet/minecraft/class_2152; FIELD field_9781 ONLY_INTS_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; METHOD (Ljava/lang/Float;Ljava/lang/Float;)V ARG 1 min ARG 2 max + METHOD comp_1840 min ()Ljava/lang/Float; + METHOD comp_1841 max ()Ljava/lang/Float; METHOD method_35400 isInSquaredRange (D)Z ARG 1 value METHOD method_35401 exactly (F)Lnet/minecraft/class_2152; @@ -37,8 +39,6 @@ CLASS net/minecraft/class_2152 net/minecraft/command/FloatRangeArgument METHOD method_9174 mapFloat (Ljava/lang/Float;Ljava/util/function/Function;)Ljava/lang/Float; ARG 0 value ARG 1 function - METHOD method_9175 getMin ()Ljava/lang/Float; METHOD method_9176 parseFloat (Lcom/mojang/brigadier/StringReader;Z)Ljava/lang/Float; ARG 0 reader ARG 1 allowFloats - METHOD method_9177 getMax ()Ljava/lang/Float; diff --git a/mappings/net/minecraft/command/argument/MessageArgumentType.mapping b/mappings/net/minecraft/command/argument/MessageArgumentType.mapping index 620295f70d..d2f6716dde 100644 --- a/mappings/net/minecraft/command/argument/MessageArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/MessageArgumentType.mapping @@ -9,8 +9,6 @@ CLASS net/minecraft/class_2196 net/minecraft/command/argument/MessageArgumentTyp ARG 1 message METHOD method_45564 (Ljava/util/concurrent/CompletableFuture;Ljava/util/concurrent/CompletableFuture;Lnet/minecraft/class_7471;Ljava/util/function/Consumer;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; ARG 4 executor - METHOD method_45565 (Ljava/util/concurrent/CompletableFuture;Ljava/util/function/Consumer;Lnet/minecraft/class_7471;Ljava/util/concurrent/Executor;)Ljava/util/concurrent/CompletableFuture; - ARG 3 executor METHOD method_45566 chain (Ljava/util/function/Consumer;Lnet/minecraft/class_2168;Lnet/minecraft/class_7471;)V ARG 0 callback ARG 1 source diff --git a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping index ec04ccef08..6db5e88ffa 100644 --- a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping @@ -12,9 +12,8 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/advancement/vanilla/Van METHOD method_37315 createLookingAtEntityUsing (Lnet/minecraft/class_1299;Lnet/minecraft/class_1792;)Lnet/minecraft/class_6409$class_6410; ARG 0 entity ARG 1 item - METHOD method_37316 createLightningStrike (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2048;)Lnet/minecraft/class_6405$class_6406; + METHOD method_37316 createLightningStrike (Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;)Lnet/minecraft/class_6405$class_6406; ARG 0 range - ARG 1 entity METHOD method_49356 buildAdventuringTime (Ljava/util/function/Consumer;Lnet/minecraft/class_161;Lnet/minecraft/class_8197$class_5305;)V ARG 0 exporter ARG 1 parent diff --git a/mappings/net/minecraft/enchantment/Enchantment.mapping b/mappings/net/minecraft/enchantment/Enchantment.mapping index 1d03d21416..4506be0f22 100644 --- a/mappings/net/minecraft/enchantment/Enchantment.mapping +++ b/mappings/net/minecraft/enchantment/Enchantment.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_1887 net/minecraft/enchantment/Enchantment FIELD field_9085 rarity Lnet/minecraft/class_1887$class_1888; FIELD field_9086 slotTypes [Lnet/minecraft/class_1304; METHOD (Lnet/minecraft/class_1887$class_1888;Lnet/minecraft/class_1886;[Lnet/minecraft/class_1304;)V - ARG 1 weight ARG 2 target ARG 3 slotTypes METHOD method_20742 getMaxPower (I)I diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping index 548add60da..7023cef552 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping @@ -41,8 +41,6 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod COMMENT COMMENT

The total value is equal to the sum of all additions and base multiplications applied by an attribute modifier. FIELD field_6332 VALUES [Lnet/minecraft/class_1322$class_1323; - METHOD (Ljava/lang/String;II)V - ARG 3 id METHOD method_6190 fromId (I)Lnet/minecraft/class_1322$class_1323; ARG 0 id METHOD method_6191 getId ()I diff --git a/mappings/net/minecraft/entity/effect/StatusEffect.mapping b/mappings/net/minecraft/entity/effect/StatusEffect.mapping index 3714ab2857..df0648e639 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffect.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffect.mapping @@ -5,22 +5,17 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect FIELD field_5885 attributeModifiers Ljava/util/Map; FIELD field_5886 color I METHOD (Lnet/minecraft/class_4081;I)V - ARG 1 category ARG 2 color METHOD method_18792 getCategory ()Lnet/minecraft/class_4081; METHOD method_42126 setFactorCalculationDataSupplier (Ljava/util/function/Supplier;)Lnet/minecraft/class_1291; ARG 1 factorCalculationDataSupplier METHOD method_42127 getFactorCalculationDataSupplier ()Ljava/util/Optional; - METHOD method_43257 getRawIdNullable (Lnet/minecraft/class_1291;)I - ARG 0 type METHOD method_52520 onApplied (Lnet/minecraft/class_1309;I)V ARG 1 entity ARG 2 amplifier METHOD method_5552 canApplyUpdateEffect (II)Z ARG 1 duration ARG 2 amplifier - METHOD method_5554 getRawId (Lnet/minecraft/class_1291;)I - ARG 0 type METHOD method_5555 onApplied (Lnet/minecraft/class_5131;I)V ARG 1 attributeContainer ARG 2 amplifier @@ -43,8 +38,6 @@ CLASS net/minecraft/class_1291 net/minecraft/entity/effect/StatusEffect ARG 3 amount ARG 5 operation METHOD method_5567 getTranslationKey ()Ljava/lang/String; - METHOD method_5569 byRawId (I)Lnet/minecraft/class_1291; - ARG 0 rawId METHOD method_5572 applyUpdateEffect (Lnet/minecraft/class_1309;I)V ARG 1 entity ARG 2 amplifier diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index 638e852606..b1ec186b2b 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -14,8 +14,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_5895 duration I FIELD field_5896 type Lnet/minecraft/class_1291; FIELD field_5897 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_1291;)V - ARG 1 type METHOD (Lnet/minecraft/class_1291;I)V ARG 1 type ARG 2 duration @@ -45,8 +43,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 6 showIcon ARG 7 hiddenEffect ARG 8 factorCalculationData - METHOD (Lnet/minecraft/class_1293;)V - ARG 1 instance METHOD compareTo (Ljava/lang/Object;)I ARG 1 that METHOD equals (Ljava/lang/Object;)Z @@ -82,7 +78,6 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance METHOD method_5579 getEffectType ()Lnet/minecraft/class_1291; METHOD method_5581 shouldShowParticles ()Z METHOD method_5582 writeNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; - ARG 1 nbt METHOD method_5583 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1293; ARG 0 nbt METHOD method_5584 getDuration ()I diff --git a/mappings/net/minecraft/entity/effect/StatusEffects.mapping b/mappings/net/minecraft/entity/effect/StatusEffects.mapping index a2fc3db72f..62dc07395a 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffects.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffects.mapping @@ -1,6 +1,3 @@ CLASS net/minecraft/class_1294 net/minecraft/entity/effect/StatusEffects FIELD field_38093 DARKNESS_PADDING_DURATION I - METHOD method_5594 register (ILjava/lang/String;Lnet/minecraft/class_1291;)Lnet/minecraft/class_1291; - ARG 0 rawId - ARG 1 id - ARG 2 entry + METHOD method_5594 register (Ljava/lang/String;Lnet/minecraft/class_1291;)Lnet/minecraft/class_1291; diff --git a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping index 2b33cde213..2f3078022f 100644 --- a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping +++ b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_1438 net/minecraft/entity/passive/MooshroomEntity FIELD field_18105 TYPE Lnet/minecraft/class_2940; - FIELD field_18106 stewEffect Lnet/minecraft/class_1291; - FIELD field_18107 stewEffectDuration I FIELD field_18108 lightningId Ljava/util/UUID; FIELD field_30339 MUTATION_CHANCE I METHOD method_18434 chooseBabyType (Lnet/minecraft/class_1438;)Lnet/minecraft/class_1438$class_4053; diff --git a/mappings/net/minecraft/item/SuspiciousStewItem.mapping b/mappings/net/minecraft/item/SuspiciousStewItem.mapping index 56c700f5db..9dc9911915 100644 --- a/mappings/net/minecraft/item/SuspiciousStewItem.mapping +++ b/mappings/net/minecraft/item/SuspiciousStewItem.mapping @@ -1,12 +1,8 @@ CLASS net/minecraft/class_1830 net/minecraft/item/SuspiciousStewItem FIELD field_30923 EFFECTS_KEY Ljava/lang/String; - FIELD field_30924 EFFECT_ID_KEY Ljava/lang/String; - FIELD field_30925 EFFECT_DURATION_KEY Ljava/lang/String; FIELD field_41069 DEFAULT_DURATION I METHOD method_47369 forEachEffect (Lnet/minecraft/class_1799;Ljava/util/function/Consumer;)V ARG 0 stew ARG 1 effectConsumer - METHOD method_8021 addEffectToStew (Lnet/minecraft/class_1799;Lnet/minecraft/class_1291;I)V + METHOD method_8021 addEffectToStew (Lnet/minecraft/class_1799;Ljava/util/List;)V ARG 0 stew - ARG 1 effect - ARG 2 duration diff --git a/mappings/net/minecraft/item/map/MapIcon.mapping b/mappings/net/minecraft/item/map/MapIcon.mapping index 4cdb7c6807..c53bd8a8cb 100644 --- a/mappings/net/minecraft/item/map/MapIcon.mapping +++ b/mappings/net/minecraft/item/map/MapIcon.mapping @@ -1,36 +1,29 @@ CLASS net/minecraft/class_20 net/minecraft/item/map/MapIcon - FIELD field_76 x B - FIELD field_77 type Lnet/minecraft/class_20$class_21; - FIELD field_78 text Lnet/minecraft/class_2561; - FIELD field_79 rotation B - FIELD field_80 z B + FIELD comp_1842 type Lnet/minecraft/class_20$class_21; + FIELD comp_1843 x B + FIELD comp_1844 z B + FIELD comp_1845 rotation B + FIELD comp_1846 text Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_20$class_21;BBBLnet/minecraft/class_2561;)V ARG 1 type ARG 2 x ARG 3 z ARG 4 rotation ARG 5 text + METHOD comp_1842 type ()Lnet/minecraft/class_20$class_21; + METHOD comp_1843 x ()B + METHOD comp_1844 z ()B + METHOD comp_1845 rotation ()B + METHOD comp_1846 text ()Lnet/minecraft/class_2561; METHOD equals (Ljava/lang/Object;)Z ARG 1 o - METHOD method_88 getText ()Lnet/minecraft/class_2561; - METHOD method_89 getRotation ()B - METHOD method_90 getX ()B - METHOD method_91 getZ ()B METHOD method_92 getTypeId ()B - METHOD method_93 getType ()Lnet/minecraft/class_20$class_21; METHOD method_94 isAlwaysRendered ()Z CLASS class_21 Type FIELD field_111 alwaysRender Z FIELD field_33990 useIconCountLimit Z FIELD field_81 id B FIELD field_82 tintColor I - METHOD (Ljava/lang/String;IZIZ)V - ARG 3 alwaysRender - ARG 4 tintColor - ARG 5 useIconCountLimit - METHOD (Ljava/lang/String;IZZ)V - ARG 3 alwaysRender - ARG 4 useIconCountLimit METHOD method_37342 shouldUseIconCountLimit ()Z METHOD method_95 isAlwaysRendered ()Z METHOD method_96 getTintColor ()I diff --git a/mappings/net/minecraft/loot/AndFunction.mapping b/mappings/net/minecraft/loot/AndFunction.mapping new file mode 100644 index 0000000000..cb43250752 --- /dev/null +++ b/mappings/net/minecraft/loot/AndFunction.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_5641 net/minecraft/loot/AndFunction + FIELD field_27904 functions Ljava/util/List; + FIELD field_27905 applier Ljava/util/function/BiFunction; + METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; + ARG 1 stack + ARG 2 context diff --git a/mappings/net/minecraft/loot/LootDataType.mapping b/mappings/net/minecraft/loot/LootDataType.mapping index 0207ca231f..facf2c9278 100644 --- a/mappings/net/minecraft/loot/LootDataType.mapping +++ b/mappings/net/minecraft/loot/LootDataType.mapping @@ -1,24 +1,10 @@ CLASS net/minecraft/class_8490 net/minecraft/loot/LootDataType FIELD field_44499 LOGGER Lorg/slf4j/Logger; - FIELD field_44500 gson Lcom/google/gson/Gson; - FIELD field_44501 parser Ljava/util/function/BiFunction; FIELD field_44502 id Ljava/lang/String; FIELD field_44503 validator Lnet/minecraft/class_8490$class_8491; - METHOD (Lcom/google/gson/Gson;Ljava/util/function/BiFunction;Ljava/lang/String;Lnet/minecraft/class_8490$class_8491;)V - ARG 1 gson - ARG 2 parserFactory - ARG 3 id - ARG 4 validator - METHOD method_51203 getGson ()Lcom/google/gson/Gson; METHOD method_51204 parse (Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 1 id ARG 2 json - METHOD method_51205 (Lcom/google/gson/Gson;Ljava/lang/Class;Ljava/lang/String;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)Ljava/util/Optional; - ARG 3 id - ARG 4 json - METHOD method_51206 (Lcom/google/gson/Gson;Ljava/lang/Class;Ljava/util/function/Function;Ljava/lang/Class;Ljava/lang/String;Lnet/minecraft/class_2960;Lcom/google/gson/JsonElement;)Ljava/util/Optional; - ARG 5 id - ARG 6 json METHOD method_51207 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_46;)V ARG 0 reporter ARG 1 key @@ -31,17 +17,6 @@ CLASS net/minecraft/class_8490 net/minecraft/loot/LootDataType ARG 1 reporter ARG 2 key ARG 3 value - METHOD method_51210 parserFactory (Ljava/lang/Class;)Ljava/util/function/BiFunction; - ARG 0 clazz - METHOD method_51211 (Ljava/lang/Class;Lcom/google/gson/Gson;Ljava/lang/String;)Ljava/util/function/BiFunction; - ARG 1 gson - ARG 2 dataTypeId - METHOD method_51212 parserFactory (Ljava/lang/Class;Ljava/util/function/Function;)Ljava/util/function/BiFunction; - ARG 0 clazz - ARG 1 combiner - METHOD method_51213 (Ljava/lang/Class;Ljava/util/function/Function;Ljava/lang/Class;Lcom/google/gson/Gson;Ljava/lang/String;)Ljava/util/function/BiFunction; - ARG 3 gson - ARG 4 dataTypeId METHOD method_51214 getId ()Ljava/lang/String; METHOD method_51215 stream ()Ljava/util/stream/Stream; METHOD method_51216 validator ()Lnet/minecraft/class_8490$class_8491; diff --git a/mappings/net/minecraft/loot/LootGsons.mapping b/mappings/net/minecraft/loot/LootGsons.mapping deleted file mode 100644 index 1a41cabb8f..0000000000 --- a/mappings/net/minecraft/loot/LootGsons.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_5270 net/minecraft/loot/LootGsons - METHOD method_27860 getConditionGsonBuilder ()Lcom/google/gson/GsonBuilder; - METHOD method_27861 getFunctionGsonBuilder ()Lcom/google/gson/GsonBuilder; - METHOD method_27862 getTableGsonBuilder ()Lcom/google/gson/GsonBuilder; diff --git a/mappings/net/minecraft/loot/LootManager.mapping b/mappings/net/minecraft/loot/LootManager.mapping index 0a079b4d8d..5301fb0849 100644 --- a/mappings/net/minecraft/loot/LootManager.mapping +++ b/mappings/net/minecraft/loot/LootManager.mapping @@ -34,25 +34,6 @@ CLASS net/minecraft/class_60 net/minecraft/loot/LootManager ARG 2 value METHOD method_51199 (Ljava/util/Map;Ljava/lang/Void;)V ARG 2 v - METHOD method_51200 and ([Lnet/minecraft/class_117;)Lnet/minecraft/class_117; - ARG 0 modifiers - METHOD method_51201 and ([Lnet/minecraft/class_5341;)Lnet/minecraft/class_5341; - ARG 0 predicates METHOD method_51202 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Ljava/lang/Object;)V ARG 1 key ARG 2 value - CLASS class_5334 AndCondition - FIELD field_25202 terms [Lnet/minecraft/class_5341; - FIELD field_25203 predicate Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_5341;)V - ARG 1 terms - METHOD test (Ljava/lang/Object;)Z - ARG 1 context - CLASS class_5641 AndFunction - FIELD field_27904 functions [Lnet/minecraft/class_117; - FIELD field_27905 applier Ljava/util/function/BiFunction; - METHOD ([Lnet/minecraft/class_117;)V - ARG 1 functions - METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; - ARG 1 stack - ARG 2 context diff --git a/mappings/net/minecraft/loot/LootPool.mapping b/mappings/net/minecraft/loot/LootPool.mapping index c0c563ce1a..1b82185eb3 100644 --- a/mappings/net/minecraft/loot/LootPool.mapping +++ b/mappings/net/minecraft/loot/LootPool.mapping @@ -1,15 +1,12 @@ CLASS net/minecraft/class_55 net/minecraft/loot/LootPool FIELD field_952 javaFunctions Ljava/util/function/BiFunction; - FIELD field_953 entries [Lnet/minecraft/class_79; - FIELD field_954 conditions [Lnet/minecraft/class_5341; + FIELD field_953 entries Ljava/util/List; + FIELD field_954 conditions Ljava/util/List; FIELD field_955 predicate Ljava/util/function/Predicate; - FIELD field_956 functions [Lnet/minecraft/class_117; + FIELD field_956 functions Ljava/util/List; FIELD field_957 rolls Lnet/minecraft/class_5658; FIELD field_958 bonusRolls Lnet/minecraft/class_5658; - METHOD ([Lnet/minecraft/class_79;[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;Lnet/minecraft/class_5658;Lnet/minecraft/class_5658;)V - ARG 1 entries - ARG 2 conditions - ARG 3 functions + METHOD (Ljava/util/List;Ljava/util/List;Ljava/util/List;Lnet/minecraft/class_5658;Lnet/minecraft/class_5658;)V ARG 4 rolls ARG 5 bonusRolls METHOD method_341 addGeneratedLoot (Ljava/util/function/Consumer;Lnet/minecraft/class_47;)V @@ -25,10 +22,10 @@ CLASS net/minecraft/class_55 net/minecraft/loot/LootPool ARG 1 reporter CLASS class_56 Builder FIELD field_959 rolls Lnet/minecraft/class_5658; - FIELD field_960 entries Ljava/util/List; - FIELD field_961 functions Ljava/util/List; + FIELD field_960 entries Lcom/google/common/collect/ImmutableList$Builder; + FIELD field_961 functions Lcom/google/common/collect/ImmutableList$Builder; FIELD field_962 bonusRollsRange Lnet/minecraft/class_5658; - FIELD field_963 conditions Ljava/util/List; + FIELD field_963 conditions Lcom/google/common/collect/ImmutableList$Builder; METHOD method_351 with (Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_55$class_56; ARG 1 entry METHOD method_352 rolls (Lnet/minecraft/class_5658;)Lnet/minecraft/class_55$class_56; @@ -36,12 +33,3 @@ CLASS net/minecraft/class_55 net/minecraft/loot/LootPool METHOD method_355 build ()Lnet/minecraft/class_55; METHOD method_35509 bonusRolls (Lnet/minecraft/class_5658;)Lnet/minecraft/class_55$class_56; ARG 1 bonusRolls - CLASS class_57 Serializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 unused - ARG 3 context - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 entry - ARG 2 unused - ARG 3 context diff --git a/mappings/net/minecraft/loot/LootTable.mapping b/mappings/net/minecraft/loot/LootTable.mapping index c44e3bf8e3..db42f569e1 100644 --- a/mappings/net/minecraft/loot/LootTable.mapping +++ b/mappings/net/minecraft/loot/LootTable.mapping @@ -1,17 +1,14 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable - FIELD field_44892 randomSequenceId Lnet/minecraft/class_2960; + FIELD field_44892 randomSequenceId Ljava/util/Optional; FIELD field_942 type Lnet/minecraft/class_176; - FIELD field_943 pools [Lnet/minecraft/class_55; - FIELD field_944 functions [Lnet/minecraft/class_117; + FIELD field_943 pools Ljava/util/List; + FIELD field_944 functions Ljava/util/List; FIELD field_945 combinedFunction Ljava/util/function/BiFunction; FIELD field_946 LOGGER Lorg/slf4j/Logger; FIELD field_947 GENERIC Lnet/minecraft/class_176; FIELD field_948 EMPTY Lnet/minecraft/class_52; - METHOD (Lnet/minecraft/class_176;Lnet/minecraft/class_2960;[Lnet/minecraft/class_55;[Lnet/minecraft/class_117;)V + METHOD (Lnet/minecraft/class_176;Ljava/util/Optional;Ljava/util/List;Ljava/util/List;)V ARG 1 type - ARG 2 randomSequenceId - ARG 3 pools - ARG 4 functions METHOD method_319 generateLoot (Lnet/minecraft/class_47;)Lit/unimi/dsi/fastutil/objects/ObjectArrayList; ARG 1 context METHOD method_320 generateLoot (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)V @@ -56,10 +53,10 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable ARG 1 parameters ARG 2 lootConsumer CLASS class_53 Builder - FIELD field_44893 randomSequenceId Lnet/minecraft/class_2960; - FIELD field_949 pools Ljava/util/List; + FIELD field_44893 randomSequenceId Ljava/util/Optional; + FIELD field_949 pools Lcom/google/common/collect/ImmutableList$Builder; FIELD field_950 type Lnet/minecraft/class_176; - FIELD field_951 functions Ljava/util/List; + FIELD field_951 functions Lcom/google/common/collect/ImmutableList$Builder; METHOD method_334 type (Lnet/minecraft/class_176;)Lnet/minecraft/class_52$class_53; ARG 1 context METHOD method_336 pool (Lnet/minecraft/class_55$class_56;)Lnet/minecraft/class_52$class_53; @@ -67,12 +64,3 @@ CLASS net/minecraft/class_52 net/minecraft/loot/LootTable METHOD method_338 build ()Lnet/minecraft/class_52; METHOD method_51883 randomSequenceId (Lnet/minecraft/class_2960;)Lnet/minecraft/class_52$class_53; ARG 1 randomSequenceId - CLASS class_54 Serializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 unused - ARG 3 context - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 supplier - ARG 2 unused - ARG 3 context diff --git a/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping b/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping index 1424552ec6..1f00650c77 100644 --- a/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/AllOfLootCondition.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_8548 net/minecraft/loot/condition/AllOfLootCondition - METHOD ([Lnet/minecraft/class_5341;)V - ARG 1 terms METHOD method_51723 builder ([Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_8548$class_8549; ARG 0 terms CLASS class_8549 Builder - CLASS class_8550 Serializer diff --git a/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping b/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping index 6f4bc1ea17..cab11dfb83 100644 --- a/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping @@ -1,19 +1,14 @@ CLASS net/minecraft/class_186 net/minecraft/loot/condition/AlternativeLootCondition - FIELD field_1246 terms [Lnet/minecraft/class_5341; + FIELD field_1246 terms Ljava/util/List; FIELD field_1247 predicate Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_5341;Ljava/util/function/Predicate;)V - ARG 1 terms + METHOD (Ljava/util/List;Ljava/util/function/Predicate;)V ARG 2 predicate METHOD test (Ljava/lang/Object;)Z ARG 1 context CLASS class_187 Builder - FIELD field_1248 terms Ljava/util/List; + FIELD field_1248 terms Lcom/google/common/collect/ImmutableList$Builder; METHOD ([Lnet/minecraft/class_5341$class_210;)V ARG 1 terms - METHOD method_51724 build ([Lnet/minecraft/class_5341;)Lnet/minecraft/class_5341; - ARG 1 terms + METHOD method_51724 build (Ljava/util/List;)Lnet/minecraft/class_5341; METHOD method_51730 add (Lnet/minecraft/class_5341$class_210;)V ARG 1 builder - CLASS class_188 Serializer - METHOD method_51726 fromTerms ([Lnet/minecraft/class_5341;)Lnet/minecraft/class_186; - ARG 1 terms diff --git a/mappings/net/minecraft/loot/condition/AnyOfLootCondition.mapping b/mappings/net/minecraft/loot/condition/AnyOfLootCondition.mapping index 3c2692bc86..cf0d33130d 100644 --- a/mappings/net/minecraft/loot/condition/AnyOfLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/AnyOfLootCondition.mapping @@ -1,7 +1,4 @@ CLASS net/minecraft/class_8551 net/minecraft/loot/condition/AnyOfLootCondition - METHOD ([Lnet/minecraft/class_5341;)V - ARG 1 terms METHOD method_51727 builder ([Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_8551$class_8552; ARG 0 terms CLASS class_8552 Builder - CLASS class_8553 Serializer diff --git a/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping b/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping index 4f883d674e..b2fc66e5c2 100644 --- a/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/BlockStatePropertyLootCondition.mapping @@ -1,20 +1,16 @@ CLASS net/minecraft/class_212 net/minecraft/loot/condition/BlockStatePropertyLootCondition - FIELD field_1286 block Lnet/minecraft/class_2248; - FIELD field_1288 properties Lnet/minecraft/class_4559; - METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;)V - ARG 1 block - ARG 2 properties + FIELD comp_1876 block Lnet/minecraft/class_6880; + FIELD comp_1877 properties Ljava/util/Optional; + METHOD comp_1876 block ()Lnet/minecraft/class_6880; + METHOD comp_1877 properties ()Ljava/util/Optional; METHOD method_900 builder (Lnet/minecraft/class_2248;)Lnet/minecraft/class_212$class_213; ARG 0 block METHOD test (Ljava/lang/Object;)Z ARG 1 context CLASS class_213 Builder - FIELD field_1290 block Lnet/minecraft/class_2248; - FIELD field_1291 propertyValues Lnet/minecraft/class_4559; + FIELD field_1290 block Lnet/minecraft/class_6880; + FIELD field_1291 propertyValues Ljava/util/Optional; METHOD (Lnet/minecraft/class_2248;)V ARG 1 block METHOD method_22584 properties (Lnet/minecraft/class_4559$class_4560;)Lnet/minecraft/class_212$class_213; ARG 1 builder - CLASS class_214 Serializer - METHOD method_22585 (Lnet/minecraft/class_2248;Ljava/lang/String;)V - ARG 1 propertyName diff --git a/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping b/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping index 66e358a787..8c4f881a7e 100644 --- a/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/DamageSourcePropertiesLootCondition.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_190 net/minecraft/loot/condition/DamageSourcePropertiesLootCondition - FIELD field_1256 predicate Lnet/minecraft/class_2022; - METHOD (Lnet/minecraft/class_2022;)V - ARG 1 predicate + FIELD comp_1870 predicate Ljava/util/Optional; + METHOD comp_1870 predicate ()Ljava/util/Optional; METHOD method_837 builder (Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_5341$class_210; ARG 0 builder METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_191 Serializer diff --git a/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping b/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping index 87399e788e..2a9e3d6a2c 100644 --- a/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/EntityPropertiesLootCondition.mapping @@ -1,9 +1,10 @@ CLASS net/minecraft/class_215 net/minecraft/loot/condition/EntityPropertiesLootCondition - FIELD field_1292 entity Lnet/minecraft/class_47$class_50; - FIELD field_1293 predicate Lnet/minecraft/class_2048; - METHOD (Lnet/minecraft/class_2048;Lnet/minecraft/class_47$class_50;)V - ARG 1 predicate + FIELD comp_1879 predicate Ljava/util/Optional; + FIELD comp_1880 entity Lnet/minecraft/class_47$class_50; + METHOD (Ljava/util/Optional;Lnet/minecraft/class_47$class_50;)V ARG 2 entity + METHOD comp_1879 predicate ()Ljava/util/Optional; + METHOD comp_1880 entity ()Lnet/minecraft/class_47$class_50; METHOD method_15972 create (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_5341$class_210; ARG 0 entity METHOD method_27865 builder (Lnet/minecraft/class_47$class_50;Lnet/minecraft/class_2048;)Lnet/minecraft/class_5341$class_210; @@ -14,4 +15,3 @@ CLASS net/minecraft/class_215 net/minecraft/loot/condition/EntityPropertiesLootC ARG 1 predicateBuilder METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_216 Serializer diff --git a/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping b/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping index 90b7a57196..b0417271aa 100644 --- a/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/EntityScoresLootCondition.mapping @@ -1,9 +1,11 @@ CLASS net/minecraft/class_199 net/minecraft/loot/condition/EntityScoresLootCondition - FIELD field_1278 target Lnet/minecraft/class_47$class_50; - FIELD field_1279 scores Ljava/util/Map; + FIELD comp_1871 scores Ljava/util/Map; + FIELD comp_1872 target Lnet/minecraft/class_47$class_50; METHOD (Ljava/util/Map;Lnet/minecraft/class_47$class_50;)V ARG 1 scores ARG 2 target + METHOD comp_1871 scores ()Ljava/util/Map; + METHOD comp_1872 target ()Lnet/minecraft/class_47$class_50; METHOD method_35557 create (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_199$class_6163; ARG 0 target METHOD method_865 entityScoreIsInRange (Lnet/minecraft/class_47;Lnet/minecraft/class_1297;Lnet/minecraft/class_269;Ljava/lang/String;Lnet/minecraft/class_42;)Z @@ -14,9 +16,8 @@ CLASS net/minecraft/class_199 net/minecraft/loot/condition/EntityScoresLootCondi ARG 5 range METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_200 Serializer CLASS class_6163 Builder - FIELD field_31869 scores Ljava/util/Map; + FIELD field_31869 scores Lcom/google/common/collect/ImmutableMap$Builder; FIELD field_31870 target Lnet/minecraft/class_47$class_50; METHOD (Lnet/minecraft/class_47$class_50;)V ARG 1 target diff --git a/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping b/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping index ffa6ea7f5e..793c1bd923 100644 --- a/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/InvertedLootCondition.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_207 net/minecraft/loot/condition/InvertedLootCondition - FIELD field_1283 term Lnet/minecraft/class_5341; + FIELD comp_1873 term Lnet/minecraft/class_5341; METHOD (Lnet/minecraft/class_5341;)V ARG 1 term + METHOD comp_1873 term ()Lnet/minecraft/class_5341; METHOD method_889 builder (Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_5341$class_210; ARG 0 term METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_208 Serializer diff --git a/mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping b/mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping index 389e220139..ea75274f8b 100644 --- a/mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/KilledByPlayerLootCondition.mapping @@ -3,4 +3,3 @@ CLASS net/minecraft/class_221 net/minecraft/loot/condition/KilledByPlayerLootCon METHOD method_939 builder ()Lnet/minecraft/class_5341$class_210; METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_222 Serializer diff --git a/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping index b48130c653..8785f3d46a 100644 --- a/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/LocationCheckLootCondition.mapping @@ -1,9 +1,10 @@ CLASS net/minecraft/class_205 net/minecraft/loot/condition/LocationCheckLootCondition - FIELD field_1282 predicate Lnet/minecraft/class_2090; - FIELD field_20765 offset Lnet/minecraft/class_2338; - METHOD (Lnet/minecraft/class_2090;Lnet/minecraft/class_2338;)V - ARG 1 predicate + FIELD comp_1874 predicate Ljava/util/Optional; + FIELD comp_1875 offset Lnet/minecraft/class_2338; + METHOD (Ljava/util/Optional;Lnet/minecraft/class_2338;)V ARG 2 offset + METHOD comp_1874 predicate ()Ljava/util/Optional; + METHOD comp_1875 offset ()Lnet/minecraft/class_2338; METHOD method_30151 builder (Lnet/minecraft/class_2090$class_2091;Lnet/minecraft/class_2338;)Lnet/minecraft/class_5341$class_210; ARG 0 predicateBuilder ARG 1 pos @@ -11,4 +12,3 @@ CLASS net/minecraft/class_205 net/minecraft/loot/condition/LocationCheckLootCond ARG 0 predicateBuilder METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_206 Serializer diff --git a/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping b/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping index 0a212f808c..cef67ceb19 100644 --- a/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping +++ b/mappings/net/minecraft/loot/condition/LootConditionTypes.mapping @@ -1,21 +1,17 @@ CLASS net/minecraft/class_217 net/minecraft/loot/condition/LootConditionTypes - METHOD method_29326 createGsonSerializer ()Ljava/lang/Object; - METHOD method_29327 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5342; + METHOD method_29327 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5342; ARG 0 id - ARG 1 serializer METHOD method_921 (Ljava/lang/Object;)Z ARG 0 predicatesx - METHOD method_924 matchingAll ([Ljava/util/function/Predicate;)Ljava/util/function/Predicate; + METHOD method_924 matchingAll (Ljava/util/List;)Ljava/util/function/Predicate; COMMENT Returns a predicate that returns true only if all its element predicates COMMENT return true, as if applied by logical and. - ARG 0 predicates - METHOD method_925 matchingAny ([Ljava/util/function/Predicate;)Ljava/util/function/Predicate; + METHOD method_925 matchingAny (Ljava/util/List;)Ljava/util/function/Predicate; COMMENT Returns a predicate that returns true if any its element predicates COMMENT return true, as if applied by logical or. - ARG 0 predicates - METHOD method_927 ([Ljava/util/function/Predicate;Ljava/lang/Object;)Z + METHOD method_927 (Ljava/util/List;Ljava/lang/Object;)Z ARG 1 operand METHOD method_928 (Ljava/lang/Object;)Z ARG 0 predicatesx - METHOD method_929 ([Ljava/util/function/Predicate;Ljava/lang/Object;)Z + METHOD method_929 (Ljava/util/List;Ljava/lang/Object;)Z ARG 1 operand diff --git a/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping b/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping index bd3a932ba6..c8680d25af 100644 --- a/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/MatchToolLootCondition.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_223 net/minecraft/loot/condition/MatchToolLootCondition - FIELD field_1298 predicate Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2073;)V - ARG 1 predicate + FIELD comp_1884 predicate Ljava/util/Optional; + METHOD comp_1884 predicate ()Ljava/util/Optional; METHOD method_945 builder (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_5341$class_210; ARG 0 predicate METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_224 Serializer diff --git a/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping b/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping index d4cfd6c2be..9034f87c75 100644 --- a/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/RandomChanceLootCondition.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_219 net/minecraft/loot/condition/RandomChanceLootCondition - FIELD field_1296 chance F + FIELD comp_1881 chance F METHOD (F)V ARG 1 chance + METHOD comp_1881 chance ()F METHOD method_932 builder (F)Lnet/minecraft/class_5341$class_210; ARG 0 chance METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_220 Serializer diff --git a/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping b/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping index db2a6faa8a..b1f3003ec9 100644 --- a/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/RandomChanceWithLootingLootCondition.mapping @@ -1,12 +1,13 @@ CLASS net/minecraft/class_225 net/minecraft/loot/condition/RandomChanceWithLootingLootCondition - FIELD field_1299 lootingMultiplier F - FIELD field_1300 chance F + FIELD comp_1882 chance F + FIELD comp_1883 lootingMultiplier F METHOD (FF)V ARG 1 chance ARG 2 lootingMultiplier + METHOD comp_1882 chance ()F + METHOD comp_1883 lootingMultiplier ()F METHOD method_953 builder (FF)Lnet/minecraft/class_5341$class_210; ARG 0 chance ARG 1 lootingMultiplier METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_226 Serializer diff --git a/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping b/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping index ca0e041f85..94f0278bbf 100644 --- a/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/ReferenceLootCondition.mapping @@ -1,12 +1,12 @@ CLASS net/minecraft/class_4568 net/minecraft/loot/condition/ReferenceLootCondition + FIELD comp_1869 id Lnet/minecraft/class_2960; FIELD field_20763 LOGGER Lorg/slf4j/Logger; - FIELD field_20764 id Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;)V ARG 1 id + METHOD comp_1869 id ()Lnet/minecraft/class_2960; METHOD method_35555 builder (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5341$class_210; ARG 0 id METHOD method_51230 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_5341;)V ARG 3 predicate METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_4569 Serializer diff --git a/mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping b/mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping index e5e7ed4b72..8150cf7c66 100644 --- a/mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/SurvivesExplosionLootCondition.mapping @@ -3,4 +3,3 @@ CLASS net/minecraft/class_201 net/minecraft/loot/condition/SurvivesExplosionLoot METHOD method_871 builder ()Lnet/minecraft/class_5341$class_210; METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_202 Serializer diff --git a/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping b/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping index 6441cd5471..5ebad41cf0 100644 --- a/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/TableBonusLootCondition.mapping @@ -1,12 +1,10 @@ CLASS net/minecraft/class_182 net/minecraft/loot/condition/TableBonusLootCondition - FIELD field_1234 enchantment Lnet/minecraft/class_1887; - FIELD field_1235 chances [F - METHOD (Lnet/minecraft/class_1887;[F)V - ARG 1 enchantment - ARG 2 chances + FIELD comp_1867 enchantment Lnet/minecraft/class_6880; + FIELD comp_1868 chances Ljava/util/List; + METHOD comp_1867 enchantment ()Lnet/minecraft/class_6880; + METHOD comp_1868 chances ()Ljava/util/List; METHOD method_800 builder (Lnet/minecraft/class_1887;[F)Lnet/minecraft/class_5341$class_210; ARG 0 enchantment ARG 1 chances METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_183 Serializer diff --git a/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping index 2a37a236b2..fb9f8d53ea 100644 --- a/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/TimeCheckLootCondition.mapping @@ -1,18 +1,16 @@ CLASS net/minecraft/class_4571 net/minecraft/loot/condition/TimeCheckLootCondition - FIELD field_20767 period Ljava/lang/Long; - FIELD field_20768 value Lnet/minecraft/class_42; - METHOD (Ljava/lang/Long;Lnet/minecraft/class_42;)V - ARG 1 period + FIELD comp_1885 period Ljava/util/Optional; + FIELD comp_1886 value Lnet/minecraft/class_42; + METHOD (Ljava/util/Optional;Lnet/minecraft/class_42;)V ARG 2 value + METHOD comp_1885 period ()Ljava/util/Optional; + METHOD comp_1886 value ()Lnet/minecraft/class_42; METHOD method_35559 create (Lnet/minecraft/class_42;)Lnet/minecraft/class_4571$class_6164; ARG 0 value METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_4572 Serializer CLASS class_6164 Builder - FIELD field_31871 period Ljava/lang/Long; + FIELD field_31871 period Ljava/util/Optional; FIELD field_31872 value Lnet/minecraft/class_42; - METHOD (Lnet/minecraft/class_42;)V - ARG 1 value METHOD method_35560 period (J)Lnet/minecraft/class_4571$class_6164; ARG 1 period diff --git a/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping index 7ab32c357b..9e46a5fec8 100644 --- a/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/ValueCheckLootCondition.mapping @@ -1,12 +1,13 @@ CLASS net/minecraft/class_5644 net/minecraft/loot/condition/ValueCheckLootCondition - FIELD field_27912 value Lnet/minecraft/class_5658; - FIELD field_27913 range Lnet/minecraft/class_42; + FIELD comp_1887 value Lnet/minecraft/class_5658; + FIELD comp_1888 range Lnet/minecraft/class_42; METHOD (Lnet/minecraft/class_5658;Lnet/minecraft/class_42;)V ARG 1 value ARG 2 range + METHOD comp_1887 value ()Lnet/minecraft/class_5658; + METHOD comp_1888 range ()Lnet/minecraft/class_42; METHOD method_35562 builder (Lnet/minecraft/class_5658;Lnet/minecraft/class_42;)Lnet/minecraft/class_5341$class_210; ARG 0 value ARG 1 range METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_5645 Serializer diff --git a/mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping b/mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping index 2142e97f4a..af4387ec7d 100644 --- a/mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/WeatherCheckLootCondition.mapping @@ -1,17 +1,13 @@ CLASS net/minecraft/class_227 net/minecraft/loot/condition/WeatherCheckLootCondition - FIELD field_1301 thundering Ljava/lang/Boolean; - FIELD field_1302 raining Ljava/lang/Boolean; - METHOD (Ljava/lang/Boolean;Ljava/lang/Boolean;)V - ARG 1 raining - ARG 2 thundering + FIELD comp_1889 raining Ljava/util/Optional; + FIELD comp_1890 thundering Ljava/util/Optional; + METHOD comp_1889 raining ()Ljava/util/Optional; + METHOD comp_1890 thundering ()Ljava/util/Optional; METHOD method_35564 create ()Lnet/minecraft/class_227$class_6165; METHOD test (Ljava/lang/Object;)Z ARG 1 context - CLASS class_228 Serializer CLASS class_6165 Builder - FIELD field_31873 raining Ljava/lang/Boolean; - FIELD field_31874 thundering Ljava/lang/Boolean; - METHOD method_35565 raining (Ljava/lang/Boolean;)Lnet/minecraft/class_227$class_6165; - ARG 1 raining - METHOD method_35567 thundering (Ljava/lang/Boolean;)Lnet/minecraft/class_227$class_6165; - ARG 1 thundering + FIELD field_31873 raining Ljava/util/Optional; + FIELD field_31874 thundering Ljava/util/Optional; + METHOD method_35565 raining (Z)Lnet/minecraft/class_227$class_6165; + METHOD method_35567 thundering (Z)Lnet/minecraft/class_227$class_6165; diff --git a/mappings/net/minecraft/loot/context/LootContext.mapping b/mappings/net/minecraft/loot/context/LootContext.mapping index b65138c73a..cab5199e93 100644 --- a/mappings/net/minecraft/loot/context/LootContext.mapping +++ b/mappings/net/minecraft/loot/context/LootContext.mapping @@ -39,8 +39,7 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext ARG 1 parameters METHOD method_304 random (J)Lnet/minecraft/class_47$class_48; ARG 1 seed - METHOD method_309 build (Lnet/minecraft/class_2960;)Lnet/minecraft/class_47; - ARG 1 randomSequenceId + METHOD method_309 build (Ljava/util/Optional;)Lnet/minecraft/class_47; METHOD method_313 getWorld ()Lnet/minecraft/class_3218; CLASS class_50 EntityTarget FIELD field_938 parameter Lnet/minecraft/class_169; @@ -51,10 +50,4 @@ CLASS net/minecraft/class_47 net/minecraft/loot/context/LootContext METHOD method_314 fromString (Ljava/lang/String;)Lnet/minecraft/class_47$class_50; ARG 0 type METHOD method_315 getParameter ()Lnet/minecraft/class_169; - CLASS class_51 Serializer - METHOD read (Lcom/google/gson/stream/JsonReader;)Ljava/lang/Object; - ARG 1 reader - METHOD write (Lcom/google/gson/stream/JsonWriter;Ljava/lang/Object;)V - ARG 1 writer - ARG 2 entity CLASS class_8487 Entry diff --git a/mappings/net/minecraft/loot/context/LootContextTypes.mapping b/mappings/net/minecraft/loot/context/LootContextTypes.mapping index 5044d955bc..44c854729a 100644 --- a/mappings/net/minecraft/loot/context/LootContextTypes.mapping +++ b/mappings/net/minecraft/loot/context/LootContextTypes.mapping @@ -18,8 +18,6 @@ CLASS net/minecraft/class_173 net/minecraft/loot/context/LootContextTypes ARG 0 builder METHOD method_756 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder - METHOD method_757 get (Lnet/minecraft/class_2960;)Lnet/minecraft/class_176; - ARG 0 id METHOD method_758 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder METHOD method_759 register (Ljava/lang/String;Ljava/util/function/Consumer;)Lnet/minecraft/class_176; @@ -27,8 +25,6 @@ CLASS net/minecraft/class_173 net/minecraft/loot/context/LootContextTypes ARG 1 type METHOD method_760 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder - METHOD method_762 getId (Lnet/minecraft/class_176;)Lnet/minecraft/class_2960; - ARG 0 type METHOD method_763 (Lnet/minecraft/class_176$class_177;)V ARG 0 builder METHOD method_764 (Lnet/minecraft/class_176$class_177;)V diff --git a/mappings/net/minecraft/loot/entry/AlternativeEntry.mapping b/mappings/net/minecraft/loot/entry/AlternativeEntry.mapping index 08a2a7b1ff..c4ef5a3a95 100644 --- a/mappings/net/minecraft/loot/entry/AlternativeEntry.mapping +++ b/mappings/net/minecraft/loot/entry/AlternativeEntry.mapping @@ -1,13 +1,13 @@ CLASS net/minecraft/class_65 net/minecraft/loot/entry/AlternativeEntry METHOD method_386 builder ([Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_65$class_66; ARG 0 children - METHOD method_387 ([Lnet/minecraft/class_64;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z + METHOD method_387 (Ljava/util/List;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z ARG 1 context ARG 2 lootChoiceExpander METHOD method_43734 builder (Ljava/util/Collection;Ljava/util/function/Function;)Lnet/minecraft/class_65$class_66; ARG 0 children ARG 1 toBuilderFunction CLASS class_66 Builder - FIELD field_979 children Ljava/util/List; + FIELD field_979 children Lcom/google/common/collect/ImmutableList$Builder; METHOD ([Lnet/minecraft/class_79$class_80;)V ARG 1 children diff --git a/mappings/net/minecraft/loot/entry/CombinedEntry.mapping b/mappings/net/minecraft/loot/entry/CombinedEntry.mapping index 1d775c911e..4834a23c4d 100644 --- a/mappings/net/minecraft/loot/entry/CombinedEntry.mapping +++ b/mappings/net/minecraft/loot/entry/CombinedEntry.mapping @@ -1,14 +1,5 @@ CLASS net/minecraft/class_69 net/minecraft/loot/entry/CombinedEntry - FIELD field_982 children [Lnet/minecraft/class_79; + FIELD field_982 children Ljava/util/List; FIELD field_983 predicate Lnet/minecraft/class_64; - METHOD ([Lnet/minecraft/class_79;[Lnet/minecraft/class_5341;)V - ARG 1 children - ARG 2 conditions - METHOD method_394 combine ([Lnet/minecraft/class_64;)Lnet/minecraft/class_64; - ARG 1 children - METHOD method_395 createSerializer (Lnet/minecraft/class_69$class_70;)Lnet/minecraft/class_79$class_5337; - ARG 0 factory + METHOD method_394 combine (Ljava/util/List;)Lnet/minecraft/class_64; CLASS class_70 Factory - METHOD create ([Lnet/minecraft/class_79;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_69; - ARG 1 children - ARG 2 conditions diff --git a/mappings/net/minecraft/loot/entry/DynamicEntry.mapping b/mappings/net/minecraft/loot/entry/DynamicEntry.mapping index 83aff06090..bc84b451a8 100644 --- a/mappings/net/minecraft/loot/entry/DynamicEntry.mapping +++ b/mappings/net/minecraft/loot/entry/DynamicEntry.mapping @@ -1,16 +1,11 @@ CLASS net/minecraft/class_67 net/minecraft/loot/entry/DynamicEntry FIELD field_980 name Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)V + METHOD (Lnet/minecraft/class_2960;IILjava/util/List;Ljava/util/List;)V ARG 1 name ARG 2 weight ARG 3 quality - ARG 4 conditions - ARG 5 functions METHOD method_390 builder (Lnet/minecraft/class_2960;)Lnet/minecraft/class_85$class_86; ARG 0 name - METHOD method_391 (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_391 (Lnet/minecraft/class_2960;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality - ARG 3 conditions - ARG 4 functions - CLASS class_68 Serializer diff --git a/mappings/net/minecraft/loot/entry/EmptyEntry.mapping b/mappings/net/minecraft/loot/entry/EmptyEntry.mapping index f9ec325108..ec20137c7d 100644 --- a/mappings/net/minecraft/loot/entry/EmptyEntry.mapping +++ b/mappings/net/minecraft/loot/entry/EmptyEntry.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_73 net/minecraft/loot/entry/EmptyEntry METHOD method_401 builder ()Lnet/minecraft/class_85$class_86; - CLASS class_74 Serializer diff --git a/mappings/net/minecraft/loot/entry/GroupEntry.mapping b/mappings/net/minecraft/loot/entry/GroupEntry.mapping index 0caa4a8d60..9b1ea776d4 100644 --- a/mappings/net/minecraft/loot/entry/GroupEntry.mapping +++ b/mappings/net/minecraft/loot/entry/GroupEntry.mapping @@ -4,10 +4,10 @@ CLASS net/minecraft/class_93 net/minecraft/loot/entry/GroupEntry ARG 3 choiceConsumer METHOD method_35511 create ([Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_93$class_6152; ARG 0 entries - METHOD method_452 ([Lnet/minecraft/class_64;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z + METHOD method_452 (Ljava/util/List;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z ARG 1 context ARG 2 lootChoiceExpander CLASS class_6152 Builder - FIELD field_31846 entries Ljava/util/List; + FIELD field_31846 entries Lcom/google/common/collect/ImmutableList$Builder; METHOD ([Lnet/minecraft/class_79$class_80;)V ARG 1 entries diff --git a/mappings/net/minecraft/loot/entry/ItemEntry.mapping b/mappings/net/minecraft/loot/entry/ItemEntry.mapping index 3648cdb1be..c6a37120a5 100644 --- a/mappings/net/minecraft/loot/entry/ItemEntry.mapping +++ b/mappings/net/minecraft/loot/entry/ItemEntry.mapping @@ -1,16 +1,10 @@ CLASS net/minecraft/class_77 net/minecraft/loot/entry/ItemEntry - FIELD field_987 item Lnet/minecraft/class_1792; - METHOD (Lnet/minecraft/class_1792;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)V - ARG 1 item + FIELD field_987 item Lnet/minecraft/class_6880; + METHOD (Lnet/minecraft/class_6880;IILjava/util/List;Ljava/util/List;)V ARG 2 weight ARG 3 quality - ARG 4 conditions - ARG 5 functions - METHOD method_409 (Lnet/minecraft/class_1935;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_409 (Lnet/minecraft/class_1935;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality - ARG 3 conditions - ARG 4 functions METHOD method_411 builder (Lnet/minecraft/class_1935;)Lnet/minecraft/class_85$class_86; ARG 0 drop - CLASS class_78 Serializer diff --git a/mappings/net/minecraft/loot/entry/LeafEntry.mapping b/mappings/net/minecraft/loot/entry/LeafEntry.mapping index a40eef2769..79b47ff509 100644 --- a/mappings/net/minecraft/loot/entry/LeafEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LeafEntry.mapping @@ -1,14 +1,12 @@ CLASS net/minecraft/class_85 net/minecraft/loot/entry/LeafEntry FIELD field_994 quality I FIELD field_995 weight I - FIELD field_996 functions [Lnet/minecraft/class_117; + FIELD field_996 functions Ljava/util/List; FIELD field_997 compiledFunctions Ljava/util/function/BiFunction; FIELD field_998 choice Lnet/minecraft/class_82; - METHOD (II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)V + METHOD (IILjava/util/List;Ljava/util/List;)V ARG 1 weight ARG 2 quality - ARG 3 conditions - ARG 4 functions METHOD method_433 generateLoot (Ljava/util/function/Consumer;Lnet/minecraft/class_47;)V ARG 1 lootConsumer ARG 2 context @@ -17,28 +15,18 @@ CLASS net/minecraft/class_85 net/minecraft/loot/entry/LeafEntry CLASS class_86 Builder FIELD field_1000 quality I FIELD field_1001 weight I - FIELD field_999 functions Ljava/util/List; + FIELD field_999 functions Lcom/google/common/collect/ImmutableList$Builder; METHOD method_436 quality (I)Lnet/minecraft/class_85$class_86; ARG 1 quality METHOD method_437 weight (I)Lnet/minecraft/class_85$class_86; ARG 1 weight - METHOD method_439 getFunctions ()[Lnet/minecraft/class_117; + METHOD method_439 getFunctions ()Ljava/util/List; CLASS class_87 BasicBuilder FIELD field_1003 factory Lnet/minecraft/class_85$class_89; METHOD (Lnet/minecraft/class_85$class_89;)V ARG 1 factory CLASS class_88 Choice CLASS class_89 Factory - METHOD build (II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD build (IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality - ARG 3 conditions - ARG 4 functions - CLASS class_90 Serializer - METHOD method_443 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; - ARG 1 entryJson - ARG 2 context - ARG 3 weight - ARG 4 quality - ARG 5 conditions - ARG 6 functions diff --git a/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping b/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping index 82d70d75c9..0a37f91e76 100644 --- a/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootPoolEntry.mapping @@ -1,15 +1,13 @@ CLASS net/minecraft/class_79 net/minecraft/loot/entry/LootPoolEntry - FIELD field_988 conditions [Lnet/minecraft/class_5341; + FIELD field_988 conditions Ljava/util/List; FIELD field_989 conditionPredicate Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_5341;)V - ARG 1 conditions METHOD method_29318 getType ()Lnet/minecraft/class_5338; METHOD method_414 test (Lnet/minecraft/class_47;)Z ARG 1 context METHOD method_415 validate (Lnet/minecraft/class_58;)V ARG 1 reporter CLASS class_80 Builder - FIELD field_990 conditions Ljava/util/List; + FIELD field_990 conditions Lcom/google/common/collect/ImmutableList$Builder; METHOD method_35513 sequenceEntry (Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_93$class_6152; ARG 1 entry METHOD method_35514 groupEntry (Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_72$class_6153; @@ -18,13 +16,4 @@ CLASS net/minecraft/class_79 net/minecraft/loot/entry/LootPoolEntry ARG 1 builder METHOD method_418 getThisBuilder ()Lnet/minecraft/class_79$class_80; METHOD method_419 build ()Lnet/minecraft/class_79; - METHOD method_420 getConditions ()[Lnet/minecraft/class_5341; - CLASS class_5337 Serializer - METHOD method_422 addEntryFields (Lcom/google/gson/JsonObject;Lnet/minecraft/class_79;Lcom/google/gson/JsonSerializationContext;)V - ARG 1 json - ARG 2 entry - ARG 3 context - METHOD method_424 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_79; - ARG 1 json - ARG 2 context - ARG 3 conditions + METHOD method_420 getConditions ()Ljava/util/List; diff --git a/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping b/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping index 29bbbb5a42..0c93878c6b 100644 --- a/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping +++ b/mappings/net/minecraft/loot/entry/LootPoolEntryTypes.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_75 net/minecraft/loot/entry/LootPoolEntryTypes - METHOD method_29316 createGsonSerializer ()Ljava/lang/Object; - METHOD method_29317 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5338; + METHOD method_29317 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5338; ARG 0 id - ARG 1 jsonSerializer diff --git a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping index 9745e65ccd..8a5fbfa9ca 100644 --- a/mappings/net/minecraft/loot/entry/LootTableEntry.mapping +++ b/mappings/net/minecraft/loot/entry/LootTableEntry.mapping @@ -1,18 +1,13 @@ CLASS net/minecraft/class_83 net/minecraft/loot/entry/LootTableEntry FIELD field_993 id Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)V + METHOD (Lnet/minecraft/class_2960;IILjava/util/List;Ljava/util/List;)V ARG 1 id ARG 2 weight ARG 3 quality - ARG 4 conditions - ARG 5 functions METHOD method_428 builder (Lnet/minecraft/class_2960;)Lnet/minecraft/class_85$class_86; ARG 0 id - METHOD method_430 (Lnet/minecraft/class_2960;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_430 (Lnet/minecraft/class_2960;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality - ARG 3 conditions - ARG 4 functions METHOD method_51222 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_52;)V ARG 3 table - CLASS class_84 Serializer diff --git a/mappings/net/minecraft/loot/entry/SequenceEntry.mapping b/mappings/net/minecraft/loot/entry/SequenceEntry.mapping index 5f608c7a1a..70dc773c88 100644 --- a/mappings/net/minecraft/loot/entry/SequenceEntry.mapping +++ b/mappings/net/minecraft/loot/entry/SequenceEntry.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_72 net/minecraft/loot/entry/SequenceEntry METHOD method_35515 create ([Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_72$class_6153; ARG 0 entries - METHOD method_400 ([Lnet/minecraft/class_64;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z + METHOD method_400 (Ljava/util/List;Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z ARG 1 context ARG 2 lootChoiceExpander CLASS class_6153 Builder - FIELD field_31849 entries Ljava/util/List; + FIELD field_31849 entries Lcom/google/common/collect/ImmutableList$Builder; METHOD ([Lnet/minecraft/class_79$class_80;)V ARG 1 entries diff --git a/mappings/net/minecraft/loot/entry/TagEntry.mapping b/mappings/net/minecraft/loot/entry/TagEntry.mapping index f96d781059..04117744a8 100644 --- a/mappings/net/minecraft/loot/entry/TagEntry.mapping +++ b/mappings/net/minecraft/loot/entry/TagEntry.mapping @@ -1,25 +1,19 @@ CLASS net/minecraft/class_91 net/minecraft/loot/entry/TagEntry FIELD field_1005 name Lnet/minecraft/class_6862; FIELD field_1006 expand Z - METHOD (Lnet/minecraft/class_6862;ZII[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)V + METHOD (Lnet/minecraft/class_6862;ZIILjava/util/List;Ljava/util/List;)V ARG 1 name ARG 2 expand ARG 3 weight ARG 4 quality - ARG 5 conditions - ARG 6 functions METHOD method_35517 builder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_85$class_86; ARG 0 name - METHOD method_35518 (Lnet/minecraft/class_6862;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_35518 (Lnet/minecraft/class_6862;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality - ARG 3 conditions - ARG 4 functions - METHOD method_444 (Lnet/minecraft/class_6862;II[Lnet/minecraft/class_5341;[Lnet/minecraft/class_117;)Lnet/minecraft/class_85; + METHOD method_444 (Lnet/minecraft/class_6862;IILjava/util/List;Ljava/util/List;)Lnet/minecraft/class_85; ARG 1 weight ARG 2 quality - ARG 3 conditions - ARG 4 functions METHOD method_445 expandBuilder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_85$class_86; ARG 0 name METHOD method_447 grow (Lnet/minecraft/class_47;Ljava/util/function/Consumer;)Z @@ -27,4 +21,3 @@ CLASS net/minecraft/class_91 net/minecraft/loot/entry/TagEntry ARG 2 lootChoiceExpander METHOD method_449 (Ljava/util/function/Consumer;Lnet/minecraft/class_6880;)V ARG 1 entry - CLASS class_92 Serializer diff --git a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping index 0d3b0f71d8..83ebb55036 100644 --- a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping @@ -1,64 +1,39 @@ CLASS net/minecraft/class_94 net/minecraft/loot/function/ApplyBonusLootFunction FIELD field_1009 formula Lnet/minecraft/class_94$class_96; FIELD field_1010 FACTORIES Ljava/util/Map; - FIELD field_1011 enchantment Lnet/minecraft/class_1887; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_1887;Lnet/minecraft/class_94$class_96;)V - ARG 1 conditions - ARG 2 enchantment + FIELD field_1011 enchantment Lnet/minecraft/class_6880; + METHOD (Ljava/util/List;Lnet/minecraft/class_6880;Lnet/minecraft/class_94$class_96;)V ARG 3 formula - METHOD method_453 (Lnet/minecraft/class_1887;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 1 conditions METHOD method_455 oreDrops (Lnet/minecraft/class_1887;)Lnet/minecraft/class_120$class_121; ARG 0 enchantment METHOD method_456 uniformBonusCount (Lnet/minecraft/class_1887;)Lnet/minecraft/class_120$class_121; ARG 0 enchantment - METHOD method_457 (Lnet/minecraft/class_1887;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 1 conditions - METHOD method_459 (Lnet/minecraft/class_1887;IF[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 3 conditions METHOD method_461 uniformBonusCount (Lnet/minecraft/class_1887;I)Lnet/minecraft/class_120$class_121; ARG 0 enchantment ARG 1 bonusMultiplier - METHOD method_462 (Lnet/minecraft/class_1887;I[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 2 conditions METHOD method_463 binomialWithBonusCount (Lnet/minecraft/class_1887;FI)Lnet/minecraft/class_120$class_121; ARG 0 enchantment ARG 1 probability ARG 2 extra CLASS class_95 BinomialWithBonusCount - FIELD field_1012 probability F - FIELD field_1013 ID Lnet/minecraft/class_2960; - FIELD field_1014 extra I + FIELD comp_1848 extra I + FIELD comp_1849 probability F + FIELD field_1013 ID Lnet/minecraft/class_94$class_8752; METHOD (IF)V ARG 1 extra ARG 2 probability - METHOD method_464 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_94$class_96; - ARG 0 json - ARG 1 context + METHOD comp_1848 extra ()I + METHOD comp_1849 probability ()F CLASS class_96 Formula - METHOD method_465 toJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonSerializationContext;)V - ARG 1 json - ARG 2 context - METHOD method_466 getId ()Lnet/minecraft/class_2960; + METHOD method_466 getId ()Lnet/minecraft/class_94$class_8752; METHOD method_467 getValue (Lnet/minecraft/class_5819;II)I ARG 1 random ARG 2 initialCount ARG 3 enchantmentLevel - CLASS class_97 FormulaFactory - METHOD deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_94$class_96; - ARG 1 functionJson - ARG 2 context CLASS class_98 OreDrops - FIELD field_1015 ID Lnet/minecraft/class_2960; - METHOD method_468 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_94$class_96; - ARG 0 json - ARG 1 context - CLASS class_99 Serializer + FIELD field_1015 ID Lnet/minecraft/class_94$class_8752; CLASS class_100 UniformBonusCount - FIELD field_1016 ID Lnet/minecraft/class_2960; - FIELD field_1017 bonusMultiplier I + FIELD comp_1852 bonusMultiplier I METHOD (I)V ARG 1 bonusMultiplier - METHOD method_471 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_94$class_96; - ARG 0 json - ARG 1 context + METHOD comp_1852 bonusMultiplier ()I diff --git a/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping b/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping index 8526a8a458..1b695a0f9e 100644 --- a/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ConditionalLootFunction.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_120 net/minecraft/loot/function/ConditionalLootFunction - FIELD field_1047 conditions [Lnet/minecraft/class_5341; + FIELD field_1047 conditions Ljava/util/List; FIELD field_1048 predicate Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_5341;)V - ARG 1 conditions METHOD apply (Ljava/lang/Object;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 itemStack ARG 2 context @@ -12,15 +10,10 @@ CLASS net/minecraft/class_120 net/minecraft/loot/function/ConditionalLootFunctio ARG 1 stack ARG 2 context CLASS class_121 Builder - FIELD field_1049 conditionList Ljava/util/List; + FIELD field_1049 conditionList Lcom/google/common/collect/ImmutableList$Builder; METHOD method_523 getThisBuilder ()Lnet/minecraft/class_120$class_121; - METHOD method_526 getConditions ()[Lnet/minecraft/class_5341; + METHOD method_526 getConditions ()Ljava/util/List; CLASS class_122 Joiner FIELD field_1050 joiner Ljava/util/function/Function; METHOD (Ljava/util/function/Function;)V ARG 1 joiner - CLASS class_123 Serializer - METHOD method_530 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_120; - ARG 1 json - ARG 2 context - ARG 3 conditions diff --git a/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping b/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping index eae07affb6..0a013f92e3 100644 --- a/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyNameLootFunction.mapping @@ -1,18 +1,12 @@ CLASS net/minecraft/class_101 net/minecraft/loot/function/CopyNameLootFunction FIELD field_1018 source Lnet/minecraft/class_101$class_102; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_101$class_102;)V - ARG 1 conditions + METHOD (Ljava/util/List;Lnet/minecraft/class_101$class_102;)V ARG 2 source METHOD method_473 builder (Lnet/minecraft/class_101$class_102;)Lnet/minecraft/class_120$class_121; ARG 0 source - METHOD method_474 (Lnet/minecraft/class_101$class_102;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 1 conditions CLASS class_102 Source FIELD field_1024 parameter Lnet/minecraft/class_169; FIELD field_1025 name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_169;)V ARG 3 name ARG 4 parameter - METHOD method_475 get (Ljava/lang/String;)Lnet/minecraft/class_101$class_102; - ARG 0 name - CLASS class_103 Serializer diff --git a/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping index 9f1e1649d9..aa8c4ca3ae 100644 --- a/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyNbtLootFunction.mapping @@ -1,16 +1,13 @@ CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction FIELD field_17013 source Lnet/minecraft/class_5651; FIELD field_17014 operations Ljava/util/List; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_5651;Ljava/util/List;)V - ARG 1 conditions + METHOD (Ljava/util/List;Lnet/minecraft/class_5651;Ljava/util/List;)V ARG 2 source ARG 3 operations METHOD method_16846 (Lnet/minecraft/class_1799;Lnet/minecraft/class_2520;Lnet/minecraft/class_3837$class_3839;)V ARG 2 operation METHOD method_16848 builder (Lnet/minecraft/class_5651;)Lnet/minecraft/class_3837$class_3838; ARG 0 source - METHOD method_16853 parseNbtPath (Ljava/lang/String;)Lnet/minecraft/class_2203$class_2209; - ARG 0 nbtPath METHOD method_35519 builder (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_3837$class_3838; ARG 0 target CLASS class_3838 Builder @@ -26,18 +23,14 @@ CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction ARG 2 target ARG 3 operator CLASS class_3839 Operation - FIELD field_17019 sourcePath Ljava/lang/String; - FIELD field_17020 parsedSourcePath Lnet/minecraft/class_2203$class_2209; - FIELD field_17021 targetPath Ljava/lang/String; - FIELD field_17022 parsedTargetPath Lnet/minecraft/class_2203$class_2209; - FIELD field_17023 operator Lnet/minecraft/class_3837$class_3841; - METHOD (Ljava/lang/String;Ljava/lang/String;Lnet/minecraft/class_3837$class_3841;)V - ARG 1 sourcePath - ARG 2 targetPath + FIELD comp_1853 parsedSourcePath Lnet/minecraft/class_3837$class_8753; + FIELD comp_1854 parsedTargetPath Lnet/minecraft/class_3837$class_8753; + FIELD comp_1855 operator Lnet/minecraft/class_3837$class_3841; + METHOD (Lnet/minecraft/class_3837$class_8753;Lnet/minecraft/class_3837$class_8753;Lnet/minecraft/class_3837$class_3841;)V ARG 3 operator - METHOD method_16858 toJson ()Lcom/google/gson/JsonObject; - METHOD method_16859 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_3837$class_3839; - ARG 0 json + METHOD comp_1853 parsedSourcePath ()Lnet/minecraft/class_3837$class_8753; + METHOD comp_1854 parsedTargetPath ()Lnet/minecraft/class_3837$class_8753; + METHOD comp_1855 operator ()Lnet/minecraft/class_3837$class_3841; METHOD method_16860 execute (Ljava/util/function/Supplier;Lnet/minecraft/class_2520;)V ARG 1 itemNbtGetter ARG 2 sourceEntityNbt @@ -49,8 +42,6 @@ CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction ARG 1 itemNbt ARG 2 targetPath ARG 3 sourceNbts - METHOD method_16865 get (Ljava/lang/String;)Lnet/minecraft/class_3837$class_3841; - ARG 0 name CLASS 2 METHOD method_16866 (Lnet/minecraft/class_2520;Lnet/minecraft/class_2520;)V ARG 1 sourceNbt @@ -61,4 +52,3 @@ CLASS net/minecraft/class_3837 net/minecraft/loot/function/CopyNbtLootFunction ARG 1 sourceNbt METHOD method_16869 (Ljava/util/List;Lnet/minecraft/class_2520;)V ARG 1 foundNbt - CLASS class_3842 Serializer diff --git a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping index bb3dbcbaf0..ada8a85614 100644 --- a/mappings/net/minecraft/loot/function/CopyStateFunction.mapping +++ b/mappings/net/minecraft/loot/function/CopyStateFunction.mapping @@ -1,26 +1,17 @@ CLASS net/minecraft/class_4488 net/minecraft/loot/function/CopyStateFunction - FIELD field_20449 block Lnet/minecraft/class_2248; + FIELD field_20449 block Lnet/minecraft/class_6880; FIELD field_20450 properties Ljava/util/Set; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2248;Ljava/util/Set;)V - ARG 1 conditions - ARG 2 block + METHOD (Ljava/util/List;Lnet/minecraft/class_6880;Ljava/util/Set;)V ARG 3 properties METHOD method_21892 builder (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4488$class_4489; ARG 0 block METHOD method_21893 getPropertyName (Lnet/minecraft/class_2680;Lnet/minecraft/class_2769;)Ljava/lang/String; ARG 0 state ARG 1 property - METHOD method_21895 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2680;Lnet/minecraft/class_2769;)V - ARG 2 property CLASS class_4489 Builder - FIELD field_20451 block Lnet/minecraft/class_2248; - FIELD field_20452 properties Ljava/util/Set; + FIELD field_20451 block Lnet/minecraft/class_6880; + FIELD field_20452 properties Lcom/google/common/collect/ImmutableSet$Builder; METHOD (Lnet/minecraft/class_2248;)V ARG 1 block METHOD method_21898 addProperty (Lnet/minecraft/class_2769;)Lnet/minecraft/class_4488$class_4489; ARG 1 property - CLASS class_4490 Serializer - METHOD method_21899 (Lcom/google/gson/JsonArray;Lnet/minecraft/class_2769;)V - ARG 1 property - METHOD method_21902 (Ljava/util/Set;Lnet/minecraft/class_2689;Lcom/google/gson/JsonElement;)V - ARG 2 property diff --git a/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping index 4c9060c64d..ae307618ca 100644 --- a/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/EnchantRandomlyLootFunction.mapping @@ -1,21 +1,13 @@ CLASS net/minecraft/class_109 net/minecraft/loot/function/EnchantRandomlyLootFunction - FIELD field_1030 enchantments Ljava/util/List; + FIELD field_1030 enchantments Ljava/util/Optional; FIELD field_1031 LOGGER Lorg/slf4j/Logger; - METHOD ([Lnet/minecraft/class_5341;Ljava/util/Collection;)V - ARG 1 conditions - ARG 2 enchantments METHOD method_26266 addEnchantmentToStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_1887;Lnet/minecraft/class_5819;)Lnet/minecraft/class_1799; ARG 0 stack ARG 1 enchantment ARG 2 random - METHOD method_26267 (ZLnet/minecraft/class_1799;Lnet/minecraft/class_1887;)Z - ARG 2 enchantment METHOD method_35520 create ()Lnet/minecraft/class_109$class_4954; - METHOD method_488 ([Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 0 conditions METHOD method_489 builder ()Lnet/minecraft/class_120$class_121; - CLASS class_110 Serializer CLASS class_4954 Builder - FIELD field_23090 enchantments Ljava/util/Set; + FIELD field_23090 enchantments Ljava/util/List; METHOD method_25992 add (Lnet/minecraft/class_1887;)Lnet/minecraft/class_109$class_4954; ARG 1 enchantment diff --git a/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping b/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping index 21624ad466..5717f51e7d 100644 --- a/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/EnchantWithLevelsLootFunction.mapping @@ -1,8 +1,7 @@ CLASS net/minecraft/class_106 net/minecraft/loot/function/EnchantWithLevelsLootFunction FIELD field_1026 range Lnet/minecraft/class_5658; FIELD field_1027 treasureEnchantmentsAllowed Z - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_5658;Z)V - ARG 1 conditions + METHOD (Ljava/util/List;Lnet/minecraft/class_5658;Z)V ARG 2 range ARG 3 treasureEnchantmentsAllowed METHOD method_481 builder (Lnet/minecraft/class_5658;)Lnet/minecraft/class_106$class_107; @@ -13,4 +12,3 @@ CLASS net/minecraft/class_106 net/minecraft/loot/function/EnchantWithLevelsLootF METHOD (Lnet/minecraft/class_5658;)V ARG 1 range METHOD method_484 allowTreasureEnchantments ()Lnet/minecraft/class_106$class_107; - CLASS class_108 Serializer diff --git a/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping index 8eb026c308..d10cb44d8d 100644 --- a/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ExplorationMapLootFunction.mapping @@ -5,11 +5,8 @@ CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunc FIELD field_1035 destination Lnet/minecraft/class_6862; FIELD field_1036 decoration Lnet/minecraft/class_20$class_21; FIELD field_1037 zoom B - FIELD field_1038 LOGGER Lorg/slf4j/Logger; FIELD field_25032 DEFAULT_DESTINATION Lnet/minecraft/class_6862; - FIELD field_31850 MANSION Ljava/lang/String; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_6862;Lnet/minecraft/class_20$class_21;BIZ)V - ARG 1 conditions + METHOD (Ljava/util/List;Lnet/minecraft/class_6862;Lnet/minecraft/class_20$class_21;BIZ)V ARG 2 destination ARG 3 decoration ARG 4 zoom @@ -32,6 +29,3 @@ CLASS net/minecraft/class_111 net/minecraft/loot/function/ExplorationMapLootFunc ARG 1 destination METHOD method_503 withSkipExistingChunks (Z)Lnet/minecraft/class_111$class_112; ARG 1 skipExistingChunks - CLASS class_113 Serializer - METHOD method_29039 getDestination (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_6862; - ARG 0 json diff --git a/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping b/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping index f16bac5453..40ea53d3e5 100644 --- a/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ExplosionDecayLootFunction.mapping @@ -1,3 +1,2 @@ CLASS net/minecraft/class_104 net/minecraft/loot/function/ExplosionDecayLootFunction METHOD method_478 builder ()Lnet/minecraft/class_120$class_121; - CLASS class_105 Serializer diff --git a/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping b/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping index b5d302b06c..875580efa5 100644 --- a/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/FillPlayerHeadLootFunction.mapping @@ -1,10 +1,6 @@ CLASS net/minecraft/class_3668 net/minecraft/loot/function/FillPlayerHeadLootFunction FIELD field_16227 entity Lnet/minecraft/class_47$class_50; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_47$class_50;)V - ARG 1 conditions + METHOD (Ljava/util/List;Lnet/minecraft/class_47$class_50;)V ARG 2 entity METHOD method_35522 builder (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_120$class_121; ARG 0 target - METHOD method_35523 (Lnet/minecraft/class_47$class_50;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 1 conditions - CLASS class_3669 Serializer diff --git a/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping b/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping index 3e02f71aad..e2820c1790 100644 --- a/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/FurnaceSmeltLootFunction.mapping @@ -1,4 +1,3 @@ CLASS net/minecraft/class_165 net/minecraft/loot/function/FurnaceSmeltLootFunction FIELD field_1159 LOGGER Lorg/slf4j/Logger; METHOD method_724 builder ()Lnet/minecraft/class_120$class_121; - CLASS class_5340 Serializer diff --git a/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping b/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping index 11f89ac32a..5e896c9d11 100644 --- a/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/LimitCountLootFunction.mapping @@ -1,10 +1,6 @@ CLASS net/minecraft/class_114 net/minecraft/loot/function/LimitCountLootFunction FIELD field_1044 limit Lnet/minecraft/class_42; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_42;)V - ARG 1 conditions + METHOD (Ljava/util/List;Lnet/minecraft/class_42;)V ARG 2 limit METHOD method_506 builder (Lnet/minecraft/class_42;)Lnet/minecraft/class_120$class_121; ARG 0 limit - METHOD method_508 (Lnet/minecraft/class_42;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 1 conditions - CLASS class_115 Serializer diff --git a/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping b/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping index 3a4e5da8fa..11fa3433fe 100644 --- a/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping +++ b/mappings/net/minecraft/loot/function/LootFunctionTypes.mapping @@ -1,17 +1,11 @@ CLASS net/minecraft/class_131 net/minecraft/loot/function/LootFunctionTypes FIELD field_1102 NOOP Ljava/util/function/BiFunction; - METHOD method_29322 createGsonSerializer ()Ljava/lang/Object; - METHOD method_29323 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5339; + METHOD method_29323 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5339; ARG 0 id - ARG 1 jsonSerializer METHOD method_591 (Ljava/util/function/BiFunction;Ljava/util/function/BiFunction;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Lnet/minecraft/class_1799; ARG 2 stack ARG 3 context METHOD method_592 (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Lnet/minecraft/class_1799; ARG 0 stack ARG 1 context - METHOD method_594 join ([Ljava/util/function/BiFunction;)Ljava/util/function/BiFunction; - ARG 0 lootFunctions - METHOD method_595 ([Ljava/util/function/BiFunction;Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Lnet/minecraft/class_1799; - ARG 1 stack - ARG 2 context + METHOD method_594 join (Ljava/util/List;)Ljava/util/function/BiFunction; diff --git a/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping b/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping index c99923d132..db028f25b8 100644 --- a/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/LootingEnchantLootFunction.mapping @@ -1,8 +1,7 @@ CLASS net/minecraft/class_125 net/minecraft/loot/function/LootingEnchantLootFunction FIELD field_1082 countRange Lnet/minecraft/class_5658; FIELD field_1083 limit I - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_5658;I)V - ARG 1 conditions + METHOD (Ljava/util/List;Lnet/minecraft/class_5658;I)V ARG 2 countRange ARG 3 limit METHOD method_547 builder (Lnet/minecraft/class_5658;)Lnet/minecraft/class_125$class_126; @@ -15,4 +14,3 @@ CLASS net/minecraft/class_125 net/minecraft/loot/function/LootingEnchantLootFunc ARG 1 countRange METHOD method_551 withLimit (I)Lnet/minecraft/class_125$class_126; ARG 1 limit - CLASS class_127 Serializer diff --git a/mappings/net/minecraft/loot/function/ReferenceLootFunction.mapping b/mappings/net/minecraft/loot/function/ReferenceLootFunction.mapping index 5c198b785c..166e68ac5d 100644 --- a/mappings/net/minecraft/loot/function/ReferenceLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ReferenceLootFunction.mapping @@ -1,13 +1,9 @@ CLASS net/minecraft/class_8492 net/minecraft/loot/function/ReferenceLootFunction FIELD field_44506 LOGGER Lorg/slf4j/Logger; FIELD field_44507 name Lnet/minecraft/class_2960; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2960;)V - ARG 1 conditions + METHOD (Ljava/util/List;Lnet/minecraft/class_2960;)V ARG 2 name METHOD method_51224 builder (Lnet/minecraft/class_2960;)Lnet/minecraft/class_120$class_121; ARG 0 name - METHOD method_51225 (Lnet/minecraft/class_2960;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 1 conditions METHOD method_51226 (Lnet/minecraft/class_58;Lnet/minecraft/class_8488;Lnet/minecraft/class_117;)V ARG 3 itemModifier - CLASS class_8493 Serializer diff --git a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping index 3b3445057e..22a07f8e81 100644 --- a/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetAttributesLootFunction.mapping @@ -1,54 +1,44 @@ CLASS net/minecraft/class_137 net/minecraft/loot/function/SetAttributesLootFunction FIELD field_1105 attributes Ljava/util/List; - METHOD ([Lnet/minecraft/class_5341;Ljava/util/List;)V - ARG 1 conditions + METHOD (Ljava/util/List;Ljava/util/List;)V ARG 2 attributes METHOD method_32406 (Lnet/minecraft/class_137$class_138;)Ljava/util/stream/Stream; ARG 0 attribute - METHOD method_35524 attributeBuilder (Ljava/lang/String;Lnet/minecraft/class_1320;Lnet/minecraft/class_1322$class_1323;Lnet/minecraft/class_5658;)Lnet/minecraft/class_137$class_6156; + METHOD method_35524 attributeBuilder (Ljava/lang/String;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322$class_1323;Lnet/minecraft/class_5658;)Lnet/minecraft/class_137$class_6156; ARG 0 name - ARG 1 attribute ARG 2 operation ARG 3 amountRange METHOD method_35525 builder ()Lnet/minecraft/class_137$class_6155; CLASS class_138 Attribute - FIELD field_1107 name Ljava/lang/String; - FIELD field_1108 amount Lnet/minecraft/class_5658; - FIELD field_1109 operation Lnet/minecraft/class_1322$class_1323; - FIELD field_1110 attribute Lnet/minecraft/class_1320; - FIELD field_1111 id Ljava/util/UUID; - FIELD field_1112 slots [Lnet/minecraft/class_1304; - METHOD (Ljava/lang/String;Lnet/minecraft/class_1320;Lnet/minecraft/class_1322$class_1323;Lnet/minecraft/class_5658;[Lnet/minecraft/class_1304;Ljava/util/UUID;)V + FIELD comp_1859 name Ljava/lang/String; + FIELD comp_1860 attribute Lnet/minecraft/class_6880; + FIELD comp_1861 operation Lnet/minecraft/class_1322$class_1323; + FIELD comp_1862 amount Lnet/minecraft/class_5658; + FIELD comp_1863 slots Ljava/util/List; + FIELD comp_1864 id Ljava/util/Optional; + METHOD (Ljava/lang/String;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322$class_1323;Lnet/minecraft/class_5658;Ljava/util/List;Ljava/util/Optional;)V ARG 1 name - ARG 2 attribute ARG 3 operation ARG 4 amount - ARG 5 slots - ARG 6 id - METHOD method_609 fromName (Ljava/lang/String;)Lnet/minecraft/class_1322$class_1323; - ARG 0 name - METHOD method_612 getName (Lnet/minecraft/class_1322$class_1323;)Ljava/lang/String; - ARG 0 operation - METHOD method_614 deserialize (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Lnet/minecraft/class_137$class_138; - ARG 0 json - ARG 1 context - METHOD method_615 serialize (Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonObject; - ARG 1 context - CLASS class_139 Serializer + METHOD comp_1859 name ()Ljava/lang/String; + METHOD comp_1860 attribute ()Lnet/minecraft/class_6880; + METHOD comp_1861 operation ()Lnet/minecraft/class_1322$class_1323; + METHOD comp_1862 amount ()Lnet/minecraft/class_5658; + METHOD comp_1863 slots ()Ljava/util/List; + METHOD comp_1864 id ()Ljava/util/Optional; CLASS class_6155 Builder FIELD field_31855 attributes Ljava/util/List; METHOD method_35527 attribute (Lnet/minecraft/class_137$class_6156;)Lnet/minecraft/class_137$class_6155; ARG 1 attribute CLASS class_6156 AttributeBuilder FIELD field_31856 name Ljava/lang/String; - FIELD field_31857 attribute Lnet/minecraft/class_1320; + FIELD field_31857 attribute Lnet/minecraft/class_6880; FIELD field_31858 operation Lnet/minecraft/class_1322$class_1323; FIELD field_31859 amount Lnet/minecraft/class_5658; - FIELD field_31860 uuid Ljava/util/UUID; + FIELD field_31860 uuid Ljava/util/Optional; FIELD field_31861 slots Ljava/util/Set; - METHOD (Ljava/lang/String;Lnet/minecraft/class_1320;Lnet/minecraft/class_1322$class_1323;Lnet/minecraft/class_5658;)V + METHOD (Ljava/lang/String;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322$class_1323;Lnet/minecraft/class_5658;)V ARG 1 name - ARG 2 attribute ARG 3 operation ARG 4 amount METHOD method_35528 build ()Lnet/minecraft/class_137$class_138; diff --git a/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping b/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping index 295af0a284..84818458e7 100644 --- a/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetBannerPatternFunction.mapping @@ -1,15 +1,11 @@ CLASS net/minecraft/class_5592 net/minecraft/loot/function/SetBannerPatternFunction FIELD field_27343 patterns Ljava/util/List; FIELD field_27344 append Z - METHOD ([Lnet/minecraft/class_5341;Ljava/util/List;Z)V - ARG 1 conditions + METHOD (Ljava/util/List;Ljava/util/List;Z)V ARG 2 patterns ARG 3 append METHOD method_35531 builder (Z)Lnet/minecraft/class_5592$class_6157; ARG 0 append - CLASS class_5593 Serializer - METHOD method_31935 (Lcom/google/gson/JsonArray;Lcom/mojang/datafixers/util/Pair;)V - ARG 1 pair CLASS class_6157 Builder FIELD field_31862 patterns Lcom/google/common/collect/ImmutableList$Builder; FIELD field_31863 append Z diff --git a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping index 3a55e2e280..b1f5538e4a 100644 --- a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping @@ -1,9 +1,7 @@ CLASS net/minecraft/class_134 net/minecraft/loot/function/SetContentsLootFunction FIELD field_1103 entries Ljava/util/List; - FIELD field_34771 type Lnet/minecraft/class_2591; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2591;Ljava/util/List;)V - ARG 1 conditions - ARG 2 type + FIELD field_34771 type Lnet/minecraft/class_6880; + METHOD (Ljava/util/List;Lnet/minecraft/class_6880;Ljava/util/List;)V ARG 3 entries METHOD method_599 (Lnet/minecraft/class_47;Lnet/minecraft/class_2371;Lnet/minecraft/class_79;)V ARG 2 entry @@ -12,10 +10,9 @@ CLASS net/minecraft/class_134 net/minecraft/loot/function/SetContentsLootFunctio METHOD method_601 builder (Lnet/minecraft/class_2591;)Lnet/minecraft/class_134$class_135; ARG 0 type CLASS class_135 Builder - FIELD field_1104 entries Ljava/util/List; + FIELD field_1104 entries Lcom/google/common/collect/ImmutableList$Builder; FIELD field_34772 type Lnet/minecraft/class_2591; METHOD (Lnet/minecraft/class_2591;)V ARG 1 type METHOD method_602 withEntry (Lnet/minecraft/class_79$class_80;)Lnet/minecraft/class_134$class_135; ARG 1 entryBuilder - CLASS class_136 Serializer diff --git a/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping b/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping index 1925b9b112..5d85f6d36c 100644 --- a/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetCountLootFunction.mapping @@ -1,17 +1,11 @@ CLASS net/minecraft/class_141 net/minecraft/loot/function/SetCountLootFunction FIELD field_1114 countRange Lnet/minecraft/class_5658; FIELD field_27909 add Z - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_5658;Z)V - ARG 1 conditions + METHOD (Ljava/util/List;Lnet/minecraft/class_5658;Z)V ARG 2 countRange ARG 3 add METHOD method_35540 builder (Lnet/minecraft/class_5658;Z)Lnet/minecraft/class_120$class_121; ARG 0 countRange ARG 1 add - METHOD method_35541 (Lnet/minecraft/class_5658;Z[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 2 conditions - METHOD method_620 (Lnet/minecraft/class_5658;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 1 conditions METHOD method_621 builder (Lnet/minecraft/class_5658;)Lnet/minecraft/class_120$class_121; ARG 0 countRange - CLASS class_142 Serializer diff --git a/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping b/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping index 41296e933a..af3764c87b 100644 --- a/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetDamageLootFunction.mapping @@ -2,17 +2,11 @@ CLASS net/minecraft/class_149 net/minecraft/loot/function/SetDamageLootFunction FIELD field_1120 durabilityRange Lnet/minecraft/class_5658; FIELD field_1121 LOGGER Lorg/slf4j/Logger; FIELD field_27910 add Z - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_5658;Z)V - ARG 1 conditions + METHOD (Ljava/util/List;Lnet/minecraft/class_5658;Z)V ARG 2 durabilityRange ARG 3 add METHOD method_35542 builder (Lnet/minecraft/class_5658;Z)Lnet/minecraft/class_120$class_121; ARG 0 durabilityRange ARG 1 add - METHOD method_35543 (Lnet/minecraft/class_5658;Z[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 2 conditions METHOD method_633 builder (Lnet/minecraft/class_5658;)Lnet/minecraft/class_120$class_121; ARG 0 durabilityRange - METHOD method_634 (Lnet/minecraft/class_5658;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 1 conditions - CLASS class_150 Serializer diff --git a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping index a68fa7e3e1..630f8b8efc 100644 --- a/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetEnchantmentsLootFunction.mapping @@ -1,8 +1,7 @@ CLASS net/minecraft/class_5642 net/minecraft/loot/function/SetEnchantmentsLootFunction FIELD field_27907 enchantments Ljava/util/Map; FIELD field_27908 add Z - METHOD ([Lnet/minecraft/class_5341;Ljava/util/Map;Z)V - ARG 1 conditions + METHOD (Ljava/util/List;Ljava/util/Map;Z)V ARG 2 enchantments ARG 3 add METHOD method_32407 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1887;Ljava/lang/Integer;)V @@ -10,8 +9,7 @@ CLASS net/minecraft/class_5642 net/minecraft/loot/function/SetEnchantmentsLootFu ARG 2 level METHOD method_32409 (Lnet/minecraft/class_5658;)Ljava/util/stream/Stream; ARG 0 numberProvider - METHOD method_32410 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_47;Lnet/minecraft/class_1887;Lnet/minecraft/class_5658;)V - ARG 2 enchantment + METHOD method_32410 (Lit/unimi/dsi/fastutil/objects/Object2IntMap;Lnet/minecraft/class_47;Lnet/minecraft/class_6880;Lnet/minecraft/class_5658;)V ARG 3 numberProvider METHOD method_32411 addEnchantmentToMap (Ljava/util/Map;Lnet/minecraft/class_1887;I)V ARG 0 map @@ -23,12 +21,8 @@ CLASS net/minecraft/class_5642 net/minecraft/loot/function/SetEnchantmentsLootFu METHOD method_32414 (Ljava/util/Map;Lnet/minecraft/class_1887;Ljava/lang/Integer;)V ARG 1 enchantment ARG 2 level - CLASS class_5643 Serializer - METHOD method_32416 (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonSerializationContext;Lnet/minecraft/class_1887;Lnet/minecraft/class_5658;)V - ARG 2 enchantment - ARG 3 numberProvider CLASS class_6158 Builder - FIELD field_31864 enchantments Ljava/util/Map; + FIELD field_31864 enchantments Lcom/google/common/collect/ImmutableMap$Builder; FIELD field_31865 add Z METHOD (Z)V ARG 1 add diff --git a/mappings/net/minecraft/loot/function/SetInstrumentLootFunction.mapping b/mappings/net/minecraft/loot/function/SetInstrumentLootFunction.mapping index 2a69ec26cd..c84adf155e 100644 --- a/mappings/net/minecraft/loot/function/SetInstrumentLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetInstrumentLootFunction.mapping @@ -1,10 +1,6 @@ CLASS net/minecraft/class_7431 net/minecraft/loot/function/SetInstrumentLootFunction FIELD field_39184 options Lnet/minecraft/class_6862; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_6862;)V - ARG 1 conditions + METHOD (Ljava/util/List;Lnet/minecraft/class_6862;)V ARG 2 options METHOD method_43571 builder (Lnet/minecraft/class_6862;)Lnet/minecraft/class_120$class_121; ARG 0 options - METHOD method_43743 (Lnet/minecraft/class_6862;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 1 conditions - CLASS class_7432 Serializer diff --git a/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping b/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping index 386b41b997..44cf9f70a1 100644 --- a/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetLootTableLootFunction.mapping @@ -1,12 +1,10 @@ CLASS net/minecraft/class_144 net/minecraft/loot/function/SetLootTableLootFunction FIELD field_1116 id Lnet/minecraft/class_2960; FIELD field_1117 seed J - FIELD field_34773 type Lnet/minecraft/class_2591; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2960;JLnet/minecraft/class_2591;)V - ARG 1 conditions + FIELD field_34773 type Lnet/minecraft/class_6880; + METHOD (Ljava/util/List;Lnet/minecraft/class_2960;JLnet/minecraft/class_6880;)V ARG 2 id ARG 3 seed - ARG 5 type METHOD method_35534 builder (Lnet/minecraft/class_2591;Lnet/minecraft/class_2960;)Lnet/minecraft/class_120$class_121; ARG 0 type ARG 1 id @@ -14,8 +12,3 @@ CLASS net/minecraft/class_144 net/minecraft/loot/function/SetLootTableLootFuncti ARG 0 type ARG 1 id ARG 2 seed - METHOD method_35536 (Lnet/minecraft/class_2960;JLnet/minecraft/class_2591;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 4 conditions - METHOD method_35537 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2591;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 2 conditions - CLASS class_145 Serializer diff --git a/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping index 2409280335..c0d402fac1 100644 --- a/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetLoreLootFunction.mapping @@ -1,21 +1,18 @@ CLASS net/minecraft/class_3671 net/minecraft/loot/function/SetLoreLootFunction FIELD field_16231 lore Ljava/util/List; FIELD field_16232 replace Z - FIELD field_16233 entity Lnet/minecraft/class_47$class_50; - METHOD ([Lnet/minecraft/class_5341;ZLjava/util/List;Lnet/minecraft/class_47$class_50;)V - ARG 1 conditions + FIELD field_16233 entity Ljava/util/Optional; + METHOD (Ljava/util/List;ZLjava/util/List;Ljava/util/Optional;)V ARG 2 replace ARG 3 lore - ARG 4 entity METHOD method_15964 getLoreForMerge (Lnet/minecraft/class_1799;Z)Lnet/minecraft/class_2499; ARG 1 stack ARG 2 otherLoreExists METHOD method_35544 builder ()Lnet/minecraft/class_3671$class_6159; - CLASS class_3672 Serializer CLASS class_6159 Builder FIELD field_31866 replace Z - FIELD field_31867 target Lnet/minecraft/class_47$class_50; - FIELD field_31868 lore Ljava/util/List; + FIELD field_31867 target Ljava/util/Optional; + FIELD field_31868 lore Lcom/google/common/collect/ImmutableList$Builder; METHOD method_35546 target (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_3671$class_6159; ARG 1 target METHOD method_35547 lore (Lnet/minecraft/class_2561;)Lnet/minecraft/class_3671$class_6159; diff --git a/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping b/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping index 53488862c5..8621df49f5 100644 --- a/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetNameLootFunction.mapping @@ -1,11 +1,7 @@ CLASS net/minecraft/class_3670 net/minecraft/loot/function/SetNameLootFunction - FIELD field_16228 name Lnet/minecraft/class_2561; - FIELD field_16229 entity Lnet/minecraft/class_47$class_50; + FIELD field_16228 name Ljava/util/Optional; + FIELD field_16229 entity Ljava/util/Optional; FIELD field_16230 LOGGER Lorg/slf4j/Logger; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2561;Lnet/minecraft/class_47$class_50;)V - ARG 1 conditions - ARG 2 name - ARG 3 entity METHOD method_16189 (Lnet/minecraft/class_2168;Lnet/minecraft/class_1297;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 2 textComponent METHOD method_16190 applySourceEntity (Lnet/minecraft/class_47;Lnet/minecraft/class_47$class_50;)Ljava/util/function/UnaryOperator; @@ -18,8 +14,3 @@ CLASS net/minecraft/class_3670 net/minecraft/loot/function/SetNameLootFunction METHOD method_35550 builder (Lnet/minecraft/class_2561;Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_120$class_121; ARG 0 name ARG 1 target - METHOD method_35551 (Lnet/minecraft/class_2561;Lnet/minecraft/class_47$class_50;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 2 conditions - METHOD method_35552 (Lnet/minecraft/class_2561;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 1 conditions - CLASS class_147 Serializer diff --git a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping index ad324e1c02..96161146f0 100644 --- a/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetNbtLootFunction.mapping @@ -1,10 +1,6 @@ CLASS net/minecraft/class_159 net/minecraft/loot/function/SetNbtLootFunction FIELD field_1138 nbt Lnet/minecraft/class_2487; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_2487;)V - ARG 1 conditions + METHOD (Ljava/util/List;Lnet/minecraft/class_2487;)V ARG 2 nbt - METHOD method_675 (Lnet/minecraft/class_2487;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 1 conditions METHOD method_677 builder (Lnet/minecraft/class_2487;)Lnet/minecraft/class_120$class_121; ARG 0 nbt - CLASS class_160 Serializer diff --git a/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping b/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping index a43020ef60..ff2696de99 100644 --- a/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetPotionLootFunction.mapping @@ -1,10 +1,4 @@ CLASS net/minecraft/class_6662 net/minecraft/loot/function/SetPotionLootFunction - FIELD field_35080 potion Lnet/minecraft/class_1842; - METHOD ([Lnet/minecraft/class_5341;Lnet/minecraft/class_1842;)V - ARG 1 conditions - ARG 2 potion + FIELD field_35080 potion Lnet/minecraft/class_6880; METHOD method_38927 builder (Lnet/minecraft/class_1842;)Lnet/minecraft/class_120$class_121; ARG 0 potion - METHOD method_38928 (Lnet/minecraft/class_1842;[Lnet/minecraft/class_5341;)Lnet/minecraft/class_117; - ARG 1 conditions - CLASS class_6663 Serializer diff --git a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping index 3b0b9f146c..d579411e5e 100644 --- a/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetStewEffectLootFunction.mapping @@ -1,14 +1,7 @@ CLASS net/minecraft/class_152 net/minecraft/loot/function/SetStewEffectLootFunction - FIELD field_1122 effects Ljava/util/Map; - METHOD ([Lnet/minecraft/class_5341;Ljava/util/Map;)V - ARG 1 conditions - ARG 2 effects - METHOD method_32421 (Lnet/minecraft/class_5658;)Ljava/util/stream/Stream; - ARG 0 numberProvider METHOD method_637 builder ()Lnet/minecraft/class_152$class_153; CLASS class_153 Builder - FIELD field_1123 map Ljava/util/Map; + FIELD field_1123 map Lcom/google/common/collect/ImmutableList$Builder; METHOD method_640 withEffect (Lnet/minecraft/class_1291;Lnet/minecraft/class_5658;)Lnet/minecraft/class_152$class_153; ARG 1 effect ARG 2 durationRange - CLASS class_154 Serializer diff --git a/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping b/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping index f7b04aa1cd..16936a0ce1 100644 --- a/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping +++ b/mappings/net/minecraft/loot/operator/BoundedIntUnaryOperator.mapping @@ -46,15 +46,6 @@ CLASS net/minecraft/class_42 net/minecraft/loot/operator/BoundedIntUnaryOperator METHOD method_32398 (Lnet/minecraft/class_5658;Lnet/minecraft/class_47;I)I ARG 1 context ARG 2 value - CLASS class_62 Serializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 unused - ARG 3 context - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 entry - ARG 2 unused - ARG 3 context CLASS class_5638 Tester METHOD test (Lnet/minecraft/class_47;I)Z ARG 1 context diff --git a/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping b/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping index 848a081b27..bfc2e1b449 100644 --- a/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping +++ b/mappings/net/minecraft/loot/provider/nbt/ContextLootNbtProvider.mapping @@ -7,14 +7,10 @@ CLASS net/minecraft/class_5646 net/minecraft/loot/provider/nbt/ContextLootNbtPro ARG 1 target METHOD method_32430 getTarget (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_5646$class_5648; ARG 0 entityTarget - METHOD method_32431 fromTarget (Ljava/lang/String;)Lnet/minecraft/class_5646; - ARG 0 target METHOD method_35568 fromTarget (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_5651; ARG 0 target - CLASS class_5647 CustomSerializer CLASS class_5648 Target METHOD method_32434 getName ()Ljava/lang/String; METHOD method_32435 getNbt (Lnet/minecraft/class_47;)Lnet/minecraft/class_2520; ARG 1 context METHOD method_32436 getRequiredParameters ()Ljava/util/Set; - CLASS class_5649 Serializer diff --git a/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping b/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping index 8cf81dcf87..28e8ebb3a8 100644 --- a/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping +++ b/mappings/net/minecraft/loot/provider/nbt/LootNbtProviderTypes.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_5652 net/minecraft/loot/provider/nbt/LootNbtProviderTypes - METHOD method_32442 createGsonSerializer ()Ljava/lang/Object; - METHOD method_32443 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5650; + METHOD method_32443 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5650; ARG 0 id - ARG 1 jsonSerializer diff --git a/mappings/net/minecraft/loot/provider/nbt/StorageLootNbtProvider.mapping b/mappings/net/minecraft/loot/provider/nbt/StorageLootNbtProvider.mapping index ec8575c959..03ac8e2ef4 100644 --- a/mappings/net/minecraft/loot/provider/nbt/StorageLootNbtProvider.mapping +++ b/mappings/net/minecraft/loot/provider/nbt/StorageLootNbtProvider.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_5653 net/minecraft/loot/provider/nbt/StorageLootNbtProvider - FIELD field_27920 source Lnet/minecraft/class_2960; + FIELD comp_1892 source Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;)V ARG 1 source - CLASS class_5654 Serializer + METHOD comp_1892 source ()Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/loot/provider/number/BinomialLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/BinomialLootNumberProvider.mapping index 0969c7171f..fd8c293e3c 100644 --- a/mappings/net/minecraft/loot/provider/number/BinomialLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/BinomialLootNumberProvider.mapping @@ -1,10 +1,11 @@ CLASS net/minecraft/class_40 net/minecraft/loot/provider/number/BinomialLootNumberProvider - FIELD field_917 p Lnet/minecraft/class_5658; - FIELD field_918 n Lnet/minecraft/class_5658; + FIELD comp_1893 n Lnet/minecraft/class_5658; + FIELD comp_1894 p Lnet/minecraft/class_5658; METHOD (Lnet/minecraft/class_5658;Lnet/minecraft/class_5658;)V ARG 1 n ARG 2 p + METHOD comp_1893 n ()Lnet/minecraft/class_5658; + METHOD comp_1894 p ()Lnet/minecraft/class_5658; METHOD method_273 create (IF)Lnet/minecraft/class_40; ARG 0 n ARG 1 p - CLASS class_41 Serializer diff --git a/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping index 88399f603f..4e0e673564 100644 --- a/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/ConstantLootNumberProvider.mapping @@ -1,10 +1,9 @@ CLASS net/minecraft/class_44 net/minecraft/loot/provider/number/ConstantLootNumberProvider - FIELD field_922 value F + FIELD comp_1895 value F METHOD (F)V ARG 1 value + METHOD comp_1895 value ()F METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_32448 create (F)Lnet/minecraft/class_44; ARG 0 value - CLASS class_5655 CustomSerializer - CLASS class_5656 Serializer diff --git a/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping b/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping index 6e50770a4c..394078b57b 100644 --- a/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping +++ b/mappings/net/minecraft/loot/provider/number/LootNumberProviderTypes.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_5659 net/minecraft/loot/provider/number/LootNumberProviderTypes - METHOD method_32455 createGsonSerializer ()Ljava/lang/Object; - METHOD method_32456 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5657; + METHOD method_32456 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5657; ARG 0 id - ARG 1 jsonSerializer diff --git a/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping index faac42bac6..66b08a8a12 100644 --- a/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/ScoreLootNumberProvider.mapping @@ -1,11 +1,14 @@ CLASS net/minecraft/class_5660 net/minecraft/loot/provider/number/ScoreLootNumberProvider - FIELD field_27925 target Lnet/minecraft/class_5670; - FIELD field_27926 score Ljava/lang/String; - FIELD field_27927 scale F + FIELD comp_1897 target Lnet/minecraft/class_5670; + FIELD comp_1898 score Ljava/lang/String; + FIELD comp_1899 scale F METHOD (Lnet/minecraft/class_5670;Ljava/lang/String;F)V ARG 1 target ARG 2 score ARG 3 scale + METHOD comp_1897 target ()Lnet/minecraft/class_5670; + METHOD comp_1898 score ()Ljava/lang/String; + METHOD comp_1899 scale ()F METHOD method_35569 create (Lnet/minecraft/class_47$class_50;Ljava/lang/String;)Lnet/minecraft/class_5660; ARG 0 target ARG 1 score @@ -13,4 +16,3 @@ CLASS net/minecraft/class_5660 net/minecraft/loot/provider/number/ScoreLootNumbe ARG 0 target ARG 1 score ARG 2 scale - CLASS class_5661 Serializer diff --git a/mappings/net/minecraft/loot/provider/number/UniformLootNumberProvider.mapping b/mappings/net/minecraft/loot/provider/number/UniformLootNumberProvider.mapping index 8c42daf341..35230abae8 100644 --- a/mappings/net/minecraft/loot/provider/number/UniformLootNumberProvider.mapping +++ b/mappings/net/minecraft/loot/provider/number/UniformLootNumberProvider.mapping @@ -1,10 +1,11 @@ CLASS net/minecraft/class_5662 net/minecraft/loot/provider/number/UniformLootNumberProvider - FIELD field_27928 min Lnet/minecraft/class_5658; - FIELD field_27929 max Lnet/minecraft/class_5658; + FIELD comp_1900 min Lnet/minecraft/class_5658; + FIELD comp_1901 max Lnet/minecraft/class_5658; METHOD (Lnet/minecraft/class_5658;Lnet/minecraft/class_5658;)V ARG 1 min ARG 2 max + METHOD comp_1900 min ()Lnet/minecraft/class_5658; + METHOD comp_1901 max ()Lnet/minecraft/class_5658; METHOD method_32462 create (FF)Lnet/minecraft/class_5662; ARG 0 min ARG 1 max - CLASS class_5663 Serializer diff --git a/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping b/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping index 93a7653295..d038b5b652 100644 --- a/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping +++ b/mappings/net/minecraft/loot/provider/score/ContextLootScoreProvider.mapping @@ -1,8 +1,7 @@ CLASS net/minecraft/class_5664 net/minecraft/loot/provider/score/ContextLootScoreProvider - FIELD field_27930 target Lnet/minecraft/class_47$class_50; + FIELD comp_1902 target Lnet/minecraft/class_47$class_50; METHOD (Lnet/minecraft/class_47$class_50;)V ARG 1 target + METHOD comp_1902 target ()Lnet/minecraft/class_47$class_50; METHOD method_35571 create (Lnet/minecraft/class_47$class_50;)Lnet/minecraft/class_5670; ARG 0 target - CLASS class_5665 CustomSerializer - CLASS class_5666 Serializer diff --git a/mappings/net/minecraft/loot/provider/score/FixedLootScoreProvider.mapping b/mappings/net/minecraft/loot/provider/score/FixedLootScoreProvider.mapping index 2a9b43e5e1..719ac9065a 100644 --- a/mappings/net/minecraft/loot/provider/score/FixedLootScoreProvider.mapping +++ b/mappings/net/minecraft/loot/provider/score/FixedLootScoreProvider.mapping @@ -1,8 +1,7 @@ CLASS net/minecraft/class_5667 net/minecraft/loot/provider/score/FixedLootScoreProvider - FIELD field_27931 name Ljava/lang/String; + FIELD comp_1903 name Ljava/lang/String; METHOD (Ljava/lang/String;)V ARG 1 name + METHOD comp_1903 name ()Ljava/lang/String; METHOD method_35572 create (Ljava/lang/String;)Lnet/minecraft/class_5670; ARG 0 name - METHOD method_35573 getName ()Ljava/lang/String; - CLASS class_5668 Serializer diff --git a/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping b/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping index fe837be4c7..d1b61536f7 100644 --- a/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping +++ b/mappings/net/minecraft/loot/provider/score/LootScoreProviderTypes.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_5671 net/minecraft/loot/provider/score/LootScoreProviderTypes - METHOD method_32478 createGsonSerializer ()Ljava/lang/Object; - METHOD method_32479 register (Ljava/lang/String;Lnet/minecraft/class_5335;)Lnet/minecraft/class_5669; + METHOD method_32479 register (Ljava/lang/String;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_5669; ARG 0 id - ARG 1 jsonSerializer diff --git a/mappings/net/minecraft/network/ClientConnection.mapping b/mappings/net/minecraft/network/ClientConnection.mapping index d89a7e2744..6b35a219f9 100644 --- a/mappings/net/minecraft/network/ClientConnection.mapping +++ b/mappings/net/minecraft/network/ClientConnection.mapping @@ -61,8 +61,7 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection METHOD method_10752 send (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;)V ARG 1 packet ARG 2 callbacks - METHOD method_10753 connect (Ljava/net/InetSocketAddress;Z)Lnet/minecraft/class_2535; - ARG 0 address + METHOD method_10753 connect (Ljava/net/InetSocketAddress;ZLnet/minecraft/class_8743;)Lnet/minecraft/class_2535; ARG 1 useEpoll METHOD method_10754 tick ()V METHOD method_10755 getAddress ()Ljava/net/SocketAddress; @@ -121,7 +120,7 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection ARG 0 marker METHOD method_45082 (Lnet/minecraft/class_7648;Lio/netty/util/concurrent/Future;)V ARG 2 future - METHOD method_48311 addHandlers (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;)V + METHOD method_48311 addHandlers (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;Lnet/minecraft/class_8762;)V ARG 0 pipeline ARG 1 side METHOD method_52271 connect (Ljava/net/InetSocketAddress;ZLnet/minecraft/class_2535;)Lio/netty/channel/ChannelFuture; @@ -170,11 +169,6 @@ CLASS net/minecraft/class_2535 net/minecraft/network/ClientConnection COMMENT @throws IllegalStateException if the listener was already set COMMENT @see #setPacketListener ARG 1 packetListener - METHOD method_52913 sendWithoutFlush (Lnet/minecraft/class_2596;)V - ARG 1 packet - METHOD method_52914 sendWithoutFlush (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;)V - ARG 1 packet - ARG 2 callbacks METHOD method_52915 flush ()V METHOD method_52916 addValidatorInternal (Lio/netty/channel/ChannelPipeline;Lnet/minecraft/class_2598;)V ARG 0 pipeline diff --git a/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping b/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping index 77f91e7580..ba57ac1718 100644 --- a/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping +++ b/mappings/net/minecraft/network/encryption/PlayerPublicKey.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_7428 net/minecraft/network/encryption/PlayerPublicKey FIELD field_39954 EXPIRED_PUBLIC_KEY_TEXT Lnet/minecraft/class_2561; FIELD field_39955 EXPIRATION_GRACE_PERIOD Ljava/time/Duration; FIELD field_39956 INVALID_PUBLIC_KEY_SIGNATURE_TEXT Lnet/minecraft/class_2561; - METHOD method_43550 verifyAndDecode (Lnet/minecraft/class_7500;Ljava/util/UUID;Lnet/minecraft/class_7428$class_7443;Ljava/time/Duration;)Lnet/minecraft/class_7428; + METHOD method_43550 verifyAndDecode (Lnet/minecraft/class_7500;Ljava/util/UUID;Lnet/minecraft/class_7428$class_7443;)Lnet/minecraft/class_7428; COMMENT Verifies the public key and decodes it. COMMENT COMMENT

The checks whether the public key is present, signed with the Mojang's private key, @@ -20,7 +20,6 @@ CLASS net/minecraft/class_7428 net/minecraft/network/encryption/PlayerPublicKey ARG 0 servicesSignatureVerifier ARG 1 playerUuid ARG 2 publicKeyData - ARG 3 gracePeriod METHOD method_43697 createSignatureInstance ()Lnet/minecraft/class_7500; CLASS class_7443 PublicKeyData FIELD field_39119 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/network/encryption/PublicPlayerSession.mapping b/mappings/net/minecraft/network/encryption/PublicPlayerSession.mapping index 4a71fbeb37..33d274240d 100644 --- a/mappings/net/minecraft/network/encryption/PublicPlayerSession.mapping +++ b/mappings/net/minecraft/network/encryption/PublicPlayerSession.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_7822 net/minecraft/network/encryption/PublicPlayerSession FIELD comp_1086 publicKeyData Lnet/minecraft/class_7428; METHOD comp_1086 publicKeyData ()Lnet/minecraft/class_7428; - METHOD method_46296 createVerifier ()Lnet/minecraft/class_7615; + METHOD method_46296 createVerifier (Ljava/time/Duration;)Lnet/minecraft/class_7615; METHOD method_46297 createUnpacker (Ljava/util/UUID;)Lnet/minecraft/class_7610$class_7611; ARG 1 sender METHOD method_46298 toSerialized ()Lnet/minecraft/class_7822$class_7823; @@ -9,10 +9,9 @@ CLASS net/minecraft/class_7822 net/minecraft/network/encryption/PublicPlayerSess CLASS class_7823 Serialized FIELD comp_1088 publicKeyData Lnet/minecraft/class_7428$class_7443; METHOD comp_1088 publicKeyData ()Lnet/minecraft/class_7428$class_7443; - METHOD method_46300 toSession (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7500;Ljava/time/Duration;)Lnet/minecraft/class_7822; + METHOD method_46300 toSession (Lcom/mojang/authlib/GameProfile;Lnet/minecraft/class_7500;)Lnet/minecraft/class_7822; ARG 1 gameProfile ARG 2 servicesSignatureVerifier - ARG 3 gracePeriod METHOD method_46301 fromBuf (Lnet/minecraft/class_2540;)Lnet/minecraft/class_7822$class_7823; ARG 0 buf METHOD method_46303 write (Lnet/minecraft/class_2540;Lnet/minecraft/class_7822$class_7823;)V diff --git a/mappings/net/minecraft/network/handler/SplitterHandler.mapping b/mappings/net/minecraft/network/handler/SplitterHandler.mapping index b07526f75f..531ac4faee 100644 --- a/mappings/net/minecraft/network/handler/SplitterHandler.mapping +++ b/mappings/net/minecraft/network/handler/SplitterHandler.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_2550 net/minecraft/network/handler/SplitterHandler METHOD decode (Lio/netty/channel/ChannelHandlerContext;Lio/netty/buffer/ByteBuf;Ljava/util/List;)V ARG 1 ctx ARG 2 buf - ARG 3 objects METHOD handlerRemoved0 (Lio/netty/channel/ChannelHandlerContext;)V ARG 1 context METHOD method_53022 shouldSplit (Lio/netty/buffer/ByteBuf;Lio/netty/buffer/ByteBuf;)Z diff --git a/mappings/net/minecraft/network/listener/ClientQueryPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientQueryPacketListener.mapping index dba61f832f..1dff90f79e 100644 --- a/mappings/net/minecraft/network/listener/ClientQueryPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientQueryPacketListener.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_2921 net/minecraft/network/listener/ClientQueryPacketListener - METHOD method_12666 onPong (Lnet/minecraft/class_2923;)V - ARG 1 packet METHOD method_12667 onResponse (Lnet/minecraft/class_2924;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerQueryPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerQueryPacketListener.mapping index c506f4ff0f..2d80316cf5 100644 --- a/mappings/net/minecraft/network/listener/ServerQueryPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerQueryPacketListener.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_2933 net/minecraft/network/listener/ServerQueryPacketListener - METHOD method_12697 onPing (Lnet/minecraft/class_2935;)V - ARG 1 packet METHOD method_12698 onRequest (Lnet/minecraft/class_2937;)V ARG 1 packet diff --git a/mappings/net/minecraft/network/message/MessageVerifier.mapping b/mappings/net/minecraft/network/message/MessageVerifier.mapping index c0eee9648a..b54c4bd294 100644 --- a/mappings/net/minecraft/network/message/MessageVerifier.mapping +++ b/mappings/net/minecraft/network/message/MessageVerifier.mapping @@ -7,15 +7,11 @@ CLASS net/minecraft/class_7615 net/minecraft/network/message/MessageVerifier FIELD field_40696 UNVERIFIED Lnet/minecraft/class_7615; METHOD method_45048 isVerified (Lnet/minecraft/class_7471;)Z ARG 1 message - METHOD method_46322 (Lnet/minecraft/class_7471;)Z - ARG 0 message - METHOD method_46323 (Lnet/minecraft/class_7471;)Z - ARG 0 message CLASS class_7616 Impl FIELD field_39821 lastMessageVerified Z FIELD field_39822 signatureVerifier Lnet/minecraft/class_7500; FIELD field_40697 lastVerifiedMessage Lnet/minecraft/class_7471; - METHOD (Lnet/minecraft/class_7500;)V + METHOD (Lnet/minecraft/class_7500;Ljava/util/function/BooleanSupplier;)V ARG 1 signatureVerifier METHOD method_44996 verifyPrecedingSignature (Lnet/minecraft/class_7471;)Z ARG 1 message diff --git a/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping index 8df56e034f..dafbf0b80e 100644 --- a/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/login/LoginQueryRequestS2CPacket.mapping @@ -6,7 +6,7 @@ CLASS net/minecraft/class_2899 net/minecraft/network/packet/s2c/login/LoginQuery METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf METHOD comp_1567 queryId ()I - METHOD method_52287 readPayload (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8597; + METHOD method_52287 readPayload (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8595; ARG 0 id ARG 1 buf METHOD method_52288 readUnknownPayload (Lnet/minecraft/class_2960;Lnet/minecraft/class_2540;)Lnet/minecraft/class_8597; diff --git a/mappings/net/minecraft/potion/Potion.mapping b/mappings/net/minecraft/potion/Potion.mapping index b175154e4c..c7dcaaa251 100644 --- a/mappings/net/minecraft/potion/Potion.mapping +++ b/mappings/net/minecraft/potion/Potion.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_1842 net/minecraft/potion/Potion FIELD field_8954 baseName Ljava/lang/String; FIELD field_8955 effects Lcom/google/common/collect/ImmutableList; METHOD (Ljava/lang/String;[Lnet/minecraft/class_1293;)V - ARG 1 baseName ARG 2 effects METHOD ([Lnet/minecraft/class_1293;)V ARG 1 effects diff --git a/mappings/net/minecraft/predicate/BlockPredicate.mapping b/mappings/net/minecraft/predicate/BlockPredicate.mapping index 28ae921c01..1245336241 100644 --- a/mappings/net/minecraft/predicate/BlockPredicate.mapping +++ b/mappings/net/minecraft/predicate/BlockPredicate.mapping @@ -1,36 +1,27 @@ CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate - FIELD field_20692 ANY Lnet/minecraft/class_4550; - FIELD field_20693 tag Lnet/minecraft/class_6862; - FIELD field_20694 blocks Ljava/util/Set; - FIELD field_20695 state Lnet/minecraft/class_4559; - FIELD field_20696 nbt Lnet/minecraft/class_2105; - METHOD (Lnet/minecraft/class_6862;Ljava/util/Set;Lnet/minecraft/class_4559;Lnet/minecraft/class_2105;)V - ARG 1 tag - ARG 2 blocks - ARG 3 state - ARG 4 nbt - METHOD method_22452 toJson ()Lcom/google/gson/JsonElement; - METHOD method_22453 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4550; - ARG 0 json + FIELD comp_1731 tag Ljava/util/Optional; + FIELD comp_1732 blocks Ljava/util/Optional; + FIELD comp_1733 state Ljava/util/Optional; + FIELD comp_1734 nbt Ljava/util/Optional; + METHOD comp_1731 tag ()Ljava/util/Optional; + METHOD comp_1732 blocks ()Ljava/util/Optional; + METHOD comp_1733 state ()Ljava/util/Optional; + METHOD comp_1734 nbt ()Ljava/util/Optional; METHOD method_22454 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos - METHOD method_33185 (Lnet/minecraft/class_2960;)Lcom/google/gson/JsonSyntaxException; - ARG 0 id CLASS class_4710 Builder - FIELD field_21572 blocks Ljava/util/Set; - FIELD field_21573 tag Lnet/minecraft/class_6862; - FIELD field_21574 state Lnet/minecraft/class_4559; - FIELD field_21575 nbt Lnet/minecraft/class_2105; + FIELD field_21572 blocks Ljava/util/Optional; + FIELD field_21573 tag Ljava/util/Optional; + FIELD field_21574 state Ljava/util/Optional; + FIELD field_21575 nbt Ljava/util/Optional; METHOD method_23880 create ()Lnet/minecraft/class_4550$class_4710; - METHOD method_23882 build ()Lnet/minecraft/class_4550; + METHOD method_23882 build ()Ljava/util/Optional; METHOD method_27962 blocks ([Lnet/minecraft/class_2248;)Lnet/minecraft/class_4550$class_4710; ARG 1 blocks - METHOD method_27963 state (Lnet/minecraft/class_4559;)Lnet/minecraft/class_4550$class_4710; - ARG 1 state + METHOD method_27963 state (Lnet/minecraft/class_4559$class_4560;)Lnet/minecraft/class_4550$class_4710; METHOD method_29233 tag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_4550$class_4710; ARG 1 tag METHOD method_35042 nbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_4550$class_4710; ARG 1 nbt - METHOD method_37214 blocks (Ljava/lang/Iterable;)Lnet/minecraft/class_4550$class_4710; - ARG 1 blocks + METHOD method_37214 blocks (Ljava/util/Collection;)Lnet/minecraft/class_4550$class_4710; diff --git a/mappings/net/minecraft/predicate/DamagePredicate.mapping b/mappings/net/minecraft/predicate/DamagePredicate.mapping index 6a4552121d..7651778a30 100644 --- a/mappings/net/minecraft/predicate/DamagePredicate.mapping +++ b/mappings/net/minecraft/predicate/DamagePredicate.mapping @@ -1,30 +1,29 @@ CLASS net/minecraft/class_2019 net/minecraft/predicate/DamagePredicate - FIELD field_9520 ANY Lnet/minecraft/class_2019; - FIELD field_9521 sourceEntity Lnet/minecraft/class_2048; - FIELD field_9522 blocked Ljava/lang/Boolean; - FIELD field_9523 dealt Lnet/minecraft/class_2096$class_2099; - FIELD field_9524 taken Lnet/minecraft/class_2096$class_2099; - FIELD field_9525 type Lnet/minecraft/class_2022; - METHOD (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2048;Ljava/lang/Boolean;Lnet/minecraft/class_2022;)V + FIELD comp_1735 dealt Lnet/minecraft/class_2096$class_2099; + FIELD comp_1736 taken Lnet/minecraft/class_2096$class_2099; + FIELD comp_1737 sourceEntity Ljava/util/Optional; + FIELD comp_1738 blocked Ljava/util/Optional; + FIELD comp_1739 type Ljava/util/Optional; + METHOD (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 dealt ARG 2 taken - ARG 3 sourceEntity - ARG 4 blocked - ARG 5 type + METHOD comp_1735 dealt ()Lnet/minecraft/class_2096$class_2099; + METHOD comp_1736 taken ()Lnet/minecraft/class_2096$class_2099; + METHOD comp_1737 sourceEntity ()Ljava/util/Optional; + METHOD comp_1738 blocked ()Ljava/util/Optional; + METHOD comp_1739 type ()Ljava/util/Optional; METHOD method_8838 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;FFZ)Z - ARG 1 player - ARG 2 source ARG 3 dealt ARG 4 taken ARG 5 blocked - METHOD method_8839 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2019; + METHOD method_8839 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 json METHOD method_8840 toJson ()Lcom/google/gson/JsonElement; CLASS class_2020 Builder - FIELD field_9526 blocked Ljava/lang/Boolean; + FIELD field_9526 blocked Ljava/util/Optional; FIELD field_9527 taken Lnet/minecraft/class_2096$class_2099; - FIELD field_9528 sourceEntity Lnet/minecraft/class_2048; - FIELD field_9529 type Lnet/minecraft/class_2022; + FIELD field_9528 sourceEntity Ljava/util/Optional; + FIELD field_9529 type Ljava/util/Optional; FIELD field_9530 dealt Lnet/minecraft/class_2096$class_2099; METHOD method_35116 type (Lnet/minecraft/class_2022;)Lnet/minecraft/class_2019$class_2020; ARG 1 type @@ -38,5 +37,5 @@ CLASS net/minecraft/class_2019 net/minecraft/predicate/DamagePredicate ARG 1 blocked METHOD method_8842 type (Lnet/minecraft/class_2022$class_2023;)Lnet/minecraft/class_2019$class_2020; ARG 1 builder - METHOD method_8843 build ()Lnet/minecraft/class_2019; + METHOD method_8843 build ()Ljava/util/Optional; METHOD method_8844 create ()Lnet/minecraft/class_2019$class_2020; diff --git a/mappings/net/minecraft/predicate/FluidPredicate.mapping b/mappings/net/minecraft/predicate/FluidPredicate.mapping index 1044698515..23cce57b85 100644 --- a/mappings/net/minecraft/predicate/FluidPredicate.mapping +++ b/mappings/net/minecraft/predicate/FluidPredicate.mapping @@ -1,22 +1,17 @@ CLASS net/minecraft/class_4551 net/minecraft/predicate/FluidPredicate - FIELD field_20708 ANY Lnet/minecraft/class_4551; - FIELD field_20709 tag Lnet/minecraft/class_6862; - FIELD field_20710 fluid Lnet/minecraft/class_3611; - FIELD field_20711 state Lnet/minecraft/class_4559; - METHOD (Lnet/minecraft/class_6862;Lnet/minecraft/class_3611;Lnet/minecraft/class_4559;)V - ARG 1 tag - ARG 2 fluid - ARG 3 state - METHOD method_22473 toJson ()Lcom/google/gson/JsonElement; - METHOD method_22474 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4551; - ARG 0 json + FIELD comp_1780 tag Ljava/util/Optional; + FIELD comp_1781 fluid Ljava/util/Optional; + FIELD comp_1782 state Ljava/util/Optional; + METHOD comp_1780 tag ()Ljava/util/Optional; + METHOD comp_1781 fluid ()Ljava/util/Optional; + METHOD comp_1782 state ()Ljava/util/Optional; METHOD method_22475 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos CLASS class_6079 Builder - FIELD field_30912 fluid Lnet/minecraft/class_3611; - FIELD field_30913 tag Lnet/minecraft/class_6862; - FIELD field_30914 state Lnet/minecraft/class_4559; + FIELD field_30912 fluid Ljava/util/Optional; + FIELD field_30913 tag Ljava/util/Optional; + FIELD field_30914 state Ljava/util/Optional; METHOD method_35221 create ()Lnet/minecraft/class_4551$class_6079; METHOD method_35222 tag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_4551$class_6079; ARG 1 tag @@ -24,4 +19,4 @@ CLASS net/minecraft/class_4551 net/minecraft/predicate/FluidPredicate ARG 1 state METHOD method_35224 fluid (Lnet/minecraft/class_3611;)Lnet/minecraft/class_4551$class_6079; ARG 1 fluid - METHOD method_35225 build ()Lnet/minecraft/class_4551; + METHOD method_35225 build ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/LightPredicate.mapping b/mappings/net/minecraft/predicate/LightPredicate.mapping index 6c1508c259..6b4b0b44e2 100644 --- a/mappings/net/minecraft/predicate/LightPredicate.mapping +++ b/mappings/net/minecraft/predicate/LightPredicate.mapping @@ -1,11 +1,8 @@ CLASS net/minecraft/class_4552 net/minecraft/predicate/LightPredicate - FIELD field_20712 ANY Lnet/minecraft/class_4552; - FIELD field_20713 range Lnet/minecraft/class_2096$class_2100; + FIELD comp_1791 range Lnet/minecraft/class_2096$class_2100; METHOD (Lnet/minecraft/class_2096$class_2100;)V ARG 1 range - METHOD method_22481 toJson ()Lcom/google/gson/JsonElement; - METHOD method_22482 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4552; - ARG 0 json + METHOD comp_1791 range ()Lnet/minecraft/class_2096$class_2100; METHOD method_22483 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z ARG 1 world ARG 2 pos @@ -14,4 +11,4 @@ CLASS net/minecraft/class_4552 net/minecraft/predicate/LightPredicate METHOD method_35271 create ()Lnet/minecraft/class_4552$class_6087; METHOD method_35272 light (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_4552$class_6087; ARG 1 light - METHOD method_35273 build ()Lnet/minecraft/class_4552; + METHOD method_35273 build ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/NbtPredicate.mapping b/mappings/net/minecraft/predicate/NbtPredicate.mapping index 5ead80183f..14ecf06329 100644 --- a/mappings/net/minecraft/predicate/NbtPredicate.mapping +++ b/mappings/net/minecraft/predicate/NbtPredicate.mapping @@ -1,15 +1,12 @@ CLASS net/minecraft/class_2105 net/minecraft/predicate/NbtPredicate - FIELD field_9715 nbt Lnet/minecraft/class_2487; - FIELD field_9716 ANY Lnet/minecraft/class_2105; + FIELD comp_1816 nbt Lnet/minecraft/class_2487; METHOD (Lnet/minecraft/class_2487;)V ARG 1 nbt + METHOD comp_1816 nbt ()Lnet/minecraft/class_2487; METHOD method_9072 test (Lnet/minecraft/class_1297;)Z ARG 1 entity - METHOD method_9073 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2105; - ARG 0 json METHOD method_9074 test (Lnet/minecraft/class_1799;)Z ARG 1 stack - METHOD method_9075 toJson ()Lcom/google/gson/JsonElement; METHOD method_9076 entityToNbt (Lnet/minecraft/class_1297;)Lnet/minecraft/class_2487; ARG 0 entity METHOD method_9077 test (Lnet/minecraft/class_2520;)Z diff --git a/mappings/net/minecraft/predicate/NumberRange.mapping b/mappings/net/minecraft/predicate/NumberRange.mapping index 87cf0a9735..b81c0daf27 100644 --- a/mappings/net/minecraft/predicate/NumberRange.mapping +++ b/mappings/net/minecraft/predicate/NumberRange.mapping @@ -1,29 +1,15 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange - FIELD field_9699 max Ljava/lang/Number; FIELD field_9700 EXCEPTION_EMPTY Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; FIELD field_9701 EXCEPTION_SWAPPED Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; - FIELD field_9702 min Ljava/lang/Number; - METHOD (Ljava/lang/Number;Ljava/lang/Number;)V - ARG 1 min - ARG 2 max - METHOD method_9035 map (Ljava/lang/Object;Ljava/util/function/Function;)Ljava/lang/Object; - ARG 0 object - ARG 1 function - METHOD method_9036 toJson ()Lcom/google/gson/JsonElement; - METHOD method_9037 fromStringReader (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;Ljava/util/function/Supplier;)Ljava/lang/Number; + METHOD comp_1805 getMin ()Ljava/util/Optional; + METHOD comp_1806 getMax ()Ljava/util/Optional; + METHOD method_9037 fromStringReader (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;Ljava/util/function/Supplier;)Ljava/util/Optional; ARG 0 reader ARG 1 converter ARG 2 exceptionTypeSupplier - METHOD method_9038 getMin ()Ljava/lang/Number; - METHOD method_9039 fromJson (Lcom/google/gson/JsonElement;Lnet/minecraft/class_2096;Ljava/util/function/BiFunction;Lnet/minecraft/class_2096$class_2097;)Lnet/minecraft/class_2096; - ARG 0 json - ARG 1 fallback - ARG 2 asNumber - ARG 3 factory METHOD method_9040 isNextCharValid (Lcom/mojang/brigadier/StringReader;)Z ARG 0 reader METHOD method_9041 isDummy ()Z - METHOD method_9042 getMax ()Ljava/lang/Number; METHOD method_9043 parse (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_2096$class_2098;Ljava/util/function/Function;Ljava/util/function/Supplier;Ljava/util/function/Function;)Lnet/minecraft/class_2096; ARG 0 commandReader ARG 1 commandFactory @@ -31,21 +17,17 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange ARG 3 exceptionTypeSupplier ARG 4 mapper CLASS class_2097 Factory - METHOD create (Ljava/lang/Number;Ljava/lang/Number;)Lnet/minecraft/class_2096; - ARG 1 min - ARG 2 max CLASS class_2098 CommandFactory - METHOD create (Lcom/mojang/brigadier/StringReader;Ljava/lang/Number;Ljava/lang/Number;)Lnet/minecraft/class_2096; + METHOD create (Lcom/mojang/brigadier/StringReader;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2096; ARG 1 reader - ARG 2 min - ARG 3 max CLASS class_2099 FloatRange - FIELD field_9703 squaredMin Ljava/lang/Double; - FIELD field_9704 squaredMax Ljava/lang/Double; + FIELD comp_1805 getMin Ljava/util/Optional; + FIELD comp_1806 getMax Ljava/util/Optional; + FIELD comp_1807 squaredMin Ljava/util/Optional; + FIELD comp_1808 squaredMax Ljava/util/Optional; FIELD field_9705 ANY Lnet/minecraft/class_2096$class_2099; - METHOD (Ljava/lang/Double;Ljava/lang/Double;)V - ARG 1 min - ARG 2 max + METHOD comp_1807 squaredMin ()Ljava/util/Optional; + METHOD comp_1808 squaredMax ()Ljava/util/Optional; METHOD method_35284 exactly (D)Lnet/minecraft/class_2096$class_2099; ARG 0 value METHOD method_35285 between (DD)Lnet/minecraft/class_2096$class_2099; @@ -53,14 +35,11 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange ARG 2 max METHOD method_35286 atMost (D)Lnet/minecraft/class_2096$class_2099; ARG 0 value - METHOD method_9044 square (Ljava/lang/Double;)Ljava/lang/Double; - ARG 0 value + METHOD method_9044 square (Ljava/util/Optional;)Ljava/util/Optional; METHOD method_9045 testSqrt (D)Z ARG 1 value - METHOD method_9046 create (Lcom/mojang/brigadier/StringReader;Ljava/lang/Double;Ljava/lang/Double;)Lnet/minecraft/class_2096$class_2099; + METHOD method_9046 create (Lcom/mojang/brigadier/StringReader;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2096$class_2099; ARG 0 reader - ARG 1 min - ARG 2 max METHOD method_9047 test (D)Z ARG 1 value METHOD method_9048 parse (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;)Lnet/minecraft/class_2096$class_2099; @@ -75,12 +54,13 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange METHOD method_9052 (Ljava/lang/Double;)Ljava/lang/Double; ARG 0 value CLASS class_2100 IntRange - FIELD field_9706 minSquared Ljava/lang/Long; - FIELD field_9707 maxSquared Ljava/lang/Long; + FIELD comp_1805 getMin Ljava/util/Optional; + FIELD comp_1806 getMax Ljava/util/Optional; + FIELD comp_1809 minSquared Ljava/util/Optional; + FIELD comp_1810 maxSquared Ljava/util/Optional; FIELD field_9708 ANY Lnet/minecraft/class_2096$class_2100; - METHOD (Ljava/lang/Integer;Ljava/lang/Integer;)V - ARG 1 min - ARG 2 max + METHOD comp_1809 minSquared ()Ljava/util/Optional; + METHOD comp_1810 maxSquared ()Ljava/util/Optional; METHOD method_35287 between (II)Lnet/minecraft/class_2096$class_2100; ARG 0 min ARG 1 max @@ -92,10 +72,8 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange ARG 0 value METHOD method_9054 test (I)Z ARG 1 value - METHOD method_9055 parse (Lcom/mojang/brigadier/StringReader;Ljava/lang/Integer;Ljava/lang/Integer;)Lnet/minecraft/class_2096$class_2100; + METHOD method_9055 parse (Lcom/mojang/brigadier/StringReader;Ljava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_2096$class_2100; ARG 0 reader - ARG 1 min - ARG 2 max METHOD method_9056 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2096$class_2100; ARG 0 element METHOD method_9057 fromStringReader (Lcom/mojang/brigadier/StringReader;Ljava/util/function/Function;)Lnet/minecraft/class_2096$class_2100; @@ -103,8 +81,7 @@ CLASS net/minecraft/class_2096 net/minecraft/predicate/NumberRange ARG 1 converter METHOD method_9058 exactly (I)Lnet/minecraft/class_2096$class_2100; ARG 0 value - METHOD method_9059 squared (Ljava/lang/Integer;)Ljava/lang/Long; - ARG 0 value + METHOD method_9059 squared (Ljava/util/Optional;)Ljava/util/Optional; METHOD method_9060 parse (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_2096$class_2100; ARG 0 reader METHOD method_9061 (Ljava/lang/Integer;)Ljava/lang/Integer; diff --git a/mappings/net/minecraft/predicate/StatePredicate.mapping b/mappings/net/minecraft/predicate/StatePredicate.mapping index b44598205a..66e4a06681 100644 --- a/mappings/net/minecraft/predicate/StatePredicate.mapping +++ b/mappings/net/minecraft/predicate/StatePredicate.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_4559 net/minecraft/predicate/StatePredicate - FIELD field_20736 ANY Lnet/minecraft/class_4559; - FIELD field_20737 conditions Ljava/util/List; + FIELD comp_1830 conditions Ljava/util/List; METHOD (Ljava/util/List;)V ARG 1 conditions + METHOD comp_1830 conditions ()Ljava/util/List; METHOD method_22513 toJson ()Lcom/google/gson/JsonElement; METHOD method_22514 test (Lnet/minecraft/class_2680;)Z ARG 1 state @@ -16,17 +16,10 @@ CLASS net/minecraft/class_4559 net/minecraft/predicate/StatePredicate ARG 2 condition METHOD method_22518 test (Lnet/minecraft/class_3610;)Z ARG 1 state - METHOD method_22519 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4559; - ARG 0 json - METHOD method_22520 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_4559$class_4562;)V - ARG 1 condition - METHOD method_22521 createPredicate (Ljava/lang/String;Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4559$class_4562; - ARG 0 key - ARG 1 json - METHOD method_22522 asNullableString (Lcom/google/gson/JsonElement;)Ljava/lang/String; + METHOD method_22519 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 json CLASS class_4560 Builder - FIELD field_20738 conditions Ljava/util/List; + FIELD field_20738 conditions Lcom/google/common/collect/ImmutableList$Builder; METHOD method_22523 create ()Lnet/minecraft/class_4559$class_4560; METHOD method_22524 exactMatch (Lnet/minecraft/class_2769;I)Lnet/minecraft/class_4559$class_4560; ARG 1 property @@ -40,31 +33,24 @@ CLASS net/minecraft/class_4559 net/minecraft/predicate/StatePredicate METHOD method_22527 exactMatch (Lnet/minecraft/class_2769;Z)Lnet/minecraft/class_4559$class_4560; ARG 1 property ARG 2 value - METHOD method_22528 build ()Lnet/minecraft/class_4559; + METHOD method_22528 build ()Ljava/util/Optional; CLASS class_4561 ExactValueCondition - FIELD field_20739 value Ljava/lang/String; - METHOD (Ljava/lang/String;Ljava/lang/String;)V - ARG 1 key - ARG 2 value - CLASS class_4562 Condition - FIELD field_20740 key Ljava/lang/String; + FIELD comp_1831 value Ljava/lang/String; METHOD (Ljava/lang/String;)V ARG 1 key - METHOD method_22529 toJson ()Lcom/google/gson/JsonElement; + METHOD comp_1831 value ()Ljava/lang/String; + CLASS class_4562 Condition + FIELD comp_1832 key Ljava/lang/String; + METHOD (Ljava/lang/String;Lnet/minecraft/class_4559$class_8750;)V + ARG 1 key + METHOD comp_1832 key ()Ljava/lang/String; METHOD method_22530 test (Lnet/minecraft/class_2689;Lnet/minecraft/class_2688;)Z ARG 1 stateManager ARG 2 state - METHOD method_22531 reportMissing (Lnet/minecraft/class_2689;Ljava/util/function/Consumer;)V + METHOD method_22531 reportMissing (Lnet/minecraft/class_2689;)Ljava/util/Optional; ARG 1 factory - ARG 2 reporter - METHOD method_22532 test (Lnet/minecraft/class_2688;Lnet/minecraft/class_2769;)Z - ARG 1 state - ARG 2 property - METHOD method_22533 getKey ()Ljava/lang/String; CLASS class_4563 RangedValueCondition - FIELD field_20741 min Ljava/lang/String; - FIELD field_20742 max Ljava/lang/String; - METHOD (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V - ARG 1 key - ARG 2 min - ARG 3 max + FIELD comp_1834 min Ljava/util/Optional; + FIELD comp_1835 max Ljava/util/Optional; + METHOD comp_1834 min ()Ljava/util/Optional; + METHOD comp_1835 max ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/TagPredicate.mapping b/mappings/net/minecraft/predicate/TagPredicate.mapping index 2756c21e74..01ebc53785 100644 --- a/mappings/net/minecraft/predicate/TagPredicate.mapping +++ b/mappings/net/minecraft/predicate/TagPredicate.mapping @@ -1,15 +1,13 @@ CLASS net/minecraft/class_8129 net/minecraft/predicate/TagPredicate - FIELD field_42477 tag Lnet/minecraft/class_6862; - FIELD field_42478 expected Z + FIELD comp_1836 tag Lnet/minecraft/class_6862; + FIELD comp_1837 expected Z METHOD (Lnet/minecraft/class_6862;Z)V ARG 1 tag ARG 2 expected - METHOD method_48964 toJson ()Lcom/google/gson/JsonElement; + METHOD comp_1836 tag ()Lnet/minecraft/class_6862; + METHOD comp_1837 expected ()Z METHOD method_48965 expected (Lnet/minecraft/class_6862;)Lnet/minecraft/class_8129; ARG 0 tag - METHOD method_48966 fromJson (Lcom/google/gson/JsonElement;Lnet/minecraft/class_5321;)Lnet/minecraft/class_8129; - ARG 0 json - ARG 1 registry METHOD method_48967 test (Lnet/minecraft/class_6880;)Z ARG 1 registryEntry METHOD method_48968 unexpected (Lnet/minecraft/class_6862;)Lnet/minecraft/class_8129; diff --git a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping index ac5e714e09..0b60bb3f7a 100644 --- a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping +++ b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer.mapping @@ -1,13 +1,12 @@ CLASS net/minecraft/class_5257 net/minecraft/predicate/entity/AdvancementEntityPredicateDeserializer FIELD field_24383 LOGGER Lorg/slf4j/Logger; FIELD field_24384 advancementId Lnet/minecraft/class_2960; - FIELD field_24386 gson Lcom/google/gson/Gson; FIELD field_44474 lootManager Lnet/minecraft/class_60; METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_60;)V ARG 1 advancementId ARG 2 lootManager METHOD method_27795 getAdvancementId ()Lnet/minecraft/class_2960; - METHOD method_27796 loadConditions (Lcom/google/gson/JsonArray;Ljava/lang/String;Lnet/minecraft/class_176;)[Lnet/minecraft/class_5341; + METHOD method_27796 loadConditions (Lcom/google/gson/JsonArray;Ljava/lang/String;Lnet/minecraft/class_176;)Ljava/util/List; ARG 1 array ARG 2 key ARG 3 contextType diff --git a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer.mapping b/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer.mapping deleted file mode 100644 index 6ab091f11c..0000000000 --- a/mappings/net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_5267 net/minecraft/predicate/entity/AdvancementEntityPredicateSerializer - FIELD field_24420 INSTANCE Lnet/minecraft/class_5267; - FIELD field_24421 gson Lcom/google/gson/Gson; - METHOD method_27849 conditionsToJson ([Lnet/minecraft/class_5341;)Lcom/google/gson/JsonElement; - ARG 1 conditions diff --git a/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping index c2341dd7c6..501cb61796 100644 --- a/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/DamageSourcePredicate.mapping @@ -1,17 +1,15 @@ CLASS net/minecraft/class_2022 net/minecraft/predicate/entity/DamageSourcePredicate - FIELD field_42272 tagPredicates Ljava/util/List; - FIELD field_9533 EMPTY Lnet/minecraft/class_2022; - FIELD field_9534 directEntity Lnet/minecraft/class_2048; - FIELD field_9539 sourceEntity Lnet/minecraft/class_2048; - METHOD (Ljava/util/List;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;)V + FIELD comp_1740 tagPredicates Ljava/util/List; + FIELD comp_1741 directEntity Ljava/util/Optional; + FIELD comp_1742 sourceEntity Ljava/util/Optional; + METHOD (Ljava/util/List;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 tagPredicates - ARG 2 directEntity - ARG 3 sourceEntity + METHOD comp_1740 tagPredicates ()Ljava/util/List; + METHOD comp_1741 directEntity ()Ljava/util/Optional; + METHOD comp_1742 sourceEntity ()Ljava/util/Optional; METHOD method_8845 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1282;)Z - ARG 1 world - ARG 2 pos ARG 3 damageSource - METHOD method_8846 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2022; + METHOD method_8846 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 json METHOD method_8847 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1282;)Z ARG 1 player @@ -19,17 +17,13 @@ CLASS net/minecraft/class_2022 net/minecraft/predicate/entity/DamageSourcePredic METHOD method_8848 toJson ()Lcom/google/gson/JsonElement; CLASS class_2023 Builder FIELD field_42273 tagPredicates Lcom/google/common/collect/ImmutableList$Builder; - FIELD field_9544 directEntity Lnet/minecraft/class_2048; - FIELD field_9545 sourceEntity Lnet/minecraft/class_2048; - METHOD method_35130 directEntity (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2022$class_2023; - ARG 1 entity + FIELD field_9544 directEntity Ljava/util/Optional; + FIELD field_9545 sourceEntity Ljava/util/Optional; METHOD method_35131 sourceEntity (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2022$class_2023; ARG 1 entity - METHOD method_35132 sourceEntity (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2022$class_2023; - ARG 1 entity METHOD method_48785 tag (Lnet/minecraft/class_8129;)Lnet/minecraft/class_2022$class_2023; ARG 1 tagPredicate - METHOD method_8851 build ()Lnet/minecraft/class_2022; + METHOD method_8851 build ()Ljava/util/Optional; METHOD method_8854 directEntity (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2022$class_2023; ARG 1 entity METHOD method_8855 create ()Lnet/minecraft/class_2022$class_2023; diff --git a/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping b/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping index 1e60e9f191..f2489a09d8 100644 --- a/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/DistancePredicate.mapping @@ -1,21 +1,25 @@ CLASS net/minecraft/class_2025 net/minecraft/predicate/entity/DistancePredicate - FIELD field_9552 z Lnet/minecraft/class_2096$class_2099; - FIELD field_9553 ANY Lnet/minecraft/class_2025; - FIELD field_9554 x Lnet/minecraft/class_2096$class_2099; - FIELD field_9555 y Lnet/minecraft/class_2096$class_2099; - FIELD field_9556 absolute Lnet/minecraft/class_2096$class_2099; - FIELD field_9557 horizontal Lnet/minecraft/class_2096$class_2099; + FIELD comp_1743 x Lnet/minecraft/class_2096$class_2099; + FIELD comp_1744 y Lnet/minecraft/class_2096$class_2099; + FIELD comp_1745 z Lnet/minecraft/class_2096$class_2099; + FIELD comp_1746 horizontal Lnet/minecraft/class_2096$class_2099; + FIELD comp_1747 absolute Lnet/minecraft/class_2096$class_2099; METHOD (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;)V ARG 1 x ARG 2 y ARG 3 z ARG 4 horizontal ARG 5 absolute + METHOD comp_1743 x ()Lnet/minecraft/class_2096$class_2099; + METHOD comp_1744 y ()Lnet/minecraft/class_2096$class_2099; + METHOD comp_1745 z ()Lnet/minecraft/class_2096$class_2099; + METHOD comp_1746 horizontal ()Lnet/minecraft/class_2096$class_2099; + METHOD comp_1747 absolute ()Lnet/minecraft/class_2096$class_2099; METHOD method_37223 absolute (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2025; ARG 0 absolute METHOD method_8856 y (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2025; ARG 0 y - METHOD method_8857 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2025; + METHOD method_8857 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 json METHOD method_8858 toJson ()Lcom/google/gson/JsonElement; METHOD method_8859 test (DDDDDD)Z diff --git a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping index 7d0ccf9dcb..45ea7654e2 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEffectPredicate.mapping @@ -1,35 +1,28 @@ CLASS net/minecraft/class_2102 net/minecraft/predicate/entity/EntityEffectPredicate - FIELD field_9709 EMPTY Lnet/minecraft/class_2102; - FIELD field_9710 effects Ljava/util/Map; + FIELD comp_1811 effects Ljava/util/Map; METHOD (Ljava/util/Map;)V ARG 1 effects - METHOD method_35290 withEffect (Lnet/minecraft/class_1291;Lnet/minecraft/class_2102$class_2103;)Lnet/minecraft/class_2102; - ARG 1 statusEffect - ARG 2 data + METHOD comp_1811 effects ()Ljava/util/Map; METHOD method_9062 test (Lnet/minecraft/class_1297;)Z ARG 1 entity METHOD method_9063 test (Ljava/util/Map;)Z ARG 1 effects - METHOD method_9064 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2102; + METHOD method_9064 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 json - METHOD method_9065 withEffect (Lnet/minecraft/class_1291;)Lnet/minecraft/class_2102; - ARG 1 statusEffect - METHOD method_9066 create ()Lnet/minecraft/class_2102; METHOD method_9067 test (Lnet/minecraft/class_1309;)Z ARG 1 livingEntity METHOD method_9068 toJson ()Lcom/google/gson/JsonElement; CLASS class_2103 EffectData - FIELD field_9711 amplifier Lnet/minecraft/class_2096$class_2100; - FIELD field_9712 visible Ljava/lang/Boolean; - FIELD field_9713 duration Lnet/minecraft/class_2096$class_2100; - FIELD field_9714 ambient Ljava/lang/Boolean; - METHOD (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Ljava/lang/Boolean;Ljava/lang/Boolean;)V + FIELD comp_1812 amplifier Lnet/minecraft/class_2096$class_2100; + FIELD comp_1813 duration Lnet/minecraft/class_2096$class_2100; + FIELD comp_1814 ambient Ljava/util/Optional; + FIELD comp_1815 visible Ljava/util/Optional; + METHOD (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 amplifier ARG 2 duration - ARG 3 ambient - ARG 4 visible + METHOD comp_1812 amplifier ()Lnet/minecraft/class_2096$class_2100; + METHOD comp_1813 duration ()Lnet/minecraft/class_2096$class_2100; + METHOD comp_1814 ambient ()Ljava/util/Optional; + METHOD comp_1815 visible ()Ljava/util/Optional; METHOD method_9069 test (Lnet/minecraft/class_1293;)Z ARG 1 statusEffectInstance - METHOD method_9070 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2102$class_2103; - ARG 0 json - METHOD method_9071 toJson ()Lcom/google/gson/JsonElement; diff --git a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping index 528f4d9bba..6ff41670bf 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping @@ -1,42 +1,30 @@ CLASS net/minecraft/class_3735 net/minecraft/predicate/entity/EntityEquipmentPredicate - FIELD field_16483 head Lnet/minecraft/class_2073; - FIELD field_16484 offhand Lnet/minecraft/class_2073; - FIELD field_16485 ANY Lnet/minecraft/class_3735; - FIELD field_16486 mainhand Lnet/minecraft/class_2073; - FIELD field_16487 chest Lnet/minecraft/class_2073; - FIELD field_16488 legs Lnet/minecraft/class_2073; - FIELD field_16489 feet Lnet/minecraft/class_2073; + FIELD comp_1750 head Ljava/util/Optional; + FIELD comp_1751 chest Ljava/util/Optional; + FIELD comp_1752 legs Ljava/util/Optional; + FIELD comp_1753 feet Ljava/util/Optional; + FIELD comp_1754 mainhand Ljava/util/Optional; + FIELD comp_1755 offhand Ljava/util/Optional; FIELD field_19240 OMINOUS_BANNER_ON_HEAD Lnet/minecraft/class_3735; - METHOD (Lnet/minecraft/class_2073;Lnet/minecraft/class_2073;Lnet/minecraft/class_2073;Lnet/minecraft/class_2073;Lnet/minecraft/class_2073;Lnet/minecraft/class_2073;)V - ARG 1 head - ARG 2 chest - ARG 3 legs - ARG 4 feet - ARG 5 mainhand - ARG 6 offhand - METHOD method_16224 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_3735; - ARG 0 json - METHOD method_16225 toJson ()Lcom/google/gson/JsonElement; + METHOD comp_1750 head ()Ljava/util/Optional; + METHOD comp_1751 chest ()Ljava/util/Optional; + METHOD comp_1752 legs ()Ljava/util/Optional; + METHOD comp_1753 feet ()Ljava/util/Optional; + METHOD comp_1754 mainhand ()Ljava/util/Optional; + METHOD comp_1755 offhand ()Ljava/util/Optional; METHOD method_16226 test (Lnet/minecraft/class_1297;)Z - ARG 1 entity CLASS class_5278 Builder - FIELD field_24482 head Lnet/minecraft/class_2073; - FIELD field_24483 chest Lnet/minecraft/class_2073; - FIELD field_24484 legs Lnet/minecraft/class_2073; - FIELD field_24485 feet Lnet/minecraft/class_2073; - FIELD field_24486 mainhand Lnet/minecraft/class_2073; - FIELD field_24487 offhand Lnet/minecraft/class_2073; + FIELD field_24482 head Ljava/util/Optional; + FIELD field_24483 chest Ljava/util/Optional; + FIELD field_24484 legs Ljava/util/Optional; + FIELD field_24485 feet Ljava/util/Optional; + FIELD field_24486 mainhand Ljava/util/Optional; + FIELD field_24487 offhand Ljava/util/Optional; METHOD method_27965 create ()Lnet/minecraft/class_3735$class_5278; - METHOD method_27966 head (Lnet/minecraft/class_2073;)Lnet/minecraft/class_3735$class_5278; - ARG 1 head - METHOD method_27967 build ()Lnet/minecraft/class_3735; - METHOD method_27968 chest (Lnet/minecraft/class_2073;)Lnet/minecraft/class_3735$class_5278; - ARG 1 chest - METHOD method_27969 legs (Lnet/minecraft/class_2073;)Lnet/minecraft/class_3735$class_5278; - ARG 1 legs - METHOD method_27970 feet (Lnet/minecraft/class_2073;)Lnet/minecraft/class_3735$class_5278; - ARG 1 feet - METHOD method_35195 mainhand (Lnet/minecraft/class_2073;)Lnet/minecraft/class_3735$class_5278; - ARG 1 mainhand - METHOD method_35196 offhand (Lnet/minecraft/class_2073;)Lnet/minecraft/class_3735$class_5278; - ARG 1 offhand + METHOD method_27966 head (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278; + METHOD method_27967 build ()Ljava/util/Optional; + METHOD method_27968 chest (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278; + METHOD method_27969 legs (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278; + METHOD method_27970 feet (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278; + METHOD method_35195 mainhand (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278; + METHOD method_35196 offhand (Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_3735$class_5278; diff --git a/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping index b1a3cffa56..46ba7cda4d 100644 --- a/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityFlagsPredicate.mapping @@ -1,34 +1,22 @@ CLASS net/minecraft/class_2040 net/minecraft/predicate/entity/EntityFlagsPredicate - FIELD field_9578 isSwimming Ljava/lang/Boolean; - FIELD field_9579 isSprinting Ljava/lang/Boolean; - FIELD field_9580 isOnFire Ljava/lang/Boolean; - FIELD field_9581 ANY Lnet/minecraft/class_2040; - FIELD field_9582 isSneaking Ljava/lang/Boolean; - FIELD field_9583 isBaby Ljava/lang/Boolean; - METHOD (Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;Ljava/lang/Boolean;)V - ARG 1 isOnFire - ARG 2 isSneaking - ARG 3 isSprinting - ARG 4 isSwimming - ARG 5 isBaby + FIELD comp_1756 isOnFire Ljava/util/Optional; + FIELD comp_1757 isSneaking Ljava/util/Optional; + FIELD comp_1758 isSprinting Ljava/util/Optional; + FIELD comp_1759 isSwimming Ljava/util/Optional; + FIELD comp_1760 isBaby Ljava/util/Optional; + METHOD comp_1756 isOnFire ()Ljava/util/Optional; + METHOD comp_1757 isSneaking ()Ljava/util/Optional; + METHOD comp_1758 isSprinting ()Ljava/util/Optional; + METHOD comp_1759 isSwimming ()Ljava/util/Optional; + METHOD comp_1760 isBaby ()Ljava/util/Optional; METHOD method_8892 test (Lnet/minecraft/class_1297;)Z ARG 1 entity - METHOD method_8893 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2040; - ARG 0 json - METHOD method_8894 toJson ()Lcom/google/gson/JsonElement; - METHOD method_8895 nullableBooleanFromJson (Lcom/google/gson/JsonObject;Ljava/lang/String;)Ljava/lang/Boolean; - ARG 0 json - ARG 1 key - METHOD method_8896 nullableBooleanToJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/lang/Boolean;)V - ARG 1 json - ARG 2 key - ARG 3 value CLASS class_2041 Builder - FIELD field_9584 isBaby Ljava/lang/Boolean; - FIELD field_9585 isSwimming Ljava/lang/Boolean; - FIELD field_9586 isSneaking Ljava/lang/Boolean; - FIELD field_9587 isOnFire Ljava/lang/Boolean; - FIELD field_9588 isSprinting Ljava/lang/Boolean; + FIELD field_9584 isBaby Ljava/util/Optional; + FIELD field_9585 isSwimming Ljava/util/Optional; + FIELD field_9586 isSneaking Ljava/util/Optional; + FIELD field_9587 isOnFire Ljava/util/Optional; + FIELD field_9588 isSprinting Ljava/util/Optional; METHOD method_29935 isBaby (Ljava/lang/Boolean;)Lnet/minecraft/class_2040$class_2041; ARG 1 isBaby METHOD method_35203 sneaking (Ljava/lang/Boolean;)Lnet/minecraft/class_2040$class_2041; @@ -40,4 +28,4 @@ CLASS net/minecraft/class_2040 net/minecraft/predicate/entity/EntityFlagsPredica METHOD method_8897 create ()Lnet/minecraft/class_2040$class_2041; METHOD method_8898 onFire (Ljava/lang/Boolean;)Lnet/minecraft/class_2040$class_2041; ARG 1 onFire - METHOD method_8899 build ()Lnet/minecraft/class_2040; + METHOD method_8899 build ()Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index f3a9b8483c..f20cecf371 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -1,43 +1,30 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate - FIELD field_16490 equipment Lnet/minecraft/class_3735; - FIELD field_20698 team Ljava/lang/String; - FIELD field_24488 vehicle Lnet/minecraft/class_2048; - FIELD field_24489 targetedEntity Lnet/minecraft/class_2048; - FIELD field_33912 steppingOn Lnet/minecraft/class_2090; - FIELD field_33914 passenger Lnet/minecraft/class_2048; - FIELD field_38721 typeSpecific Lnet/minecraft/class_7376; - FIELD field_9594 effects Lnet/minecraft/class_2102; - FIELD field_9595 type Lnet/minecraft/class_2050; - FIELD field_9596 location Lnet/minecraft/class_2090; - FIELD field_9597 flags Lnet/minecraft/class_2040; - FIELD field_9599 ANY Lnet/minecraft/class_2048; - FIELD field_9600 nbt Lnet/minecraft/class_2105; - FIELD field_9601 distance Lnet/minecraft/class_2025; - METHOD (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_7376;Ljava/lang/String;)V - ARG 1 type - ARG 2 distance - ARG 3 location - ARG 4 steppingOn - ARG 5 effects - ARG 6 nbt - ARG 7 flags - ARG 8 equipment - ARG 9 typeSpecific - ARG 10 team - METHOD (Lnet/minecraft/class_2050;Lnet/minecraft/class_2025;Lnet/minecraft/class_2090;Lnet/minecraft/class_2090;Lnet/minecraft/class_2102;Lnet/minecraft/class_2105;Lnet/minecraft/class_2040;Lnet/minecraft/class_3735;Lnet/minecraft/class_7376;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Lnet/minecraft/class_2048;Ljava/lang/String;)V - ARG 1 type - ARG 2 distance - ARG 3 location - ARG 4 steppingOn - ARG 5 effects - ARG 6 nbt - ARG 7 flags - ARG 8 equipment - ARG 9 typeSpecific - ARG 10 vehicle - ARG 11 passenger - ARG 12 targetedEntity - ARG 13 team + FIELD comp_1761 type Ljava/util/Optional; + FIELD comp_1762 distance Ljava/util/Optional; + FIELD comp_1763 location Ljava/util/Optional; + FIELD comp_1764 steppingOn Ljava/util/Optional; + FIELD comp_1765 effects Ljava/util/Optional; + FIELD comp_1766 nbt Ljava/util/Optional; + FIELD comp_1767 flags Ljava/util/Optional; + FIELD comp_1768 equipment Ljava/util/Optional; + FIELD comp_1769 typeSpecific Ljava/util/Optional; + FIELD comp_1770 vehicle Ljava/util/Optional; + FIELD comp_1771 passenger Ljava/util/Optional; + FIELD comp_1772 targetedEntity Ljava/util/Optional; + FIELD comp_1773 team Ljava/util/Optional; + METHOD comp_1761 type ()Ljava/util/Optional; + METHOD comp_1762 distance ()Ljava/util/Optional; + METHOD comp_1763 location ()Ljava/util/Optional; + METHOD comp_1764 steppingOn ()Ljava/util/Optional; + METHOD comp_1765 effects ()Ljava/util/Optional; + METHOD comp_1766 nbt ()Ljava/util/Optional; + METHOD comp_1767 flags ()Ljava/util/Optional; + METHOD comp_1768 equipment ()Ljava/util/Optional; + METHOD comp_1769 typeSpecific ()Ljava/util/Optional; + METHOD comp_1770 vehicle ()Ljava/util/Optional; + METHOD comp_1771 passenger ()Ljava/util/Optional; + METHOD comp_1772 targetedEntity ()Ljava/util/Optional; + METHOD comp_1773 team ()Ljava/util/Optional; METHOD method_27802 createAdvancementEntityLootContext (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Lnet/minecraft/class_47; ARG 0 player ARG 1 target @@ -45,54 +32,47 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 3 entityx METHOD method_51704 asLootContextPredicate (Lnet/minecraft/class_2048;)Lnet/minecraft/class_5258; ARG 0 predicate - METHOD method_51705 contextPredicateFromJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_5257;)Lnet/minecraft/class_5258; + METHOD method_51705 contextPredicateFromJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_5257;)Ljava/util/Optional; ARG 0 json ARG 1 key ARG 2 predicateDeserializer - METHOD method_51706 contextPredicateFromJsonElement (Ljava/lang/String;Lnet/minecraft/class_5257;Lcom/google/gson/JsonElement;)Lnet/minecraft/class_5258; + METHOD method_51706 contextPredicateFromJsonElement (Ljava/lang/String;Lnet/minecraft/class_5257;Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 key ARG 1 predicateDeserializer ARG 2 json - METHOD method_51707 contextPredicateArrayFromJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_5257;)[Lnet/minecraft/class_5258; + METHOD method_51707 contextPredicateArrayFromJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_5257;)Ljava/util/List; ARG 0 json ARG 1 key ARG 2 predicateDeserializer METHOD method_8909 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Z - ARG 1 world - ARG 2 pos - ARG 3 entity METHOD method_8912 toJson ()Lcom/google/gson/JsonElement; - METHOD method_8913 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2048; + METHOD method_8913 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 json METHOD method_8914 test (Lnet/minecraft/class_3222;Lnet/minecraft/class_1297;)Z ARG 1 player ARG 2 entity CLASS class_2049 Builder - FIELD field_16491 equipment Lnet/minecraft/class_3735; - FIELD field_20700 team Ljava/lang/String; - FIELD field_24490 vehicle Lnet/minecraft/class_2048; - FIELD field_24491 targetedEntity Lnet/minecraft/class_2048; - FIELD field_33915 steppingOn Lnet/minecraft/class_2090; - FIELD field_33917 passenger Lnet/minecraft/class_2048; - FIELD field_38722 typeSpecific Lnet/minecraft/class_7376; - FIELD field_9602 distance Lnet/minecraft/class_2025; - FIELD field_9603 nbt Lnet/minecraft/class_2105; - FIELD field_9604 location Lnet/minecraft/class_2090; - FIELD field_9605 effects Lnet/minecraft/class_2102; - FIELD field_9606 flags Lnet/minecraft/class_2040; - FIELD field_9607 type Lnet/minecraft/class_2050; + FIELD field_16491 equipment Ljava/util/Optional; + FIELD field_20700 team Ljava/util/Optional; + FIELD field_24490 vehicle Ljava/util/Optional; + FIELD field_24491 targetedEntity Ljava/util/Optional; + FIELD field_33915 steppingOn Ljava/util/Optional; + FIELD field_33917 passenger Ljava/util/Optional; + FIELD field_38722 typeSpecific Ljava/util/Optional; + FIELD field_9602 distance Ljava/util/Optional; + FIELD field_9603 nbt Ljava/util/Optional; + FIELD field_9604 location Ljava/util/Optional; + FIELD field_9605 effects Ljava/util/Optional; + FIELD field_9606 flags Ljava/util/Optional; + FIELD field_9607 type Ljava/util/Optional; METHOD method_16227 equipment (Lnet/minecraft/class_3735;)Lnet/minecraft/class_2048$class_2049; ARG 1 equipment METHOD method_22470 team (Ljava/lang/String;)Lnet/minecraft/class_2048$class_2049; ARG 1 team - METHOD method_27971 vehicle (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2048$class_2049; - ARG 1 vehicle - METHOD method_27972 targetedEntity (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2048$class_2049; - ARG 1 targetedEntity - METHOD method_37229 passenger (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2048$class_2049; - ARG 1 passenger - METHOD method_37230 steppingOn (Lnet/minecraft/class_2090;)Lnet/minecraft/class_2048$class_2049; - ARG 1 location + METHOD method_27971 vehicle (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2048$class_2049; + METHOD method_27972 targetedEntity (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2048$class_2049; + METHOD method_37229 passenger (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2048$class_2049; + METHOD method_37230 steppingOn (Lnet/minecraft/class_2090$class_2091;)Lnet/minecraft/class_2048$class_2049; METHOD method_43094 typeSpecific (Lnet/minecraft/class_7376;)Lnet/minecraft/class_2048$class_2049; ARG 1 typeSpecific METHOD method_8915 nbt (Lnet/minecraft/class_2105;)Lnet/minecraft/class_2048$class_2049; @@ -100,16 +80,13 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate METHOD method_8916 create ()Lnet/minecraft/class_2048$class_2049; METHOD method_8917 type (Lnet/minecraft/class_2050;)Lnet/minecraft/class_2048$class_2049; ARG 1 type - METHOD method_8918 location (Lnet/minecraft/class_2090;)Lnet/minecraft/class_2048$class_2049; - ARG 1 location - METHOD method_8919 flags (Lnet/minecraft/class_2040;)Lnet/minecraft/class_2048$class_2049; - ARG 1 flags - METHOD method_8920 build ()Lnet/minecraft/class_2048; + METHOD method_8918 location (Lnet/minecraft/class_2090$class_2091;)Lnet/minecraft/class_2048$class_2049; + METHOD method_8919 flags (Lnet/minecraft/class_2040$class_2041;)Lnet/minecraft/class_2048$class_2049; + METHOD method_8920 build ()Ljava/util/Optional; METHOD method_8921 type (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2048$class_2049; ARG 1 type METHOD method_8922 type (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2048$class_2049; ARG 1 tag - METHOD method_8923 effects (Lnet/minecraft/class_2102;)Lnet/minecraft/class_2048$class_2049; - ARG 1 effects + METHOD method_8923 effects (Lnet/minecraft/class_2102$class_8748;)Lnet/minecraft/class_2048$class_2049; METHOD method_8924 distance (Lnet/minecraft/class_2025;)Lnet/minecraft/class_2048$class_2049; ARG 1 distance diff --git a/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping index 3495cbe5a6..9b783d0f93 100644 --- a/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityTypePredicate.mapping @@ -1,20 +1,7 @@ CLASS net/minecraft/class_2050 net/minecraft/predicate/entity/EntityTypePredicate - FIELD field_9608 COMMA_JOINER Lcom/google/common/base/Joiner; - FIELD field_9609 ANY Lnet/minecraft/class_2050; METHOD method_8925 matches (Lnet/minecraft/class_1299;)Z ARG 1 type METHOD method_8926 create (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2050; ARG 0 tag - METHOD method_8927 toJson ()Lcom/google/gson/JsonElement; - METHOD method_8928 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2050; - ARG 0 json METHOD method_8929 create (Lnet/minecraft/class_1299;)Lnet/minecraft/class_2050; ARG 0 type - CLASS class_2051 Tagged - FIELD field_9610 tag Lnet/minecraft/class_6862; - METHOD (Lnet/minecraft/class_6862;)V - ARG 1 tag - CLASS class_2052 Single - FIELD field_9611 type Lnet/minecraft/class_1299; - METHOD (Lnet/minecraft/class_1299;)V - ARG 1 type diff --git a/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping b/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping index 02d7c36928..e1deba4975 100644 --- a/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/FishingHookPredicate.mapping @@ -1,10 +1,6 @@ CLASS net/minecraft/class_4965 net/minecraft/predicate/entity/FishingHookPredicate + FIELD comp_1779 inOpenWater Ljava/util/Optional; FIELD field_23137 ALL Lnet/minecraft/class_4965; - FIELD field_23138 inOpenWater Z - FIELD field_30854 IN_OPEN_WATER Ljava/lang/String; - METHOD (Z)V - ARG 1 inOpenWater - METHOD method_26094 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_4965; - ARG 0 json + METHOD comp_1779 inOpenWater ()Ljava/util/Optional; METHOD method_26095 of (Z)Lnet/minecraft/class_4965; ARG 0 inOpenWater diff --git a/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping b/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping index 7fb23ab0db..951aedf8ff 100644 --- a/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LightningBoltPredicate.mapping @@ -1,14 +1,11 @@ CLASS net/minecraft/class_6404 net/minecraft/predicate/entity/LightningBoltPredicate - FIELD field_33921 BLOCKS_SET_ON_FIRE_KEY Ljava/lang/String; - FIELD field_33922 ENTITY_STRUCK_KEY Ljava/lang/String; - FIELD field_33923 blocksSetOnFire Lnet/minecraft/class_2096$class_2100; - FIELD field_33924 entityStruck Lnet/minecraft/class_2048; - METHOD (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2048;)V + FIELD comp_1792 blocksSetOnFire Lnet/minecraft/class_2096$class_2100; + FIELD comp_1793 entityStruck Ljava/util/Optional; + METHOD (Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;)V ARG 1 blocksSetOnFire - ARG 2 entityStruck + METHOD comp_1792 blocksSetOnFire ()Lnet/minecraft/class_2096$class_2100; + METHOD comp_1793 entityStruck ()Ljava/util/Optional; METHOD method_37235 (Lnet/minecraft/class_3218;Lnet/minecraft/class_243;Lnet/minecraft/class_1297;)Z ARG 3 struckEntity METHOD method_37237 of (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_6404; ARG 0 blocksSetOnFire - METHOD method_37238 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_6404; - ARG 0 json diff --git a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping index d9e83c5aa4..2779dfd83f 100644 --- a/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LocationPredicate.mapping @@ -1,65 +1,41 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate - FIELD field_20714 light Lnet/minecraft/class_4552; - FIELD field_20715 block Lnet/minecraft/class_4550; - FIELD field_20716 fluid Lnet/minecraft/class_4551; - FIELD field_24500 smokey Ljava/lang/Boolean; - FIELD field_24732 LOGGER Lorg/slf4j/Logger; - FIELD field_9681 z Lnet/minecraft/class_2096$class_2099; - FIELD field_9682 x Lnet/minecraft/class_2096$class_2099; - FIELD field_9683 biome Lnet/minecraft/class_5321; - FIELD field_9684 y Lnet/minecraft/class_2096$class_2099; - FIELD field_9685 ANY Lnet/minecraft/class_2090; - FIELD field_9686 dimension Lnet/minecraft/class_5321; - FIELD field_9687 feature Lnet/minecraft/class_5321; - METHOD (Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_2096$class_2099;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Ljava/lang/Boolean;Lnet/minecraft/class_4552;Lnet/minecraft/class_4550;Lnet/minecraft/class_4551;)V - ARG 1 x - ARG 2 y - ARG 3 z - ARG 4 biome - ARG 5 feature - ARG 6 dimension - ARG 7 smokey - ARG 8 light - ARG 9 block - ARG 10 fluid - METHOD method_28480 (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonElement;)V - ARG 1 json - METHOD method_38858 y (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2090; - ARG 0 y - METHOD method_9016 dimension (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090; - ARG 0 dimension - METHOD method_9017 feature (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090; - ARG 0 feature + FIELD comp_1795 biome Ljava/util/Optional; + FIELD comp_1796 feature Ljava/util/Optional; + FIELD comp_1797 dimension Ljava/util/Optional; + FIELD comp_1798 smokey Ljava/util/Optional; + FIELD comp_1799 light Ljava/util/Optional; + FIELD comp_1800 block Ljava/util/Optional; + FIELD comp_1801 fluid Ljava/util/Optional; + METHOD comp_1795 biome ()Ljava/util/Optional; + METHOD comp_1796 feature ()Ljava/util/Optional; + METHOD comp_1797 dimension ()Ljava/util/Optional; + METHOD comp_1798 smokey ()Ljava/util/Optional; + METHOD comp_1799 light ()Ljava/util/Optional; + METHOD comp_1800 block ()Ljava/util/Optional; + METHOD comp_1801 fluid ()Ljava/util/Optional; METHOD method_9018 test (Lnet/minecraft/class_3218;DDD)Z - ARG 1 world ARG 2 x ARG 4 y ARG 6 z METHOD method_9019 toJson ()Lcom/google/gson/JsonElement; - METHOD method_9021 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2090; + METHOD method_9021 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 json - METHOD method_9022 biome (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090; - ARG 0 biome CLASS class_2091 Builder - FIELD field_20717 light Lnet/minecraft/class_4552; - FIELD field_20718 block Lnet/minecraft/class_4550; - FIELD field_20719 fluid Lnet/minecraft/class_4551; - FIELD field_24501 smokey Ljava/lang/Boolean; - FIELD field_9688 feature Lnet/minecraft/class_5321; + FIELD field_20717 light Ljava/util/Optional; + FIELD field_20718 block Ljava/util/Optional; + FIELD field_20719 fluid Ljava/util/Optional; + FIELD field_24501 smokey Ljava/util/Optional; + FIELD field_9688 feature Ljava/util/Optional; FIELD field_9689 y Lnet/minecraft/class_2096$class_2099; - FIELD field_9690 biome Lnet/minecraft/class_5321; - FIELD field_9691 dimension Lnet/minecraft/class_5321; + FIELD field_9690 biome Ljava/util/Optional; + FIELD field_9691 dimension Ljava/util/Optional; FIELD field_9692 z Lnet/minecraft/class_2096$class_2099; FIELD field_9693 x Lnet/minecraft/class_2096$class_2099; METHOD method_22484 create ()Lnet/minecraft/class_2090$class_2091; - METHOD method_27989 block (Lnet/minecraft/class_4550;)Lnet/minecraft/class_2090$class_2091; - ARG 1 block - METHOD method_27990 smokey (Ljava/lang/Boolean;)Lnet/minecraft/class_2090$class_2091; - ARG 1 smokey - METHOD method_35274 fluid (Lnet/minecraft/class_4551;)Lnet/minecraft/class_2090$class_2091; - ARG 1 fluid - METHOD method_35275 light (Lnet/minecraft/class_4552;)Lnet/minecraft/class_2090$class_2091; - ARG 1 light + METHOD method_27989 block (Lnet/minecraft/class_4550$class_4710;)Lnet/minecraft/class_2090$class_2091; + METHOD method_27990 smokey (Z)Lnet/minecraft/class_2090$class_2091; + METHOD method_35274 fluid (Lnet/minecraft/class_4551$class_6079;)Lnet/minecraft/class_2090$class_2091; + METHOD method_35275 light (Lnet/minecraft/class_4552$class_6087;)Lnet/minecraft/class_2090$class_2091; METHOD method_35276 x (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2090$class_2091; ARG 1 x METHOD method_35277 feature (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090$class_2091; @@ -70,6 +46,6 @@ CLASS net/minecraft/class_2090 net/minecraft/predicate/entity/LocationPredicate ARG 1 dimension METHOD method_35280 z (Lnet/minecraft/class_2096$class_2099;)Lnet/minecraft/class_2090$class_2091; ARG 1 z - METHOD method_9023 build ()Lnet/minecraft/class_2090; + METHOD method_9023 build ()Ljava/util/Optional; METHOD method_9024 biome (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2090$class_2091; ARG 1 biome diff --git a/mappings/net/minecraft/predicate/entity/LootContextPredicate.mapping b/mappings/net/minecraft/predicate/entity/LootContextPredicate.mapping index 7dd3abe2a3..fb52c56b9a 100644 --- a/mappings/net/minecraft/predicate/entity/LootContextPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/LootContextPredicate.mapping @@ -1,22 +1,16 @@ CLASS net/minecraft/class_5258 net/minecraft/predicate/entity/LootContextPredicate COMMENT A list of loot conditions applied to entities. All conditions must match for this COMMENT unified conditions to {@linkplain #test match}. Mainly used by advancements. - FIELD field_24388 EMPTY Lnet/minecraft/class_5258; - FIELD field_24389 conditions [Lnet/minecraft/class_5341; + FIELD field_24389 conditions Ljava/util/List; FIELD field_24390 combinedCondition Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_5341;)V - ARG 1 conditions - METHOD method_27804 toJson (Lnet/minecraft/class_5267;)Lcom/google/gson/JsonElement; - ARG 1 predicateSerializer + METHOD method_27804 toJson ()Lcom/google/gson/JsonElement; METHOD method_27806 test (Lnet/minecraft/class_47;)Z ARG 1 context - METHOD method_27807 fromJson (Ljava/lang/String;Lnet/minecraft/class_5257;Lcom/google/gson/JsonElement;Lnet/minecraft/class_176;)Lnet/minecraft/class_5258; + METHOD method_27807 fromJson (Ljava/lang/String;Lnet/minecraft/class_5257;Lcom/google/gson/JsonElement;Lnet/minecraft/class_176;)Ljava/util/Optional; ARG 0 key ARG 1 predicateDeserializer ARG 2 json ARG 3 contextType - METHOD method_27808 toPredicatesJsonArray ([Lnet/minecraft/class_5258;Lnet/minecraft/class_5267;)Lcom/google/gson/JsonElement; - ARG 0 predicates - ARG 1 predicateSerializer + METHOD method_27808 toPredicatesJsonArray (Ljava/util/List;)Lcom/google/gson/JsonElement; METHOD method_27973 create ([Lnet/minecraft/class_5341;)Lnet/minecraft/class_5258; ARG 0 conditions diff --git a/mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping b/mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping index 501794edce..2d03424d26 100644 --- a/mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/PlayerPredicate.mapping @@ -1,63 +1,50 @@ CLASS net/minecraft/class_4553 net/minecraft/predicate/entity/PlayerPredicate - FIELD field_20723 experienceLevel Lnet/minecraft/class_2096$class_2100; - FIELD field_20724 gameMode Lnet/minecraft/class_1934; - FIELD field_20725 stats Ljava/util/Map; - FIELD field_20726 recipes Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; - FIELD field_20727 advancements Ljava/util/Map; + FIELD comp_1817 experienceLevel Lnet/minecraft/class_2096$class_2100; + FIELD comp_1818 gameMode Ljava/util/Optional; + FIELD comp_1819 stats Ljava/util/List; + FIELD comp_1820 recipes Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; + FIELD comp_1821 advancements Ljava/util/Map; + FIELD comp_1822 lookingAt Ljava/util/Optional; FIELD field_33928 LOOKING_AT_DISTANCE I - FIELD field_33929 lookingAt Lnet/minecraft/class_2048; - METHOD (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_1934;Ljava/util/Map;Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;Ljava/util/Map;Lnet/minecraft/class_2048;)V + METHOD (Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;Ljava/util/List;Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;Ljava/util/Map;Ljava/util/Optional;)V ARG 1 experienceLevel - ARG 2 gameMode - ARG 3 stats ARG 4 recipes ARG 5 advancements - ARG 6 lookingAt - METHOD method_22495 getStatId (Lnet/minecraft/class_3445;)Lnet/minecraft/class_2960; - ARG 0 stat - METHOD method_22496 getStat (Lnet/minecraft/class_3448;Lnet/minecraft/class_2960;)Lnet/minecraft/class_3445; - ARG 0 type - ARG 1 id + METHOD comp_1817 experienceLevel ()Lnet/minecraft/class_2096$class_2100; + METHOD comp_1818 gameMode ()Ljava/util/Optional; + METHOD comp_1819 stats ()Ljava/util/List; + METHOD comp_1820 recipes ()Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; + METHOD comp_1821 advancements ()Ljava/util/Map; + METHOD comp_1822 lookingAt ()Ljava/util/Optional; METHOD method_22497 (Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Z ARG 1 entity - METHOD method_22498 (Lcom/google/gson/JsonArray;Lnet/minecraft/class_3445;Lnet/minecraft/class_2096$class_2100;)V - ARG 1 stat - METHOD method_22499 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_4553; - ARG 0 json - METHOD method_22500 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2960;Ljava/lang/Boolean;)V - ARG 1 id - METHOD method_22501 (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2960;Lnet/minecraft/class_4553$class_4556;)V - ARG 1 id - METHOD method_22503 criterionFromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_4553$class_4556; - ARG 0 json METHOD method_37250 (Lnet/minecraft/class_1297;)Z ARG 0 hitEntity CLASS class_4554 AdvancementCriteriaPredicate - FIELD field_20728 criteria Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; + FIELD comp_1823 criteria Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; METHOD (Lit/unimi/dsi/fastutil/objects/Object2BooleanMap;)V ARG 1 criteria + METHOD comp_1823 criteria ()Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; METHOD test (Ljava/lang/Object;)Z ARG 1 progress CLASS class_4555 CompletedAdvancementPredicate - FIELD field_20729 done Z + FIELD comp_1824 done Z METHOD (Z)V ARG 1 done + METHOD comp_1824 done ()Z METHOD test (Ljava/lang/Object;)Z ARG 1 progress CLASS class_4556 AdvancementPredicate - METHOD method_22506 toJson ()Lcom/google/gson/JsonElement; CLASS class_4557 Builder FIELD field_20730 experienceLevel Lnet/minecraft/class_2096$class_2100; - FIELD field_20731 gameMode Lnet/minecraft/class_1934; - FIELD field_20732 stats Ljava/util/Map; + FIELD field_20731 gameMode Ljava/util/Optional; + FIELD field_20732 stats Lcom/google/common/collect/ImmutableList$Builder; FIELD field_20733 recipes Lit/unimi/dsi/fastutil/objects/Object2BooleanMap; FIELD field_20734 advancements Ljava/util/Map; - FIELD field_33930 lookingAt Lnet/minecraft/class_2048; + FIELD field_33930 lookingAt Ljava/util/Optional; METHOD method_22507 build ()Lnet/minecraft/class_4553; METHOD method_35310 create ()Lnet/minecraft/class_4553$class_4557; - METHOD method_35311 stat (Lnet/minecraft/class_3445;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_4553$class_4557; - ARG 1 stat - ARG 2 value + METHOD method_35311 stat (Lnet/minecraft/class_3448;Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_4553$class_4557; METHOD method_35312 gameMode (Lnet/minecraft/class_1934;)Lnet/minecraft/class_4553$class_4557; ARG 1 gameMode METHOD method_35313 experienceLevel (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_4553$class_4557; @@ -71,5 +58,4 @@ CLASS net/minecraft/class_4553 net/minecraft/predicate/entity/PlayerPredicate METHOD method_35316 advancement (Lnet/minecraft/class_2960;Z)Lnet/minecraft/class_4553$class_4557; ARG 1 id ARG 2 done - METHOD method_37251 lookingAt (Lnet/minecraft/class_2048;)Lnet/minecraft/class_4553$class_4557; - ARG 1 lookingAt + METHOD method_37251 lookingAt (Ljava/util/Optional;)Lnet/minecraft/class_4553$class_4557; diff --git a/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping b/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping index 6bf431bff2..89134a7a1c 100644 --- a/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/SlimePredicate.mapping @@ -1,8 +1,7 @@ CLASS net/minecraft/class_7383 net/minecraft/predicate/entity/SlimePredicate - FIELD field_38759 size Lnet/minecraft/class_2096$class_2100; + FIELD comp_1829 size Lnet/minecraft/class_2096$class_2100; METHOD (Lnet/minecraft/class_2096$class_2100;)V ARG 1 size + METHOD comp_1829 size ()Lnet/minecraft/class_2096$class_2100; METHOD method_43157 of (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_7383; ARG 0 size - METHOD method_43158 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_7383; - ARG 0 json diff --git a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping b/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping index d712e33c4c..81fe396c69 100644 --- a/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/TypeSpecificPredicate.mapping @@ -1,6 +1,5 @@ CLASS net/minecraft/class_7376 net/minecraft/predicate/entity/TypeSpecificPredicate - FIELD field_38723 ANY Lnet/minecraft/class_7376; - METHOD method_22494 typeSpecificToJson ()Lcom/google/gson/JsonObject; + METHOD comp_1776 getDeserializer ()Lnet/minecraft/class_7376$class_8745; METHOD method_22497 test (Lnet/minecraft/class_1297;Lnet/minecraft/class_3218;Lnet/minecraft/class_243;)Z ARG 1 entity ARG 2 world @@ -9,19 +8,12 @@ CLASS net/minecraft/class_7376 net/minecraft/predicate/entity/TypeSpecificPredic ARG 0 variant METHOD method_43096 frog (Lnet/minecraft/class_7106;)Lnet/minecraft/class_7376; ARG 0 variant - METHOD method_43097 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_7376; - ARG 0 json - METHOD method_43098 toJson ()Lcom/google/gson/JsonElement; - METHOD method_43099 getDeserializer ()Lnet/minecraft/class_7376$class_7377; - CLASS class_7377 Deserializer - METHOD deserialize (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_7376; - ARG 1 json CLASS class_7378 Deserializers - FIELD field_38724 ANY Lnet/minecraft/class_7376$class_7377; - FIELD field_38725 LIGHTNING Lnet/minecraft/class_7376$class_7377; - FIELD field_38726 FISHING_HOOK Lnet/minecraft/class_7376$class_7377; - FIELD field_38727 PLAYER Lnet/minecraft/class_7376$class_7377; - FIELD field_38728 SLIME Lnet/minecraft/class_7376$class_7377; + FIELD field_38724 ANY Lnet/minecraft/class_7376$class_8745; + FIELD field_38725 LIGHTNING Lnet/minecraft/class_7376$class_8745; + FIELD field_38726 FISHING_HOOK Lnet/minecraft/class_7376$class_8745; + FIELD field_38727 PLAYER Lnet/minecraft/class_7376$class_8745; + FIELD field_38728 SLIME Lnet/minecraft/class_7376$class_8745; FIELD field_38729 CAT Lnet/minecraft/class_7380; FIELD field_38730 FROG Lnet/minecraft/class_7380; FIELD field_38731 TYPES Lcom/google/common/collect/BiMap; @@ -38,8 +30,6 @@ CLASS net/minecraft/class_7376 net/minecraft/predicate/entity/TypeSpecificPredic FIELD field_41544 TROPICAL_FISH Lnet/minecraft/class_7380; METHOD method_43100 (Lnet/minecraft/class_1297;)Ljava/util/Optional; ARG 0 entity - METHOD method_43101 (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_7376; - ARG 0 json METHOD method_43102 (Lnet/minecraft/class_1297;)Ljava/util/Optional; ARG 0 entity METHOD method_47829 (Lnet/minecraft/class_1297;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping b/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping index d241bc285d..67a70fad55 100644 --- a/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping +++ b/mappings/net/minecraft/predicate/entity/VariantPredicates.mapping @@ -1,22 +1,11 @@ CLASS net/minecraft/class_7380 net/minecraft/predicate/entity/VariantPredicates - FIELD field_38739 VARIANT_KEY Ljava/lang/String; FIELD field_38741 variantGetter Ljava/util/function/Function; - FIELD field_38742 deserializer Lnet/minecraft/class_7376$class_7377; - FIELD field_41547 codec Lcom/mojang/serialization/Codec; - METHOD (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)V - ARG 1 codec - ARG 2 variantGetter - METHOD method_43114 getDeserializer ()Lnet/minecraft/class_7376$class_7377; - METHOD method_43115 (Lcom/mojang/serialization/Codec;Lcom/google/gson/JsonObject;)Lnet/minecraft/class_7376; - ARG 2 json + FIELD field_38742 deserializer Lnet/minecraft/class_7376$class_8745; + METHOD method_43114 getDeserializer ()Lnet/minecraft/class_7376$class_8745; METHOD method_43116 create (Lnet/minecraft/class_2378;Ljava/util/function/Function;)Lnet/minecraft/class_7380; ARG 0 registry ARG 1 variantGetter - METHOD method_43117 createPredicate (Ljava/lang/Object;)Lnet/minecraft/class_7376; - ARG 1 variant + METHOD method_43117 createPredicate (Ljava/lang/Object;)Lnet/minecraft/class_7380$class_8746; METHOD method_47840 create (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lnet/minecraft/class_7380; ARG 0 codec ARG 1 variantGetter - CLASS 1 - METHOD method_43118 (Ljava/lang/Object;Ljava/lang/Object;)Z - ARG 1 variant diff --git a/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping b/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping index 5220866aa8..99048a2e8f 100644 --- a/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/EnchantmentPredicate.mapping @@ -1,15 +1,9 @@ CLASS net/minecraft/class_2035 net/minecraft/predicate/item/EnchantmentPredicate - FIELD field_20687 ARRAY_OF_ANY [Lnet/minecraft/class_2035; - FIELD field_9569 enchantment Lnet/minecraft/class_1887; - FIELD field_9570 levels Lnet/minecraft/class_2096$class_2100; - FIELD field_9571 ANY Lnet/minecraft/class_2035; + FIELD comp_1748 enchantment Ljava/util/Optional; + FIELD comp_1749 levels Lnet/minecraft/class_2096$class_2100; METHOD (Lnet/minecraft/class_1887;Lnet/minecraft/class_2096$class_2100;)V ARG 1 enchantment ARG 2 levels - METHOD method_8879 deserializeAll (Lcom/google/gson/JsonElement;)[Lnet/minecraft/class_2035; - ARG 0 el + METHOD comp_1748 enchantment ()Ljava/util/Optional; + METHOD comp_1749 levels ()Lnet/minecraft/class_2096$class_2100; METHOD method_8880 test (Ljava/util/Map;)Z - ARG 1 enchantments - METHOD method_8881 serialize ()Lcom/google/gson/JsonElement; - METHOD method_8882 deserialize (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2035; - ARG 0 el diff --git a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index fe4de0d75f..b1e426a1b2 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -1,40 +1,38 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate - FIELD field_20689 storedEnchantments [Lnet/minecraft/class_2035; - FIELD field_9640 ANY Lnet/minecraft/class_2073; - FIELD field_9641 count Lnet/minecraft/class_2096$class_2100; - FIELD field_9642 potion Lnet/minecraft/class_1842; - FIELD field_9643 tag Lnet/minecraft/class_6862; - FIELD field_9644 items Ljava/util/Set; - FIELD field_9645 nbt Lnet/minecraft/class_2105; - FIELD field_9646 durability Lnet/minecraft/class_2096$class_2100; - FIELD field_9647 enchantments [Lnet/minecraft/class_2035; - METHOD (Lnet/minecraft/class_6862;Ljava/util/Set;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;[Lnet/minecraft/class_2035;[Lnet/minecraft/class_2035;Lnet/minecraft/class_1842;Lnet/minecraft/class_2105;)V - ARG 1 tag - ARG 2 items + FIELD comp_1783 tag Ljava/util/Optional; + FIELD comp_1784 items Ljava/util/Optional; + FIELD comp_1785 count Lnet/minecraft/class_2096$class_2100; + FIELD comp_1786 durability Lnet/minecraft/class_2096$class_2100; + FIELD comp_1787 enchantments Ljava/util/List; + FIELD comp_1788 storedEnchantments Ljava/util/List; + FIELD comp_1789 potion Ljava/util/Optional; + FIELD comp_1790 nbt Ljava/util/Optional; + METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Ljava/util/List;Ljava/util/List;Ljava/util/Optional;Ljava/util/Optional;)V ARG 3 count ARG 4 durability - ARG 5 enchantments - ARG 6 storedEnchantments - ARG 7 potion - ARG 8 nbt - METHOD method_33267 (Lnet/minecraft/class_2960;)Lcom/google/gson/JsonSyntaxException; - ARG 0 id - METHOD method_8969 fromJson (Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2073; + METHOD comp_1783 tag ()Ljava/util/Optional; + METHOD comp_1784 items ()Ljava/util/Optional; + METHOD comp_1785 count ()Lnet/minecraft/class_2096$class_2100; + METHOD comp_1786 durability ()Lnet/minecraft/class_2096$class_2100; + METHOD comp_1787 enchantments ()Ljava/util/List; + METHOD comp_1788 storedEnchantments ()Ljava/util/List; + METHOD comp_1789 potion ()Ljava/util/Optional; + METHOD comp_1790 nbt ()Ljava/util/Optional; + METHOD method_8969 fromJson (Lcom/google/gson/JsonElement;)Ljava/util/Optional; ARG 0 el METHOD method_8970 test (Lnet/minecraft/class_1799;)Z - ARG 1 stack METHOD method_8971 toJson ()Lcom/google/gson/JsonElement; - METHOD method_8972 deserializeAll (Lcom/google/gson/JsonElement;)[Lnet/minecraft/class_2073; + METHOD method_8972 deserializeAll (Lcom/google/gson/JsonElement;)Ljava/util/List; ARG 0 el CLASS class_2074 Builder - FIELD field_20690 storedEnchantments Ljava/util/List; + FIELD field_20690 storedEnchantments Lcom/google/common/collect/ImmutableList$Builder; FIELD field_9648 count Lnet/minecraft/class_2096$class_2100; - FIELD field_9649 enchantments Ljava/util/List; - FIELD field_9650 item Ljava/util/Set; - FIELD field_9651 potion Lnet/minecraft/class_1842; - FIELD field_9652 tag Lnet/minecraft/class_6862; + FIELD field_9649 enchantments Lcom/google/common/collect/ImmutableList$Builder; + FIELD field_9650 item Ljava/util/Optional; + FIELD field_9651 potion Ljava/util/Optional; + FIELD field_9652 tag Ljava/util/Optional; FIELD field_9653 durability Lnet/minecraft/class_2096$class_2100; - FIELD field_9654 nbt Lnet/minecraft/class_2105; + FIELD field_9654 nbt Ljava/util/Optional; METHOD method_20399 nbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2073$class_2074; ARG 1 nbt METHOD method_35232 potion (Lnet/minecraft/class_1842;)Lnet/minecraft/class_2073$class_2074; @@ -48,7 +46,7 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate METHOD method_8973 create ()Lnet/minecraft/class_2073$class_2074; METHOD method_8975 tag (Lnet/minecraft/class_6862;)Lnet/minecraft/class_2073$class_2074; ARG 1 tag - METHOD method_8976 build ()Lnet/minecraft/class_2073; + METHOD method_8976 build ()Ljava/util/Optional; METHOD method_8977 items ([Lnet/minecraft/class_1935;)Lnet/minecraft/class_2073$class_2074; ARG 1 items METHOD method_8978 enchantment (Lnet/minecraft/class_2035;)Lnet/minecraft/class_2073$class_2074; diff --git a/mappings/net/minecraft/registry/MutableRegistry.mapping b/mappings/net/minecraft/registry/MutableRegistry.mapping index 640b326880..061fae5b57 100644 --- a/mappings/net/minecraft/registry/MutableRegistry.mapping +++ b/mappings/net/minecraft/registry/MutableRegistry.mapping @@ -7,11 +7,6 @@ CLASS net/minecraft/class_2385 net/minecraft/registry/MutableRegistry ARG 1 key ARG 2 entry ARG 3 lifecycle - METHOD method_10273 set (ILnet/minecraft/class_5321;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/class_6880; - ARG 1 rawId - ARG 2 key - ARG 3 value - ARG 4 lifecycle METHOD method_35863 isEmpty ()Z COMMENT {@return whether the registry is empty} METHOD method_46769 createMutableEntryLookup ()Lnet/minecraft/class_7871; diff --git a/mappings/net/minecraft/registry/Registry.mapping b/mappings/net/minecraft/registry/Registry.mapping index f0a3d6069f..dbb082f7d1 100644 --- a/mappings/net/minecraft/registry/Registry.mapping +++ b/mappings/net/minecraft/registry/Registry.mapping @@ -151,11 +151,6 @@ CLASS net/minecraft/class_2378 net/minecraft/registry/Registry ARG 0 registry ARG 1 id ARG 2 entry - METHOD method_10231 register (Lnet/minecraft/class_2378;ILjava/lang/String;Ljava/lang/Object;)Ljava/lang/Object; - ARG 0 registry - ARG 1 rawId - ARG 2 id - ARG 3 entry METHOD method_10235 getIds ()Ljava/util/Set; COMMENT {@return the set of all IDs registered in a registry} METHOD method_10240 getRandom (Lnet/minecraft/class_5819;)Ljava/util/Optional; diff --git a/mappings/net/minecraft/registry/entry/RegistryEntryList.mapping b/mappings/net/minecraft/registry/entry/RegistryEntryList.mapping index 229a19444d..ec84ac96ed 100644 --- a/mappings/net/minecraft/registry/entry/RegistryEntryList.mapping +++ b/mappings/net/minecraft/registry/entry/RegistryEntryList.mapping @@ -25,10 +25,9 @@ CLASS net/minecraft/class_6885 net/minecraft/registry/entry/RegistryEntryList METHOD method_40243 getRandom (Lnet/minecraft/class_5819;)Ljava/util/Optional; COMMENT {@return a random entry of the list, or an empty optional if this list is empty} ARG 1 random - METHOD method_40244 of (Ljava/util/function/Function;Ljava/util/List;)Lnet/minecraft/class_6885$class_6886; + METHOD method_40244 of (Ljava/util/function/Function;Ljava/util/Collection;)Lnet/minecraft/class_6885$class_6886; COMMENT {@return a new direct list of {@code values} converted to a registry entry with {@code mapper}} ARG 0 mapper - ARG 1 values METHOD method_40245 of (Ljava/util/function/Function;[Ljava/lang/Object;)Lnet/minecraft/class_6885$class_6886; COMMENT {@return a new direct list of {@code values} converted to a registry entry with {@code mapper}} ARG 0 mapper diff --git a/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping b/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping index afd0267277..acf940f8d9 100644 --- a/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping +++ b/mappings/net/minecraft/screen/AbstractFurnaceScreenHandler.mapping @@ -20,8 +20,8 @@ CLASS net/minecraft/class_1720 net/minecraft/screen/AbstractFurnaceScreenHandler ARG 7 propertyDelegate METHOD method_16945 isFuel (Lnet/minecraft/class_1799;)Z ARG 1 itemStack - METHOD method_17363 getCookProgress ()I - METHOD method_17364 getFuelProgress ()I + METHOD method_17363 getCookProgress ()F + METHOD method_17364 getFuelProgress ()F METHOD method_17365 isBurning ()Z METHOD method_7640 isSmeltable (Lnet/minecraft/class_1799;)Z ARG 1 itemStack diff --git a/mappings/net/minecraft/server/MinecraftServer.mapping b/mappings/net/minecraft/server/MinecraftServer.mapping index d3a119a44a..893ecd48ff 100644 --- a/mappings/net/minecraft/server/MinecraftServer.mapping +++ b/mappings/net/minecraft/server/MinecraftServer.mapping @@ -15,7 +15,6 @@ CLASS net/minecraft/server/MinecraftServer COMMENT COMMENT @see net.minecraft.server.dedicated.MinecraftDedicatedServer COMMENT @see net.minecraft.server.integrated.IntegratedServer - FIELD field_16205 metricsData Lnet/minecraft/class_3517; FIELD field_16257 serverThread Ljava/lang/Thread; FIELD field_16258 profiler Lnet/minecraft/class_3695; FIELD field_17200 workerExecutor Ljava/util/concurrent/Executor; @@ -90,7 +89,6 @@ CLASS net/minecraft/server/MinecraftServer ARG 6 dataFixer ARG 7 apiServices ARG 8 worldGenerationProgressListenerFactory - METHOD method_15876 getMetricsData ()Lnet/minecraft/class_3517; METHOD method_16043 isStopping ()Z METHOD method_16044 getProfiler ()Lnet/minecraft/class_3695; METHOD method_16208 runTasksTillTickEnd ()V diff --git a/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping b/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping index 46edaa6594..60e9ed6eb1 100644 --- a/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping +++ b/mappings/net/minecraft/server/network/ServerCommonNetworkHandler.mapping @@ -9,21 +9,16 @@ CLASS net/minecraft/class_8609 net/minecraft/server/network/ServerCommonNetworkH FIELD field_45018 keepAliveId J FIELD field_45019 latency I METHOD (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_2535;I)V - ARG 1 server ARG 2 connection ARG 3 keepAliveId METHOD method_14364 sendPacket (Lnet/minecraft/class_2596;)V ARG 1 packet - METHOD method_52391 send (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;Z)V + METHOD method_52391 send (Lnet/minecraft/class_2596;Lnet/minecraft/class_7648;)V ARG 1 packet ARG 2 callbacks - ARG 3 flush METHOD method_52396 disconnect (Lnet/minecraft/class_2561;)V ARG 1 reason - METHOD method_52398 sendPacketWithoutFlush (Lnet/minecraft/class_2596;)V - ARG 1 packet METHOD method_52400 baseTick ()V - METHOD method_52401 flush ()V METHOD method_52402 isHost ()Z METHOD method_52403 getProfile ()Lcom/mojang/authlib/GameProfile; METHOD method_52404 getDebugProfile ()Lcom/mojang/authlib/GameProfile; diff --git a/mappings/net/minecraft/stat/StatType.mapping b/mappings/net/minecraft/stat/StatType.mapping index dd32b0577a..32c791416b 100644 --- a/mappings/net/minecraft/stat/StatType.mapping +++ b/mappings/net/minecraft/stat/StatType.mapping @@ -2,14 +2,13 @@ CLASS net/minecraft/class_3448 net/minecraft/stat/StatType FIELD field_15323 registry Lnet/minecraft/class_2378; FIELD field_15324 stats Ljava/util/Map; FIELD field_26382 name Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_2378;)V + METHOD (Lnet/minecraft/class_2378;Lnet/minecraft/class_2561;)V ARG 1 registry METHOD method_14955 getOrCreateStat (Ljava/lang/Object;Lnet/minecraft/class_3446;)Lnet/minecraft/class_3445; ARG 1 key ARG 2 formatter METHOD method_14956 getOrCreateStat (Ljava/lang/Object;)Lnet/minecraft/class_3445; ARG 1 key - METHOD method_14957 getTranslationKey ()Ljava/lang/String; METHOD method_14958 hasStat (Ljava/lang/Object;)Z ARG 1 key METHOD method_14959 getRegistry ()Lnet/minecraft/class_2378; diff --git a/mappings/net/minecraft/util/JsonHelper.mapping b/mappings/net/minecraft/util/JsonHelper.mapping index b7b6a2d21a..e9ecb32b7d 100644 --- a/mappings/net/minecraft/util/JsonHelper.mapping +++ b/mappings/net/minecraft/util/JsonHelper.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper ARG 1 element METHOD method_15255 deserialize (Ljava/io/Reader;)Lcom/google/gson/JsonObject; ARG 0 reader - METHOD method_15256 asItem (Lcom/google/gson/JsonElement;Ljava/lang/String;)Lnet/minecraft/class_1792; + METHOD method_15256 asItem (Lcom/google/gson/JsonElement;Ljava/lang/String;)Lnet/minecraft/class_6880; ARG 0 element ARG 1 name METHOD method_15257 asInt (Lcom/google/gson/JsonElement;Ljava/lang/String;)I @@ -126,7 +126,7 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper METHOD method_15287 asString (Lcom/google/gson/JsonElement;Ljava/lang/String;)Ljava/lang/String; ARG 0 element ARG 1 name - METHOD method_15288 getItem (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lnet/minecraft/class_1792; + METHOD method_15288 getItem (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lnet/minecraft/class_6880; ARG 0 object ARG 1 key METHOD method_15289 hasString (Lcom/google/gson/JsonObject;Ljava/lang/String;)Z @@ -175,10 +175,9 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper ARG 0 object ARG 1 element ARG 2 defaultDouble - METHOD method_34916 getItem (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_1792;)Lnet/minecraft/class_1792; + METHOD method_34916 getItem (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_6880;)Lnet/minecraft/class_6880; ARG 0 object ARG 1 key - ARG 2 defaultItem METHOD method_34917 getBigDecimal (Lcom/google/gson/JsonObject;Ljava/lang/String;Ljava/math/BigDecimal;)Ljava/math/BigDecimal; ARG 0 object ARG 1 element diff --git a/mappings/net/minecraft/util/JsonSerializableType.mapping b/mappings/net/minecraft/util/JsonSerializableType.mapping deleted file mode 100644 index 6e9c514d1a..0000000000 --- a/mappings/net/minecraft/util/JsonSerializableType.mapping +++ /dev/null @@ -1,5 +0,0 @@ -CLASS net/minecraft/class_5336 net/minecraft/util/JsonSerializableType - FIELD field_25204 jsonSerializer Lnet/minecraft/class_5335; - METHOD (Lnet/minecraft/class_5335;)V - ARG 1 jsonSerializer - METHOD method_29312 getJsonSerializer ()Lnet/minecraft/class_5335; diff --git a/mappings/net/minecraft/util/JsonSerializer.mapping b/mappings/net/minecraft/util/JsonSerializer.mapping deleted file mode 100644 index a35b71a4f1..0000000000 --- a/mappings/net/minecraft/util/JsonSerializer.mapping +++ /dev/null @@ -1,8 +0,0 @@ -CLASS net/minecraft/class_5335 net/minecraft/util/JsonSerializer - METHOD method_516 toJson (Lcom/google/gson/JsonObject;Ljava/lang/Object;Lcom/google/gson/JsonSerializationContext;)V - ARG 1 json - ARG 2 object - ARG 3 context - METHOD method_517 fromJson (Lcom/google/gson/JsonObject;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 context diff --git a/mappings/net/minecraft/util/JsonSerializing.mapping b/mappings/net/minecraft/util/JsonSerializing.mapping deleted file mode 100644 index 2d430547a9..0000000000 --- a/mappings/net/minecraft/util/JsonSerializing.mapping +++ /dev/null @@ -1,72 +0,0 @@ -CLASS net/minecraft/class_5330 net/minecraft/util/JsonSerializing - METHOD method_29306 createSerializerBuilder (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Function;)Lnet/minecraft/class_5330$class_5331; - ARG 0 registry - ARG 1 rootFieldName - ARG 2 idFieldName - ARG 3 typeGetter - CLASS class_5331 SerializerBuilder - COMMENT A builder for serializing types to JSON that can either obtain a type from - COMMENT a registry to handle JSON conversion or handle with a custom logic bound - COMMENT to a type. - COMMENT - COMMENT

When the root element read is an object, the built serializer obtains the type - COMMENT from registry to handle reading; otherwise, it falls back to custom - COMMENT logic. - FIELD field_25192 registry Lnet/minecraft/class_2378; - FIELD field_25193 rootFieldName Ljava/lang/String; - FIELD field_25194 idFieldName Ljava/lang/String; - FIELD field_25195 typeGetter Ljava/util/function/Function; - FIELD field_25196 elementSerializer Lcom/mojang/datafixers/util/Pair; - FIELD field_28444 defaultType Lnet/minecraft/class_5336; - METHOD (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Function;)V - ARG 1 registry - ARG 2 rootFieldName - ARG 3 idFieldName - ARG 4 typeIdentification - METHOD method_29307 build ()Ljava/lang/Object; - METHOD method_32385 elementSerializer (Lnet/minecraft/class_5336;Lnet/minecraft/class_5330$class_5332;)Lnet/minecraft/class_5330$class_5331; - COMMENT Sets the element serializer and its target type. It can serialize and - COMMENT deserialize instances of one type to non-{@link com.google.gson.JsonObject} - COMMENT elements. - COMMENT - COMMENT @apiNote There can only be one element serializer for this builder and - COMMENT the built serializer. Calling this method replaces any previous serializer. - ARG 1 type - COMMENT the target type of the element serializer - ARG 2 serializer - COMMENT the element serializer - METHOD method_33409 defaultType (Lnet/minecraft/class_5336;)Lnet/minecraft/class_5330$class_5331; - COMMENT Sets the default type that is used when there's no ID field. - COMMENT - COMMENT @return this instance - ARG 1 defaultType - COMMENT the default type - CLASS class_5332 ElementSerializer - METHOD method_29308 fromJson (Lcom/google/gson/JsonElement;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 context - METHOD method_29309 toJson (Ljava/lang/Object;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 object - ARG 2 context - CLASS class_5333 GsonSerializer - FIELD field_25197 registry Lnet/minecraft/class_2378; - FIELD field_25198 rootFieldName Ljava/lang/String; - FIELD field_25199 idFieldName Ljava/lang/String; - FIELD field_25200 typeGetter Ljava/util/function/Function; - FIELD field_25201 elementSerializer Lcom/mojang/datafixers/util/Pair; - FIELD field_28445 defaultType Lnet/minecraft/class_5336; - METHOD (Lnet/minecraft/class_2378;Ljava/lang/String;Ljava/lang/String;Ljava/util/function/Function;Lnet/minecraft/class_5336;Lcom/mojang/datafixers/util/Pair;)V - ARG 1 registry - ARG 2 rootFieldName - ARG 3 idFieldName - ARG 4 typeGetter - ARG 5 defaultType - ARG 6 elementSerializer - METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; - ARG 1 json - ARG 2 type - ARG 3 context - METHOD serialize (Ljava/lang/Object;Ljava/lang/reflect/Type;Lcom/google/gson/JsonSerializationContext;)Lcom/google/gson/JsonElement; - ARG 1 object - ARG 2 type - ARG 3 context diff --git a/mappings/net/minecraft/util/MetricsData.mapping b/mappings/net/minecraft/util/MetricsData.mapping deleted file mode 100644 index 16e72f6058..0000000000 --- a/mappings/net/minecraft/util/MetricsData.mapping +++ /dev/null @@ -1,21 +0,0 @@ -CLASS net/minecraft/class_3517 net/minecraft/util/MetricsData - FIELD field_15653 samples [J - FIELD field_15654 writeIndex I - FIELD field_15655 sampleCount I - FIELD field_15656 startIndex I - FIELD field_29839 SIZE I - METHOD method_15246 getSamples ()[J - METHOD method_15247 pushSample (J)V - ARG 1 time - METHOD method_15248 scaleSample (JII)I - ARG 1 sample - ARG 3 destScale - ARG 4 srcScale - METHOD method_15249 getStartIndex ()I - METHOD method_15250 getCurrentIndex ()I - METHOD method_15251 wrapIndex (I)I - ARG 1 index - METHOD method_34912 average (I)J - ARG 1 offset - METHOD method_34913 (II)I - ARG 1 offset diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 40a0e68892..47f8bf0490 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -146,8 +146,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 0 optional METHOD method_44169 (Ljava/util/OptionalLong;)Ljava/util/Optional; ARG 0 optionalLong - METHOD method_46368 (Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/DataResult; - ARG 0 element METHOD method_46370 (Lcom/mojang/authlib/GameProfile;Lcom/mojang/authlib/properties/PropertyMap;)Lcom/mojang/authlib/GameProfile; ARG 0 profile ARG 1 properties @@ -179,8 +177,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 0 stream METHOD method_46385 (Lorg/joml/Vector3f;)Ljava/util/List; ARG 0 vec3f - METHOD method_46386 (Lnet/minecraft/class_2561;)Lcom/mojang/serialization/DataResult; - ARG 0 text METHOD method_46387 (Lcom/google/gson/JsonElement;)Lcom/mojang/serialization/Dynamic; ARG 0 element METHOD method_46388 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; @@ -230,8 +226,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 0 list METHOD method_48779 (Ljava/util/List;)Lorg/joml/Quaternionf; ARG 0 listx - METHOD method_49754 (Lnet/minecraft/class_2561;)Lcom/mojang/serialization/DataResult; - ARG 0 text METHOD method_49755 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; ARG 0 json METHOD method_51494 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; @@ -348,14 +342,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 0 pair METHOD method_37950 (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 3 left - CLASS class_6739 Lazy - METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; - ARG 1 ops - ARG 2 input - METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; - ARG 1 input - ARG 2 ops - ARG 3 prefix CLASS class_6866 ContextRetrievalCodec FIELD field_36397 retriever Ljava/util/function/Function; METHOD (Ljava/util/function/Function;)V diff --git a/mappings/net/minecraft/util/profiling/jfr/sample/TimedSample.mapping b/mappings/net/minecraft/util/profiling/jfr/sample/TimedSample.mapping deleted file mode 100644 index 2718bde80d..0000000000 --- a/mappings/net/minecraft/util/profiling/jfr/sample/TimedSample.mapping +++ /dev/null @@ -1,2 +0,0 @@ -CLASS net/minecraft/class_6533 net/minecraft/util/profiling/jfr/sample/TimedSample - METHOD method_38045 getTime ()Ljava/time/Instant; diff --git a/mappings/net/minecraft/village/TradeOffers.mapping b/mappings/net/minecraft/village/TradeOffers.mapping index 62c21d9766..05dc368dca 100644 --- a/mappings/net/minecraft/village/TradeOffers.mapping +++ b/mappings/net/minecraft/village/TradeOffers.mapping @@ -192,8 +192,6 @@ CLASS net/minecraft/class_3853 net/minecraft/village/TradeOffers ARG 4 maxUses ARG 5 experience CLASS class_4166 SellSuspiciousStewFactory - FIELD field_18577 effect Lnet/minecraft/class_1291; - FIELD field_18578 duration I FIELD field_18579 experience I FIELD field_18580 multiplier F METHOD (Lnet/minecraft/class_1291;II)V