diff --git a/build.gradle b/build.gradle index cdc6c81cbc..96e2d17a16 100644 --- a/build.gradle +++ b/build.gradle @@ -19,7 +19,7 @@ plugins { id 'net.fabricmc.filament' } -def minecraft_version = "25w09b" +def minecraft_version = "25w10a" filament { minecraftVersion = minecraft_version diff --git a/mappings/net/minecraft/block/TntBlock.mapping b/mappings/net/minecraft/block/TntBlock.mapping index ad7640a0b8..5ab60513bd 100644 --- a/mappings/net/minecraft/block/TntBlock.mapping +++ b/mappings/net/minecraft/block/TntBlock.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_2530 net/minecraft/block/TntBlock FIELD field_11621 UNSTABLE Lnet/minecraft/class_2746; FIELD field_46474 CODEC Lcom/mojang/serialization/MapCodec; - METHOD method_10737 primeTnt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1309;)V + METHOD method_10737 primeTnt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1309;)Z ARG 0 world ARG 1 pos ARG 2 igniter - METHOD method_10738 primeTnt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V + METHOD method_10738 primeTnt (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z ARG 0 world ARG 1 pos diff --git a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping index cc3ff53753..438dfd169f 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -8,14 +8,6 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior ARG 0 pointer ARG 1 stack METHOD method_18346 registerDefaults ()V - CLASS 10 - FIELD field_56153 fallback Lnet/minecraft/class_2347; - CLASS 11 - CLASS 12 - METHOD method_66899 (Lnet/minecraft/class_1792;)V - ARG 0 item - CLASS 13 - CLASS 14 CLASS 2 CLASS 3 METHOD method_66900 (Lnet/minecraft/class_4970$class_4971;)Z @@ -37,3 +29,11 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior CLASS 9 METHOD method_58766 (Lnet/minecraft/class_1492;)Z ARG 0 donkey + CLASS 10 + FIELD field_56153 fallback Lnet/minecraft/class_2347; + CLASS 11 + CLASS 12 + METHOD method_66899 (Lnet/minecraft/class_1792;)V + ARG 0 item + CLASS 13 + CLASS 14 diff --git a/mappings/net/minecraft/class_10895.mapping b/mappings/net/minecraft/class_10895.mapping index 0759d1230d..da43b130bb 100644 --- a/mappings/net/minecraft/class_10895.mapping +++ b/mappings/net/minecraft/class_10895.mapping @@ -1,5 +1,7 @@ CLASS net/minecraft/class_10895 - CLASS class_10204 Selector + CLASS class_816 MultipartUnbakedModel + FIELD field_4330 selectors Ljava/util/List; + CLASS class_9981 EqualityGroup CLASS class_1095 MultipartBakedModel FIELD field_5427 selectors Ljava/util/List; FIELD field_57011 particleSprite Lnet/minecraft/class_1058; @@ -7,6 +9,4 @@ CLASS net/minecraft/class_10895 ARG 1 selectors METHOD method_64095 getFirst (Ljava/util/List;)Lnet/minecraft/class_1087; ARG 0 selectors - CLASS class_816 MultipartUnbakedModel - FIELD field_4330 selectors Ljava/util/List; - CLASS class_9981 EqualityGroup + CLASS class_10204 Selector diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index b2aeaf7f3d..69956d7467 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -82,9 +82,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_1742 itemRenderer Lnet/minecraft/class_918; FIELD field_1743 skipGameRender Z FIELD field_1745 resourceManager Lnet/minecraft/class_3304; diff --git a/mappings/net/minecraft/client/font/BakedGlyph.mapping b/mappings/net/minecraft/client/font/BakedGlyph.mapping index 24f884c774..2cb1054ff5 100644 --- a/mappings/net/minecraft/client/font/BakedGlyph.mapping +++ b/mappings/net/minecraft/client/font/BakedGlyph.mapping @@ -57,8 +57,6 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/BakedGlyph ARG 6 color ARG 7 bold ARG 8 light - CLASS class_10364 DrawnGlyph - METHOD method_65184 hasShadow ()Z CLASS class_328 Rectangle FIELD comp_3307 minX F FIELD comp_3308 minY F @@ -80,3 +78,5 @@ CLASS net/minecraft/class_382 net/minecraft/client/font/BakedGlyph METHOD comp_3311 zIndex ()F METHOD comp_3312 color ()I METHOD method_65183 hasShadow ()Z + CLASS class_10364 DrawnGlyph + METHOD method_65184 hasShadow ()Z diff --git a/mappings/net/minecraft/client/gl/GpuBuffer.mapping b/mappings/net/minecraft/client/gl/GpuBuffer.mapping index 3af5e74de8..7d3780abcc 100644 --- a/mappings/net/minecraft/client/gl/GpuBuffer.mapping +++ b/mappings/net/minecraft/client/gl/GpuBuffer.mapping @@ -6,10 +6,8 @@ CLASS net/minecraft/class_10227 net/minecraft/client/gl/GpuBuffer ARG 1 target ARG 2 usage ARG 3 size - METHOD close close ()V METHOD method_68151 getSize ()I METHOD method_68152 getTarget ()Lnet/minecraft/class_10226; METHOD method_68343 getUsage ()Lnet/minecraft/class_8555; CLASS class_10858 ReadResult - METHOD close close ()V METHOD method_64323 getBuf ()Ljava/nio/ByteBuffer; diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping index 3773e9892e..88dbc9f289 100644 --- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping @@ -69,6 +69,10 @@ CLASS net/minecraft/class_447 net/minecraft/client/gui/screen/StatsScreen METHOD method_65518 select (II)Z ARG 1 mouseX ARG 2 mouseY + 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 @@ -80,10 +84,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/gui/screen/narration/ScreenNarrator.mapping b/mappings/net/minecraft/client/gui/screen/narration/ScreenNarrator.mapping index b2d043cd8d..9351e640dd 100644 --- a/mappings/net/minecraft/client/gui/screen/narration/ScreenNarrator.mapping +++ b/mappings/net/minecraft/client/gui/screen/narration/ScreenNarrator.mapping @@ -2,8 +2,6 @@ CLASS net/minecraft/class_6385 net/minecraft/client/gui/screen/narration/ScreenN COMMENT Manages narration messages and combines them into a narrated string. FIELD field_33796 currentMessageIndex I FIELD field_33797 narrations Ljava/util/Map; - METHOD method_37043 (Lnet/minecraft/class_6385$class_6386;)Ljava/lang/Integer; - ARG 0 partIndex METHOD method_37044 buildNarrations (Ljava/util/function/Consumer;)V COMMENT Creates the narration messages for the next narration using a COMMENT {@link NarrationMessageBuilder}. @@ -23,7 +21,9 @@ CLASS net/minecraft/class_6385 net/minecraft/client/gui/screen/narration/ScreenN METHOD method_37046 (ZLjava/util/function/Consumer;Lnet/minecraft/class_6385$class_6386;Lnet/minecraft/class_6385$class_6387;)V ARG 3 partIndex ARG 4 message - METHOD method_37047 (Lnet/minecraft/class_6385$class_6386;)Lnet/minecraft/class_6381; + METHOD method_68701 (Lnet/minecraft/class_6385$class_6386;)Ljava/lang/Integer; + ARG 0 partIndex + METHOD method_68702 (Lnet/minecraft/class_6385$class_6386;)Lnet/minecraft/class_6381; ARG 0 partIndex CLASS 1 FIELD field_33800 first Z diff --git a/mappings/net/minecraft/client/model/ModelPart.mapping b/mappings/net/minecraft/client/model/ModelPart.mapping index 6d405f1bdb..ac5a85e457 100644 --- a/mappings/net/minecraft/client/model/ModelPart.mapping +++ b/mappings/net/minecraft/client/model/ModelPart.mapping @@ -113,19 +113,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 @@ -155,3 +142,16 @@ CLASS net/minecraft/class_630 net/minecraft/client/model/ModelPart ARG 3 light ARG 4 overlay ARG 5 color + 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 d44398d5cb..99a623eb8d 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/BlockDustParticle.mapping b/mappings/net/minecraft/client/particle/BlockDustParticle.mapping index 4fd7588496..b740c5fb00 100644 --- a/mappings/net/minecraft/client/particle/BlockDustParticle.mapping +++ b/mappings/net/minecraft/client/particle/BlockDustParticle.mapping @@ -30,6 +30,6 @@ CLASS net/minecraft/class_727 net/minecraft/client/particle/BlockDustParticle ARG 8 velocityX ARG 10 velocityY ARG 12 velocityZ - CLASS class_10334 CrumbleFactory CLASS class_728 Factory CLASS class_9482 DustPillarFactory + CLASS class_10334 CrumbleFactory diff --git a/mappings/net/minecraft/client/particle/CrackParticle.mapping b/mappings/net/minecraft/client/particle/CrackParticle.mapping index 575cfbebf9..b9832615d8 100644 --- a/mappings/net/minecraft/client/particle/CrackParticle.mapping +++ b/mappings/net/minecraft/client/particle/CrackParticle.mapping @@ -16,12 +16,12 @@ CLASS net/minecraft/class_647 net/minecraft/client/particle/CrackParticle ARG 4 y ARG 6 z ARG 8 itemRenderState + CLASS class_648 ItemFactory + CLASS class_649 SlimeballFactory + CLASS class_650 SnowballFactory + CLASS class_9478 CobwebFactory CLASS class_10417 Factory FIELD field_55268 itemRenderState Lnet/minecraft/class_10444; METHOD method_65524 getItemRenderState (Lnet/minecraft/class_1799;Lnet/minecraft/class_638;)Lnet/minecraft/class_10444; ARG 1 stack ARG 2 world - CLASS class_648 ItemFactory - CLASS class_649 SlimeballFactory - CLASS class_650 SnowballFactory - CLASS class_9478 CobwebFactory 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 8dff2924ae..9f9bf35793 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; @@ -75,3 +71,7 @@ CLASS net/minecraft/class_677 net/minecraft/client/particle/FireworksSparkPartic ARG 2 targetColors 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/realms/gui/screen/RealmsNotificationsScreen.mapping b/mappings/net/minecraft/client/realms/gui/screen/RealmsNotificationsScreen.mapping index 557bf7694d..754703077f 100644 --- a/mappings/net/minecraft/client/realms/gui/screen/RealmsNotificationsScreen.mapping +++ b/mappings/net/minecraft/client/realms/gui/screen/RealmsNotificationsScreen.mapping @@ -31,7 +31,7 @@ CLASS net/minecraft/class_4399 net/minecraft/client/realms/gui/screen/RealmsNoti ARG 2 manager METHOD method_49591 (Ljava/util/List;)V ARG 0 notifications - METHOD method_52670 (Lnet/minecraft/class_8647$class_8648;)Ljava/lang/Boolean; + METHOD method_68700 (Lnet/minecraft/class_8647$class_8648;)Ljava/lang/Boolean; ARG 0 info CLASS class_8207 NotificationRunnersFactory METHOD method_49592 isNews ()Z diff --git a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping index 364bddeee8..98be464701 100644 --- a/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping +++ b/mappings/net/minecraft/client/render/ChunkRenderingDataPreparer.mapping @@ -64,21 +64,6 @@ CLASS net/minecraft/class_8679 net/minecraft/client/render/ChunkRenderingDataPre ARG 4 depth ARG 5 nearCenter METHOD method_62925 getOctree ()Lnet/minecraft/class_10143; - 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_45627 infoList Lnet/minecraft/class_8679$class_5972; - FIELD field_45628 queue Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; - FIELD field_53929 octree Lnet/minecraft/class_10143; - METHOD (Lnet/minecraft/class_769;)V - ARG 1 storage CLASS class_762 ChunkInfo FIELD field_4122 propagationLevel I FIELD field_4124 chunk Lnet/minecraft/class_846$class_851; @@ -100,6 +85,21 @@ 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_45627 infoList Lnet/minecraft/class_8679$class_5972; + FIELD field_45628 queue Lit/unimi/dsi/fastutil/longs/Long2ObjectMap; + FIELD field_53929 octree Lnet/minecraft/class_10143; + METHOD (Lnet/minecraft/class_769;)V + ARG 1 storage CLASS class_8680 Events CLASS class_8681 PreparerState METHOD (Lnet/minecraft/class_769;)V diff --git a/mappings/net/minecraft/client/render/RenderPass.mapping b/mappings/net/minecraft/client/render/RenderPass.mapping index cf32996c13..13286897dd 100644 --- a/mappings/net/minecraft/client/render/RenderPass.mapping +++ b/mappings/net/minecraft/client/render/RenderPass.mapping @@ -44,6 +44,6 @@ CLASS net/minecraft/class_10883 net/minecraft/client/render/RenderPass ARG 5 firstIndex ARG 6 indexCount CLASS class_10885 UniformUploader - METHOD upload upload (Ljava/lang/String;[F)V + METHOD upload (Ljava/lang/String;[F)V ARG 1 uniform ARG 2 values diff --git a/mappings/net/minecraft/client/render/RenderPhase.mapping b/mappings/net/minecraft/client/render/RenderPhase.mapping index 07b1d1e8b0..5567acc029 100644 --- a/mappings/net/minecraft/client/render/RenderPhase.mapping +++ b/mappings/net/minecraft/client/render/RenderPhase.mapping @@ -68,7 +68,6 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase METHOD (Ljava/util/List;)V ARG 1 textures METHOD method_34560 create ()Lnet/minecraft/class_4668$class_5940$class_5941; - CLASS class_10542 TextureEntry CLASS class_5941 Builder FIELD field_29454 textures Lcom/google/common/collect/ImmutableList$Builder; METHOD method_34562 build ()Lnet/minecraft/class_4668$class_5940; @@ -76,3 +75,4 @@ CLASS net/minecraft/class_4668 net/minecraft/client/render/RenderPhase ARG 1 id ARG 2 blur ARG 3 mipmap + CLASS class_10542 TextureEntry diff --git a/mappings/net/minecraft/client/render/RenderResourceManager.mapping b/mappings/net/minecraft/client/render/RenderResourceManager.mapping index 751c4ad857..6153f2dbec 100644 --- a/mappings/net/minecraft/client/render/RenderResourceManager.mapping +++ b/mappings/net/minecraft/client/render/RenderResourceManager.mapping @@ -1,9 +1,6 @@ CLASS net/minecraft/class_10881 net/minecraft/client/render/RenderResourceManager METHOD method_68347 readBufferFully (Lnet/minecraft/class_10227;)Lnet/minecraft/class_10227$class_10858; ARG 1 source - METHOD method_68348 clearAndResizeBuffer (Lnet/minecraft/class_10227;I)V - ARG 1 target - ARG 2 size METHOD method_68349 readBuffer (Lnet/minecraft/class_10227;II)Lnet/minecraft/class_10227$class_10858; ARG 1 source ARG 2 offset diff --git a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping index d1a5817ec9..75d0cbffe7 100644 --- a/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/BlockModelRenderer.mapping @@ -77,26 +77,6 @@ CLASS net/minecraft/class_778 net/minecraft/client/render/block/BlockModelRender ARG 5 matrices ARG 6 vertexConsumer ARG 7 cull - 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; @@ -137,3 +117,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/chunk/BlockBufferAllocatorStorage.mapping b/mappings/net/minecraft/client/render/chunk/BlockBufferAllocatorStorage.mapping index b4d81930bd..e0d8310088 100644 --- a/mappings/net/minecraft/client/render/chunk/BlockBufferAllocatorStorage.mapping +++ b/mappings/net/minecraft/client/render/chunk/BlockBufferAllocatorStorage.mapping @@ -6,5 +6,5 @@ CLASS net/minecraft/class_750 net/minecraft/client/render/chunk/BlockBufferAlloc METHOD method_23501 reset ()V METHOD method_3154 get (Lnet/minecraft/class_1921;)Lnet/minecraft/class_9799; ARG 1 layer - METHOD method_60896 (Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;)V + METHOD method_68707 (Lit/unimi/dsi/fastutil/objects/Reference2ObjectArrayMap;)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 665ac8a75d..06fe24d114 100644 --- a/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping +++ b/mappings/net/minecraft/client/render/chunk/ChunkBuilder.mapping @@ -43,23 +43,6 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder METHOD method_3633 clear ()V METHOD method_38555 (Ljava/util/concurrent/CompletableFuture;)Ljava/util/concurrent/CompletionStage; ARG 0 future - CLASS class_10196 NormalizedRelativePos - FIELD field_54170 x I - FIELD field_54171 y I - FIELD field_54172 z I - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - METHOD method_64067 isOnCameraAxis ()Z - METHOD method_64068 normalize (DI)I - ARG 0 cameraCoord - ARG 2 sectionCoord - METHOD method_64069 of (Lnet/minecraft/class_243;J)Lnet/minecraft/class_846$class_10196; - ARG 0 cameraPos - ARG 1 sectionPos - METHOD method_64070 with (Lnet/minecraft/class_243;J)Lnet/minecraft/class_846$class_10196; - ARG 1 cameraPos - ARG 2 sectionPos - CLASS class_4690 Result CLASS class_849 ChunkData FIELD field_4450 nonEmptyLayers Ljava/util/Set; FIELD field_4451 UNPROCESSED Lnet/minecraft/class_846$class_849; @@ -161,3 +144,20 @@ CLASS net/minecraft/class_846 net/minecraft/client/render/chunk/ChunkBuilder ARG 3 throwable METHOD method_22790 (Ljava/lang/Void;)Lnet/minecraft/class_846$class_4690; ARG 0 v + CLASS class_4690 Result + CLASS class_10196 NormalizedRelativePos + FIELD field_54170 x I + FIELD field_54171 y I + FIELD field_54172 z I + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + METHOD method_64067 isOnCameraAxis ()Z + METHOD method_64068 normalize (DI)I + ARG 0 cameraCoord + ARG 2 sectionCoord + METHOD method_64069 of (Lnet/minecraft/class_243;J)Lnet/minecraft/class_846$class_10196; + ARG 0 cameraPos + ARG 1 sectionPos + METHOD method_64070 with (Lnet/minecraft/class_243;J)Lnet/minecraft/class_846$class_10196; + ARG 1 cameraPos + ARG 2 sectionPos diff --git a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping index 41f8d7b523..f34e4e4918 100644 --- a/mappings/net/minecraft/client/render/model/BakedModelManager.mapping +++ b/mappings/net/minecraft/client/render/model/BakedModelManager.mapping @@ -87,5 +87,5 @@ CLASS net/minecraft/class_1092 net/minecraft/client/render/model/BakedModelManag ARG 7 models CLASS 1 FIELD field_55480 missingSprite Lnet/minecraft/class_1058; - CLASS class_10816 Models CLASS class_7779 BakingResult + CLASS class_10816 Models diff --git a/mappings/net/minecraft/client/render/model/Baker.mapping b/mappings/net/minecraft/client/render/model/Baker.mapping index fedf6f602b..4397a5d1b1 100644 --- a/mappings/net/minecraft/client/render/model/Baker.mapping +++ b/mappings/net/minecraft/client/render/model/Baker.mapping @@ -4,5 +4,5 @@ CLASS net/minecraft/class_7775 net/minecraft/client/render/model/Baker METHOD method_65732 getSpriteGetter ()Lnet/minecraft/class_9826; METHOD method_68549 compute (Lnet/minecraft/class_7775$class_10897;)Ljava/lang/Object; CLASS class_10897 ResolvableCacheKey - METHOD compute compute (Lnet/minecraft/class_7775;)Ljava/lang/Object; + METHOD compute (Lnet/minecraft/class_7775;)Ljava/lang/Object; ARG 1 baker diff --git a/mappings/net/minecraft/client/render/model/BlockStateModel.mapping b/mappings/net/minecraft/client/render/model/BlockStateModel.mapping index bc01c7e2ee..2cb559cc21 100644 --- a/mappings/net/minecraft/client/render/model/BlockStateModel.mapping +++ b/mappings/net/minecraft/client/render/model/BlockStateModel.mapping @@ -8,6 +8,12 @@ CLASS net/minecraft/class_1087 net/minecraft/client/render/model/BlockStateModel METHOD method_68513 addParts (Lnet/minecraft/class_5819;Ljava/util/List;)V ARG 1 random ARG 2 parts + CLASS class_9979 UnbakedGrouped + METHOD method_62332 getEqualityGroup (Lnet/minecraft/class_2680;)Ljava/lang/Object; + ARG 1 state + METHOD method_65542 getModel (Lnet/minecraft/class_2680;Lnet/minecraft/class_7775;)Lnet/minecraft/class_1087; + ARG 1 state + ARG 2 baker CLASS class_10891 CachedUnbaked FIELD field_57939 delegate Lnet/minecraft/class_1087$class_10892; FIELD field_57940 cacheKey Lnet/minecraft/class_7775$class_10897; @@ -32,9 +38,3 @@ CLASS net/minecraft/class_1087 net/minecraft/client/render/model/BlockStateModel ARG 1 baker METHOD method_68522 (Lnet/minecraft/class_1097$class_10898;)Ljava/lang/Record; ARG 0 left - CLASS class_9979 UnbakedGrouped - METHOD method_62332 getEqualityGroup (Lnet/minecraft/class_2680;)Ljava/lang/Object; - ARG 1 state - METHOD method_65542 getModel (Lnet/minecraft/class_2680;Lnet/minecraft/class_7775;)Lnet/minecraft/class_1087; - ARG 1 state - ARG 2 baker diff --git a/mappings/net/minecraft/client/render/model/ModelBaker.mapping b/mappings/net/minecraft/client/render/model/ModelBaker.mapping index 99b3fd2b88..1287aeec31 100644 --- a/mappings/net/minecraft/client/render/model/ModelBaker.mapping +++ b/mappings/net/minecraft/client/render/model/ModelBaker.mapping @@ -31,11 +31,11 @@ CLASS net/minecraft/class_1088 net/minecraft/client/render/model/ModelBaker ARG 1 spriteGetter METHOD method_60912 (Ljava/lang/String;)Ljava/lang/String; ARG 0 path - CLASS class_10524 BakedModels - CLASS class_10812 BlockItemModels - METHOD method_68021 bake (Lnet/minecraft/class_10819;Lnet/minecraft/class_9826;)Lnet/minecraft/class_1088$class_10812; - ARG 0 model CLASS class_7778 BakerImpl FIELD field_56988 spriteGetter Lnet/minecraft/class_9826; FIELD field_57959 cache Ljava/util/Map; FIELD field_57960 cacheValueFunction Ljava/util/function/Function; + CLASS class_10524 BakedModels + CLASS class_10812 BlockItemModels + METHOD method_68021 bake (Lnet/minecraft/class_10819;Lnet/minecraft/class_9826;)Lnet/minecraft/class_1088$class_10812; + ARG 0 model diff --git a/mappings/net/minecraft/client/render/model/json/ModelElementFace.mapping b/mappings/net/minecraft/client/render/model/json/ModelElementFace.mapping index 8e49283bd1..8bec295fca 100644 --- a/mappings/net/minecraft/client/render/model/json/ModelElementFace.mapping +++ b/mappings/net/minecraft/client/render/model/json/ModelElementFace.mapping @@ -12,9 +12,6 @@ CLASS net/minecraft/class_783 net/minecraft/client/render/model/json/ModelElemen METHOD comp_2869 textureId ()Ljava/lang/String; METHOD method_67909 getUValue (Lnet/minecraft/class_783$class_10800;Lnet/minecraft/class_10821;I)F METHOD method_67910 getVValue (Lnet/minecraft/class_783$class_10800;Lnet/minecraft/class_10821;I)F - CLASS class_10800 UV - METHOD method_67913 getUVertices (I)F - METHOD method_67914 getVVertices (I)F CLASS class_784 Deserializer FIELD field_32790 DEFAULT_TINT_INDEX I METHOD deserialize (Lcom/google/gson/JsonElement;Ljava/lang/reflect/Type;Lcom/google/gson/JsonDeserializationContext;)Ljava/lang/Object; @@ -26,3 +23,6 @@ CLASS net/minecraft/class_783 net/minecraft/client/render/model/json/ModelElemen METHOD method_3400 deserializeTintIndex (Lcom/google/gson/JsonObject;)I METHOD method_67911 getRotation (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_10821; METHOD method_67912 getUV (Lcom/google/gson/JsonObject;)Lnet/minecraft/class_783$class_10800; + CLASS class_10800 UV + METHOD method_67913 getUVertices (I)F + METHOD method_67914 getVVertices (I)F diff --git a/mappings/net/minecraft/client/resource/ClientDataPackManager.mapping b/mappings/net/minecraft/client/resource/ClientDataPackManager.mapping index 4c935d6bff..17ce034977 100644 --- a/mappings/net/minecraft/client/resource/ClientDataPackManager.mapping +++ b/mappings/net/minecraft/client/resource/ClientDataPackManager.mapping @@ -2,9 +2,9 @@ CLASS net/minecraft/class_9247 net/minecraft/client/resource/ClientDataPackManag FIELD field_49124 packManager Lnet/minecraft/class_3283; FIELD field_49125 knownPacks Ljava/util/Map; METHOD method_57046 createResourceManager ()Lnet/minecraft/class_6860; - METHOD method_57047 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_9224;Lnet/minecraft/class_9226;)V - ARG 2 knownPackInfo - METHOD method_57048 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_3288;)V - ARG 1 resourcePackProfile METHOD method_57049 getCommonKnownPacks (Ljava/util/List;)Ljava/util/List; ARG 1 serverKnownPacks + METHOD method_68703 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_9224;Lnet/minecraft/class_9226;)V + ARG 2 knownPackInfo + METHOD method_68704 (Lcom/google/common/collect/ImmutableMap$Builder;Lnet/minecraft/class_3288;)V + ARG 1 resourcePackProfile diff --git a/mappings/net/minecraft/command/argument/packrat/ParsingRule.mapping b/mappings/net/minecraft/command/argument/packrat/ParsingRule.mapping index 801284fd03..08e284d8a5 100644 --- a/mappings/net/minecraft/command/argument/packrat/ParsingRule.mapping +++ b/mappings/net/minecraft/command/argument/packrat/ParsingRule.mapping @@ -8,9 +8,5 @@ CLASS net/minecraft/class_9396 net/minecraft/command/argument/packrat/ParsingRul ARG 0 term ARG 1 action CLASS class_9397 RuleAction - METHOD run (Lnet/minecraft/class_9393;)Ljava/lang/Object; - ARG 1 state CLASS class_9398 StatelessAction - METHOD run (Lnet/minecraft/class_9400;)Ljava/lang/Object; - ARG 1 results CLASS class_9399 SimpleRule diff --git a/mappings/net/minecraft/component/type/NbtComponent.mapping b/mappings/net/minecraft/component/type/NbtComponent.mapping index aa39147b15..4ab65304d3 100644 --- a/mappings/net/minecraft/component/type/NbtComponent.mapping +++ b/mappings/net/minecraft/component/type/NbtComponent.mapping @@ -6,8 +6,6 @@ CLASS net/minecraft/class_9279 net/minecraft/component/type/NbtComponent FIELD field_49306 nbt Lnet/minecraft/class_2487; FIELD field_51522 LOGGER Lorg/slf4j/Logger; FIELD field_55048 ID_KEY Ljava/lang/String; - FIELD field_56309 MOB_SPAWNER_ID Lnet/minecraft/class_2960; - FIELD field_56310 TRIAL_SPAWNER_ID Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_2487;)V ARG 1 nbt METHOD equals (Ljava/lang/Object;)Z @@ -38,11 +36,6 @@ CLASS net/minecraft/class_9279 net/minecraft/component/type/NbtComponent ARG 0 type ARG 1 stack ARG 2 nbt - METHOD method_57454 createPredicate (Lnet/minecraft/class_9331;Lnet/minecraft/class_2487;)Ljava/util/function/Predicate; - ARG 0 type - ARG 1 nbt - METHOD method_57455 (Lnet/minecraft/class_9331;Lnet/minecraft/class_2487;Lnet/minecraft/class_1799;)Z - ARG 2 stack METHOD method_57456 of (Lnet/minecraft/class_2487;)Lnet/minecraft/class_9279; ARG 0 nbt METHOD method_57457 (Lnet/minecraft/class_2520;)Lnet/minecraft/class_9279; diff --git a/mappings/net/minecraft/data/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping b/mappings/net/minecraft/data/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping index f232464d71..fd0e3ad43e 100644 --- a/mappings/net/minecraft/data/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping +++ b/mappings/net/minecraft/data/advancement/vanilla/VanillaHusbandryTabAdvancementGenerator.mapping @@ -41,10 +41,5 @@ CLASS net/minecraft/class_2414 net/minecraft/data/advancement/vanilla/VanillaHus ARG 2 entityType METHOD method_48498 (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7871;Lnet/minecraft/class_1299;)V ARG 2 entityType - METHOD method_58572 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_2960; - ARG 0 entry - METHOD method_59775 requireAllWolvesTamed (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7225$class_7874;)Lnet/minecraft/class_161$class_162; + METHOD method_59775 requireAllWolvesTamed (Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_7225;)Lnet/minecraft/class_161$class_162; ARG 0 builder - ARG 1 registries - METHOD method_59776 (Lnet/minecraft/class_7225$class_7226;Lnet/minecraft/class_161$class_162;Lnet/minecraft/class_5321;)V - ARG 2 key diff --git a/mappings/net/minecraft/data/recipe/VanillaRecipeGenerator.mapping b/mappings/net/minecraft/data/recipe/VanillaRecipeGenerator.mapping index 93131e5080..25e16dabab 100644 --- a/mappings/net/minecraft/data/recipe/VanillaRecipeGenerator.mapping +++ b/mappings/net/minecraft/data/recipe/VanillaRecipeGenerator.mapping @@ -14,5 +14,5 @@ CLASS net/minecraft/class_7803 net/minecraft/data/recipe/VanillaRecipeGenerator ARG 1 item METHOD method_64384 generateDyedShulkerBoxes ()V METHOD method_64541 generateDyedBundles ()V - CLASS class_10116 Provider CLASS class_8905 SmithingTemplate + CLASS class_10116 Provider diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 419df1446a..4ea04acc53 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -217,7 +217,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity FIELD field_6037 velocityModified Z FIELD field_6038 lastRenderX D METHOD (Lnet/minecraft/class_1299;Lnet/minecraft/class_1937;)V - ARG 1 type ARG 2 world METHOD equals (Ljava/lang/Object;)Z ARG 1 o @@ -2327,7 +2326,6 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT COMMENT

