From 377ae9194511fb3343a7f8e6293a0bff617a2c1b Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 3 May 2023 14:29:41 +0100 Subject: [PATCH] 23w18a --- build.gradle | 2 +- .../minecraft/advancement/Advancement.mapping | 5 +-- .../criterion/AbstractCriterion.mapping | 2 +- .../AbstractCriterionConditions.mapping | 6 +-- .../BeeNestDestroyedCriterion.mapping | 2 +- .../criterion/BredAnimalsCriterion.mapping | 8 ++-- .../criterion/BrewedPotionCriterion.mapping | 2 +- .../ChangedDimensionCriterion.mapping | 2 +- .../ChanneledLightningCriterion.mapping | 4 +- .../ConstructBeaconCriterion.mapping | 2 +- .../criterion/ConsumeItemCriterion.mapping | 2 +- .../advancement/criterion/Criteria.mapping | 2 +- .../CuredZombieVillagerCriterion.mapping | 6 +-- .../criterion/EffectsChangedCriterion.mapping | 4 +- .../criterion/EnchantedItemCriterion.mapping | 2 +- .../criterion/EnterBlockCriterion.mapping | 2 +- .../EntityHurtPlayerCriterion.mapping | 2 +- .../criterion/FilledBucketCriterion.mapping | 2 +- .../FishingRodHookedCriterion.mapping | 4 +- .../InventoryChangedCriterion.mapping | 2 +- .../criterion/ItemCriterion.mapping | 17 +-------- .../ItemDurabilityChangedCriterion.mapping | 4 +- .../KilledByCrossbowCriterion.mapping | 4 +- .../criterion/LevitationCriterion.mapping | 2 +- .../LightningStrikeCriterion.mapping | 6 +-- .../criterion/OnKilledCriterion.mapping | 4 +- .../criterion/PlacedBlockCriterion.mapping | 30 --------------- ...yerGeneratesContainerLootCriterion.mapping | 2 +- .../PlayerHurtEntityCriterion.mapping | 4 +- ...layerInteractedWithEntityCriterion.mapping | 8 ++-- .../criterion/RecipeCraftedCriterion.mapping | 2 +- .../criterion/RecipeUnlockedCriterion.mapping | 2 +- .../criterion/ShotCrossbowCriterion.mapping | 2 +- .../criterion/SlideDownBlockCriterion.mapping | 2 +- .../criterion/StartedRidingCriterion.mapping | 2 +- .../criterion/SummonedEntityCriterion.mapping | 4 +- .../criterion/TameAnimalCriterion.mapping | 4 +- .../criterion/TargetHitCriterion.mapping | 6 +-- ...hrownItemPickedUpByEntityCriterion.mapping | 8 ++-- .../criterion/TravelCriterion.mapping | 2 +- .../criterion/UsedEnderEyeCriterion.mapping | 2 +- .../criterion/UsedTotemCriterion.mapping | 2 +- .../criterion/UsingItemCriterion.mapping | 2 +- .../criterion/VillagerTradeCriterion.mapping | 4 +- .../minecraft/block/SculkSensorBlock.mapping | 2 - .../minecraft/client/font/BitmapFont.mapping | 18 ++++----- .../minecraft/client/font/FontLoader.mapping | 1 + .../minecraft/client/font/FontType.mapping | 11 +----- .../client/font/ReferenceFont.mapping | 11 ++---- .../minecraft/client/font/SpaceFont.mapping | 8 ---- .../client/font/TrueTypeFontLoader.mapping | 19 ---------- .../minecraft/client/font/UnihexFont.mapping | 4 +- .../minecraft/client/gui/DrawContext.mapping | 22 +---------- .../minecraft/client/gui/hud/DebugHud.mapping | 1 - .../network/ClientAdvancementManager.mapping | 2 +- .../network/ClientPlayNetworkHandler.mapping | 4 -- .../client/render/GameRenderer.mapping | 8 ---- .../client/render/RenderLayer.mapping | 4 +- .../client/render/RenderPhase.mapping | 2 - .../client/render/WorldRenderer.mapping | 2 +- .../util/telemetry/TelemetryManager.mapping | 3 +- .../util/telemetry/WorldSession.mapping | 2 +- ...nillaNetherTabAdvancementGenerator.mapping | 2 +- mappings/net/minecraft/entity/Entity.mapping | 3 -- .../net/minecraft/entity/LivingEntity.mapping | 2 +- .../AlternativeLootCondition.mapping | 4 -- .../loot/condition/LootCondition.mapping | 2 +- .../predicate/entity/EntityPredicate.mapping | 37 ------------------- .../predicate/entity/Extended.mapping | 19 ++++++++++ .../screen/SmithingScreenHandler.mapping | 4 -- .../world/BlockCollisionSpliterator.mapping | 6 +-- .../chunk/light/ChunkLightProvider.mapping | 6 +-- .../world/chunk/light/LightStorage.mapping | 1 - .../RandomSpreadStructurePlacement.mapping | 2 - .../gen/structure/JigsawStructure.mapping | 4 +- 75 files changed, 119 insertions(+), 285 deletions(-) delete mode 100644 mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping delete mode 100644 mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping create mode 100644 mappings/net/minecraft/predicate/entity/Extended.mapping diff --git a/build.gradle b/build.gradle index ea5efe89b1..c92e6676a2 100644 --- a/build.gradle +++ b/build.gradle @@ -21,7 +21,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "23w17a" +def minecraft_version = "23w18a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/advancement/Advancement.mapping b/mappings/net/minecraft/advancement/Advancement.mapping index e83c4abae1..04bbff47c7 100644 --- a/mappings/net/minecraft/advancement/Advancement.mapping +++ b/mappings/net/minecraft/advancement/Advancement.mapping @@ -7,9 +7,8 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement FIELD field_1144 id Lnet/minecraft/class_2960; FIELD field_1145 rewards Lnet/minecraft/class_170; FIELD field_1146 display Lnet/minecraft/class_185; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_161;Lnet/minecraft/class_185;Lnet/minecraft/class_170;Ljava/util/Map;[[Ljava/lang/String;)V + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_161;Lnet/minecraft/class_185;Lnet/minecraft/class_170;Ljava/util/Map;[[Ljava/lang/String;Z)V ARG 1 id - ARG 2 parent ARG 3 display ARG 4 rewards ARG 5 criteria @@ -41,7 +40,7 @@ CLASS net/minecraft/class_161 net/minecraft/advancement/Advancement FIELD field_1151 merger Lnet/minecraft/class_193; FIELD field_1152 parentId Lnet/minecraft/class_2960; FIELD field_1153 rewards Lnet/minecraft/class_170; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_185;Lnet/minecraft/class_170;Ljava/util/Map;[[Ljava/lang/String;)V + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_185;Lnet/minecraft/class_170;Ljava/util/Map;[[Ljava/lang/String;Z)V ARG 1 parentId ARG 2 display ARG 3 rewards diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping index d88d4e87ed..0c07e7df62 100644 --- a/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/AbstractCriterion.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_4558 net/minecraft/advancement/criterion/AbstractCrite ARG 2 predicate METHOD method_22512 (Lnet/minecraft/class_2985;)Ljava/util/Set; ARG 0 manager - METHOD method_27854 conditionsFromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_5257;)Lnet/minecraft/class_195; + METHOD method_27854 conditionsFromJson (Lcom/google/gson/JsonObject;Lnet/minecraft/class_5258;Lnet/minecraft/class_5257;)Lnet/minecraft/class_195; ARG 1 obj ARG 2 playerPredicate ARG 3 predicateDeserializer diff --git a/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping b/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping index 2daf63b552..737a8233af 100644 --- a/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping +++ b/mappings/net/minecraft/advancement/criterion/AbstractCriterionConditions.mapping @@ -1,7 +1,7 @@ CLASS net/minecraft/class_195 net/minecraft/advancement/criterion/AbstractCriterionConditions FIELD field_1270 id Lnet/minecraft/class_2960; - FIELD field_24381 playerPredicate Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;)V + FIELD field_24381 playerPredicate Lnet/minecraft/class_5258; + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_5258;)V ARG 1 id ARG 2 entity - METHOD method_27790 getPlayerPredicate ()Lnet/minecraft/class_2048$class_5258; + METHOD method_27790 getPlayerPredicate ()Lnet/minecraft/class_5258; diff --git a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping index f19c53816a..ea03726d71 100644 --- a/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BeeNestDestroyedCriterion.mapping @@ -13,7 +13,7 @@ CLASS net/minecraft/class_4708 net/minecraft/advancement/criterion/BeeNestDestro FIELD field_21569 block Lnet/minecraft/class_2248; FIELD field_21570 item Lnet/minecraft/class_2073; FIELD field_21571 beeCount Lnet/minecraft/class_2096$class_2100; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2248;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2248;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)V ARG 1 player ARG 2 block ARG 3 item diff --git a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping index 05d7ae120d..87fe66980c 100644 --- a/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BredAnimalsCriterion.mapping @@ -8,10 +8,10 @@ CLASS net/minecraft/class_196 net/minecraft/advancement/criterion/BredAnimalsCri ARG 3 partner ARG 4 child CLASS class_198 Conditions - FIELD field_1275 child Lnet/minecraft/class_2048$class_5258; - FIELD field_1276 parent Lnet/minecraft/class_2048$class_5258; - FIELD field_1277 partner Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;)V + FIELD field_1275 child Lnet/minecraft/class_5258; + FIELD field_1276 parent Lnet/minecraft/class_5258; + FIELD field_1277 partner Lnet/minecraft/class_5258; + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;)V ARG 1 player ARG 2 parent ARG 3 partner diff --git a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping index b33feef19a..f6ca6117e7 100644 --- a/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/BrewedPotionCriterion.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_1996 net/minecraft/advancement/criterion/BrewedPotionC ARG 2 potion CLASS class_1998 Conditions FIELD field_9492 potion Lnet/minecraft/class_1842; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_1842;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_1842;)V ARG 1 player ARG 2 potion METHOD method_8790 matches (Lnet/minecraft/class_1842;)Z diff --git a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping index 592618dd8f..af2f19ca34 100644 --- a/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChangedDimensionCriterion.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_1999 net/minecraft/advancement/criterion/ChangedDimens CLASS class_2001 Conditions FIELD field_9497 from Lnet/minecraft/class_5321; FIELD field_9498 to Lnet/minecraft/class_5321; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;)V ARG 1 player ARG 2 from ARG 3 to diff --git a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping index 62f0796f32..488d53eb56 100644 --- a/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ChanneledLightningCriterion.mapping @@ -8,8 +8,8 @@ CLASS net/minecraft/class_2002 net/minecraft/advancement/criterion/ChanneledLigh ARG 1 player ARG 2 victims CLASS class_2004 Conditions - FIELD field_9503 victims [Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;[Lnet/minecraft/class_2048$class_5258;)V + FIELD field_9503 victims [Lnet/minecraft/class_5258; + METHOD (Lnet/minecraft/class_5258;[Lnet/minecraft/class_5258;)V ARG 1 player ARG 2 victims METHOD method_8808 matches (Ljava/util/Collection;)Z diff --git a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping index c01d0e4ea6..2a83254cfa 100644 --- a/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConstructBeaconCriterion.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_2006 net/minecraft/advancement/criterion/ConstructBeac ARG 2 level CLASS class_2008 Conditions FIELD field_9508 level Lnet/minecraft/class_2096$class_2100; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2096$class_2100;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2096$class_2100;)V ARG 1 player ARG 2 level METHOD method_35110 create ()Lnet/minecraft/class_2006$class_2008; diff --git a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping index b7aad6ae5e..0c941cde20 100644 --- a/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ConsumeItemCriterion.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_2010 net/minecraft/advancement/criterion/ConsumeItemCr ARG 2 stack CLASS class_2012 Conditions FIELD field_9513 item Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;)V ARG 1 player ARG 2 item METHOD method_35112 predicate (Lnet/minecraft/class_2073;)Lnet/minecraft/class_2010$class_2012; diff --git a/mappings/net/minecraft/advancement/criterion/Criteria.mapping b/mappings/net/minecraft/advancement/criterion/Criteria.mapping index 52162c144e..94ba8e439c 100644 --- a/mappings/net/minecraft/advancement/criterion/Criteria.mapping +++ b/mappings/net/minecraft/advancement/criterion/Criteria.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_174 net/minecraft/advancement/criterion/Criteria FIELD field_1188 ENTITY_KILLED_PLAYER Lnet/minecraft/class_2080; FIELD field_1189 CONSTRUCT_BEACON Lnet/minecraft/class_2006; FIELD field_1190 BRED_ANIMALS Lnet/minecraft/class_196; - FIELD field_1191 PLACED_BLOCK Lnet/minecraft/class_2111; + FIELD field_1191 PLACED_BLOCK Lnet/minecraft/class_4711; FIELD field_1192 PLAYER_KILLED_ENTITY Lnet/minecraft/class_2080; FIELD field_1193 EFFECTS_CHANGED Lnet/minecraft/class_2027; FIELD field_1194 LOCATION Lnet/minecraft/class_2135; diff --git a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping index 41d401644b..f3ed36f384 100644 --- a/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/CuredZombieVillagerCriterion.mapping @@ -7,9 +7,9 @@ CLASS net/minecraft/class_2014 net/minecraft/advancement/criterion/CuredZombieVi ARG 2 zombie ARG 3 villager CLASS class_2016 Conditions - FIELD field_9518 zombie Lnet/minecraft/class_2048$class_5258; - FIELD field_9519 villager Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;)V + FIELD field_9518 zombie Lnet/minecraft/class_5258; + FIELD field_9519 villager Lnet/minecraft/class_5258; + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;)V ARG 1 player ARG 2 zombie ARG 3 villager diff --git a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping index 5283d58358..32425c7cab 100644 --- a/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EffectsChangedCriterion.mapping @@ -6,9 +6,9 @@ CLASS net/minecraft/class_2027 net/minecraft/advancement/criterion/EffectsChange ARG 1 player ARG 2 source CLASS class_2029 Conditions - FIELD field_33909 source Lnet/minecraft/class_2048$class_5258; + FIELD field_33909 source Lnet/minecraft/class_5258; FIELD field_9562 effects Lnet/minecraft/class_2102; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2102;Lnet/minecraft/class_2048$class_5258;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2102;Lnet/minecraft/class_5258;)V ARG 1 player ARG 2 effects ARG 3 source diff --git a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping index 2e5a35c808..cddb66f3fc 100644 --- a/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnchantedItemCriterion.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_2030 net/minecraft/advancement/criterion/EnchantedItem CLASS class_2032 Conditions FIELD field_9567 item Lnet/minecraft/class_2073; FIELD field_9568 levels Lnet/minecraft/class_2096$class_2100; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)V ARG 1 player ARG 2 item ARG 3 levels diff --git a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping index 16dad4f52d..35296711d4 100644 --- a/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EnterBlockCriterion.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_2037 net/minecraft/advancement/criterion/EnterBlockCri CLASS class_2039 Conditions FIELD field_9576 block Lnet/minecraft/class_2248; FIELD field_9577 state Lnet/minecraft/class_4559; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;)V ARG 1 player ARG 2 block ARG 3 state diff --git a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping index 882770d2b4..0302d3a176 100644 --- a/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/EntityHurtPlayerCriterion.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_2044 net/minecraft/advancement/criterion/EntityHurtPla ARG 5 conditions CLASS class_2046 Conditions FIELD field_9593 damage Lnet/minecraft/class_2019; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2019;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2019;)V ARG 1 player ARG 2 damage METHOD method_35209 create (Lnet/minecraft/class_2019;)Lnet/minecraft/class_2044$class_2046; diff --git a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping index c99e913ae0..e56a1ef9aa 100644 --- a/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FilledBucketCriterion.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_2054 net/minecraft/advancement/criterion/FilledBucketC ARG 2 stack CLASS class_2056 Conditions FIELD field_9616 item Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;)V ARG 1 player ARG 2 item METHOD method_8937 create (Lnet/minecraft/class_2073;)Lnet/minecraft/class_2054$class_2056; diff --git a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping index bf3dc896c1..2178ccbcae 100644 --- a/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/FishingRodHookedCriterion.mapping @@ -8,10 +8,10 @@ CLASS net/minecraft/class_2058 net/minecraft/advancement/criterion/FishingRodHoo ARG 3 bobber ARG 4 fishingLoots CLASS class_2060 Conditions - FIELD field_24391 hookedEntity Lnet/minecraft/class_2048$class_5258; + FIELD field_24391 hookedEntity Lnet/minecraft/class_5258; FIELD field_9621 rod Lnet/minecraft/class_2073; FIELD field_9623 caughtItem Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;)V ARG 1 player ARG 2 rod ARG 3 hookedEntity diff --git a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping index 964ca61d6e..1d97a2dbe1 100644 --- a/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/InventoryChangedCriterion.mapping @@ -18,7 +18,7 @@ CLASS net/minecraft/class_2066 net/minecraft/advancement/criterion/InventoryChan FIELD field_9630 full Lnet/minecraft/class_2096$class_2100; FIELD field_9631 empty Lnet/minecraft/class_2096$class_2100; FIELD field_9632 items [Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;[Lnet/minecraft/class_2073;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;[Lnet/minecraft/class_2073;)V ARG 1 player ARG 2 occupied ARG 3 full diff --git a/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping index 329748620a..35c34e122a 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemCriterion.mapping @@ -2,25 +2,12 @@ CLASS net/minecraft/class_4711 net/minecraft/advancement/criterion/ItemCriterion FIELD field_21576 id Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2960;)V ARG 1 id - METHOD method_23888 (Lnet/minecraft/class_2680;Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;Lnet/minecraft/class_4711$class_4712;)Z - ARG 4 conditions METHOD method_23889 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V - ARG 1 player - ARG 2 pos - ARG 3 stack CLASS class_4712 Conditions - FIELD field_21579 item Lnet/minecraft/class_2073; - FIELD field_24495 location Lnet/minecraft/class_2090; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2090;Lnet/minecraft/class_2073;)V + FIELD field_24495 location Lnet/minecraft/class_5258; + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;)V ARG 1 id ARG 2 entity - ARG 3 location - ARG 4 item - METHOD method_23892 test (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)Z - ARG 1 state - ARG 2 world - ARG 3 pos - ARG 4 stack METHOD method_27981 create (Lnet/minecraft/class_2090$class_2091;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_4711$class_4712; ARG 0 location ARG 1 item diff --git a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping index 777cfa3ab2..c7ce6e9fc2 100644 --- a/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ItemDurabilityChangedCriterion.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_2069 net/minecraft/advancement/criterion/ItemDurabilit FIELD field_9637 item Lnet/minecraft/class_2073; FIELD field_9638 durability Lnet/minecraft/class_2096$class_2100; FIELD field_9639 delta Lnet/minecraft/class_2096$class_2100; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2096$class_2100;)V ARG 1 player ARG 2 item ARG 3 durability @@ -18,7 +18,7 @@ CLASS net/minecraft/class_2069 net/minecraft/advancement/criterion/ItemDurabilit METHOD method_35229 create (Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2069$class_2071; ARG 0 item ARG 1 durability - METHOD method_8967 create (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2069$class_2071; + METHOD method_8967 create (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2069$class_2071; ARG 0 player ARG 1 item ARG 2 durability diff --git a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping index 0fbaf7372a..0d21d18319 100644 --- a/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/KilledByCrossbowCriterion.mapping @@ -7,8 +7,8 @@ CLASS net/minecraft/class_2076 net/minecraft/advancement/criterion/KilledByCross ARG 2 piercingKilledEntities CLASS class_2078 Conditions FIELD field_9659 uniqueEntityTypes Lnet/minecraft/class_2096$class_2100; - FIELD field_9660 victims [Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;[Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2096$class_2100;)V + FIELD field_9660 victims [Lnet/minecraft/class_5258; + METHOD (Lnet/minecraft/class_5258;[Lnet/minecraft/class_5258;Lnet/minecraft/class_2096$class_2100;)V ARG 1 player ARG 2 victims ARG 3 uniqueEntityTypes diff --git a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping index 1bb610ed0b..5b69bebe80 100644 --- a/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LevitationCriterion.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_2085 net/minecraft/advancement/criterion/LevitationCri CLASS class_2087 Conditions FIELD field_9675 distance Lnet/minecraft/class_2025; FIELD field_9676 duration Lnet/minecraft/class_2096$class_2100; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2025;Lnet/minecraft/class_2096$class_2100;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2025;Lnet/minecraft/class_2096$class_2100;)V ARG 1 player ARG 2 distance ARG 3 duration diff --git a/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping index 961bee1c1b..2bcb30fbf7 100644 --- a/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/LightningStrikeCriterion.mapping @@ -9,9 +9,9 @@ CLASS net/minecraft/class_6405 net/minecraft/advancement/criterion/LightningStri METHOD method_37242 (Lnet/minecraft/class_47;Ljava/util/List;Lnet/minecraft/class_6405$class_6406;)Z ARG 2 conditions CLASS class_6406 Conditions - FIELD field_33926 lightning Lnet/minecraft/class_2048$class_5258; - FIELD field_33927 bystander Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;)V + FIELD field_33926 lightning Lnet/minecraft/class_5258; + FIELD field_33927 bystander Lnet/minecraft/class_5258; + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;)V ARG 1 player ARG 2 lightning ARG 3 bystander diff --git a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping index 974a33932b..bcec25931e 100644 --- a/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/OnKilledCriterion.mapping @@ -10,8 +10,8 @@ CLASS net/minecraft/class_2080 net/minecraft/advancement/criterion/OnKilledCrite ARG 3 killingDamage CLASS class_2083 Conditions FIELD field_9667 killingBlow Lnet/minecraft/class_2022; - FIELD field_9668 entity Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2022;)V + FIELD field_9668 entity Lnet/minecraft/class_5258; + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;Lnet/minecraft/class_2022;)V ARG 1 id ARG 2 player ARG 3 entity diff --git a/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping deleted file mode 100644 index 32f77f5fa7..0000000000 --- a/mappings/net/minecraft/advancement/criterion/PlacedBlockCriterion.mapping +++ /dev/null @@ -1,30 +0,0 @@ -CLASS net/minecraft/class_2111 net/minecraft/advancement/criterion/PlacedBlockCriterion - FIELD field_9724 ID Lnet/minecraft/class_2960; - METHOD method_22490 (Lnet/minecraft/class_2248;Ljava/lang/String;)V - ARG 1 name - METHOD method_22491 (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_3222;Lnet/minecraft/class_1799;Lnet/minecraft/class_2111$class_2113;)Z - ARG 4 conditions - METHOD method_22492 getBlock (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_2248; - ARG 0 obj - METHOD method_9087 trigger (Lnet/minecraft/class_3222;Lnet/minecraft/class_2338;Lnet/minecraft/class_1799;)V - ARG 1 player - ARG 2 blockPos - ARG 3 stack - CLASS class_2113 Conditions - FIELD field_9728 block Lnet/minecraft/class_2248; - FIELD field_9729 location Lnet/minecraft/class_2090; - FIELD field_9730 state Lnet/minecraft/class_4559; - FIELD field_9731 item Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;Lnet/minecraft/class_2090;Lnet/minecraft/class_2073;)V - ARG 1 player - ARG 2 block - ARG 3 state - ARG 4 location - ARG 5 item - METHOD method_9094 matches (Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;)Z - ARG 1 state - ARG 2 pos - ARG 3 world - ARG 4 stack - METHOD method_9095 block (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2111$class_2113; - ARG 0 block diff --git a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping index 76080c1786..d295ded6a4 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerGeneratesContainerLootCriterion.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_5282 net/minecraft/advancement/criterion/PlayerGenerat ARG 2 id CLASS class_5283 Conditions FIELD field_24503 lootTable Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2960;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2960;)V ARG 1 entity ARG 2 lootTable METHOD method_27995 create (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5282$class_5283; diff --git a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping index fa9daf991f..c64f4fd7b9 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerHurtEntityCriterion.mapping @@ -11,8 +11,8 @@ CLASS net/minecraft/class_2115 net/minecraft/advancement/criterion/PlayerHurtEnt ARG 6 blocked CLASS class_2117 Conditions FIELD field_9736 damage Lnet/minecraft/class_2019; - FIELD field_9737 entity Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2019;Lnet/minecraft/class_2048$class_5258;)V + FIELD field_9737 entity Lnet/minecraft/class_5258; + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2019;Lnet/minecraft/class_5258;)V ARG 1 player ARG 2 damage ARG 3 entity diff --git a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping index 5c8c2d4395..a0cace6fb2 100644 --- a/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/PlayerInteractedWithEntityCriterion.mapping @@ -8,18 +8,18 @@ CLASS net/minecraft/class_5409 net/minecraft/advancement/criterion/PlayerInterac ARG 3 entity CLASS class_5410 Conditions FIELD field_25700 item Lnet/minecraft/class_2073; - FIELD field_25701 entity Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;)V + FIELD field_25701 entity Lnet/minecraft/class_5258; + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_5258;)V ARG 1 player ARG 2 item ARG 3 entity - METHOD method_30099 create (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073$class_2074;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_5409$class_5410; + METHOD method_30099 create (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073$class_2074;Lnet/minecraft/class_5258;)Lnet/minecraft/class_5409$class_5410; ARG 0 player ARG 1 itemBuilder ARG 2 entity METHOD method_30100 test (Lnet/minecraft/class_1799;Lnet/minecraft/class_47;)Z ARG 1 stack ARG 2 context - METHOD method_43278 create (Lnet/minecraft/class_2073$class_2074;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_5409$class_5410; + METHOD method_43278 create (Lnet/minecraft/class_2073$class_2074;Lnet/minecraft/class_5258;)Lnet/minecraft/class_5409$class_5410; ARG 0 itemBuilder ARG 1 entity diff --git a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping index 9762882e21..ce93eefd9a 100644 --- a/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/RecipeCraftedCriterion.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_8508 net/minecraft/advancement/criterion/RecipeCrafted CLASS class_8509 Conditions FIELD field_44605 recipeId Lnet/minecraft/class_2960; FIELD field_44606 ingredients Ljava/util/List; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2960;Ljava/util/List;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2960;Ljava/util/List;)V ARG 1 player ARG 2 recipeId ARG 3 ingredients diff --git a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping index 73a63cbabd..d538f7b5ec 100644 --- a/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/RecipeUnlockedCriterion.mapping @@ -9,7 +9,7 @@ CLASS net/minecraft/class_2119 net/minecraft/advancement/criterion/RecipeUnlocke ARG 2 recipe CLASS class_2121 Conditions FIELD field_9742 recipe Lnet/minecraft/class_2960; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2960;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2960;)V ARG 1 player ARG 2 recipe METHOD method_9112 matches (Lnet/minecraft/class_1860;)Z diff --git a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping index ecaf775b96..746cc51a36 100644 --- a/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ShotCrossbowCriterion.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_2123 net/minecraft/advancement/criterion/ShotCrossbowC ARG 2 stack CLASS class_2125 Conditions FIELD field_9747 item Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;)V ARG 1 player ARG 2 item METHOD method_35323 create (Lnet/minecraft/class_2073;)Lnet/minecraft/class_2123$class_2125; diff --git a/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping index 5b4f83397e..bec209beff 100644 --- a/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SlideDownBlockCriterion.mapping @@ -12,7 +12,7 @@ CLASS net/minecraft/class_4713 net/minecraft/advancement/criterion/SlideDownBloc CLASS class_4714 Conditions FIELD field_21587 block Lnet/minecraft/class_2248; FIELD field_21588 state Lnet/minecraft/class_4559; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2248;Lnet/minecraft/class_4559;)V ARG 1 player ARG 2 block ARG 3 state diff --git a/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping b/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping index 851ee1e794..47906ea585 100644 --- a/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/StartedRidingCriterion.mapping @@ -5,7 +5,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 - METHOD (Lnet/minecraft/class_2048$class_5258;)V + METHOD (Lnet/minecraft/class_5258;)V ARG 1 player METHOD method_37260 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_6407$class_6408; ARG 0 player diff --git a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping index 19bea0f8a2..a40e00df4e 100644 --- a/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/SummonedEntityCriterion.mapping @@ -6,8 +6,8 @@ CLASS net/minecraft/class_2128 net/minecraft/advancement/criterion/SummonedEntit ARG 1 player ARG 2 entity CLASS class_2130 Conditions - FIELD field_9752 entity Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;)V + FIELD field_9752 entity Lnet/minecraft/class_5258; + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;)V ARG 1 player ARG 2 entity METHOD method_9129 create (Lnet/minecraft/class_2048$class_2049;)Lnet/minecraft/class_2128$class_2130; diff --git a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping index 1249bdd03e..8431e91ade 100644 --- a/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TameAnimalCriterion.mapping @@ -6,8 +6,8 @@ CLASS net/minecraft/class_2131 net/minecraft/advancement/criterion/TameAnimalCri ARG 1 player ARG 2 entity CLASS class_2133 Conditions - FIELD field_9757 entity Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;)V + FIELD field_9757 entity Lnet/minecraft/class_5258; + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;)V ARG 1 player ARG 2 entity METHOD method_16114 create (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2131$class_2133; diff --git a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping index 7a33c11260..ea51239ead 100644 --- a/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TargetHitCriterion.mapping @@ -9,12 +9,12 @@ CLASS net/minecraft/class_4851 net/minecraft/advancement/criterion/TargetHitCrit ARG 3 conditions CLASS class_4852 Conditions FIELD field_22430 signalStrength Lnet/minecraft/class_2096$class_2100; - FIELD field_22512 projectile Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2048$class_5258;)V + FIELD field_22512 projectile Lnet/minecraft/class_5258; + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_5258;)V ARG 1 player ARG 2 signalStrength ARG 3 projectile - METHOD method_24865 create (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_4851$class_4852; + METHOD method_24865 create (Lnet/minecraft/class_2096$class_2100;Lnet/minecraft/class_5258;)Lnet/minecraft/class_4851$class_4852; ARG 0 signalStrength ARG 1 projectile METHOD method_24952 test (Lnet/minecraft/class_47;Lnet/minecraft/class_243;I)Z diff --git a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping index 64dc5e0607..f7bedc44de 100644 --- a/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/ThrownItemPickedUpByEntityCriterion.mapping @@ -10,13 +10,13 @@ CLASS net/minecraft/class_5279 net/minecraft/advancement/criterion/ThrownItemPic ARG 3 conditions CLASS class_5280 Conditions FIELD field_24493 item Lnet/minecraft/class_2073; - FIELD field_24494 entity Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;)V + FIELD field_24494 entity Lnet/minecraft/class_5258; + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_5258;)V ARG 1 id ARG 2 player ARG 3 item ARG 4 entity - METHOD method_27978 createThrownItemPickedUpByEntity (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_5279$class_5280; + METHOD method_27978 createThrownItemPickedUpByEntity (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_5258;)Lnet/minecraft/class_5279$class_5280; ARG 0 player ARG 1 item ARG 2 entity @@ -24,7 +24,7 @@ CLASS net/minecraft/class_5279 net/minecraft/advancement/criterion/ThrownItemPic ARG 1 player ARG 2 stack ARG 3 entityContext - METHOD method_43277 createThrownItemPickedUpByPlayer (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_2048$class_5258;)Lnet/minecraft/class_5279$class_5280; + METHOD method_43277 createThrownItemPickedUpByPlayer (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;Lnet/minecraft/class_5258;)Lnet/minecraft/class_5279$class_5280; ARG 0 player ARG 1 item ARG 2 entity diff --git a/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping b/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping index d80163bd32..2a847d8036 100644 --- a/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/TravelCriterion.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_2108 net/minecraft/advancement/criterion/TravelCriteri CLASS class_2110 Conditions FIELD field_35040 startPos Lnet/minecraft/class_2090; FIELD field_9723 distance Lnet/minecraft/class_2025; - METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2090;Lnet/minecraft/class_2025;)V + METHOD (Lnet/minecraft/class_2960;Lnet/minecraft/class_5258;Lnet/minecraft/class_2090;Lnet/minecraft/class_2025;)V ARG 1 id ARG 2 entity ARG 3 startPos diff --git a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping index e862e4eb40..a63b720623 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedEnderEyeCriterion.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_2143 net/minecraft/advancement/criterion/UsedEnderEyeC ARG 2 strongholdPos CLASS class_2145 Conditions FIELD field_9772 distance Lnet/minecraft/class_2096$class_2099; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2096$class_2099;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2096$class_2099;)V ARG 1 player ARG 2 distance METHOD method_9162 matches (D)Z diff --git a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping index 83724788c8..7045f59d84 100644 --- a/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsedTotemCriterion.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_2148 net/minecraft/advancement/criterion/UsedTotemCrit ARG 2 stack CLASS class_2150 Conditions FIELD field_9777 item Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;)V ARG 1 player ARG 2 item METHOD method_35399 create (Lnet/minecraft/class_2073;)Lnet/minecraft/class_2148$class_2150; diff --git a/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping b/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping index 9397cf201f..2731da6184 100644 --- a/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/UsingItemCriterion.mapping @@ -7,7 +7,7 @@ CLASS net/minecraft/class_6409 net/minecraft/advancement/criterion/UsingItemCrit ARG 1 conditions CLASS class_6410 Conditions FIELD field_33938 item Lnet/minecraft/class_2073; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;)V ARG 1 player ARG 2 item METHOD method_37265 create (Lnet/minecraft/class_2048$class_2049;Lnet/minecraft/class_2073$class_2074;)Lnet/minecraft/class_6409$class_6410; diff --git a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping index c0f6f6a82a..fda399664d 100644 --- a/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping +++ b/mappings/net/minecraft/advancement/criterion/VillagerTradeCriterion.mapping @@ -8,8 +8,8 @@ CLASS net/minecraft/class_2140 net/minecraft/advancement/criterion/VillagerTrade ARG 3 stack CLASS class_2142 Conditions FIELD field_9766 item Lnet/minecraft/class_2073; - FIELD field_9767 villager Lnet/minecraft/class_2048$class_5258; - METHOD (Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_2073;)V + FIELD field_9767 villager Lnet/minecraft/class_5258; + METHOD (Lnet/minecraft/class_5258;Lnet/minecraft/class_5258;Lnet/minecraft/class_2073;)V ARG 1 player ARG 2 villager ARG 3 item diff --git a/mappings/net/minecraft/block/SculkSensorBlock.mapping b/mappings/net/minecraft/block/SculkSensorBlock.mapping index da188b7b55..d96fc5429f 100644 --- a/mappings/net/minecraft/block/SculkSensorBlock.mapping +++ b/mappings/net/minecraft/block/SculkSensorBlock.mapping @@ -11,9 +11,7 @@ CLASS net/minecraft/class_5703 net/minecraft/block/SculkSensorBlock ARG 1 pos ARG 2 state METHOD method_32903 setCooldown (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V - ARG 0 world ARG 1 pos - ARG 2 state METHOD method_32904 setActive (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;II)V ARG 1 sourceEntity ARG 2 world diff --git a/mappings/net/minecraft/client/font/BitmapFont.mapping b/mappings/net/minecraft/client/font/BitmapFont.mapping index 9246e27274..0b91a9da0b 100644 --- a/mappings/net/minecraft/client/font/BitmapFont.mapping +++ b/mappings/net/minecraft/client/font/BitmapFont.mapping @@ -6,17 +6,18 @@ CLASS net/minecraft/class_386 net/minecraft/client/font/BitmapFont ARG 1 image ARG 2 glyphs CLASS class_387 Loader - FIELD field_2287 ascent I - FIELD field_2288 height I - FIELD field_2289 filename Lnet/minecraft/class_2960; - FIELD field_2290 chars Ljava/util/List; - METHOD (Lnet/minecraft/class_2960;IILjava/util/List;)V + FIELD comp_1519 filename Lnet/minecraft/class_2960; + FIELD comp_1520 height I + FIELD comp_1521 ascent I + FIELD comp_1522 chars [[I + METHOD (Lnet/minecraft/class_2960;II[[I)V ARG 1 id ARG 2 height ARG 3 ascent - ARG 4 chars - METHOD method_2037 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_386$class_387; - ARG 0 json + METHOD comp_1519 filename ()Lnet/minecraft/class_2960; + METHOD comp_1520 height ()I + METHOD comp_1521 ascent ()I + METHOD comp_1522 chars ()[[I METHOD method_2038 findCharacterStartX (Lnet/minecraft/class_1011;IIII)I ARG 1 image ARG 2 characterWidth @@ -24,7 +25,6 @@ CLASS net/minecraft/class_386 net/minecraft/client/font/BitmapFont ARG 4 charPosX ARG 5 charPosY METHOD method_2039 load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; - ARG 1 resourceManager CLASS class_388 BitmapFontGlyph FIELD comp_603 scaleFactor F FIELD comp_604 image Lnet/minecraft/class_1011; diff --git a/mappings/net/minecraft/client/font/FontLoader.mapping b/mappings/net/minecraft/client/font/FontLoader.mapping index 865531b0f7..d892bab0e6 100644 --- a/mappings/net/minecraft/client/font/FontLoader.mapping +++ b/mappings/net/minecraft/client/font/FontLoader.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_389 net/minecraft/client/font/FontLoader + METHOD method_51734 build ()Lcom/mojang/datafixers/util/Either; CLASS class_8539 Loadable METHOD load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; ARG 1 resourceManager diff --git a/mappings/net/minecraft/client/font/FontType.mapping b/mappings/net/minecraft/client/font/FontType.mapping index 5ccf8c2858..d302a8b5fb 100644 --- a/mappings/net/minecraft/client/font/FontType.mapping +++ b/mappings/net/minecraft/client/font/FontType.mapping @@ -1,13 +1,4 @@ CLASS net/minecraft/class_394 net/minecraft/client/font/FontType - FIELD field_2311 REGISTRY Ljava/util/Map; FIELD field_2314 id Ljava/lang/String; - FIELD field_2315 loaderFactory Ljava/util/function/Function; - METHOD (Ljava/lang/String;ILjava/lang/String;Ljava/util/function/Function;)V + METHOD (Ljava/lang/String;ILjava/lang/String;Lcom/mojang/serialization/MapCodec;)V ARG 3 id - ARG 4 factory - METHOD method_2047 createLoader (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_389; - ARG 1 json - METHOD method_2048 byId (Ljava/lang/String;)Lnet/minecraft/class_394; - ARG 0 id - METHOD method_2049 (Ljava/util/HashMap;)V - ARG 0 map diff --git a/mappings/net/minecraft/client/font/ReferenceFont.mapping b/mappings/net/minecraft/client/font/ReferenceFont.mapping index 33abdbf8db..f551dca747 100644 --- a/mappings/net/minecraft/client/font/ReferenceFont.mapping +++ b/mappings/net/minecraft/client/font/ReferenceFont.mapping @@ -1,13 +1,8 @@ CLASS net/minecraft/class_8541 net/minecraft/client/font/ReferenceFont - FIELD field_44762 CODEC Lcom/mojang/serialization/Codec; - FIELD field_44763 id Lnet/minecraft/class_2960; + FIELD comp_1523 id Lnet/minecraft/class_2960; + FIELD field_44762 CODEC Lcom/mojang/serialization/MapCodec; METHOD (Lnet/minecraft/class_2960;)V ARG 1 id - METHOD method_51646 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_389; - ARG 0 json + METHOD comp_1523 id ()Lnet/minecraft/class_2960; METHOD method_51647 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_51648 (Lnet/minecraft/class_8541;)Lnet/minecraft/class_2960; - ARG 0 font - METHOD method_51649 (Ljava/lang/String;)V - ARG 0 error diff --git a/mappings/net/minecraft/client/font/SpaceFont.mapping b/mappings/net/minecraft/client/font/SpaceFont.mapping index 23c18902e1..2a7df4c9c3 100644 --- a/mappings/net/minecraft/client/font/SpaceFont.mapping +++ b/mappings/net/minecraft/client/font/SpaceFont.mapping @@ -1,10 +1,2 @@ CLASS net/minecraft/class_7166 net/minecraft/client/font/SpaceFont FIELD field_37842 codePointsToGlyphs Lit/unimi/dsi/fastutil/ints/Int2ObjectMap; - METHOD (Lit/unimi/dsi/fastutil/ints/Int2FloatMap;)V - ARG 1 codePointsToAdvances - METHOD method_41715 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_389; - ARG 0 json - METHOD method_41716 (Lit/unimi/dsi/fastutil/ints/Int2FloatMap$Entry;)V - ARG 1 entry - METHOD method_41717 (Lit/unimi/dsi/fastutil/ints/Int2FloatMap;Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; - ARG 0 manager diff --git a/mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping b/mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping deleted file mode 100644 index 8e716d4d52..0000000000 --- a/mappings/net/minecraft/client/font/TrueTypeFontLoader.mapping +++ /dev/null @@ -1,19 +0,0 @@ -CLASS net/minecraft/class_396 net/minecraft/client/font/TrueTypeFontLoader - FIELD field_16242 LOGGER Lorg/slf4j/Logger; - FIELD field_2326 shiftY F - FIELD field_2327 shiftX F - FIELD field_2328 oversample F - FIELD field_2329 size F - FIELD field_2330 filename Lnet/minecraft/class_2960; - FIELD field_2331 excludedCharacters Ljava/lang/String; - METHOD (Lnet/minecraft/class_2960;FFFFLjava/lang/String;)V - ARG 1 filename - ARG 2 size - ARG 3 oversample - ARG 4 shiftX - ARG 5 shiftY - ARG 6 excludedCharacters - METHOD method_2059 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_389; - ARG 0 json - METHOD method_51650 load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; - ARG 1 resourceManager diff --git a/mappings/net/minecraft/client/font/UnihexFont.mapping b/mappings/net/minecraft/client/font/UnihexFont.mapping index fd8c1d475e..11ed926008 100644 --- a/mappings/net/minecraft/client/font/UnihexFont.mapping +++ b/mappings/net/minecraft/client/font/UnihexFont.mapping @@ -29,13 +29,11 @@ CLASS net/minecraft/class_391 net/minecraft/client/font/UnihexFont ARG 3 right CLASS class_392 Loader FIELD field_2304 sizes Lnet/minecraft/class_2960; - FIELD field_44771 CODEC Lcom/mojang/serialization/Codec; + FIELD field_44771 CODEC Lcom/mojang/serialization/MapCodec; FIELD field_44772 overrides Ljava/util/List; METHOD (Lnet/minecraft/class_2960;Ljava/util/List;)V ARG 1 sizes ARG 2 overrides - METHOD method_2046 fromJson (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_389; - ARG 0 json METHOD method_51658 load (Lnet/minecraft/class_3300;)Lnet/minecraft/class_390; ARG 1 resourceManager METHOD method_51659 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/client/gui/DrawContext.mapping b/mappings/net/minecraft/client/gui/DrawContext.mapping index 15257d9268..9a0f9eabe0 100644 --- a/mappings/net/minecraft/client/gui/DrawContext.mapping +++ b/mappings/net/minecraft/client/gui/DrawContext.mapping @@ -108,8 +108,6 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext ARG 4 y ARG 5 color METHOD method_25301 drawVerticalLine (IIII)V - ARG 1 x - ARG 2 y1 ARG 3 y2 ARG 4 color METHOD method_25302 drawTexture (Lnet/minecraft/class_2960;IIIIII)V @@ -132,8 +130,7 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext ARG 3 x ARG 4 y ARG 5 color - METHOD method_27533 fillGradient (Lnet/minecraft/class_287;IIIIIII)V - ARG 1 bufferBuilder + METHOD method_27533 fillGradient (Lnet/minecraft/class_4588;IIIIIII)V ARG 2 startX ARG 3 startY ARG 4 endX @@ -153,19 +150,11 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext ARG 3 x ARG 4 y ARG 5 color - METHOD method_29343 drawWithOutline (IILjava/util/function/BiConsumer;)V - ARG 1 x - ARG 2 y - ARG 3 renderAction - COMMENT the action to render both the content and the outline, taking x and y positions as input METHOD method_33284 fillGradient (IIIIIII)V ARG 1 startX ARG 2 startY ARG 3 endX ARG 4 endY - ARG 5 z - ARG 6 colorStart - ARG 7 colorEnd METHOD method_35719 drawCenteredTextWithShadow (Lnet/minecraft/class_327;Lnet/minecraft/class_5481;III)V ARG 1 textRenderer ARG 2 text @@ -184,13 +173,7 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext ARG 3 x2 ARG 4 y2 METHOD method_44380 disableScissor ()V - METHOD method_48196 fill (IIIIII)V - ARG 1 x1 - ARG 2 y1 - ARG 3 x2 - ARG 4 y2 - ARG 5 z - ARG 6 color + METHOD method_48196 fill (Lnet/minecraft/class_1921;IIIIII)V METHOD method_48465 drawSprite (IIIIILnet/minecraft/class_1058;FFFF)V ARG 1 x ARG 2 y @@ -274,7 +257,6 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext ARG 10 u ARG 11 v METHOD method_49698 setScissor (Lnet/minecraft/class_8030;)V - ARG 0 rect METHOD method_51421 getScaledWindowWidth ()I METHOD method_51422 setShaderColor (FFFF)V ARG 1 red diff --git a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping index f5966fea44..de0aef0290 100644 --- a/mappings/net/minecraft/client/gui/hud/DebugHud.mapping +++ b/mappings/net/minecraft/client/gui/hud/DebugHud.mapping @@ -39,7 +39,6 @@ CLASS net/minecraft/class_340 net/minecraft/client/gui/hud/DebugHud METHOD method_1845 propertyToString (Ljava/util/Map$Entry;)Ljava/lang/String; ARG 1 propEntry METHOD method_1846 render (Lnet/minecraft/class_332;)V - ARG 1 context METHOD method_1847 renderLeftText (Lnet/minecraft/class_332;)V ARG 1 context METHOD method_1848 renderRightText (Lnet/minecraft/class_332;)V diff --git a/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping b/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping index 95c3af8d91..ba7b3cb495 100644 --- a/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping +++ b/mappings/net/minecraft/client/network/ClientAdvancementManager.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_632 net/minecraft/client/network/ClientAdvancementMana FIELD field_3684 client Lnet/minecraft/class_310; FIELD field_3685 selectedTab Lnet/minecraft/class_161; FIELD field_3686 LOGGER Lorg/slf4j/Logger; - METHOD (Lnet/minecraft/class_310;)V + METHOD (Lnet/minecraft/class_310;Lnet/minecraft/class_7975;)V ARG 1 client METHOD method_2861 onAdvancements (Lnet/minecraft/class_2779;)V ARG 1 packet diff --git a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping index 2770dbac57..fa4db06e8b 100644 --- a/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping +++ b/mappings/net/minecraft/client/network/ClientPlayNetworkHandler.mapping @@ -98,10 +98,6 @@ CLASS net/minecraft/class_634 net/minecraft/client/network/ClientPlayNetworkHand ARG 1 x ARG 2 z ARG 3 chunkData - METHOD method_38540 updateChunk (IILnet/minecraft/class_6606;)V - ARG 1 x - ARG 2 z - ARG 3 lightData METHOD method_38541 scheduleRenderChunk (Lnet/minecraft/class_2818;II)V ARG 1 chunk ARG 2 x diff --git a/mappings/net/minecraft/client/render/GameRenderer.mapping b/mappings/net/minecraft/client/render/GameRenderer.mapping index 25fedac906..d5eaa9f733 100644 --- a/mappings/net/minecraft/client/render/GameRenderer.mapping +++ b/mappings/net/minecraft/client/render/GameRenderer.mapping @@ -9,8 +9,6 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer FIELD field_29353 positionColorTexProgram Lnet/minecraft/class_5944; FIELD field_29354 positionTexProgram Lnet/minecraft/class_5944; FIELD field_29355 positionTexColorProgram Lnet/minecraft/class_5944; - FIELD field_29356 blockProgram Lnet/minecraft/class_5944; - FIELD field_29357 newEntityProgram Lnet/minecraft/class_5944; FIELD field_29358 particleProgram Lnet/minecraft/class_5944; FIELD field_29359 positionColorLightmapProgram Lnet/minecraft/class_5944; FIELD field_29360 positionColorTexLightmapProgram Lnet/minecraft/class_5944; @@ -240,8 +238,6 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer METHOD method_34541 getPositionColorTexProgram ()Lnet/minecraft/class_5944; METHOD method_34542 getPositionTexProgram ()Lnet/minecraft/class_5944; METHOD method_34543 getPositionTexColorProgram ()Lnet/minecraft/class_5944; - METHOD method_34544 getBlockProgram ()Lnet/minecraft/class_5944; - METHOD method_34545 getNewEntityProgram ()Lnet/minecraft/class_5944; METHOD method_34546 getParticleProgram ()Lnet/minecraft/class_5944; METHOD method_34547 getPositionColorLightmapProgram ()Lnet/minecraft/class_5944; METHOD method_34548 getPositionColorTexLightmapProgram ()Lnet/minecraft/class_5944; @@ -320,10 +316,6 @@ CLASS net/minecraft/class_757 net/minecraft/client/render/GameRenderer ARG 1 pair METHOD method_36513 (Lnet/minecraft/class_5944;)V ARG 0 program - METHOD method_36514 (Lnet/minecraft/class_5944;)V - ARG 0 program - METHOD method_36515 (Lnet/minecraft/class_5944;)V - ARG 0 program METHOD method_36516 (Lcom/mojang/datafixers/util/Pair;)V ARG 0 pair METHOD method_36517 (Lnet/minecraft/class_5944;)V diff --git a/mappings/net/minecraft/client/render/RenderLayer.mapping b/mappings/net/minecraft/client/render/RenderLayer.mapping index 10083b5ddf..e3f1e8f0c0 100644 --- a/mappings/net/minecraft/client/render/RenderLayer.mapping +++ b/mappings/net/minecraft/client/render/RenderLayer.mapping @@ -267,7 +267,7 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer FIELD field_21422 phases Lcom/google/common/collect/ImmutableList; FIELD field_21852 outlineMode Lnet/minecraft/class_1921$class_4750; FIELD field_29461 program Lnet/minecraft/class_4668$class_5942; - METHOD (Lnet/minecraft/class_4668$class_5939;Lnet/minecraft/class_4668$class_5942;Lnet/minecraft/class_4668$class_4685;Lnet/minecraft/class_4668$class_4672;Lnet/minecraft/class_4668$class_4671;Lnet/minecraft/class_4668$class_4676;Lnet/minecraft/class_4668$class_4679;Lnet/minecraft/class_4668$class_4675;Lnet/minecraft/class_4668$class_4678;Lnet/minecraft/class_4668$class_4684;Lnet/minecraft/class_4668$class_4686;Lnet/minecraft/class_4668$class_4677;Lnet/minecraft/class_1921$class_4750;)V + METHOD (Lnet/minecraft/class_4668$class_5939;Lnet/minecraft/class_4668$class_5942;Lnet/minecraft/class_4668$class_4685;Lnet/minecraft/class_4668$class_4672;Lnet/minecraft/class_4668$class_4671;Lnet/minecraft/class_4668$class_4676;Lnet/minecraft/class_4668$class_4679;Lnet/minecraft/class_4668$class_4675;Lnet/minecraft/class_4668$class_4678;Lnet/minecraft/class_4668$class_4684;Lnet/minecraft/class_4668$class_4686;Lnet/minecraft/class_4668$class_4677;Lnet/minecraft/class_4668$class_8559;Lnet/minecraft/class_1921$class_4750;)V ARG 1 texture ARG 2 program ARG 3 transparency @@ -280,7 +280,6 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer ARG 10 texturing ARG 11 writeMaskState ARG 12 lineWidth - ARG 13 outlineMode METHOD method_23598 builder ()Lnet/minecraft/class_1921$class_4688$class_4689; CLASS class_4689 Builder FIELD field_21424 transparency Lnet/minecraft/class_4668$class_4685; @@ -318,7 +317,6 @@ CLASS net/minecraft/class_1921 net/minecraft/client/render/RenderLayer METHOD method_23617 build (Z)Lnet/minecraft/class_1921$class_4688; ARG 1 affectsOutline METHOD method_24297 build (Lnet/minecraft/class_1921$class_4750;)Lnet/minecraft/class_1921$class_4688; - ARG 1 outlineMode METHOD method_34577 texture (Lnet/minecraft/class_4668$class_5939;)Lnet/minecraft/class_1921$class_4688$class_4689; ARG 1 texture METHOD method_34578 program (Lnet/minecraft/class_4668$class_5942;)Lnet/minecraft/class_1921$class_4688$class_4689; diff --git a/mappings/net/minecraft/client/render/RenderPhase.mapping b/mappings/net/minecraft/client/render/RenderPhase.mapping index 8a1f75cbe3..30f0a165b1 100644 --- a/mappings/net/minecraft/client/render/RenderPhase.mapping +++ b/mappings/net/minecraft/client/render/RenderPhase.mapping @@ -68,8 +68,6 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase FIELD field_29432 END_GATEWAY_PROGRAM Lnet/minecraft/class_4668$class_5942; FIELD field_29433 LINES_PROGRAM Lnet/minecraft/class_4668$class_5942; FIELD field_29434 NO_PROGRAM Lnet/minecraft/class_4668$class_5942; - FIELD field_29435 BLOCK_PROGRAM Lnet/minecraft/class_4668$class_5942; - FIELD field_29436 NEW_ENTITY_PROGRAM Lnet/minecraft/class_4668$class_5942; FIELD field_29437 POSITION_COLOR_LIGHTMAP_PROGRAM Lnet/minecraft/class_4668$class_5942; FIELD field_29438 POSITION_PROGRAM Lnet/minecraft/class_4668$class_5942; FIELD field_29439 POSITION_COLOR_TEXTURE_PROGRAM Lnet/minecraft/class_4668$class_5942; diff --git a/mappings/net/minecraft/client/render/WorldRenderer.mapping b/mappings/net/minecraft/client/render/WorldRenderer.mapping index de8b7ad042..f22b4661ba 100644 --- a/mappings/net/minecraft/client/render/WorldRenderer.mapping +++ b/mappings/net/minecraft/client/render/WorldRenderer.mapping @@ -175,7 +175,7 @@ CLASS net/minecraft/class_761 net/minecraft/client/render/WorldRenderer ARG 4 green ARG 5 blue ARG 6 alpha - METHOD method_22983 drawShapeOutline (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_265;DDDFFFF)V + METHOD method_22983 drawShapeOutline (Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_265;DDDFFFFZ)V ARG 0 matrices ARG 1 vertexConsumer ARG 2 shape diff --git a/mappings/net/minecraft/client/util/telemetry/TelemetryManager.mapping b/mappings/net/minecraft/client/util/telemetry/TelemetryManager.mapping index 42ae408519..94fb388728 100644 --- a/mappings/net/minecraft/client/util/telemetry/TelemetryManager.mapping +++ b/mappings/net/minecraft/client/util/telemetry/TelemetryManager.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_6628 net/minecraft/client/util/telemetry/TelemetryMana FIELD field_41429 logManager Ljava/util/concurrent/CompletableFuture; METHOD (Lnet/minecraft/class_310;Lcom/mojang/authlib/minecraft/UserApiService;Lnet/minecraft/class_320;)V ARG 1 client - ARG 2 userApiService ARG 3 session METHOD method_38731 (Ljava/lang/Runnable;)Ljava/lang/Thread; ARG 0 runnable @@ -21,7 +20,7 @@ CLASS net/minecraft/class_6628 net/minecraft/client/util/telemetry/TelemetryMana METHOD method_47705 (Ljava/util/concurrent/CompletableFuture;Lcom/mojang/authlib/minecraft/TelemetrySession;Lnet/minecraft/class_7966;Ljava/util/function/Consumer;)V ARG 1 eventType ARG 2 propertyAdder - METHOD method_47706 createWorldSession (ZLjava/time/Duration;)Lnet/minecraft/class_7975; + METHOD method_47706 createWorldSession (ZLjava/time/Duration;Ljava/lang/String;)Lnet/minecraft/class_7975; ARG 1 newWorld ARG 2 worldLoadTime METHOD method_47707 getSender ()Lnet/minecraft/class_7965; diff --git a/mappings/net/minecraft/client/util/telemetry/WorldSession.mapping b/mappings/net/minecraft/client/util/telemetry/WorldSession.mapping index fa3b0bd0ac..48d0769135 100644 --- a/mappings/net/minecraft/client/util/telemetry/WorldSession.mapping +++ b/mappings/net/minecraft/client/util/telemetry/WorldSession.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_7975 net/minecraft/client/util/telemetry/WorldSession FIELD field_41502 worldUnloadedEvent Lnet/minecraft/class_7982; FIELD field_41503 performanceMetricsEvent Lnet/minecraft/class_7977; FIELD field_41504 worldLoadTimesEvent Lnet/minecraft/class_7981; - METHOD (Lnet/minecraft/class_7965;ZLjava/time/Duration;)V + METHOD (Lnet/minecraft/class_7965;ZLjava/time/Duration;Ljava/lang/String;)V ARG 1 sender ARG 2 newWorld ARG 3 worldLoadTime diff --git a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaNetherTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaNetherTabAdvancementGenerator.mapping index 8898f00c01..f47b91902d 100644 --- a/mappings/net/minecraft/data/server/advancement/vanilla/VanillaNetherTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/server/advancement/vanilla/VanillaNetherTabAdvancementGenerator.mapping @@ -1,2 +1,2 @@ CLASS net/minecraft/class_2416 net/minecraft/data/server/advancement/vanilla/VanillaNetherTabAdvancementGenerator - FIELD field_25712 PIGLIN_DISTRACTION_PREDICATE Lnet/minecraft/class_2048$class_5258; + FIELD field_25712 PIGLIN_DISTRACTION_PREDICATE Lnet/minecraft/class_5258; diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 2f8cb4438e..be1e5b2454 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -965,9 +965,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 1 state METHOD method_49792 teleportPassengers ()V METHOD method_51152 getNameLabelHeight ()F - METHOD method_51294 canStep (ZLnet/minecraft/class_243;)Z - ARG 1 climbing - ARG 2 movement METHOD method_51295 playSwimSound ()V METHOD method_51296 playSecondaryStepSound (Lnet/minecraft/class_2680;)V ARG 1 state diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index ff369dadd7..ca58c8a7d5 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -323,7 +323,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity COMMENT the source entity or {@code null} for non-entity sources METHOD method_37410 processEquippedStack (Lnet/minecraft/class_1799;)V ARG 1 stack - METHOD method_37416 getJumpBoostVelocityModifier ()D + METHOD method_37416 getJumpBoostVelocityModifier ()F METHOD method_39760 getFallSounds ()Lnet/minecraft/class_1309$class_6823; METHOD method_41329 disableExperienceDropping ()V METHOD method_41330 isExperienceDroppingDisabled ()Z diff --git a/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping b/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping index 880168266d..9d7cd11992 100644 --- a/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/AlternativeLootCondition.mapping @@ -1,10 +1,6 @@ CLASS net/minecraft/class_186 net/minecraft/loot/condition/AlternativeLootCondition FIELD field_1246 terms [Lnet/minecraft/class_5341; FIELD field_1247 predicate Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_5341;)V - ARG 1 terms - METHOD method_826 builder ([Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_186$class_187; - ARG 0 terms METHOD test (Ljava/lang/Object;)Z ARG 1 context CLASS class_187 Builder diff --git a/mappings/net/minecraft/loot/condition/LootCondition.mapping b/mappings/net/minecraft/loot/condition/LootCondition.mapping index bda1634eb3..c598a5d4c7 100644 --- a/mappings/net/minecraft/loot/condition/LootCondition.mapping +++ b/mappings/net/minecraft/loot/condition/LootCondition.mapping @@ -2,5 +2,5 @@ CLASS net/minecraft/class_5341 net/minecraft/loot/condition/LootCondition METHOD method_29325 getType ()Lnet/minecraft/class_5342; CLASS class_210 Builder METHOD method_16780 invert ()Lnet/minecraft/class_5341$class_210; - METHOD method_893 or (Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_186$class_187; + METHOD method_893 or (Lnet/minecraft/class_5341$class_210;)Lnet/minecraft/class_8551$class_8552; ARG 1 condition diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index e6018036fd..f18c26b505 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -99,40 +99,3 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 1 effects METHOD method_8924 distance (Lnet/minecraft/class_2025;)Lnet/minecraft/class_2048$class_2049; ARG 1 distance - CLASS class_5258 Extended - FIELD field_24388 EMPTY Lnet/minecraft/class_2048$class_5258; - FIELD field_24389 conditions [Lnet/minecraft/class_5341; - FIELD field_24390 combinedCondition Ljava/util/function/Predicate; - METHOD ([Lnet/minecraft/class_5341;)V - ARG 1 conditions - METHOD method_27803 ofLegacy (Lnet/minecraft/class_2048;)Lnet/minecraft/class_2048$class_5258; - ARG 0 predicate - METHOD method_27804 toJson (Lnet/minecraft/class_5267;)Lcom/google/gson/JsonElement; - ARG 1 predicateSerializer - METHOD method_27805 getInJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_5257;)Lnet/minecraft/class_2048$class_5258; - COMMENT Parses an extended entity check in a sub-value in JSON, accepting objects - COMMENT as simple entity predicates or array as list of loot conditions. - COMMENT - COMMENT @see - COMMENT Mojang description - ARG 0 root - ARG 1 key - ARG 2 predicateDeserializer - METHOD method_27806 test (Lnet/minecraft/class_47;)Z - ARG 1 context - METHOD method_27807 fromJson (Ljava/lang/String;Lnet/minecraft/class_5257;Lcom/google/gson/JsonElement;)Lnet/minecraft/class_2048$class_5258; - ARG 0 key - ARG 1 predicateDeserializer - ARG 2 json - METHOD method_27808 toPredicatesJsonArray ([Lnet/minecraft/class_2048$class_5258;Lnet/minecraft/class_5267;)Lcom/google/gson/JsonElement; - ARG 0 predicates - ARG 1 predicateSerializer - METHOD method_27809 requireInJson (Lcom/google/gson/JsonObject;Ljava/lang/String;Lnet/minecraft/class_5257;)[Lnet/minecraft/class_2048$class_5258; - COMMENT Parses an extended entity check in a sub-value in JSON. The value must - COMMENT be absent, JSON null, or an array, or the parser will error. In other - COMMENT words, it does not accept object sub-values. - ARG 0 root - ARG 1 key - ARG 2 predicateDeserializer - METHOD method_27973 create ([Lnet/minecraft/class_5341;)Lnet/minecraft/class_2048$class_5258; - ARG 0 conditions diff --git a/mappings/net/minecraft/predicate/entity/Extended.mapping b/mappings/net/minecraft/predicate/entity/Extended.mapping new file mode 100644 index 0000000000..88700b3cad --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/Extended.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_5258 net/minecraft/predicate/entity/Extended + FIELD field_24388 EMPTY Lnet/minecraft/class_5258; + FIELD field_24389 conditions [Lnet/minecraft/class_5341; + FIELD field_24390 combinedCondition Ljava/util/function/Predicate; + METHOD ([Lnet/minecraft/class_5341;)V + ARG 1 conditions + METHOD method_27804 toJson (Lnet/minecraft/class_5267;)Lcom/google/gson/JsonElement; + ARG 1 predicateSerializer + METHOD method_27806 test (Lnet/minecraft/class_47;)Z + ARG 1 context + METHOD method_27807 fromJson (Ljava/lang/String;Lnet/minecraft/class_5257;Lcom/google/gson/JsonElement;Lnet/minecraft/class_176;)Lnet/minecraft/class_5258; + ARG 0 key + ARG 1 predicateDeserializer + ARG 2 json + METHOD method_27808 toPredicatesJsonArray ([Lnet/minecraft/class_5258;Lnet/minecraft/class_5267;)Lcom/google/gson/JsonElement; + ARG 0 predicates + ARG 1 predicateSerializer + METHOD method_27973 create ([Lnet/minecraft/class_5341;)Lnet/minecraft/class_5258; + ARG 0 conditions diff --git a/mappings/net/minecraft/screen/SmithingScreenHandler.mapping b/mappings/net/minecraft/screen/SmithingScreenHandler.mapping index d2d3a0f3f1..42f8175aa0 100644 --- a/mappings/net/minecraft/screen/SmithingScreenHandler.mapping +++ b/mappings/net/minecraft/screen/SmithingScreenHandler.mapping @@ -21,10 +21,6 @@ CLASS net/minecraft/class_4862 net/minecraft/screen/SmithingScreenHandler ARG 1 stack METHOD method_48390 (Lnet/minecraft/class_1799;Lnet/minecraft/class_8059;)Ljava/util/Optional; ARG 1 recipe - METHOD method_48391 (Lnet/minecraft/class_1799;Lnet/minecraft/class_8059;)Z - ARG 2 recipe - METHOD method_48392 (Lnet/minecraft/class_1799;Lnet/minecraft/class_8059;)Z - ARG 2 recipe METHOD method_48393 (Lnet/minecraft/class_1799;)Z ARG 1 stack METHOD method_48394 (Lnet/minecraft/class_1799;Lnet/minecraft/class_8059;)Z diff --git a/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping b/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping index 3473e12f86..a852eb2713 100644 --- a/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping +++ b/mappings/net/minecraft/world/BlockCollisionSpliterator.mapping @@ -8,11 +8,7 @@ CLASS net/minecraft/class_5329 net/minecraft/world/BlockCollisionSpliterator FIELD field_35108 chunk Lnet/minecraft/class_1922; FIELD field_35109 chunkPos J FIELD field_35590 forEntity Z - METHOD (Lnet/minecraft/class_1941;Lnet/minecraft/class_1297;Lnet/minecraft/class_238;)V - ARG 1 world - ARG 2 entity - ARG 3 box - METHOD (Lnet/minecraft/class_1941;Lnet/minecraft/class_1297;Lnet/minecraft/class_238;Z)V + METHOD (Lnet/minecraft/class_1941;Lnet/minecraft/class_1297;Lnet/minecraft/class_238;ZLjava/util/function/BiFunction;)V ARG 1 world ARG 2 entity ARG 3 box diff --git a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping index 8512b8ee41..c7703330e3 100644 --- a/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping +++ b/mappings/net/minecraft/world/chunk/light/ChunkLightProvider.mapping @@ -5,7 +5,7 @@ CLASS net/minecraft/class_3558 net/minecraft/world/chunk/light/ChunkLightProvide FIELD field_17397 cachedChunkPositions [J FIELD field_17398 cachedChunks [Lnet/minecraft/class_8527; FIELD field_19284 reusableBlockPos Lnet/minecraft/class_2338$class_2339; - FIELD field_44733 blockPositionsToCheck Lit/unimi/dsi/fastutil/longs/LongSet; + FIELD field_44733 blockPositionsToCheck Lit/unimi/dsi/fastutil/longs/LongOpenHashSet; METHOD (Lnet/minecraft/class_2823;Lnet/minecraft/class_3560;)V ARG 1 chunkProvider ARG 2 lightStorage @@ -62,8 +62,6 @@ CLASS net/minecraft/class_3558 net/minecraft/world/chunk/light/ChunkLightProvide ARG 3 direction METHOD method_51563 isTrivialForLighting (Lnet/minecraft/class_2680;)Z ARG 0 blockState - METHOD method_51564 markSectionAsChecked (J)V - ARG 1 sectionPos METHOD method_51565 (JJ)V ARG 1 blockPos ARG 3 flags @@ -72,8 +70,6 @@ CLASS net/minecraft/class_3558 net/minecraft/world/chunk/light/ChunkLightProvide ARG 3 flags METHOD method_51568 getStatus (J)Lnet/minecraft/class_3560$class_8530; ARG 1 sectionPos - METHOD method_51569 (JJ)Z - ARG 2 blockPos CLASS class_8531 COMMENT Methods for manipulating a set of bitflags with yet unknown functionality. COMMENT diff --git a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping index e64c1fea1a..a09cba7946 100644 --- a/mappings/net/minecraft/world/chunk/light/LightStorage.mapping +++ b/mappings/net/minecraft/world/chunk/light/LightStorage.mapping @@ -40,7 +40,6 @@ CLASS net/minecraft/class_3560 net/minecraft/world/chunk/light/LightStorage ARG 1 sectionPos ARG 3 notReady METHOD method_15527 updateLight (Lnet/minecraft/class_3558;)V - ARG 1 lightProvider METHOD method_15528 hasLightUpdates ()Z METHOD method_15529 createSection (J)Lnet/minecraft/class_2804; ARG 1 sectionPos diff --git a/mappings/net/minecraft/world/gen/chunk/placement/RandomSpreadStructurePlacement.mapping b/mappings/net/minecraft/world/gen/chunk/placement/RandomSpreadStructurePlacement.mapping index cc6091a58b..f7d2eb3938 100644 --- a/mappings/net/minecraft/world/gen/chunk/placement/RandomSpreadStructurePlacement.mapping +++ b/mappings/net/minecraft/world/gen/chunk/placement/RandomSpreadStructurePlacement.mapping @@ -23,8 +23,6 @@ CLASS net/minecraft/class_6872 net/minecraft/world/gen/chunk/placement/RandomSpr ARG 4 chunkZ METHOD method_40170 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_40171 (Lnet/minecraft/class_6872;)Lcom/mojang/serialization/DataResult; - ARG 0 placement METHOD method_41632 getSpacing ()I METHOD method_41633 getSeparation ()I METHOD method_41634 getSpreadType ()Lnet/minecraft/class_6873; diff --git a/mappings/net/minecraft/world/gen/structure/JigsawStructure.mapping b/mappings/net/minecraft/world/gen/structure/JigsawStructure.mapping index 47d1a72a8c..afc654b763 100644 --- a/mappings/net/minecraft/world/gen/structure/JigsawStructure.mapping +++ b/mappings/net/minecraft/world/gen/structure/JigsawStructure.mapping @@ -32,8 +32,6 @@ CLASS net/minecraft/class_5434 net/minecraft/world/gen/structure/JigsawStructure ARG 8 maxDistanceFromCenter METHOD method_41662 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_42703 (Lnet/minecraft/class_5434;)Lcom/mojang/serialization/DataResult; - ARG 0 feature METHOD method_42704 (Lnet/minecraft/class_5434;)Ljava/lang/Integer; ARG 0 structure METHOD method_42705 (Lnet/minecraft/class_5434;)Ljava/util/Optional; @@ -42,7 +40,7 @@ CLASS net/minecraft/class_5434 net/minecraft/world/gen/structure/JigsawStructure ARG 0 structure METHOD method_42707 (Lnet/minecraft/class_5434;)Lnet/minecraft/class_6122; ARG 0 structure - METHOD method_42708 createValidator ()Ljava/util/function/Function; + METHOD method_42708 createValidator (Lnet/minecraft/class_5434;)Lcom/mojang/serialization/DataResult; METHOD method_42709 (Lnet/minecraft/class_5434;)Ljava/lang/Integer; ARG 0 structure METHOD method_42710 (Lnet/minecraft/class_5434;)Lnet/minecraft/class_6880;