From ed98156faed98374aa8a284cbe4419668983483a Mon Sep 17 00:00:00 2001 From: Matias Koivikko Date: Wed, 8 Jan 2025 18:57:12 +0200 Subject: [PATCH] 25w02a changes (#4077) * Map flower and leaf litter changes * Map leaf block changes and some of the related particle changes\ Got confused by the particle math and unused fields * Map text changes * Map fill command changes * Address review comment --- .../net/minecraft/block/AbstractBlock.mapping | 2 + mappings/net/minecraft/block/Blocks.mapping | 18 ++++++ .../minecraft/block/FlowerbedBlock.mapping | 20 +++++++ .../minecraft/block/LeafLitterBlock.mapping | 5 ++ .../net/minecraft/block/LeavesBlock.mapping | 24 ++++++++ .../block/SegmentedFlowerBlock.mapping | 6 ++ .../client/particle/LeavesParticle.mapping | 10 ++++ .../argument/ArgumentReaderUtils.mapping | 11 ++++ .../argument/StyleArgumentType.mapping | 1 + .../type/WrittenBookContentComponent.mapping | 4 ++ mappings/net/minecraft/item/ItemStack.mapping | 3 + mappings/net/minecraft/item/Items.mapping | 2 + .../server/command/FillCommand.mapping | 58 ++++++++++++++++++- .../minecraft/sound/BlockSoundGroup.mapping | 1 + .../state/property/Properties.mapping | 1 + .../net/minecraft/text/ClickEvent.mapping | 33 +++++++++++ .../net/minecraft/text/HoverEvent.mapping | 16 +++++ .../net/minecraft/text/TextCodecs.mapping | 8 +++ .../net/minecraft/util/JsonHelper.mapping | 18 ++++++ .../minecraft/util/JsonReaderUtils.mapping | 4 -- .../net/minecraft/util/dynamic/Codecs.mapping | 4 ++ 21 files changed, 244 insertions(+), 5 deletions(-) create mode 100644 mappings/net/minecraft/block/FlowerbedBlock.mapping create mode 100644 mappings/net/minecraft/block/LeafLitterBlock.mapping create mode 100644 mappings/net/minecraft/block/SegmentedFlowerBlock.mapping create mode 100644 mappings/net/minecraft/command/argument/ArgumentReaderUtils.mapping delete mode 100644 mappings/net/minecraft/util/JsonReaderUtils.mapping diff --git a/mappings/net/minecraft/block/AbstractBlock.mapping b/mappings/net/minecraft/block/AbstractBlock.mapping index 8ae4f667eb..e3087f7fbf 100644 --- a/mappings/net/minecraft/block/AbstractBlock.mapping +++ b/mappings/net/minecraft/block/AbstractBlock.mapping @@ -268,6 +268,8 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock COMMENT COMMENT @see net.minecraft.resource.featuretoggle.FeatureFlags FIELD field_54005 translationKey Ljava/lang/String; + METHOD (Lnet/minecraft/class_4970$class_2251;)V + ARG 1 settings METHOD method_17454 createScreenHandlerFactory (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Lnet/minecraft/class_3908; COMMENT {@return the screen handler factory or {@code null} if screen handler cannot be created} COMMENT diff --git a/mappings/net/minecraft/block/Blocks.mapping b/mappings/net/minecraft/block/Blocks.mapping index 1660f903b6..b3b66d06f1 100644 --- a/mappings/net/minecraft/block/Blocks.mapping +++ b/mappings/net/minecraft/block/Blocks.mapping @@ -1085,6 +1085,24 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks ARG 0 settings METHOD method_65146 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; ARG 0 settings + METHOD method_66409 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; + ARG 0 settings + METHOD method_66410 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; + ARG 0 settings + METHOD method_66411 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; + ARG 0 settings + METHOD method_66412 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; + ARG 0 settings + METHOD method_66413 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; + ARG 0 settings + METHOD method_66414 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; + ARG 0 settings + METHOD method_66415 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; + ARG 0 settings + METHOD method_66416 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; + ARG 0 settings + METHOD method_66417 (Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; + ARG 0 settings METHOD method_9492 register (Ljava/lang/String;Lnet/minecraft/class_4970$class_2251;)Lnet/minecraft/class_2248; ARG 0 id ARG 1 settings diff --git a/mappings/net/minecraft/block/FlowerbedBlock.mapping b/mappings/net/minecraft/block/FlowerbedBlock.mapping new file mode 100644 index 0000000000..4fd8b49b26 --- /dev/null +++ b/mappings/net/minecraft/block/FlowerbedBlock.mapping @@ -0,0 +1,20 @@ +CLASS net/minecraft/class_10596 net/minecraft/block/FlowerbedBlock + FIELD field_55789 SEGMENTS_PER_PLACEMENT I + FIELD field_55790 MAX_SEGMENTS I + FIELD field_55791 SEGMENT_AMOUNT Lnet/minecraft/class_2758; + METHOD method_66433 getHeight ()D + METHOD method_66434 getAmountProperty ()Lnet/minecraft/class_2758; + METHOD method_66463 getPlacementState (Lnet/minecraft/class_1750;Lnet/minecraft/class_2248;Lnet/minecraft/class_2758;Lnet/minecraft/class_2754;)Lnet/minecraft/class_2680; + ARG 1 context + ARG 2 block + ARG 3 amountProperty + ARG 4 directionProperty + METHOD method_66464 shouldAddSegment (Lnet/minecraft/class_2680;Lnet/minecraft/class_1750;Lnet/minecraft/class_2758;)Z + ARG 1 state + ARG 2 context + ARG 3 property + METHOD method_66465 buildShapeFunction (Lnet/minecraft/class_2754;Lnet/minecraft/class_2758;)Ljava/util/function/Function; + ARG 1 directionProperty + ARG 2 segementAmountProperty + METHOD method_66466 (Lnet/minecraft/class_2754;Lnet/minecraft/class_2758;Ljava/util/Map;Lnet/minecraft/class_2680;)Lnet/minecraft/class_265; + ARG 3 state diff --git a/mappings/net/minecraft/block/LeafLitterBlock.mapping b/mappings/net/minecraft/block/LeafLitterBlock.mapping new file mode 100644 index 0000000000..1fec3c2313 --- /dev/null +++ b/mappings/net/minecraft/block/LeafLitterBlock.mapping @@ -0,0 +1,5 @@ +CLASS net/minecraft/class_10595 net/minecraft/block/LeafLitterBlock + FIELD field_55769 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_55770 HORIZONTAL_FACING Lnet/minecraft/class_2754; + FIELD field_55771 shapeFunction Ljava/util/function/Function; + METHOD method_66440 buildShapeFunction ()Ljava/util/function/Function; diff --git a/mappings/net/minecraft/block/LeavesBlock.mapping b/mappings/net/minecraft/block/LeavesBlock.mapping index 090a212a03..a0bd09a4a6 100644 --- a/mappings/net/minecraft/block/LeavesBlock.mapping +++ b/mappings/net/minecraft/block/LeavesBlock.mapping @@ -4,6 +4,12 @@ CLASS net/minecraft/class_2397 net/minecraft/block/LeavesBlock FIELD field_31111 MAX_DISTANCE I FIELD field_38227 WATERLOGGED Lnet/minecraft/class_2746; FIELD field_46385 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_55772 leafParticle Lnet/minecraft/class_2394; + FIELD field_55773 leafParticleChance I + METHOD (ILnet/minecraft/class_2394;Lnet/minecraft/class_4970$class_2251;)V + ARG 1 leafParticleChance + ARG 2 leafParticle + ARG 3 settings METHOD method_10300 updateDistanceFromLogs (Lnet/minecraft/class_2680;Lnet/minecraft/class_1936;Lnet/minecraft/class_2338;)Lnet/minecraft/class_2680; ARG 0 state ARG 1 world @@ -14,3 +20,21 @@ CLASS net/minecraft/class_2397 net/minecraft/block/LeavesBlock ARG 1 state METHOD method_49817 getOptionalDistanceFromLog (Lnet/minecraft/class_2680;)Ljava/util/OptionalInt; ARG 0 state + METHOD method_66441 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_66442 spawnWaterParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)V + ARG 0 world + ARG 1 pos + ARG 2 random + ARG 3 state + ARG 4 posBelow + METHOD method_66443 (Lnet/minecraft/class_2397;)Lnet/minecraft/class_2394; + ARG 0 block + METHOD method_66444 spawnLeafParticle (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;)V + ARG 1 world + ARG 2 pos + ARG 3 random + ARG 4 state + ARG 5 posBelow + METHOD method_66445 (Lnet/minecraft/class_2397;)Ljava/lang/Integer; + ARG 0 block diff --git a/mappings/net/minecraft/block/SegmentedFlowerBlock.mapping b/mappings/net/minecraft/block/SegmentedFlowerBlock.mapping new file mode 100644 index 0000000000..3a529f265d --- /dev/null +++ b/mappings/net/minecraft/block/SegmentedFlowerBlock.mapping @@ -0,0 +1,6 @@ +CLASS net/minecraft/class_10594 net/minecraft/block/SegmentedFlowerBlock + FIELD field_55761 CODEC Lcom/mojang/serialization/MapCodec; + FIELD field_55762 HORIZONTAL_FACING Lnet/minecraft/class_2754; + FIELD field_55763 FLOWER_AMOUNT Lnet/minecraft/class_2758; + FIELD field_55764 shapeFunction Ljava/util/function/Function; + METHOD method_66435 buildShapeFunction ()Ljava/util/function/Function; diff --git a/mappings/net/minecraft/client/particle/LeavesParticle.mapping b/mappings/net/minecraft/client/particle/LeavesParticle.mapping index 568a175fa1..6511aaebab 100644 --- a/mappings/net/minecraft/client/particle/LeavesParticle.mapping +++ b/mappings/net/minecraft/client/particle/LeavesParticle.mapping @@ -1,10 +1,16 @@ CLASS net/minecraft/class_8253 net/minecraft/client/particle/LeavesParticle + FIELD field_43369 angularVelocity F + FIELD field_43371 angularAcceleration F + FIELD field_43372 SPEED_SCALE F METHOD (Lnet/minecraft/class_638;DDDLnet/minecraft/class_4002;FFZZFF)V ARG 1 world ARG 2 x ARG 4 y ARG 6 z ARG 8 spriteProvider + ARG 9 gravity + ARG 13 size + ARG 14 initialYVelocity CLASS class_10379 CherryLeavesFactory FIELD field_55133 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V @@ -13,3 +19,7 @@ CLASS net/minecraft/class_8253 net/minecraft/client/particle/LeavesParticle FIELD field_55134 spriteProvider Lnet/minecraft/class_4002; METHOD (Lnet/minecraft/class_4002;)V ARG 1 spriteProvider + CLASS class_10604 TintedLeavesFactory + FIELD field_55867 spriteProvider Lnet/minecraft/class_4002; + METHOD (Lnet/minecraft/class_4002;)V + ARG 1 spriteProvider diff --git a/mappings/net/minecraft/command/argument/ArgumentReaderUtils.mapping b/mappings/net/minecraft/command/argument/ArgumentReaderUtils.mapping new file mode 100644 index 0000000000..5619061212 --- /dev/null +++ b/mappings/net/minecraft/command/argument/ArgumentReaderUtils.mapping @@ -0,0 +1,11 @@ +CLASS net/minecraft/class_9010 net/minecraft/command/argument/ArgumentReaderUtils + METHOD method_58128 readWhileMatching (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_5462;)Ljava/lang/String; + ARG 0 stringReader + ARG 1 predicate + METHOD method_66491 (Lcom/mojang/brigadier/StringReader;ILcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;Ljava/lang/String;)Lcom/mojang/brigadier/exceptions/CommandSyntaxException; + ARG 3 error + METHOD method_66492 readSnbtCodec (Lcom/mojang/serialization/Codec;Lnet/minecraft/class_7225$class_7874;Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType;Lcom/mojang/brigadier/StringReader;)Ljava/lang/Object; + ARG 0 codec + ARG 1 registries + ARG 2 exceptionType + ARG 3 reader diff --git a/mappings/net/minecraft/command/argument/StyleArgumentType.mapping b/mappings/net/minecraft/command/argument/StyleArgumentType.mapping index 586c9d8e77..a9df1ac93e 100644 --- a/mappings/net/minecraft/command/argument/StyleArgumentType.mapping +++ b/mappings/net/minecraft/command/argument/StyleArgumentType.mapping @@ -1,6 +1,7 @@ CLASS net/minecraft/class_9019 net/minecraft/command/argument/StyleArgumentType FIELD field_47554 EXAMPLES Ljava/util/Collection; FIELD field_48932 registries Lnet/minecraft/class_7225$class_7874; + FIELD field_55866 INVALID_STYLE_EXCEPTION Lcom/mojang/brigadier/exceptions/DynamicCommandExceptionType; METHOD (Lnet/minecraft/class_7225$class_7874;)V ARG 1 registries METHOD method_55446 style (Lnet/minecraft/class_7157;)Lnet/minecraft/class_9019; diff --git a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping index 6df7747e52..478d798e60 100644 --- a/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping +++ b/mappings/net/minecraft/component/type/WrittenBookContentComponent.mapping @@ -33,3 +33,7 @@ CLASS net/minecraft/class_9302 net/minecraft/component/type/WrittenBookContentCo ARG 0 textCodec METHOD method_58437 createPageCodec (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/Codec; ARG 0 textCodec + METHOD method_66337 resolveInStack (Lnet/minecraft/class_1799;Lnet/minecraft/class_2168;Lnet/minecraft/class_1657;)Z + ARG 0 stack + ARG 1 commandSource + ARG 2 player diff --git a/mappings/net/minecraft/item/ItemStack.mapping b/mappings/net/minecraft/item/ItemStack.mapping index c8bed3026d..82b3d12062 100644 --- a/mappings/net/minecraft/item/ItemStack.mapping +++ b/mappings/net/minecraft/item/ItemStack.mapping @@ -53,6 +53,7 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack FIELD field_51397 VALIDATED_CODEC Lcom/mojang/serialization/Codec; FIELD field_51398 VALIDATED_UNCOUNTED_CODEC Lcom/mojang/serialization/Codec; FIELD field_55546 OPERATOR_WARNINGS Ljava/util/List; + FIELD field_55709 MAP_CODEC Lcom/mojang/serialization/MapCodec; FIELD field_8030 bobbingAnimationTime I FIELD field_8031 count I FIELD field_8033 LOGGER Lorg/slf4j/Logger; @@ -201,6 +202,8 @@ CLASS net/minecraft/class_1799 net/minecraft/item/ItemStack ARG 1 amount ARG 2 entity METHOD method_57351 getBreakSound ()Lnet/minecraft/class_3414; + METHOD method_57352 (Lcom/mojang/serialization/Codec;)Lcom/mojang/serialization/MapCodec; + ARG 0 codec METHOD method_57354 applyAttributeModifiers (Lnet/minecraft/class_1304;Ljava/util/function/BiConsumer;)V ARG 1 slot ARG 2 attributeModifierConsumer diff --git a/mappings/net/minecraft/item/Items.mapping b/mappings/net/minecraft/item/Items.mapping index 50e06b31d3..70be888c31 100644 --- a/mappings/net/minecraft/item/Items.mapping +++ b/mappings/net/minecraft/item/Items.mapping @@ -465,6 +465,8 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items FIELD field_55041 RESIN_BRICK_SLAB Lnet/minecraft/class_1792; FIELD field_55042 RESIN_BRICK_WALL Lnet/minecraft/class_1792; FIELD field_55043 CHISELED_RESIN_BRICKS Lnet/minecraft/class_1792; + FIELD field_55710 WILDFLOWERS Lnet/minecraft/class_1792; + FIELD field_55711 LEAF_LITTER Lnet/minecraft/class_1792; FIELD field_8043 ORANGE_TERRACOTTA Lnet/minecraft/class_1792; FIELD field_8047 JUNGLE_PRESSURE_PLATE Lnet/minecraft/class_1792; FIELD field_8048 SPRUCE_BUTTON Lnet/minecraft/class_1792; diff --git a/mappings/net/minecraft/server/command/FillCommand.mapping b/mappings/net/minecraft/server/command/FillCommand.mapping index 81c5297f0c..8a570be6f1 100644 --- a/mappings/net/minecraft/server/command/FillCommand.mapping +++ b/mappings/net/minecraft/server/command/FillCommand.mapping @@ -20,10 +20,57 @@ CLASS net/minecraft/class_3057 net/minecraft/server/command/FillCommand ARG 2 block ARG 3 mode ARG 4 filter + METHOD method_65985 (Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10557;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 4 context + METHOD method_65986 (Lcom/mojang/brigadier/context/CommandContext;)I + ARG 0 context + METHOD method_65987 buildModeTree (Lnet/minecraft/class_7157;Lcom/mojang/brigadier/builder/ArgumentBuilder;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10557;)Lcom/mojang/brigadier/builder/ArgumentBuilder; + ARG 0 registries + ARG 1 argumentBuilder + ARG 2 from + ARG 3 to + ARG 4 state + ARG 5 filter + METHOD method_65988 (Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10557;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 4 context + METHOD method_65989 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate; + ARG 0 context + METHOD method_65990 (Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10557;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 4 context + METHOD method_65991 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2247; + ARG 0 context + METHOD method_65992 (Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10557;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 4 context + METHOD method_65993 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2338; + ARG 0 context + METHOD method_65994 (Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10556;Lnet/minecraft/class_3057$class_10557;Lcom/mojang/brigadier/context/CommandContext;)I + ARG 4 context + METHOD method_65995 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2338; + ARG 0 context + METHOD method_65996 (Lcom/mojang/brigadier/context/CommandContext;)Ljava/util/function/Predicate; + ARG 0 context + METHOD method_65997 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2247; + ARG 0 context + METHOD method_65998 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2338; + ARG 0 context + METHOD method_65999 (Lcom/mojang/brigadier/context/CommandContext;)Lnet/minecraft/class_2338; + ARG 0 context + CLASS class_10555 PostProcessor + FIELD field_55585 EMPTY Lnet/minecraft/class_3057$class_10555; + METHOD affect (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z + ARG 1 world + ARG 2 pos + METHOD method_66000 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 pos + CLASS class_10556 ArgumentResolver + CLASS class_10557 OptionalArgumentResolver CLASS class_3058 Mode FIELD field_13654 filter Lnet/minecraft/class_3057$class_3120; + FIELD field_55587 postProcessor Lnet/minecraft/class_3057$class_10555; METHOD (Ljava/lang/String;ILnet/minecraft/class_3057$class_10555;Lnet/minecraft/class_3057$class_3120;)V - ARG 3 filter + ARG 3 postProcessor + ARG 4 filter METHOD method_13358 (Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;Lnet/minecraft/class_2247;Lnet/minecraft/class_3218;)Lnet/minecraft/class_2247; ARG 0 range ARG 1 pos @@ -34,9 +81,18 @@ CLASS net/minecraft/class_3057 net/minecraft/server/command/FillCommand ARG 1 pos ARG 2 block ARG 3 world + METHOD method_66002 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;)Z + ARG 0 world + ARG 1 pos CLASS class_3120 Filter + FIELD field_55586 IDENTITY Lnet/minecraft/class_3057$class_3120; METHOD filter (Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;Lnet/minecraft/class_2247;Lnet/minecraft/class_3218;)Lnet/minecraft/class_2247; ARG 1 box ARG 2 pos ARG 3 block ARG 4 world + METHOD method_66001 (Lnet/minecraft/class_3341;Lnet/minecraft/class_2338;Lnet/minecraft/class_2247;Lnet/minecraft/class_3218;)Lnet/minecraft/class_2247; + ARG 0 box + ARG 1 pos + ARG 2 block + ARG 3 world diff --git a/mappings/net/minecraft/sound/BlockSoundGroup.mapping b/mappings/net/minecraft/sound/BlockSoundGroup.mapping index 9e3e54b199..72aea54ea7 100644 --- a/mappings/net/minecraft/sound/BlockSoundGroup.mapping +++ b/mappings/net/minecraft/sound/BlockSoundGroup.mapping @@ -123,6 +123,7 @@ CLASS net/minecraft/class_2498 net/minecraft/sound/BlockSoundGroup FIELD field_54773 CREAKING_HEART Lnet/minecraft/class_2498; FIELD field_55082 RESIN Lnet/minecraft/class_2498; FIELD field_55083 RESIN_BRICKS Lnet/minecraft/class_2498; + FIELD field_55793 LEAF_LITTER Lnet/minecraft/class_2498; METHOD (FFLnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V ARG 1 volume ARG 2 pitch diff --git a/mappings/net/minecraft/state/property/Properties.mapping b/mappings/net/minecraft/state/property/Properties.mapping index ba9b16dc1b..1ecd91766d 100644 --- a/mappings/net/minecraft/state/property/Properties.mapping +++ b/mappings/net/minecraft/state/property/Properties.mapping @@ -271,6 +271,7 @@ CLASS net/minecraft/class_2741 net/minecraft/state/property/Properties COMMENT A property that specifies if a hanging moss block is the tip. FIELD field_55088 NATURAL Lnet/minecraft/class_2746; COMMENT A property that specifies if a creaking heart is natural. + FIELD field_55829 SEGMENT_AMOUNT Lnet/minecraft/class_2758; 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/text/ClickEvent.mapping b/mappings/net/minecraft/text/ClickEvent.mapping index 2f1dd0321a..3681044731 100644 --- a/mappings/net/minecraft/text/ClickEvent.mapping +++ b/mappings/net/minecraft/text/ClickEvent.mapping @@ -1,14 +1,47 @@ CLASS net/minecraft/class_2558 net/minecraft/text/ClickEvent FIELD field_46594 CODEC Lcom/mojang/serialization/Codec; METHOD method_10845 getAction ()Lnet/minecraft/class_2558$class_2559; + METHOD method_66564 (Lnet/minecraft/class_2558$class_2559;)Lcom/mojang/serialization/MapCodec; + ARG 0 action + CLASS class_10605 ChangePage + FIELD field_55903 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_66565 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_10606 CopyToClipboard + FIELD field_55904 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_66566 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_10607 OpenFile + FIELD field_55905 CODEC Lcom/mojang/serialization/MapCodec; + METHOD (Ljava/io/File;)V + ARG 1 file + METHOD (Ljava/nio/file/Path;)V + ARG 1 path + METHOD method_66567 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + METHOD method_66568 file ()Ljava/io/File; + CLASS class_10608 OpenUrl + FIELD field_55906 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_66569 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_10609 RunCommand + FIELD field_55907 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_66570 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_10610 SuggestCommand + FIELD field_55908 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_66571 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_2559 Action FIELD field_11742 name Ljava/lang/String; FIELD field_11744 userDefinable Z FIELD field_46595 UNVALIDATED_CODEC Lcom/mojang/serialization/Codec; FIELD field_46596 CODEC Lcom/mojang/serialization/Codec; + FIELD field_55902 codec Lcom/mojang/serialization/MapCodec; METHOD (Ljava/lang/String;ILjava/lang/String;ZLcom/mojang/serialization/MapCodec;)V ARG 3 name ARG 4 userDefinable + ARG 5 codec METHOD method_10847 isUserDefinable ()Z METHOD method_54152 validate (Lnet/minecraft/class_2558$class_2559;)Lcom/mojang/serialization/DataResult; ARG 0 action diff --git a/mappings/net/minecraft/text/HoverEvent.mapping b/mappings/net/minecraft/text/HoverEvent.mapping index a17961cd1b..f397fab5dc 100644 --- a/mappings/net/minecraft/text/HoverEvent.mapping +++ b/mappings/net/minecraft/text/HoverEvent.mapping @@ -1,12 +1,28 @@ CLASS net/minecraft/class_2568 net/minecraft/text/HoverEvent FIELD field_46601 CODEC Lcom/mojang/serialization/Codec; METHOD method_10892 getAction ()Lnet/minecraft/class_2568$class_5247; + CLASS class_10611 ShowEntity + FIELD field_55911 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_66577 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance + CLASS class_10612 ShowItem + FIELD field_55912 CODEC Lcom/mojang/serialization/MapCodec; + METHOD (Lnet/minecraft/class_1799;)V + ARG 1 stack + CLASS class_10613 ShowText + FIELD field_55913 CODEC Lcom/mojang/serialization/MapCodec; + METHOD method_66578 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; + ARG 0 instance CLASS class_5247 Action FIELD field_24346 name Ljava/lang/String; FIELD field_24347 parsable Z FIELD field_46603 UNVALIDATED_CODEC Lcom/mojang/serialization/Codec; FIELD field_46604 CODEC Lcom/mojang/serialization/Codec; FIELD field_46605 codec Lcom/mojang/serialization/MapCodec; + METHOD (Ljava/lang/String;ILjava/lang/String;ZLcom/mojang/serialization/MapCodec;)V + ARG 3 name + ARG 4 parsable + ARG 5 codec METHOD method_27667 isParsable ()Z METHOD method_54186 validate (Lnet/minecraft/class_2568$class_5247;)Lcom/mojang/serialization/DataResult; ARG 0 action diff --git a/mappings/net/minecraft/text/TextCodecs.mapping b/mappings/net/minecraft/text/TextCodecs.mapping index cfd45f4144..2a35364926 100644 --- a/mappings/net/minecraft/text/TextCodecs.mapping +++ b/mappings/net/minecraft/text/TextCodecs.mapping @@ -26,15 +26,23 @@ CLASS net/minecraft/class_8824 net/minecraft/text/TextCodecs ARG 0 either2 METHOD method_54177 (Lnet/minecraft/class_2561;)Lnet/minecraft/class_2561; ARG 0 text + METHOD method_66572 withJsonLengthLimit (I)Lcom/mojang/serialization/Codec; + ARG 0 maxLength CLASS 1 METHOD decode (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 ops + ARG 2 value METHOD encode (Ljava/lang/Object;Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult; ARG 1 input ARG 2 ops ARG 3 prefix METHOD method_57976 toJsonOps (Lcom/mojang/serialization/DynamicOps;)Lcom/mojang/serialization/DynamicOps; ARG 0 ops + METHOD method_66574 (Lcom/mojang/serialization/DynamicOps;ILcom/mojang/datafixers/util/Pair;)Lcom/mojang/serialization/DataResult; + ARG 3 pair + METHOD method_66575 isTooLarge (Lcom/mojang/serialization/DynamicOps;Lnet/minecraft/class_2561;)Z + ARG 1 ops + ARG 2 text CLASS class_8825 FuzzyCodec FIELD field_46599 codecs Ljava/util/List; FIELD field_46600 codecGetter Ljava/util/function/Function; diff --git a/mappings/net/minecraft/util/JsonHelper.mapping b/mappings/net/minecraft/util/JsonHelper.mapping index 1f998a8531..63d7c89e8f 100644 --- a/mappings/net/minecraft/util/JsonHelper.mapping +++ b/mappings/net/minecraft/util/JsonHelper.mapping @@ -263,3 +263,21 @@ CLASS net/minecraft/class_3518 net/minecraft/util/JsonHelper METHOD method_52226 getElement (Lcom/google/gson/JsonObject;Ljava/lang/String;)Lcom/google/gson/JsonElement; ARG 0 object ARG 1 name + METHOD method_66034 isTooLarge (Lcom/google/gson/JsonElement;I)Z + ARG 0 json + ARG 1 maxLength + CLASS class_10559 CharacterCounter + FIELD field_55624 length I + FIELD field_55625 maxLength I + METHOD (I)V + ARG 1 maxLength + METHOD append (C)Ljava/lang/Appendable; + ARG 1 c + METHOD append (Ljava/lang/CharSequence;)Ljava/lang/Appendable; + ARG 1 charSequence + METHOD append (Ljava/lang/CharSequence;II)Ljava/lang/Appendable; + ARG 1 charSequence + ARG 2 from + ARG 3 to + METHOD method_66035 addCharacters (I)Ljava/lang/Appendable; + ARG 1 count diff --git a/mappings/net/minecraft/util/JsonReaderUtils.mapping b/mappings/net/minecraft/util/JsonReaderUtils.mapping deleted file mode 100644 index b894e323f8..0000000000 --- a/mappings/net/minecraft/util/JsonReaderUtils.mapping +++ /dev/null @@ -1,4 +0,0 @@ -CLASS net/minecraft/class_9010 net/minecraft/util/JsonReaderUtils - METHOD method_58128 readWhileMatching (Lcom/mojang/brigadier/StringReader;Lnet/minecraft/class_5462;)Ljava/lang/String; - ARG 0 stringReader - ARG 1 predicate diff --git a/mappings/net/minecraft/util/dynamic/Codecs.mapping b/mappings/net/minecraft/util/dynamic/Codecs.mapping index 9e2f83f7ea..3d7a908eed 100644 --- a/mappings/net/minecraft/util/dynamic/Codecs.mapping +++ b/mappings/net/minecraft/util/dynamic/Codecs.mapping @@ -39,6 +39,8 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs FIELD field_51365 ARGB Lcom/mojang/serialization/Codec; FIELD field_53754 NON_NEGATIVE_FLOAT Lcom/mojang/serialization/Codec; FIELD field_54067 RGB Lcom/mojang/serialization/Codec; + FIELD field_55622 URI Lcom/mojang/serialization/Codec; + FIELD field_55623 CHAT_TEXT Lcom/mojang/serialization/Codec; METHOD method_36241 rangedInt (IILjava/util/function/Function;)Lcom/mojang/serialization/Codec; ARG 0 min ARG 1 max @@ -287,6 +289,8 @@ CLASS net/minecraft/class_5699 net/minecraft/util/dynamic/Codecs ARG 1 listCodec METHOD method_65322 (Ljava/util/List;)Ljava/util/List; ARG 0 list + METHOD method_66032 (Ljava/lang/String;)Lcom/mojang/serialization/DataResult; + ARG 0 s CLASS 1 METHOD apply (Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;Lcom/mojang/serialization/DataResult;)Lcom/mojang/serialization/DataResult; ARG 1 ops