From c085684b63ad7d8137381396da096c0655d07b20 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 6 Mar 2024 15:14:46 +0000 Subject: [PATCH] 24w10a --- build.gradle | 2 +- .../net/minecraft/block/FlowerBlock.mapping | 6 +-- .../block/dispenser/DispenserBehavior.mapping | 34 ++++++++-------- .../block/entity/BannerBlockEntity.mapping | 5 --- .../block/entity/BannerPattern.mapping | 3 -- .../block/entity/BannerPatterns.mapping | 6 +-- .../LockableContainerBlockEntity.mapping | 2 + .../LootableContainerBlockEntity.mapping | 3 -- .../entity/ShulkerBoxBlockEntity.mapping | 1 - .../block/entity/SkullBlockEntity.mapping | 12 ++---- .../minecraft/client/MinecraftClient.mapping | 2 +- .../client/gui/screen/StatsScreen.mapping | 8 ++-- .../gui/screen/ingame/BeaconScreen.mapping | 14 +++---- .../MultiplayerServerListWidget.mapping | 2 +- .../minecraft/client/model/ModelPart.mapping | 26 ++++++------ .../client/option/GameOptions.mapping | 2 +- .../client/particle/DamageParticle.mapping | 8 ++-- .../particle/FireworksSparkParticle.mapping | 8 ++-- .../client/particle/FlameParticle.mapping | 8 ++-- .../client/particle/SquidInkParticle.mapping | 8 ++-- .../client/particle/SuspendParticle.mapping | 8 ++-- .../render/ChunkRenderingDataPreparer.mapping | 26 ++++++------ .../render/TexturedRenderLayers.mapping | 12 +----- .../render/block/BlockModelRenderer.mapping | 40 +++++++++---------- .../entity/BannerBlockEntityRenderer.mapping | 9 +---- .../entity/SkullBlockEntityRenderer.mapping | 3 +- .../client/render/chunk/ChunkBuilder.mapping | 2 +- .../render/entity/WolfEntityRenderer.mapping | 3 -- .../model/json/JsonUnbakedModel.mapping | 30 +++++++------- .../render/model/json/ModelOverride.mapping | 16 ++++---- .../render/model/json/ModelVariantMap.mapping | 4 +- .../argument/ItemSlotArgumentType.mapping | 3 -- .../type/BannerPatternsComponent.mapping | 5 --- .../type/ItemEnchantmentsComponent.mapping | 5 +-- .../type/LodestoneTargetComponent.mapping | 2 - .../component/type/ProfileComponent.mapping | 6 +-- .../datafixer/schema/Schema99.mapping | 7 ++-- .../attribute/EntityAttributeInstance.mapping | 9 ++--- .../attribute/EntityAttributeModifier.mapping | 15 +++---- .../net/minecraft/item/BannerItem.mapping | 5 --- mappings/net/minecraft/item/BlockItem.mapping | 6 --- mappings/net/minecraft/item/ItemStack.mapping | 3 -- .../function/ApplyBonusLootFunction.mapping | 16 ++++---- .../SetBannerPatternLootFunction.mapping | 3 -- .../function/SetContentsLootFunction.mapping | 2 - mappings/net/minecraft/nbt/NbtHelper.mapping | 12 ------ .../network/codec/PacketCodecs.mapping | 22 +++++----- .../entity/EntityEquipmentPredicate.mapping | 1 - .../net/minecraft/registry/Registries.mapping | 1 - .../entry/RegistryEntryListCodec.mapping | 4 +- .../screen/GrindstoneScreenHandler.mapping | 12 +----- .../net/minecraft/util/dynamic/Codecs.mapping | 6 +-- .../net/minecraft/village/raid/Raid.mapping | 2 +- 53 files changed, 180 insertions(+), 280 deletions(-) diff --git a/build.gradle b/build.gradle index 26e5ed251b..88fa692086 100644 --- a/build.gradle +++ b/build.gradle @@ -20,7 +20,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "24w09a" +def minecraft_version = "24w10a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/FlowerBlock.mapping b/mappings/net/minecraft/block/FlowerBlock.mapping index 4b17ce601a..7a8720f483 100644 --- a/mappings/net/minecraft/block/FlowerBlock.mapping +++ b/mappings/net/minecraft/block/FlowerBlock.mapping @@ -3,12 +3,10 @@ CLASS net/minecraft/class_2356 net/minecraft/block/FlowerBlock FIELD field_45775 stewEffects Lnet/minecraft/class_9298; FIELD field_46354 STEW_EFFECT_CODEC Lcom/mojang/serialization/MapCodec; FIELD field_46355 CODEC Lcom/mojang/serialization/MapCodec; - METHOD (Lnet/minecraft/class_6880;ILnet/minecraft/class_4970$class_2251;)V + METHOD (Lnet/minecraft/class_6880;FLnet/minecraft/class_4970$class_2251;)V ARG 1 stewEffect - ARG 2 duration ARG 3 settings - METHOD method_54015 createStewEffectList (Lnet/minecraft/class_6880;I)Lnet/minecraft/class_9298; + METHOD method_54015 createStewEffectList (Lnet/minecraft/class_6880;F)Lnet/minecraft/class_9298; ARG 0 effect - ARG 1 duration METHOD method_54016 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping index b5f1061be0..d12cc6cf96 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -12,6 +12,23 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior ARG 0 pointer ARG 1 entityType ARG 2 direction + CLASS 2 + METHOD method_48306 (Lnet/minecraft/class_2350;Lnet/minecraft/class_1531;)V + ARG 1 entity + CLASS 3 + METHOD method_27159 (Lnet/minecraft/class_1309;)Z + ARG 0 entity + CLASS 4 + METHOD method_27160 (Lnet/minecraft/class_1496;)Z + ARG 0 entity + CLASS 5 + METHOD method_27161 (Lnet/minecraft/class_1492;)Z + ARG 0 entity + CLASS 7 + METHOD method_17204 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1677;)V + ARG 1 entity + CLASS 9 + FIELD field_13368 fallbackBehavior Lnet/minecraft/class_2347; CLASS 10 FIELD field_49137 fallbackBehavior Lnet/minecraft/class_2347; CLASS 17 @@ -23,9 +40,6 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior ARG 1 pointer ARG 2 emptyBottleStack ARG 3 filledBottleStack - CLASS 2 - METHOD method_48306 (Lnet/minecraft/class_2350;Lnet/minecraft/class_1531;)V - ARG 1 entity CLASS 22 FIELD field_38001 fallback Lnet/minecraft/class_2347; CLASS 24 @@ -45,17 +59,3 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior CLASS 1 METHOD method_17202 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1686;)V ARG 1 entity - CLASS 3 - METHOD method_27159 (Lnet/minecraft/class_1309;)Z - ARG 0 entity - CLASS 4 - METHOD method_27160 (Lnet/minecraft/class_1496;)Z - ARG 0 entity - CLASS 5 - METHOD method_27161 (Lnet/minecraft/class_1492;)Z - ARG 0 entity - CLASS 7 - METHOD method_17204 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1677;)V - ARG 1 entity - CLASS 9 - FIELD field_13368 fallbackBehavior Lnet/minecraft/class_2347; diff --git a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping index 756a32eeb0..52e6a1d74e 100644 --- a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping @@ -1,11 +1,9 @@ CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity FIELD field_11772 customName Lnet/minecraft/class_2561; - FIELD field_11773 patternsComponent Lnet/minecraft/class_9307; FIELD field_11774 baseColor Lnet/minecraft/class_1767; FIELD field_31296 MAX_PATTERN_COUNT I FIELD field_31297 PATTERNS_KEY Ljava/lang/String; FIELD field_49402 LOGGER Lorg/slf4j/Logger; - FIELD field_49403 patternsComponentWithBase Lnet/minecraft/class_9307; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state @@ -18,6 +16,3 @@ CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity METHOD method_10913 readFrom (Lnet/minecraft/class_1799;Lnet/minecraft/class_1767;)V ARG 1 stack ARG 2 baseColor - METHOD method_57565 setPatterns (Lnet/minecraft/class_9307;)V - ARG 1 patternsComponent - METHOD method_57570 getPatterns ()Lnet/minecraft/class_9307; diff --git a/mappings/net/minecraft/block/entity/BannerPattern.mapping b/mappings/net/minecraft/block/entity/BannerPattern.mapping index f45af6d83e..b025084a2f 100644 --- a/mappings/net/minecraft/block/entity/BannerPattern.mapping +++ b/mappings/net/minecraft/block/entity/BannerPattern.mapping @@ -1,4 +1 @@ CLASS net/minecraft/class_2582 net/minecraft/block/entity/BannerPattern - METHOD method_22536 getSpriteId (Lnet/minecraft/class_5321;Z)Lnet/minecraft/class_2960; - ARG 0 pattern - ARG 1 banner diff --git a/mappings/net/minecraft/block/entity/BannerPatterns.mapping b/mappings/net/minecraft/block/entity/BannerPatterns.mapping index 9961033fd0..448a1d0c9d 100644 --- a/mappings/net/minecraft/block/entity/BannerPatterns.mapping +++ b/mappings/net/minecraft/block/entity/BannerPatterns.mapping @@ -1,8 +1,6 @@ CLASS net/minecraft/class_7446 net/minecraft/block/entity/BannerPatterns - METHOD method_43721 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_2582; - ARG 0 registry + METHOD method_43721 registerAndGetDefault (Lnet/minecraft/class_7891;)V METHOD method_43722 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id - METHOD method_57577 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;)Lnet/minecraft/class_2582; - ARG 0 registry + METHOD method_57577 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;)V ARG 1 key diff --git a/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping b/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping index fe9d0ad119..0ac9cb41d2 100644 --- a/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_2624 net/minecraft/block/entity/LockableContainerBlockEntity FIELD field_12045 lock Lnet/minecraft/class_1273; FIELD field_17376 customName Lnet/minecraft/class_2561; + METHOD method_11281 setHeldStacks (Lnet/minecraft/class_2371;)V + METHOD method_11282 getHeldStacks ()Lnet/minecraft/class_2371; METHOD method_17487 checkUnlocked (Lnet/minecraft/class_1657;Lnet/minecraft/class_1273;Lnet/minecraft/class_2561;)Z ARG 0 player ARG 1 lock diff --git a/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping b/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping index f3ffbc9dd8..b5f9753895 100644 --- a/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/LootableContainerBlockEntity.mapping @@ -1,8 +1,5 @@ CLASS net/minecraft/class_2621 net/minecraft/block/entity/LootableContainerBlockEntity FIELD field_12036 lootTableSeed J FIELD field_12037 lootTableId Lnet/minecraft/class_2960; - METHOD method_11281 setHeldStacks (Lnet/minecraft/class_2371;)V - ARG 1 list - METHOD method_11282 getHeldStacks ()Lnet/minecraft/class_2371; METHOD method_11285 (Lnet/minecraft/class_2960;)V ARG 1 id diff --git a/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping b/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping index 9db9afa7b1..3f6947ad51 100644 --- a/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/ShulkerBoxBlockEntity.mapping @@ -7,7 +7,6 @@ CLASS net/minecraft/class_2627 net/minecraft/block/entity/ShulkerBoxBlockEntity FIELD field_12059 AVAILABLE_SLOTS [I FIELD field_12060 cachedColor Lnet/minecraft/class_1767; FIELD field_31356 INVENTORY_SIZE I - FIELD field_31361 ITEMS_KEY Ljava/lang/String; METHOD (Lnet/minecraft/class_1767;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 color ARG 2 pos diff --git a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping index dc5739410f..25b9310fa7 100644 --- a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity - FIELD field_12087 owner Lcom/mojang/authlib/GameProfile; + FIELD field_12087 owner Lnet/minecraft/class_9296; FIELD field_12089 userCache Lcom/google/common/cache/LoadingCache; - FIELD field_31363 SKULL_OWNER_KEY Ljava/lang/String; FIELD field_34029 currentExecutor Ljava/util/concurrent/Executor; FIELD field_41315 poweredTicks I FIELD field_41316 powered Z @@ -11,9 +10,8 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state - METHOD method_11333 setOwner (Lcom/mojang/authlib/GameProfile;)V - ARG 1 owner - METHOD method_11334 getOwner ()Lcom/mojang/authlib/GameProfile; + METHOD method_11333 setOwner (Lnet/minecraft/class_9296;)V + METHOD method_11334 getOwner ()Lnet/minecraft/class_9296; METHOD method_11339 loadOwnerProperties ()V METHOD method_39765 setServices (Lnet/minecraft/class_7497;Ljava/util/concurrent/Executor;)V ARG 0 apiServices @@ -31,10 +29,6 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity ARG 0 runnable METHOD method_52580 fetchProfile (Ljava/lang/String;)Ljava/util/concurrent/CompletableFuture; ARG 0 name - METHOD method_52586 hasTextures (Lcom/mojang/authlib/GameProfile;)Z - ARG 0 profile - METHOD method_52587 (Ljava/util/Optional;)V - ARG 1 profile METHOD method_54081 fetchProfile (Ljava/lang/String;Lnet/minecraft/class_7497;Ljava/util/function/BooleanSupplier;)Ljava/util/concurrent/CompletableFuture; ARG 0 name ARG 1 apiServices diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 27da3c02cb..283fbf458c 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -87,9 +87,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1735 fpsCounter I FIELD field_1738 currentFps I FIELD field_1739 networkProxy Ljava/net/Proxy; - FIELD field_1740 DEFAULT_FONT_ID Lnet/minecraft/class_2960; FIELD field_17404 renderTaskQueue Ljava/util/Queue; FIELD field_17405 worldGenProgressTracker Ljava/util/concurrent/atomic/AtomicReference; + FIELD field_1740 DEFAULT_FONT_ID Lnet/minecraft/class_2960; FIELD field_1741 pausedTickDelta F FIELD field_1742 itemRenderer Lnet/minecraft/class_918; FIELD field_1743 skipGameRender Z diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping index 24017e29b7..a5db5d4e81 100644 --- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping @@ -64,6 +64,10 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen ARG 1 statType METHOD method_19410 getStatType (I)Lnet/minecraft/class_3448; ARG 1 headerColumn + CLASS class_450 ItemComparator + METHOD compare (Ljava/lang/Object;Ljava/lang/Object;)I + ARG 1 a + ARG 2 b CLASS class_4199 Entry FIELD field_33830 item Lnet/minecraft/class_1792; METHOD (Lnet/minecraft/class_447$class_4200;Lnet/minecraft/class_1792;)V @@ -75,10 +79,6 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen ARG 4 y ARG 5 white METHOD method_37307 getItem ()Lnet/minecraft/class_1792; - CLASS class_450 ItemComparator - METHOD compare (Ljava/lang/Object;Ljava/lang/Object;)I - ARG 1 a - ARG 2 b CLASS class_4202 EntityStatsListWidget FIELD field_18763 screen Lnet/minecraft/class_447; METHOD (Lnet/minecraft/class_447;Lnet/minecraft/class_310;)V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping index e6b180fbdb..bd6b7c3f16 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -20,13 +20,6 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree METHOD method_37076 addButton (Lnet/minecraft/class_339;)V ARG 1 button METHOD method_37078 tickButtons ()V - CLASS class_4072 IconButtonWidget - FIELD field_45445 texture Lnet/minecraft/class_2960; - METHOD (IILnet/minecraft/class_2960;Lnet/minecraft/class_2561;)V - ARG 1 x - ARG 2 y - ARG 3 texture - ARG 4 message CLASS class_467 CancelButtonWidget METHOD (Lnet/minecraft/class_466;II)V ARG 2 x @@ -64,6 +57,13 @@ CLASS net/minecraft/class_466 net/minecraft/client/gui/screen/ingame/BeaconScree METHOD method_2401 setDisabled (Z)V ARG 1 disabled METHOD method_2402 isDisabled ()Z + CLASS class_4072 IconButtonWidget + FIELD field_45445 texture Lnet/minecraft/class_2960; + METHOD (IILnet/minecraft/class_2960;Lnet/minecraft/class_2561;)V + ARG 1 x + ARG 2 y + ARG 3 texture + ARG 4 message CLASS class_6392 BeaconButtonWidget METHOD method_37080 tick (I)V ARG 1 level diff --git a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping index e016739100..7090def805 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -47,6 +47,7 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi METHOD method_36889 (Lnet/minecraft/class_4267;Lnet/minecraft/class_350$class_351;)V ARG 1 server METHOD method_52204 onRemoved ()V + CLASS class_504 Entry CLASS class_4268 ScanningEntry FIELD field_19112 client Lnet/minecraft/class_310; CLASS class_4269 LanServerEntry @@ -88,4 +89,3 @@ CLASS net/minecraft/class_4267 net/minecraft/client/gui/screen/multiplayer/Multi METHOD method_49300 uploadFavicon ([B)Z ARG 1 bytes METHOD method_55815 update ()V - CLASS class_504 Entry diff --git a/mappings/net/minecraft/client/model/ModelPart.mapping b/mappings/net/minecraft/client/model/ModelPart.mapping index bd3cb66199..7c43cef311 100644 --- a/mappings/net/minecraft/client/model/ModelPart.mapping +++ b/mappings/net/minecraft/client/model/ModelPart.mapping @@ -112,19 +112,6 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart METHOD method_2837 remap (FF)Lnet/minecraft/class_630$class_618; ARG 1 u ARG 2 v - CLASS class_6229 CuboidConsumer - METHOD method_35748 accept (Lnet/minecraft/class_4587$class_4665;Ljava/lang/String;ILnet/minecraft/class_630$class_628;)V - COMMENT Accepts a cuboid from a model part. - COMMENT - COMMENT @see ModelPart#forEachCuboid(MatrixStack, CuboidConsumer) - ARG 1 matrix - COMMENT the current matrix transformation from the model parts - ARG 2 path - COMMENT the path of the current model part, separated by {@code /} - ARG 3 index - COMMENT the index of the current cuboid in the current model part - ARG 4 cuboid - COMMENT the current cuboid CLASS class_628 Cuboid FIELD field_3643 minZ F FIELD field_3644 minY F @@ -157,3 +144,16 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart ARG 6 green ARG 7 blue ARG 8 alpha + CLASS class_6229 CuboidConsumer + METHOD method_35748 accept (Lnet/minecraft/class_4587$class_4665;Ljava/lang/String;ILnet/minecraft/class_630$class_628;)V + COMMENT Accepts a cuboid from a model part. + COMMENT + COMMENT @see ModelPart#forEachCuboid(MatrixStack, CuboidConsumer) + ARG 1 matrix + COMMENT the current matrix transformation from the model parts + ARG 2 path + COMMENT the path of the current model part, separated by {@code /} + ARG 3 index + COMMENT the index of the current cuboid in the current model part + ARG 4 cuboid + COMMENT the current cuboid diff --git a/mappings/net/minecraft/client/option/GameOptions.mapping b/mappings/net/minecraft/client/option/GameOptions.mapping index 92da52209c..69aebe494c 100644 --- a/mappings/net/minecraft/client/option/GameOptions.mapping +++ b/mappings/net/minecraft/client/option/GameOptions.mapping @@ -90,9 +90,9 @@ CLASS net/minecraft/class_315 net/minecraft/client/option/GameOptions COMMENT or {@linkplain net.minecraft.block.Block#getPickStack(net.minecraft.world.WorldView, COMMENT net.minecraft.util.math.BlockPos, net.minecraft.block.BlockState) block} the player is looking at. COMMENT Bound to {@linkplain org.lwjgl.glfw.GLFW#GLFW_MOUSE_BUTTON_MIDDLE the middle mouse button} by default. - FIELD field_1872 overrideWidth I FIELD field_18725 backgroundForChatOnly Lnet/minecraft/class_7172; FIELD field_18726 textBackgroundOpacity Lnet/minecraft/class_7172; + FIELD field_1872 overrideWidth I FIELD field_1873 autoSuggestions Lnet/minecraft/class_7172; FIELD field_1874 loadToolbarActivatorKey Lnet/minecraft/class_304; COMMENT A key binding for loading the hotbar items in {@linkplain net.minecraft.world.GameMode#CREATIVE creative mode}. diff --git a/mappings/net/minecraft/client/particle/DamageParticle.mapping b/mappings/net/minecraft/client/particle/DamageParticle.mapping index 46ce657085..277046a1ee 100644 --- a/mappings/net/minecraft/client/particle/DamageParticle.mapping +++ b/mappings/net/minecraft/client/particle/DamageParticle.mapping @@ -1,8 +1,4 @@ CLASS net/minecraft/class_657 net/minecraft/client/particle/DamageParticle - CLASS class_3939 Factory - FIELD field_18291 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider CLASS class_658 DefaultFactory FIELD field_17790 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V @@ -11,3 +7,7 @@ CLASS net/minecraft/class_657 net/minecraft/client/particle/DamageParticle FIELD field_17791 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider + CLASS class_3939 Factory + FIELD field_18291 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping b/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping index 11335bf42b..ff2ab76e22 100644 --- a/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping +++ b/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping @@ -1,8 +1,4 @@ CLASS net/minecraft/class_677 net/minecraft/client/particle/FireworksSparkParticle - CLASS class_3997 FlashFactory - FIELD field_17810 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider CLASS class_678 Flash CLASS class_679 ExplosionFactory FIELD field_17811 spriteProvider Lnet/minecraft/class_4002; @@ -64,3 +60,7 @@ CLASS net/minecraft/class_677 net/minecraft/client/particle/FireworksSparkPartic METHOD method_3032 explodeBurst (Lit/unimi/dsi/fastutil/ints/IntList;Lit/unimi/dsi/fastutil/ints/IntList;ZZ)V ARG 3 trail ARG 4 flicker + CLASS class_3997 FlashFactory + FIELD field_17810 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/FlameParticle.mapping b/mappings/net/minecraft/client/particle/FlameParticle.mapping index e6493e1bf8..6e83c1c7a5 100644 --- a/mappings/net/minecraft/client/particle/FlameParticle.mapping +++ b/mappings/net/minecraft/client/particle/FlameParticle.mapping @@ -1,9 +1,9 @@ CLASS net/minecraft/class_687 net/minecraft/client/particle/FlameParticle - CLASS class_5613 SmallFactory - FIELD field_27736 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider CLASS class_688 Factory FIELD field_17812 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider + CLASS class_5613 SmallFactory + FIELD field_27736 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/SquidInkParticle.mapping b/mappings/net/minecraft/client/particle/SquidInkParticle.mapping index aa7abefcbb..800f5ed9f6 100644 --- a/mappings/net/minecraft/client/particle/SquidInkParticle.mapping +++ b/mappings/net/minecraft/client/particle/SquidInkParticle.mapping @@ -9,11 +9,11 @@ CLASS net/minecraft/class_725 net/minecraft/client/particle/SquidInkParticle ARG 12 velocityZ ARG 14 color ARG 15 spriteProvider - CLASS class_5788 GlowSquidInkFactory - FIELD field_28460 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider CLASS class_726 Factory FIELD field_17878 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider + CLASS class_5788 GlowSquidInkFactory + FIELD field_28460 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/client/particle/SuspendParticle.mapping b/mappings/net/minecraft/client/particle/SuspendParticle.mapping index d84ff5de2c..b68e57ce3f 100644 --- a/mappings/net/minecraft/client/particle/SuspendParticle.mapping +++ b/mappings/net/minecraft/client/particle/SuspendParticle.mapping @@ -1,8 +1,4 @@ CLASS net/minecraft/class_729 net/minecraft/client/particle/SuspendParticle - CLASS class_3991 Factory - FIELD field_17880 spriteProvider Lnet/minecraft/class_4002; - METHOD (Lnet/minecraft/class_4002;)V - ARG 1 spriteProvider CLASS class_730 DolphinFactory FIELD field_17881 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V @@ -15,6 +11,10 @@ CLASS net/minecraft/class_729 net/minecraft/client/particle/SuspendParticle FIELD field_17883 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider + CLASS class_3991 Factory + FIELD field_17880 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider CLASS class_8254 EggCrackFactory FIELD field_43374 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V diff --git a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping index e2c2719ae8..71cbbca858 100644 --- a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping +++ b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping @@ -1,17 +1,4 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPreparer - CLASS class_5972 ChunkInfoList - FIELD field_29620 current [Lnet/minecraft/class_8679$class_762; - METHOD (I)V - ARG 1 size - METHOD method_34820 getInfo (Lnet/minecraft/class_846$class_851;)Lnet/minecraft/class_8679$class_762; - ARG 1 chunk - METHOD method_34821 setInfo (Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_8679$class_762;)V - ARG 1 chunk - ARG 2 info - CLASS class_6600 RenderableChunks - FIELD field_34819 chunks Ljava/util/LinkedHashSet; - METHOD (I)V - ARG 1 chunkCount CLASS class_762 ChunkInfo FIELD field_4122 propagationLevel I FIELD field_4124 chunk Lnet/minecraft/class_846$class_851; @@ -33,3 +20,16 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre ARG 1 ordinal METHOD method_34816 addDirection (Lnet/minecraft/class_2350;)V ARG 1 direction + CLASS class_5972 ChunkInfoList + FIELD field_29620 current [Lnet/minecraft/class_8679$class_762; + METHOD (I)V + ARG 1 size + METHOD method_34820 getInfo (Lnet/minecraft/class_846$class_851;)Lnet/minecraft/class_8679$class_762; + ARG 1 chunk + METHOD method_34821 setInfo (Lnet/minecraft/class_846$class_851;Lnet/minecraft/class_8679$class_762;)V + ARG 1 chunk + ARG 2 info + CLASS class_6600 RenderableChunks + FIELD field_34819 chunks Ljava/util/LinkedHashSet; + METHOD (I)V + ARG 1 chunkCount diff --git a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping index e508a53b58..e8008f86ad 100644 --- a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping +++ b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping @@ -43,8 +43,6 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers ARG 0 type METHOD method_24065 createChestTextureId (Ljava/lang/String;)Lnet/minecraft/class_4730; ARG 0 variant - METHOD method_24066 addDefaultTextures (Ljava/util/function/Consumer;)V - ARG 0 adder METHOD method_24067 getShieldPatterns ()Lnet/minecraft/class_1921; METHOD method_24068 (Ljava/lang/String;)Lnet/minecraft/class_4730; ARG 0 colorName @@ -56,16 +54,10 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers METHOD method_24074 getEntityCutout ()Lnet/minecraft/class_1921; METHOD method_24076 getEntityTranslucentCull ()Lnet/minecraft/class_1921; METHOD method_29382 getItemEntityTranslucentCull ()Lnet/minecraft/class_1921; - METHOD method_33081 getBannerPatternTextureId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_4730; - ARG 0 bannerPattern + METHOD method_33081 getBannerPatternTextureId (Lnet/minecraft/class_6880;)Lnet/minecraft/class_4730; METHOD method_33082 getSignTextureId (Lnet/minecraft/class_4719;)Lnet/minecraft/class_4730; ARG 0 signType - METHOD method_33083 getShieldPatternTextureId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_4730; - ARG 0 bannerPattern - METHOD method_33084 createBannerPatternTextureId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_4730; - ARG 0 bannerPattern - METHOD method_33085 createShieldPatternTextureId (Lnet/minecraft/class_5321;)Lnet/minecraft/class_4730; - ARG 0 bannerPattern + METHOD method_33083 getShieldPatternTextureId (Lnet/minecraft/class_6880;)Lnet/minecraft/class_4730; METHOD method_45781 getHangingSignTextureId (Lnet/minecraft/class_4719;)Lnet/minecraft/class_4730; ARG 0 signType METHOD method_45782 createHangingSignTextureId (Lnet/minecraft/class_4719;)Lnet/minecraft/class_4730; diff --git a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping index 599a619e86..87f167adaa 100644 --- a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping @@ -105,26 +105,6 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender ARG 8 random ARG 9 seed ARG 11 overlay - CLASS class_4303 BrightnessCache - FIELD field_19320 enabled Z - FIELD field_19321 intCache Lit/unimi/dsi/fastutil/longs/Long2IntLinkedOpenHashMap; - FIELD field_19322 floatCache Lit/unimi/dsi/fastutil/longs/Long2FloatLinkedOpenHashMap; - METHOD method_20548 enable ()V - METHOD method_20549 getInt (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)I - ARG 1 state - ARG 2 world - ARG 3 pos - METHOD method_20550 disable ()V - METHOD method_20551 getFloat (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)F - ARG 1 state - ARG 2 blockView - ARG 3 pos - CLASS 1 - METHOD rehash (I)V - ARG 1 newN - CLASS 2 - METHOD rehash (I)V - ARG 1 newN CLASS class_779 NeighborData FIELD field_4189 nonCubicWeight Z FIELD field_4190 VALUES [Lnet/minecraft/class_778$class_779; @@ -169,3 +149,23 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender METHOD (Ljava/lang/String;ILnet/minecraft/class_2350;Z)V ARG 3 direction ARG 4 flip + CLASS class_4303 BrightnessCache + FIELD field_19320 enabled Z + FIELD field_19321 intCache Lit/unimi/dsi/fastutil/longs/Long2IntLinkedOpenHashMap; + FIELD field_19322 floatCache Lit/unimi/dsi/fastutil/longs/Long2FloatLinkedOpenHashMap; + METHOD method_20548 enable ()V + METHOD method_20549 getInt (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)I + ARG 1 state + ARG 2 world + ARG 3 pos + METHOD method_20550 disable ()V + METHOD method_20551 getFloat (Lnet/minecraft/class_2680;Lnet/minecraft/class_1920;Lnet/minecraft/class_2338;)F + ARG 1 state + ARG 2 blockView + ARG 3 pos + CLASS 1 + METHOD rehash (I)V + ARG 1 newN + CLASS 2 + METHOD rehash (I)V + ARG 1 newN diff --git a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping index 1ad388fd6a..cf8a156711 100644 --- a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping @@ -10,7 +10,7 @@ CLASS net/minecraft/class_823 net/minecraft/client/render/block/entity/BannerBlo FIELD field_32821 CROSSBAR Ljava/lang/String; METHOD (Lnet/minecraft/class_5614$class_5615;)V ARG 1 ctx - METHOD method_23802 renderCanvas (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_630;Lnet/minecraft/class_4730;ZLnet/minecraft/class_9307;Z)V + METHOD method_23802 renderCanvas (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_630;Lnet/minecraft/class_4730;ZLnet/minecraft/class_1767;Lnet/minecraft/class_9307;Z)V ARG 0 matrices ARG 1 vertexConsumers ARG 2 light @@ -18,8 +18,7 @@ CLASS net/minecraft/class_823 net/minecraft/client/render/block/entity/BannerBlo ARG 4 canvas ARG 5 baseSprite ARG 6 isBanner - ARG 8 glint - METHOD method_29999 renderCanvas (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_630;Lnet/minecraft/class_4730;ZLnet/minecraft/class_9307;)V + METHOD method_29999 renderCanvas (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_630;Lnet/minecraft/class_4730;ZLnet/minecraft/class_1767;Lnet/minecraft/class_9307;)V ARG 0 matrices ARG 1 vertexConsumers ARG 2 light @@ -28,7 +27,3 @@ CLASS net/minecraft/class_823 net/minecraft/client/render/block/entity/BannerBlo ARG 5 baseSprite ARG 6 isBanner METHOD method_32135 getTexturedModelData ()Lnet/minecraft/class_5607; - METHOD method_43789 (Lnet/minecraft/class_630;Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;II[FLnet/minecraft/class_4730;)V - ARG 6 sprite - METHOD method_43790 (ZLnet/minecraft/class_5321;)Lnet/minecraft/class_4730; - ARG 1 key diff --git a/mappings/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.mapping index 599efeb896..ba0bd22659 100644 --- a/mappings/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.mapping @@ -14,8 +14,7 @@ CLASS net/minecraft/class_836 net/minecraft/client/render/block/entity/SkullBloc ARG 5 light ARG 6 model ARG 7 renderLayer - METHOD method_3578 getRenderLayer (Lnet/minecraft/class_2484$class_2485;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_1921; + METHOD method_3578 getRenderLayer (Lnet/minecraft/class_2484$class_2485;Lnet/minecraft/class_9296;)Lnet/minecraft/class_1921; ARG 0 type - ARG 1 profile METHOD method_3580 (Ljava/util/HashMap;)V ARG 0 map diff --git a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping index 6cf3426913..83c1274eb7 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -48,7 +48,6 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder METHOD method_38555 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletionStage; ARG 0 future METHOD method_39132 pollTask ()Lnet/minecraft/class_846$class_851$class_4577; - CLASS class_4690 Result CLASS class_849 ChunkData FIELD field_4450 nonEmptyLayers Ljava/util/Set; FIELD field_4451 EMPTY Lnet/minecraft/class_846$class_849; @@ -172,3 +171,4 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder ARG 2 throwable METHOD method_22790 (Ljava/lang/Void;)Lnet/minecraft/class_846$class_4690; ARG 0 v + CLASS class_4690 Result diff --git a/mappings/net/minecraft/client/render/entity/WolfEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/WolfEntityRenderer.mapping index 9ed683bf98..fc9d530f79 100644 --- a/mappings/net/minecraft/client/render/entity/WolfEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/WolfEntityRenderer.mapping @@ -1,4 +1 @@ CLASS net/minecraft/class_969 net/minecraft/client/render/entity/WolfEntityRenderer - FIELD field_4821 WILD_TEXTURE Lnet/minecraft/class_2960; - FIELD field_4822 TAMED_TEXTURE Lnet/minecraft/class_2960; - FIELD field_4823 ANGRY_TEXTURE Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping index dd90fefa39..af50e878fa 100644 --- a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping @@ -63,21 +63,6 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked METHOD method_35789 needsResolution ()Z METHOD method_45786 (Ljava/util/function/Function;Lnet/minecraft/class_799;)V ARG 2 override - CLASS class_4751 GuiLight - FIELD field_21858 ITEM Lnet/minecraft/class_793$class_4751; - COMMENT The model will be shaded from the front, like a basic item - FIELD field_21859 BLOCK Lnet/minecraft/class_793$class_4751; - COMMENT The model will be shaded from the side, like a block. - FIELD field_21860 name Ljava/lang/String; - METHOD (Ljava/lang/String;ILjava/lang/String;)V - ARG 3 name - METHOD method_24299 isSide ()Z - METHOD method_24300 byName (Ljava/lang/String;)Lnet/minecraft/class_793$class_4751; - ARG 0 value - CLASS class_6246 UncheckedModelException - COMMENT An unused unchecked exception. Probably related to unbaked models. - METHOD (Ljava/lang/String;)V - ARG 1 message CLASS class_795 Deserializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 element @@ -98,3 +83,18 @@ CLASS net/minecraft/class_793 net/minecraft/client/render/model/json/JsonUnbaked ARG 2 object METHOD method_3453 ambientOcclusionFromJson (Lcom/google/gson/JsonObject;)Ljava/lang/Boolean; ARG 1 json + CLASS class_4751 GuiLight + FIELD field_21858 ITEM Lnet/minecraft/class_793$class_4751; + COMMENT The model will be shaded from the front, like a basic item + FIELD field_21859 BLOCK Lnet/minecraft/class_793$class_4751; + COMMENT The model will be shaded from the side, like a block. + FIELD field_21860 name Ljava/lang/String; + METHOD (Ljava/lang/String;ILjava/lang/String;)V + ARG 3 name + METHOD method_24299 isSide ()Z + METHOD method_24300 byName (Ljava/lang/String;)Lnet/minecraft/class_793$class_4751; + ARG 0 value + CLASS class_6246 UncheckedModelException + COMMENT An unused unchecked exception. Probably related to unbaked models. + METHOD (Ljava/lang/String;)V + ARG 1 message diff --git a/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping b/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping index f40af007a7..f623cbb50e 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping @@ -6,14 +6,6 @@ CLASS net/minecraft/class_799 net/minecraft/client/render/model/json/ModelOverri ARG 2 conditions METHOD method_33690 streamConditions ()Ljava/util/stream/Stream; METHOD method_3472 getModelId ()Lnet/minecraft/class_2960; - CLASS class_5826 Condition - FIELD field_28790 type Lnet/minecraft/class_2960; - FIELD field_28791 threshold F - METHOD (Lnet/minecraft/class_2960;F)V - ARG 1 type - ARG 2 threshold - METHOD method_33692 getType ()Lnet/minecraft/class_2960; - METHOD method_33693 getThreshold ()F CLASS class_800 Deserializer METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; ARG 1 functionJson @@ -23,3 +15,11 @@ CLASS net/minecraft/class_799 net/minecraft/client/render/model/json/ModelOverri ARG 0 entry METHOD method_3474 deserializeMinPropertyValues (Lcom/google/gson/JsonObject;)Ljava/util/List; ARG 1 object + CLASS class_5826 Condition + FIELD field_28790 type Lnet/minecraft/class_2960; + FIELD field_28791 threshold F + METHOD (Lnet/minecraft/class_2960;F)V + ARG 1 type + ARG 2 threshold + METHOD method_33692 getType ()Lnet/minecraft/class_2960; + METHOD method_33693 getThreshold ()F diff --git a/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping index 9b5ba410ab..36fe96dcdf 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping @@ -33,8 +33,6 @@ CLASS net/minecraft/class_790 net/minecraft/client/render/model/json/ModelVarian METHOD method_45787 fromJson (Lnet/minecraft/class_790$class_791;Lcom/google/gson/JsonElement;)Lnet/minecraft/class_790; ARG 0 context ARG 1 json - CLASS class_6247 VariantAbsentException - COMMENT An unchecked exception indicating a variant is not found with a string key. CLASS class_791 DeserializationContext FIELD field_4242 stateFactory Lnet/minecraft/class_2689; FIELD field_4243 gson Lcom/google/gson/Gson; @@ -52,3 +50,5 @@ CLASS net/minecraft/class_790 net/minecraft/client/render/model/json/ModelVarian METHOD method_3429 variantsFromJson (Lcom/google/gson/JsonDeserializationContext;Lcom/google/gson/JsonObject;)Ljava/util/Map; ARG 1 context ARG 2 object + CLASS class_6247 VariantAbsentException + COMMENT An unchecked exception indicating a variant is not found with a string key. diff --git a/mappings/net/minecraft/command/argument/ItemSlotArgumentType.mapping b/mappings/net/minecraft/command/argument/ItemSlotArgumentType.mapping index 005ef8ef72..3bdd6b3435 100644 --- a/mappings/net/minecraft/command/argument/ItemSlotArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/ItemSlotArgumentType.mapping @@ -1,7 +1,6 @@ CLASS net/minecraft/class_2240 net/minecraft/command/argument/ItemSlotArgumentType FIELD field_9955 UNKNOWN_SLOT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; FIELD field_9956 EXAMPLES Ljava/util/Collection; - FIELD field_9957 SLOT_NAMES_TO_SLOT_COMMAND_ID Ljava/util/Map; METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; ARG 1 context ARG 2 builder @@ -10,8 +9,6 @@ CLASS net/minecraft/class_2240 net/minecraft/command/argument/ItemSlotArgumentTy ARG 1 name METHOD method_9471 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; ARG 0 name - METHOD method_9472 (Ljava/util/HashMap;)V - ARG 0 map METHOD method_9473 itemSlot ()Lnet/minecraft/class_2240; METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; ARG 1 reader diff --git a/mappings/net/minecraft/component/type/BannerPatternsComponent.mapping b/mappings/net/minecraft/component/type/BannerPatternsComponent.mapping index de8c6e07af..773e7ccc66 100644 --- a/mappings/net/minecraft/component/type/BannerPatternsComponent.mapping +++ b/mappings/net/minecraft/component/type/BannerPatternsComponent.mapping @@ -3,16 +3,11 @@ CLASS net/minecraft/class_9307 net/minecraft/component/type/BannerPatternsCompon FIELD field_49405 CODEC Lcom/mojang/serialization/Codec; FIELD field_49406 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_57571 withoutTopLayer ()Lnet/minecraft/class_9307; - METHOD method_57572 withBase (Lnet/minecraft/class_1767;)Lnet/minecraft/class_9307; - ARG 1 color CLASS class_3750 Builder FIELD field_16548 entries Lcom/google/common/collect/ImmutableList$Builder; METHOD method_16376 add (Lnet/minecraft/class_6880;Lnet/minecraft/class_1767;)Lnet/minecraft/class_9307$class_3750; ARG 1 pattern ARG 2 color - METHOD method_43720 add (Lnet/minecraft/class_5321;Lnet/minecraft/class_1767;)Lnet/minecraft/class_9307$class_3750; - ARG 1 pattern - ARG 2 color METHOD method_57573 build ()Lnet/minecraft/class_9307; METHOD method_57574 add (Lnet/minecraft/class_9307$class_9308;)Lnet/minecraft/class_9307$class_3750; ARG 1 layer diff --git a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping index 8c8aefddd4..37db6b1f14 100644 --- a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping +++ b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping @@ -17,9 +17,6 @@ CLASS net/minecraft/class_9304 net/minecraft/component/type/ItemEnchantmentsComp ARG 1 enchantment METHOD method_57537 (Lnet/minecraft/class_9304;)Ljava/lang/Boolean; ARG 0 component - METHOD method_57538 (Ljava/util/Map;Ljava/lang/Boolean;)Lnet/minecraft/class_9304; - ARG 0 enchantments - ARG 1 showInTooltip METHOD method_57539 getEnchantmentsMap ()Ljava/util/Set; METHOD method_57540 (Lnet/minecraft/class_9304;)Lit/unimi/dsi/fastutil/objects/Object2IntLinkedOpenHashMap; ARG 0 component @@ -27,7 +24,7 @@ CLASS net/minecraft/class_9304 net/minecraft/component/type/ItemEnchantmentsComp METHOD method_57542 (Lnet/minecraft/class_9304;)Ljava/lang/Boolean; ARG 0 component METHOD method_57543 isEmpty ()Z - METHOD method_57544 (Lnet/minecraft/class_9304;)Ljava/util/Map; + METHOD method_57544 (Lnet/minecraft/class_9304;)Lit/unimi/dsi/fastutil/objects/Object2IntLinkedOpenHashMap; ARG 0 component CLASS class_9305 Builder FIELD field_49391 enchantments Lit/unimi/dsi/fastutil/objects/Object2IntLinkedOpenHashMap; diff --git a/mappings/net/minecraft/component/type/LodestoneTargetComponent.mapping b/mappings/net/minecraft/component/type/LodestoneTargetComponent.mapping index 55879571e2..2af9baa941 100644 --- a/mappings/net/minecraft/component/type/LodestoneTargetComponent.mapping +++ b/mappings/net/minecraft/component/type/LodestoneTargetComponent.mapping @@ -1,7 +1,5 @@ CLASS net/minecraft/class_9291 net/minecraft/component/type/LodestoneTargetComponent FIELD field_49345 CODEC Lcom/mojang/serialization/Codec; FIELD field_49346 PACKET_CODEC Lnet/minecraft/class_9139; - METHOD method_57501 isInvalid (Lnet/minecraft/class_3218;)Z - ARG 1 world METHOD method_57502 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/component/type/ProfileComponent.mapping b/mappings/net/minecraft/component/type/ProfileComponent.mapping index 7107bd28ea..1526b53bae 100644 --- a/mappings/net/minecraft/component/type/ProfileComponent.mapping +++ b/mappings/net/minecraft/component/type/ProfileComponent.mapping @@ -3,15 +3,13 @@ CLASS net/minecraft/class_9296 net/minecraft/component/type/ProfileComponent FIELD field_49360 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Lcom/mojang/authlib/GameProfile;)V ARG 1 gameProfile - METHOD (Ljava/lang/String;Ljava/util/Optional;Lcom/mojang/authlib/properties/PropertyMap;)V - ARG 1 name + METHOD (Ljava/util/Optional;Ljava/util/Optional;Lcom/mojang/authlib/properties/PropertyMap;)V ARG 2 id ARG 3 properties METHOD method_57507 getFuture ()Ljava/util/concurrent/CompletableFuture; METHOD method_57508 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_57509 createProfile (Ljava/lang/String;Ljava/util/Optional;Lcom/mojang/authlib/properties/PropertyMap;)Lcom/mojang/authlib/GameProfile; - ARG 0 name + METHOD method_57509 createProfile (Ljava/util/Optional;Ljava/util/Optional;Lcom/mojang/authlib/properties/PropertyMap;)Lcom/mojang/authlib/GameProfile; ARG 1 id ARG 2 properties METHOD method_57510 (Ljava/util/Optional;)Lnet/minecraft/class_9296; diff --git a/mappings/net/minecraft/datafixer/schema/Schema99.mapping b/mappings/net/minecraft/datafixer/schema/Schema99.mapping index 63dfa1e3e7..9c99fa2063 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema99.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema99.mapping @@ -28,14 +28,13 @@ CLASS net/minecraft/class_1254 net/minecraft/datafixer/schema/Schema99 ARG 1 name METHOD method_5356 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; ARG 1 name - METHOD method_5357 (Lcom/mojang/serialization/Dynamic;Ljava/util/Map;Ljava/lang/String;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_5357 (Lcom/mojang/serialization/Dynamic;Ljava/util/Map;Ljava/util/Map;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 3 tag METHOD method_5358 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; ARG 1 name - METHOD method_5359 updateBlockEntityTags (Lcom/mojang/serialization/Dynamic;Ljava/util/Map;Ljava/lang/String;)Ljava/lang/Object; + METHOD method_5359 updateBlockEntityTags (Lcom/mojang/serialization/Dynamic;Ljava/util/Map;Ljava/util/Map;)Ljava/lang/Object; ARG 0 stack ARG 1 renames - ARG 2 newArmorStandId METHOD method_5362 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; ARG 1 name METHOD method_5363 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; @@ -50,7 +49,7 @@ CLASS net/minecraft/class_1254 net/minecraft/datafixer/schema/Schema99 ARG 0 schema ARG 1 map ARG 2 entityId - METHOD method_5371 (Lcom/mojang/serialization/Dynamic;Ljava/lang/String;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_5371 (Lcom/mojang/serialization/Dynamic;Ljava/util/Map;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; ARG 2 entityTag METHOD method_5372 (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;)Lcom/mojang/datafixers/types/templates/TypeTemplate; ARG 1 name diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping index 1535d84e9a..4c5b88956a 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeInstance.mapping @@ -3,7 +3,7 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns FIELD field_23700 type Lnet/minecraft/class_6880; FIELD field_23701 operationToModifiers Ljava/util/Map; FIELD field_23702 idToModifiers Ljava/util/Map; - FIELD field_23703 persistentModifiers Ljava/util/Set; + FIELD field_23703 persistentModifiers Ljava/util/Map; FIELD field_23704 baseValue D FIELD field_23705 dirty Z FIELD field_23706 value D @@ -16,9 +16,8 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns COMMENT COMMENT

