From a5d388bcf16e8f168f9d429ffc4e969ce1f8c0c2 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Thu, 16 Nov 2023 16:07:59 +0000 Subject: [PATCH] 23w46a --- 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 + mappings/net/minecraft/class_9013.mapping | 2 + mappings/net/minecraft/class_9015.mapping | 3 ++ .../client/gui/hud/InGameHud.mapping | 2 +- .../client/gui/hud/PlayerListHud.mapping | 3 +- .../client/gui/screen/StatsScreen.mapping | 1 - .../MultiplayerServerListWidget.mapping | 3 +- ...SocialInteractionsPlayerListWidget.mapping | 3 +- .../screen/option/GameOptionsScreen.mapping | 6 --- .../world/CustomizeFlatLevelScreen.mapping | 1 - .../gui/screen/world/WorldListWidget.mapping | 5 +-- .../client/gui/widget/EntryListWidget.mapping | 16 +------- .../realms/RealmsObjectSelectionList.mapping | 3 +- .../argument/OperationArgumentType.mapping | 7 +--- .../argument/ScoreHolderArgumentType.mapping | 4 +- .../minecraft/data/family/BlockFamily.mapping | 6 +-- .../data/server/recipe/RecipeProvider.mapping | 16 +------- mappings/net/minecraft/entity/Entity.mapping | 2 +- .../provider/score/LootScoreProvider.mapping | 2 - .../ScoreboardPlayerUpdateS2CPacket.mapping | 19 +++------- .../minecraft/scoreboard/Scoreboard.mapping | 37 +++++-------------- .../scoreboard/ScoreboardObjective.mapping | 2 +- .../scoreboard/ScoreboardPlayerScore.mapping | 24 ------------ .../server/command/ExecuteCommand.mapping | 15 +------- .../server/command/ScoreboardCommand.mapping | 6 +-- .../server/command/TestCommand.mapping | 4 +- .../server/command/TriggerCommand.mapping | 15 ++------ .../server/network/ServerPlayerEntity.mapping | 8 ++-- .../server/world/ServerWorld.mapping | 4 +- .../minecraft/text/ScoreTextContent.mapping | 6 +-- mappings/net/minecraft/text/Text.mapping | 6 --- .../packageinfo/PackageInfo9026.mapping | 1 + 71 files changed, 91 insertions(+), 182 deletions(-) create mode 100644 mappings/net/minecraft/class_9013.mapping create mode 100644 mappings/net/minecraft/class_9015.mapping create mode 100644 mappings/net/minecraft/unused/packageinfo/PackageInfo9026.mapping diff --git a/build.gradle b/build.gradle index 325db06262..f828490ce7 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w45a" +def minecraft_version = "23w46a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping index 1df557014d..c99ec9b489 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 getPlayerPredicate 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..c321c8214e 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 getPlayerPredicate 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..ddf4cb1b28 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 getPlayerPredicate 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..82c6d40f98 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 getPlayerPredicate 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..547592e132 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 getPlayerPredicate 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..32eb3d1112 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 getPlayerPredicate 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..00298ecc14 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 getPlayerPredicate 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..eed68aee5d 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 getPlayerPredicate 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..c2fdd239de 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 getPlayerPredicate 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..b4ea0c60d7 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 getPlayerPredicate 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..aaa081f188 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 getPlayerPredicate 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..ea13aadde2 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 getPlayerPredicate 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..4095cf87cc 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 getPlayerPredicate 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..7c96643e0b 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 getPlayerPredicate 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..997978b409 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 getPlayerPredicate 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..7602a71bb5 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 getPlayerPredicate 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..6c3dea1673 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 getPlayerPredicate 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..611e78dbac 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 getPlayerPredicate 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..86ad98db25 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 getPlayerPredicate 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..1df85c82d2 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 getPlayerPredicate 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..8ac0b42a8e 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 getPlayerPredicate 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..a36953f7c9 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 getPlayerPredicate 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..30083a3802 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 getPlayerPredicate 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..9d3b978454 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 getPlayerPredicate 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..60bbc62150 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 getPlayerPredicate 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..359c9cca0b 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 getPlayerPredicate 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..aa1c581bb5 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 getPlayerPredicate 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..8d25297832 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 getPlayerPredicate 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..fd19f99208 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 getPlayerPredicate 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..42584d7f0f 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 getPlayerPredicate 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..d77af9e843 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 getPlayerPredicate 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..b91e2f1c21 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 getPlayerPredicate 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..67ad607b14 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 getPlayerPredicate 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..35a5504803 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 getPlayerPredicate 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..1842630116 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 getPlayerPredicate 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..cad92e903b 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 getPlayerPredicate 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..7c2fb6dd56 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 getPlayerPredicate 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..026dfb3478 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 getPlayerPredicate 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..e4550d3fa2 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 getPlayerPredicate 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/class_9013.mapping b/mappings/net/minecraft/class_9013.mapping new file mode 100644 index 0000000000..c4738e37ac --- /dev/null +++ b/mappings/net/minecraft/class_9013.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_9013 + METHOD method_1131 isLocked ()Z diff --git a/mappings/net/minecraft/class_9015.mapping b/mappings/net/minecraft/class_9015.mapping new file mode 100644 index 0000000000..2bcd732c86 --- /dev/null +++ b/mappings/net/minecraft/class_9015.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9015 + METHOD method_5476 getDisplayName ()Lnet/minecraft/class_2561; + METHOD method_5820 getEntityName ()Ljava/lang/String; diff --git a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping index 06b802ed83..7999199aee 100644 --- a/mappings/net/minecraft/client/gui/hud/InGameHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/InGameHud.mapping @@ -108,7 +108,7 @@ CLASS net/minecraft/class_329 net/minecraft/client/gui/hud/InGameHud METHOD method_1749 renderHeldItemTooltip (Lnet/minecraft/class_332;)V ARG 1 context METHOD method_1750 getPlayerListHud ()Lnet/minecraft/class_355; - METHOD method_1751 (Lnet/minecraft/class_267;)Z + METHOD method_1751 (Lnet/minecraft/class_9011;)Z ARG 0 score METHOD method_1752 renderMountJumpBar (Lnet/minecraft/class_1316;Lnet/minecraft/class_332;I)V ARG 1 mount diff --git a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping index 6898c7fbb3..a31e77fe65 100644 --- a/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/PlayerListHud.mapping @@ -41,10 +41,9 @@ CLASS net/minecraft/class_355 net/minecraft/client/gui/hud/PlayerListHud METHOD method_1920 clear ()V METHOD method_1921 setVisible (Z)V ARG 1 visible - METHOD method_1922 renderScoreboardObjective (Lnet/minecraft/class_266;ILjava/lang/String;IILjava/util/UUID;Lnet/minecraft/class_332;)V + METHOD method_1922 renderScoreboardObjective (Lnet/minecraft/class_266;ILnet/minecraft/class_355$class_9018;IILjava/util/UUID;Lnet/minecraft/class_332;)V ARG 1 objective ARG 2 y - ARG 3 player ARG 4 left ARG 5 right ARG 6 uuid diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping index d6264a0736..01b13ee12f 100644 --- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping @@ -17,7 +17,6 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen ARG 2 statHandler METHOD method_19390 selectStatList (Lnet/minecraft/class_4280;)V ARG 1 list - METHOD method_19399 getSelectedStatList ()Lnet/minecraft/class_4280; METHOD method_19866 (Lnet/minecraft/class_4185;)V ARG 1 button METHOD method_19867 (Lnet/minecraft/class_4185;)V diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index bd6f131f11..8e8847b810 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -31,14 +31,13 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi FIELD field_45528 JOIN_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; FIELD field_45529 JOIN_TEXTURE Lnet/minecraft/class_2960; FIELD field_45530 MOVE_UP_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_500;Lnet/minecraft/class_310;IIIII)V + METHOD (Lnet/minecraft/class_500;Lnet/minecraft/class_310;IIII)V ARG 1 screen ARG 2 client ARG 3 width ARG 4 height ARG 5 top ARG 6 bottom - ARG 7 entryHeight METHOD method_20125 setServers (Lnet/minecraft/class_641;)V ARG 1 servers METHOD method_20126 setLanServers (Ljava/util/List;)V diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping index 2a14c5ddae..5dfa988885 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/SocialInteractionsPlayerListWidget.mapping @@ -2,14 +2,13 @@ CLASS net/minecraft/class_5521 net/minecraft/client/gui/screen/multiplayer/Socia FIELD field_26867 parent Lnet/minecraft/class_5522; FIELD field_26869 players Ljava/util/List; FIELD field_26870 currentSearch Ljava/lang/String; - METHOD (Lnet/minecraft/class_5522;Lnet/minecraft/class_310;IIIII)V + METHOD (Lnet/minecraft/class_5522;Lnet/minecraft/class_310;IIII)V ARG 1 parent ARG 2 client ARG 3 width ARG 4 height ARG 5 top ARG 6 bottom - ARG 7 itemHeight METHOD method_31342 (Lnet/minecraft/class_5519;)Z ARG 1 player METHOD method_31345 setPlayerOnline (Lnet/minecraft/class_640;Lnet/minecraft/class_5522$class_5523;)V diff --git a/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping b/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping index a0d6082290..686666580e 100644 --- a/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/option/GameOptionsScreen.mapping @@ -5,9 +5,3 @@ CLASS net/minecraft/class_4667 net/minecraft/client/gui/screen/option/GameOption ARG 1 parent ARG 2 gameOptions ARG 3 title - METHOD method_45626 render (Lnet/minecraft/class_332;Lnet/minecraft/class_353;IIF)V - ARG 1 context - ARG 2 optionButtons - ARG 3 mouseX - ARG 4 mouseY - ARG 5 tickDelta diff --git a/mappings/net/minecraft/client/gui/screen/world/CustomizeFlatLevelScreen.mapping b/mappings/net/minecraft/client/gui/screen/world/CustomizeFlatLevelScreen.mapping index 4ac164db83..bf4969aae9 100644 --- a/mappings/net/minecraft/client/gui/screen/world/CustomizeFlatLevelScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/CustomizeFlatLevelScreen.mapping @@ -31,7 +31,6 @@ CLASS net/minecraft/class_413 net/minecraft/client/gui/screen/world/CustomizeFla ARG 1 config METHOD method_29055 getConfig ()Lnet/minecraft/class_3232; CLASS class_4192 SuperflatLayersListWidget - FIELD field_44667 STATS_ICONS_TEXTURE Lnet/minecraft/class_2960; METHOD method_19372 updateLayers ()V CLASS class_4193 SuperflatLayerEntry METHOD method_19373 renderIconBackgroundTexture (Lnet/minecraft/class_332;II)V diff --git a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping index 6b88d8d3ef..d848bdd332 100644 --- a/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/world/WorldListWidget.mapping @@ -23,16 +23,13 @@ CLASS net/minecraft/class_528 net/minecraft/client/gui/screen/world/WorldListWid FIELD field_45576 JOIN_HIGHLIGHTED_TEXTURE Lnet/minecraft/class_2960; FIELD field_45577 JOIN_TEXTURE Lnet/minecraft/class_2960; FIELD field_46897 INCOMPATIBLE_TOOLTIP Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_526;Lnet/minecraft/class_310;IIIIILjava/lang/String;Lnet/minecraft/class_528;)V + METHOD (Lnet/minecraft/class_526;Lnet/minecraft/class_310;IIIILjava/lang/String;Lnet/minecraft/class_528;)V ARG 1 parent ARG 2 client ARG 3 width ARG 4 height ARG 5 top ARG 6 bottom - ARG 7 itemHeight - ARG 8 search - ARG 9 oldWidget METHOD method_20159 getSelectedAsOptional ()Ljava/util/Optional; METHOD method_2752 getParent ()Lnet/minecraft/class_526; METHOD method_43453 shouldShow (Ljava/lang/String;Lnet/minecraft/class_34;)Z diff --git a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping index 82d4d69cc0..77486ad015 100644 --- a/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping +++ b/mappings/net/minecraft/client/gui/widget/EntryListWidget.mapping @@ -1,13 +1,7 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget - FIELD field_19085 top I - FIELD field_19086 bottom I - FIELD field_19087 right I - FIELD field_19088 left I FIELD field_22739 children Ljava/util/List; FIELD field_22740 client Lnet/minecraft/class_310; FIELD field_22741 itemHeight I - FIELD field_22742 width I - FIELD field_22743 height I FIELD field_22744 centerListVertically Z FIELD field_22747 renderHeader Z FIELD field_22748 headerHeight I @@ -17,13 +11,12 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget FIELD field_26846 renderBackground Z FIELD field_33780 hoveredEntry Lnet/minecraft/class_350$class_351; FIELD field_45908 SCROLLER_TEXTURE Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_310;IIIII)V + METHOD (Lnet/minecraft/class_310;IIII)V ARG 1 client ARG 2 width ARG 3 height ARG 4 top ARG 5 bottom - ARG 6 itemHeight METHOD method_25307 setScrollAmount (D)V ARG 1 amount METHOD method_25308 getEntryAtPosition (DD)Lnet/minecraft/class_350$class_351; @@ -67,11 +60,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget METHOD method_25321 addEntry (Lnet/minecraft/class_350$class_351;)I ARG 1 entry METHOD method_25322 getRowWidth ()I - METHOD method_25323 updateSize (IIII)V - ARG 1 width - ARG 2 height - ARG 3 top - ARG 4 bottom METHOD method_25324 centerScrollOn (Lnet/minecraft/class_350$class_351;)V ARG 1 entry METHOD method_25326 getEntry (I)Lnet/minecraft/class_350$class_351; @@ -84,8 +72,6 @@ CLASS net/minecraft/class_350 net/minecraft/client/gui/widget/EntryListWidget METHOD method_25331 getMaxScroll ()I METHOD method_25332 isSelectedEntry (I)Z ARG 1 index - METHOD method_25333 setLeftPos (I)V - ARG 1 left METHOD method_25334 getSelectedOrNull ()Lnet/minecraft/class_350$class_351; COMMENT {@return the selected entry of this entry list, or {@code null} if there is none} METHOD method_25337 getRowTop (I)I diff --git a/mappings/net/minecraft/client/realms/RealmsObjectSelectionList.mapping b/mappings/net/minecraft/client/realms/RealmsObjectSelectionList.mapping index 49ce80d1d4..310022ec88 100644 --- a/mappings/net/minecraft/client/realms/RealmsObjectSelectionList.mapping +++ b/mappings/net/minecraft/client/realms/RealmsObjectSelectionList.mapping @@ -1,10 +1,9 @@ CLASS net/minecraft/class_4904 net/minecraft/client/realms/RealmsObjectSelectionList - METHOD (IIIII)V + METHOD (IIII)V ARG 1 width ARG 2 height ARG 3 top ARG 4 bottom - ARG 5 itemHeight METHOD method_25489 setSelected (I)V ARG 1 index METHOD method_25492 setSelectedItem (I)V diff --git a/mappings/net/minecraft/command/argument/OperationArgumentType.mapping b/mappings/net/minecraft/command/argument/OperationArgumentType.mapping index 567e1dafd5..41474aa62e 100644 --- a/mappings/net/minecraft/command/argument/OperationArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/OperationArgumentType.mapping @@ -6,9 +6,6 @@ CLASS net/minecraft/class_2218 net/minecraft/command/argument/OperationArgumentT ARG 1 context ARG 2 builder METHOD method_9404 operation ()Lnet/minecraft/class_2218; - METHOD method_9405 (II)I - ARG 0 a - ARG 1 b METHOD method_9406 (II)I ARG 0 a ARG 1 b @@ -20,7 +17,7 @@ CLASS net/minecraft/class_2218 net/minecraft/command/argument/OperationArgumentT METHOD method_9409 getOperation (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_2218$class_2219; ARG 0 context ARG 1 name - METHOD method_9410 (Lnet/minecraft/class_267;Lnet/minecraft/class_267;)V + METHOD method_9410 (Lnet/minecraft/class_9014;Lnet/minecraft/class_9014;)V ARG 0 a ARG 1 b METHOD method_9411 (II)I @@ -37,7 +34,7 @@ CLASS net/minecraft/class_2218 net/minecraft/command/argument/OperationArgumentT METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; ARG 1 reader CLASS class_2219 Operation - METHOD apply (Lnet/minecraft/class_267;Lnet/minecraft/class_267;)V + METHOD apply (Lnet/minecraft/class_9014;Lnet/minecraft/class_9014;)V ARG 1 a ARG 2 b CLASS class_2220 IntOperator diff --git a/mappings/net/minecraft/command/argument/ScoreHolderArgumentType.mapping b/mappings/net/minecraft/command/argument/ScoreHolderArgumentType.mapping index 737d97fd53..c3e6dbce5c 100644 --- a/mappings/net/minecraft/command/argument/ScoreHolderArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ScoreHolderArgumentType.mapping @@ -16,13 +16,13 @@ CLASS net/minecraft/class_2233 net/minecraft/command/argument/ScoreHolderArgumen ARG 1 name ARG 2 players METHOD method_9451 scoreHolders ()Lnet/minecraft/class_2233; - METHOD method_9452 getScoreHolder (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Ljava/lang/String; + METHOD method_9452 getScoreHolder (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_9015; ARG 0 context ARG 1 name METHOD method_9455 (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 0 context ARG 1 builder - METHOD method_9456 (Ljava/util/Collection;Lnet/minecraft/class_2168;Ljava/util/function/Supplier;)Ljava/util/Collection; + METHOD method_9456 (Ljava/util/List;Lnet/minecraft/class_2168;Ljava/util/function/Supplier;)Ljava/util/Collection; ARG 1 source ARG 2 players METHOD method_9457 (Lnet/minecraft/class_2168;Ljava/util/function/Supplier;)Ljava/util/Collection; diff --git a/mappings/net/minecraft/data/family/BlockFamily.mapping b/mappings/net/minecraft/data/family/BlockFamily.mapping index 72581ac226..51d6610bd7 100644 --- a/mappings/net/minecraft/data/family/BlockFamily.mapping +++ b/mappings/net/minecraft/data/family/BlockFamily.mapping @@ -5,7 +5,6 @@ CLASS net/minecraft/class_5794 net/minecraft/data/family/BlockFamily FIELD field_28529 generateRecipes Z FIELD field_28530 group Ljava/lang/String; FIELD field_28531 unlockCriterionName Ljava/lang/String; - FIELD field_40591 requiredFeatures Lnet/minecraft/class_7699; METHOD (Lnet/minecraft/class_2248;)V ARG 1 baseBlock METHOD method_33469 getBaseBlock ()Lnet/minecraft/class_2248; @@ -13,8 +12,7 @@ CLASS net/minecraft/class_5794 net/minecraft/data/family/BlockFamily ARG 1 variant METHOD method_33474 getVariants ()Ljava/util/Map; METHOD method_33477 shouldGenerateModels ()Z - METHOD method_33478 shouldGenerateRecipes (Lnet/minecraft/class_7699;)Z - ARG 1 enabledFeatures + METHOD method_33478 shouldGenerateRecipes ()Z METHOD method_33479 getGroup ()Ljava/util/Optional; METHOD method_33480 getUnlockCriterionName ()Ljava/util/Optional; CLASS class_5795 Builder @@ -57,8 +55,6 @@ CLASS net/minecraft/class_5794 net/minecraft/data/family/BlockFamily ARG 1 block METHOD method_36544 cut (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795; ARG 1 block - METHOD method_45964 requires ([Lnet/minecraft/class_7696;)Lnet/minecraft/class_5794$class_5795; - ARG 1 features METHOD method_45965 mosaic (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795; ARG 1 block METHOD method_45966 customFence (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795; diff --git a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping index 6bbcc921e9..14935a4a2e 100644 --- a/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping +++ b/mappings/net/minecraft/data/server/recipe/RecipeProvider.mapping @@ -141,12 +141,8 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider COMMENT

Purpur is handled separately because both purpur and purpur pillars can be used to craft purpur slabs and stairs. ARG 0 family ARG 1 variant - METHOD method_33534 (Lnet/minecraft/class_5794;Lnet/minecraft/class_8790;Lnet/minecraft/class_5794$class_5796;Lnet/minecraft/class_2248;)V - ARG 2 variant - ARG 3 block - METHOD method_33535 generateFamily (Lnet/minecraft/class_8790;Lnet/minecraft/class_5794;)V + METHOD method_33535 generateFamily (Lnet/minecraft/class_8790;Lnet/minecraft/class_5794;Lnet/minecraft/class_7699;)V ARG 0 exporter - ARG 1 family METHOD method_33536 (Lnet/minecraft/class_5797;Lnet/minecraft/class_5794$class_5796;Ljava/lang/String;)V ARG 2 group METHOD method_33537 createCondensingRecipe (Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797; @@ -225,11 +221,7 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider ARG 0 exporter ARG 1 output ARG 2 input - METHOD method_34853 (Lnet/minecraft/class_8790;Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;)V - ARG 1 input - ARG 2 output - METHOD method_34854 offerWaxingRecipes (Lnet/minecraft/class_8790;)V - ARG 0 exporter + METHOD method_34854 offerWaxingRecipes (Lnet/minecraft/class_8790;Lnet/minecraft/class_7699;)V METHOD method_35914 conditionsFromItem (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_1935;)Lnet/minecraft/class_175; ARG 0 count ARG 1 item @@ -333,8 +325,6 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider ARG 0 exporter ARG 1 output ARG 2 input - METHOD method_46205 (Lnet/minecraft/class_7699;Lnet/minecraft/class_5794;)Z - ARG 1 family METHOD method_46206 saveRecipeAdvancement (Lnet/minecraft/class_7403;Lnet/minecraft/class_8779;)Ljava/util/concurrent/CompletableFuture; ARG 1 cache ARG 2 advancement @@ -350,8 +340,6 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/recipe/RecipeProvider ARG 1 category ARG 2 output ARG 3 input - METHOD method_46210 (Lnet/minecraft/class_8790;Lnet/minecraft/class_5794;)V - ARG 1 family METHOD method_46212 offerMosaicRecipe (Lnet/minecraft/class_8790;Lnet/minecraft/class_7800;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V ARG 0 exporter ARG 1 category diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index b8b61b59df..a25183be92 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -2010,7 +2010,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_5819 populateCrashReport (Lnet/minecraft/class_129;)V COMMENT Populates the crash report section to include the entity's information. ARG 1 section - METHOD method_5820 getEntityName ()Ljava/lang/String; + METHOD method_5820 ()Ljava/lang/String; COMMENT {@return the name uniquely identifying the entity} COMMENT COMMENT

Unlike {@link #getName}, this is guaranteed to be unique. This is the UUID diff --git a/mappings/net/minecraft/loot/provider/score/LootScoreProvider.mapping b/mappings/net/minecraft/loot/provider/score/LootScoreProvider.mapping index d03125f74d..0187f9a50e 100644 --- a/mappings/net/minecraft/loot/provider/score/LootScoreProvider.mapping +++ b/mappings/net/minecraft/loot/provider/score/LootScoreProvider.mapping @@ -1,5 +1,3 @@ CLASS net/minecraft/class_5670 net/minecraft/loot/provider/score/LootScoreProvider METHOD method_32475 getType ()Lnet/minecraft/class_5669; - METHOD method_32476 getName (Lnet/minecraft/class_47;)Ljava/lang/String; - ARG 1 context METHOD method_32477 getRequiredParameters ()Ljava/util/Set; diff --git a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardPlayerUpdateS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardPlayerUpdateS2CPacket.mapping index 638d2c64d3..bbbe4af1e6 100644 --- a/mappings/net/minecraft/network/packet/s2c/play/ScoreboardPlayerUpdateS2CPacket.mapping +++ b/mappings/net/minecraft/network/packet/s2c/play/ScoreboardPlayerUpdateS2CPacket.mapping @@ -1,16 +1,9 @@ CLASS net/minecraft/class_2757 net/minecraft/network/packet/s2c/play/ScoreboardPlayerUpdateS2CPacket - FIELD field_12610 playerName Ljava/lang/String; - FIELD field_12611 score I - FIELD field_12612 updateMode Lnet/minecraft/class_2995$class_2996; - FIELD field_12613 objectiveName Ljava/lang/String; + FIELD comp_2122 playerName Ljava/lang/String; + FIELD comp_2123 objectiveName Ljava/lang/String; + FIELD comp_2124 score I METHOD (Lnet/minecraft/class_2540;)V ARG 1 buf - METHOD (Lnet/minecraft/class_2995$class_2996;Ljava/lang/String;Ljava/lang/String;I)V - ARG 1 updateMode - ARG 2 objectiveName - ARG 3 playerName - ARG 4 score - METHOD method_11862 getPlayerName ()Ljava/lang/String; - METHOD method_11863 getUpdateMode ()Lnet/minecraft/class_2995$class_2996; - METHOD method_11864 getObjectiveName ()Ljava/lang/String; - METHOD method_11865 getScore ()I + METHOD comp_2122 playerName ()Ljava/lang/String; + METHOD comp_2123 objectiveName ()Ljava/lang/String; + METHOD comp_2124 score ()I diff --git a/mappings/net/minecraft/scoreboard/Scoreboard.mapping b/mappings/net/minecraft/scoreboard/Scoreboard.mapping index dbeee15c91..d996191d26 100644 --- a/mappings/net/minecraft/scoreboard/Scoreboard.mapping +++ b/mappings/net/minecraft/scoreboard/Scoreboard.mapping @@ -7,19 +7,13 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard FIELD field_1432 objectiveSlots Ljava/util/Map; FIELD field_36309 LOGGER Lorg/slf4j/Logger; METHOD method_1150 resetEntityScore (Lnet/minecraft/class_1297;)V - ARG 1 entity METHOD method_1151 getObjectives ()Ljava/util/Collection; - METHOD method_1152 updatePlayerScore (Ljava/lang/String;)V - ARG 1 playerName + METHOD method_1152 updatePlayerScore (Lnet/minecraft/class_9015;)V METHOD method_1153 getTeam (Ljava/lang/String;)Lnet/minecraft/class_268; ARG 1 name METHOD method_1154 updateScoreboardTeam (Lnet/minecraft/class_268;)V ARG 1 team - METHOD method_1155 resetPlayerScore (Ljava/lang/String;Lnet/minecraft/class_266;)V - ARG 1 playerName - ARG 2 objective - METHOD method_1156 (Lnet/minecraft/class_2499;Ljava/util/Collection;)V - ARG 1 scores + METHOD method_1155 resetPlayerScore (Lnet/minecraft/class_9015;Lnet/minecraft/class_266;)V METHOD method_1157 removePlayerFromTeam (Ljava/lang/String;Lnet/minecraft/class_268;)V ARG 1 playerName ARG 2 team @@ -29,18 +23,14 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard METHOD method_1159 getTeams ()Ljava/util/Collection; METHOD method_1160 updateScoreboardTeamAndPlayers (Lnet/minecraft/class_268;)V ARG 1 team - METHOD method_1161 (Lnet/minecraft/class_2499;Lnet/minecraft/class_267;)V - ARG 1 score - METHOD method_1162 forEachScore (Lnet/minecraft/class_274;Ljava/lang/String;Ljava/util/function/Consumer;)V + METHOD method_1162 forEachScore (Lnet/minecraft/class_274;Lnet/minecraft/class_9015;Ljava/util/function/Consumer;)V ARG 1 criterion - ARG 2 player ARG 3 action METHOD method_1163 getObjectiveNames ()Ljava/util/Collection; METHOD method_1164 getPlayerTeam (Ljava/lang/String;)Lnet/minecraft/class_268; ARG 1 playerName - METHOD method_1166 getPlayerObjectives (Ljava/lang/String;)Ljava/util/Map; - ARG 1 playerName - METHOD method_1168 addObjective (Ljava/lang/String;Lnet/minecraft/class_274;Lnet/minecraft/class_2561;Lnet/minecraft/class_274$class_275;)Lnet/minecraft/class_266; + METHOD method_1166 getPlayerObjectives (Lnet/minecraft/class_9015;)Lit/unimi/dsi/fastutil/objects/Object2IntMap; + METHOD method_1168 addObjective (Ljava/lang/String;Lnet/minecraft/class_274;Lnet/minecraft/class_2561;Lnet/minecraft/class_274$class_275;ZLnet/minecraft/class_9022;)Lnet/minecraft/class_266; ARG 1 name ARG 2 criterion ARG 3 displayName @@ -55,35 +45,26 @@ CLASS net/minecraft/class_269 net/minecraft/scoreboard/Scoreboard ARG 2 team METHOD method_1173 updateRemovedObjective (Lnet/minecraft/class_266;)V ARG 1 objective - METHOD method_1174 (Ljava/lang/String;)Ljava/util/Map; - ARG 0 name METHOD method_1175 updateExistingObjective (Lnet/minecraft/class_266;)V ARG 1 objective - METHOD method_1176 updateScore (Lnet/minecraft/class_267;)V + METHOD method_1176 updateScore (Lnet/minecraft/class_9015;Lnet/minecraft/class_266;Lnet/minecraft/class_267;)V ARG 1 score METHOD method_1178 getKnownPlayers ()Ljava/util/Collection; METHOD method_1179 (Lnet/minecraft/class_274;)Ljava/util/List; ARG 0 criterionx - METHOD method_1180 getPlayerScore (Ljava/lang/String;Lnet/minecraft/class_266;)Lnet/minecraft/class_267; - ARG 1 playerName + METHOD method_1180 getPlayerScore (Lnet/minecraft/class_9015;Lnet/minecraft/class_266;)Lnet/minecraft/class_9014; ARG 2 objective - METHOD method_1182 (Ljava/util/function/Consumer;Ljava/lang/String;Lnet/minecraft/class_266;)V + METHOD method_1182 (Ljava/util/function/Consumer;Lnet/minecraft/class_9015;Lnet/minecraft/class_266;)V ARG 3 objective - METHOD method_1183 playerHasObjective (Ljava/lang/String;Lnet/minecraft/class_266;)Z - ARG 1 playerName - ARG 2 objective METHOD method_1184 getAllPlayerScores (Lnet/minecraft/class_266;)Ljava/util/Collection; ARG 1 objective METHOD method_1185 updateObjective (Lnet/minecraft/class_266;)V ARG 1 objective - METHOD method_1187 (Ljava/lang/String;Lnet/minecraft/class_266;)Lnet/minecraft/class_267; - ARG 2 objectivex METHOD method_1188 readNbt (Lnet/minecraft/class_2499;)V ARG 1 list METHOD method_1189 getObjectiveForSlot (Lnet/minecraft/class_8646;)Lnet/minecraft/class_266; ARG 1 slot - METHOD method_1190 updatePlayerScore (Ljava/lang/String;Lnet/minecraft/class_266;)V - ARG 1 playerName + METHOD method_1190 updatePlayerScore (Lnet/minecraft/class_9015;Lnet/minecraft/class_266;)V ARG 2 objective METHOD method_1191 removeTeam (Lnet/minecraft/class_268;)V ARG 1 team diff --git a/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping b/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping index 25bfc8aaf1..8926055f61 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardObjective.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_266 net/minecraft/scoreboard/ScoreboardObjective FIELD field_1405 name Ljava/lang/String; FIELD field_1406 criterion Lnet/minecraft/class_274; FIELD field_24194 bracketedDisplayName Lnet/minecraft/class_2561; - METHOD (Lnet/minecraft/class_269;Ljava/lang/String;Lnet/minecraft/class_274;Lnet/minecraft/class_2561;Lnet/minecraft/class_274$class_275;)V + METHOD (Lnet/minecraft/class_269;Ljava/lang/String;Lnet/minecraft/class_274;Lnet/minecraft/class_2561;Lnet/minecraft/class_274$class_275;ZLnet/minecraft/class_9022;)V ARG 1 scoreboard ARG 2 name ARG 3 criterion diff --git a/mappings/net/minecraft/scoreboard/ScoreboardPlayerScore.mapping b/mappings/net/minecraft/scoreboard/ScoreboardPlayerScore.mapping index 3f667a8428..52ed1b5d64 100644 --- a/mappings/net/minecraft/scoreboard/ScoreboardPlayerScore.mapping +++ b/mappings/net/minecraft/scoreboard/ScoreboardPlayerScore.mapping @@ -1,28 +1,4 @@ CLASS net/minecraft/class_267 net/minecraft/scoreboard/ScoreboardPlayerScore - FIELD field_1407 scoreboard Lnet/minecraft/class_269; - FIELD field_1408 forceUpdate Z - FIELD field_1409 playerName Ljava/lang/String; - FIELD field_1410 score I FIELD field_1411 locked Z - FIELD field_1412 objective Lnet/minecraft/class_266; - FIELD field_1413 COMPARATOR Ljava/util/Comparator; - METHOD (Lnet/minecraft/class_269;Lnet/minecraft/class_266;Ljava/lang/String;)V - ARG 1 scoreboard - ARG 2 objective - ARG 3 playerName - METHOD method_1122 getScoreboard ()Lnet/minecraft/class_269; - METHOD method_1123 (Lnet/minecraft/class_267;Lnet/minecraft/class_267;)I - ARG 0 a - ARG 1 b - METHOD method_1124 incrementScore (I)V - ARG 1 amount METHOD method_1125 setLocked (Z)V ARG 1 locked - METHOD method_1126 getScore ()I - METHOD method_1127 getObjective ()Lnet/minecraft/class_266; - METHOD method_1128 setScore (I)V - ARG 1 score - METHOD method_1129 getPlayerName ()Ljava/lang/String; - METHOD method_1130 incrementScore ()V - METHOD method_1131 isLocked ()Z - METHOD method_1132 clearScore ()V diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index b3dd232926..17b0b9085e 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -7,9 +7,6 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand FIELD field_46642 INSTANTIATION_FAILURE_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic2CommandExceptionType; METHOD method_13249 (Lcom/mojang/brigadier/context/CommandContext;)Z ARG 0 context - METHOD method_13250 (Ljava/lang/Integer;Ljava/lang/Integer;)Z - ARG 0 a - ARG 1 b METHOD method_13251 (Lnet/minecraft/class_3164$class_3167;ZLcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2168; ARG 2 context METHOD method_13252 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2168; @@ -22,9 +19,6 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 0 source METHOD method_13256 (Lnet/minecraft/class_3164$class_3167;ZLcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2168; ARG 2 context - METHOD method_13257 (Ljava/lang/Integer;Ljava/lang/Integer;)Z - ARG 0 a - ARG 1 b METHOD method_13258 (Lcom/mojang/brigadier/tree/CommandNode;ZLnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 3 builder METHOD method_13259 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2168; @@ -40,9 +34,8 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 4 masked METHOD method_13262 (Lcom/mojang/brigadier/context/CommandContext;)Z ARG 0 context - METHOD method_13263 testScoreCondition (Lcom/mojang/brigadier/context/CommandContext;Ljava/util/function/BiPredicate;)Z + METHOD method_13263 testScoreCondition (Lcom/mojang/brigadier/context/CommandContext;Lnet/minecraft/class_3050$class_9007;)Z ARG 0 context - ARG 1 condition METHOD method_13264 (Lnet/minecraft/class_3164$class_3167;ZLcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2168; ARG 2 context METHOD method_13265 executeStoreData (Lnet/minecraft/class_2168;Lnet/minecraft/class_3162;Lnet/minecraft/class_2203$class_2209;Ljava/util/function/IntFunction;Z)Lnet/minecraft/class_2168; @@ -128,16 +121,10 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand ARG 1 argumentBuilder ARG 2 positive ARG 3 commandRegistryAccess - METHOD method_13299 (Ljava/lang/Integer;Ljava/lang/Integer;)Z - ARG 0 a - ARG 1 b METHOD method_13300 (ZLcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; ARG 1 context METHOD method_13301 (ZLnet/minecraft/class_3164$class_3167;Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/Collection; ARG 2 context - METHOD method_13302 (Ljava/lang/Integer;Ljava/lang/Integer;)Z - ARG 0 a - ARG 1 b METHOD method_13303 countPathMatches (Lnet/minecraft/class_3162;Lnet/minecraft/class_2203$class_2209;)I ARG 0 object ARG 1 path diff --git a/mappings/net/minecraft/server/command/ScoreboardCommand.mapping b/mappings/net/minecraft/server/command/ScoreboardCommand.mapping index 0fce6efdff..f0a809771c 100644 --- a/mappings/net/minecraft/server/command/ScoreboardCommand.mapping +++ b/mappings/net/minecraft/server/command/ScoreboardCommand.mapping @@ -97,9 +97,8 @@ CLASS net/minecraft/class_3115 net/minecraft/server/command/ScoreboardCommand ARG 0 objective ARG 1 target METHOD method_13606 makeRenderTypeArguments ()Lcom/mojang/brigadier/builder/LiteralArgumentBuilder; - METHOD method_13607 executeGet (Lnet/minecraft/class_2168;Ljava/lang/String;Lnet/minecraft/class_266;)I + METHOD method_13607 executeGet (Lnet/minecraft/class_2168;Lnet/minecraft/class_9015;Lnet/minecraft/class_266;)I ARG 0 source - ARG 1 target ARG 2 objective METHOD method_13608 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context @@ -120,6 +119,5 @@ CLASS net/minecraft/class_3115 net/minecraft/server/command/ScoreboardCommand ARG 0 source ARG 1 targets ARG 2 builder - METHOD method_13614 executeListScores (Lnet/minecraft/class_2168;Ljava/lang/String;)I + METHOD method_13614 executeListScores (Lnet/minecraft/class_2168;Lnet/minecraft/class_9015;)I ARG 0 source - ARG 1 target diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index f426a27d83..22e5f29c4f 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -1,6 +1,6 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand FIELD field_45665 LOGGER Lorg/slf4j/Logger; - METHOD method_22263 (Lnet/minecraft/class_124;Ljava/lang/String;Lnet/minecraft/class_3222;)V + METHOD method_22263 (Ljava/lang/String;Lnet/minecraft/class_124;Lnet/minecraft/class_3222;)V ARG 2 player METHOD method_22264 executePos (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 0 source @@ -41,8 +41,6 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 3 pos METHOD method_22275 sendMessage (Lnet/minecraft/class_3218;Ljava/lang/String;Lnet/minecraft/class_124;)V ARG 0 world - ARG 1 message - ARG 2 formatting METHOD method_22276 (Lnet/minecraft/class_3222;)Z ARG 0 player METHOD method_22277 executeRunThis (Lnet/minecraft/class_2168;Z)I diff --git a/mappings/net/minecraft/server/command/TriggerCommand.mapping b/mappings/net/minecraft/server/command/TriggerCommand.mapping index 0d75477709..10326adaa0 100644 --- a/mappings/net/minecraft/server/command/TriggerCommand.mapping +++ b/mappings/net/minecraft/server/command/TriggerCommand.mapping @@ -12,20 +12,13 @@ CLASS net/minecraft/class_3153 net/minecraft/server/command/TriggerCommand ARG 0 context METHOD method_13816 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context - METHOD method_13817 executeAdd (Lnet/minecraft/class_2168;Lnet/minecraft/class_267;I)I + METHOD method_13817 executeAdd (Lnet/minecraft/class_2168;Lnet/minecraft/class_3222;Lnet/minecraft/class_266;I)I ARG 0 source - ARG 1 score - ARG 2 value - METHOD method_13818 executeSimple (Lnet/minecraft/class_2168;Lnet/minecraft/class_267;)I + METHOD method_13818 executeSimple (Lnet/minecraft/class_2168;Lnet/minecraft/class_3222;Lnet/minecraft/class_266;)I ARG 0 source - ARG 1 score METHOD method_13819 suggestObjectives (Lnet/minecraft/class_2168;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 0 source ARG 1 builder - METHOD method_13820 executeSet (Lnet/minecraft/class_2168;Lnet/minecraft/class_267;I)I + METHOD method_13820 executeSet (Lnet/minecraft/class_2168;Lnet/minecraft/class_3222;Lnet/minecraft/class_266;I)I ARG 0 source - ARG 1 score - ARG 2 value - METHOD method_13821 getScore (Lnet/minecraft/class_3222;Lnet/minecraft/class_266;)Lnet/minecraft/class_267; - ARG 0 player - ARG 1 objective + METHOD method_13821 getScore (Lnet/minecraft/class_269;Lnet/minecraft/class_9015;Lnet/minecraft/class_266;)Lnet/minecraft/class_9014; diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 7c2cbb09b4..18d70040e1 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -82,7 +82,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 3 jumping ARG 4 sneaking METHOD method_14219 getLastActionTime ()J - METHOD method_14221 (ILnet/minecraft/class_267;)V + METHOD method_14221 (ILnet/minecraft/class_9014;)V ARG 1 score METHOD method_14222 lookAtEntity (Lnet/minecraft/class_2183$class_2184;Lnet/minecraft/class_1297;Lnet/minecraft/class_2183$class_2184;)V ARG 1 anchorPoint @@ -91,9 +91,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14224 setCameraEntity (Lnet/minecraft/class_1297;)V ARG 1 entity METHOD method_14226 playerTick ()V - METHOD method_14227 updateScoreboardScore (Ljava/lang/String;Ljava/lang/String;[Lnet/minecraft/class_274;)V - ARG 1 playerName - ARG 2 team + METHOD method_14227 updateScoreboardScore (Lnet/minecraft/class_9015;Lnet/minecraft/class_9015;[Lnet/minecraft/class_274;)V ARG 3 criterions METHOD method_14228 setExperiencePoints (I)V ARG 1 points @@ -122,7 +120,7 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_14245 moveToSpawn (Lnet/minecraft/class_3218;)V ARG 1 world METHOD method_14248 getStatHandler ()Lnet/minecraft/class_3442; - METHOD method_14250 (ILnet/minecraft/class_267;)V + METHOD method_14250 (ILnet/minecraft/class_9014;)V ARG 1 innerScore METHOD method_14251 teleport (Lnet/minecraft/class_3218;DDDFF)V ARG 1 targetWorld diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 9e57eca7a6..f1a295cb0a 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -380,9 +380,7 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld METHOD method_51837 setEnderDragonFight (Lnet/minecraft/class_2881;)V ARG 1 enderDragonFight METHOD method_52168 getRandomSequences ()Lnet/minecraft/class_8565; - METHOD method_52370 tickIceAndSnow (ZLnet/minecraft/class_2338;)V - ARG 1 raining - ARG 2 pos + METHOD method_52370 tickIceAndSnow (Lnet/minecraft/class_2338;)V METHOD method_8448 updateSleepingPlayers ()V METHOD method_8487 locateStructure (Lnet/minecraft/class_6862;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; COMMENT Tries to find the closest structure of a given type near a given block. diff --git a/mappings/net/minecraft/text/ScoreTextContent.mapping b/mappings/net/minecraft/text/ScoreTextContent.mapping index aa92c0d4d6..2ef47b0b7a 100644 --- a/mappings/net/minecraft/text/ScoreTextContent.mapping +++ b/mappings/net/minecraft/text/ScoreTextContent.mapping @@ -2,7 +2,6 @@ CLASS net/minecraft/class_2578 net/minecraft/text/ScoreTextContent FIELD field_11785 objective Ljava/lang/String; FIELD field_11786 selector Lnet/minecraft/class_2300; FIELD field_11787 name Ljava/lang/String; - FIELD field_33290 SENDER_PLACEHOLDER Ljava/lang/String; FIELD field_46626 INNER_CODEC Lcom/mojang/serialization/MapCodec; FIELD field_46627 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_46628 TYPE Lnet/minecraft/class_7417$class_8823; @@ -13,10 +12,9 @@ CLASS net/minecraft/class_2578 net/minecraft/text/ScoreTextContent ARG 1 o METHOD method_10928 getObjective ()Ljava/lang/String; METHOD method_10930 getName ()Ljava/lang/String; - METHOD method_27699 getPlayerName (Lnet/minecraft/class_2168;)Ljava/lang/String; + METHOD method_27699 getPlayerName (Lnet/minecraft/class_2168;)Lnet/minecraft/class_9015; ARG 1 source - METHOD method_27700 getScore (Ljava/lang/String;Lnet/minecraft/class_2168;)Ljava/lang/String; - ARG 1 playerName + METHOD method_27700 getScore (Lnet/minecraft/class_9015;Lnet/minecraft/class_2168;)Lnet/minecraft/class_5250; ARG 2 source METHOD method_27701 parseEntitySelector (Ljava/lang/String;)Lnet/minecraft/class_2300; ARG 0 name diff --git a/mappings/net/minecraft/text/Text.mapping b/mappings/net/minecraft/text/Text.mapping index fe8bd8ed33..c05d84c244 100644 --- a/mappings/net/minecraft/text/Text.mapping +++ b/mappings/net/minecraft/text/Text.mapping @@ -119,8 +119,6 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text COMMENT

A literal text is an unstyled {@link PlainTextContent} without any siblings. COMMENT Such texts are serialized as a string instead of an object. CLASS class_2562 Serialization - FIELD field_11752 JSON_READER_LINE_START Ljava/lang/reflect/Field; - FIELD field_11753 JSON_READER_POS Ljava/lang/reflect/Field; FIELD field_11754 GSON Lcom/google/gson/Gson; METHOD method_10867 toJsonString (Lnet/minecraft/class_2561;)Ljava/lang/String; ARG 0 text @@ -136,10 +134,6 @@ CLASS net/minecraft/class_2561 net/minecraft/text/Text ARG 0 text METHOD method_10877 fromJson (Ljava/lang/String;)Lnet/minecraft/class_5250; ARG 0 json - METHOD method_10879 fromJson (Lcom/mojang/brigadier/StringReader;)Lnet/minecraft/class_5250; - ARG 0 reader - METHOD method_10880 getPosition (Lcom/google/gson/stream/JsonReader;)I - ARG 0 reader CLASS class_8822 Serializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 json diff --git a/mappings/net/minecraft/unused/packageinfo/PackageInfo9026.mapping b/mappings/net/minecraft/unused/packageinfo/PackageInfo9026.mapping new file mode 100644 index 0000000000..98b3331b45 --- /dev/null +++ b/mappings/net/minecraft/unused/packageinfo/PackageInfo9026.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_9026 net/minecraft/unused/packageinfo/PackageInfo9026