diff --git a/mappings/net/minecraft/block/FlowerBlock.mapping b/mappings/net/minecraft/block/FlowerBlock.mapping index 7a8720f483..9a97c3c2c0 100644 --- a/mappings/net/minecraft/block/FlowerBlock.mapping +++ b/mappings/net/minecraft/block/FlowerBlock.mapping @@ -5,8 +5,13 @@ CLASS net/minecraft/class_2356 net/minecraft/block/FlowerBlock FIELD field_46355 CODEC Lcom/mojang/serialization/MapCodec; METHOD (Lnet/minecraft/class_6880;FLnet/minecraft/class_4970$class_2251;)V ARG 1 stewEffect + ARG 2 effectLengthInSeconds ARG 3 settings + METHOD (Lnet/minecraft/class_9298;Lnet/minecraft/class_4970$class_2251;)V + ARG 1 stewEffects + ARG 2 settings METHOD method_54015 createStewEffectList (Lnet/minecraft/class_6880;F)Lnet/minecraft/class_9298; ARG 0 effect + ARG 1 effectLengthInSeconds 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 d12cc6cf96..b5f1061be0 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -12,23 +12,6 @@ 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 @@ -40,6 +23,9 @@ 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 @@ -59,3 +45,17 @@ 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 52e6a1d74e..38adceb66a 100644 --- a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity FIELD field_31296 MAX_PATTERN_COUNT I FIELD field_31297 PATTERNS_KEY Ljava/lang/String; FIELD field_49402 LOGGER Lorg/slf4j/Logger; + FIELD field_49756 patterns Lnet/minecraft/class_9307; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state @@ -16,3 +17,8 @@ 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_57566 (Ljava/lang/String;)V + ARG 0 patterns + METHOD method_58121 (Lnet/minecraft/class_9307;)V + ARG 1 patterns + METHOD method_58122 getPatterns ()Lnet/minecraft/class_9307; diff --git a/mappings/net/minecraft/block/entity/BannerPattern.mapping b/mappings/net/minecraft/block/entity/BannerPattern.mapping index b025084a2f..0486093eb2 100644 --- a/mappings/net/minecraft/block/entity/BannerPattern.mapping +++ b/mappings/net/minecraft/block/entity/BannerPattern.mapping @@ -1 +1,7 @@ CLASS net/minecraft/class_2582 net/minecraft/block/entity/BannerPattern + FIELD field_49757 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49758 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49759 ENTRY_CODEC Lcom/mojang/serialization/Codec; + FIELD field_49760 ENTRY_PACKET_CODEC Lnet/minecraft/class_9139; + METHOD method_58123 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/block/entity/BannerPatterns.mapping b/mappings/net/minecraft/block/entity/BannerPatterns.mapping index 448a1d0c9d..0bdac02cf8 100644 --- a/mappings/net/minecraft/block/entity/BannerPatterns.mapping +++ b/mappings/net/minecraft/block/entity/BannerPatterns.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_7446 net/minecraft/block/entity/BannerPatterns METHOD method_43721 registerAndGetDefault (Lnet/minecraft/class_7891;)V + ARG 0 registry METHOD method_43722 of (Ljava/lang/String;)Lnet/minecraft/class_5321; ARG 0 id METHOD method_57577 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;)V + ARG 0 registry ARG 1 key diff --git a/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping b/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping index 0ac9cb41d2..2837de504d 100644 --- a/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/LockableContainerBlockEntity.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_2624 net/minecraft/block/entity/LockableContainerBlock 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 + ARG 1 inventory 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 diff --git a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping index 25b9310fa7..0eec153f04 100644 --- a/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/SkullBlockEntity.mapping @@ -4,13 +4,18 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity FIELD field_34029 currentExecutor Ljava/util/concurrent/Executor; FIELD field_41315 poweredTicks I FIELD field_41316 powered Z - FIELD field_41602 NOTE_BLOCK_SOUND_KEY Ljava/lang/String; + FIELD field_41602 NOTE_BLOCK_SOUND_NBT_KEY Ljava/lang/String; FIELD field_41603 noteBlockSound Lnet/minecraft/class_2960; FIELD field_45147 EXECUTOR Ljava/util/concurrent/Executor; + FIELD field_49762 PROFILE_NBT_KEY Ljava/lang/String; + FIELD field_49763 CUSTOM_NAME_NBT_KEY Ljava/lang/String; + FIELD field_49764 LOGGER Lorg/slf4j/Logger; + FIELD field_49765 customName Lnet/minecraft/class_2561; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state METHOD method_11333 setOwner (Lnet/minecraft/class_9296;)V + ARG 1 profile 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 @@ -35,6 +40,8 @@ CLASS net/minecraft/class_2631 net/minecraft/block/entity/SkullBlockEntity ARG 2 missingUserCache METHOD method_54082 (Ljava/util/function/BooleanSupplier;Lnet/minecraft/class_7497;Ljava/util/Optional;)Ljava/util/Optional; ARG 2 profile + METHOD method_58126 (Lnet/minecraft/class_9296;)V + ARG 1 owner CLASS 1 METHOD load (Ljava/lang/Object;)Ljava/lang/Object; ARG 1 name diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 283fbf458c..27da3c02cb 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/DrawContext.mapping b/mappings/net/minecraft/client/gui/DrawContext.mapping index 52062e542d..77a1552f06 100644 --- a/mappings/net/minecraft/client/gui/DrawContext.mapping +++ b/mappings/net/minecraft/client/gui/DrawContext.mapping @@ -465,8 +465,14 @@ CLASS net/minecraft/class_332 net/minecraft/client/gui/DrawContext ARG 4 endX ARG 5 endY ARG 6 z + METHOD method_58135 scissorContains (II)Z + ARG 1 x + ARG 2 y CLASS class_8214 ScissorStack FIELD field_43099 stack Ljava/util/Deque; METHOD method_49699 pop ()Lnet/minecraft/class_8030; METHOD method_49700 push (Lnet/minecraft/class_8030;)Lnet/minecraft/class_8030; ARG 1 rect + METHOD method_58136 contains (II)Z + ARG 1 x + ARG 2 y diff --git a/mappings/net/minecraft/client/gui/ScreenRect.mapping b/mappings/net/minecraft/client/gui/ScreenRect.mapping index c3cfa10fc6..855cecd3fc 100644 --- a/mappings/net/minecraft/client/gui/ScreenRect.mapping +++ b/mappings/net/minecraft/client/gui/ScreenRect.mapping @@ -51,3 +51,6 @@ CLASS net/minecraft/class_8030 net/minecraft/client/gui/ScreenRect COMMENT {@return the rect that intersects with {@code other}, or {@code null} if they do not COMMENT intersect} ARG 1 other + METHOD method_58137 contains (II)Z + ARG 1 x + ARG 2 y diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping index a5db5d4e81..24017e29b7 100644 --- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping @@ -64,10 +64,6 @@ 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 @@ -79,6 +75,10 @@ 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 bd6b7c3f16..e6b180fbdb 100644 --- a/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/ingame/BeaconScreen.mapping @@ -20,6 +20,13 @@ 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 @@ -57,13 +64,6 @@ 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 7090def805..e016739100 100644 --- a/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping +++ b/mappings/net/minecraft/client/gui/screen/multiplayer/MultiplayerServerListWidget.mapping @@ -47,7 +47,6 @@ 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 @@ -89,3 +88,4 @@ 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 7c43cef311..bd3cb66199 100644 --- a/mappings/net/minecraft/client/model/ModelPart.mapping +++ b/mappings/net/minecraft/client/model/ModelPart.mapping @@ -112,6 +112,19 @@ 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 @@ -144,16 +157,3 @@ 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 69aebe494c..92da52209c 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 277046a1ee..46ce657085 100644 --- a/mappings/net/minecraft/client/particle/DamageParticle.mapping +++ b/mappings/net/minecraft/client/particle/DamageParticle.mapping @@ -1,4 +1,8 @@ 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 @@ -7,7 +11,3 @@ 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 ff2ab76e22..11335bf42b 100644 --- a/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping +++ b/mappings/net/minecraft/client/particle/FireworksSparkParticle.mapping @@ -1,4 +1,8 @@ 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; @@ -60,7 +64,3 @@ 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 6e83c1c7a5..e6493e1bf8 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_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 + CLASS class_688 Factory + FIELD field_17812 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 800f5ed9f6..aa7abefcbb 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_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 + CLASS class_726 Factory + FIELD field_17878 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 b68e57ce3f..d84ff5de2c 100644 --- a/mappings/net/minecraft/client/particle/SuspendParticle.mapping +++ b/mappings/net/minecraft/client/particle/SuspendParticle.mapping @@ -1,4 +1,8 @@ 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 @@ -11,10 +15,6 @@ 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 71cbbca858..e2c2719ae8 100644 --- a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping +++ b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping @@ -1,4 +1,17 @@ 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; @@ -20,16 +33,3 @@ 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 e8008f86ad..1c128a0985 100644 --- a/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping +++ b/mappings/net/minecraft/client/render/TexturedRenderLayers.mapping @@ -27,6 +27,8 @@ CLASS net/minecraft/class_4722 net/minecraft/client/render/TexturedRenderLayers FIELD field_42910 DECORATED_POT_ATLAS_TEXTURE Lnet/minecraft/class_2960; FIELD field_42911 DECORATED_POT_PATTERN_TEXTURES Ljava/util/Map; FIELD field_46070 ARMOR_TRIMS_DECAL_RENDER_LAYER Lnet/minecraft/class_1921; + FIELD field_49769 BANNER_BASE Lnet/minecraft/class_4730; + FIELD field_49770 SHIELD_BASE Lnet/minecraft/class_4730; METHOD method_24059 getBannerPatterns ()Lnet/minecraft/class_1921; METHOD method_24061 (Lnet/minecraft/class_1767;)Lnet/minecraft/class_4730; ARG 0 color diff --git a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping index 87f167adaa..599a619e86 100644 --- a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping @@ -105,6 +105,26 @@ 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; @@ -149,23 +169,3 @@ 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 cf8a156711..173b474465 100644 --- a/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/BannerBlockEntityRenderer.mapping @@ -18,6 +18,9 @@ CLASS net/minecraft/class_823 net/minecraft/client/render/block/entity/BannerBlo ARG 4 canvas ARG 5 baseSprite ARG 6 isBanner + ARG 7 color + ARG 8 patterns + ARG 9 glint 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 @@ -26,4 +29,14 @@ CLASS net/minecraft/class_823 net/minecraft/client/render/block/entity/BannerBlo ARG 4 canvas ARG 5 baseSprite ARG 6 isBanner + ARG 7 color + ARG 8 patterns METHOD method_32135 getTexturedModelData ()Lnet/minecraft/class_5607; + METHOD method_58140 renderLayer (Lnet/minecraft/class_4587;Lnet/minecraft/class_4597;IILnet/minecraft/class_630;Lnet/minecraft/class_4730;Lnet/minecraft/class_1767;)V + ARG 0 matrices + ARG 1 vertexConsumers + ARG 2 light + ARG 3 overlay + ARG 4 canvas + ARG 5 textureId + ARG 6 color diff --git a/mappings/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.mapping index ba0bd22659..4fbcb0048c 100644 --- a/mappings/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/SkullBlockEntityRenderer.mapping @@ -16,5 +16,6 @@ CLASS net/minecraft/class_836 net/minecraft/client/render/block/entity/SkullBloc ARG 7 renderLayer 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 83c1274eb7..6cf3426913 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -48,6 +48,7 @@ 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; @@ -171,4 +172,3 @@ 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/model/json/JsonUnbakedModel.mapping b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping index af50e878fa..dd90fefa39 100644 --- a/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping +++ b/mappings/net/minecraft/client/render/model/json/JsonUnbakedModel.mapping @@ -63,6 +63,21 @@ 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 @@ -83,18 +98,3 @@ 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 f623cbb50e..f40af007a7 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelOverride.mapping @@ -6,6 +6,14 @@ 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 @@ -15,11 +23,3 @@ 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 36fe96dcdf..9b5ba410ab 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelVariantMap.mapping @@ -33,6 +33,8 @@ 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; @@ -50,5 +52,3 @@ 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/client/util/SpriteIdentifier.mapping b/mappings/net/minecraft/client/util/SpriteIdentifier.mapping index 34b6aaf662..cc494ef88d 100644 --- a/mappings/net/minecraft/client/util/SpriteIdentifier.mapping +++ b/mappings/net/minecraft/client/util/SpriteIdentifier.mapping @@ -19,3 +19,4 @@ CLASS net/minecraft/class_4730 net/minecraft/client/util/SpriteIdentifier METHOD method_30001 getVertexConsumer (Lnet/minecraft/class_4597;Ljava/util/function/Function;Z)Lnet/minecraft/class_4588; ARG 1 vertexConsumers ARG 2 layerFactory + ARG 3 glint diff --git a/mappings/net/minecraft/command/argument/SlotRangeArgumentType.mapping b/mappings/net/minecraft/command/argument/SlotRangeArgumentType.mapping new file mode 100644 index 0000000000..63ab7977ce --- /dev/null +++ b/mappings/net/minecraft/command/argument/SlotRangeArgumentType.mapping @@ -0,0 +1,14 @@ +CLASS net/minecraft/class_9351 net/minecraft/command/argument/SlotRangeArgumentType + FIELD field_49767 EXAMPLES Ljava/util/Collection; + FIELD field_49768 UNKNOWN_SLOT_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; + METHOD listSuggestions (Lcom/mojang/brigadier/context/CommandContext;Lcom/mojang/brigadier/suggestion/SuggestionsBuilder;)Ljava/util/concurrent/CompletableFuture; + ARG 1 context + ARG 2 suggestionsBuilder + METHOD method_58130 slotRange ()Lnet/minecraft/class_9351; + METHOD method_58133 getSlotRange (Lcom/mojang/brigadier/context/CommandContext;Ljava/lang/String;)Lnet/minecraft/class_9348; + ARG 0 context + ARG 1 name + METHOD method_58134 (Ljava/lang/Object;)Lcom/mojang/brigadier/Message; + ARG 0 slotRange + METHOD parse (Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; + ARG 1 stringReader diff --git a/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping b/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping index b4b724e373..b71f162625 100644 --- a/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping +++ b/mappings/net/minecraft/component/type/AttributeModifiersComponent.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_9285 net/minecraft/component/type/AttributeModifiersCo FIELD field_49327 CODEC Lcom/mojang/serialization/Codec; FIELD field_49328 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_49329 DECIMAL_FORMAT Ljava/text/DecimalFormat; + FIELD field_49751 BASE_CODEC Lcom/mojang/serialization/Codec; METHOD method_57480 builder ()Lnet/minecraft/class_9285$class_9286; METHOD method_57481 applyOperations (DLnet/minecraft/class_1304;)D ARG 1 base @@ -18,6 +19,8 @@ CLASS net/minecraft/class_9285 net/minecraft/component/type/AttributeModifiersCo ARG 3 slot METHOD method_57485 (Ljava/text/DecimalFormat;)V ARG 0 format + METHOD method_58113 (Ljava/util/List;)Lnet/minecraft/class_9285; + ARG 0 attributeModifiers CLASS class_9286 Builder FIELD field_49331 entries Lcom/google/common/collect/ImmutableList$Builder; METHOD method_57486 build ()Lnet/minecraft/class_9285; diff --git a/mappings/net/minecraft/component/type/BannerPatternsComponent.mapping b/mappings/net/minecraft/component/type/BannerPatternsComponent.mapping index 773e7ccc66..5e1f2c288a 100644 --- a/mappings/net/minecraft/component/type/BannerPatternsComponent.mapping +++ b/mappings/net/minecraft/component/type/BannerPatternsComponent.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_9307 net/minecraft/component/type/BannerPatternsCompon FIELD field_49404 DEFAULT Lnet/minecraft/class_9307; FIELD field_49405 CODEC Lcom/mojang/serialization/Codec; FIELD field_49406 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49761 LOGGER Lorg/slf4j/Logger; METHOD method_57571 withoutTopLayer ()Lnet/minecraft/class_9307; CLASS class_3750 Builder FIELD field_16548 entries Lcom/google/common/collect/ImmutableList$Builder; @@ -13,8 +14,13 @@ CLASS net/minecraft/class_9307 net/minecraft/component/type/BannerPatternsCompon ARG 1 layer METHOD method_57575 addAll (Lnet/minecraft/class_9307;)Lnet/minecraft/class_9307$class_3750; ARG 1 patterns + METHOD method_58124 add (Lnet/minecraft/class_7871;Lnet/minecraft/class_5321;Lnet/minecraft/class_1767;)Lnet/minecraft/class_9307$class_3750; + ARG 1 patternLookup + ARG 2 pattern + ARG 3 color CLASS class_9308 Layer FIELD field_49407 CODEC Lcom/mojang/serialization/Codec; FIELD field_49408 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_57576 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_58125 getTooltipText ()Lnet/minecraft/class_5250; diff --git a/mappings/net/minecraft/component/type/ContainerComponent.mapping b/mappings/net/minecraft/component/type/ContainerComponent.mapping index ce5e02e1f1..725a6f6ff3 100644 --- a/mappings/net/minecraft/component/type/ContainerComponent.mapping +++ b/mappings/net/minecraft/component/type/ContainerComponent.mapping @@ -28,6 +28,7 @@ CLASS net/minecraft/class_9288 net/minecraft/component/type/ContainerComponent ARG 0 slots METHOD method_57497 getSize (Ljava/util/List;)I ARG 0 size + METHOD method_58114 copyFirstStack ()Lnet/minecraft/class_1799; CLASS class_9289 Slot FIELD field_49339 CODEC Lcom/mojang/serialization/Codec; METHOD method_57498 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/component/type/DyedColorComponent.mapping b/mappings/net/minecraft/component/type/DyedColorComponent.mapping index 433c89e46f..b026834f16 100644 --- a/mappings/net/minecraft/component/type/DyedColorComponent.mapping +++ b/mappings/net/minecraft/component/type/DyedColorComponent.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_9282 net/minecraft/component/type/DyedColorComponent FIELD field_49312 CODEC Lcom/mojang/serialization/Codec; FIELD field_49313 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49750 BASE_CODEC Lcom/mojang/serialization/Codec; METHOD method_57469 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_57470 getColor (Lnet/minecraft/class_1799;I)I @@ -9,3 +10,5 @@ CLASS net/minecraft/class_9282 net/minecraft/component/type/DyedColorComponent METHOD method_57471 setColor (Lnet/minecraft/class_1799;Ljava/util/List;)Lnet/minecraft/class_1799; ARG 0 stack ARG 1 dyes + METHOD method_58112 (Ljava/lang/Integer;)Lnet/minecraft/class_9282; + ARG 0 rgb diff --git a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping index 37db6b1f14..b6a81c27f4 100644 --- a/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping +++ b/mappings/net/minecraft/component/type/ItemEnchantmentsComponent.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_9304 net/minecraft/component/type/ItemEnchantmentsComp FIELD field_49388 ENCHANTMENT_LEVEL_CODEC Lcom/mojang/serialization/Codec; FIELD field_49389 enchantments Lit/unimi/dsi/fastutil/objects/Object2IntLinkedOpenHashMap; FIELD field_49390 showInTooltip Z + FIELD field_49753 INLINE_CODEC Lcom/mojang/serialization/Codec; + FIELD field_49754 BASE_CODEC Lcom/mojang/serialization/Codec; METHOD (Lit/unimi/dsi/fastutil/objects/Object2IntLinkedOpenHashMap;Z)V ARG 1 enchantments ARG 2 showInTooltip @@ -26,6 +28,8 @@ CLASS net/minecraft/class_9304 net/minecraft/component/type/ItemEnchantmentsComp METHOD method_57543 isEmpty ()Z METHOD method_57544 (Lnet/minecraft/class_9304;)Lit/unimi/dsi/fastutil/objects/Object2IntLinkedOpenHashMap; ARG 0 component + METHOD method_58118 (Lit/unimi/dsi/fastutil/objects/Object2IntLinkedOpenHashMap;)Lnet/minecraft/class_9304; + ARG 0 map CLASS class_9305 Builder FIELD field_49391 enchantments Lit/unimi/dsi/fastutil/objects/Object2IntLinkedOpenHashMap; FIELD field_49392 showInTooltip Z diff --git a/mappings/net/minecraft/component/type/LodestoneTargetComponent.mapping b/mappings/net/minecraft/component/type/LodestoneTrackerComponent.mapping similarity index 72% rename from mappings/net/minecraft/component/type/LodestoneTargetComponent.mapping rename to mappings/net/minecraft/component/type/LodestoneTrackerComponent.mapping index 2af9baa941..6d12b44581 100644 --- a/mappings/net/minecraft/component/type/LodestoneTargetComponent.mapping +++ b/mappings/net/minecraft/component/type/LodestoneTrackerComponent.mapping @@ -1,5 +1,7 @@ -CLASS net/minecraft/class_9291 net/minecraft/component/type/LodestoneTargetComponent +CLASS net/minecraft/class_9291 net/minecraft/component/type/LodestoneTrackerComponent FIELD field_49345 CODEC Lcom/mojang/serialization/Codec; FIELD field_49346 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_57502 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_58115 forWorld (Lnet/minecraft/class_3218;)Lnet/minecraft/class_9291; + ARG 1 world diff --git a/mappings/net/minecraft/component/type/PotionContentsComponent.mapping b/mappings/net/minecraft/component/type/PotionContentsComponent.mapping index 2567dfa59c..2e13e289c5 100644 --- a/mappings/net/minecraft/component/type/PotionContentsComponent.mapping +++ b/mappings/net/minecraft/component/type/PotionContentsComponent.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_1844 net/minecraft/component/type/PotionContentsCompon FIELD field_49275 CODEC Lcom/mojang/serialization/Codec; FIELD field_49276 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_49277 EFFECTLESS_COLOR I + FIELD field_49749 BASE_CODEC Lcom/mojang/serialization/Codec; METHOD (Lnet/minecraft/class_6880;)V ARG 1 potion METHOD method_47372 buildTooltip (Ljava/util/function/Consumer;FF)V @@ -30,6 +31,8 @@ CLASS net/minecraft/class_1844 net/minecraft/component/type/PotionContentsCompon ARG 1 potion METHOD method_57404 getCustomColor ()I METHOD method_57405 hasEffects ()Z + METHOD method_58111 mixColors (Ljava/lang/Iterable;)I + ARG 0 effects METHOD method_8055 getColor (Ljava/lang/Iterable;)I ARG 0 effects METHOD method_8062 getColor (Lnet/minecraft/class_6880;)I diff --git a/mappings/net/minecraft/component/type/ProfileComponent.mapping b/mappings/net/minecraft/component/type/ProfileComponent.mapping index 1526b53bae..b15b038ee4 100644 --- a/mappings/net/minecraft/component/type/ProfileComponent.mapping +++ b/mappings/net/minecraft/component/type/ProfileComponent.mapping @@ -1,17 +1,22 @@ CLASS net/minecraft/class_9296 net/minecraft/component/type/ProfileComponent FIELD field_49359 CODEC Lcom/mojang/serialization/Codec; FIELD field_49360 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49752 BASE_CODEC Lcom/mojang/serialization/Codec; METHOD (Lcom/mojang/authlib/GameProfile;)V ARG 1 gameProfile METHOD (Ljava/util/Optional;Ljava/util/Optional;Lcom/mojang/authlib/properties/PropertyMap;)V + ARG 1 name 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/util/Optional;Ljava/util/Optional;Lcom/mojang/authlib/properties/PropertyMap;)Lcom/mojang/authlib/GameProfile; + ARG 0 name ARG 1 id ARG 2 properties METHOD method_57510 (Ljava/util/Optional;)Lnet/minecraft/class_9296; ARG 1 profile METHOD method_57511 isCompleted ()Z + METHOD method_58116 (Ljava/lang/String;)Lnet/minecraft/class_9296; + ARG 0 name diff --git a/mappings/net/minecraft/datafixer/fix/ComponentFix.mapping b/mappings/net/minecraft/datafixer/fix/ComponentFix.mapping new file mode 100644 index 0000000000..d7c821e251 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/ComponentFix.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_9342 net/minecraft/datafixer/fix/ComponentFix + FIELD field_49714 name Ljava/lang/String; + FIELD field_49715 oldComponentId Ljava/lang/String; + FIELD field_49716 newComponentId Ljava/lang/String; + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 outputSchema + ARG 2 name + ARG 3 componentId + METHOD (Lcom/mojang/datafixers/schemas/Schema;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V + ARG 1 outputSchema + ARG 2 name + ARG 3 oldComponentId + ARG 4 newComponentId + METHOD method_58045 fixComponent (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 dynamic + METHOD method_58046 (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 dynamic diff --git a/mappings/net/minecraft/datafixer/fix/LodestoneCompassComponentFix.mapping b/mappings/net/minecraft/datafixer/fix/LodestoneCompassComponentFix.mapping new file mode 100644 index 0000000000..d8e86783ea --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/LodestoneCompassComponentFix.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_9343 net/minecraft/datafixer/fix/LodestoneCompassComponentFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/PlayerHeadBlockProfileFix.mapping b/mappings/net/minecraft/datafixer/fix/PlayerHeadBlockProfileFix.mapping new file mode 100644 index 0000000000..6c5985f14c --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/PlayerHeadBlockProfileFix.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_9344 net/minecraft/datafixer/fix/PlayerHeadBlockProfileFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_58055 fixProfile (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 1 dynamic diff --git a/mappings/net/minecraft/datafixer/schema/Schema705.mapping b/mappings/net/minecraft/datafixer/schema/Schema705.mapping index 87a44f0436..249c5aad2d 100644 --- a/mappings/net/minecraft/datafixer/schema/Schema705.mapping +++ b/mappings/net/minecraft/datafixer/schema/Schema705.mapping @@ -1,4 +1,5 @@ CLASS net/minecraft/class_1253 net/minecraft/datafixer/schema/Schema705 + FIELD field_49717 ITEM_TO_ENTITY Ljava/util/Map; METHOD method_5311 targetEntityItems (Lcom/mojang/datafixers/schemas/Schema;Ljava/util/Map;Ljava/lang/String;)V ARG 0 schema ARG 1 map diff --git a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping index c46a91cc59..066ce6224e 100644 --- a/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping +++ b/mappings/net/minecraft/enchantment/EnchantmentHelper.mapping @@ -20,7 +20,7 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper ARG 0 entity METHOD method_49189 hasSilkTouch (Lnet/minecraft/class_1799;)Z ARG 0 stack - METHOD method_57529 hasEnchantments (Lnet/minecraft/class_1799;)Z + METHOD method_57529 canHaveEnchantments (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_57530 set (Lnet/minecraft/class_1799;Lnet/minecraft/class_9304;)V ARG 0 stack @@ -32,6 +32,8 @@ CLASS net/minecraft/class_1890 net/minecraft/enchantment/EnchantmentHelper ARG 0 stack METHOD method_57533 getEnchantmentsComponentType (Lnet/minecraft/class_1799;)Lnet/minecraft/class_9331; ARG 0 stack + METHOD method_58117 hasEnchantments (Lnet/minecraft/class_1799;)Z + ARG 0 stack METHOD method_8198 (Lnet/minecraft/class_1309;Lnet/minecraft/class_1297;Lnet/minecraft/class_1887;I)V ARG 2 enchantment ARG 3 level diff --git a/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping b/mappings/net/minecraft/entity/attribute/EntityAttributeModifier.mapping index c4fd17b3dc..847fd46249 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_49232 MAP_CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_49233 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;DLnet/minecraft/class_1322$class_1323;)V ARG 1 name ARG 2 value @@ -15,9 +15,7 @@ CLASS net/minecraft/class_1322 net/minecraft/entity/attribute/EntityAttributeMod 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; diff --git a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping index 56c9b3681e..d2dfb8ec04 100644 --- a/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping +++ b/mappings/net/minecraft/entity/data/TrackedDataHandlerRegistry.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_2943 net/minecraft/entity/data/TrackedDataHandlerRegis FIELD field_47707 ARMADILLO_STATE Lnet/minecraft/class_2941; FIELD field_48265 OPTIONAL_BLOCK_STATE_CODEC Lnet/minecraft/class_9139; FIELD field_48266 OPTIONAL_INT_CODEC Lnet/minecraft/class_9139; + FIELD field_49713 WOLF_VARIANT Lnet/minecraft/class_2941; METHOD method_12719 getId (Lnet/minecraft/class_2941;)I ARG 0 handler METHOD method_12720 register (Lnet/minecraft/class_2941;)V diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index 9094fb334f..dd58bc3e14 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -5,6 +5,7 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity FIELD field_25373 ANGER_TIME Lnet/minecraft/class_2940; FIELD field_30386 WILD_MAX_HEALTH F FIELD field_30387 TAMED_MAX_HEALTH F + FIELD field_49722 VARIANT Lnet/minecraft/class_2940; FIELD field_6944 furWet Z FIELD field_6945 lastShakeProgress F FIELD field_6946 BEGGING Lnet/minecraft/class_2940; @@ -26,6 +27,11 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity METHOD method_55710 hasArmor ()Z METHOD method_57304 shouldArmorAbsorbDamage (Lnet/minecraft/class_1282;)Z ARG 1 source + METHOD method_58059 (Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 variantKey + METHOD method_58060 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; + ARG 0 variantId + METHOD method_58061 getTextureId ()Lnet/minecraft/class_2960; METHOD method_6707 getFurWetBrightnessMultiplier (F)F COMMENT Returns this wolf's brightness multiplier based on the fur wetness. COMMENT

@@ -63,3 +69,7 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity CLASS class_6859 WolfEscapeDangerGoal METHOD (Lnet/minecraft/class_1493;D)V ARG 2 speed + CLASS class_9345 WolfData + FIELD field_49723 variant Lnet/minecraft/class_6880; + METHOD (Lnet/minecraft/class_6880;)V + ARG 1 variant diff --git a/mappings/net/minecraft/entity/passive/WolfVariant.mapping b/mappings/net/minecraft/entity/passive/WolfVariant.mapping new file mode 100644 index 0000000000..4c12491e44 --- /dev/null +++ b/mappings/net/minecraft/entity/passive/WolfVariant.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_9346 net/minecraft/entity/passive/WolfVariant + FIELD field_49724 CODEC Lcom/mojang/serialization/Codec; + METHOD method_58064 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/entity/passive/WolfVariants.mapping b/mappings/net/minecraft/entity/passive/WolfVariants.mapping new file mode 100644 index 0000000000..fccf28573a --- /dev/null +++ b/mappings/net/minecraft/entity/passive/WolfVariants.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_9347 net/minecraft/entity/passive/WolfVariants + METHOD method_58065 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880$class_6883;)Z + ARG 1 entry + METHOD method_58066 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 id + METHOD method_58067 getForBiome (Lnet/minecraft/class_5455;Lnet/minecraft/class_6880;)Lnet/minecraft/class_6880; + ARG 0 dynamicRegistryManager + ARG 1 biome + METHOD method_58068 (Lnet/minecraft/class_7891;)V + ARG 0 registry + METHOD method_58069 register (Lnet/minecraft/class_7891;Lnet/minecraft/class_5321;Ljava/lang/String;Lnet/minecraft/class_5321;)V + ARG 0 registry + ARG 1 key + ARG 2 textureName + ARG 3 biome diff --git a/mappings/net/minecraft/inventory/SlotRange.mapping b/mappings/net/minecraft/inventory/SlotRange.mapping new file mode 100644 index 0000000000..9966484341 --- /dev/null +++ b/mappings/net/minecraft/inventory/SlotRange.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_9348 net/minecraft/inventory/SlotRange + METHOD method_58075 getSlotIds ()Lit/unimi/dsi/fastutil/ints/IntList; + METHOD method_58076 create (Ljava/lang/String;Lit/unimi/dsi/fastutil/ints/IntList;)Lnet/minecraft/class_9348; + ARG 0 name + ARG 1 slotIds + METHOD method_58077 getSlotCount ()I diff --git a/mappings/net/minecraft/inventory/SlotRanges.mapping b/mappings/net/minecraft/inventory/SlotRanges.mapping new file mode 100644 index 0000000000..90ce8b5f4d --- /dev/null +++ b/mappings/net/minecraft/inventory/SlotRanges.mapping @@ -0,0 +1,34 @@ +CLASS net/minecraft/class_9349 net/minecraft/inventory/SlotRanges + FIELD field_49744 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49745 SLOT_RANGES Ljava/util/List; + FIELD field_49746 FROM_NAME Ljava/util/function/Function; + METHOD method_58078 streamNames ()Ljava/util/stream/Stream; + METHOD method_58079 (Lnet/minecraft/class_9348;)Z + ARG 0 slotRange + METHOD method_58080 fromName (Ljava/lang/String;)Lnet/minecraft/class_9348; + ARG 0 name + METHOD method_58081 create (Ljava/lang/String;I)Lnet/minecraft/class_9348; + ARG 0 name + ARG 1 slotId + METHOD method_58082 create (Ljava/lang/String;Lit/unimi/dsi/fastutil/ints/IntList;)Lnet/minecraft/class_9348; + ARG 0 name + ARG 1 slotIds + METHOD method_58083 create (Ljava/lang/String;[I)Lnet/minecraft/class_9348; + ARG 0 name + ARG 1 slotIds + METHOD method_58084 (Ljava/util/ArrayList;)V + ARG 0 list + METHOD method_58085 createAndAdd (Ljava/util/List;Ljava/lang/String;I)V + ARG 0 list + ARG 1 name + ARG 2 slotId + METHOD method_58086 createAndAdd (Ljava/util/List;Ljava/lang/String;II)V + ARG 0 list + ARG 1 baseName + ARG 2 firstSlotId + ARG 3 lastSlotId + METHOD method_58087 createAndAdd (Ljava/util/List;Ljava/lang/String;[I)V + ARG 0 list + ARG 1 name + ARG 2 slots + METHOD method_58088 streamSingleSlotNames ()Ljava/util/stream/Stream; diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index a6fea5a73b..c6d9209195 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -49,6 +49,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack FIELD field_49268 OPTIONAL_PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_49269 OPTIONAL_LIST_PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_49270 components Lnet/minecraft/class_9335; + FIELD field_49747 COOKING_RECIPE_RESULT_CODEC Lcom/mojang/serialization/Codec; FIELD field_8030 bobbingAnimationTime I FIELD field_8031 count I FIELD field_8033 LOGGER Lorg/slf4j/Logger; @@ -275,6 +276,13 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 0 stack METHOD method_57385 (Lnet/minecraft/class_1799;)Lnet/minecraft/class_9326; ARG 0 stack + METHOD method_58092 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_58093 (Lnet/minecraft/class_6880;Lnet/minecraft/class_9326;)Lnet/minecraft/class_1799; + ARG 0 item + ARG 1 components + METHOD method_58094 (Lnet/minecraft/class_1799;)Lnet/minecraft/class_9326; + ARG 0 stack METHOD method_7909 getItem ()Lnet/minecraft/class_1792; COMMENT {@return the item of this stack} COMMENT diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index 2e814c5d9e..686f1c5d65 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -879,6 +879,37 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items METHOD method_51348 register (Lnet/minecraft/class_5321;Lnet/minecraft/class_1792;)Lnet/minecraft/class_1792; ARG 0 key ARG 1 item + METHOD method_58095 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; + ARG 0 settings + METHOD method_58096 register (Lnet/minecraft/class_2248;Ljava/util/function/UnaryOperator;)Lnet/minecraft/class_1792; + ARG 0 block + ARG 1 settingsOperator + METHOD method_58097 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; + ARG 0 settings + METHOD method_58098 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; + ARG 0 settings + METHOD method_58099 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; + ARG 0 settings + METHOD method_58100 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; + ARG 0 settings + METHOD method_58101 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; + ARG 0 settings + METHOD method_58103 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; + ARG 0 settings + METHOD method_58104 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; + ARG 0 settings + METHOD method_58105 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; + ARG 0 settings + METHOD method_58106 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; + ARG 0 settings + METHOD method_58107 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; + ARG 0 settings + METHOD method_58108 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; + ARG 0 settings + METHOD method_58109 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; + ARG 0 settings + METHOD method_58110 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792$class_1793; + ARG 0 settings METHOD method_7989 register (Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792; ARG 0 block METHOD method_7990 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_1792;)Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping index 1d2efae857..8b096928f3 100644 --- a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping +++ b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping @@ -36,6 +36,14 @@ 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; @@ -55,11 +63,3 @@ 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/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping index fa4bb5d08e..0cb28a5bf3 100644 --- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping @@ -289,17 +289,6 @@ 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 @@ -330,9 +319,20 @@ 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 1e8c46d638..c54a1cacd4 100644 --- a/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityEquipmentPredicate.mapping @@ -4,6 +4,8 @@ CLASS net/minecraft/class_3735 net/minecraft/predicate/entity/EntityEquipmentPre ARG 1 entity METHOD method_53129 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance + METHOD method_58057 ominousBannerOnHead (Lnet/minecraft/class_7871;)Lnet/minecraft/class_3735; + ARG 0 bannerPatternLookup CLASS class_5278 Builder FIELD field_24482 head Ljava/util/Optional; FIELD field_24483 chest Ljava/util/Optional; diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index 2c64a5c235..5ce6ad0baa 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -41,6 +41,7 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate FIELD field_33915 steppingOn Ljava/util/Optional; FIELD field_33917 passenger Ljava/util/Optional; FIELD field_38722 typeSpecific Ljava/util/Optional; + FIELD field_49721 slots Ljava/util/Optional; FIELD field_9602 distance Ljava/util/Optional; FIELD field_9603 nbt Ljava/util/Optional; FIELD field_9604 location Ljava/util/Optional; @@ -63,6 +64,8 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 1 typeSpecific METHOD method_53141 equipment (Lnet/minecraft/class_3735$class_5278;)Lnet/minecraft/class_2048$class_2049; ARG 1 equipment + METHOD method_58058 slots (Lnet/minecraft/class_9350;)Lnet/minecraft/class_2048$class_2049; + ARG 1 slots METHOD method_8915 nbt (Lnet/minecraft/class_2105;)Lnet/minecraft/class_2048$class_2049; ARG 1 nbt METHOD method_8916 create ()Lnet/minecraft/class_2048$class_2049; diff --git a/mappings/net/minecraft/predicate/entity/SlotsPredicate.mapping b/mappings/net/minecraft/predicate/entity/SlotsPredicate.mapping new file mode 100644 index 0000000000..099beb0245 --- /dev/null +++ b/mappings/net/minecraft/predicate/entity/SlotsPredicate.mapping @@ -0,0 +1,8 @@ +CLASS net/minecraft/class_9350 net/minecraft/predicate/entity/SlotsPredicate + FIELD field_49755 CODEC Lcom/mojang/serialization/Codec; + METHOD method_58119 matches (Lnet/minecraft/class_1297;)Z + ARG 1 entity + METHOD method_58120 matches (Lnet/minecraft/class_1297;Lnet/minecraft/class_2073;Lit/unimi/dsi/fastutil/ints/IntList;)Z + ARG 0 entity + ARG 1 itemPredicate + ARG 2 slotIds diff --git a/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping b/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping index cea200396a..9e3f112233 100644 --- a/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping +++ b/mappings/net/minecraft/screen/GrindstoneScreenHandler.mapping @@ -25,6 +25,18 @@ CLASS net/minecraft/class_3803 net/minecraft/screen/GrindstoneScreenHandler METHOD method_20268 transferEnchantments (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V ARG 1 target ARG 2 source + METHOD method_58070 getOutputStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; + ARG 1 firstInput + ARG 2 secondInput + METHOD method_58071 (Lnet/minecraft/class_1799;Lnet/minecraft/class_9304$class_9305;)V + ARG 1 components + METHOD method_58072 (Lnet/minecraft/class_9304$class_9305;)V + ARG 0 components + METHOD method_58073 (Lnet/minecraft/class_6880;)Z + ARG 0 enchantment + METHOD method_58074 combineItems (Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; + ARG 1 firstInput + ARG 2 secondInput CLASS 4 METHOD method_16696 getExperience (Lnet/minecraft/class_1799;)I ARG 1 stack diff --git a/mappings/net/minecraft/screen/LoomScreenHandler.mapping b/mappings/net/minecraft/screen/LoomScreenHandler.mapping index f3f40f3d7a..20da7d5df8 100644 --- a/mappings/net/minecraft/screen/LoomScreenHandler.mapping +++ b/mappings/net/minecraft/screen/LoomScreenHandler.mapping @@ -14,6 +14,7 @@ CLASS net/minecraft/class_1726 net/minecraft/screen/LoomScreenHandler FIELD field_30829 HOTBAR_END I FIELD field_39120 NO_PATTERN I FIELD field_39121 bannerPatterns Ljava/util/List; + FIELD field_49741 bannerPatternLookup Lnet/minecraft/class_7871; FIELD field_7850 input Lnet/minecraft/class_1263; METHOD (ILnet/minecraft/class_1661;)V ARG 1 syncId diff --git a/mappings/net/minecraft/screen/PlayerScreenHandler.mapping b/mappings/net/minecraft/screen/PlayerScreenHandler.mapping index 7436c4b925..4c92960d25 100644 --- a/mappings/net/minecraft/screen/PlayerScreenHandler.mapping +++ b/mappings/net/minecraft/screen/PlayerScreenHandler.mapping @@ -15,6 +15,8 @@ CLASS net/minecraft/class_1723 net/minecraft/screen/PlayerScreenHandler FIELD field_30810 HOTBAR_START I FIELD field_30811 HOTBAR_END I FIELD field_30812 OFFHAND_ID I + FIELD field_49739 CRAFTING_INPUT_COUNT I + FIELD field_49740 EQUIPMENT_COUNT I FIELD field_7827 onServer Z FIELD field_7828 owner Lnet/minecraft/class_1657; FIELD field_7829 EMPTY_ARMOR_SLOT_TEXTURES [Lnet/minecraft/class_2960; diff --git a/mappings/net/minecraft/server/command/ClearCommand.mapping b/mappings/net/minecraft/server/command/ClearCommand.mapping index 074612be5e..b0fa5758ed 100644 --- a/mappings/net/minecraft/server/command/ClearCommand.mapping +++ b/mappings/net/minecraft/server/command/ClearCommand.mapping @@ -27,3 +27,7 @@ CLASS net/minecraft/class_3020 net/minecraft/server/command/ClearCommand ARG 0 source METHOD method_13083 (Lnet/minecraft/class_1799;)Z ARG 0 stack + METHOD method_58032 execute (Lnet/minecraft/class_2168;Ljava/util/Collection;Ljava/util/function/Predicate;)I + ARG 0 source + ARG 1 targets + ARG 2 item diff --git a/mappings/net/minecraft/server/command/ExecuteCommand.mapping b/mappings/net/minecraft/server/command/ExecuteCommand.mapping index 868aef9da5..ff491d9674 100644 --- a/mappings/net/minecraft/server/command/ExecuteCommand.mapping +++ b/mappings/net/minecraft/server/command/ExecuteCommand.mapping @@ -272,6 +272,15 @@ CLASS net/minecraft/class_3050 net/minecraft/server/command/ExecuteCommand METHOD method_55338 (II)Z ARG 0 targetScore ARG 1 sourceScore + METHOD method_58034 countMatchingItems (Lnet/minecraft/class_2168;Lnet/minecraft/class_2338;Lnet/minecraft/class_9348;Ljava/util/function/Predicate;)I + ARG 0 source + ARG 1 pos + ARG 2 slotRange + ARG 3 predicate + METHOD method_58035 countMatchingItems (Ljava/lang/Iterable;Lnet/minecraft/class_9348;Ljava/util/function/Predicate;)I + ARG 0 entities + ARG 1 slotRange + ARG 2 predicate CLASS class_3051 ExistsCondition METHOD test (Lcom/mojang/brigadier/context/CommandContext;)I ARG 1 context diff --git a/mappings/net/minecraft/util/JsonReaderUtils.mapping b/mappings/net/minecraft/util/JsonReaderUtils.mapping index 6d172fdbf5..60e1670f08 100644 --- a/mappings/net/minecraft/util/JsonReaderUtils.mapping +++ b/mappings/net/minecraft/util/JsonReaderUtils.mapping @@ -7,3 +7,6 @@ CLASS net/minecraft/class_9010 net/minecraft/util/JsonReaderUtils ARG 0 registryLookup ARG 1 stringReader ARG 2 codec + METHOD method_58128 readWhileMatching (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_5462;)Ljava/lang/String; + ARG 0 stringReader + ARG 1 predicate diff --git a/mappings/net/minecraft/village/raid/Raid.mapping b/mappings/net/minecraft/village/raid/Raid.mapping index 9fc75ce043..0dc7f80dac 100644 --- a/mappings/net/minecraft/village/raid/Raid.mapping +++ b/mappings/net/minecraft/village/raid/Raid.mapping @@ -68,6 +68,7 @@ CLASS net/minecraft/class_3765 net/minecraft/village/raid/Raid METHOD method_16513 getCurrentRaiderHealth ()F METHOD method_16514 getMaxAcceptableBadOmenLevel ()I METHOD method_16515 getOminousBanner (Lnet/minecraft/class_7871;)Lnet/minecraft/class_1799; + ARG 0 bannerPatternLookup METHOD method_16516 addRaider (ILnet/minecraft/class_3763;Lnet/minecraft/class_2338;Z)V ARG 1 wave ARG 2 raider