From 350f3619b93f553c8d8d9b425be7364554b297d2 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 16 Jan 2025 05:45:57 +1100 Subject: [PATCH 1/2] 25w03a stuff Still lots of stuff to do, mainly with gametest stuff, but here's what I've got so far --- mappings/net/minecraft/block/Block.mapping | 1 + .../net/minecraft/block/TestBlock.mapping | 9 +++ .../minecraft/block/TestInstanceBlock.mapping | 2 + .../entity/BeamEmitter.mapping} | 2 +- .../block/entity/ComponentsAccess.mapping | 2 + .../block/entity/TestBlockEntity.mapping | 20 ++++++ .../entity/TestInstanceBlockEntity.mapping | 58 ++++++++++++++++ .../block/enums/TestBlockMode.mapping | 17 +++++ .../gui/screen/ingame/TestBlockScreen.mapping | 18 +++++ .../ingame/TestInstanceBlockScreen.mapping | 31 +++++++++ .../TestInstanceBlockEntityRenderer.mapping | 5 ++ .../AbstractDonkeyEntityRenderer.mapping | 15 ++++ .../render/entity/CamelEntityRenderer.mapping | 2 + .../feature/SaddleFeatureRenderer.mapping | 19 ++++++ .../entity/model/CamelEntityModel.mapping | 1 + .../model/CamelSaddleEntityModel.mapping | 6 ++ .../entity/model/DonkeyEntityModel.mapping | 6 ++ .../entity/model/EntityModelLayers.mapping | 12 ++++ .../model/HorseSaddleEntityModel.mapping | 13 ++++ .../entity/model/ModelTransformer.mapping | 9 +++ .../state/CamelEntityRenderState.mapping | 1 + .../property/select/ComponentProperty.mapping | 12 ++++ .../property/select/SelectProperty.mapping | 6 ++ .../component/DataComponentTypes.mapping | 63 +++++++++++++++++ .../type/EquippableComponent.mapping | 9 +++ .../net/minecraft/datafixer/FixUtil.mapping | 2 + ...EntityFallDistanceFloatToDoubleFix.mapping | 4 ++ .../datafixer/fix/EquipmentFormatFix.mapping | 3 + .../ItemVariantComponentizationFix.mapping | 13 ++++ .../fix/SaddleEquipmentSlotFix.mapping | 13 ++++ .../datafixer/schema/Schema4300.mapping | 1 + .../datafixer/schema/Schema4301.mapping | 1 + .../datafixer/schema/Schema4302.mapping | 1 + mappings/net/minecraft/entity/Entity.mapping | 21 ++++++ .../minecraft/entity/EntityEquipment.mapping | 15 ++++ .../net/minecraft/entity/LivingEntity.mapping | 16 +++++ .../decoration/ArmorStandEntity.mapping | 4 ++ .../painting/PaintingEntity.mapping | 1 + .../minecraft/entity/mob/MobEntity.mapping | 4 ++ .../entity/passive/AxolotlEntity.mapping | 20 +++--- .../entity/passive/CatEntity.mapping | 3 + .../entity/passive/CatVariant.mapping | 1 + .../entity/passive/FoxEntity.mapping | 28 ++++---- .../entity/passive/FrogEntity.mapping | 3 + .../entity/passive/FrogVariant.mapping | 1 + .../entity/passive/HorseColor.mapping | 17 ++--- .../entity/passive/HorseEntity.mapping | 3 + .../entity/passive/HorseMarking.mapping | 8 +-- .../entity/passive/LlamaEntity.mapping | 18 +++-- .../entity/passive/MooshroomEntity.mapping | 17 ++++- .../entity/passive/ParrotEntity.mapping | 4 ++ .../entity/passive/PigEntity.mapping | 3 + .../entity/passive/RabbitEntity.mapping | 30 ++++---- .../entity/passive/SalmonEntity.mapping | 4 ++ .../entity/passive/TropicalFishEntity.mapping | 17 +++-- .../entity/passive/WolfEntity.mapping | 6 ++ .../entity/player/PlayerEntity.mapping | 4 ++ mappings/net/minecraft/item/ItemStack.mapping | 3 + mappings/net/minecraft/item/Items.mapping | 2 + .../network/codec/PacketCodec.mapping | 21 ++++++ .../listener/ClientPlayPacketListener.mapping | 2 + .../listener/ServerPlayPacketListener.mapping | 4 ++ .../c2s/play/SetTestBlockC2SPacket.mapping | 2 + .../TestInstanceBlockActionC2SPacket.mapping | 15 ++++ .../TestInstanceBlockStatusS2CPacket.mapping | 2 + .../predicate/ComponentPredicate.mapping | 5 ++ .../predicate/entity/EntityPredicate.mapping | 3 + .../net/minecraft/registry/Registries.mapping | 5 ++ .../state/property/Properties.mapping | 2 + .../test/BlockBasedTestInstance.mapping | 13 ++++ .../test/FunctionTestInstance.mapping | 9 +++ mappings/net/minecraft/test/TestData.mapping | 19 ++++++ .../test/TestEnvironmentDefinition.mapping | 68 +++++++++++++++++++ .../minecraft/test/TestEnvironments.mapping | 6 ++ .../net/minecraft/test/TestFunctions.mapping | 5 ++ .../net/minecraft/test/TestInstance.mapping | 37 ++++++++++ .../net/minecraft/test/TestInstances.mapping | 5 ++ .../net/minecraft/util/BlockRotation.mapping | 8 +++ .../util/function/ValueLists.mapping | 12 ++-- .../net/minecraft/util/math/Vec3i.mapping | 1 + .../village/VillagerProfession.mapping | 29 +++++++- .../minecraft/village/VillagerType.mapping | 8 +++ .../net/minecraft/world/GameRules.mapping | 11 +++ 83 files changed, 852 insertions(+), 70 deletions(-) create mode 100644 mappings/net/minecraft/block/TestBlock.mapping create mode 100644 mappings/net/minecraft/block/TestInstanceBlock.mapping rename mappings/net/minecraft/{class_10633.mapping => block/entity/BeamEmitter.mapping} (80%) create mode 100644 mappings/net/minecraft/block/entity/TestBlockEntity.mapping create mode 100644 mappings/net/minecraft/block/entity/TestInstanceBlockEntity.mapping create mode 100644 mappings/net/minecraft/block/enums/TestBlockMode.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/ingame/TestBlockScreen.mapping create mode 100644 mappings/net/minecraft/client/gui/screen/ingame/TestInstanceBlockScreen.mapping create mode 100644 mappings/net/minecraft/client/render/block/entity/TestInstanceBlockEntityRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/feature/SaddleFeatureRenderer.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/CamelSaddleEntityModel.mapping create mode 100644 mappings/net/minecraft/client/render/entity/model/HorseSaddleEntityModel.mapping create mode 100644 mappings/net/minecraft/client/render/item/property/select/ComponentProperty.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/EntityFallDistanceFloatToDoubleFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/EquipmentFormatFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/ItemVariantComponentizationFix.mapping create mode 100644 mappings/net/minecraft/datafixer/fix/SaddleEquipmentSlotFix.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/Schema4300.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/Schema4301.mapping create mode 100644 mappings/net/minecraft/datafixer/schema/Schema4302.mapping create mode 100644 mappings/net/minecraft/entity/EntityEquipment.mapping create mode 100644 mappings/net/minecraft/network/packet/c2s/play/SetTestBlockC2SPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/c2s/play/TestInstanceBlockActionC2SPacket.mapping create mode 100644 mappings/net/minecraft/network/packet/s2c/play/TestInstanceBlockStatusS2CPacket.mapping create mode 100644 mappings/net/minecraft/test/BlockBasedTestInstance.mapping create mode 100644 mappings/net/minecraft/test/FunctionTestInstance.mapping create mode 100644 mappings/net/minecraft/test/TestData.mapping create mode 100644 mappings/net/minecraft/test/TestEnvironmentDefinition.mapping create mode 100644 mappings/net/minecraft/test/TestEnvironments.mapping create mode 100644 mappings/net/minecraft/test/TestFunctions.mapping create mode 100644 mappings/net/minecraft/test/TestInstance.mapping create mode 100644 mappings/net/minecraft/test/TestInstances.mapping diff --git a/mappings/net/minecraft/block/Block.mapping b/mappings/net/minecraft/block/Block.mapping index e48d449292..9fdd105adf 100644 --- a/mappings/net/minecraft/block/Block.mapping +++ b/mappings/net/minecraft/block/Block.mapping @@ -269,6 +269,7 @@ CLASS net/minecraft/class_2248 net/minecraft/block/Block ARG 2 state ARG 3 pos ARG 4 entity + ARG 5 fallDistance METHOD method_9556 afterBreak (Lnet/minecraft/class_1937;Lnet/minecraft/class_1657;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;Lnet/minecraft/class_2586;Lnet/minecraft/class_1799;)V COMMENT Called server-side when the block is broken by the player using correct tool. COMMENT This is called after {@link #onBroken} but has the tool requirement. diff --git a/mappings/net/minecraft/block/TestBlock.mapping b/mappings/net/minecraft/block/TestBlock.mapping new file mode 100644 index 0000000000..db5d240e8e --- /dev/null +++ b/mappings/net/minecraft/block/TestBlock.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_10631 net/minecraft/block/TestBlock + FIELD field_55989 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_55990 MODE Lnet/minecraft/class_2754; + METHOD method_66711 applyBlockStateToStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_10641;)Lnet/minecraft/class_1799; + ARG 0 stack + ARG 1 mode + METHOD method_66712 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_10637; + ARG 0 world + ARG 1 pos diff --git a/mappings/net/minecraft/block/TestInstanceBlock.mapping b/mappings/net/minecraft/block/TestInstanceBlock.mapping new file mode 100644 index 0000000000..e3ca989d9d --- /dev/null +++ b/mappings/net/minecraft/block/TestInstanceBlock.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_10632 net/minecraft/block/TestInstanceBlock + FIELD field_55991 CODEC Lcom/mojang/serialization/MapCodec; diff --git a/mappings/net/minecraft/class_10633.mapping b/mappings/net/minecraft/block/entity/BeamEmitter.mapping similarity index 80% rename from mappings/net/minecraft/class_10633.mapping rename to mappings/net/minecraft/block/entity/BeamEmitter.mapping index c336d45c6f..a01a3f2962 100644 --- a/mappings/net/minecraft/class_10633.mapping +++ b/mappings/net/minecraft/block/entity/BeamEmitter.mapping @@ -1,4 +1,4 @@ -CLASS net/minecraft/class_10633 +CLASS net/minecraft/class_10633 net/minecraft/block/entity/BeamEmitter METHOD method_10937 getBeamSegments ()Ljava/util/List; CLASS class_2581 BeamSegment FIELD field_11804 height I diff --git a/mappings/net/minecraft/block/entity/ComponentsAccess.mapping b/mappings/net/minecraft/block/entity/ComponentsAccess.mapping index 6fd988dca4..4248e69d0b 100644 --- a/mappings/net/minecraft/block/entity/ComponentsAccess.mapping +++ b/mappings/net/minecraft/block/entity/ComponentsAccess.mapping @@ -4,3 +4,5 @@ CLASS net/minecraft/class_9473 net/minecraft/block/entity/ComponentsAccess METHOD method_58695 getOrDefault (Lnet/minecraft/class_9331;Ljava/lang/Object;)Ljava/lang/Object; ARG 1 type ARG 2 fallback + METHOD method_66876 getTyped (Lnet/minecraft/class_9331;)Lnet/minecraft/class_9336; + ARG 1 type diff --git a/mappings/net/minecraft/block/entity/TestBlockEntity.mapping b/mappings/net/minecraft/block/entity/TestBlockEntity.mapping new file mode 100644 index 0000000000..ba08835f82 --- /dev/null +++ b/mappings/net/minecraft/block/entity/TestBlockEntity.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_10637 net/minecraft/block/entity/TestBlockEntity + FIELD field_55998 LOGGER Lorg/slf4j/Logger; + FIELD field_55999 mode Lnet/minecraft/class_10641; + FIELD field_56000 message Ljava/lang/String; + FIELD field_56001 powered Z + METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 pos + ARG 2 state + METHOD method_66719 setMode (Lnet/minecraft/class_10641;)V + ARG 1 mode + METHOD method_66720 setMessage (Ljava/lang/String;)V + ARG 1 message + METHOD method_66721 setPowered (Z)V + ARG 1 powered + METHOD method_66722 isPowered ()Z + METHOD method_66723 getMode ()Lnet/minecraft/class_10641; + METHOD method_66726 logMessage ()V + METHOD method_66728 getMessage ()Ljava/lang/String; + METHOD method_66729 update ()V + METHOD method_66730 getBlock ()Lnet/minecraft/class_2248; diff --git a/mappings/net/minecraft/block/entity/TestInstanceBlockEntity.mapping b/mappings/net/minecraft/block/entity/TestInstanceBlockEntity.mapping new file mode 100644 index 0000000000..c17ccf5c3a --- /dev/null +++ b/mappings/net/minecraft/block/entity/TestInstanceBlockEntity.mapping @@ -0,0 +1,58 @@ +CLASS net/minecraft/class_10638 net/minecraft/block/entity/TestInstanceBlockEntity + FIELD field_56003 INVALID_TEST_TEXT Lnet/minecraft/class_2561; + FIELD field_56004 CLEARED_BEAM_SEGMENTS Ljava/util/List; + FIELD field_56005 RUNNING_BEAM_SEGMENTS Ljava/util/List; + FIELD field_56006 SUCCESS_BEAM_SEGMENTS Ljava/util/List; + FIELD field_56007 REQUIRED_FAIL_BEAM_SEGMENTS Ljava/util/List; + FIELD field_56008 OPTIONAL_FAIL_BEAM_SEGMENTS Ljava/util/List; + FIELD field_56010 data Lnet/minecraft/class_10638$class_10639; + METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V + ARG 1 pos + ARG 2 state + METHOD method_66735 getTestEntry ()Ljava/util/Optional; + METHOD method_66739 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2561; + ARG 0 key + METHOD method_66745 setData (Lnet/minecraft/class_10638$class_10639;)V + ARG 1 data + METHOD method_66748 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ZLjava/util/function/Consumer;Lnet/minecraft/class_2338;)V + ARG 4 pos + METHOD method_66750 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V + ARG 1 dataNbt + METHOD method_66751 setErrorMessage (Lnet/minecraft/class_2561;)V + ARG 1 errorMessage + METHOD method_66761 (Ljava/util/function/Consumer;)V + ARG 1 posConsumer + METHOD method_66763 getTestKey ()Ljava/util/Optional; + METHOD method_66764 getTestName ()Lnet/minecraft/class_2561; + METHOD method_66765 shouldIgnoreEntities ()Z + METHOD method_66766 getSize ()Lnet/minecraft/class_2382; + METHOD method_66767 getRotation ()Lnet/minecraft/class_2470; + METHOD method_66768 getErrorMessage ()Ljava/util/Optional; + METHOD method_66769 setFinished ()V + METHOD method_66770 setRunning ()V + CLASS class_10639 Data + FIELD field_56012 CODEC Lcom/mojang/serialization/Codec; + FIELD field_56013 PACKET_CODEC Lnet/minecraft/class_9139; + METHOD method_66773 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_66774 withStatus (Lnet/minecraft/class_10638$class_10640;)Lnet/minecraft/class_10638$class_10639; + ARG 1 status + METHOD method_66775 withSize (Lnet/minecraft/class_2382;)Lnet/minecraft/class_10638$class_10639; + ARG 1 size + METHOD method_66776 withErrorMessage (Lnet/minecraft/class_2561;)Lnet/minecraft/class_10638$class_10639; + ARG 1 errorMessage + CLASS class_10640 Status + FIELD field_56017 CODEC Lcom/mojang/serialization/Codec; + FIELD field_56018 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_56019 INDEX_MAPPER Ljava/util/function/IntFunction; + FIELD field_56020 id Ljava/lang/String; + FIELD field_56021 index I + METHOD (Ljava/lang/String;ILjava/lang/String;I)V + ARG 3 id + ARG 4 index + METHOD method_66778 fromIndex (I)Lnet/minecraft/class_10638$class_10640; + ARG 0 index + METHOD method_66779 (Lnet/minecraft/class_10638$class_10640;)I + ARG 0 status + METHOD method_66780 (Lnet/minecraft/class_10638$class_10640;)I + ARG 0 status diff --git a/mappings/net/minecraft/block/enums/TestBlockMode.mapping b/mappings/net/minecraft/block/enums/TestBlockMode.mapping new file mode 100644 index 0000000000..7957b5847f --- /dev/null +++ b/mappings/net/minecraft/block/enums/TestBlockMode.mapping @@ -0,0 +1,17 @@ +CLASS net/minecraft/class_10641 net/minecraft/block/enums/TestBlockMode + FIELD field_56028 CODEC Lnet/minecraft/class_3542$class_7292; + FIELD field_56029 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_56030 INDEX_MAPPER Ljava/util/function/IntFunction; + FIELD field_56031 index I + FIELD field_56032 id Ljava/lang/String; + FIELD field_56033 name Lnet/minecraft/class_2561; + FIELD field_56034 info Lnet/minecraft/class_2561; + METHOD (Ljava/lang/String;IILjava/lang/String;)V + ARG 3 index + ARG 4 id + METHOD method_66781 getName ()Lnet/minecraft/class_2561; + METHOD method_66782 (Lnet/minecraft/class_10641;)I + ARG 0 mode + METHOD method_66783 getInfo ()Lnet/minecraft/class_2561; + METHOD method_66784 (Lnet/minecraft/class_10641;)I + ARG 0 mode diff --git a/mappings/net/minecraft/client/gui/screen/ingame/TestBlockScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/TestBlockScreen.mapping new file mode 100644 index 0000000000..e197fa03f2 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/ingame/TestBlockScreen.mapping @@ -0,0 +1,18 @@ +CLASS net/minecraft/class_10642 net/minecraft/client/gui/screen/ingame/TestBlockScreen + FIELD field_56036 MODES Ljava/util/List; + FIELD field_56037 TITLE_TEXT Lnet/minecraft/class_2561; + FIELD field_56038 MESSAGE_TEXT Lnet/minecraft/class_2561; + FIELD field_56039 pos Lnet/minecraft/class_2338; + FIELD field_56040 mode Lnet/minecraft/class_10641; + FIELD field_56041 message Ljava/lang/String; + FIELD field_56042 textField Lnet/minecraft/class_342; + METHOD (Lnet/minecraft/class_10637;)V + ARG 1 blockEntity + METHOD method_66792 onCancel ()V + METHOD method_66793 setMode (Lnet/minecraft/class_10641;)V + ARG 1 mode + METHOD method_66794 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_66796 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_66797 onDone ()V diff --git a/mappings/net/minecraft/client/gui/screen/ingame/TestInstanceBlockScreen.mapping b/mappings/net/minecraft/client/gui/screen/ingame/TestInstanceBlockScreen.mapping new file mode 100644 index 0000000000..ed916e0004 --- /dev/null +++ b/mappings/net/minecraft/client/gui/screen/ingame/TestInstanceBlockScreen.mapping @@ -0,0 +1,31 @@ +CLASS net/minecraft/class_10643 net/minecraft/client/gui/screen/ingame/TestInstanceBlockScreen + FIELD field_56044 saveButton Lnet/minecraft/class_4185; + FIELD field_56045 exportButton Lnet/minecraft/class_4185; + FIELD field_56046 entitiesButton Lnet/minecraft/class_5676; + FIELD field_56047 rotationButton Lnet/minecraft/class_5676; + FIELD field_56048 TEST_ID_TEXT Lnet/minecraft/class_2561; + FIELD field_56049 SIZE_TEXT Lnet/minecraft/class_2561; + FIELD field_56050 ENTITIES_TEXT Lnet/minecraft/class_2561; + FIELD field_56051 ROTATION_TEXT Lnet/minecraft/class_2561; + FIELD field_56054 testInstanceBlockEntity Lnet/minecraft/class_10638; + FIELD field_56055 testIdTextField Lnet/minecraft/class_342; + METHOD (Lnet/minecraft/class_10638;)V + ARG 1 testInstanceBlockEntity + METHOD method_66802 executeAction (Lnet/minecraft/class_10616$class_10617;)Z + ARG 1 action + METHOD method_66803 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; + ARG 0 testId + METHOD method_66804 rotationAsText (Lnet/minecraft/class_2470;)Lnet/minecraft/class_2561; + ARG 0 rotation + METHOD method_66805 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_66812 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_66814 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_66816 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_66817 (Lnet/minecraft/class_4185;)V + ARG 1 button + METHOD method_66818 (Lnet/minecraft/class_4185;)V + ARG 1 button diff --git a/mappings/net/minecraft/client/render/block/entity/TestInstanceBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/TestInstanceBlockEntityRenderer.mapping new file mode 100644 index 0000000000..6b664b7711 --- /dev/null +++ b/mappings/net/minecraft/client/render/block/entity/TestInstanceBlockEntityRenderer.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_10649 net/minecraft/client/render/block/entity/TestInstanceBlockEntityRenderer + FIELD field_56093 beaconBlockEntityRenderer Lnet/minecraft/class_822; + FIELD field_56094 structureBlockBlockEntityRenderer Lnet/minecraft/class_838; + METHOD (Lnet/minecraft/class_5614$class_5615;)V + ARG 1 context diff --git a/mappings/net/minecraft/client/render/entity/AbstractDonkeyEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/AbstractDonkeyEntityRenderer.mapping index 4956e5140c..bd373d5f44 100644 --- a/mappings/net/minecraft/client/render/entity/AbstractDonkeyEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/AbstractDonkeyEntityRenderer.mapping @@ -2,3 +2,18 @@ CLASS net/minecraft/class_9991 net/minecraft/client/render/entity/AbstractDonkey FIELD field_53186 texture Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_5617$class_5618;Lnet/minecraft/class_9991$class_10650;)V ARG 1 context + ARG 2 type + CLASS class_10650 Type + FIELD field_56097 texture Lnet/minecraft/class_2960; + FIELD field_56098 adultModelLayer Lnet/minecraft/class_5601; + FIELD field_56099 babyModelLayer Lnet/minecraft/class_5601; + FIELD field_56100 saddleLayerType Lnet/minecraft/class_10186$class_10190; + FIELD field_56101 adultSaddleModelLayer Lnet/minecraft/class_5601; + FIELD field_56102 babySaddleModelLayer Lnet/minecraft/class_5601; + METHOD (Ljava/lang/String;ILnet/minecraft/class_2960;Lnet/minecraft/class_5601;Lnet/minecraft/class_5601;Lnet/minecraft/class_10186$class_10190;Lnet/minecraft/class_5601;Lnet/minecraft/class_5601;)V + ARG 3 texture + ARG 4 adultModelLayer + ARG 5 babyModelLayer + ARG 6 saddleLayerType + ARG 7 adultSaddleModelLayer + ARG 8 babySaddleModelLayer diff --git a/mappings/net/minecraft/client/render/entity/CamelEntityRenderer.mapping b/mappings/net/minecraft/client/render/entity/CamelEntityRenderer.mapping index bad4b84d43..b39834d76c 100644 --- a/mappings/net/minecraft/client/render/entity/CamelEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/CamelEntityRenderer.mapping @@ -2,3 +2,5 @@ CLASS net/minecraft/class_7763 net/minecraft/client/render/entity/CamelEntityRen FIELD field_40529 TEXTURE Lnet/minecraft/class_2960; METHOD (Lnet/minecraft/class_5617$class_5618;)V ARG 1 ctx + METHOD method_66847 (Lnet/minecraft/class_10007;)Lnet/minecraft/class_1799; + ARG 0 state diff --git a/mappings/net/minecraft/client/render/entity/feature/SaddleFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/SaddleFeatureRenderer.mapping new file mode 100644 index 0000000000..898d032f0f --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/feature/SaddleFeatureRenderer.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_10652 net/minecraft/client/render/entity/feature/SaddleFeatureRenderer + FIELD field_56113 equipmentRenderer Lnet/minecraft/class_10197; + FIELD field_56114 layerType Lnet/minecraft/class_10186$class_10190; + FIELD field_56115 saddleStackGetter Ljava/util/function/Function; + FIELD field_56116 adultModel Lnet/minecraft/class_583; + FIELD field_56117 babyModel Lnet/minecraft/class_583; + METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_10197;Lnet/minecraft/class_10186$class_10190;Ljava/util/function/Function;Lnet/minecraft/class_583;Lnet/minecraft/class_583;)V + ARG 1 context + ARG 2 equipmentRenderer + ARG 3 layerType + ARG 4 saddleStackGetter + ARG 5 adultModel + ARG 6 babyModel + METHOD (Lnet/minecraft/class_3883;Lnet/minecraft/class_10197;Lnet/minecraft/class_583;Lnet/minecraft/class_10186$class_10190;Ljava/util/function/Function;)V + ARG 1 context + ARG 2 equipmentRenderer + ARG 3 model + ARG 4 layerType + ARG 5 saddleStackGetter diff --git a/mappings/net/minecraft/client/render/entity/model/CamelEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/CamelEntityModel.mapping index f7d17038bf..8626ea0461 100644 --- a/mappings/net/minecraft/client/render/entity/model/CamelEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/CamelEntityModel.mapping @@ -8,3 +8,4 @@ CLASS net/minecraft/class_7751 net/minecraft/client/render/entity/model/CamelEnt ARG 2 headYaw ARG 3 headPitch METHOD method_45707 getTexturedModelData ()Lnet/minecraft/class_5607; + METHOD method_66836 getModelData ()Lnet/minecraft/class_5609; diff --git a/mappings/net/minecraft/client/render/entity/model/CamelSaddleEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/CamelSaddleEntityModel.mapping new file mode 100644 index 0000000000..9ad626245d --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/CamelSaddleEntityModel.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_10647 net/minecraft/client/render/entity/model/CamelSaddleEntityModel + FIELD field_56066 SADDLE Ljava/lang/String; + FIELD field_56067 BRIDLE Ljava/lang/String; + FIELD field_56068 REINS Ljava/lang/String; + FIELD field_56069 reins Lnet/minecraft/class_630; + METHOD method_66837 getTexturedModelData ()Lnet/minecraft/class_5607; diff --git a/mappings/net/minecraft/client/render/entity/model/DonkeyEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/DonkeyEntityModel.mapping index 43956f7c0a..f338344624 100644 --- a/mappings/net/minecraft/client/render/entity/model/DonkeyEntityModel.mapping +++ b/mappings/net/minecraft/client/render/entity/model/DonkeyEntityModel.mapping @@ -1,9 +1,15 @@ CLASS net/minecraft/class_9945 net/minecraft/client/render/entity/model/DonkeyEntityModel FIELD field_52895 leftChest Lnet/minecraft/class_630; FIELD field_52896 rightChest Lnet/minecraft/class_630; + FIELD field_56070 DONKEY_PARTS_ADDER Lnet/minecraft/class_9953; METHOD method_62077 addDonkeyParts (Lnet/minecraft/class_5610;)V ARG 0 root METHOD method_62079 getTexturedModelData (F)Lnet/minecraft/class_5607; ARG 0 scale METHOD method_62080 getBabyTexturedModelData (F)Lnet/minecraft/class_5607; ARG 0 scale + METHOD method_66838 getSaddleTexturedModelData (FZ)Lnet/minecraft/class_5607; + ARG 0 scale + ARG 1 baby + METHOD method_66839 (Lnet/minecraft/class_5609;)Lnet/minecraft/class_5609; + ARG 0 data diff --git a/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping b/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping index 8dde3dd776..068ab91533 100644 --- a/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping +++ b/mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping @@ -71,6 +71,18 @@ CLASS net/minecraft/class_5602 net/minecraft/client/render/entity/model/EntityMo FIELD field_55120 STRIDER_BABY_SADDLE Lnet/minecraft/class_5601; FIELD field_55122 STANDING_BANNER_FLAG Lnet/minecraft/class_5601; FIELD field_55124 WALL_BANNER_FLAG Lnet/minecraft/class_5601; + FIELD field_56079 CAMEL_SADDLE Lnet/minecraft/class_5601; + FIELD field_56080 CAMEL_BABY_SADDLE Lnet/minecraft/class_5601; + FIELD field_56081 DONKEY_SADDLE Lnet/minecraft/class_5601; + FIELD field_56082 DONKEY_BABY_SADDLE Lnet/minecraft/class_5601; + FIELD field_56083 MULE_SADDLE Lnet/minecraft/class_5601; + FIELD field_56084 MULE_BABY_SADDLE Lnet/minecraft/class_5601; + FIELD field_56085 HORSE_SADDLE Lnet/minecraft/class_5601; + FIELD field_56086 HORSE_BABY_SADDLE Lnet/minecraft/class_5601; + FIELD field_56087 SKELETON_HORSE_SADDLE Lnet/minecraft/class_5601; + FIELD field_56088 SKELETON_HORSE_BABY_SADDLE Lnet/minecraft/class_5601; + FIELD field_56089 ZOMBIE_HORSE_SADDLE Lnet/minecraft/class_5601; + FIELD field_56090 ZOMBIE_HORSE_BABY_SADDLE Lnet/minecraft/class_5601; METHOD method_32076 getLayers ()Ljava/util/stream/Stream; METHOD method_32079 registerMain (Ljava/lang/String;)Lnet/minecraft/class_5601; ARG 0 id diff --git a/mappings/net/minecraft/client/render/entity/model/HorseSaddleEntityModel.mapping b/mappings/net/minecraft/client/render/entity/model/HorseSaddleEntityModel.mapping new file mode 100644 index 0000000000..e99842ba50 --- /dev/null +++ b/mappings/net/minecraft/client/render/entity/model/HorseSaddleEntityModel.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_10648 net/minecraft/client/render/entity/model/HorseSaddleEntityModel + FIELD field_56071 SADDLE Ljava/lang/String; + FIELD field_56072 LEFT_SADDLE_MOUTH Ljava/lang/String; + FIELD field_56073 LEFT_SADDLE_LINE Ljava/lang/String; + FIELD field_56074 RIGHT_SADDLE_MOUTH Ljava/lang/String; + FIELD field_56075 RIGHT_SADDLE_LINE Ljava/lang/String; + FIELD field_56076 HEAD_SADDLE Ljava/lang/String; + FIELD field_56077 MOUTH_SADDLE_WRAP Ljava/lang/String; + FIELD field_56078 saddleLines [Lnet/minecraft/class_630; + METHOD method_66840 getTexturedModelData (Z)Lnet/minecraft/class_5607; + ARG 0 baby + METHOD method_66841 getUntransformedTexturedModelData (Z)Lnet/minecraft/class_5607; + ARG 0 baby diff --git a/mappings/net/minecraft/client/render/entity/model/ModelTransformer.mapping b/mappings/net/minecraft/client/render/entity/model/ModelTransformer.mapping index eda423b570..bfa221c658 100644 --- a/mappings/net/minecraft/client/render/entity/model/ModelTransformer.mapping +++ b/mappings/net/minecraft/client/render/entity/model/ModelTransformer.mapping @@ -1,3 +1,12 @@ CLASS net/minecraft/class_9953 net/minecraft/client/render/entity/model/ModelTransformer + FIELD field_56092 NO_OP Lnet/minecraft/class_9953; METHOD apply (Lnet/minecraft/class_5609;)Lnet/minecraft/class_5609; ARG 1 modelData + METHOD method_62139 (FFLnet/minecraft/class_5603;)Lnet/minecraft/class_5603; + ARG 2 transform + METHOD method_62140 (FFLnet/minecraft/class_5609;)Lnet/minecraft/class_5609; + ARG 2 data + METHOD method_66843 (Lnet/minecraft/class_5609;)Lnet/minecraft/class_5609; + ARG 0 data + METHOD scaling (F)Lnet/minecraft/class_9953; + ARG 0 scale diff --git a/mappings/net/minecraft/client/render/entity/state/CamelEntityRenderState.mapping b/mappings/net/minecraft/client/render/entity/state/CamelEntityRenderState.mapping index 13d3a3540f..4102efb0ee 100644 --- a/mappings/net/minecraft/client/render/entity/state/CamelEntityRenderState.mapping +++ b/mappings/net/minecraft/client/render/entity/state/CamelEntityRenderState.mapping @@ -6,3 +6,4 @@ CLASS net/minecraft/class_10007 net/minecraft/client/render/entity/state/CamelEn FIELD field_53294 standingTransitionAnimationState Lnet/minecraft/class_7094; FIELD field_53295 idlingAnimationState Lnet/minecraft/class_7094; FIELD field_53296 dashingAnimationState Lnet/minecraft/class_7094; + FIELD field_56118 saddleStack Lnet/minecraft/class_1799; diff --git a/mappings/net/minecraft/client/render/item/property/select/ComponentProperty.mapping b/mappings/net/minecraft/client/render/item/property/select/ComponentProperty.mapping new file mode 100644 index 0000000000..fd7d909aec --- /dev/null +++ b/mappings/net/minecraft/client/render/item/property/select/ComponentProperty.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_10653 net/minecraft/client/render/item/property/select/ComponentProperty + FIELD field_56122 TYPE Lnet/minecraft/class_10494$class_10495; + METHOD method_66859 (Lnet/minecraft/class_10451$class_10454;)Lnet/minecraft/class_9331; + ARG 0 unbakedSwitch + METHOD method_66860 (Lnet/minecraft/class_9331;)Lcom/mojang/serialization/MapCodec; + ARG 0 componentType + METHOD method_66861 (Lnet/minecraft/class_9331;Ljava/util/List;)Lnet/minecraft/class_10451$class_10454; + ARG 1 cases + METHOD method_66862 getTypeInstance ()Lnet/minecraft/class_10494$class_10495; + METHOD method_66863 (Lnet/minecraft/class_9331;)Lcom/mojang/serialization/DataResult; + ARG 0 componentType + METHOD method_66864 createType ()Lnet/minecraft/class_10494$class_10495; diff --git a/mappings/net/minecraft/client/render/item/property/select/SelectProperty.mapping b/mappings/net/minecraft/client/render/item/property/select/SelectProperty.mapping index f2dedde6cd..38a63f2c3a 100644 --- a/mappings/net/minecraft/client/render/item/property/select/SelectProperty.mapping +++ b/mappings/net/minecraft/client/render/item/property/select/SelectProperty.mapping @@ -10,3 +10,9 @@ CLASS net/minecraft/class_10494 net/minecraft/client/render/item/property/select METHOD method_65686 create (Lcom/mojang/serialization/MapCodec;Lcom/mojang/serialization/Codec;)Lnet/minecraft/class_10494$class_10495; ARG 0 propertyCodec ARG 1 valueCodec + METHOD method_66868 createCaseListCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/MapCodec; + ARG 0 conditionCodec + METHOD method_66869 (Lcom/mojang/serialization/MapCodec;Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 2 instance + METHOD method_66870 validateCases (Ljava/util/List;)Lcom/mojang/serialization/DataResult; + ARG 0 cases diff --git a/mappings/net/minecraft/component/DataComponentTypes.mapping b/mappings/net/minecraft/component/DataComponentTypes.mapping index df36d9dabe..9254732356 100644 --- a/mappings/net/minecraft/component/DataComponentTypes.mapping +++ b/mappings/net/minecraft/component/DataComponentTypes.mapping @@ -1,6 +1,27 @@ CLASS net/minecraft/class_9334 net/minecraft/component/DataComponentTypes FIELD field_49627 DEFAULT_ITEM_COMPONENTS Lnet/minecraft/class_9323; FIELD field_51518 CACHE Lnet/minecraft/class_9684; + FIELD field_56132 TROPICAL_FISH_PATTERN_COLOR Lnet/minecraft/class_9331; + FIELD field_56133 MOOSHROOM_VARIANT Lnet/minecraft/class_9331; + FIELD field_56134 RABBIT_VARIANT Lnet/minecraft/class_9331; + FIELD field_56135 PIG_VARIANT Lnet/minecraft/class_9331; + FIELD field_56136 FROG_VARIANT Lnet/minecraft/class_9331; + FIELD field_56137 HORSE_VARIANT Lnet/minecraft/class_9331; + FIELD field_56138 PAINTING_VARIANT Lnet/minecraft/class_9331; + FIELD field_56139 LLAMA_VARIANT Lnet/minecraft/class_9331; + FIELD field_56140 AXOLOTL_VARIANT Lnet/minecraft/class_9331; + FIELD field_56141 CAT_VARIANT Lnet/minecraft/class_9331; + FIELD field_56142 CAT_COLLAR Lnet/minecraft/class_9331; + FIELD field_56143 SHEEP_COLOR Lnet/minecraft/class_9331; + FIELD field_56144 SHULKER_COLOR Lnet/minecraft/class_9331; + FIELD field_56145 VILLAGER_VARIANT Lnet/minecraft/class_9331; + FIELD field_56146 WOLF_VARIANT Lnet/minecraft/class_9331; + FIELD field_56147 WOLF_COLLAR Lnet/minecraft/class_9331; + FIELD field_56148 FOX_VARIANT Lnet/minecraft/class_9331; + FIELD field_56149 SALMON_SIZE Lnet/minecraft/class_9331; + FIELD field_56150 PARROT_VARIANT Lnet/minecraft/class_9331; + FIELD field_56151 TROPICAL_FISH_PATTERN Lnet/minecraft/class_9331; + FIELD field_56152 TROPICAL_FISH_BASE_COLOR Lnet/minecraft/class_9331; METHOD method_57884 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; ARG 0 builder METHOD method_57885 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; @@ -144,3 +165,45 @@ CLASS net/minecraft/class_9334 net/minecraft/component/DataComponentTypes ARG 0 builder METHOD method_66551 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; ARG 0 builder + METHOD method_66878 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66879 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66880 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66881 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66882 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66883 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66884 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66885 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66886 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66887 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66888 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66889 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66890 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66891 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66892 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66893 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66894 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66895 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66896 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66897 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder + METHOD method_66898 (Lnet/minecraft/class_9331$class_9332;)Lnet/minecraft/class_9331$class_9332; + ARG 0 builder diff --git a/mappings/net/minecraft/component/type/EquippableComponent.mapping b/mappings/net/minecraft/component/type/EquippableComponent.mapping index 44b0a8af0d..fd19e50b71 100644 --- a/mappings/net/minecraft/component/type/EquippableComponent.mapping +++ b/mappings/net/minecraft/component/type/EquippableComponent.mapping @@ -12,6 +12,11 @@ CLASS net/minecraft/class_10192 net/minecraft/component/type/EquippableComponent ARG 2 player METHOD method_64202 builder (Lnet/minecraft/class_1304;)Lnet/minecraft/class_10192$class_10217; ARG 0 slot + METHOD method_66699 ofSaddle ()Lnet/minecraft/class_10192; + METHOD method_66700 equipOnInteract (Lnet/minecraft/class_1657;Lnet/minecraft/class_1309;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269; + ARG 1 player + ARG 2 entity + ARG 3 stack CLASS class_10217 Builder FIELD field_54234 slot Lnet/minecraft/class_1304; FIELD field_54235 equipSound Lnet/minecraft/class_6880; @@ -21,10 +26,12 @@ CLASS net/minecraft/class_10192 net/minecraft/component/type/EquippableComponent FIELD field_54239 swappable Z FIELD field_54240 damageOnHurt Z FIELD field_54908 cameraOverlay Ljava/util/Optional; + FIELD field_55982 equipOnInteract Z METHOD (Lnet/minecraft/class_1304;)V ARG 1 slot METHOD method_64203 build ()Lnet/minecraft/class_10192; METHOD method_64204 model (Lnet/minecraft/class_5321;)Lnet/minecraft/class_10192$class_10217; + ARG 1 model METHOD method_64205 equipSound (Lnet/minecraft/class_6880;)Lnet/minecraft/class_10192$class_10217; ARG 1 equipSound METHOD method_64206 allowedEntities (Lnet/minecraft/class_6885;)Lnet/minecraft/class_10192$class_10217; @@ -39,3 +46,5 @@ CLASS net/minecraft/class_10192 net/minecraft/component/type/EquippableComponent ARG 1 damageOnHurt METHOD method_65009 cameraOverlay (Lnet/minecraft/class_2960;)Lnet/minecraft/class_10192$class_10217; ARG 1 cameraOverlay + METHOD method_66701 equipOnInteract (Z)Lnet/minecraft/class_10192$class_10217; + ARG 1 equipOnInteract diff --git a/mappings/net/minecraft/datafixer/FixUtil.mapping b/mappings/net/minecraft/datafixer/FixUtil.mapping index 62518615cf..ce3f5f8dac 100644 --- a/mappings/net/minecraft/datafixer/FixUtil.mapping +++ b/mappings/net/minecraft/datafixer/FixUtil.mapping @@ -26,3 +26,5 @@ CLASS net/minecraft/class_9228 net/minecraft/datafixer/FixUtil METHOD method_61358 (Lcom/mojang/serialization/Dynamic;Ljava/util/Map$Entry;)Lcom/mojang/serialization/Dynamic; ARG 1 entry METHOD method_66040 withType (Lcom/mojang/datafixers/types/Type;Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/datafixers/Typed; + METHOD method_66591 getColorName (I)Ljava/lang/String; + ARG 0 index diff --git a/mappings/net/minecraft/datafixer/fix/EntityFallDistanceFloatToDoubleFix.mapping b/mappings/net/minecraft/datafixer/fix/EntityFallDistanceFloatToDoubleFix.mapping new file mode 100644 index 0000000000..d89dfe4bc8 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/EntityFallDistanceFloatToDoubleFix.mapping @@ -0,0 +1,4 @@ +CLASS net/minecraft/class_10620 net/minecraft/datafixer/fix/EntityFallDistanceFloatToDoubleFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;Lcom/mojang/datafixers/DSL$TypeReference;)V + ARG 1 outputSchema + METHOD method_66600 fixFallDistance (Lcom/mojang/datafixers/Typed;)Lcom/mojang/datafixers/Typed; diff --git a/mappings/net/minecraft/datafixer/fix/EquipmentFormatFix.mapping b/mappings/net/minecraft/datafixer/fix/EquipmentFormatFix.mapping new file mode 100644 index 0000000000..7791a88081 --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/EquipmentFormatFix.mapping @@ -0,0 +1,3 @@ +CLASS net/minecraft/class_10623 net/minecraft/datafixer/fix/EquipmentFormatFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema diff --git a/mappings/net/minecraft/datafixer/fix/ItemVariantComponentizationFix.mapping b/mappings/net/minecraft/datafixer/fix/ItemVariantComponentizationFix.mapping new file mode 100644 index 0000000000..2fa42db87a --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/ItemVariantComponentizationFix.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_10621 net/minecraft/datafixer/fix/ItemVariantComponentizationFix + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_66603 getTropicalFishBaseColorName (I)Ljava/lang/String; + ARG 0 variant + METHOD method_66606 fixPainting (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_66607 fixTropicalFishBucket (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_66609 getTropicalFishPatternColorName (I)Ljava/lang/String; + ARG 0 variant + METHOD method_66611 fixAxolotlBucket (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + METHOD method_66612 getTropicalFishPatternName (I)Ljava/lang/String; + ARG 0 variant + METHOD method_66614 fixSalmonBucket (Lcom/mojang/serialization/Dynamic;Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; diff --git a/mappings/net/minecraft/datafixer/fix/SaddleEquipmentSlotFix.mapping b/mappings/net/minecraft/datafixer/fix/SaddleEquipmentSlotFix.mapping new file mode 100644 index 0000000000..da58e4bbde --- /dev/null +++ b/mappings/net/minecraft/datafixer/fix/SaddleEquipmentSlotFix.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_10624 net/minecraft/datafixer/fix/SaddleEquipmentSlotFix + FIELD field_55936 FULL_SADDLE_STACK_ENTITY_IDS Ljava/util/Set; + FIELD field_55937 BOOLEAN_SADDLE_ENTITY_IDS Ljava/util/Set; + FIELD field_55938 OLD_NBT_KEY Ljava/lang/String; + FIELD field_55939 NEW_NBT_KEY Ljava/lang/String; + METHOD (Lcom/mojang/datafixers/schemas/Schema;)V + ARG 1 outputSchema + METHOD method_66626 fixFullSaddleStackEntity (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 nbt + METHOD method_66627 fixBooleanSaddleEntity (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 nbt + METHOD method_66628 fixDropChances (Lcom/mojang/serialization/Dynamic;)Lcom/mojang/serialization/Dynamic; + ARG 0 nbt diff --git a/mappings/net/minecraft/datafixer/schema/Schema4300.mapping b/mappings/net/minecraft/datafixer/schema/Schema4300.mapping new file mode 100644 index 0000000000..4df0f0324c --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema4300.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10625 net/minecraft/datafixer/schema/Schema4300 diff --git a/mappings/net/minecraft/datafixer/schema/Schema4301.mapping b/mappings/net/minecraft/datafixer/schema/Schema4301.mapping new file mode 100644 index 0000000000..df957b8f5f --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema4301.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10626 net/minecraft/datafixer/schema/Schema4301 diff --git a/mappings/net/minecraft/datafixer/schema/Schema4302.mapping b/mappings/net/minecraft/datafixer/schema/Schema4302.mapping new file mode 100644 index 0000000000..433ddc0f69 --- /dev/null +++ b/mappings/net/minecraft/datafixer/schema/Schema4302.mapping @@ -0,0 +1 @@ +CLASS net/minecraft/class_10627 net/minecraft/datafixer/schema/Schema4302 diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 9af5fac10d..97886da936 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -912,6 +912,8 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity ARG 2 state METHOD method_51502 setWorld (Lnet/minecraft/class_1937;)V ARG 1 world + METHOD method_51700 (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; + ARG 1 pos METHOD method_51701 stepOnBlock (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;ZZLnet/minecraft/class_243;)Z ARG 1 pos ARG 2 state @@ -1498,6 +1500,9 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity COMMENT COMMENT @return whether to play the sound when falling on honey block; {@code false} for all COMMENT entities except horses and llamas + ARG 1 fallDistance + ARG 3 damagePerDistance + ARG 4 damageSource METHOD method_5748 getMaxAir ()I COMMENT {@return the maximum amount of air the entity can hold, in ticks} COMMENT @@ -2274,6 +2279,22 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_66249 canMoveVoluntarily ()Z METHOD method_66250 spawnBubbleColumnParticles (Lnet/minecraft/class_2338;)V ARG 1 pos + METHOD method_66649 copyCustomNameFrom (Lnet/minecraft/class_9473;)V + ARG 1 from + METHOD method_66650 copyComponentFrom (Lnet/minecraft/class_9473;Lnet/minecraft/class_9331;)Z + ARG 1 from + ARG 2 type + METHOD method_66651 castComponentValue (Lnet/minecraft/class_9331;Ljava/lang/Object;)Ljava/lang/Object; + ARG 0 type + ARG 1 value + METHOD method_66652 copyCustomNameFrom (Lnet/minecraft/class_1799;)V + ARG 1 stack + METHOD method_66653 setComponent (Lnet/minecraft/class_9331;Ljava/lang/Object;)V + ARG 1 type + ARG 2 value + METHOD method_66654 setApplicableComponent (Lnet/minecraft/class_9331;Ljava/lang/Object;)Z + ARG 1 type + ARG 2 value METHOD method_7325 isSpectator ()Z COMMENT {@return whether the entity is a spectator} COMMENT diff --git a/mappings/net/minecraft/entity/EntityEquipment.mapping b/mappings/net/minecraft/entity/EntityEquipment.mapping new file mode 100644 index 0000000000..10064bb627 --- /dev/null +++ b/mappings/net/minecraft/entity/EntityEquipment.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_10630 net/minecraft/entity/EntityEquipment + FIELD field_55943 CODEC Lcom/mojang/serialization/Codec; + FIELD field_55944 map Ljava/util/EnumMap; + METHOD (Ljava/util/EnumMap;)V + ARG 1 map + METHOD method_66657 isEmpty ()Z + METHOD method_66658 (Lnet/minecraft/class_10630;)Ljava/util/Map; + ARG 0 equipment + METHOD method_66659 get (Lnet/minecraft/class_1304;)Lnet/minecraft/class_1799; + ARG 1 slot + METHOD method_66660 put (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; + ARG 1 slot + ARG 2 stack + METHOD method_66661 (Ljava/util/Map;)Lnet/minecraft/class_10630; + ARG 0 map diff --git a/mappings/net/minecraft/entity/LivingEntity.mapping b/mappings/net/minecraft/entity/LivingEntity.mapping index 235c957823..3b44fdd026 100644 --- a/mappings/net/minecraft/entity/LivingEntity.mapping +++ b/mappings/net/minecraft/entity/LivingEntity.mapping @@ -32,6 +32,7 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity FIELD field_54564 NOT_WEARING_GAZE_DISGUISE_PREDICATE Ljava/util/function/Predicate; FIELD field_55674 attackerReference Lnet/minecraft/class_10583; FIELD field_55675 interpolator Lnet/minecraft/class_10584; + FIELD field_55951 lastEquipmentStacks Ljava/util/Map; FIELD field_6212 sidewaysSpeed F FIELD field_6213 deathTime I FIELD field_6214 POTION_SWIRLS_AMBIENT Lnet/minecraft/class_2940; @@ -140,6 +141,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity ARG 1 stingerCount METHOD method_23328 playBlockFallSound ()V METHOD method_23329 computeFallDamage (DF)I + ARG 1 fallDistance + ARG 3 damagePerDistance METHOD method_23667 swingHand (Lnet/minecraft/class_1268;Z)V ARG 1 hand ARG 2 fromServerPlayer @@ -607,6 +610,8 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_6115 isUsingItem ()Z METHOD method_6116 onEquipStack (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)V ARG 1 slot + ARG 2 oldStack + ARG 3 newStack METHOD method_6117 getLastAttackedTime ()I METHOD method_6118 getEquippedStack (Lnet/minecraft/class_1304;)Lnet/minecraft/class_1799; ARG 1 slot @@ -731,5 +736,16 @@ CLASS net/minecraft/class_1309 net/minecraft/entity/LivingEntity METHOD method_66282 tickMovementInput ()V METHOD method_66283 playThornsSound (Lnet/minecraft/class_1282;)V ARG 1 damageSource + METHOD method_66667 getEquipSound (Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;Lnet/minecraft/class_10192;)Lnet/minecraft/class_6880; + ARG 1 slot + ARG 2 stack + ARG 3 equippableComponent + METHOD method_66668 (Ljava/util/List;Lnet/minecraft/class_1304;Lnet/minecraft/class_1799;)V + ARG 2 slot + ARG 3 stack + METHOD method_66669 getUnsafeFallDistance (D)D + ARG 1 fallDistance + METHOD method_66670 (Lnet/minecraft/class_1304;)Lnet/minecraft/class_1799; + ARG 0 slot METHOD method_7292 getLuck ()F CLASS class_6823 FallSounds diff --git a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping index b7276f1c87..ebbb97c5fd 100644 --- a/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/ArmorStandEntity.mapping @@ -5,6 +5,8 @@ CLASS net/minecraft/class_1531 net/minecraft/entity/decoration/ArmorStandEntity FIELD field_30444 MARKER_FLAG I FIELD field_30452 SMALL_FLAG I FIELD field_30453 SHOW_ARMS_FLAG I + FIELD field_55973 LOGGER Lorg/slf4j/Logger; + FIELD field_55974 equipment Lnet/minecraft/class_10630; FIELD field_7102 RIDEABLE_MINECART_PREDICATE Ljava/util/function/Predicate; FIELD field_7103 rightLegRotation Lnet/minecraft/class_2379; FIELD field_7104 headRotation Lnet/minecraft/class_2379; @@ -38,6 +40,8 @@ CLASS net/minecraft/class_1531 net/minecraft/entity/decoration/ArmorStandEntity ARG 1 marker METHOD method_55745 createArmorStandAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_61489 shouldShowBasePlate ()Z + METHOD method_66682 (Lnet/minecraft/class_10630;)V + ARG 1 equipment METHOD method_6898 spawnBreakParticles ()V METHOD method_6900 getRightLegRotation ()Lnet/minecraft/class_2379; METHOD method_6902 setMarker (Z)V diff --git a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping index f4425cf6ce..cdbfd6bb09 100644 --- a/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping +++ b/mappings/net/minecraft/entity/decoration/painting/PaintingEntity.mapping @@ -21,5 +21,6 @@ CLASS net/minecraft/class_1534 net/minecraft/entity/decoration/painting/Painting ARG 1 variant METHOD method_43403 getSize (Lnet/minecraft/class_6880;)I ARG 0 variant + METHOD method_43404 getVariant ()Lnet/minecraft/class_6880; METHOD method_59946 getOffset (I)D ARG 1 length diff --git a/mappings/net/minecraft/entity/mob/MobEntity.mapping b/mappings/net/minecraft/entity/mob/MobEntity.mapping index 5d4a5eeebf..1d9f5187a4 100644 --- a/mappings/net/minecraft/entity/mob/MobEntity.mapping +++ b/mappings/net/minecraft/entity/mob/MobEntity.mapping @@ -31,6 +31,7 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity FIELD field_52448 EQUIPMENT_INIT_ORDER Ljava/util/List; FIELD field_55676 LOGGER Lorg/slf4j/Logger; FIELD field_55677 equipmentDropChances Lnet/minecraft/class_10582; + FIELD field_55953 equipment Lnet/minecraft/class_10630; FIELD field_6184 lootTableSeed J FIELD field_6185 targetSelector Lnet/minecraft/class_1355; COMMENT Contains goals used to select this entity's target. @@ -296,5 +297,8 @@ CLASS net/minecraft/class_1308 net/minecraft/entity/mob/MobEntity METHOD method_66284 (Lnet/minecraft/class_10582;)V ARG 1 equipmentDropChances METHOD method_66286 getEquipmentDropChances ()Lnet/minecraft/class_10582; + METHOD method_66672 hasSaddleEquipped ()Z + METHOD method_66674 createEquipmentInventory (Lnet/minecraft/class_1304;)Lnet/minecraft/class_1263; + ARG 1 slot METHOD method_7217 setBaby (Z)V ARG 1 baby diff --git a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping index 75be831410..f3798f5489 100644 --- a/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping +++ b/mappings/net/minecraft/entity/passive/AxolotlEntity.mapping @@ -53,6 +53,7 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity ARG 0 random METHOD method_33223 buffPlayer (Lnet/minecraft/class_1657;)V ARG 1 player + METHOD method_33225 getVariant ()Lnet/minecraft/class_5762$class_5767; METHOD method_33226 isPlayingDead ()Z METHOD method_33227 createAxolotlAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_33230 tickAir (Lnet/minecraft/class_3218;I)V @@ -89,16 +90,17 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity METHOD (Lnet/minecraft/class_5762;)V ARG 1 axolotl CLASS class_5767 Variant - FIELD field_28346 BY_ID Ljava/util/function/IntFunction; - FIELD field_28347 id I - FIELD field_28348 name Ljava/lang/String; + FIELD field_28346 INDEX_MAPPER Ljava/util/function/IntFunction; + FIELD field_28347 index I + FIELD field_28348 id Ljava/lang/String; FIELD field_28349 natural Z FIELD field_41585 CODEC Lcom/mojang/serialization/Codec; + FIELD field_55970 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;IILjava/lang/String;Z)V - ARG 3 id - ARG 4 name + ARG 3 index + ARG 4 id ARG 5 natural - METHOD method_33233 getId ()I + METHOD method_33233 getIndex ()I METHOD method_33235 getRandomNatural (Lnet/minecraft/class_5819;)Lnet/minecraft/class_5762$class_5767; ARG 0 random METHOD method_33236 getRandom (Lnet/minecraft/class_5819;Z)Lnet/minecraft/class_5762$class_5767; @@ -106,9 +108,9 @@ CLASS net/minecraft/class_5762 net/minecraft/entity/passive/AxolotlEntity ARG 1 natural METHOD method_33237 (ZLnet/minecraft/class_5762$class_5767;)Z ARG 1 variant - METHOD method_33238 getName ()Ljava/lang/String; + METHOD method_33238 getId ()Ljava/lang/String; METHOD method_33240 getRandomUnnatural (Lnet/minecraft/class_5819;)Lnet/minecraft/class_5762$class_5767; ARG 0 random - METHOD method_47928 byId (I)Lnet/minecraft/class_5762$class_5767; - ARG 0 id + METHOD method_47928 byIndex (I)Lnet/minecraft/class_5762$class_5767; + ARG 0 index CLASS class_9870 State diff --git a/mappings/net/minecraft/entity/passive/CatEntity.mapping b/mappings/net/minecraft/entity/passive/CatEntity.mapping index 9735beadab..d486106067 100644 --- a/mappings/net/minecraft/entity/passive/CatEntity.mapping +++ b/mappings/net/minecraft/entity/passive/CatEntity.mapping @@ -40,6 +40,9 @@ CLASS net/minecraft/class_1451 net/minecraft/entity/passive/CatEntity ARG 1 tickDelta METHOD method_16096 getCollarColor ()Lnet/minecraft/class_1767; METHOD method_26881 createCatAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_47842 setVariant (Lnet/minecraft/class_6880;)V + ARG 1 variant + METHOD method_47843 getVariant ()Lnet/minecraft/class_6880; METHOD method_58168 tryTame (Lnet/minecraft/class_1657;)V ARG 1 player METHOD method_58364 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; diff --git a/mappings/net/minecraft/entity/passive/CatVariant.mapping b/mappings/net/minecraft/entity/passive/CatVariant.mapping index 0f3a9b5cf8..7169f1306a 100644 --- a/mappings/net/minecraft/entity/passive/CatVariant.mapping +++ b/mappings/net/minecraft/entity/passive/CatVariant.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_7375 net/minecraft/entity/passive/CatVariant FIELD field_51941 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_55959 CODEC Lcom/mojang/serialization/Codec; METHOD method_43090 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/String;)Lnet/minecraft/class_7375; ARG 0 registry ARG 1 key diff --git a/mappings/net/minecraft/entity/passive/FoxEntity.mapping b/mappings/net/minecraft/entity/passive/FoxEntity.mapping index cec8933ff9..993ce4bb2d 100644 --- a/mappings/net/minecraft/entity/passive/FoxEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FoxEntity.mapping @@ -1,5 +1,5 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity - FIELD field_17949 TYPE Lnet/minecraft/class_2940; + FIELD field_17949 VARIANT Lnet/minecraft/class_2940; FIELD field_17950 FOX_FLAGS Lnet/minecraft/class_2940; FIELD field_17951 OWNER Lnet/minecraft/class_2940; FIELD field_17952 OTHER_TRUSTED Lnet/minecraft/class_2940; @@ -99,6 +99,9 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity ARG 2 spawnReason ARG 3 pos ARG 4 random + METHOD method_47844 setVariant (Lnet/minecraft/class_4019$class_4039;)V + ARG 1 variant + METHOD method_47845 getVariant ()Lnet/minecraft/class_4019$class_4039; METHOD method_66290 trust (Lnet/minecraft/class_10583;)V ARG 1 entity METHOD method_66291 (Lnet/minecraft/class_1309;Lnet/minecraft/class_10583;)Z @@ -176,21 +179,22 @@ CLASS net/minecraft/class_4019 net/minecraft/entity/passive/FoxEntity FIELD field_30337 MAX_CALM_DOWN_TIME I METHOD method_18432 canNotCalmDown ()Z CLASS class_4038 MoveToHuntGoal - CLASS class_4039 Type - FIELD field_17998 BY_ID Ljava/util/function/IntFunction; - FIELD field_18000 id I - FIELD field_18001 key Ljava/lang/String; + CLASS class_4039 Variant + FIELD field_17998 INDEX_MAPPER Ljava/util/function/IntFunction; + FIELD field_18000 index I + FIELD field_18001 id Ljava/lang/String; FIELD field_41548 CODEC Lnet/minecraft/class_3542$class_7292; + FIELD field_55960 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - ARG 4 key - METHOD method_18311 fromId (I)Lnet/minecraft/class_4019$class_4039; - ARG 0 id + ARG 3 index + ARG 4 id + METHOD method_18311 byIndex (I)Lnet/minecraft/class_4019$class_4039; + ARG 0 index METHOD method_18313 fromBiome (Lnet/minecraft/class_6880;)Lnet/minecraft/class_4019$class_4039; ARG 0 biome - METHOD method_18314 byName (Ljava/lang/String;)Lnet/minecraft/class_4019$class_4039; - ARG 0 name - METHOD method_18317 getId ()I + METHOD method_18314 byId (Ljava/lang/String;)Lnet/minecraft/class_4019$class_4039; + ARG 0 id + METHOD method_18317 getIndex ()I CLASS class_4052 FollowParentGoal FIELD field_18104 fox Lnet/minecraft/class_4019; METHOD (Lnet/minecraft/class_4019;D)V diff --git a/mappings/net/minecraft/entity/passive/FrogEntity.mapping b/mappings/net/minecraft/entity/passive/FrogEntity.mapping index c8704fe4b9..2a72685553 100644 --- a/mappings/net/minecraft/entity/passive/FrogEntity.mapping +++ b/mappings/net/minecraft/entity/passive/FrogEntity.mapping @@ -11,6 +11,9 @@ CLASS net/minecraft/class_7102 net/minecraft/entity/passive/FrogEntity FIELD field_49988 DEFAULT_VARIANT_KEY Lnet/minecraft/class_5321; METHOD method_41352 setFrogTarget (Lnet/minecraft/class_1297;)V ARG 1 entity + METHOD method_41353 setVariant (Lnet/minecraft/class_6880;)V + ARG 1 variant + METHOD method_41354 getVariant ()Lnet/minecraft/class_6880; METHOD method_41355 createFrogAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_41358 isValidFrogFood (Lnet/minecraft/class_1309;)Z ARG 0 entity diff --git a/mappings/net/minecraft/entity/passive/FrogVariant.mapping b/mappings/net/minecraft/entity/passive/FrogVariant.mapping index eebbd54723..25a526a1cb 100644 --- a/mappings/net/minecraft/entity/passive/FrogVariant.mapping +++ b/mappings/net/minecraft/entity/passive/FrogVariant.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_7106 net/minecraft/entity/passive/FrogVariant FIELD field_37463 WARM Lnet/minecraft/class_5321; FIELD field_37464 COLD Lnet/minecraft/class_5321; FIELD field_51942 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_55961 CODEC Lcom/mojang/serialization/Codec; METHOD method_43091 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/lang/String;)Lnet/minecraft/class_7106; ARG 0 registry ARG 1 key diff --git a/mappings/net/minecraft/entity/passive/HorseColor.mapping b/mappings/net/minecraft/entity/passive/HorseColor.mapping index ce236e4c44..88440cea6e 100644 --- a/mappings/net/minecraft/entity/passive/HorseColor.mapping +++ b/mappings/net/minecraft/entity/passive/HorseColor.mapping @@ -1,11 +1,12 @@ CLASS net/minecraft/class_5149 net/minecraft/entity/passive/HorseColor - FIELD field_23823 BY_ID Ljava/util/function/IntFunction; - FIELD field_23824 id I + FIELD field_23823 INDEX_MAPPER Ljava/util/function/IntFunction; + FIELD field_23824 index I FIELD field_41595 CODEC Lcom/mojang/serialization/Codec; - FIELD field_41596 name Ljava/lang/String; + FIELD field_41596 id Ljava/lang/String; + FIELD field_55972 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - ARG 4 name - METHOD method_27082 getId ()I - METHOD method_27083 byId (I)Lnet/minecraft/class_5149; - ARG 0 id + ARG 3 index + ARG 4 id + METHOD method_27082 getIndex ()I + METHOD method_27083 byIndex (I)Lnet/minecraft/class_5149; + ARG 0 index diff --git a/mappings/net/minecraft/entity/passive/HorseEntity.mapping b/mappings/net/minecraft/entity/passive/HorseEntity.mapping index 5c49548330..7a3cd81a25 100644 --- a/mappings/net/minecraft/entity/passive/HorseEntity.mapping +++ b/mappings/net/minecraft/entity/passive/HorseEntity.mapping @@ -4,7 +4,10 @@ CLASS net/minecraft/class_1498 net/minecraft/entity/passive/HorseEntity METHOD method_27076 setHorseVariant (Lnet/minecraft/class_5149;Lnet/minecraft/class_5148;)V ARG 1 color ARG 2 marking + METHOD method_27077 getHorseColor ()Lnet/minecraft/class_5149; METHOD method_27078 getMarking ()Lnet/minecraft/class_5148; + METHOD method_47873 setHorseColor (Lnet/minecraft/class_5149;)V + ARG 1 color METHOD method_6783 setHorseVariant (I)V ARG 1 variant METHOD method_6788 getHorseVariant ()I diff --git a/mappings/net/minecraft/entity/passive/HorseMarking.mapping b/mappings/net/minecraft/entity/passive/HorseMarking.mapping index 6ec66ae6e1..a666843a2f 100644 --- a/mappings/net/minecraft/entity/passive/HorseMarking.mapping +++ b/mappings/net/minecraft/entity/passive/HorseMarking.mapping @@ -1,8 +1,8 @@ CLASS net/minecraft/class_5148 net/minecraft/entity/passive/HorseMarking - FIELD field_23813 BY_ID Ljava/util/function/IntFunction; - FIELD field_23814 id I + FIELD field_23813 INDEX_MAPPER Ljava/util/function/IntFunction; + FIELD field_23814 index I METHOD (Ljava/lang/String;II)V - ARG 3 id - METHOD method_27079 getId ()I + ARG 3 index + METHOD method_27079 getIndex ()I METHOD method_27080 byIndex (I)Lnet/minecraft/class_5148; ARG 0 index diff --git a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping index d83be67846..4621a87e20 100644 --- a/mappings/net/minecraft/entity/passive/LlamaEntity.mapping +++ b/mappings/net/minecraft/entity/passive/LlamaEntity.mapping @@ -8,6 +8,8 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity FIELD field_7000 following Lnet/minecraft/class_1501; METHOD method_18004 createChild ()Lnet/minecraft/class_1501; METHOD method_26900 createLlamaAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_47874 setVariant (Lnet/minecraft/class_1501$class_7993;)V + ARG 1 variant METHOD method_58393 (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_6791 follow (Lnet/minecraft/class_1501;)V @@ -26,6 +28,7 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity METHOD method_6807 isTrader ()Z METHOD method_6808 setSpit (Z)V ARG 1 spit + METHOD method_6809 getVariant ()Lnet/minecraft/class_1501$class_7993; CLASS class_1502 ChaseWolvesGoal METHOD (Lnet/minecraft/class_1501;)V ARG 1 llama @@ -41,12 +44,13 @@ CLASS net/minecraft/class_1501 net/minecraft/entity/passive/LlamaEntity ARG 1 llama CLASS class_7993 Variant FIELD field_41590 CODEC Lcom/mojang/serialization/Codec; - FIELD field_41591 BY_ID Ljava/util/function/IntFunction; - FIELD field_41592 id I - FIELD field_41593 name Ljava/lang/String; + FIELD field_41591 INDEX_MAPPER Ljava/util/function/IntFunction; + FIELD field_41592 index I + FIELD field_41593 id Ljava/lang/String; + FIELD field_55971 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - ARG 4 name + ARG 3 index + ARG 4 id METHOD method_47875 getIndex ()I - METHOD method_47876 byId (I)Lnet/minecraft/class_1501$class_7993; - ARG 0 id + METHOD method_47876 byIndex (I)Lnet/minecraft/class_1501$class_7993; + ARG 0 index diff --git a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping index c274584ea5..3e903f6964 100644 --- a/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping +++ b/mappings/net/minecraft/entity/passive/MooshroomEntity.mapping @@ -1,10 +1,10 @@ CLASS net/minecraft/class_1438 net/minecraft/entity/passive/MooshroomEntity - FIELD field_18105 TYPE Lnet/minecraft/class_2940; + FIELD field_18105 VARIANT Lnet/minecraft/class_2940; FIELD field_18108 lightningId Ljava/util/UUID; FIELD field_30339 MUTATION_CHANCE I FIELD field_45751 STEW_EFFECTS_NBT_KEY Ljava/lang/String; FIELD field_45752 stewEffects Lnet/minecraft/class_9298; - METHOD method_18434 chooseBabyType (Lnet/minecraft/class_1438;)Lnet/minecraft/class_1438$class_4053; + METHOD method_18434 chooseBabyVariant (Lnet/minecraft/class_1438;)Lnet/minecraft/class_1438$class_4053; ARG 1 mooshroom METHOD method_18436 getStewEffectFrom (Lnet/minecraft/class_1799;)Ljava/util/Optional; ARG 1 flower @@ -14,6 +14,9 @@ CLASS net/minecraft/class_1438 net/minecraft/entity/passive/MooshroomEntity ARG 2 spawnReason ARG 3 pos ARG 4 random + METHOD method_47846 setVariant (Lnet/minecraft/class_1438$class_4053;)V + ARG 1 variant + METHOD method_47847 getVariant ()Lnet/minecraft/class_1438$class_4053; METHOD method_53154 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V ARG 1 stewEffects METHOD method_53155 (Lnet/minecraft/class_9298;)V @@ -23,12 +26,20 @@ CLASS net/minecraft/class_1438 net/minecraft/entity/passive/MooshroomEntity ARG 2 stack METHOD method_63648 (Lnet/minecraft/class_3218;Lnet/minecraft/class_1799;Lnet/minecraft/class_1430;)V ARG 3 cow - CLASS class_4053 Type + CLASS class_4053 Variant FIELD field_18111 name Ljava/lang/String; FIELD field_18112 mushroom Lnet/minecraft/class_2680; FIELD field_41549 CODEC Lnet/minecraft/class_3542$class_7292; + FIELD field_55962 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_55963 INDEX_MAPPER Ljava/util/function/IntFunction; + FIELD field_55964 index I METHOD (Ljava/lang/String;ILjava/lang/String;ILnet/minecraft/class_2680;)V ARG 3 name + ARG 4 index + ARG 5 mushroom METHOD method_18437 getMushroomState ()Lnet/minecraft/class_2680; METHOD method_18441 fromName (Ljava/lang/String;)Lnet/minecraft/class_1438$class_4053; ARG 0 name + METHOD method_66677 fromIndex (I)Lnet/minecraft/class_1438$class_4053; + ARG 0 index + METHOD method_66678 getIndex ()I diff --git a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping index 3e0ce97e9f..06b480fb76 100644 --- a/mappings/net/minecraft/entity/passive/ParrotEntity.mapping +++ b/mappings/net/minecraft/entity/passive/ParrotEntity.mapping @@ -16,6 +16,8 @@ CLASS net/minecraft/class_1453 net/minecraft/entity/passive/ParrotEntity ARG 3 pos ARG 4 random METHOD method_26889 createParrotAttributes ()Lnet/minecraft/class_5132$class_5133; + METHOD method_47848 setVariant (Lnet/minecraft/class_1453$class_7989;)V + ARG 1 variant METHOD method_6578 flapWings ()V METHOD method_6579 (Ljava/util/HashMap;)V ARG 0 map @@ -25,6 +27,7 @@ CLASS net/minecraft/class_1453 net/minecraft/entity/passive/ParrotEntity METHOD method_6583 getRandomSound (Lnet/minecraft/class_1937;Lnet/minecraft/class_5819;)Lnet/minecraft/class_3414; ARG 0 world ARG 1 random + METHOD method_6584 getVariant ()Lnet/minecraft/class_1453$class_7989; METHOD method_6586 getSound (Lnet/minecraft/class_1299;)Lnet/minecraft/class_3414; ARG 0 imitate METHOD method_6587 imitateNearbyMob (Lnet/minecraft/class_1937;Lnet/minecraft/class_1297;)Z @@ -40,6 +43,7 @@ CLASS net/minecraft/class_1453 net/minecraft/entity/passive/ParrotEntity FIELD field_41556 BY_ID Ljava/util/function/IntFunction; FIELD field_41557 id I FIELD field_41558 name Ljava/lang/String; + FIELD field_55965 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;IILjava/lang/String;)V ARG 3 id ARG 4 name diff --git a/mappings/net/minecraft/entity/passive/PigEntity.mapping b/mappings/net/minecraft/entity/passive/PigEntity.mapping index fd8c196cf1..48f5554674 100644 --- a/mappings/net/minecraft/entity/passive/PigEntity.mapping +++ b/mappings/net/minecraft/entity/passive/PigEntity.mapping @@ -15,3 +15,6 @@ CLASS net/minecraft/class_1452 net/minecraft/entity/passive/PigEntity ARG 0 variantId METHOD method_66297 (Lnet/minecraft/class_2487;Lnet/minecraft/class_5321;)V ARG 1 variantKey + METHOD method_66298 setVariant (Lnet/minecraft/class_6880;)V + ARG 1 variant + METHOD method_66299 getVariant ()Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping index 08942f53ce..10293b858f 100644 --- a/mappings/net/minecraft/entity/passive/RabbitEntity.mapping +++ b/mappings/net/minecraft/entity/passive/RabbitEntity.mapping @@ -8,7 +8,7 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity FIELD field_6849 jumpDuration I FIELD field_6850 lastOnGround Z FIELD field_6851 jumpTicks I - FIELD field_6852 RABBIT_TYPE Lnet/minecraft/class_2940; + FIELD field_6852 VARIANT Lnet/minecraft/class_2940; METHOD method_20669 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z ARG 0 entity ARG 1 world @@ -16,9 +16,12 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity ARG 3 pos ARG 4 random METHOD method_26892 createRabbitAttributes ()Lnet/minecraft/class_5132$class_5133; - METHOD method_47854 getTypeFromPos (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1463$class_7990; + METHOD method_47853 setVariant (Lnet/minecraft/class_1463$class_7990;)V + ARG 1 variant + METHOD method_47854 getVariantFromPos (Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_1463$class_7990; ARG 0 world ARG 1 pos + METHOD method_47855 getVariant ()Lnet/minecraft/class_1463$class_7990; METHOD method_58374 (Lnet/minecraft/class_1799;)Z ARG 0 stack METHOD method_6605 getJumpProgress (F)F @@ -44,9 +47,9 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity ARG 4 slowSpeed ARG 6 fastSpeed CLASS class_1466 RabbitData - FIELD field_41560 type Lnet/minecraft/class_1463$class_7990; + FIELD field_41560 variant Lnet/minecraft/class_1463$class_7990; METHOD (Lnet/minecraft/class_1463$class_7990;)V - ARG 1 type + ARG 1 variant CLASS class_1468 RabbitMoveControl FIELD field_6858 rabbitSpeed D FIELD field_6859 rabbit Lnet/minecraft/class_1463; @@ -72,14 +75,15 @@ CLASS net/minecraft/class_1463 net/minecraft/entity/passive/RabbitEntity ARG 1 canJump METHOD method_27312 isActive ()Z METHOD method_27313 canJump ()Z - CLASS class_7990 RabbitType + CLASS class_7990 Variant FIELD field_41568 CODEC Lcom/mojang/serialization/Codec; - FIELD field_41569 BY_ID Ljava/util/function/IntFunction; - FIELD field_41570 id I - FIELD field_41571 name Ljava/lang/String; + FIELD field_41569 INDEX_MAPPER Ljava/util/function/IntFunction; + FIELD field_41570 index I + FIELD field_41571 id Ljava/lang/String; + FIELD field_55966 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;IILjava/lang/String;)V - ARG 3 id - ARG 4 name - METHOD method_47856 getId ()I - METHOD method_47857 byId (I)Lnet/minecraft/class_1463$class_7990; - ARG 0 id + ARG 3 index + ARG 4 id + METHOD method_47856 getIndex ()I + METHOD method_47857 byIndex (I)Lnet/minecraft/class_1463$class_7990; + ARG 0 index diff --git a/mappings/net/minecraft/entity/passive/SalmonEntity.mapping b/mappings/net/minecraft/entity/passive/SalmonEntity.mapping index a4c6f8020a..dc45395204 100644 --- a/mappings/net/minecraft/entity/passive/SalmonEntity.mapping +++ b/mappings/net/minecraft/entity/passive/SalmonEntity.mapping @@ -1,6 +1,9 @@ CLASS net/minecraft/class_1462 net/minecraft/entity/passive/SalmonEntity FIELD field_52469 VARIANT Lnet/minecraft/class_2940; FIELD field_55007 TYPE_KEY Ljava/lang/String; + METHOD method_61471 setVariant (Lnet/minecraft/class_1462$class_9869;)V + ARG 1 variant + METHOD method_61472 getVariant ()Lnet/minecraft/class_1462$class_9869; METHOD method_63008 getVariantScale ()F CLASS class_9869 Variant FIELD field_52473 CODEC Lnet/minecraft/class_3542$class_7292; @@ -8,6 +11,7 @@ CLASS net/minecraft/class_1462 net/minecraft/entity/passive/SalmonEntity FIELD field_53975 scale F FIELD field_55008 FROM_INDEX Ljava/util/function/IntFunction; FIELD field_55009 index I + FIELD field_55967 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;ILjava/lang/String;IF)V ARG 3 id ARG 4 index diff --git a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping index b3c1279474..e21eda3319 100644 --- a/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping +++ b/mappings/net/minecraft/entity/passive/TropicalFishEntity.mapping @@ -1,5 +1,6 @@ CLASS net/minecraft/class_1474 net/minecraft/entity/passive/TropicalFishEntity FIELD field_41573 COMMON_VARIANTS Ljava/util/List; + FIELD field_55968 DEFAULT_VARIANT Lnet/minecraft/class_1474$class_7992; FIELD field_6874 VARIANT Lnet/minecraft/class_2940; FIELD field_6877 commonSpawn Z METHOD method_38985 canTropicalFishSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z @@ -8,6 +9,8 @@ CLASS net/minecraft/class_1474 net/minecraft/entity/passive/TropicalFishEntity ARG 2 reason ARG 3 pos ARG 4 random + METHOD method_47860 setVariety (Lnet/minecraft/class_1474$class_1475;)V + ARG 1 variety METHOD method_47861 getVariantId (Lnet/minecraft/class_1474$class_1475;Lnet/minecraft/class_1767;Lnet/minecraft/class_1767;)I ARG 0 variety ARG 1 baseColor @@ -19,12 +22,17 @@ CLASS net/minecraft/class_1474 net/minecraft/entity/passive/TropicalFishEntity ARG 1 variant METHOD method_6649 getToolTipForVariant (I)Ljava/lang/String; ARG 0 variant - METHOD method_6651 getPatternDyeColor (I)Lnet/minecraft/class_1767; + METHOD method_6651 getPatternColor (I)Lnet/minecraft/class_1767; ARG 0 variant - METHOD method_6652 getBaseDyeColor (I)Lnet/minecraft/class_1767; + METHOD method_6652 getBaseColor (I)Lnet/minecraft/class_1767; ARG 0 variant - METHOD method_6655 getPatternColorComponents ()Lnet/minecraft/class_1767; - METHOD method_6658 getBaseColorComponents ()Lnet/minecraft/class_1767; + METHOD method_6655 getPatternColor ()Lnet/minecraft/class_1767; + METHOD method_6658 getBaseColor ()Lnet/minecraft/class_1767; + METHOD method_66679 setBaseColor (Lnet/minecraft/class_1767;)V + ARG 1 baseColor + METHOD method_66680 setPatternColor (Lnet/minecraft/class_1767;)V + ARG 1 patternColor + METHOD method_66681 getVariety ()Lnet/minecraft/class_1474$class_1475; CLASS class_1475 Variety FIELD field_41578 CODEC Lcom/mojang/serialization/Codec; FIELD field_41579 BY_ID Ljava/util/function/IntFunction; @@ -32,6 +40,7 @@ CLASS net/minecraft/class_1474 net/minecraft/entity/passive/TropicalFishEntity FIELD field_41581 text Lnet/minecraft/class_2561; FIELD field_41582 size Lnet/minecraft/class_1474$class_7991; FIELD field_41583 id I + FIELD field_55969 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (Ljava/lang/String;ILjava/lang/String;Lnet/minecraft/class_1474$class_7991;I)V ARG 3 name ARG 4 size diff --git a/mappings/net/minecraft/entity/passive/WolfEntity.mapping b/mappings/net/minecraft/entity/passive/WolfEntity.mapping index cf35e6594b..a8a43a20c5 100644 --- a/mappings/net/minecraft/entity/passive/WolfEntity.mapping +++ b/mappings/net/minecraft/entity/passive/WolfEntity.mapping @@ -16,6 +16,7 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity FIELD field_6952 begAnimationProgress F METHOD method_18444 (Lnet/minecraft/class_1309;Lnet/minecraft/class_3218;)Z ARG 0 entity + ARG 1 world METHOD method_26897 createWolfAttributes ()Lnet/minecraft/class_5132$class_5133; METHOD method_31167 resetShake ()V METHOD method_39450 canSpawn (Lnet/minecraft/class_1299;Lnet/minecraft/class_1936;Lnet/minecraft/class_3730;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z @@ -31,8 +32,13 @@ CLASS net/minecraft/class_1493 net/minecraft/entity/passive/WolfEntity METHOD method_58060 (Lnet/minecraft/class_2960;)Lnet/minecraft/class_5321; ARG 0 variantId METHOD method_58061 getTextureId ()Lnet/minecraft/class_2960; + METHOD method_58062 getVariant ()Lnet/minecraft/class_6880; + METHOD method_58063 setVariant (Lnet/minecraft/class_6880;)V + ARG 1 variant METHOD method_58169 tryTame (Lnet/minecraft/class_1657;)V ARG 1 player + METHOD method_59937 (Lnet/minecraft/class_2487;Lnet/minecraft/class_5321;)V + ARG 1 key METHOD method_61477 getShakeProgress (F)F ARG 1 tickDelta METHOD method_6707 getFurWetBrightnessMultiplier (F)F diff --git a/mappings/net/minecraft/entity/player/PlayerEntity.mapping b/mappings/net/minecraft/entity/player/PlayerEntity.mapping index 64f3284a7b..cbbbabc698 100644 --- a/mappings/net/minecraft/entity/player/PlayerEntity.mapping +++ b/mappings/net/minecraft/entity/player/PlayerEntity.mapping @@ -183,6 +183,10 @@ CLASS net/minecraft/class_1657 net/minecraft/entity/player/PlayerEntity ARG 1 loaded METHOD method_66324 shouldSkipBlockDrops ()Z METHOD method_66325 getExpectedPose ()Lnet/minecraft/class_4050; + METHOD method_66695 openTestBlockScreen (Lnet/minecraft/class_10637;)V + ARG 1 testBlock + METHOD method_66696 openTestInstanceBlockScreen (Lnet/minecraft/class_10638;)V + ARG 1 testInstanceBlock METHOD method_7254 unlockRecipes (Ljava/util/Collection;)I ARG 1 recipes METHOD method_7255 addExperience (I)V diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index 1d910df29c..679555d2d8 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -394,6 +394,9 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 2 world ARG 3 pos ARG 4 player + METHOD method_66697 copy (Lnet/minecraft/class_9331;Lnet/minecraft/class_9473;)V + ARG 1 type + ARG 2 from METHOD method_7909 getItem ()Lnet/minecraft/class_1792; COMMENT {@return the item of this stack} COMMENT diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index 52f851f481..fc20417023 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -1556,6 +1556,8 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items ARG 1 settings METHOD method_64296 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 settings + METHOD method_64657 (Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; + ARG 0 settings METHOD method_64658 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)Lnet/minecraft/class_1792; ARG 0 block ARG 1 settings diff --git a/mappings/net/minecraft/network/codec/PacketCodec.mapping b/mappings/net/minecraft/network/codec/PacketCodec.mapping index 9a52b61243..752ddd8237 100644 --- a/mappings/net/minecraft/network/codec/PacketCodec.mapping +++ b/mappings/net/minecraft/network/codec/PacketCodec.mapping @@ -203,6 +203,27 @@ CLASS net/minecraft/class_9139 net/minecraft/network/codec/PacketCodec ARG 14 codec8 ARG 15 from8 ARG 16 to + METHOD method_67079 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;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/Function9;)Lnet/minecraft/class_9139; + COMMENT {@return a codec for encoding nine 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 codec7 + ARG 13 from7 + ARG 14 codec8 + ARG 15 from8 + ARG 16 codec9 + ARG 17 from9 + ARG 18 to CLASS 8 FIELD field_49712 codecSupplier Ljava/util/function/Supplier; CLASS class_9140 ResultFunction diff --git a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping index 784f59b5e1..d46136df5a 100644 --- a/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ClientPlayPacketListener.mapping @@ -231,3 +231,5 @@ CLASS net/minecraft/class_2602 net/minecraft/network/listener/ClientPlayPacketLi ARG 1 packet METHOD method_64556 onRecipeBookSettings (Lnet/minecraft/class_10269;)V ARG 1 packet + METHOD method_66579 onTestInstanceBlockStatus (Lnet/minecraft/class_10614;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping index 4f362d5916..27be6c149b 100644 --- a/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping +++ b/mappings/net/minecraft/network/listener/ServerPlayPacketListener.mapping @@ -104,3 +104,7 @@ CLASS net/minecraft/class_2792 net/minecraft/network/listener/ServerPlayPacketLi ARG 1 packet METHOD method_65306 onPlayerLoaded (Lnet/minecraft/class_10387;)V ARG 1 packet + METHOD method_66581 onSetTestBlock (Lnet/minecraft/class_10615;)V + ARG 1 packet + METHOD method_66582 onTestInstanceBlockAction (Lnet/minecraft/class_10616;)V + ARG 1 packet diff --git a/mappings/net/minecraft/network/packet/c2s/play/SetTestBlockC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/SetTestBlockC2SPacket.mapping new file mode 100644 index 0000000000..714e4ea909 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/play/SetTestBlockC2SPacket.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_10615 net/minecraft/network/packet/c2s/play/SetTestBlockC2SPacket + FIELD field_55918 CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/network/packet/c2s/play/TestInstanceBlockActionC2SPacket.mapping b/mappings/net/minecraft/network/packet/c2s/play/TestInstanceBlockActionC2SPacket.mapping new file mode 100644 index 0000000000..71fc6d9ac0 --- /dev/null +++ b/mappings/net/minecraft/network/packet/c2s/play/TestInstanceBlockActionC2SPacket.mapping @@ -0,0 +1,15 @@ +CLASS net/minecraft/class_10616 net/minecraft/network/packet/c2s/play/TestInstanceBlockActionC2SPacket + FIELD field_55919 CODEC Lnet/minecraft/class_9139; + METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_10616$class_10617;Ljava/util/Optional;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;Z)V + ARG 1 pos + ARG 2 actin + CLASS class_10617 Action + FIELD field_55927 CODEC Lnet/minecraft/class_9139; + FIELD field_55928 INDEX_MAPPER Ljava/util/function/IntFunction; + FIELD field_55929 index I + METHOD (Ljava/lang/String;II)V + ARG 3 index + METHOD method_66586 (Lnet/minecraft/class_10616$class_10617;)I + ARG 0 action + METHOD method_66587 (Lnet/minecraft/class_10616$class_10617;)I + ARG 0 action diff --git a/mappings/net/minecraft/network/packet/s2c/play/TestInstanceBlockStatusS2CPacket.mapping b/mappings/net/minecraft/network/packet/s2c/play/TestInstanceBlockStatusS2CPacket.mapping new file mode 100644 index 0000000000..5ecc3b6996 --- /dev/null +++ b/mappings/net/minecraft/network/packet/s2c/play/TestInstanceBlockStatusS2CPacket.mapping @@ -0,0 +1,2 @@ +CLASS net/minecraft/class_10614 net/minecraft/network/packet/s2c/play/TestInstanceBlockStatusS2CPacket + FIELD field_55914 CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/predicate/ComponentPredicate.mapping b/mappings/net/minecraft/predicate/ComponentPredicate.mapping index 2f7b1f82e2..de1203b74b 100644 --- a/mappings/net/minecraft/predicate/ComponentPredicate.mapping +++ b/mappings/net/minecraft/predicate/ComponentPredicate.mapping @@ -16,9 +16,14 @@ CLASS net/minecraft/class_9329 net/minecraft/predicate/ComponentPredicate METHOD method_57869 (Lnet/minecraft/class_9329;)Ljava/util/Map; ARG 0 predicate METHOD method_57870 toChanges ()Lnet/minecraft/class_9326; + METHOD method_58760 (Lnet/minecraft/class_9336;)Z + ARG 0 component METHOD method_64096 ofFiltered (Lnet/minecraft/class_9323;[Lnet/minecraft/class_9331;)Lnet/minecraft/class_9329; ARG 0 components ARG 1 types + METHOD method_66877 of (Lnet/minecraft/class_9331;Ljava/lang/Object;)Lnet/minecraft/class_9329; + ARG 0 type + ARG 1 value METHOD test (Ljava/lang/Object;)Z ARG 1 components CLASS class_9330 Builder diff --git a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping index 37e6a7a84d..ef9af8a699 100644 --- a/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping +++ b/mappings/net/minecraft/predicate/entity/EntityPredicate.mapping @@ -44,6 +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_9602 distance Ljava/util/Optional; FIELD field_9603 nbt Ljava/util/Optional; FIELD field_9605 effects Ljava/util/Optional; @@ -73,6 +74,8 @@ 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_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/registry/Registries.mapping b/mappings/net/minecraft/registry/Registries.mapping index 158162ce89..4f2494edb0 100644 --- a/mappings/net/minecraft/registry/Registries.mapping +++ b/mappings/net/minecraft/registry/Registries.mapping @@ -84,6 +84,9 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries FIELD field_54874 RECIPE_DISPLAY Lnet/minecraft/class_2378; FIELD field_54927 RECIPE_BOOK_CATEGORY Lnet/minecraft/class_2378; FIELD field_55881 TICKET_TYPE Lnet/minecraft/class_2378; + FIELD field_56154 TEST_ENVIRONMENT_DEFINITION_TYPE Lnet/minecraft/class_2378; + FIELD field_56155 TEST_INSTANCE_TYPE Lnet/minecraft/class_2378; + FIELD field_56156 TEST_FUNCTION Lnet/minecraft/class_2378; METHOD method_47452 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry METHOD method_47453 (Lnet/minecraft/class_2378;)Ljava/lang/Object; @@ -208,6 +211,8 @@ CLASS net/minecraft/class_7923 net/minecraft/registry/Registries ARG 0 registry METHOD method_66552 (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 0 registry + METHOD method_66903 (Lnet/minecraft/class_2378;)Ljava/lang/Object; + ARG 0 registry CLASS class_6889 Initializer METHOD run (Lnet/minecraft/class_2378;)Ljava/lang/Object; ARG 1 registry diff --git a/mappings/net/minecraft/state/property/Properties.mapping b/mappings/net/minecraft/state/property/Properties.mapping index 2e0a93b1ca..c2da2e0ca5 100644 --- a/mappings/net/minecraft/state/property/Properties.mapping +++ b/mappings/net/minecraft/state/property/Properties.mapping @@ -275,6 +275,8 @@ CLASS net/minecraft/class_2741 net/minecraft/state/property/Properties COMMENT A property that specifies the amount of segments in a segmented block. FIELD field_55830 CREAKING_HEART_STATE Lnet/minecraft/class_2754; COMMENT A property that specifies the state of a creaking heart. + FIELD field_56023 TEST_BLOCK_MODE Lnet/minecraft/class_2754; + COMMENT A property that specifies the mode of a test block. METHOD method_11813 (Lnet/minecraft/class_2768;)Z ARG 0 shape METHOD method_11814 (Lnet/minecraft/class_2350;)Z diff --git a/mappings/net/minecraft/test/BlockBasedTestInstance.mapping b/mappings/net/minecraft/test/BlockBasedTestInstance.mapping new file mode 100644 index 0000000000..47e771aea8 --- /dev/null +++ b/mappings/net/minecraft/test/BlockBasedTestInstance.mapping @@ -0,0 +1,13 @@ +CLASS net/minecraft/class_10654 net/minecraft/test/BlockBasedTestInstance + FIELD field_56162 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_66906 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_66909 (Lnet/minecraft/class_4516;Lnet/minecraft/class_10641;)Lnet/minecraft/class_2338; + ARG 1 context + ARG 2 mode + METHOD method_66911 (Lnet/minecraft/class_4516;Lnet/minecraft/class_10641;Ljava/util/function/Consumer;)V + ARG 1 context + ARG 2 mode + METHOD method_66914 (Lnet/minecraft/class_4516;Lnet/minecraft/class_10641;)Ljava/util/List; + ARG 1 context + ARG 2 mode diff --git a/mappings/net/minecraft/test/FunctionTestInstance.mapping b/mappings/net/minecraft/test/FunctionTestInstance.mapping new file mode 100644 index 0000000000..2f1afc52b2 --- /dev/null +++ b/mappings/net/minecraft/test/FunctionTestInstance.mapping @@ -0,0 +1,9 @@ +CLASS net/minecraft/class_10657 net/minecraft/test/FunctionTestInstance + FIELD field_56166 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_56167 function Lnet/minecraft/class_6880; + METHOD (Lnet/minecraft/class_6880;Lnet/minecraft/class_10664;)V + ARG 1 function + ARG 2 data + METHOD method_66921 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_66923 getFunction ()Lnet/minecraft/class_6880; diff --git a/mappings/net/minecraft/test/TestData.mapping b/mappings/net/minecraft/test/TestData.mapping new file mode 100644 index 0000000000..65ef0a52bb --- /dev/null +++ b/mappings/net/minecraft/test/TestData.mapping @@ -0,0 +1,19 @@ +CLASS net/minecraft/class_10664 net/minecraft/test/TestData + FIELD field_56199 CODEC Lcom/mojang/serialization/MapCodec; + METHOD (Ljava/lang/Object;Lnet/minecraft/class_2960;IIZ)V + ARG 1 environment + ARG 2 structure + ARG 3 maxTicks + ARG 4 setupTicks + ARG 5 required + METHOD (Ljava/lang/Object;Lnet/minecraft/class_2960;IIZLnet/minecraft/class_2470;)V + ARG 1 environment + ARG 2 structure + ARG 3 maxTicks + ARG 4 setupTicks + ARG 5 required + ARG 6 rotation + METHOD method_67048 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_67049 applyToEnvironment (Ljava/util/function/Function;)Lnet/minecraft/class_10664; + ARG 1 environmentFunction diff --git a/mappings/net/minecraft/test/TestEnvironmentDefinition.mapping b/mappings/net/minecraft/test/TestEnvironmentDefinition.mapping new file mode 100644 index 0000000000..64fca04aeb --- /dev/null +++ b/mappings/net/minecraft/test/TestEnvironmentDefinition.mapping @@ -0,0 +1,68 @@ +CLASS net/minecraft/class_10665 net/minecraft/test/TestEnvironmentDefinition + FIELD field_56200 CODEC Lcom/mojang/serialization/Codec; + FIELD field_56201 ENTRY_CODEC Lcom/mojang/serialization/Codec; + METHOD method_67050 getCodec ()Lcom/mojang/serialization/MapCodec; + METHOD method_67051 setup (Lnet/minecraft/class_3218;)V + ARG 1 world + METHOD method_67053 registerAndGetDefault (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/MapCodec; + ARG 0 registry + METHOD method_67054 teardown (Lnet/minecraft/class_3218;)V + ARG 1 world + CLASS class_10666 AllOf + FIELD field_56202 CODEC Lcom/mojang/serialization/MapCodec; + METHOD ([Lnet/minecraft/class_10665;)V + ARG 1 definitionTypes + METHOD method_67055 (Lnet/minecraft/class_3218;Lnet/minecraft/class_6880;)V + ARG 1 definition + METHOD method_67056 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_67057 (Lnet/minecraft/class_3218;Lnet/minecraft/class_6880;)V + ARG 1 definition + CLASS class_10667 Function + FIELD field_56203 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_56204 LOGGER Lorg/slf4j/Logger; + METHOD method_67058 executeFunction (Lnet/minecraft/class_3218;Lnet/minecraft/class_2960;)V + ARG 0 world + ARG 1 functionId + METHOD method_67059 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_67060 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2960;)V + ARG 1 functionId + METHOD method_67061 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2960;)V + ARG 1 functionId + CLASS class_10668 GameRules + FIELD field_56205 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_67062 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_67063 ruleValue (Lnet/minecraft/class_1928$class_4313;Ljava/lang/Object;)Lnet/minecraft/class_10665$class_10668$class_10669; + ARG 0 key + ARG 1 value + CLASS class_10669 RuleValue + METHOD method_67064 createCodec (Ljava/lang/Class;Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; + ARG 0 ruleClass + ARG 1 valueCodec + METHOD method_67065 (Ljava/lang/Class;Lcom/mojang/serialization/Codec;Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 2 instance + CLASS class_10670 TimeOfDay + FIELD field_56206 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_67066 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_10671 Raining + FIELD field_56207 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_67067 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_10672 Weather + FIELD field_56211 CODEC Lcom/mojang/serialization/Codec; + FIELD field_56212 name Ljava/lang/String; + FIELD field_56213 clearDuration I + FIELD field_56214 rainDuration I + FIELD field_56215 raining Z + FIELD field_56216 thundering Z + METHOD (Ljava/lang/String;ILjava/lang/String;IIZZ)V + ARG 3 name + ARG 4 clearDuration + ARG 5 rainDuration + ARG 6 raining + ARG 7 thundering + METHOD method_67069 apply (Lnet/minecraft/class_3218;)V + ARG 1 world diff --git a/mappings/net/minecraft/test/TestEnvironments.mapping b/mappings/net/minecraft/test/TestEnvironments.mapping new file mode 100644 index 0000000000..b11698e4e9 --- /dev/null +++ b/mappings/net/minecraft/test/TestEnvironments.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_10659 net/minecraft/test/TestEnvironments + FIELD field_56171 DEFAULT_ID Ljava/lang/String; + METHOD method_66932 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 id + METHOD method_66933 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 registry diff --git a/mappings/net/minecraft/test/TestFunctions.mapping b/mappings/net/minecraft/test/TestFunctions.mapping new file mode 100644 index 0000000000..0f987d817c --- /dev/null +++ b/mappings/net/minecraft/test/TestFunctions.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_10655 net/minecraft/test/TestFunctions + METHOD method_66915 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 id + METHOD method_66917 registerAndGetDefault (Lnet/minecraft/class_2378;)Ljava/util/function/Consumer; + ARG 0 registry diff --git a/mappings/net/minecraft/test/TestInstance.mapping b/mappings/net/minecraft/test/TestInstance.mapping new file mode 100644 index 0000000000..0677e9a2d1 --- /dev/null +++ b/mappings/net/minecraft/test/TestInstance.mapping @@ -0,0 +1,37 @@ +CLASS net/minecraft/class_10660 net/minecraft/test/TestInstance + FIELD field_56177 data Lnet/minecraft/class_10664; + FIELD field_56178 CODEC Lcom/mojang/serialization/Codec; + METHOD (Lnet/minecraft/class_10664;)V + ARG 1 data + METHOD method_66905 getCodec ()Lcom/mojang/serialization/MapCodec; + METHOD method_66907 (Lnet/minecraft/class_4516;)V + ARG 1 context + METHOD method_66912 getTypeDescription ()Lnet/minecraft/class_5250; + METHOD method_66922 getDescription ()Lnet/minecraft/class_2561; + METHOD method_66957 (Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/MapCodec; + ARG 0 codec + METHOD method_66958 getFormattedDescription (Ljava/lang/String;Ljava/lang/String;)Lnet/minecraft/class_5250; + ARG 1 key + ARG 2 description + METHOD method_66959 getFormattedDescription (Ljava/lang/String;Lnet/minecraft/class_5250;)Lnet/minecraft/class_5250; + ARG 1 key + ARG 2 description + METHOD method_66960 registerAndGetDefault (Lnet/minecraft/class_2378;)Lcom/mojang/serialization/MapCodec; + ARG 0 registry + METHOD method_66961 register (Lnet/minecraft/class_2378;Ljava/lang/String;Lcom/mojang/serialization/MapCodec;)Lcom/mojang/serialization/MapCodec; + ARG 0 registry + ARG 1 id + ARG 2 codec + METHOD method_66962 getEnvironment ()Lnet/minecraft/class_6880; + METHOD method_66963 getStructure ()Lnet/minecraft/class_2960; + METHOD method_66964 getMaxTicks ()I + METHOD method_66965 getSetupTicks ()I + METHOD method_66966 isRequired ()Z + METHOD method_66967 isManualOnly ()Z + METHOD method_66968 getMaxAttempts ()I + METHOD method_66969 getRequiredSuccesses ()I + METHOD method_66970 requiresSkyAccess ()Z + METHOD method_66971 getRotation ()Lnet/minecraft/class_2470; + METHOD method_66972 getData ()Lnet/minecraft/class_10664; + METHOD method_66973 getFormattedTypeDescription ()Lnet/minecraft/class_5250; + METHOD method_66974 getStructureAndBatchDescription ()Lnet/minecraft/class_2561; diff --git a/mappings/net/minecraft/test/TestInstances.mapping b/mappings/net/minecraft/test/TestInstances.mapping new file mode 100644 index 0000000000..d871b8c6ee --- /dev/null +++ b/mappings/net/minecraft/test/TestInstances.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_10661 net/minecraft/test/TestInstances + METHOD method_66975 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 id + METHOD method_66976 bootstrap (Lnet/minecraft/class_7891;)V + ARG 0 registry diff --git a/mappings/net/minecraft/util/BlockRotation.mapping b/mappings/net/minecraft/util/BlockRotation.mapping index 5bd2db08b3..9a2f563aec 100644 --- a/mappings/net/minecraft/util/BlockRotation.mapping +++ b/mappings/net/minecraft/util/BlockRotation.mapping @@ -2,6 +2,13 @@ CLASS net/minecraft/class_2470 net/minecraft/util/BlockRotation FIELD field_23264 directionTransformation Lnet/minecraft/class_4990; FIELD field_39313 CODEC Lcom/mojang/serialization/Codec; FIELD field_39314 id Ljava/lang/String; + FIELD field_55986 INDEX_MAPPER Ljava/util/function/IntFunction; + FIELD field_55987 PACKET_CODEC Lnet/minecraft/class_9139; + FIELD field_55988 index I + METHOD (Ljava/lang/String;IILjava/lang/String;Lnet/minecraft/class_4990;)V + ARG 3 index + ARG 4 id + ARG 5 directionTransformation METHOD method_10501 rotate (Lnet/minecraft/class_2470;)Lnet/minecraft/class_2470; ARG 1 rotation METHOD method_10502 rotate (II)I @@ -14,3 +21,4 @@ CLASS net/minecraft/class_2470 net/minecraft/util/BlockRotation METHOD method_16548 random (Lnet/minecraft/class_5819;)Lnet/minecraft/class_2470; ARG 0 random METHOD method_26383 getDirectionTransformation ()Lnet/minecraft/class_4990; + METHOD method_66710 getIndex ()I diff --git a/mappings/net/minecraft/util/function/ValueLists.mapping b/mappings/net/minecraft/util/function/ValueLists.mapping index 00ef0af568..65ddd82ba4 100644 --- a/mappings/net/minecraft/util/function/ValueLists.mapping +++ b/mappings/net/minecraft/util/function/ValueLists.mapping @@ -3,15 +3,15 @@ CLASS net/minecraft/class_7995 net/minecraft/util/function/ValueLists ARG 3 index METHOD method_47912 (Ljava/util/function/IntFunction;Ljava/lang/Object;I)Ljava/lang/Object; ARG 2 index - METHOD method_47913 createIdToValueFunction (Ljava/util/function/ToIntFunction;[Ljava/lang/Object;)Ljava/util/function/IntFunction; - ARG 0 valueToIdFunction + METHOD method_47913 createIndexToValueFunction (Ljava/util/function/ToIntFunction;[Ljava/lang/Object;)Ljava/util/function/IntFunction; + ARG 0 valueToIndexFunction ARG 1 values - METHOD method_47914 createIdToValueFunction (Ljava/util/function/ToIntFunction;[Ljava/lang/Object;Lnet/minecraft/class_7995$class_7996;)Ljava/util/function/IntFunction; - ARG 0 valueToIdFunction + METHOD method_47914 createIndexToValueFunction (Ljava/util/function/ToIntFunction;[Ljava/lang/Object;Lnet/minecraft/class_7995$class_7996;)Ljava/util/function/IntFunction; + ARG 0 valueToIndexFunction ARG 1 values ARG 2 outOfBoundsHandling - METHOD method_47915 createIdToValueFunction (Ljava/util/function/ToIntFunction;[Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/function/IntFunction; - ARG 0 valueToIdFunction + METHOD method_47915 createIndexToValueFunction (Ljava/util/function/ToIntFunction;[Ljava/lang/Object;Ljava/lang/Object;)Ljava/util/function/IntFunction; + ARG 0 valueToIndexFunction ARG 1 values ARG 2 fallback METHOD method_47916 ([Ljava/lang/Object;II)Ljava/lang/Object; diff --git a/mappings/net/minecraft/util/math/Vec3i.mapping b/mappings/net/minecraft/util/math/Vec3i.mapping index ece86db580..d94b27a810 100644 --- a/mappings/net/minecraft/util/math/Vec3i.mapping +++ b/mappings/net/minecraft/util/math/Vec3i.mapping @@ -18,6 +18,7 @@ CLASS net/minecraft/class_2382 net/minecraft/util/math/Vec3i FIELD field_11175 x I FIELD field_11176 ZERO Lnet/minecraft/class_2382; FIELD field_25123 CODEC Lcom/mojang/serialization/Codec; + FIELD field_56131 PACKET_CODEC Lnet/minecraft/class_9139; METHOD (III)V ARG 1 x ARG 2 y diff --git a/mappings/net/minecraft/village/VillagerProfession.mapping b/mappings/net/minecraft/village/VillagerProfession.mapping index abacd78dac..af57cadac0 100644 --- a/mappings/net/minecraft/village/VillagerProfession.mapping +++ b/mappings/net/minecraft/village/VillagerProfession.mapping @@ -15,19 +15,42 @@ CLASS net/minecraft/class_3852 net/minecraft/village/VillagerProfession METHOD comp_822 secondaryJobSites ()Lcom/google/common/collect/ImmutableSet; METHOD comp_823 workSound ()Lnet/minecraft/class_3414; METHOD method_16926 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852; + ARG 0 registry + ARG 1 key + ARG 2 heldWorkstation + ARG 3 workSound METHOD method_19197 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Lnet/minecraft/class_5321;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852; + ARG 0 registry + ARG 1 key + ARG 2 heldWorkstation + ARG 3 gatherableItems + ARG 4 secondaryJobSites + ARG 5 workSound METHOD method_44005 (Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;)Z ARG 1 entry METHOD method_44006 (Lnet/minecraft/class_6880;)Z ARG 0 poiType METHOD method_44007 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852; - ARG 2 acquirableWorkstation + ARG 0 registry + ARG 1 key + ARG 2 heldWorkstation + ARG 3 acquirableWorkstation + ARG 4 workSound METHOD method_44008 register (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;Ljava/util/function/Predicate;Ljava/util/function/Predicate;Lcom/google/common/collect/ImmutableSet;Lcom/google/common/collect/ImmutableSet;Lnet/minecraft/class_3414;)Lnet/minecraft/class_3852; - ARG 2 acquirableWorkstation - ARG 4 secondaryJobSites + ARG 0 registry + ARG 1 key + ARG 2 heldWorkstation + ARG 3 acquirableWorkstation + ARG 4 gatherableItems + ARG 5 secondaryJobSites + ARG 6 workSound METHOD method_44009 (Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;)Z ARG 1 entry METHOD method_44321 (Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;)Z ARG 1 entry METHOD method_44322 (Lnet/minecraft/class_5321;Lnet/minecraft/class_6880;)Z ARG 1 entry + METHOD method_66691 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 id + METHOD method_66692 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3852; + ARG 0 registry diff --git a/mappings/net/minecraft/village/VillagerType.mapping b/mappings/net/minecraft/village/VillagerType.mapping index a77fd5e8da..96ca5911ec 100644 --- a/mappings/net/minecraft/village/VillagerType.mapping +++ b/mappings/net/minecraft/village/VillagerType.mapping @@ -7,8 +7,16 @@ CLASS net/minecraft/class_3854 net/minecraft/village/VillagerType FIELD field_17076 SWAMP Lnet/minecraft/class_5321; FIELD field_17077 TAIGA Lnet/minecraft/class_5321; FIELD field_17078 BIOME_TO_TYPE Ljava/util/Map; + FIELD field_55975 CODEC Lcom/mojang/serialization/Codec; + FIELD field_55976 PACKET_CODEC Lnet/minecraft/class_9139; METHOD method_16930 forBiome (Lnet/minecraft/class_6880;)Lnet/minecraft/class_5321; ARG 0 biomeEntry METHOD method_16931 create (Lnet/minecraft/class_2378;Lnet/minecraft/class_5321;)Lnet/minecraft/class_3854; + ARG 0 registry + ARG 1 key METHOD method_16932 (Ljava/util/HashMap;)V ARG 0 map + METHOD method_66693 of (Ljava/lang/String;)Lnet/minecraft/class_5321; + ARG 0 id + METHOD method_66694 registerAndGetDefault (Lnet/minecraft/class_2378;)Lnet/minecraft/class_3854; + ARG 0 registry diff --git a/mappings/net/minecraft/world/GameRules.mapping b/mappings/net/minecraft/world/GameRules.mapping index 26f2db8cfa..ca39781b50 100644 --- a/mappings/net/minecraft/world/GameRules.mapping +++ b/mappings/net/minecraft/world/GameRules.mapping @@ -99,6 +99,14 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules METHOD method_61727 (Lnet/minecraft/server/MinecraftServer;Lnet/minecraft/class_1928$class_4312;)V ARG 0 server ARG 1 value + METHOD method_66702 getRuleType (Lnet/minecraft/class_1928$class_4313;)Lnet/minecraft/class_1928$class_4314; + ARG 0 key + METHOD method_66703 createKeyCodec (Ljava/lang/Class;)Lcom/mojang/serialization/Codec; + ARG 0 ruleClass + METHOD method_66705 (Ljava/lang/Class;Ljava/util/Map$Entry;)Z + ARG 1 ruleType + METHOD method_66707 (Ljava/lang/String;Lnet/minecraft/class_1928$class_4313;)Z + ARG 1 key METHOD method_8355 getBoolean (Lnet/minecraft/class_1928$class_4313;)Z ARG 1 rule METHOD method_8356 getInt (Lnet/minecraft/class_1928$class_4313;)I @@ -203,11 +211,14 @@ CLASS net/minecraft/class_1928 net/minecraft/world/GameRules FIELD field_19416 changeCallback Ljava/util/function/BiConsumer; FIELD field_24104 ruleAcceptor Lnet/minecraft/class_1928$class_5199; FIELD field_52616 requiredFeatures Lnet/minecraft/class_7699; + FIELD field_55983 ruleClass Ljava/lang/Class; METHOD (Ljava/util/function/Supplier;Ljava/util/function/Function;Ljava/util/function/BiConsumer;Lnet/minecraft/class_1928$class_5199;Ljava/lang/Class;Lnet/minecraft/class_7699;)V ARG 1 argumentType ARG 2 ruleFactory ARG 3 changeCallback ARG 4 ruleAcceptor + ARG 5 ruleClass + ARG 6 requiredFeatures METHOD method_20773 createRule ()Lnet/minecraft/class_1928$class_4315; METHOD method_20775 argument (Ljava/lang/String;)Lcom/mojang/brigadier/builder/RequiredArgumentBuilder; ARG 1 name From 65b20745380506825d3b255e24b9667cc9ed65a3 Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Thu, 16 Jan 2025 19:29:43 +1100 Subject: [PATCH 2/2] a little more --- .../net/minecraft/block/TestBlock.mapping | 2 +- .../block/dispenser/DispenserBehavior.mapping | 14 +++++++ .../entity/StructureBlockBlockEntity.mapping | 10 ++++- .../entity/StructureBoxRendering.mapping | 12 ++++++ .../block/entity/TestBlockEntity.mapping | 4 ++ .../entity/TestInstanceBlockEntity.mapping | 42 ++++++++++++++++++- .../StructureBlockBlockEntityRenderer.mapping | 12 ++++++ .../VillagerClothingFeatureRenderer.mapping | 8 ++++ mappings/net/minecraft/entity/Entity.mapping | 4 +- .../net/minecraft/entity/EntityType.mapping | 5 +++ .../minecraft/entity/EquipmentSlot.mapping | 1 + .../entity/ExperienceOrbEntity.mapping | 5 ++- .../entity/mob/ShulkerEntity.mapping | 3 ++ .../server/command/TestCommand.mapping | 14 +++++++ .../server/world/ServerWorld.mapping | 4 ++ .../net/minecraft/test/GameTestState.mapping | 10 +++++ .../minecraft/test/StructureTestUtil.mapping | 6 +++ 17 files changed, 150 insertions(+), 6 deletions(-) create mode 100644 mappings/net/minecraft/block/entity/StructureBoxRendering.mapping diff --git a/mappings/net/minecraft/block/TestBlock.mapping b/mappings/net/minecraft/block/TestBlock.mapping index db5d240e8e..e46205a79d 100644 --- a/mappings/net/minecraft/block/TestBlock.mapping +++ b/mappings/net/minecraft/block/TestBlock.mapping @@ -4,6 +4,6 @@ CLASS net/minecraft/class_10631 net/minecraft/block/TestBlock METHOD method_66711 applyBlockStateToStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_10641;)Lnet/minecraft/class_1799; ARG 0 stack ARG 1 mode - METHOD method_66712 (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_10637; + METHOD method_66712 getBlockEntityOnServer (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_10637; 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 da332d3b53..cc3ff53753 100644 --- a/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping +++ b/mappings/net/minecraft/block/dispenser/DispenserBehavior.mapping @@ -8,14 +8,26 @@ 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 + ARG 0 state + METHOD method_66901 pickUpFluid (Lnet/minecraft/class_2342;Lnet/minecraft/class_1799;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1799; + ARG 1 pointer + ARG 2 inputStack + ARG 3 outputStack CLASS 4 CLASS 5 + METHOD method_66902 (Lnet/minecraft/class_1792;)V + ARG 0 item CLASS 6 CLASS 7 FIELD field_49137 fallbackBehavior Lnet/minecraft/class_2347; @@ -23,3 +35,5 @@ CLASS net/minecraft/class_2357 net/minecraft/block/dispenser/DispenserBehavior METHOD method_58765 (Lnet/minecraft/class_2350;Lnet/minecraft/class_1531;)V ARG 1 armorStand CLASS 9 + METHOD method_58766 (Lnet/minecraft/class_1492;)Z + ARG 0 donkey diff --git a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping index a94b367966..c381217440 100644 --- a/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/StructureBlockBlockEntity.mapping @@ -47,7 +47,7 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt ARG 1 metadata METHOD method_11365 saveStructure ()Z METHOD method_11366 saveStructure (Z)Z - ARG 1 interactive + ARG 1 toDisk METHOD method_11367 shouldIgnoreEntities ()Z METHOD method_11370 setIntegrity (F)V ARG 1 integrity @@ -105,4 +105,12 @@ CLASS net/minecraft/class_2633 net/minecraft/block/entity/StructureBlockBlockEnt ARG 1 world METHOD method_66476 setStrict (Z)V METHOD method_66477 isStrict ()Z + METHOD method_66717 saveStructure (Lnet/minecraft/class_3218;Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;ZLjava/lang/String;Z)Z + ARG 0 world + ARG 1 templateId + ARG 2 start + ARG 3 size + ARG 4 ignoreEntities + ARG 5 author + ARG 6 toDisk CLASS class_2634 Action diff --git a/mappings/net/minecraft/block/entity/StructureBoxRendering.mapping b/mappings/net/minecraft/block/entity/StructureBoxRendering.mapping new file mode 100644 index 0000000000..c15577967e --- /dev/null +++ b/mappings/net/minecraft/block/entity/StructureBoxRendering.mapping @@ -0,0 +1,12 @@ +CLASS net/minecraft/class_10634 net/minecraft/block/entity/StructureBoxRendering + METHOD method_66713 getRenderMode ()Lnet/minecraft/class_10634$class_10635; + METHOD method_66714 getStructureBox ()Lnet/minecraft/class_10634$class_10636; + CLASS class_10635 RenderMode + CLASS class_10636 StructureBox + METHOD method_66716 create (IIIIII)Lnet/minecraft/class_10634$class_10636; + ARG 0 minX + ARG 1 minY + ARG 2 minZ + ARG 3 maxX + ARG 4 maxY + ARG 5 maxZ diff --git a/mappings/net/minecraft/block/entity/TestBlockEntity.mapping b/mappings/net/minecraft/block/entity/TestBlockEntity.mapping index ba08835f82..120a97159f 100644 --- a/mappings/net/minecraft/block/entity/TestBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/TestBlockEntity.mapping @@ -3,6 +3,7 @@ CLASS net/minecraft/class_10637 net/minecraft/block/entity/TestBlockEntity FIELD field_55999 mode Lnet/minecraft/class_10641; FIELD field_56000 message Ljava/lang/String; FIELD field_56001 powered Z + FIELD field_56002 triggered Z METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state @@ -14,7 +15,10 @@ CLASS net/minecraft/class_10637 net/minecraft/block/entity/TestBlockEntity ARG 1 powered METHOD method_66722 isPowered ()Z METHOD method_66723 getMode ()Lnet/minecraft/class_10641; + METHOD method_66724 reset ()V + METHOD method_66725 trigger ()V METHOD method_66726 logMessage ()V + METHOD method_66727 hasTriggered ()Z METHOD method_66728 getMessage ()Ljava/lang/String; METHOD method_66729 update ()V METHOD method_66730 getBlock ()Lnet/minecraft/class_2248; diff --git a/mappings/net/minecraft/block/entity/TestInstanceBlockEntity.mapping b/mappings/net/minecraft/block/entity/TestInstanceBlockEntity.mapping index c17ccf5c3a..57df05bfa8 100644 --- a/mappings/net/minecraft/block/entity/TestInstanceBlockEntity.mapping +++ b/mappings/net/minecraft/block/entity/TestInstanceBlockEntity.mapping @@ -5,23 +5,62 @@ CLASS net/minecraft/class_10638 net/minecraft/block/entity/TestInstanceBlockEnti FIELD field_56006 SUCCESS_BEAM_SEGMENTS Ljava/util/List; FIELD field_56007 REQUIRED_FAIL_BEAM_SEGMENTS Ljava/util/List; FIELD field_56008 OPTIONAL_FAIL_BEAM_SEGMENTS Ljava/util/List; + FIELD field_56009 STRUCTURE_OFFSET Lnet/minecraft/class_2382; FIELD field_56010 data Lnet/minecraft/class_10638$class_10639; METHOD (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V ARG 1 pos ARG 2 state + METHOD method_66731 placeStructure ()Z + METHOD method_66732 getStartPos ()Lnet/minecraft/class_2338; + METHOD method_66733 placeBarriers ()V + METHOD method_66734 clearBarriers ()V METHOD method_66735 getTestEntry ()Ljava/util/Optional; + METHOD method_66736 getTransformedSize ()Lnet/minecraft/class_2382; + METHOD method_66737 discardEntities ()V + METHOD method_66738 setChunksForced ()V METHOD method_66739 (Lnet/minecraft/class_5321;)Lnet/minecraft/class_2561; ARG 0 key + METHOD method_66740 getStructureSize (Lnet/minecraft/class_3218;Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 0 world + ARG 1 testInstance + METHOD method_66741 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2960;)Ljava/util/Optional; + ARG 1 structureId + METHOD method_66744 placeStructure (Lnet/minecraft/class_3218;Lnet/minecraft/class_3499;)V + ARG 1 world + ARG 2 template METHOD method_66745 setData (Lnet/minecraft/class_10638$class_10639;)V ARG 1 data + METHOD method_66746 reset (Ljava/util/function/Consumer;)V + ARG 1 messageConsumer + METHOD method_66747 getStructurePos (Lnet/minecraft/class_2338;)Lnet/minecraft/class_2338; + ARG 0 pos METHOD method_66748 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;ZLjava/util/function/Consumer;Lnet/minecraft/class_2338;)V ARG 4 pos + METHOD method_66749 (Lnet/minecraft/class_6880$class_6883;)Ljava/lang/Boolean; + ARG 0 entry METHOD method_66750 (Lnet/minecraft/class_2487;Lnet/minecraft/class_2520;)V ARG 1 dataNbt METHOD method_66751 setErrorMessage (Lnet/minecraft/class_2561;)V ARG 1 errorMessage - METHOD method_66761 (Ljava/util/function/Consumer;)V + METHOD method_66752 getStructureTemplate (Lnet/minecraft/class_3218;Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 0 world + ARG 1 testInstance + METHOD method_66753 (Ljava/util/function/Consumer;)Ljava/util/Optional; + ARG 1 messageConsumer + METHOD method_66754 (Lnet/minecraft/class_2338;)V + ARG 1 pos + METHOD method_66755 (Lnet/minecraft/class_6880$class_6883;)Lnet/minecraft/class_2960; + ARG 0 entry + METHOD method_66756 (Lnet/minecraft/class_3218;Lnet/minecraft/class_5321;)Ljava/util/Optional; + ARG 1 template + METHOD method_66757 (Ljava/util/function/Consumer;)Z + ARG 1 messageConsumer + METHOD method_66758 (Lnet/minecraft/class_2338;)V + ARG 1 pos + METHOD method_66759 getBlockBox ()Lnet/minecraft/class_3341; + METHOD method_66761 forEachPos (Ljava/util/function/Consumer;)V ARG 1 posConsumer + METHOD method_66762 getBox ()Lnet/minecraft/class_238; METHOD method_66763 getTestKey ()Ljava/util/Optional; METHOD method_66764 getTestName ()Lnet/minecraft/class_2561; METHOD method_66765 shouldIgnoreEntities ()Z @@ -30,6 +69,7 @@ CLASS net/minecraft/class_10638 net/minecraft/block/entity/TestInstanceBlockEnti METHOD method_66768 getErrorMessage ()Ljava/util/Optional; METHOD method_66769 setFinished ()V METHOD method_66770 setRunning ()V + METHOD method_66772 getStructurePos ()Lnet/minecraft/class_2338; CLASS class_10639 Data FIELD field_56012 CODEC Lcom/mojang/serialization/Codec; FIELD field_56013 PACKET_CODEC Lnet/minecraft/class_9139; diff --git a/mappings/net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer.mapping b/mappings/net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer.mapping index 2c057675f2..44d3d0973f 100644 --- a/mappings/net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer.mapping +++ b/mappings/net/minecraft/client/render/block/entity/StructureBlockBlockEntityRenderer.mapping @@ -2,6 +2,18 @@ CLASS net/minecraft/class_838 net/minecraft/client/render/block/entity/Structure METHOD (Lnet/minecraft/class_5614$class_5615;)V ARG 1 ctx METHOD method_3585 renderInvisibleBlocks (Lnet/minecraft/class_2586;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_4597;Lnet/minecraft/class_4587;)V + ARG 1 entity + ARG 2 world + ARG 3 pos + ARG 4 size + ARG 5 vertexConsumers + ARG 6 matrices + METHOD method_61047 renderStructureVoids (Lnet/minecraft/class_2586;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_4588;Lnet/minecraft/class_4587;)V + ARG 1 entity + ARG 2 pos + ARG 3 size + ARG 4 vertexConsumer + ARG 5 matrices METHOD method_61048 (Lnet/minecraft/class_2338;Lnet/minecraft/class_2338;Lnet/minecraft/class_4587;Lnet/minecraft/class_4588;Lnet/minecraft/class_2350;III)V ARG 4 direction ARG 5 x diff --git a/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping b/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping index 7a2311ea32..a0c3ce9227 100644 --- a/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping +++ b/mappings/net/minecraft/client/render/entity/feature/VillagerClothingFeatureRenderer.mapping @@ -11,6 +11,9 @@ CLASS net/minecraft/class_3885 net/minecraft/client/render/entity/feature/Villag METHOD method_17152 (Lit/unimi/dsi/fastutil/ints/Int2ObjectOpenHashMap;)V ARG 0 levelToId METHOD method_17153 getHatType (Lit/unimi/dsi/fastutil/objects/Object2ObjectMap;Ljava/lang/String;Lnet/minecraft/class_6880;)Lnet/minecraft/class_3888$class_3889; + ARG 1 metadataMap + ARG 2 keyType + ARG 3 entry METHOD method_17155 getTexture (Ljava/lang/String;Lnet/minecraft/class_2960;)Lnet/minecraft/class_2960; ARG 1 keyType ARG 2 keyId @@ -18,3 +21,8 @@ CLASS net/minecraft/class_3885 net/minecraft/client/render/entity/feature/Villag ARG 0 resource METHOD method_45803 (Ljava/lang/String;Ljava/lang/String;)Ljava/lang/String; ARG 2 path + METHOD method_66857 (Ljava/lang/String;Lnet/minecraft/class_5321;)Lnet/minecraft/class_2960; + ARG 2 key + METHOD method_66858 getTexture (Ljava/lang/String;Lnet/minecraft/class_6880;)Lnet/minecraft/class_2960; + ARG 1 keyType + ARG 2 entry diff --git a/mappings/net/minecraft/entity/Entity.mapping b/mappings/net/minecraft/entity/Entity.mapping index 97886da936..6e479b2611 100644 --- a/mappings/net/minecraft/entity/Entity.mapping +++ b/mappings/net/minecraft/entity/Entity.mapping @@ -2279,7 +2279,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_66249 canMoveVoluntarily ()Z METHOD method_66250 spawnBubbleColumnParticles (Lnet/minecraft/class_2338;)V ARG 1 pos - METHOD method_66649 copyCustomNameFrom (Lnet/minecraft/class_9473;)V + METHOD method_66649 copyComponentsFrom (Lnet/minecraft/class_9473;)V ARG 1 from METHOD method_66650 copyComponentFrom (Lnet/minecraft/class_9473;Lnet/minecraft/class_9331;)Z ARG 1 from @@ -2287,7 +2287,7 @@ CLASS net/minecraft/class_1297 net/minecraft/entity/Entity METHOD method_66651 castComponentValue (Lnet/minecraft/class_9331;Ljava/lang/Object;)Ljava/lang/Object; ARG 0 type ARG 1 value - METHOD method_66652 copyCustomNameFrom (Lnet/minecraft/class_1799;)V + METHOD method_66652 copyComponentsFrom (Lnet/minecraft/class_1799;)V ARG 1 stack METHOD method_66653 setComponent (Lnet/minecraft/class_9331;Ljava/lang/Object;)V ARG 1 type diff --git a/mappings/net/minecraft/entity/EntityType.mapping b/mappings/net/minecraft/entity/EntityType.mapping index fbe68927d8..a73ca6472c 100644 --- a/mappings/net/minecraft/entity/EntityType.mapping +++ b/mappings/net/minecraft/entity/EntityType.mapping @@ -184,6 +184,11 @@ CLASS net/minecraft/class_1299 net/minecraft/entity/EntityType ARG 1 type ARG 2 world METHOD method_65893 canPotentiallyExecuteCommands ()Z + METHOD method_66662 (Lnet/minecraft/class_1799;Lnet/minecraft/class_1297;)V + ARG 1 entity + METHOD method_66663 componentsCopier (Ljava/util/function/Consumer;Lnet/minecraft/class_1799;)Ljava/util/function/Consumer; + ARG 0 chained + ARG 1 stack CLASS 1 METHOD method_31490 (Lnet/minecraft/class_1937;Lnet/minecraft/class_3730;Ljava/util/function/Consumer;Lnet/minecraft/class_2520;)V ARG 3 nbt diff --git a/mappings/net/minecraft/entity/EquipmentSlot.mapping b/mappings/net/minecraft/entity/EquipmentSlot.mapping index 93124b91df..f764db68b1 100644 --- a/mappings/net/minecraft/entity/EquipmentSlot.mapping +++ b/mappings/net/minecraft/entity/EquipmentSlot.mapping @@ -72,5 +72,6 @@ CLASS net/minecraft/class_1304 net/minecraft/entity/EquipmentSlot METHOD method_63621 (Lnet/minecraft/class_1304;)I ARG 0 slot METHOD method_63622 getIndex ()I + METHOD method_66664 increasesDroppedExperience ()Z CLASS class_1305 Type COMMENT The type of body item slot an {@link EquipmentSlot} targets. diff --git a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping index 5a36a47c8b..be629c58cd 100644 --- a/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping +++ b/mappings/net/minecraft/entity/ExperienceOrbEntity.mapping @@ -4,6 +4,7 @@ CLASS net/minecraft/class_1303 net/minecraft/entity/ExperienceOrbEntity FIELD field_30056 EXPENSIVE_UPDATE_INTERVAL I FIELD field_30058 MERGING_CHANCE_FRACTION I FIELD field_55662 interpolator Lnet/minecraft/class_10584; + FIELD field_55950 VALUE Lnet/minecraft/class_2940; FIELD field_6161 health I FIELD field_6162 target Lnet/minecraft/class_1657; FIELD field_6164 orbAge I @@ -46,7 +47,9 @@ CLASS net/minecraft/class_1303 net/minecraft/entity/ExperienceOrbEntity ARG 2 amount METHOD method_5918 roundToOrbSize (I)I ARG 0 value - METHOD method_5919 getExperienceAmount ()I + METHOD method_5919 getValue ()I METHOD method_5920 getOrbSize ()I METHOD method_5921 applyWaterMovement ()V METHOD method_66264 moveTowardsPlayer ()V + METHOD method_66666 setValue (I)V + ARG 1 value diff --git a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping index 756c9ed289..a6b76566fb 100644 --- a/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping +++ b/mappings/net/minecraft/entity/mob/ShulkerEntity.mapping @@ -40,6 +40,9 @@ CLASS net/minecraft/class_1606 net/minecraft/entity/mob/ShulkerEntity ARG 1 face METHOD method_47879 (Lnet/minecraft/class_1767;)Ljava/lang/Byte; ARG 0 color + METHOD method_47880 setColor (Ljava/util/Optional;)V + ARG 1 color + METHOD method_47881 getColorOptional ()Ljava/util/Optional; METHOD method_7115 getPeekAmount ()I METHOD method_7116 getOpenProgress (F)F ARG 1 delta diff --git a/mappings/net/minecraft/server/command/TestCommand.mapping b/mappings/net/minecraft/server/command/TestCommand.mapping index 7a394fc33f..79e6a5ed6f 100644 --- a/mappings/net/minecraft/server/command/TestCommand.mapping +++ b/mappings/net/minecraft/server/command/TestCommand.mapping @@ -1,4 +1,9 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand + FIELD field_56194 NO_TESTS_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_56195 TEST_INSTANCE_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_56196 EXPORT_STRUCTURES_NOT_FOUND_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_56197 NO_TEST_INSTANCES_EXCEPTION Lcom/mojang/brigadier/exceptions/SimpleCommandExceptionType; + FIELD field_56198 NO_TEST_CONTAINING_POS_EXCEPTION Lcom/mojang/brigadier/exceptions/Dynamic3CommandExceptionType; METHOD method_22264 executePos (Lnet/minecraft/class_2168;Ljava/lang/String;)I ARG 0 source ARG 1 variableName @@ -8,8 +13,11 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 3 y ARG 4 z METHOD method_22270 register (Lcom/mojang/brigadier/CommandDispatcher;Lnet/minecraft/class_7157;)V + ARG 0 dispatcher + ARG 1 registryAccess METHOD method_22282 executeExport (Lnet/minecraft/class_2168;Lnet/minecraft/class_6880;)I ARG 0 source + ARG 1 instance METHOD method_22288 (Lcom/mojang/brigadier/context/CommandContext;)I ARG 0 context METHOD method_23648 (Lcom/mojang/brigadier/context/CommandContext;)I @@ -17,6 +25,8 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand METHOD method_54850 getStructurePos (Lnet/minecraft/class_2168;)Lnet/minecraft/class_2338; ARG 0 source METHOD method_54904 checkStructure (Lnet/minecraft/class_2168;Lnet/minecraft/class_2960;)Z + ARG 0 source + ARG 1 templateId METHOD method_56254 stop ()I METHOD method_56256 (Lcom/mojang/brigadier/builder/ArgumentBuilder;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 extraConfigAdder @@ -27,6 +37,7 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 2 extraConfigAdder METHOD method_56259 start (Lnet/minecraft/class_2168;Lnet/minecraft/class_4520;)I ARG 0 source + ARG 1 context METHOD method_56260 (Lnet/minecraft/class_2168;Lnet/minecraft/class_9118;Lnet/minecraft/class_2338;)Ljava/util/Optional; ARG 2 pos METHOD method_56261 stream (Lnet/minecraft/class_2168;Lnet/minecraft/class_9118;Lnet/minecraft/class_10675;)Ljava/util/stream/Stream; @@ -40,8 +51,11 @@ CLASS net/minecraft/class_4527 net/minecraft/server/command/TestCommand ARG 3 rotationSteps METHOD method_56264 find (Lnet/minecraft/class_2338;Lnet/minecraft/class_2168;Lnet/minecraft/class_9118;)Ljava/util/Optional; ARG 0 pos + ARG 1 source ARG 2 config METHOD method_56267 reset (Lnet/minecraft/class_2168;Lnet/minecraft/class_4517;)I + ARG 0 source + ARG 1 state METHOD method_56268 testAttemptAndPlacementConfig (Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_10618;)Lcom/mojang/brigadier/builder/ArgumentBuilder; ARG 0 builder METHOD method_56270 (Lnet/minecraft/class_4517;)V diff --git a/mappings/net/minecraft/server/world/ServerWorld.mapping b/mappings/net/minecraft/server/world/ServerWorld.mapping index 0691257ba6..4b9902a82f 100644 --- a/mappings/net/minecraft/server/world/ServerWorld.mapping +++ b/mappings/net/minecraft/server/world/ServerWorld.mapping @@ -372,6 +372,10 @@ CLASS net/minecraft/class_3218 net/minecraft/server/world/ServerWorld ARG 11 offsetY ARG 13 offsetZ ARG 15 speed + METHOD method_66017 (Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)V + ARG 2 newPoiType + METHOD method_66019 (Lnet/minecraft/class_2338;Lnet/minecraft/class_6880;)V + ARG 2 oldPoiType METHOD method_8448 updateSleepingPlayers ()V METHOD method_8487 locateStructure (Lnet/minecraft/class_6862;Lnet/minecraft/class_2338;IZ)Lnet/minecraft/class_2338; COMMENT Tries to find the closest structure of a given type near a given block. diff --git a/mappings/net/minecraft/test/GameTestState.mapping b/mappings/net/minecraft/test/GameTestState.mapping index 607c52c7e2..f98957c6dd 100644 --- a/mappings/net/minecraft/test/GameTestState.mapping +++ b/mappings/net/minecraft/test/GameTestState.mapping @@ -12,7 +12,12 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState FIELD field_47173 initialized Z FIELD field_47174 tickedOnce Z FIELD field_48469 testAttemptConfig Lnet/minecraft/class_9118; + FIELD field_56173 testInstance Lnet/minecraft/class_6880$class_6883; + FIELD field_56174 testBlockPos Lnet/minecraft/class_2338; + FIELD field_56175 rotation Lnet/minecraft/class_2470; + FIELD field_56176 blockEntity Lnet/minecraft/class_10638; METHOD (Lnet/minecraft/class_6880$class_6883;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;Lnet/minecraft/class_9118;)V + ARG 1 testInstance ARG 2 rotation ARG 3 world ARG 4 testAttemptConfig @@ -67,3 +72,8 @@ CLASS net/minecraft/class_4517 net/minecraft/test/GameTestState METHOD method_56213 initializeImmediately ()V METHOD method_56215 getTestAttemptConfig ()Lnet/minecraft/class_9118; METHOD method_64385 getOrigin ()Lnet/minecraft/class_2338; + METHOD method_66949 setTestBlockPos (Lnet/minecraft/class_2338;)V + ARG 1 testBlockPos + METHOD method_66952 (Lnet/minecraft/class_4518;)V + ARG 1 listener + METHOD method_66953 getTestInstanceBlockEntity ()Lnet/minecraft/class_10638; diff --git a/mappings/net/minecraft/test/StructureTestUtil.mapping b/mappings/net/minecraft/test/StructureTestUtil.mapping index 833e0f1c24..b11d4bf79f 100644 --- a/mappings/net/minecraft/test/StructureTestUtil.mapping +++ b/mappings/net/minecraft/test/StructureTestUtil.mapping @@ -48,3 +48,9 @@ CLASS net/minecraft/class_4525 net/minecraft/test/StructureTestUtil ARG 0 pos ARG 1 radius ARG 2 world + METHOD method_66992 createTestInstanceBlockEntity (Lnet/minecraft/class_2960;Lnet/minecraft/class_2338;Lnet/minecraft/class_2382;Lnet/minecraft/class_2470;Lnet/minecraft/class_3218;)Lnet/minecraft/class_10638; + ARG 0 testInstanceId + ARG 1 pos + ARG 2 size + ARG 3 rotation + ARG 4 world