Temporary modifiers are copied when using the operation. ARG 1 other - METHOD method_26832 (Lnet/minecraft/class_1322$class_1323;Ljava/util/Set;)V + METHOD method_26832 (Lnet/minecraft/class_1322$class_1323;Ljava/util/Map;)V ARG 1 operation - ARG 2 modifiers METHOD method_26833 readNbt (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD method_26834 getModifiersByOperation (Lnet/minecraft/class_1322$class_1323;)Ljava/util/Collection; @@ -27,7 +26,7 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns COMMENT Adds a temporary attribute modifier. COMMENT The modifier will not be serialized. ARG 1 modifier - METHOD method_26836 (Lnet/minecraft/class_1322$class_1323;)Ljava/util/Set; + METHOD method_26836 (Lnet/minecraft/class_1322$class_1323;)Ljava/util/Map; ARG 0 operationx METHOD method_26837 addPersistentModifier (Lnet/minecraft/class_1322;)V ARG 1 modifier @@ -47,7 +46,7 @@ CLASS net/minecraft/class_1324 net/minecraft/entity/attribute/EntityAttributeIns ARG 1 modifier METHOD method_6192 setBaseValue (D)V ARG 1 baseValue - METHOD method_6193 getModifiers (Lnet/minecraft/class_1322$class_1323;)Ljava/util/Set; + METHOD method_6193 getModifiers (Lnet/minecraft/class_1322$class_1323;)Ljava/util/Map; ARG 1 operation METHOD method_6194 getValue ()D METHOD method_6195 getModifiers ()Ljava/util/Set; diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping index d769ed9f32..c4fd17b3dc 100644 --- a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping +++ b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeModifier + FIELD comp_2447 uuid Ljava/util/UUID; + FIELD comp_2448 name Ljava/lang/String; + FIELD comp_2449 value D + FIELD comp_2450 operation Lnet/minecraft/class_1322$class_1323; FIELD field_23712 LOGGER Lorg/slf4j/Logger; FIELD field_46247 CODEC Lcom/mojang/serialization/Codec; - FIELD field_46248 name Ljava/lang/String; - FIELD field_6323 value D - FIELD field_6324 operation Lnet/minecraft/class_1322$class_1323; - FIELD field_6327 uuid Ljava/util/UUID; METHOD (Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)V ARG 1 name ARG 2 value @@ -14,6 +14,10 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod ARG 2 name ARG 3 value ARG 5 operation + METHOD comp_2447 uuid ()Ljava/util/UUID; + METHOD comp_2448 name ()Ljava/lang/String; + METHOD comp_2449 value ()D + METHOD comp_2450 operation ()Lnet/minecraft/class_1322$class_1323; METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_26859 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1322; @@ -23,9 +27,6 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod ARG 0 modifier METHOD method_53966 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - METHOD method_6182 getOperation ()Lnet/minecraft/class_1322$class_1323; - METHOD method_6186 getValue ()D - METHOD method_6189 getId ()Ljava/util/UUID; CLASS class_1323 Operation COMMENT Represents an operation which can be applied to an attribute modifier. FIELD field_45742 CODEC Lcom/mojang/serialization/Codec; diff --git a/mappings/net/minecraft/item/BannerItem.mapping b/mappings/net/minecraft/item/BannerItem.mapping index 903bccfde2..dec1333628 100644 --- a/mappings/net/minecraft/item/BannerItem.mapping +++ b/mappings/net/minecraft/item/BannerItem.mapping @@ -1,13 +1,8 @@ CLASS net/minecraft/class_1746 net/minecraft/item/BannerItem - FIELD field_30848 TRANSLATION_KEY_PREFIX Ljava/lang/String; METHOD (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)V ARG 1 bannerBlock ARG 2 wallBannerBlock ARG 3 settings - METHOD method_43707 (Ljava/util/List;Lnet/minecraft/class_9307$class_9308;Ljava/lang/String;)V - ARG 2 translationKey - METHOD method_43708 (Lnet/minecraft/class_5321;)Ljava/lang/String; - ARG 0 key METHOD method_7705 appendBannerTooltip (Lnet/minecraft/class_1799;Ljava/util/List;)V ARG 0 stack ARG 1 tooltip diff --git a/mappings/net/minecraft/item/BlockItem.mapping b/mappings/net/minecraft/item/BlockItem.mapping index 47fa78364e..9c15d96dc0 100644 --- a/mappings/net/minecraft/item/BlockItem.mapping +++ b/mappings/net/minecraft/item/BlockItem.mapping @@ -15,10 +15,6 @@ CLASS net/minecraft/class_1747 net/minecraft/item/BlockItem METHOD method_19260 getPlaceSound (Lnet/minecraft/class_2680;)Lnet/minecraft/class_3414; ARG 1 state METHOD method_20360 checkStatePlacement ()Z - METHOD method_57337 setBlockEntityData (Lnet/minecraft/class_1799;Lnet/minecraft/class_2591;Ljava/util/function/Consumer;)V - ARG 0 stack - ARG 1 type - ARG 2 setter METHOD method_57338 setBlockEntityData (Lnet/minecraft/class_1799;Lnet/minecraft/class_2591;Lnet/minecraft/class_2487;)V ARG 0 stack ARG 1 type @@ -27,8 +23,6 @@ CLASS net/minecraft/class_1747 net/minecraft/item/BlockItem ARG 0 world ARG 1 pos ARG 2 stack - METHOD method_57340 (Ljava/util/function/Consumer;Lnet/minecraft/class_2591;Lnet/minecraft/class_2487;)V - ARG 2 nbt METHOD method_7707 getPlacementState (Lnet/minecraft/class_1750;)Lnet/minecraft/class_2680; ARG 1 context METHOD method_7708 place (Lnet/minecraft/class_1750;Lnet/minecraft/class_2680;)Z diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index a63bc99f9a..a6fea5a73b 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -41,7 +41,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack FIELD field_24093 holder Lnet/minecraft/class_1297; FIELD field_24671 CODEC Lcom/mojang/serialization/Codec; FIELD field_40211 DISABLED_TEXT Lnet/minecraft/class_2561; - FIELD field_47309 RECIPE_RESULT_CODEC Lcom/mojang/serialization/Codec; FIELD field_47312 ITEM_CODEC Lcom/mojang/serialization/Codec; FIELD field_48349 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_48350 LIST_PACKET_CODEC Lnet/minecraft/class_9139; @@ -167,8 +166,6 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 1 registryEntryList METHOD method_54466 onCraftByCrafter (Lnet/minecraft/class_1937;)V ARG 1 world - METHOD method_55066 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance METHOD method_56700 (Lnet/minecraft/class_1799;)Ljava/util/Optional; ARG 0 stack METHOD method_56701 copyComponentsToNewStack (Lnet/minecraft/class_1935;I)Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping index 8b096928f3..1d2efae857 100644 --- a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping @@ -36,14 +36,6 @@ CLASS net/minecraft/class_94 net/minecraft/loot/function/ApplyBonusLootFunction ARG 0 instance METHOD method_53302 (Lnet/minecraft/class_94;)Lnet/minecraft/class_6880; ARG 0 function - CLASS class_100 UniformBonusCount - FIELD field_45813 CODEC Lcom/mojang/serialization/Codec; - FIELD field_45814 TYPE Lnet/minecraft/class_94$class_8752; - METHOD (I)V - ARG 1 bonusMultiplier - METHOD method_53308 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - CLASS class_8752 Type CLASS class_95 BinomialWithBonusCount FIELD comp_1848 extra I FIELD field_1013 TYPE Lnet/minecraft/class_94$class_8752; @@ -63,3 +55,11 @@ CLASS net/minecraft/class_94 net/minecraft/loot/function/ApplyBonusLootFunction CLASS class_98 OreDrops FIELD field_1015 TYPE Lnet/minecraft/class_94$class_8752; FIELD field_45812 CODEC Lcom/mojang/serialization/Codec; + CLASS class_100 UniformBonusCount + FIELD field_45813 CODEC Lcom/mojang/serialization/Codec; + FIELD field_45814 TYPE Lnet/minecraft/class_94$class_8752; + METHOD (I)V + ARG 1 bonusMultiplier + METHOD method_53308 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_8752 Type diff --git a/mappings/net/minecraft/loot/function/SetBannerPatternLootFunction.mapping b/mappings/net/minecraft/loot/function/SetBannerPatternLootFunction.mapping index deea270406..8e0a09b9e2 100644 --- a/mappings/net/minecraft/loot/function/SetBannerPatternLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetBannerPatternLootFunction.mapping @@ -25,6 +25,3 @@ CLASS net/minecraft/class_5592 net/minecraft/loot/function/SetBannerPatternLootF METHOD method_35533 pattern (Lnet/minecraft/class_6880;Lnet/minecraft/class_1767;)Lnet/minecraft/class_5592$class_6157; ARG 1 pattern ARG 2 color - METHOD method_43741 pattern (Lnet/minecraft/class_5321;Lnet/minecraft/class_1767;)Lnet/minecraft/class_5592$class_6157; - ARG 1 pattern - ARG 2 color diff --git a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping index 87787b8318..439b4e1add 100644 --- a/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/SetContentsLootFunction.mapping @@ -12,8 +12,6 @@ CLASS net/minecraft/class_134 net/minecraft/loot/function/SetContentsLootFunctio ARG 0 instance METHOD method_53365 (Lnet/minecraft/class_134;)Lnet/minecraft/class_6880; ARG 0 function - METHOD method_57653 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2487;)V - ARG 1 nbt METHOD method_599 (Lnet/minecraft/class_47;Lnet/minecraft/class_2371;Lnet/minecraft/class_79;)V ARG 2 entry METHOD method_600 (Lnet/minecraft/class_47;Lnet/minecraft/class_2371;Lnet/minecraft/class_82;)V diff --git a/mappings/net/minecraft/nbt/NbtHelper.mapping b/mappings/net/minecraft/nbt/NbtHelper.mapping index c076384f03..aca6f340ea 100644 --- a/mappings/net/minecraft/nbt/NbtHelper.mapping +++ b/mappings/net/minecraft/nbt/NbtHelper.mapping @@ -25,18 +25,6 @@ CLASS net/minecraft/class_2512 net/minecraft/nbt/NbtHelper ARG 2 key ARG 3 properties ARG 4 root - METHOD method_10683 toGameProfile (Lnet/minecraft/class_2487;)Lcom/mojang/authlib/GameProfile; - COMMENT {@return the game profile converted from {@code nbt}} - COMMENT - COMMENT @see #writeGameProfile(NbtCompound, GameProfile) - ARG 0 nbt - METHOD method_10684 writeGameProfile (Lnet/minecraft/class_2487;Lcom/mojang/authlib/GameProfile;)Lnet/minecraft/class_2487; - COMMENT Writes the game profile to {@code nbt}. This modifies the passed compound. - COMMENT - COMMENT @return the compound with the serialized game profile - COMMENT @see #toGameProfile(NbtCompound) - ARG 0 nbt - ARG 1 profile METHOD method_10685 nameValue (Lnet/minecraft/class_2769;Ljava/lang/Comparable;)Ljava/lang/String; ARG 0 property ARG 1 value diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping index 0cb28a5bf3..fa4bb5d08e 100644 --- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping @@ -289,6 +289,17 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs ARG 0 registryRef METHOD method_58002 unlimitedRegistryCodec (Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_9139; ARG 0 codec + CLASS 2 + METHOD method_56403 decode (Lio/netty/buffer/ByteBuf;)[B + ARG 1 buf + METHOD method_56404 encode (Lio/netty/buffer/ByteBuf;[B)V + ARG 1 buf + ARG 2 value + CLASS 5 + METHOD method_56899 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; + ARG 1 error + METHOD method_56900 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; + ARG 1 error CLASS 10 CLASS 11 METHOD method_58007 (Lnet/minecraft/class_9139;Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;Ljava/lang/Object;)V @@ -319,20 +330,9 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs ARG 1 signature METHOD method_58017 (Lio/netty/buffer/ByteBuf;)Ljava/lang/String; ARG 0 buf2 - CLASS 2 - METHOD method_56403 decode (Lio/netty/buffer/ByteBuf;)[B - ARG 1 buf - METHOD method_56404 encode (Lio/netty/buffer/ByteBuf;[B)V - ARG 1 buf - ARG 2 value CLASS 27 METHOD method_56407 read (Lio/netty/buffer/ByteBuf;)[B ARG 1 buf METHOD method_56408 write (Lio/netty/buffer/ByteBuf;[B)V ARG 1 buf ARG 2 bytes - CLASS 5 - METHOD method_56899 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; - ARG 1 error - METHOD method_56900 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; - ARG 1 error diff --git a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping index 3fee1f9dbb..1e8c46d638 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping @@ -1,5 +1,4 @@ CLASS net/minecraft/class_3735 net/minecraft/predicate/entity/EntityEquipmentPredicate - FIELD field_19240 OMINOUS_BANNER_ON_HEAD Lnet/minecraft/class_3735; FIELD field_45744 CODEC Lcom/mojang/serialization/Codec; METHOD method_16226 test (Lnet/minecraft/class_1297;)Z ARG 1 entity diff --git a/mappings/net/minecraft/registry/Registries.mapping b/mappings/net/minecraft/registry/Registries.mapping index 01258b705f..0fc8499b78 100644 --- a/mappings/net/minecraft/registry/Registries.mapping +++ b/mappings/net/minecraft/registry/Registries.mapping @@ -35,7 +35,6 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries FIELD field_41162 STRUCTURE_POOL_ELEMENT Lnet/minecraft/class_2378; FIELD field_41163 CAT_VARIANT Lnet/minecraft/class_2378; FIELD field_41164 FROG_VARIANT Lnet/minecraft/class_2378; - FIELD field_41165 BANNER_PATTERN Lnet/minecraft/class_2378; FIELD field_41166 INSTRUMENT Lnet/minecraft/class_2378; FIELD field_41167 REGISTRIES Lnet/minecraft/class_2378; FIELD field_41168 LOGGER Lorg/slf4j/Logger; diff --git a/mappings/net/minecraft/registry/entry/RegistryEntryListCodec.mapping b/mappings/net/minecraft/registry/entry/RegistryEntryListCodec.mapping index 34db86afab..7623a415fe 100644 --- a/mappings/net/minecraft/registry/entry/RegistryEntryListCodec.mapping +++ b/mappings/net/minecraft/registry/entry/RegistryEntryListCodec.mapping @@ -28,9 +28,7 @@ CLASS net/minecraft/class_6898 net/minecraft/registry/entry/RegistryEntryListCod METHOD method_40383 decodeDirect (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 ops ARG 2 input - METHOD method_40385 (Lnet/minecraft/class_7871;Lcom/mojang/datafixers/util/Either;)Lnet/minecraft/class_6885; - ARG 1 either - METHOD method_40386 (Lnet/minecraft/class_7871;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Pair; + METHOD method_40386 (Lnet/minecraft/class_7871;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; ARG 1 pair METHOD method_40387 (Ljava/util/List;)Lcom/mojang/datafixers/util/Either; ARG 0 entries diff --git a/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping b/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping index 454bc19613..cea200396a 100644 --- a/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping +++ b/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping @@ -16,23 +16,15 @@ CLASS net/minecraft/class_3803 net/minecraft/screen/GrindstoneScreenHandler ARG 1 syncId ARG 2 playerInventory ARG 3 context - METHOD method_16693 grind (Lnet/minecraft/class_1799;II)Lnet/minecraft/class_1799; + METHOD method_16693 grind (Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; ARG 1 item - ARG 2 damage - ARG 3 amount - METHOD method_16694 (Lnet/minecraft/class_9304$class_9305;)V - ARG 0 builder METHOD method_16695 updateResult ()V METHOD method_17415 (Lnet/minecraft/class_1657;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V ARG 2 world ARG 3 pos - METHOD method_20268 transferEnchantments (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; + METHOD method_20268 transferEnchantments (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V ARG 1 target ARG 2 source - METHOD method_57320 (Lnet/minecraft/class_1799;Lnet/minecraft/class_9304$class_9305;)V - ARG 1 builder - METHOD method_57321 (Lnet/minecraft/class_6880;)Z - ARG 0 enchantment CLASS 4 METHOD method_16696 getExperience (Lnet/minecraft/class_1799;)I ARG 1 stack diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 2051a2d5ef..656a7c47cd 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -393,15 +393,13 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 1 input ARG 2 ops ARG 3 prefix - METHOD method_57158 (Lcom/google/common/collect/ImmutableMap$Builder;Lcom/mojang/datafixers/util/Pair;)V - ARG 1 decoded METHOD method_57159 (Lcom/mojang/datafixers/util/Unit;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/datafixers/util/Unit; ARG 0 unit ARG 1 pair METHOD method_57160 (Lcom/mojang/datafixers/util/Unit;Lcom/mojang/datafixers/util/Unit;)Lcom/mojang/datafixers/util/Unit; ARG 0 unit ARG 1 unit2 - METHOD method_57161 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/DynamicOps;Ljava/util/function/Function;Lcom/google/common/collect/ImmutableMap$Builder;Ljava/util/stream/Stream$Builder;Lcom/mojang/serialization/DataResult;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; + METHOD method_57161 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/DynamicOps;Ljava/util/function/Function;Ljava/util/Map;Ljava/util/stream/Stream$Builder;Lcom/mojang/serialization/DataResult;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; ARG 5 result ARG 6 entry METHOD method_57162 (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/DynamicOps;Ljava/util/function/Function;Ljava/lang/Object;Lcom/mojang/serialization/MapLike;)Lcom/mojang/serialization/DataResult; @@ -419,8 +417,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 1 error METHOD method_57168 (Ljava/util/Map;Ljava/lang/Object;Lcom/mojang/datafixers/util/Unit;)Lcom/mojang/datafixers/util/Pair; ARG 2 unit - METHOD method_57169 (Ljava/util/stream/Stream$Builder;Lcom/mojang/datafixers/util/Pair;Lcom/mojang/serialization/DataResult$PartialResult;)V - ARG 2 result CLASS 8 METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 ops diff --git a/mappings/net/minecraft/village/raid/Raid.mapping b/mappings/net/minecraft/village/raid/Raid.mapping index 44a6674385..9fc75ce043 100644 --- a/mappings/net/minecraft/village/raid/Raid.mapping +++ b/mappings/net/minecraft/village/raid/Raid.mapping @@ -67,7 +67,7 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid ARG 2 countHealth METHOD method_16513 getCurrentRaiderHealth ()F METHOD method_16514 getMaxAcceptableBadOmenLevel ()I - METHOD method_16515 getOminousBanner ()Lnet/minecraft/class_1799; + METHOD method_16515 getOminousBanner (Lnet/minecraft/class_7871;)Lnet/minecraft/class_1799; METHOD method_16516 addRaider (ILnet/minecraft/class_3763;Lnet/minecraft/class_2338;Z)V ARG 1 wave ARG 2 raider