From 527534caf866bbfa21eeb9bd0bed9a8a1dec3e85 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Mon, 20 Nov 2023 16:16:06 +0000 Subject: [PATCH] 1.20.3-pre1 --- build.gradle | 2 +- .../BeeNestDestroyedCriterion.mapping | 1 + .../criterion/BredAnimalsCriterion.mapping | 1 + .../criterion/BrewedPotionCriterion.mapping | 1 + .../ChangedDimensionCriterion.mapping | 1 + .../ChanneledLightningCriterion.mapping | 1 + .../ConstructBeaconCriterion.mapping | 1 + .../criterion/ConsumeItemCriterion.mapping | 1 + .../CuredZombieVillagerCriterion.mapping | 1 + .../criterion/EffectsChangedCriterion.mapping | 1 + .../criterion/EnchantedItemCriterion.mapping | 1 + .../criterion/EnterBlockCriterion.mapping | 1 + .../EntityHurtPlayerCriterion.mapping | 1 + .../criterion/FilledBucketCriterion.mapping | 1 + .../FishingRodHookedCriterion.mapping | 1 + .../InventoryChangedCriterion.mapping | 1 + .../criterion/ItemCriterion.mapping | 1 + .../ItemDurabilityChangedCriterion.mapping | 1 + .../KilledByCrossbowCriterion.mapping | 1 + .../criterion/LevitationCriterion.mapping | 1 + .../LightningStrikeCriterion.mapping | 1 + .../criterion/OnKilledCriterion.mapping | 1 + ...yerGeneratesContainerLootCriterion.mapping | 1 + .../PlayerHurtEntityCriterion.mapping | 1 + ...layerInteractedWithEntityCriterion.mapping | 1 + .../criterion/RecipeCraftedCriterion.mapping | 1 + .../criterion/RecipeUnlockedCriterion.mapping | 1 + .../criterion/ShotCrossbowCriterion.mapping | 1 + .../criterion/SlideDownBlockCriterion.mapping | 1 + .../criterion/StartedRidingCriterion.mapping | 1 + .../criterion/SummonedEntityCriterion.mapping | 1 + .../criterion/TameAnimalCriterion.mapping | 1 + .../criterion/TargetHitCriterion.mapping | 1 + ...hrownItemPickedUpByEntityCriterion.mapping | 1 + .../criterion/TickCriterion.mapping | 1 + .../criterion/TravelCriterion.mapping | 1 + .../criterion/UsedEnderEyeCriterion.mapping | 1 + .../criterion/UsedTotemCriterion.mapping | 1 + .../criterion/UsingItemCriterion.mapping | 1 + .../criterion/VillagerTradeCriterion.mapping | 1 + .../ClientCommonNetworkHandler.mapping | 14 +------ .../EnergySwirlOverlayFeatureRenderer.mapping | 2 - .../ServerResourcePackProvider.mapping | 39 ------------------- .../client/toast/SystemToast.mapping | 16 +++----- .../client/util/NetworkUtils.mapping | 8 ---- ...laAdventureTabAdvancementGenerator.mapping | 4 +- .../ResourcePackStatusC2SPacket.mapping | 6 +-- .../common/ResourcePackSendS2CPacket.mapping | 21 ++++------ .../server/command/CommandManager.mapping | 1 - .../dedicated/ServerPropertiesHandler.mapping | 12 +----- .../integrated/IntegratedServerLoader.mapping | 2 - .../packageinfo/PackageInfo9050.mapping | 1 + mappings/net/minecraft/util/Util.mapping | 7 +--- 53 files changed, 63 insertions(+), 111 deletions(-) create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo9050.mapping diff --git a/build.gradle b/build.gradle index f828490ce7..099834dfd3 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w46a" +def minecraft_version = "1.20.3-pre1" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping index 1df557014d..6160a82d5f 100644 --- a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_4708 net/minecraft/advancement/criterion/BeeNestDestro ARG 3 stack ARG 4 beeCount CLASS class_4709 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47217 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping index bfcc9afef6..cc967208d9 100644 --- a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_196 net/minecraft/advancement/criterion/BredAnimalsCri ARG 3 partner ARG 4 child CLASS class_198 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47228 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping index 944e1ebca5..c1cc658021 100644 --- a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_1996 net/minecraft/advancement/criterion/BrewedPotionC ARG 1 player ARG 2 potion CLASS class_1998 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47229 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping index f64bc43546..6a1ddddd74 100644 --- a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_1999 net/minecraft/advancement/criterion/ChangedDimens ARG 2 from ARG 3 to CLASS class_2001 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47230 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping index f4ccb758dc..f1d808c7fa 100644 --- a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_2002 net/minecraft/advancement/criterion/ChanneledLigh ARG 1 player ARG 2 victims CLASS class_2004 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47231 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/List;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping index 9bf3880c1d..1618a12e86 100644 --- a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2006 net/minecraft/advancement/criterion/ConstructBeac ARG 1 player ARG 2 level CLASS class_2008 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47232 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping index 8ae82fdd93..329ad42184 100644 --- a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2010 net/minecraft/advancement/criterion/ConsumeItemCr ARG 1 player ARG 2 stack CLASS class_2012 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47233 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping index 5428dc970c..53f6dde4fe 100644 --- a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_2014 net/minecraft/advancement/criterion/CuredZombieVi ARG 2 zombie ARG 3 villager CLASS class_2016 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47237 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping index 45e06e3034..c93a2f4594 100644 --- a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2027 net/minecraft/advancement/criterion/EffectsChange ARG 1 player ARG 2 source CLASS class_2029 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47240 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping index 80b2a7e532..45e754b835 100644 --- a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_2030 net/minecraft/advancement/criterion/EnchantedItem ARG 2 stack ARG 3 levels CLASS class_2032 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47241 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping index 1976db56ee..2103944e6b 100644 --- a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2037 net/minecraft/advancement/criterion/EnterBlockCri ARG 1 player ARG 2 state CLASS class_2039 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47242 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping index 4cf5396513..6301509364 100644 --- a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping @@ -8,6 +8,7 @@ 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 comp_2029 player Ljava/util/Optional; FIELD field_47249 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping index 520b38c86a..602c9ebff4 100644 --- a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2054 net/minecraft/advancement/criterion/FilledBucketC ARG 1 player ARG 2 stack CLASS class_2056 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47251 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping index 0d079c410a..469c24bcfe 100644 --- a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_2058 net/minecraft/advancement/criterion/FishingRodHoo ARG 3 bobber ARG 4 fishingLoots CLASS class_2060 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47259 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping index 5f7d2e949d..edfeade8d3 100644 --- a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_2066 net/minecraft/advancement/criterion/InventoryChan ARG 2 inventory ARG 3 stack CLASS class_2068 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47263 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2066$class_2068$class_8948;Ljava/util/List;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping index 9d02107b38..fb563ec4ab 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemCriterion ARG 2 pos ARG 3 stack CLASS class_4712 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47267 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping index 6a83992308..7ad7ee4420 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_2069 net/minecraft/advancement/criterion/ItemDurabilit ARG 2 stack ARG 3 durability CLASS class_2071 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47266 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping index b713df4c3b..fe3973a393 100644 --- a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2076 net/minecraft/advancement/criterion/KilledByCross ARG 1 player ARG 2 piercingKilledEntities CLASS class_2078 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47268 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/List;Lnet/minecraft/class_2096$class_2100;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping index 742967d4cd..db1575e937 100644 --- a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_2085 net/minecraft/advancement/criterion/LevitationCri ARG 2 startPos ARG 3 duration CLASS class_2087 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47305 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping index d46648f1fa..2747f92b1d 100644 --- a/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping @@ -8,6 +8,7 @@ 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 comp_2029 player Ljava/util/Optional; FIELD field_47306 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping index f3d9ed811c..0190a11ccf 100644 --- a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_2080 net/minecraft/advancement/criterion/OnKilledCrite ARG 2 entity ARG 3 killingDamage CLASS class_2083 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD comp_2068 entity Ljava/util/Optional; FIELD field_47304 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V diff --git a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping index c91dc6900f..1cb85d991f 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_5282 net/minecraft/advancement/criterion/PlayerGenerat ARG 1 player ARG 2 id CLASS class_5283 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47307 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2960;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping index 6220eac830..e2d26f7edc 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping @@ -9,6 +9,7 @@ CLASS net/minecraft/class_2115 net/minecraft/advancement/criterion/PlayerHurtEnt ARG 5 taken ARG 6 blocked CLASS class_2117 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47317 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping index 81fe6568e5..907d548672 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_5409 net/minecraft/advancement/criterion/PlayerInterac ARG 2 stack ARG 3 entity CLASS class_5410 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47318 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping index 6155ef6f44..5849718784 100644 --- a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_8508 net/minecraft/advancement/criterion/RecipeCrafted ARG 2 recipeId ARG 3 ingredients CLASS class_8509 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47327 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2960;Ljava/util/List;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping index 9628180845..e25a42916c 100644 --- a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_2119 net/minecraft/advancement/criterion/RecipeUnlocke ARG 1 player ARG 2 recipe CLASS class_2121 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47333 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2960;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping index 3a32b6b408..52a3b1fe8f 100644 --- a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2123 net/minecraft/advancement/criterion/ShotCrossbowC ARG 1 player ARG 2 stack CLASS class_2125 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47334 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping index 3f93a5d578..ed9f689e09 100644 --- a/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_4713 net/minecraft/advancement/criterion/SlideDownBloc ARG 1 player ARG 2 state CLASS class_4714 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47335 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping b/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping index 5af4c8f2af..3061bc1192 100644 --- a/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping @@ -4,6 +4,7 @@ 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 + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47337 CODEC Lcom/mojang/serialization/Codec; METHOD method_37260 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_175; ARG 0 player diff --git a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping index f796b9f10b..ffc1e63f74 100644 --- a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2128 net/minecraft/advancement/criterion/SummonedEntit ARG 1 player ARG 2 entity CLASS class_2130 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47338 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping index 2887761dc7..2785cd938d 100644 --- a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2131 net/minecraft/advancement/criterion/TameAnimalCri ARG 1 player ARG 2 entity CLASS class_2133 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47344 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping index 200acd039f..e115ac6a0e 100644 --- a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping @@ -7,6 +7,7 @@ CLASS net/minecraft/class_4851 net/minecraft/advancement/criterion/TargetHitCrit METHOD method_24951 (Lnet/minecraft/class_47;Lnet/minecraft/class_243;ILnet/minecraft/class_4851$class_4852;)Z ARG 3 conditions CLASS class_4852 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47345 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2100;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping index b82e3214f5..763f2be448 100644 --- a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping @@ -6,6 +6,7 @@ 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 comp_2029 player Ljava/util/Optional; FIELD field_47316 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping index 72acfeb50a..273ee13785 100644 --- a/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TickCriterion.mapping @@ -4,6 +4,7 @@ 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 + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47326 CODEC Lcom/mojang/serialization/Codec; METHOD method_43135 createLocation (Ljava/util/Optional;)Lnet/minecraft/class_175; ARG 0 entity diff --git a/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping index aeee6eadcf..aaed4206ab 100644 --- a/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2108 net/minecraft/advancement/criterion/TravelCriteri ARG 1 player ARG 2 startPos CLASS class_2110 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47239 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping index a74b4c1eab..c2bad7df12 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2143 net/minecraft/advancement/criterion/UsedEnderEyeC ARG 1 player ARG 2 strongholdPos CLASS class_2145 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47350 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Lnet/minecraft/class_2096$class_2099;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping index 8ed6e58101..b6f17e2267 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_2148 net/minecraft/advancement/criterion/UsedTotemCrit ARG 1 player ARG 2 stack CLASS class_2150 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47351 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping index 10d2ce8a1c..6dbb352e20 100644 --- a/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping @@ -5,6 +5,7 @@ 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 comp_2029 player Ljava/util/Optional; FIELD field_47353 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping index 39d28ffd66..c046580495 100644 --- a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping @@ -6,6 +6,7 @@ CLASS net/minecraft/class_2140 net/minecraft/advancement/criterion/VillagerTrade ARG 2 merchant ARG 3 stack CLASS class_2142 Conditions + FIELD comp_2029 player Ljava/util/Optional; FIELD field_47347 CODEC Lcom/mojang/serialization/Codec; METHOD (Ljava/util/Optional;Ljava/util/Optional;Ljava/util/Optional;)V ARG 1 playerPredicate diff --git a/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping index 02068a881b..91ae8e5101 100644 --- a/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientCommonNetworkHandler.mapping @@ -18,19 +18,11 @@ CLASS net/minecraft/class_8673 net/minecraft/client/network/ClientCommonNetworkH METHOD method_52771 handleSynchronizedTagGroup (Lnet/minecraft/class_5321;Lnet/minecraft/class_6864$class_5748;)V ARG 1 registryRef ARG 2 tags - METHOD method_52772 (Lnet/minecraft/class_437;Ljava/net/URL;Ljava/lang/String;ZZ)V + METHOD method_52772 (Lnet/minecraft/class_437;Ljava/util/UUID;Ljava/net/URL;Ljava/lang/String;ZZ)V ARG 5 confirmed METHOD method_52773 getParsedResourcePackUrl (Ljava/lang/String;)Ljava/net/URL; ARG 0 url - METHOD method_52774 (Ljava/lang/Throwable;)Ljava/lang/Void; - ARG 1 throwable - METHOD method_52775 showPackConfirmationScreen (Ljava/net/URL;Ljava/lang/String;ZLnet/minecraft/class_2561;)V - ARG 1 packUrl - ARG 2 sha1 - ARG 3 required - ARG 4 prompt - METHOD method_52777 sendResourcePackStatusAfter (Ljava/util/concurrent/CompletableFuture;)V - ARG 1 future + METHOD method_52775 showPackConfirmationScreen (Ljava/util/UUID;Ljava/net/URL;Ljava/lang/String;ZLnet/minecraft/class_2561;)V METHOD method_52778 getPrompt (Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 0 requirementPrompt ARG 1 customPrompt @@ -38,8 +30,6 @@ CLASS net/minecraft/class_8673 net/minecraft/client/network/ClientCommonNetworkH ARG 1 packet ARG 2 sendCondition ARG 3 expiry - METHOD method_52785 sendResourcePackStatus (Lnet/minecraft/class_2856$class_2857;)V - ARG 1 status METHOD method_52786 createDisconnectedScreen (Lnet/minecraft/class_2561;)Lnet/minecraft/class_437; ARG 1 reason METHOD method_52787 sendPacket (Lnet/minecraft/class_2596;)V diff --git a/mappings/net/minecraft/client/render/entity/feature/EnergySwirlOverlayFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/EnergySwirlOverlayFeatureRenderer.mapping index bdf3b1d725..46ccc172f3 100644 --- a/mappings/net/minecraft/client/render/entity/feature/EnergySwirlOverlayFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/EnergySwirlOverlayFeatureRenderer.mapping @@ -3,5 +3,3 @@ CLASS net/minecraft/class_4607 net/minecraft/client/render/entity/feature/Energy METHOD method_23202 getEnergySwirlX (F)F ARG 1 partialAge METHOD method_23203 getEnergySwirlModel ()Lnet/minecraft/class_583; - METHOD method_55276 getEnergySwirlY (F)F - ARG 1 partialAge diff --git a/mappings/net/minecraft/client/resource/ServerResourcePackProvider.mapping b/mappings/net/minecraft/client/resource/ServerResourcePackProvider.mapping index abe037344b..de3f791147 100644 --- a/mappings/net/minecraft/client/resource/ServerResourcePackProvider.mapping +++ b/mappings/net/minecraft/client/resource/ServerResourcePackProvider.mapping @@ -1,43 +1,4 @@ CLASS net/minecraft/class_1066 net/minecraft/client/resource/ServerResourcePackProvider - FIELD field_32958 MAX_FILE_SIZE I - FIELD field_32959 MAX_SAVED_PACKS I - FIELD field_32961 SERVER Ljava/lang/String; - FIELD field_33633 APPLYING_PACK_TEXT Lnet/minecraft/class_2561; FIELD field_40562 SERVER_NAME_TEXT Lnet/minecraft/class_2561; - FIELD field_5292 serverPacksRoot Ljava/io/File; - FIELD field_5294 downloadTask Ljava/util/concurrent/CompletableFuture; - FIELD field_5295 serverContainer Lnet/minecraft/class_3288; FIELD field_5296 SHA1_PATTERN Ljava/util/regex/Pattern; - FIELD field_5297 lock Ljava/util/concurrent/locks/ReentrantLock; FIELD field_5298 LOGGER Lorg/slf4j/Logger; - METHOD (Ljava/io/File;)V - ARG 1 serverPacksRoot - METHOD method_19436 (Ljava/io/File;Lnet/minecraft/class_310;Ljava/lang/Throwable;)Ljava/util/concurrent/CompletionStage; - ARG 3 throwable - METHOD method_19437 delete (Ljava/io/File;)V - ARG 0 file - METHOD method_36323 (Lnet/minecraft/class_310;Ljava/lang/Void;)V - ARG 1 void_ - METHOD method_36324 (Lnet/minecraft/class_310;Z)V - ARG 1 confirmed - METHOD method_43339 loadServerPack (Lnet/minecraft/class_32$class_5143;)Ljava/util/concurrent/CompletableFuture; - ARG 1 session - METHOD method_44602 (Ljava/lang/Throwable;Ljava/io/File;Ljava/lang/Void;)V - ARG 2 void_ - METHOD method_44603 (Ljava/lang/Void;)V - ARG 1 void_ - METHOD method_4634 (Ljava/lang/String;Ljava/io/File;Lnet/minecraft/class_310;ZLjava/lang/Object;)Ljava/util/concurrent/CompletionStage; - ARG 5 object - METHOD method_4636 getDownloadHeaders ()Ljava/util/Map; - METHOD method_4638 loadServerPack (Ljava/io/File;Lnet/minecraft/class_5352;)Ljava/util/concurrent/CompletableFuture; - ARG 1 packZip - ARG 2 packSource - METHOD method_4640 download (Ljava/net/URL;Ljava/lang/String;Z)Ljava/util/concurrent/CompletableFuture; - ARG 1 url - ARG 2 packSha1 - ARG 3 closeAfterDownload - METHOD method_4641 verifyFile (Ljava/lang/String;Ljava/io/File;)Z - ARG 1 expectedSha1 - ARG 2 file - METHOD method_4642 clear ()Ljava/util/concurrent/CompletableFuture; - METHOD method_4643 deleteOldServerPack ()V diff --git a/mappings/net/minecraft/client/toast/SystemToast.mapping b/mappings/net/minecraft/client/toast/SystemToast.mapping index 34884d7f32..03117948ad 100644 --- a/mappings/net/minecraft/client/toast/SystemToast.mapping +++ b/mappings/net/minecraft/client/toast/SystemToast.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast - FIELD field_2213 type Lnet/minecraft/class_370$class_371; + FIELD field_2213 type Lnet/minecraft/class_370$class_9037; FIELD field_2214 justUpdated Z FIELD field_2215 title Lnet/minecraft/class_2561; FIELD field_2216 startTime J @@ -9,16 +9,16 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast FIELD field_39926 LINE_HEIGHT I FIELD field_39927 PADDING_Y I FIELD field_45396 TEXTURE Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_370$class_371;Lnet/minecraft/class_2561;Ljava/util/List;I)V + METHOD (Lnet/minecraft/class_370$class_9037;Lnet/minecraft/class_2561;Ljava/util/List;I)V ARG 1 type ARG 2 title ARG 3 lines ARG 4 width - METHOD (Lnet/minecraft/class_370$class_371;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V + METHOD (Lnet/minecraft/class_370$class_9037;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 1 type ARG 2 title ARG 3 description - METHOD method_1990 show (Lnet/minecraft/class_374;Lnet/minecraft/class_370$class_371;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V + METHOD method_1990 show (Lnet/minecraft/class_374;Lnet/minecraft/class_370$class_9037;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 0 manager ARG 1 type ARG 2 title @@ -29,7 +29,7 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast METHOD method_27023 addWorldAccessFailureToast (Lnet/minecraft/class_310;Ljava/lang/String;)V ARG 0 client ARG 1 worldName - METHOD method_27024 add (Lnet/minecraft/class_374;Lnet/minecraft/class_370$class_371;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V + METHOD method_27024 add (Lnet/minecraft/class_374;Lnet/minecraft/class_370$class_9037;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)V ARG 0 manager ARG 1 type ARG 2 title @@ -39,7 +39,7 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast ARG 1 worldName METHOD method_29046 drawPart (Lnet/minecraft/class_332;IIII)V ARG 1 context - METHOD method_29047 create (Lnet/minecraft/class_310;Lnet/minecraft/class_370$class_371;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_370; + METHOD method_29047 create (Lnet/minecraft/class_310;Lnet/minecraft/class_370$class_9037;Lnet/minecraft/class_2561;Lnet/minecraft/class_2561;)Lnet/minecraft/class_370; ARG 0 client ARG 1 type ARG 2 title @@ -49,7 +49,3 @@ CLASS net/minecraft/class_370 net/minecraft/client/toast/SystemToast METHOD method_29627 addPackCopyFailure (Lnet/minecraft/class_310;Ljava/lang/String;)V ARG 0 client ARG 1 directory - CLASS class_371 Type - FIELD field_39340 displayDuration J - METHOD (Ljava/lang/String;IJ)V - ARG 3 displayDuration diff --git a/mappings/net/minecraft/client/util/NetworkUtils.mapping b/mappings/net/minecraft/client/util/NetworkUtils.mapping index befec011aa..86d8396d4e 100644 --- a/mappings/net/minecraft/client/util/NetworkUtils.mapping +++ b/mappings/net/minecraft/client/util/NetworkUtils.mapping @@ -4,15 +4,7 @@ CLASS net/minecraft/class_3521 net/minecraft/client/util/NetworkUtils COMMENT @implNote This is not marked as client-only because it's used by the COMMENT {@code /publish} command, which is only available to integrated servers COMMENT yet was retained by proguard. - FIELD field_15664 EXECUTOR Lcom/google/common/util/concurrent/ListeningExecutorService; FIELD field_15665 LOGGER Lorg/slf4j/Logger; - METHOD method_15301 downloadResourcePack (Ljava/io/File;Ljava/net/URL;Ljava/util/Map;ILnet/minecraft/class_3536;Ljava/net/Proxy;)Ljava/util/concurrent/CompletableFuture; - ARG 0 file - ARG 1 url - ARG 2 headers - ARG 3 maxFileSize - ARG 4 progressListener - ARG 5 proxy METHOD method_15302 findLocalPort ()I METHOD method_46872 isPortAvailable (I)Z ARG 0 port diff --git a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping index 71de8bd88b..19e35b7e27 100644 --- a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_2412 net/minecraft/data/server/advancement/vanilla/VanillaAdventureTabAdvancementGenerator - FIELD field_11294 MONSTERS [Lnet/minecraft/class_1299; + FIELD field_11294 MONSTERS Ljava/util/List; FIELD field_35091 OVERWORLD_HEIGHT I FIELD field_35092 OVERWORLD_MAX_Y I FIELD field_35093 OVERWORLD_MIN_Y I FIELD field_35094 OVERWORLD_BEDROCK_LAYER_HEIGHT I - METHOD method_10336 requireListedMobsKilled (Lnet/minecraft/class_161$class_162;)Lnet/minecraft/class_161$class_162; + METHOD method_10336 requireListedMobsKilled (Lnet/minecraft/class_161$class_162;Ljava/util/List;)Lnet/minecraft/class_161$class_162; ARG 0 builder METHOD method_10337 requireListedBiomesVisited (Lnet/minecraft/class_161$class_162;Ljava/util/List;)Lnet/minecraft/class_161$class_162; ARG 0 builder diff --git a/mappings/net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket.mapping index b8a43158b4..95ae6ebd1e 100644 --- a/mappings/net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket.mapping +++ b/mappings/net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_2856 net/minecraft/network/packet/c2s/common/ResourcePackStatusC2SPacket - FIELD field_13014 status Lnet/minecraft/class_2856$class_2857; + FIELD comp_2164 status Lnet/minecraft/class_2856$class_2857; METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD (Lnet/minecraft/class_2856$class_2857;)V - ARG 1 status - METHOD method_32308 getStatus ()Lnet/minecraft/class_2856$class_2857; + METHOD comp_2164 status ()Lnet/minecraft/class_2856$class_2857; CLASS class_2857 Status diff --git a/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping index bb9e0d6f7c..c701a510f7 100644 --- a/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket.mapping @@ -1,17 +1,12 @@ CLASS net/minecraft/class_2720 net/minecraft/network/packet/s2c/common/ResourcePackSendS2CPacket - FIELD field_12427 url Ljava/lang/String; - FIELD field_12428 hash Ljava/lang/String; - FIELD field_27844 required Z + FIELD comp_2159 url Ljava/lang/String; + FIELD comp_2160 hash Ljava/lang/String; + FIELD comp_2161 required Z + FIELD comp_2162 prompt Lnet/minecraft/class_2561; FIELD field_33340 MAX_HASH_LENGTH I - FIELD field_33541 prompt Lnet/minecraft/class_2561; - METHOD (Ljava/lang/String;Ljava/lang/String;ZLnet/minecraft/class_2561;)V - ARG 1 url - ARG 2 hash - ARG 3 required - ARG 4 prompt METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD method_11772 getUrl ()Ljava/lang/String; - METHOD method_11773 getHash ()Ljava/lang/String; - METHOD method_32307 isRequired ()Z - METHOD method_36340 getPrompt ()Lnet/minecraft/class_2561; + METHOD comp_2159 url ()Ljava/lang/String; + METHOD comp_2160 hash ()Ljava/lang/String; + METHOD comp_2161 required ()Z + METHOD comp_2162 prompt ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/server/command/CommandManager.mapping b/mappings/net/minecraft/server/command/CommandManager.mapping index c60234003e..51b289b08b 100644 --- a/mappings/net/minecraft/server/command/CommandManager.mapping +++ b/mappings/net/minecraft/server/command/CommandManager.mapping @@ -3,7 +3,6 @@ CLASS net/minecraft/class_2170 net/minecraft/server/command/CommandManager FIELD field_9832 dispatcher Lcom/mojang/brigadier/CommandDispatcher; FIELD field_9833 LOGGER Lorg/slf4j/Logger; METHOD (Lnet/minecraft/class_2170$class_5364;Lnet/minecraft/class_7157;)V - ARG 1 environment ARG 2 commandRegistryAccess METHOD method_23917 getException (Lcom/mojang/brigadier/ParseResults;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException; ARG 0 parse diff --git a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping index 3cb4cde030..fd0bde61d1 100644 --- a/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping +++ b/mappings/net/minecraft/server/dedicated/ServerPropertiesHandler.mapping @@ -64,24 +64,14 @@ CLASS net/minecraft/class_3806 net/minecraft/server/dedicated/ServerPropertiesHa ARG 0 type METHOD method_41186 (Ljava/lang/String;)Lcom/google/gson/JsonObject; ARG 0 generatorSettings - METHOD method_43660 getServerResourcePackProperties (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)Ljava/util/Optional; - ARG 0 url - ARG 1 sha1 - ARG 2 hash - ARG 3 required - ARG 4 prompt + METHOD method_43660 getServerResourcePackProperties (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ZLjava/lang/String;)Ljava/util/Optional; METHOD method_43661 parseResourcePackPrompt (Ljava/lang/String;)Lnet/minecraft/class_2561; ARG 0 prompt METHOD method_45157 createDimensionsRegistryHolder (Lnet/minecraft/class_5455;)Lnet/minecraft/class_7723; ARG 1 dynamicRegistry - METHOD method_45158 (Ljava/lang/String;Ljava/util/function/Consumer;)V - ARG 0 id - ARG 1 consumer METHOD method_45159 parseDataPackSettings (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_5359; ARG 0 enabled ARG 1 disabled - METHOD method_45160 parseFeatureFlags (Ljava/lang/String;)Lnet/minecraft/class_7699; - ARG 0 featureFlags CLASS class_7044 WorldGenProperties FIELD field_37277 LEVEL_TYPE_TO_PRESET_KEY Ljava/util/Map; METHOD method_41242 createDimensionsRegistryHolder (Lnet/minecraft/class_5455;)Lnet/minecraft/class_7723; diff --git a/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping b/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping index 62cabae183..0ff448a02d 100644 --- a/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping +++ b/mappings/net/minecraft/server/integrated/IntegratedServerLoader.mapping @@ -51,8 +51,6 @@ CLASS net/minecraft/class_7196 net/minecraft/server/integrated/IntegratedServerL ARG 1 levelProperties ARG 2 safeMode ARG 3 dataPackManager - METHOD method_54611 (Lnet/minecraft/class_32$class_5143;Lnet/minecraft/class_3283;Lnet/minecraft/class_6904;Ljava/lang/Runnable;Ljava/lang/Boolean;)V - ARG 5 packLoadSuccessful METHOD method_54612 (Lnet/minecraft/class_32$class_5143;Lcom/mojang/serialization/Dynamic;Ljava/lang/Runnable;ZZ)V ARG 4 backup ARG 5 eraseCache diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9050.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9050.mapping new file mode 100644 index 0000000000..eaac8d20bf --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9050.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9050 net/minecraft/unused/packageinfo/PackageInfo9050 diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index 658ffb6437..e56991520e 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util COMMENT A class holding various utility methods. FIELD field_1128 nanoTimeSupplier Lnet/minecraft/class_7576$class_7577; FIELD field_1129 LOGGER Lorg/slf4j/Logger; - FIELD field_18034 NEXT_WORKER_ID Ljava/util/concurrent/atomic/AtomicInteger; FIELD field_18035 MAIN_WORKER_EXECUTOR Ljava/util/concurrent/ExecutorService; FIELD field_24477 IO_WORKER_EXECUTOR Ljava/util/concurrent/ExecutorService; FIELD field_25140 NIL_UUID Ljava/util/UUID; @@ -67,17 +66,13 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util ARG 0 string ARG 1 cursor ARG 2 delta - METHOD method_27956 (Ljava/lang/Runnable;)Ljava/lang/Thread; - ARG 0 runnable METHOD method_27957 attemptShutdown (Ljava/util/concurrent/ExecutorService;)V ARG 0 service METHOD method_27958 getIoWorkerExecutor ()Ljava/util/concurrent/ExecutorService; COMMENT {@return the executor for disk or network IO tasks} - METHOD method_27959 createIoWorker ()Ljava/util/concurrent/ExecutorService; + METHOD method_27959 createIoWorker (Ljava/lang/String;Z)Ljava/util/concurrent/ExecutorService; METHOD method_28122 createWorker (Ljava/lang/String;)Ljava/util/concurrent/ExecutorService; ARG 0 name - METHOD method_28123 (Ljava/lang/String;Ljava/util/concurrent/ForkJoinPool;)Ljava/util/concurrent/ForkJoinWorkerThread; - ARG 1 forkJoinPool METHOD method_29187 getChoiceType (Lcom/mojang/datafixers/DSL$TypeReference;Ljava/lang/String;)Lcom/mojang/datafixers/types/Type; ARG 0 typeReference ARG 1 id