This returns {@code false} unless the entity is a player in spectator game mode. METHOD method_7490 getGravity ()D - CLASS class_10365 QueuedCollisionCheck CLASS class_4738 PositionUpdater METHOD accept (Lnet/minecraft/class_1297;DDD)V ARG 1 entity @@ -2379,3 +2377,4 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT Returns whether this means an entity may emit game events as it moves. METHOD method_33578 playsSounds ()Z COMMENT Returns whether this means an entity may play sounds as it moves. + CLASS class_10365 QueuedCollisionCheck diff --git a/mappings/net/minecraft/entity/EntityCollisionHandler.mapping b/mappings/net/minecraft/entity/EntityCollisionHandler.mapping index 528aa89094..54b8afb1a3 100644 --- a/mappings/net/minecraft/entity/EntityCollisionHandler.mapping +++ b/mappings/net/minecraft/entity/EntityCollisionHandler.mapping @@ -21,7 +21,7 @@ CLASS net/minecraft/class_10774 net/minecraft/entity/EntityCollisionHandler ARG 1 version METHOD method_67643 runCallbacks (Lnet/minecraft/class_1297;)V ARG 1 entity - METHOD method_67644 (Lnet/minecraft/class_10776;)Ljava/util/List; + METHOD method_68687 (Lnet/minecraft/class_10776;)Ljava/util/List; ARG 0 value - METHOD method_67645 (Lnet/minecraft/class_10776;)Ljava/util/List; + METHOD method_68688 (Lnet/minecraft/class_10776;)Ljava/util/List; ARG 0 value diff --git a/mappings/net/minecraft/entity/MarkerEntity.mapping b/mappings/net/minecraft/entity/MarkerEntity.mapping index 12b36f6342..0163c1724d 100644 --- a/mappings/net/minecraft/entity/MarkerEntity.mapping +++ b/mappings/net/minecraft/entity/MarkerEntity.mapping @@ -1,4 +1 @@ CLASS net/minecraft/class_6335 net/minecraft/entity/MarkerEntity - FIELD field_33457 DATA_KEY Ljava/lang/String; - COMMENT The name of the compound tag that stores the marker's custom data. - FIELD field_33458 data Lnet/minecraft/class_2487; diff --git a/mappings/net/minecraft/item/CrossbowItem.mapping b/mappings/net/minecraft/item/CrossbowItem.mapping index df603289fb..32a7072acd 100644 --- a/mappings/net/minecraft/item/CrossbowItem.mapping +++ b/mappings/net/minecraft/item/CrossbowItem.mapping @@ -48,12 +48,12 @@ CLASS net/minecraft/class_1764 net/minecraft/item/CrossbowItem METHOD method_7784 getSoundPitch (ZLnet/minecraft/class_5819;)F ARG 0 flag ARG 1 random + CLASS class_9693 LoadingSounds + FIELD field_51627 CODEC Lcom/mojang/serialization/Codec; + METHOD method_59977 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_10393 ChargeType FIELD field_55209 CODEC Lcom/mojang/serialization/Codec; FIELD field_55210 name Ljava/lang/String; METHOD (Ljava/lang/String;ILjava/lang/String;)V ARG 3 name - CLASS class_9693 LoadingSounds - FIELD field_51627 CODEC Lcom/mojang/serialization/Codec; - METHOD method_59977 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance diff --git a/mappings/net/minecraft/item/ProjectileItem.mapping b/mappings/net/minecraft/item/ProjectileItem.mapping index 20ac31f523..f0f4186c35 100644 --- a/mappings/net/minecraft/item/ProjectileItem.mapping +++ b/mappings/net/minecraft/item/ProjectileItem.mapping @@ -27,11 +27,11 @@ CLASS net/minecraft/class_9463 net/minecraft/item/ProjectileItem ARG 1 overrideDispenseEvent METHOD method_58667 positionFunction (Lnet/minecraft/class_9463$class_9466;)Lnet/minecraft/class_9463$class_9464$class_9465; ARG 1 positionFunction - METHOD method_58668 (Lnet/minecraft/class_2342;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2374; - ARG 0 pointer - ARG 1 direction METHOD method_58669 power (F)Lnet/minecraft/class_9463$class_9464$class_9465; ARG 1 power + METHOD method_68690 (Lnet/minecraft/class_2342;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2374; + ARG 0 pointer + ARG 1 direction CLASS class_9466 PositionFunction METHOD getDispensePosition (Lnet/minecraft/class_2342;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2374; ARG 1 pointer diff --git a/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping b/mappings/net/minecraft/loot/function/ApplyBonusLootFunction.mapping index 957de20125..55e6f13ae8 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/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping index 24ed58854a..67803d825d 100644 --- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping @@ -311,6 +311,29 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs ARG 0 value METHOD method_64960 (Ljava/util/OptionalInt;)Ljava/lang/Integer; ARG 0 value + CLASS 3 + METHOD method_59799 decode (Lio/netty/buffer/ByteBuf;)[B + ARG 1 buf + METHOD method_59800 encode (Lio/netty/buffer/ByteBuf;[B)V + ARG 1 buf + ARG 2 value + CLASS 4 + 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_68115 decode (Lio/netty/buffer/ByteBuf;)[J + ARG 1 buf + METHOD method_68116 encode (Lio/netty/buffer/ByteBuf;[J)V + ARG 1 buf + ARG 2 values + CLASS 8 + METHOD method_68121 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; + ARG 1 error + METHOD method_68122 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; + ARG 1 error CLASS 15 CLASS 16 METHOD method_68096 (Lnet/minecraft/class_9139;Lio/netty/buffer/ByteBuf;Lnet/minecraft/class_9139;Ljava/lang/Object;Ljava/lang/Object;)V @@ -341,26 +364,3 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs ARG 1 signature METHOD method_68112 (Lio/netty/buffer/ByteBuf;)Ljava/lang/String; ARG 0 buf2 - CLASS 3 - METHOD method_59799 decode (Lio/netty/buffer/ByteBuf;)[B - ARG 1 buf - METHOD method_59800 encode (Lio/netty/buffer/ByteBuf;[B)V - ARG 1 buf - ARG 2 value - CLASS 4 - 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_68115 decode (Lio/netty/buffer/ByteBuf;)[J - ARG 1 buf - METHOD method_68116 encode (Lio/netty/buffer/ByteBuf;[J)V - ARG 1 buf - ARG 2 values - CLASS 8 - METHOD method_68121 (Ljava/lang/Object;Ljava/lang/String;)Lio/netty/handler/codec/EncoderException; - ARG 1 error - METHOD method_68122 (Lnet/minecraft/class_2520;Ljava/lang/String;)Lio/netty/handler/codec/DecoderException; - ARG 1 error diff --git a/mappings/net/minecraft/predicate/BlockPredicate.mapping b/mappings/net/minecraft/predicate/BlockPredicate.mapping index e5582f1919..414aa8d946 100644 --- a/mappings/net/minecraft/predicate/BlockPredicate.mapping +++ b/mappings/net/minecraft/predicate/BlockPredicate.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate FIELD field_49181 PACKET_CODEC Lnet/minecraft/class_9139; METHOD comp_1733 state ()Ljava/util/Optional; METHOD method_22454 test (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z - ARG 1 world ARG 2 pos METHOD method_57143 hasNbt ()Z METHOD method_57144 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index ef9af8a699..50ca6b17ce 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -44,7 +44,7 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate FIELD field_51574 periodicTick Ljava/util/Optional; FIELD field_51937 location Ljava/util/Optional; FIELD field_51938 movementAffectedBy Ljava/util/Optional; - FIELD field_55957 components Ljava/util/Optional; + FIELD field_55957 components Lnet/minecraft/class_10914; FIELD field_9602 distance Ljava/util/Optional; FIELD field_9603 nbt Ljava/util/Optional; FIELD field_9605 effects Ljava/util/Optional; @@ -74,8 +74,7 @@ CLASS net/minecraft/class_2048 net/minecraft/predicate/entity/EntityPredicate ARG 1 movement METHOD method_60611 movementAffectedBy (Lnet/minecraft/class_2090$class_2091;)Lnet/minecraft/class_2048$class_2049; ARG 1 movementAffectedBy - METHOD method_66675 components (Lnet/minecraft/class_9329;)Lnet/minecraft/class_2048$class_2049; - ARG 1 components + METHOD method_66675 components (Lnet/minecraft/class_10914;)Lnet/minecraft/class_2048$class_2049; 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/item/ItemPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping index 8567784bde..d7bca6e779 100644 --- a/mappings/net/minecraft/predicate/item/ItemPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemPredicate.mapping @@ -7,19 +7,14 @@ CLASS net/minecraft/class_2073 net/minecraft/predicate/item/ItemPredicate METHOD test (Ljava/lang/Object;)Z ARG 1 stack CLASS class_2074 Builder - FIELD field_49235 componentPredicate Lnet/minecraft/class_9329; - FIELD field_49803 subPredicates Lcom/google/common/collect/ImmutableMap$Builder; + FIELD field_49235 componentPredicate Lnet/minecraft/class_10914; FIELD field_9648 count Lnet/minecraft/class_2096$class_2100; FIELD field_9650 item Ljava/util/Optional; METHOD method_35233 count (Lnet/minecraft/class_2096$class_2100;)Lnet/minecraft/class_2073$class_2074; ARG 1 count METHOD method_53166 (Lnet/minecraft/class_1935;)Lnet/minecraft/class_6880; ARG 0 item - METHOD method_57299 component (Lnet/minecraft/class_9329;)Lnet/minecraft/class_2073$class_2074; - ARG 1 componentPredicate - METHOD method_58179 subPredicate (Lnet/minecraft/class_9360$class_8745;Lnet/minecraft/class_9360;)Lnet/minecraft/class_2073$class_2074; - ARG 1 type - ARG 2 subPredicate + METHOD method_57299 component (Lnet/minecraft/class_10914;)Lnet/minecraft/class_2073$class_2074; METHOD method_8973 create ()Lnet/minecraft/class_2073$class_2074; METHOD method_8975 tag (Lnet/minecraft/class_7871;Lnet/minecraft/class_6862;)Lnet/minecraft/class_2073$class_2074; ARG 1 itemRegistry diff --git a/mappings/net/minecraft/predicate/item/ItemSubPredicate.mapping b/mappings/net/minecraft/predicate/item/ItemSubPredicate.mapping index 055cfcbd40..6ac72dedd3 100644 --- a/mappings/net/minecraft/predicate/item/ItemSubPredicate.mapping +++ b/mappings/net/minecraft/predicate/item/ItemSubPredicate.mapping @@ -4,7 +4,6 @@ CLASS net/minecraft/class_9360 net/minecraft/predicate/item/ItemSubPredicate ARG 1 components METHOD method_67301 createCodec (Ljava/lang/String;)Lcom/mojang/serialization/MapCodec; ARG 0 predicateFieldName - CLASS class_10727 TypedSubPredicate CLASS class_8745 Type FIELD field_56401 predicateCodec Lcom/mojang/serialization/Codec; FIELD field_56402 typedCodec Lcom/mojang/serialization/MapCodec; @@ -16,3 +15,4 @@ CLASS net/minecraft/class_9360 net/minecraft/predicate/item/ItemSubPredicate METHOD method_67304 (Lnet/minecraft/class_9360;)Lnet/minecraft/class_9360$class_10727; ARG 1 predicate METHOD method_67305 getTypedCodec ()Lcom/mojang/serialization/MapCodec; + CLASS class_10727 TypedSubPredicate diff --git a/mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping b/mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping index b92ea295c1..1c1b7d3b7d 100644 --- a/mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping +++ b/mappings/net/minecraft/recipe/AbstractCookingRecipe.mapping @@ -13,14 +13,6 @@ CLASS net/minecraft/class_1874 net/minecraft/recipe/AbstractCookingRecipe METHOD method_64663 getCookerItem ()Lnet/minecraft/class_1792; METHOD method_8167 getCookingTime ()I METHOD method_8171 getExperience ()F - CLASS class_10285 Serializer - FIELD field_54625 codec Lcom/mojang/serialization/MapCodec; - FIELD field_54626 packetCodec Lnet/minecraft/class_9139; - METHOD (Lnet/minecraft/class_1874$class_3958;I)V - ARG 1 factory - ARG 2 defaultCookingTime - METHOD method_64665 (ILnet/minecraft/class_1874$class_3958;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 2 instance CLASS class_3958 RecipeFactory METHOD create (Ljava/lang/String;Lnet/minecraft/class_7709;Lnet/minecraft/class_1856;Lnet/minecraft/class_1799;FI)Lnet/minecraft/class_1874; ARG 1 group @@ -29,3 +21,11 @@ CLASS net/minecraft/class_1874 net/minecraft/recipe/AbstractCookingRecipe ARG 4 result ARG 5 experience ARG 6 cookingTime + CLASS class_10285 Serializer + FIELD field_54625 codec Lcom/mojang/serialization/MapCodec; + FIELD field_54626 packetCodec Lnet/minecraft/class_9139; + METHOD (Lnet/minecraft/class_1874$class_3958;I)V + ARG 1 factory + ARG 2 defaultCookingTime + METHOD method_64665 (ILnet/minecraft/class_1874$class_3958;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 2 instance diff --git a/mappings/net/minecraft/recipe/RecipeMatcher.mapping b/mappings/net/minecraft/recipe/RecipeMatcher.mapping index 65f37e9ee3..535e09e50b 100644 --- a/mappings/net/minecraft/recipe/RecipeMatcher.mapping +++ b/mappings/net/minecraft/recipe/RecipeMatcher.mapping @@ -34,9 +34,6 @@ CLASS net/minecraft/class_1662 net/minecraft/recipe/RecipeMatcher ARG 1 input ARG 2 count COMMENT the number of times that item must be consumed - CLASS class_10528 RawIngredient - METHOD acceptsItem (Ljava/lang/Object;)Z - ARG 1 entry CLASS class_1663 Matcher FIELD field_7551 requiredItems Ljava/util/List; FIELD field_7552 ingredients Ljava/util/List; @@ -116,3 +113,6 @@ CLASS net/minecraft/class_1662 net/minecraft/recipe/RecipeMatcher CLASS class_9874 ItemCallback METHOD accept (Ljava/lang/Object;)V ARG 1 item + CLASS class_10528 RawIngredient + METHOD acceptsItem (Ljava/lang/Object;)Z + ARG 1 entry diff --git a/mappings/net/minecraft/recipe/ServerRecipeManager.mapping b/mappings/net/minecraft/recipe/ServerRecipeManager.mapping index fefed3a1ce..ba62f3443a 100644 --- a/mappings/net/minecraft/recipe/ServerRecipeManager.mapping +++ b/mappings/net/minecraft/recipe/ServerRecipeManager.mapping @@ -120,6 +120,10 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/ServerRecipeManager COMMENT the input world CLASS 1 FIELD field_38221 id Lnet/minecraft/class_5321; + CLASS class_7266 MatchGetter + METHOD method_42303 getFirstMatch (Lnet/minecraft/class_9695;Lnet/minecraft/class_3218;)Ljava/util/Optional; + ARG 1 input + ARG 2 world CLASS class_10288 ServerRecipe CLASS class_10356 PropertySetBuilder FIELD field_54898 propertySetKey Lnet/minecraft/class_5321; @@ -135,7 +139,3 @@ CLASS net/minecraft/class_1863 net/minecraft/recipe/ServerRecipeManager CLASS class_10357 SoleIngredientGetter METHOD apply (Lnet/minecraft/class_1860;)Ljava/util/Optional; ARG 1 recipe - CLASS class_7266 MatchGetter - METHOD method_42303 getFirstMatch (Lnet/minecraft/class_9695;Lnet/minecraft/class_3218;)Ljava/util/Optional; - ARG 1 input - ARG 2 world diff --git a/mappings/net/minecraft/recipe/display/StoneCutterRecipeDisplay.mapping b/mappings/net/minecraft/recipe/display/StonecutterRecipeDisplay.mapping similarity index 100% rename from mappings/net/minecraft/recipe/display/StoneCutterRecipeDisplay.mapping rename to mappings/net/minecraft/recipe/display/StonecutterRecipeDisplay.mapping diff --git a/mappings/net/minecraft/registry/tag/TagGroupLoader.mapping b/mappings/net/minecraft/registry/tag/TagGroupLoader.mapping index 242df67ecd..cdbd611eeb 100644 --- a/mappings/net/minecraft/registry/tag/TagGroupLoader.mapping +++ b/mappings/net/minecraft/registry/tag/TagGroupLoader.mapping @@ -56,6 +56,19 @@ CLASS net/minecraft/class_3503 net/minecraft/registry/tag/TagGroupLoader METHOD method_61314 (Lnet/minecraft/class_2385;Lnet/minecraft/class_5321;Lnet/minecraft/class_2960;Ljava/util/List;)V ARG 2 id ARG 3 entries + CLASS class_5145 TrackedEntry + FIELD comp_324 entry Lnet/minecraft/class_3497; + FIELD comp_325 source Ljava/lang/String; + METHOD (Lnet/minecraft/class_3497;Ljava/lang/String;)V + ARG 2 source + METHOD comp_324 entry ()Lnet/minecraft/class_3497; + METHOD comp_325 source ()Ljava/lang/String; + CLASS class_6863 RegistryTags + CLASS class_8522 TagDependencies + METHOD method_51479 (Ljava/util/function/Consumer;Lnet/minecraft/class_3503$class_5145;)V + ARG 1 entry + METHOD method_51481 (Ljava/util/function/Consumer;Lnet/minecraft/class_3503$class_5145;)V + ARG 1 entry CLASS class_10272 EntrySupplier METHOD get (Lnet/minecraft/class_2960;Z)Ljava/util/Optional; ARG 1 id @@ -70,16 +83,3 @@ CLASS net/minecraft/class_3503 net/minecraft/registry/tag/TagGroupLoader ARG 2 required METHOD method_64600 forInitial (Lnet/minecraft/class_2385;)Lnet/minecraft/class_3503$class_10272; ARG 0 registry - CLASS class_5145 TrackedEntry - FIELD comp_324 entry Lnet/minecraft/class_3497; - FIELD comp_325 source Ljava/lang/String; - METHOD (Lnet/minecraft/class_3497;Ljava/lang/String;)V - ARG 2 source - METHOD comp_324 entry ()Lnet/minecraft/class_3497; - METHOD comp_325 source ()Ljava/lang/String; - CLASS class_6863 RegistryTags - CLASS class_8522 TagDependencies - METHOD method_51479 (Ljava/util/function/Consumer;Lnet/minecraft/class_3503$class_5145;)V - ARG 1 entry - METHOD method_51481 (Ljava/util/function/Consumer;Lnet/minecraft/class_3503$class_5145;)V - ARG 1 entry diff --git a/mappings/net/minecraft/server/command/FillCommand.mapping b/mappings/net/minecraft/server/command/FillCommand.mapping index 0df1145a2d..83ce1ab1b3 100644 --- a/mappings/net/minecraft/server/command/FillCommand.mapping +++ b/mappings/net/minecraft/server/command/FillCommand.mapping @@ -56,15 +56,6 @@ CLASS net/minecraft/class_3057 net/minecraft/server/command/FillCommand ARG 0 context METHOD method_65999 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2338; ARG 0 context - CLASS class_10555 PostProcessor - FIELD field_55585 EMPTY Lnet/minecraft/class_3057$class_10555; - METHOD affect (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z - ARG 1 world - ARG 2 pos - METHOD method_66000 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z - ARG 0 world - ARG 1 pos - CLASS class_10557 OptionalArgumentResolver CLASS class_3058 Mode FIELD field_13654 filter Lnet/minecraft/class_3057$class_3120; FIELD field_55587 postProcessor Lnet/minecraft/class_3057$class_10555; @@ -96,3 +87,12 @@ CLASS net/minecraft/class_3057 net/minecraft/server/command/FillCommand ARG 1 pos ARG 2 block ARG 3 world + CLASS class_10555 PostProcessor + FIELD field_55585 EMPTY Lnet/minecraft/class_3057$class_10555; + METHOD affect (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos + METHOD method_66000 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 pos + CLASS class_10557 OptionalArgumentResolver diff --git a/mappings/net/minecraft/server/command/TestFinder.mapping b/mappings/net/minecraft/server/command/TestFinder.mapping index e6f9920221..2c91393919 100644 --- a/mappings/net/minecraft/server/command/TestFinder.mapping +++ b/mappings/net/minecraft/server/command/TestFinder.mapping @@ -43,9 +43,9 @@ CLASS net/minecraft/class_9123 net/minecraft/server/command/TestFinder METHOD method_67071 selector (Lcom/mojang/brigadier/context/CommandContext;Ljava/util/Collection;)Lnet/minecraft/class_9123; ARG 1 context ARG 2 selected - METHOD method_67072 (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; - ARG 0 finder METHOD method_67073 (ZLnet/minecraft/class_6880$class_6883;)Z ARG 1 instance - METHOD method_67074 (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; + METHOD method_68719 (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; + ARG 0 finder + METHOD method_68720 (Ljava/util/function/Supplier;)Ljava/util/function/Supplier; ARG 0 finder diff --git a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping index 3a14b98211..2dcd995bd2 100644 --- a/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping +++ b/mappings/net/minecraft/server/network/ServerPlayerEntity.mapping @@ -306,14 +306,6 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity ARG 1 handler ARG 2 property ARG 3 value - CLASS class_10766 Respawn - FIELD field_56608 CODEC Lcom/mojang/serialization/Codec; - METHOD method_67565 posEquals (Lnet/minecraft/class_3222$class_10766;)Z - ARG 1 respawn - METHOD method_67566 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - METHOD method_67567 getDimension (Lnet/minecraft/class_3222$class_10766;)Lnet/minecraft/class_5321; - ARG 0 respawn CLASS class_9773 RespawnPos FIELD comp_2811 pos Lnet/minecraft/class_243; METHOD comp_2811 pos ()Lnet/minecraft/class_243; @@ -323,3 +315,11 @@ CLASS net/minecraft/class_3222 net/minecraft/server/network/ServerPlayerEntity METHOD method_60596 getYaw (Lnet/minecraft/class_243;Lnet/minecraft/class_2338;)F ARG 0 respawnPos ARG 1 currentPos + CLASS class_10766 Respawn + FIELD field_56608 CODEC Lcom/mojang/serialization/Codec; + METHOD method_67565 posEquals (Lnet/minecraft/class_3222$class_10766;)Z + ARG 1 respawn + METHOD method_67566 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_67567 getDimension (Lnet/minecraft/class_3222$class_10766;)Lnet/minecraft/class_5321; + ARG 0 respawn diff --git a/mappings/net/minecraft/structure/StructureTemplate.mapping b/mappings/net/minecraft/structure/StructureTemplate.mapping index 797c5c9239..45a91d4307 100644 --- a/mappings/net/minecraft/structure/StructureTemplate.mapping +++ b/mappings/net/minecraft/structure/StructureTemplate.mapping @@ -183,11 +183,6 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate ARG 1 state METHOD method_67693 getJointFromFacing (Lnet/minecraft/class_2680;)Lnet/minecraft/class_3751$class_4991; ARG 0 state - CLASS class_10326 JigsawBlockInfo - METHOD method_64824 of (Lnet/minecraft/class_3499$class_3501;)Lnet/minecraft/class_3499$class_10326; - ARG 0 structureBlockInfo - METHOD method_64825 withInfo (Lnet/minecraft/class_3499$class_3501;)Lnet/minecraft/class_3499$class_10326; - ARG 1 structureBlockInfo CLASS class_3500 Palette FIELD field_15590 AIR Lnet/minecraft/class_2680; FIELD field_15591 ids Lnet/minecraft/class_2361; @@ -226,3 +221,8 @@ CLASS net/minecraft/class_3499 net/minecraft/structure/StructureTemplate METHOD method_27128 (Lnet/minecraft/class_2248;)Ljava/util/List; ARG 1 block2 METHOD method_64827 getOrCreateJigsawBlockInfos ()Ljava/util/List; + CLASS class_10326 JigsawBlockInfo + METHOD method_64824 of (Lnet/minecraft/class_3499$class_3501;)Lnet/minecraft/class_3499$class_10326; + ARG 0 structureBlockInfo + METHOD method_64825 withInfo (Lnet/minecraft/class_3499$class_3501;)Lnet/minecraft/class_3499$class_10326; + ARG 1 structureBlockInfo diff --git a/mappings/net/minecraft/text/ClickEvent.mapping b/mappings/net/minecraft/text/ClickEvent.mapping index 3681044731..63f33c7082 100644 --- a/mappings/net/minecraft/text/ClickEvent.mapping +++ b/mappings/net/minecraft/text/ClickEvent.mapping @@ -3,6 +3,19 @@ CLASS net/minecraft/class_2558 net/minecraft/text/ClickEvent METHOD method_10845 getAction ()Lnet/minecraft/class_2558$class_2559; METHOD method_66564 (Lnet/minecraft/class_2558$class_2559;)Lcom/mojang/serialization/MapCodec; ARG 0 action + CLASS class_2559 Action + FIELD field_11742 name Ljava/lang/String; + FIELD field_11744 userDefinable Z + FIELD field_46595 UNVALIDATED_CODEC Lcom/mojang/serialization/Codec; + FIELD field_46596 CODEC Lcom/mojang/serialization/Codec; + FIELD field_55902 codec Lcom/mojang/serialization/MapCodec; + METHOD (Ljava/lang/String;ILjava/lang/String;ZLcom/mojang/serialization/MapCodec;)V + ARG 3 name + ARG 4 userDefinable + ARG 5 codec + METHOD method_10847 isUserDefinable ()Z + METHOD method_54152 validate (Lnet/minecraft/class_2558$class_2559;)Lcom/mojang/serialization/DataResult; + ARG 0 action CLASS class_10605 ChangePage FIELD field_55903 CODEC Lcom/mojang/serialization/MapCodec; METHOD method_66565 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; @@ -32,16 +45,3 @@ CLASS net/minecraft/class_2558 net/minecraft/text/ClickEvent FIELD field_55908 CODEC Lcom/mojang/serialization/MapCodec; METHOD method_66571 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance - CLASS class_2559 Action - FIELD field_11742 name Ljava/lang/String; - FIELD field_11744 userDefinable Z - FIELD field_46595 UNVALIDATED_CODEC Lcom/mojang/serialization/Codec; - FIELD field_46596 CODEC Lcom/mojang/serialization/Codec; - FIELD field_55902 codec Lcom/mojang/serialization/MapCodec; - METHOD (Ljava/lang/String;ILjava/lang/String;ZLcom/mojang/serialization/MapCodec;)V - ARG 3 name - ARG 4 userDefinable - ARG 5 codec - METHOD method_10847 isUserDefinable ()Z - METHOD method_54152 validate (Lnet/minecraft/class_2558$class_2559;)Lcom/mojang/serialization/DataResult; - ARG 0 action diff --git a/mappings/net/minecraft/text/HoverEvent.mapping b/mappings/net/minecraft/text/HoverEvent.mapping index 2c57e514be..af60a4ef3a 100644 --- a/mappings/net/minecraft/text/HoverEvent.mapping +++ b/mappings/net/minecraft/text/HoverEvent.mapping @@ -3,20 +3,6 @@ CLASS net/minecraft/class_2568 net/minecraft/text/HoverEvent METHOD method_10892 getAction ()Lnet/minecraft/class_2568$class_5247; METHOD method_54184 (Lnet/minecraft/class_2568$class_5247;)Lcom/mojang/serialization/MapCodec; ARG 0 action - CLASS class_10611 ShowEntity - FIELD field_55911 CODEC Lcom/mojang/serialization/MapCodec; - METHOD method_66577 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance - CLASS class_10612 ShowItem - FIELD field_55912 CODEC Lcom/mojang/serialization/MapCodec; - METHOD (Lnet/minecraft/class_1799;)V - ARG 1 stack - METHOD equals (Ljava/lang/Object;)Z - ARG 1 o - CLASS class_10613 ShowText - FIELD field_55913 CODEC Lcom/mojang/serialization/MapCodec; - METHOD method_66578 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance CLASS class_5247 Action FIELD field_24346 name Ljava/lang/String; FIELD field_24347 parsable Z @@ -55,3 +41,17 @@ CLASS net/minecraft/class_2568 net/minecraft/text/HoverEvent ARG 0 content METHOD method_54198 (Lnet/minecraft/class_2568$class_5248;)Lnet/minecraft/class_1299; ARG 0 content + CLASS class_10611 ShowEntity + FIELD field_55911 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_66577 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_10612 ShowItem + FIELD field_55912 CODEC Lcom/mojang/serialization/MapCodec; + METHOD (Lnet/minecraft/class_1799;)V + ARG 1 stack + METHOD equals (Ljava/lang/Object;)Z + ARG 1 o + CLASS class_10613 ShowText + FIELD field_55913 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_66578 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance diff --git a/mappings/net/minecraft/util/collection/Pool.mapping b/mappings/net/minecraft/util/collection/Pool.mapping index 9b9232fdcd..fcfd6db6d3 100644 --- a/mappings/net/minecraft/util/collection/Pool.mapping +++ b/mappings/net/minecraft/util/collection/Pool.mapping @@ -35,6 +35,14 @@ CLASS net/minecraft/class_6012 net/minecraft/util/collection/Pool ARG 1 function METHOD method_68257 (Ljava/util/function/Function;Lnet/minecraft/class_6010;)Lnet/minecraft/class_6010; ARG 1 entry + CLASS class_6006 Builder + FIELD field_29926 entries Lcom/google/common/collect/ImmutableList$Builder; + METHOD method_34974 build ()Lnet/minecraft/class_6012; + METHOD method_34975 add (Ljava/lang/Object;I)Lnet/minecraft/class_6012$class_6006; + ARG 1 object + ARG 2 weight + METHOD method_54453 add (Ljava/lang/Object;)Lnet/minecraft/class_6012$class_6006; + ARG 1 object CLASS class_10579 WrappedContent FIELD field_55648 entries [Lnet/minecraft/class_6010; METHOD (Ljava/util/List;)V @@ -47,11 +55,3 @@ CLASS net/minecraft/class_6012 net/minecraft/util/collection/Pool CLASS class_10581 Content METHOD method_66219 get (I)Ljava/lang/Object; ARG 1 i - CLASS class_6006 Builder - FIELD field_29926 entries Lcom/google/common/collect/ImmutableList$Builder; - METHOD method_34974 build ()Lnet/minecraft/class_6012; - METHOD method_34975 add (Ljava/lang/Object;I)Lnet/minecraft/class_6012$class_6006; - ARG 1 object - ARG 2 weight - METHOD method_54453 add (Ljava/lang/Object;)Lnet/minecraft/class_6012$class_6006; - ARG 1 object diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 16e5604082..52dde3ec62 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -366,13 +366,6 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs METHOD method_58593 isEmpty (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Z ARG 0 ops ARG 1 input - CLASS class_10388 IdMapper - FIELD field_55200 values Lcom/google/common/collect/BiMap; - METHOD method_65323 getCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; - ARG 1 idCodec - METHOD method_65325 put (Ljava/lang/Object;Ljava/lang/Object;)Lnet/minecraft/class_5699$class_10388; - ARG 1 id - ARG 2 value CLASS class_6866 ContextRetrievalCodec FIELD field_36397 retriever Ljava/util/function/Function; METHOD (Ljava/util/function/Function;)V @@ -410,3 +403,10 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 2 map METHOD method_53707 (Ljava/lang/Object;Ljava/util/Map;)Lcom/mojang/datafixers/util/Pair; ARG 1 map + CLASS class_10388 IdMapper + FIELD field_55200 values Lcom/google/common/collect/BiMap; + METHOD method_65323 getCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 1 idCodec + METHOD method_65325 put (Ljava/lang/Object;Ljava/lang/Object;)Lnet/minecraft/class_5699$class_10388; + ARG 1 id + ARG 2 value diff --git a/mappings/net/minecraft/util/math/BlockPos.mapping b/mappings/net/minecraft/util/math/BlockPos.mapping index aeb741a4d2..ab0ef23639 100644 --- a/mappings/net/minecraft/util/math/BlockPos.mapping +++ b/mappings/net/minecraft/util/math/BlockPos.mapping @@ -253,7 +253,6 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos FIELD field_48446 currentX I FIELD field_48447 currentY I FIELD field_48448 currentZ I - CLASS class_10384 IterationState CLASS class_2339 Mutable METHOD (DDD)V ARG 1 x @@ -313,3 +312,4 @@ CLASS net/minecraft/class_2338 net/minecraft/util/math/BlockPos COMMENT Sets this mutable block position to the sum of the given vectors. ARG 1 vec1 ARG 2 vec2 + CLASS class_10384 IterationState diff --git a/mappings/net/minecraft/util/profiling/jfr/JfrProfile.mapping b/mappings/net/minecraft/util/profiling/jfr/JfrProfile.mapping index 345c78494e..6c1518d63f 100644 --- a/mappings/net/minecraft/util/profiling/jfr/JfrProfile.mapping +++ b/mappings/net/minecraft/util/profiling/jfr/JfrProfile.mapping @@ -5,8 +5,8 @@ CLASS net/minecraft/class_6517 net/minecraft/util/profiling/jfr/JfrProfile FIELD comp_13 fileWriteStatistics Lnet/minecraft/class_6523$class_6524; FIELD comp_14 fileReadStatistics Lnet/minecraft/class_6523$class_6524; FIELD comp_15 chunkGenerationSamples Ljava/util/List; - FIELD comp_3 startTime Ljava/time/Instant; FIELD comp_3330 structureGenerationSamples Ljava/util/List; + FIELD comp_3 startTime Ljava/time/Instant; FIELD comp_4 endTime Ljava/time/Instant; FIELD comp_5 duration Ljava/time/Duration; FIELD comp_6 worldGenDuration Ljava/time/Duration; diff --git a/mappings/net/minecraft/world/biome/SpawnSettings.mapping b/mappings/net/minecraft/world/biome/SpawnSettings.mapping index 9d05b3df75..4e81cc989e 100644 --- a/mappings/net/minecraft/world/biome/SpawnSettings.mapping +++ b/mappings/net/minecraft/world/biome/SpawnSettings.mapping @@ -85,5 +85,5 @@ CLASS net/minecraft/class_5483 net/minecraft/world/biome/SpawnSettings ARG 3 entry METHOD method_31012 (Ljava/util/Map$Entry;)Lnet/minecraft/class_6012; ARG 0 spawner - METHOD method_31013 (Lnet/minecraft/class_1311;)Lnet/minecraft/class_6012$class_6006; + METHOD method_68692 (Lnet/minecraft/class_1311;)Lnet/minecraft/class_6012$class_6006; ARG 0 group diff --git a/mappings/net/minecraft/world/border/WorldBorder.mapping b/mappings/net/minecraft/world/border/WorldBorder.mapping index ebc1a0e16d..d30dae9a6b 100644 --- a/mappings/net/minecraft/world/border/WorldBorder.mapping +++ b/mappings/net/minecraft/world/border/WorldBorder.mapping @@ -133,7 +133,6 @@ CLASS net/minecraft/class_2784 net/minecraft/world/border/WorldBorder METHOD method_67544 calculateDistancesFromCamera (DD)Ljava/util/List; ARG 1 x ARG 3 z - CLASS class_10763 DistanceFromCamera CLASS class_2785 Area METHOD method_11984 getSize ()D METHOD method_11985 getBoundSouth ()D @@ -204,3 +203,4 @@ CLASS net/minecraft/class_2784 net/minecraft/world/border/WorldBorder METHOD method_27364 getSize ()D METHOD method_27365 getSizeLerpTime ()J METHOD method_27366 getSizeLerpTarget ()D + CLASS class_10763 DistanceFromCamera diff --git a/mappings/net/minecraft/world/chunk/WorldChunk.mapping b/mappings/net/minecraft/world/chunk/WorldChunk.mapping index 00b4aa6610..7131044737 100644 --- a/mappings/net/minecraft/world/chunk/WorldChunk.mapping +++ b/mappings/net/minecraft/world/chunk/WorldChunk.mapping @@ -101,9 +101,6 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk ARG 0 pos METHOD method_65066 setUnsavedListener (Lnet/minecraft/class_2818$class_10368;)V ARG 1 unsavedListener - CLASS class_10368 UnsavedListener - METHOD setUnsaved (Lnet/minecraft/class_1923;)V - ARG 1 pos CLASS class_2819 CreationType CLASS class_5563 DirectBlockEntityTickInvoker FIELD field_27223 worldChunk Lnet/minecraft/class_2818; @@ -122,3 +119,6 @@ CLASS net/minecraft/class_2818 net/minecraft/world/chunk/WorldChunk CLASS class_6829 EntityLoader METHOD run (Lnet/minecraft/class_2818;)V ARG 1 chunk + CLASS class_10368 UnsavedListener + METHOD setUnsaved (Lnet/minecraft/class_1923;)V + ARG 1 pos diff --git a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping index 89bf23ebe4..bb91c2a86f 100644 --- a/mappings/net/minecraft/world/storage/StorageIoWorker.mapping +++ b/mappings/net/minecraft/world/storage/StorageIoWorker.mapping @@ -56,7 +56,6 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker METHOD method_64028 (Ljava/util/concurrent/CompletableFuture;)V ARG 0 future METHOD method_64030 runRemainingTasks ()V - CLASS class_10195 Callable CLASS class_4699 Result FIELD field_21503 nbt Lnet/minecraft/class_2487; FIELD field_21504 future Ljava/util/concurrent/CompletableFuture; @@ -64,3 +63,4 @@ CLASS net/minecraft/class_4698 net/minecraft/world/storage/StorageIoWorker ARG 1 nbt METHOD method_60627 copyNbt ()Lnet/minecraft/class_2487; CLASS class_5276 Priority + CLASS class_10195 Callable