From d47820aa8154d64d37e03b4b4e545d68c0acf8e2 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 29 Feb 2024 08:29:53 +1100 Subject: [PATCH] oh lord --- .../block/dispenser/DispenserBehavior.mapping | 34 +++++------ .../block/entity/BannerBlockEntity.mapping | 7 ++- .../block/entity/BeehiveBlockEntity.mapping | 21 +++++++ .../block/entity/BlockEntity.mapping | 5 ++ .../net/minecraft/block/entity/Sherds.mapping | 10 ++++ mappings/net/minecraft/class_9283.mapping | 12 ---- mappings/net/minecraft/class_9298.mapping | 6 -- mappings/net/minecraft/class_9307.mapping | 9 --- .../minecraft/client/MinecraftClient.mapping | 2 +- .../client/gui/screen/StatsScreen.mapping | 8 +-- .../gui/screen/ingame/BeaconScreen.mapping | 14 ++--- .../MultiplayerServerListWidget.mapping | 2 +- .../minecraft/client/model/ModelPart.mapping | 26 ++++---- .../client/option/GameOptions.mapping | 2 +- .../client/particle/DamageParticle.mapping | 8 +-- .../particle/FireworksSparkParticle.mapping | 8 +-- .../client/particle/FlameParticle.mapping | 8 +-- .../client/particle/SquidInkParticle.mapping | 8 +-- .../client/particle/SuspendParticle.mapping | 8 +-- .../render/ChunkRenderingDataPreparer.mapping | 26 ++++---- .../render/block/BlockModelRenderer.mapping | 40 ++++++------- .../client/render/chunk/ChunkBuilder.mapping | 2 +- .../entity/model/SkeletonEntityModel.mapping | 2 + .../model/json/JsonUnbakedModel.mapping | 30 +++++----- .../render/model/json/ModelOverride.mapping | 16 ++--- .../render/model/json/ModelVariantMap.mapping | 4 +- .../data/report/BlockListProvider.mapping | 6 ++ .../loottable/LootTableGenerator.mapping | 2 + .../loottable/LootTableProvider.mapping | 2 + .../datafixer/TypeReferences.mapping | 1 + .../net/minecraft/entity/LivingEntity.mapping | 6 ++ .../effect/StatusEffectInstance.mapping | 2 + .../minecraft/entity/mob/BoggedEntity.mapping | 6 ++ .../entity/passive/BeeEntity.mapping | 2 + .../minecraft/inventory/ContainerLock.mapping | 2 + .../item/BlockPredicatesChecker.mapping | 17 ++++++ .../net/minecraft/item/Instrument.mapping | 5 +- mappings/net/minecraft/item/Item.mapping | 10 ++++ mappings/net/minecraft/item/ItemStack.mapping | 32 ++++++++++ mappings/net/minecraft/item/map/MapId.mapping | 3 - .../net/minecraft/item/trim/ArmorTrim.mapping | 14 +++++ .../item/trim/ArmorTrimMaterial.mapping | 2 + .../function/ApplyBonusLootFunction.mapping | 16 ++--- .../network/codec/PacketCodec.mapping | 15 +++++ .../network/codec/PacketCodecs.mapping | 60 +++++++++++++++---- .../net/minecraft/potion/PotionUtil.mapping | 18 ------ .../predicate/BlockPredicate.mapping | 12 ++++ .../net/minecraft/registry/Registries.mapping | 1 + mappings/net/minecraft/util/DyeColor.mapping | 1 + .../net/minecraft/util/StringHelper.mapping | 2 + mappings/net/minecraft/util/Util.mapping | 10 ++++ .../net/minecraft/util/dynamic/Codecs.mapping | 18 ++++++ .../minecraft/util/math/ColorHelper.mapping | 6 ++ .../net/minecraft/util/math/GlobalPos.mapping | 1 + .../world/CommandBlockExecutor.mapping | 2 + 55 files changed, 400 insertions(+), 192 deletions(-) delete mode 100644 mappings/net/minecraft/class_9283.mapping delete mode 100644 mappings/net/minecraft/class_9298.mapping delete mode 100644 mappings/net/minecraft/class_9307.mapping delete mode 100644 mappings/net/minecraft/item/map/MapId.mapping delete mode 100644 mappings/net/minecraft/potion/PotionUtil.mapping 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 ee1560e627..035a884652 100644 --- a/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BannerBlockEntity.mapping @@ -1,11 +1,13 @@ CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity FIELD field_11772 customName Lnet/minecraft/class_2561; - FIELD field_11773 patternListNbt Lnet/minecraft/class_9307; + FIELD field_11773 patternsComponent Lnet/minecraft/class_9307; FIELD field_11774 baseColor Lnet/minecraft/class_1767; FIELD field_31296 MAX_PATTERN_COUNT I FIELD field_31297 PATTERNS_KEY Ljava/lang/String; + FIELD field_49403 patternsComponentWithBase Lnet/minecraft/class_9307; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos + ARG 2 state METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_1767;)V ARG 1 pos ARG 2 state @@ -15,3 +17,6 @@ CLASS net/minecraft/class_2573 net/minecraft/block/entity/BannerBlockEntity METHOD method_10913 readFrom (Lnet/minecraft/class_1799;Lnet/minecraft/class_1767;)V ARG 1 stack ARG 2 baseColor + METHOD method_57565 setPatterns (Lnet/minecraft/class_9307;)V + ARG 1 patternsComponent + METHOD method_57570 getPatterns ()Lnet/minecraft/class_9307; diff --git a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping index 3ca614b32c..9a5480d0d5 100644 --- a/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BeehiveBlockEntity.mapping @@ -52,6 +52,27 @@ CLASS net/minecraft/class_4482 net/minecraft/block/entity/BeehiveBlockEntity METHOD method_35292 addBee (Lnet/minecraft/class_4482$class_9309;)V METHOD method_40019 (Lnet/minecraft/class_4970$class_4971;)Z ARG 0 statex + METHOD method_57580 createBeesData ()Ljava/util/List; CLASS class_4483 Bee FIELD field_20426 ticksInHive I + FIELD field_49410 data Lnet/minecraft/class_4482$class_9309; + METHOD (Lnet/minecraft/class_4482$class_9309;)V + ARG 1 data + METHOD method_57581 canExitHive ()Z + METHOD method_57582 createData ()Lnet/minecraft/class_4482$class_9309; + METHOD method_57583 hasNectar ()Z CLASS class_4484 BeeState + CLASS class_9309 BeeData + FIELD field_49411 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49412 LIST_CODEC Lcom/mojang/serialization/Codec; + FIELD field_49413 PACKET_CODEC Lnet/minecraft/class_9139; + METHOD method_57584 create (I)Lnet/minecraft/class_4482$class_9309; + ARG 0 ticksInHive + METHOD method_57585 tickEntity (ILnet/minecraft/class_4466;)V + ARG 0 ticksInHive + ARG 1 beeEntity + METHOD method_57586 of (Lnet/minecraft/class_1297;)Lnet/minecraft/class_4482$class_9309; + ARG 0 entity + METHOD method_57588 loadEntity (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1297; + ARG 1 world + ARG 2 pos diff --git a/mappings/net/minecraft/block/entity/BlockEntity.mapping b/mappings/net/minecraft/block/entity/BlockEntity.mapping index bb2d05d64a..b003c63e5d 100644 --- a/mappings/net/minecraft/block/entity/BlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/BlockEntity.mapping @@ -226,3 +226,8 @@ CLASS net/minecraft/class_2586 net/minecraft/block/entity/BlockEntity COMMENT COMMENT

This must be called when something changed in a way that COMMENT affects the saved NBT; otherwise, the game might not save the block entity. + METHOD method_57567 addComponents (Lnet/minecraft/class_9323$class_9324;)V + ARG 1 componentMapBuilder + METHOD method_57568 readComponents (Lnet/minecraft/class_9323;)V + ARG 1 components + METHOD method_57590 createComponentMap ()Lnet/minecraft/class_9323; diff --git a/mappings/net/minecraft/block/entity/Sherds.mapping b/mappings/net/minecraft/block/entity/Sherds.mapping index 072cf2475b..fff3b9cb3f 100644 --- a/mappings/net/minecraft/block/entity/Sherds.mapping +++ b/mappings/net/minecraft/block/entity/Sherds.mapping @@ -1,9 +1,19 @@ CLASS net/minecraft/class_8526 net/minecraft/block/entity/Sherds FIELD field_44707 DEFAULT Lnet/minecraft/class_8526; + FIELD field_49414 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49415 PACKET_CODEC Lnet/minecraft/class_9139; + METHOD (Ljava/util/List;)V + ARG 1 sherds + METHOD (Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;)V + ARG 1 back + ARG 2 left + ARG 3 right + ARG 4 front METHOD method_51512 stream ()Ljava/util/List; METHOD method_51513 toNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_2487; ARG 1 nbt METHOD method_51514 getSherd (Ljava/util/List;I)Ljava/util/Optional; + ARG 0 sherds ARG 1 index METHOD method_51516 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_8526; ARG 0 nbt diff --git a/mappings/net/minecraft/class_9283.mapping b/mappings/net/minecraft/class_9283.mapping deleted file mode 100644 index 12a68422d8..0000000000 --- a/mappings/net/minecraft/class_9283.mapping +++ /dev/null @@ -1,12 +0,0 @@ -CLASS net/minecraft/class_9283 - CLASS class_1782 Type - FIELD field_7971 name Ljava/lang/String; - FIELD field_7972 id I - FIELD field_7975 BY_ID Ljava/util/function/IntFunction; - METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - ARG 4 name - METHOD method_7812 getName ()Lnet/minecraft/class_5250; - METHOD method_7813 byId (I)Lnet/minecraft/class_9283$class_1782; - ARG 0 id - METHOD method_7816 getId ()I diff --git a/mappings/net/minecraft/class_9298.mapping b/mappings/net/minecraft/class_9298.mapping deleted file mode 100644 index 70033a6263..0000000000 --- a/mappings/net/minecraft/class_9298.mapping +++ /dev/null @@ -1,6 +0,0 @@ -CLASS net/minecraft/class_9298 - CLASS class_8751 StewEffect - FIELD field_45782 CODEC Lcom/mojang/serialization/Codec; - METHOD method_53247 createStatusEffectInstance ()Lnet/minecraft/class_1293; - METHOD method_53248 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; - ARG 0 instance diff --git a/mappings/net/minecraft/class_9307.mapping b/mappings/net/minecraft/class_9307.mapping deleted file mode 100644 index 0ff6192a77..0000000000 --- a/mappings/net/minecraft/class_9307.mapping +++ /dev/null @@ -1,9 +0,0 @@ -CLASS net/minecraft/class_9307 - CLASS class_3750 Patterns - FIELD field_16548 entries Lcom/google/common/collect/ImmutableList$Builder; - METHOD method_16376 add (Lnet/minecraft/class_6880;Lnet/minecraft/class_1767;)Lnet/minecraft/class_9307$class_3750; - ARG 1 pattern - ARG 2 color - METHOD method_43720 add (Lnet/minecraft/class_5321;Lnet/minecraft/class_1767;)Lnet/minecraft/class_9307$class_3750; - ARG 1 pattern - ARG 2 color diff --git a/mappings/net/minecraft/client/MinecraftClient.mapping b/mappings/net/minecraft/client/MinecraftClient.mapping index 6776d36e6b..0573065dcc 100644 --- a/mappings/net/minecraft/client/MinecraftClient.mapping +++ b/mappings/net/minecraft/client/MinecraftClient.mapping @@ -87,9 +87,9 @@ CLASS net/minecraft/class_310 net/minecraft/client/MinecraftClient FIELD field_1735 fpsCounter I FIELD field_1738 currentFps I FIELD field_1739 networkProxy Ljava/net/Proxy; + FIELD field_1740 DEFAULT_FONT_ID Lnet/minecraft/class_2960; FIELD field_17404 renderTaskQueue Ljava/util/Queue; FIELD field_17405 worldGenProgressTracker Ljava/util/concurrent/atomic/AtomicReference; - FIELD field_1740 DEFAULT_FONT_ID Lnet/minecraft/class_2960; FIELD field_1741 pausedTickDelta F FIELD field_1742 itemRenderer Lnet/minecraft/class_918; FIELD field_1743 skipGameRender Z diff --git a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping index 8a44a7310a..5ebccba10f 100644 --- a/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping +++ b/mappings/net/minecraft/client/gui/screen/StatsScreen.mapping @@ -57,10 +57,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 @@ -72,6 +68,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 8fe593ab3a..cc43a9db1d 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/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/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/entity/model/SkeletonEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/SkeletonEntityModel.mapping index 573df319cd..a6189a8866 100644 --- a/mappings/net/minecraft/client/render/entity/model/SkeletonEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/SkeletonEntityModel.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_606 net/minecraft/client/render/entity/model/SkeletonEntityModel METHOD method_32047 getTexturedModelData ()Lnet/minecraft/class_5607; + METHOD method_57794 addLimbs (Lnet/minecraft/class_5610;)V + ARG 0 data 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/data/report/BlockListProvider.mapping b/mappings/net/minecraft/data/report/BlockListProvider.mapping index 0bc112a434..8cd1a2c08d 100644 --- a/mappings/net/minecraft/data/report/BlockListProvider.mapping +++ b/mappings/net/minecraft/data/report/BlockListProvider.mapping @@ -1,4 +1,10 @@ CLASS net/minecraft/class_2422 net/minecraft/data/report/BlockListProvider FIELD field_40599 output Lnet/minecraft/class_7784; + FIELD field_49660 registryLookupFuture Ljava/util/concurrent/CompletableFuture; METHOD (Lnet/minecraft/class_7784;Ljava/util/concurrent/CompletableFuture;)V ARG 1 output + ARG 2 registryLookupFuture + METHOD method_57952 (Lnet/minecraft/class_6903;Lcom/google/gson/JsonObject;Lnet/minecraft/class_6880$class_6883;)V + ARG 2 entry + METHOD method_57954 (Lnet/minecraft/class_7403;Ljava/nio/file/Path;Lnet/minecraft/class_7225$class_7874;)Ljava/util/concurrent/CompletionStage; + ARG 2 registryLookup diff --git a/mappings/net/minecraft/data/server/loottable/LootTableGenerator.mapping b/mappings/net/minecraft/data/server/loottable/LootTableGenerator.mapping index 0f05723cce..9231dc0dfc 100644 --- a/mappings/net/minecraft/data/server/loottable/LootTableGenerator.mapping +++ b/mappings/net/minecraft/data/server/loottable/LootTableGenerator.mapping @@ -1,2 +1,4 @@ CLASS net/minecraft/class_7791 net/minecraft/data/server/loottable/LootTableGenerator METHOD method_10399 accept (Lnet/minecraft/class_7225$class_7874;Ljava/util/function/BiConsumer;)V + ARG 1 registryLookup + ARG 2 consumer diff --git a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping index ebdcf61051..46c3e13f41 100644 --- a/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping +++ b/mappings/net/minecraft/data/server/loottable/LootTableProvider.mapping @@ -12,6 +12,8 @@ CLASS net/minecraft/class_2438 net/minecraft/data/server/loottable/LootTableProv METHOD method_10407 (Ljava/lang/String;Ljava/lang/String;)V ARG 0 name ARG 1 message + METHOD method_10410 (Lnet/minecraft/class_7225$class_7874;Ljava/util/Map;Ljava/util/Map;Lnet/minecraft/class_2438$class_7790;)V + ARG 3 generator METHOD method_10411 (Lnet/minecraft/class_58;Lnet/minecraft/class_2960;Lnet/minecraft/class_52;)V ARG 1 id ARG 2 table diff --git a/mappings/net/minecraft/datafixer/TypeReferences.mapping b/mappings/net/minecraft/datafixer/TypeReferences.mapping index fe7a795a1d..807cf42c00 100644 --- a/mappings/net/minecraft/datafixer/TypeReferences.mapping +++ b/mappings/net/minecraft/datafixer/TypeReferences.mapping @@ -17,6 +17,7 @@ CLASS net/minecraft/class_1208 net/minecraft/datafixer/TypeReferences FIELD field_45096 SAVED_DATA_STRUCTURE_FEATURE_INDICES Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_45097 SAVED_DATA_SCOREBOARD Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_47727 FLAT_BLOCK_STATE Lcom/mojang/datafixers/DSL$TypeReference; + FIELD field_49205 DATA_COMPONENTS Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_5710 LEVEL Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_5711 RECIPE Lcom/mojang/datafixers/DSL$TypeReference; FIELD field_5712 ITEM_STACK Lcom/mojang/datafixers/DSL$TypeReference; diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 3a172cbab5..b3d23f85de 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -382,6 +382,12 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 health METHOD method_56994 getJumpVelocity (F)F ARG 1 strength + METHOD method_57293 (Lnet/minecraft/class_5131;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V + ARG 1 attribute + ARG 2 modifier + METHOD method_57294 (Lnet/minecraft/class_5131;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V + ARG 1 attribute + ARG 2 modifier METHOD method_5877 getHandItems ()Ljava/lang/Iterable; METHOD method_5973 canTarget (Lnet/minecraft/class_1299;)Z ARG 1 type diff --git a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping index c7690c7d31..913d35200b 100644 --- a/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping +++ b/mappings/net/minecraft/entity/effect/StatusEffectInstance.mapping @@ -10,6 +10,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance FIELD field_48821 CODEC Lcom/mojang/serialization/Codec; FIELD field_49014 MIN_AMPLIFIER I FIELD field_49015 MAX_AMPLIFIER I + FIELD field_49207 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_5889 showIcon Z FIELD field_5890 showParticles Z FIELD field_5892 ambient Z @@ -135,6 +136,7 @@ CLASS net/minecraft/class_1293 net/minecraft/entity/effect/StatusEffectInstance ARG 0 effect CLASS class_9195 Parameters FIELD field_48822 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_49208 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_56669 create (IIZZLjava/util/Optional;Ljava/util/Optional;)Lnet/minecraft/class_1293$class_9195; ARG 0 amplifier ARG 1 duration diff --git a/mappings/net/minecraft/entity/mob/BoggedEntity.mapping b/mappings/net/minecraft/entity/mob/BoggedEntity.mapping index 9ca2a59cf6..8436dda67a 100644 --- a/mappings/net/minecraft/entity/mob/BoggedEntity.mapping +++ b/mappings/net/minecraft/entity/mob/BoggedEntity.mapping @@ -1,4 +1,10 @@ CLASS net/minecraft/class_9254 net/minecraft/entity/mob/BoggedEntity FIELD field_49151 HARD_ATTACK_INTERVAL I FIELD field_49152 REGULAR_ATTACK_INTERVAL I + FIELD field_49240 SHEARED_KEY Ljava/lang/String; + FIELD field_49241 SHEARED Lnet/minecraft/class_2940; METHOD method_57080 createBoggedAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_57308 isSheared ()Z + METHOD method_57309 dropShearedItems ()V + METHOD method_57310 setSheared (Z)V + ARG 1 sheared diff --git a/mappings/net/minecraft/entity/passive/BeeEntity.mapping b/mappings/net/minecraft/entity/passive/BeeEntity.mapping index 344509eb8c..7bb1ff9e0c 100644 --- a/mappings/net/minecraft/entity/passive/BeeEntity.mapping +++ b/mappings/net/minecraft/entity/passive/BeeEntity.mapping @@ -96,6 +96,8 @@ CLASS net/minecraft/class_4466 net/minecraft/entity/passive/BeeEntity METHOD method_35161 getMoveGoalTicks ()I METHOD method_35162 getPossibleHives ()Ljava/util/List; METHOD method_35163 getGoalSelector ()Lnet/minecraft/class_1355; + METHOD method_57301 setHivePos (Lnet/minecraft/class_2338;)V + ARG 1 pos CLASS class_4467 NotAngryGoal METHOD method_21814 canBeeStart ()Z METHOD method_21815 canBeeContinue ()Z diff --git a/mappings/net/minecraft/inventory/ContainerLock.mapping b/mappings/net/minecraft/inventory/ContainerLock.mapping index 979d5bcf74..8a28b342a0 100644 --- a/mappings/net/minecraft/inventory/ContainerLock.mapping +++ b/mappings/net/minecraft/inventory/ContainerLock.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_1273 net/minecraft/inventory/ContainerLock FIELD comp_2371 key Ljava/lang/String; FIELD field_29956 LOCK_KEY Ljava/lang/String; + FIELD field_49206 CODEC Lcom/mojang/serialization/Codec; FIELD field_5817 EMPTY Lnet/minecraft/class_1273; COMMENT An empty container lock that can always be opened. METHOD (Ljava/lang/String;)V @@ -11,6 +12,7 @@ CLASS net/minecraft/class_1273 net/minecraft/inventory/ContainerLock COMMENT

COMMENT An item stack is a valid key if the stack name matches the key string of this lock, COMMENT or if the key string is empty. + ARG 1 stack METHOD method_5473 fromNbt (Lnet/minecraft/class_2487;)Lnet/minecraft/class_1273; COMMENT Creates a new {@code ContainerLock} from the {@code Lock} key of the NBT compound. COMMENT

diff --git a/mappings/net/minecraft/item/BlockPredicatesChecker.mapping b/mappings/net/minecraft/item/BlockPredicatesChecker.mapping index 8d7b13852d..f0b96eb700 100644 --- a/mappings/net/minecraft/item/BlockPredicatesChecker.mapping +++ b/mappings/net/minecraft/item/BlockPredicatesChecker.mapping @@ -11,10 +11,27 @@ CLASS net/minecraft/class_6538 net/minecraft/item/BlockPredicatesChecker FIELD field_34450 cachedPos Lnet/minecraft/class_2694; FIELD field_34451 lastResult Z FIELD field_34452 nbtAware Z + FIELD field_49245 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49246 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49247 CAN_BREAK_TEXT Lnet/minecraft/class_2561; + FIELD field_49248 CAN_PLACE_TEXT Lnet/minecraft/class_2561; + FIELD field_49251 CAN_USE_UNKNOWN_TEXT Lnet/minecraft/class_2561; + FIELD field_49252 predicates Ljava/util/List; + FIELD field_49253 showInTooltip Z + FIELD field_49254 tooltipText Ljava/util/List; + METHOD (Ljava/util/List;Z)V + ARG 1 predicates + ARG 2 showInTooltip METHOD method_38070 check (Lnet/minecraft/class_2694;)Z COMMENT {@return true if any of the predicates in the {@code stack}'s NBT COMMENT matched against the block at {@code pos}, false otherwise} + ARG 1 cachedPos METHOD method_38071 canUseCache (Lnet/minecraft/class_2694;Lnet/minecraft/class_2694;Z)Z ARG 0 pos ARG 1 cachedPos ARG 2 nbtAware + METHOD method_57324 showInTooltip ()Z + METHOD method_57325 (Lnet/minecraft/class_4550;)Ljava/util/stream/Stream; + ARG 0 predicate + METHOD method_57329 getTooltipText (Ljava/util/List;)Ljava/util/List; + ARG 0 blockPredicates diff --git a/mappings/net/minecraft/item/Instrument.mapping b/mappings/net/minecraft/item/Instrument.mapping index af649b87cc..054f4eafee 100644 --- a/mappings/net/minecraft/item/Instrument.mapping +++ b/mappings/net/minecraft/item/Instrument.mapping @@ -1,4 +1,7 @@ CLASS net/minecraft/class_7444 net/minecraft/item/Instrument - FIELD field_39122 CODEC Lcom/mojang/serialization/Codec; + FIELD field_39122 ENTRY_CODEC Lcom/mojang/serialization/Codec; + FIELD field_49260 CODEC Lcom/mojang/serialization/Codec; + FIELD field_49261 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49262 ENTRY_PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_43709 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance diff --git a/mappings/net/minecraft/item/Item.mapping b/mappings/net/minecraft/item/Item.mapping index 6511ead0bd..e742cb9c2d 100644 --- a/mappings/net/minecraft/item/Item.mapping +++ b/mappings/net/minecraft/item/Item.mapping @@ -30,6 +30,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item FIELD field_30889 ITEM_BAR_STEPS I FIELD field_36401 registryEntry Lnet/minecraft/class_6880$class_6883; FIELD field_40209 requiredFeatures Lnet/minecraft/class_7699; + FIELD field_49263 components Lnet/minecraft/class_9323; FIELD field_8001 ATTACK_SPEED_MODIFIER_ID Ljava/util/UUID; FIELD field_8003 BLOCK_ITEMS Ljava/util/Map; FIELD field_8006 ATTACK_DAMAGE_MODIFIER_ID Ljava/util/UUID; @@ -143,6 +144,7 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item ARG 1 stack ARG 2 world ARG 3 player + METHOD method_57347 getComponents ()Lnet/minecraft/class_9323; METHOD method_7836 use (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_1268;)Lnet/minecraft/class_1271; COMMENT Called when the player uses (or starts using) the item. COMMENT The use action, by default, is bound to the right mouse button. @@ -406,6 +408,8 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item FIELD field_18673 foodComponent Lnet/minecraft/class_4174; FIELD field_21980 fireproof Z FIELD field_40210 requiredFeatures Lnet/minecraft/class_7699; + FIELD field_49264 COMPONENT_MAP_INTERNER Lcom/google/common/collect/Interner; + FIELD field_49265 components Lnet/minecraft/class_9323$class_9324; FIELD field_8016 rarity Lnet/minecraft/class_1814; FIELD field_8018 recipeRemainder Lnet/minecraft/class_1792; FIELD field_8019 maxDamage I @@ -422,6 +426,12 @@ CLASS net/minecraft/class_1792 net/minecraft/item/Item COMMENT @return this instance METHOD method_45434 requires ([Lnet/minecraft/class_7696;)Lnet/minecraft/class_1792$class_1793; ARG 1 features + METHOD method_57348 attributeModifiers (Lnet/minecraft/class_9285;)Lnet/minecraft/class_1792$class_1793; + ARG 1 attributeModifiersComponent + METHOD method_57349 component (Lnet/minecraft/class_9331;Ljava/lang/Object;)Lnet/minecraft/class_1792$class_1793; + ARG 1 type + ARG 2 value + METHOD method_57350 getComponents ()Lnet/minecraft/class_9323; METHOD method_7889 maxCount (I)Lnet/minecraft/class_1792$class_1793; COMMENT Sets the maximum stack count of any ItemStack with an Item using this Settings instance. COMMENT diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 73e9069f04..322f33e5e8 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -87,6 +87,9 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack FIELD field_47312 ITEM_CODEC Lcom/mojang/serialization/Codec; FIELD field_48349 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_48350 LIST_PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49266 OPTIONAL_CODEC Lcom/mojang/serialization/Codec; + FIELD field_49267 REGISTRY_ENTRY_CODEC Lcom/mojang/serialization/Codec; + FIELD field_49270 components Lnet/minecraft/class_9335; FIELD field_8030 bobbingAnimationTime I FIELD field_8031 count I FIELD field_8033 LOGGER Lorg/slf4j/Logger; @@ -104,6 +107,10 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack METHOD (Lnet/minecraft/class_1935;I)V ARG 1 item ARG 2 count + METHOD (Lnet/minecraft/class_1935;ILnet/minecraft/class_9335;)V + ARG 1 item + ARG 2 count + ARG 3 components METHOD (Lnet/minecraft/class_6880;)V ARG 1 entry METHOD (Lnet/minecraft/class_6880;I)V @@ -130,6 +137,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT @see #isInFrame COMMENT @see #getFrame COMMENT @see #getHolder + ARG 1 holder METHOD method_31573 isIn (Lnet/minecraft/class_6862;)Z COMMENT {@return whether the item is in {@code tag}} ARG 1 tag @@ -231,6 +239,30 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack COMMENT is a creative mode player. ARG 1 amount ARG 2 entity + METHOD method_57354 applyAttributeModifiers (Lnet/minecraft/class_1304;Ljava/util/function/BiConsumer;)V + ARG 1 slot + ARG 2 attributeModifierConsumer + METHOD method_57355 hashCode (Lnet/minecraft/class_1799;)I + ARG 0 stack + METHOD method_57361 listHashCode (Ljava/util/List;)I + ARG 0 stacks + METHOD method_57363 appendAttributeModifiersTooltip (Ljava/util/function/Consumer;Lnet/minecraft/class_1657;)V + ARG 1 textConsumer + ARG 2 player + METHOD method_57364 appendAttributeModifierTooltip (Ljava/util/function/Consumer;Lnet/minecraft/class_1657;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V + ARG 1 textConsumer + ARG 2 player + ARG 3 attribute + ARG 4 modifier + METHOD method_57369 appendTooltip (Lnet/minecraft/class_9331;Ljava/util/function/Consumer;Lnet/minecraft/class_1836;)V + ARG 1 componentType + ARG 2 textConsumer + ARG 3 context + METHOD method_57370 (Lorg/apache/commons/lang3/mutable/MutableBoolean;Ljava/util/function/Consumer;Lnet/minecraft/class_1304;Lnet/minecraft/class_1657;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V + ARG 5 attribute + ARG 6 modifier + METHOD method_57372 validate (Lnet/minecraft/class_1799;)Lcom/mojang/serialization/DataResult; + 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/map/MapId.mapping b/mappings/net/minecraft/item/map/MapId.mapping deleted file mode 100644 index 18f73977c5..0000000000 --- a/mappings/net/minecraft/item/map/MapId.mapping +++ /dev/null @@ -1,3 +0,0 @@ -CLASS net/minecraft/class_9209 net/minecraft/item/map/MapId - FIELD field_48924 CODEC Lnet/minecraft/class_9139; - METHOD method_56814 asString ()Ljava/lang/String; diff --git a/mappings/net/minecraft/item/trim/ArmorTrim.mapping b/mappings/net/minecraft/item/trim/ArmorTrim.mapping index 81a3e1e2a9..ad98a3d181 100644 --- a/mappings/net/minecraft/item/trim/ArmorTrim.mapping +++ b/mappings/net/minecraft/item/trim/ArmorTrim.mapping @@ -5,9 +5,15 @@ CLASS net/minecraft/class_8053 net/minecraft/item/trim/ArmorTrim FIELD field_41999 pattern Lnet/minecraft/class_6880; FIELD field_42000 leggingsModelIdGetter Ljava/util/function/Function; FIELD field_42001 genericModelIdGetter Ljava/util/function/Function; + FIELD field_49278 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49279 showInTooltip Z METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)V ARG 1 material ARG 2 pattern + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;Z)V + ARG 1 material + ARG 2 pattern + ARG 3 showInTooltip METHOD equals (Ljava/lang/Object;)Z ARG 1 o METHOD method_48424 getPattern ()Lnet/minecraft/class_6880; @@ -21,3 +27,11 @@ CLASS net/minecraft/class_8053 net/minecraft/item/trim/ArmorTrim ARG 1 armorMaterial METHOD method_48577 getMaterialAssetNameFor (Lnet/minecraft/class_6880;)Ljava/lang/String; ARG 1 armorMaterial + METHOD method_57408 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 1 materialName + METHOD method_57411 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960; + ARG 2 materialEntry + METHOD method_57412 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; + ARG 1 materialName + METHOD method_57413 (Lnet/minecraft/class_6880;Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960; + ARG 2 materialEntry diff --git a/mappings/net/minecraft/item/trim/ArmorTrimMaterial.mapping b/mappings/net/minecraft/item/trim/ArmorTrimMaterial.mapping index 993078e5d5..dd1a6fbfb5 100644 --- a/mappings/net/minecraft/item/trim/ArmorTrimMaterial.mapping +++ b/mappings/net/minecraft/item/trim/ArmorTrimMaterial.mapping @@ -1,6 +1,8 @@ CLASS net/minecraft/class_8054 net/minecraft/item/trim/ArmorTrimMaterial FIELD field_42002 CODEC Lcom/mojang/serialization/Codec; FIELD field_42003 ENTRY_CODEC Lcom/mojang/serialization/Codec; + FIELD field_49280 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49281 ENTRY_PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_48437 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; ARG 0 instance METHOD method_48438 of (Ljava/lang/String;Lnet/minecraft/class_1792;FLnet/minecraft/class_2561;Ljava/util/Map;)Lnet/minecraft/class_8054; 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/PacketCodec.mapping b/mappings/net/minecraft/network/codec/PacketCodec.mapping index 23e28f635a..e3a04378a5 100644 --- a/mappings/net/minecraft/network/codec/PacketCodec.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodec.mapping @@ -150,6 +150,21 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec ARG 8 codec5 ARG 9 from5 ARG 10 to + METHOD method_58025 tuple (Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lnet/minecraft/class_9139;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Function6;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for encoding six values} + ARG 0 codec1 + ARG 1 from1 + ARG 2 codec2 + ARG 3 from2 + ARG 4 codec3 + ARG 5 from3 + ARG 6 codec4 + ARG 7 from4 + ARG 8 codec5 + ARG 9 from5 + ARG 10 codec6 + ARG 11 from6 + ARG 12 to CLASS class_9140 ResultFunction METHOD apply (Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; ARG 1 codec diff --git a/mappings/net/minecraft/network/codec/PacketCodecs.mapping b/mappings/net/minecraft/network/codec/PacketCodecs.mapping index d45cdb31c8..2672127544 100644 --- a/mappings/net/minecraft/network/codec/PacketCodecs.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodecs.mapping @@ -77,6 +77,13 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs COMMENT COMMENT @see net.minecraft.network.PacketByteBuf#readByteArray() COMMENT @see net.minecraft.network.PacketByteBuf#writeByteArray(byte[]) + FIELD field_49675 INTEGER Lnet/minecraft/class_9139; + COMMENT A codec for an integer value. + COMMENT + COMMENT @see io.netty.buffer.ByteBuf#readInt + COMMENT @see io.netty.buffer.ByteBuf#writeInt + FIELD field_49678 PROPERTY_MAP Lnet/minecraft/class_9139; + FIELD field_49679 GAME_PROFILE Lnet/minecraft/class_9139; METHOD method_56363 toList ()Lnet/minecraft/class_9139$class_9140; COMMENT Used to make a codec for a list of values using {@link PacketCodec#collect}. COMMENT This creates an {@link java.util.ArrayList}, so the decoded result can be modified. @@ -225,17 +232,31 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs ARG 0 maxLength METHOD method_56896 registryCodec (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 + METHOD method_57986 (ILnet/minecraft/class_9139;)Lnet/minecraft/class_9139; + ARG 1 codec + METHOD method_57989 readCollectionSize (Lio/netty/buffer/ByteBuf;I)I + ARG 0 buf + ARG 1 maxSize + METHOD method_57990 writeCollectionSize (Lio/netty/buffer/ByteBuf;II)V + ARG 0 buf + ARG 1 size + ARG 2 maxSize + METHOD method_57991 collection (Ljava/util/function/IntFunction;Lnet/minecraft/class_9139;I)Lnet/minecraft/class_9139; + ARG 0 factory + ARG 1 elementCodec + ARG 2 maxSize + METHOD method_57992 map (Ljava/util/function/IntFunction;Lnet/minecraft/class_9139;Lnet/minecraft/class_9139;I)Lnet/minecraft/class_9139; + ARG 0 factory + ARG 1 keyCodec + ARG 2 valueCodec + ARG 3 maxSize + METHOD method_57995 either (Lnet/minecraft/class_9139;Lnet/minecraft/class_9139;)Lnet/minecraft/class_9139; + ARG 0 left + ARG 1 right + METHOD method_58000 toList (I)Lnet/minecraft/class_9139$class_9140; + ARG 0 maxLength + METHOD method_58001 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_9139; + ARG 0 registryRef CLASS 10 CLASS 15 METHOD method_56424 getIterable (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359; @@ -244,7 +265,24 @@ CLASS net/minecraft/class_9135 net/minecraft/network/codec/PacketCodecs FIELD field_48562 DIRECT_ENTRY_MARKER I METHOD method_56390 getEntries (Lnet/minecraft/class_9129;)Lnet/minecraft/class_2359; ARG 1 buf + CLASS 18 + FIELD field_49691 NAME_MAX_LENGTH I + FIELD field_49692 VALUE_MAX_LENGTH I + FIELD field_49693 SIGNATURE_MAX_LENGTH I + FIELD field_49694 MAP_MAX_SIZE I + 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 + 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/potion/PotionUtil.mapping b/mappings/net/minecraft/potion/PotionUtil.mapping deleted file mode 100644 index d2a3f09e64..0000000000 --- a/mappings/net/minecraft/potion/PotionUtil.mapping +++ /dev/null @@ -1,18 +0,0 @@ -CLASS net/minecraft/class_1844 net/minecraft/potion/PotionUtil - FIELD comp_2380 getCustomPotionEffects Ljava/util/List; - FIELD field_25817 NONE_TEXT Lnet/minecraft/class_2561; - FIELD field_30946 DEFAULT_COLOR I - METHOD comp_2380 getCustomPotionEffects ()Ljava/util/List; - METHOD method_47372 buildTooltip (Ljava/util/function/Consumer;FF)V - ARG 2 durationMultiplier - ARG 3 tickRate - METHOD method_55762 (Ljava/util/List;Lnet/minecraft/class_6880;Lnet/minecraft/class_1322;)V - ARG 1 attribute - ARG 2 modifier - METHOD method_8055 getColor (Ljava/lang/Iterable;)I - METHOD method_8062 getColor (Lnet/minecraft/class_6880;)I - ARG 0 potion - METHOD method_8064 getColor ()I - METHOD method_8065 buildTooltip (Ljava/lang/Iterable;Ljava/util/function/Consumer;FF)V - ARG 2 durationMultiplier - ARG 3 tickRate diff --git a/mappings/net/minecraft/predicate/BlockPredicate.mapping b/mappings/net/minecraft/predicate/BlockPredicate.mapping index 3b56c6e398..53f6394a04 100644 --- a/mappings/net/minecraft/predicate/BlockPredicate.mapping +++ b/mappings/net/minecraft/predicate/BlockPredicate.mapping @@ -1,8 +1,20 @@ CLASS net/minecraft/class_4550 net/minecraft/predicate/BlockPredicate FIELD comp_1733 state Ljava/util/Optional; FIELD field_45723 CODEC Lcom/mojang/serialization/Codec; + 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_57145 testBlockEntity (Lnet/minecraft/class_4538;Lnet/minecraft/class_2586;Lnet/minecraft/class_2105;)Z + ARG 0 world + ARG 1 blockEntity + ARG 2 nbtPredicate + METHOD method_57146 testState (Lnet/minecraft/class_2680;)Z + ARG 1 state + METHOD method_57147 test (Lnet/minecraft/class_2694;)Z + ARG 1 pos CLASS class_4710 Builder FIELD field_21572 blocks Ljava/util/Optional; FIELD field_21574 state Ljava/util/Optional; diff --git a/mappings/net/minecraft/registry/Registries.mapping b/mappings/net/minecraft/registry/Registries.mapping index 5fc1c8545c..01258b705f 100644 --- a/mappings/net/minecraft/registry/Registries.mapping +++ b/mappings/net/minecraft/registry/Registries.mapping @@ -74,6 +74,7 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries FIELD field_47496 CRITERION Lnet/minecraft/class_2378; FIELD field_47555 NUMBER_FORMAT_TYPE Lnet/minecraft/class_2378; FIELD field_48976 ARMOR_MATERIAL Lnet/minecraft/class_2378; + FIELD field_49658 DATA_COMPONENT_TYPE Lnet/minecraft/class_2378; METHOD method_47450 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry METHOD method_47451 (Lnet/minecraft/class_2378;)Ljava/lang/Object; diff --git a/mappings/net/minecraft/util/DyeColor.mapping b/mappings/net/minecraft/util/DyeColor.mapping index 2b3beb165f..e850340a28 100644 --- a/mappings/net/minecraft/util/DyeColor.mapping +++ b/mappings/net/minecraft/util/DyeColor.mapping @@ -2,6 +2,7 @@ CLASS net/minecraft/class_1767 net/minecraft/util/DyeColor COMMENT An enum representing 16 dye colors. FIELD field_16537 signColor I FIELD field_41600 CODEC Lnet/minecraft/class_3542$class_7292; + FIELD field_49259 PACKET_CODEC Lnet/minecraft/class_9139; FIELD field_7943 colorComponents [F FIELD field_7948 name Ljava/lang/String; FIELD field_7950 BY_FIREWORK_COLOR Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap; diff --git a/mappings/net/minecraft/util/StringHelper.mapping b/mappings/net/minecraft/util/StringHelper.mapping index 92f207032b..73f36f5b5c 100644 --- a/mappings/net/minecraft/util/StringHelper.mapping +++ b/mappings/net/minecraft/util/StringHelper.mapping @@ -40,3 +40,5 @@ CLASS net/minecraft/class_3544 net/minecraft/util/StringHelper COMMENT COMMENT @apiNote This is used when sending chat messages. ARG 0 text + METHOD method_57179 isValidPlayerName (Ljava/lang/String;)Z + ARG 0 name diff --git a/mappings/net/minecraft/util/Util.mapping b/mappings/net/minecraft/util/Util.mapping index e65a1d9199..d0665b53f0 100644 --- a/mappings/net/minecraft/util/Util.mapping +++ b/mappings/net/minecraft/util/Util.mapping @@ -310,6 +310,16 @@ CLASS net/minecraft/class_156 net/minecraft/util/Util ARG 0 predicates METHOD method_56616 anyOf (Ljava/util/List;)Ljava/util/function/Predicate; ARG 0 predicates + METHOD method_57107 registryValueToString (Lnet/minecraft/class_2378;Ljava/lang/Object;)Ljava/lang/String; + ARG 0 registry + ARG 1 value + METHOD method_57108 listWith (Ljava/util/List;Ljava/lang/Object;)Ljava/util/List; + ARG 0 list + ARG 1 valueToAppend + METHOD method_57109 mapWith (Ljava/util/Map;Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/Map; + ARG 0 map + ARG 1 keyToAppend + ARG 2 valueToAppend METHOD method_645 previous (Ljava/lang/Iterable;Ljava/lang/Object;)Ljava/lang/Object; COMMENT {@return the item preceding {@code object} in {@code iterable}} COMMENT diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 2c99ff25ca..e02da0607d 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -34,6 +34,7 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs COMMENT COMMENT @see RuntimeOps FIELD field_49012 UNSIGNED_BYTE Lcom/mojang/serialization/Codec; + FIELD field_49183 PLAYER_NAME Lcom/mojang/serialization/Codec; METHOD method_33817 xor (Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; COMMENT Returns an exclusive-or codec for {@link Either} instances. COMMENT @@ -304,6 +305,14 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs METHOD method_56942 withLifecycle (Lcom/mojang/serialization/Codec;Ljava/util/function/Function;)Lcom/mojang/serialization/Codec; ARG 0 originalCodec ARG 1 lifecycleGetter + METHOD method_57150 list (Lcom/mojang/serialization/Codec;I)Lcom/mojang/serialization/Codec; + ARG 0 codec + ARG 1 maxLength + METHOD method_57153 map (Lcom/mojang/serialization/Codec;I)Lcom/mojang/serialization/Codec; + ARG 0 codec + ARG 1 maxLength + METHOD method_57155 optional (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 codec CLASS 1 METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult; ARG 1 ops @@ -362,6 +371,15 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 3 ops METHOD method_54943 (Lcom/mojang/serialization/MapLike;Ljava/lang/String;Lcom/mojang/serialization/DynamicOps;Ljava/util/function/Function;Lcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; ARG 4 pair + CLASS 8 + METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 1 ops + ARG 2 input + METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; + ARG 2 ops + METHOD method_57171 isEmpty (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Z + ARG 0 ops + ARG 1 input CLASS class_5839 Xor COMMENT An xor codec that only permits exactly one of the two data choices to be COMMENT present. diff --git a/mappings/net/minecraft/util/math/ColorHelper.mapping b/mappings/net/minecraft/util/math/ColorHelper.mapping index bf1e5c1ece..c358ad6e77 100644 --- a/mappings/net/minecraft/util/math/ColorHelper.mapping +++ b/mappings/net/minecraft/util/math/ColorHelper.mapping @@ -36,6 +36,12 @@ CLASS net/minecraft/class_5253 net/minecraft/util/math/ColorHelper ARG 0 delta ARG 1 start ARG 2 end + METHOD method_57173 getArgb (III)I + ARG 0 red + ARG 1 green + ARG 2 blue + METHOD method_57174 fullAlpha (I)I + ARG 0 argb CLASS class_8045 Abgr METHOD method_48342 getAlpha (I)I ARG 0 abgr diff --git a/mappings/net/minecraft/util/math/GlobalPos.mapping b/mappings/net/minecraft/util/math/GlobalPos.mapping index 5150a6d144..00aa21a392 100644 --- a/mappings/net/minecraft/util/math/GlobalPos.mapping +++ b/mappings/net/minecraft/util/math/GlobalPos.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_4208 net/minecraft/util/math/GlobalPos FIELD field_25066 CODEC Lcom/mojang/serialization/Codec; FIELD field_48451 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_49583 MAP_CODEC Lcom/mojang/serialization/MapCodec; METHOD (Lnet/minecraft/class_5321;Lnet/minecraft/class_2338;)V ARG 1 dimension ARG 2 pos diff --git a/mappings/net/minecraft/world/CommandBlockExecutor.mapping b/mappings/net/minecraft/world/CommandBlockExecutor.mapping index 0003d6b5d9..96d8cb63a1 100644 --- a/mappings/net/minecraft/world/CommandBlockExecutor.mapping +++ b/mappings/net/minecraft/world/CommandBlockExecutor.mapping @@ -13,6 +13,7 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor FIELD field_9168 command Ljava/lang/String; FIELD field_9169 DATE_FORMAT Ljava/text/SimpleDateFormat; METHOD method_52175 isEditable ()Z + METHOD method_57558 getCustomNameNullable ()Lnet/minecraft/class_2561; METHOD method_8286 setCommand (Ljava/lang/String;)V ARG 1 command METHOD method_8287 setTrackOutput (Z)V @@ -21,6 +22,7 @@ CLASS net/minecraft/class_1918 net/minecraft/world/CommandBlockExecutor ARG 1 player METHOD method_8289 getCommand ()Ljava/lang/String; METHOD method_8290 setCustomName (Lnet/minecraft/class_2561;)V + ARG 1 customName METHOD method_8291 setLastOutput (Lnet/minecraft/class_2561;)V ARG 1 lastOutput METHOD method_8292 getLastOutput ()Lnet/minecraft/class_2561;