Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

25w02a changes #4077

Merged
merged 5 commits into from
Jan 8, 2025
Merged

25w02a changes #4077

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
648ece5
Map flower and leaf litter changes
MattiDragon Jan 8, 2025
d79b0aa
Map leaf block changes and some of the related particle changes\
MattiDragon Jan 8, 2025
a53b47c
Map text changes
MattiDragon Jan 8, 2025
2aa1e9d
Map fill command changes
MattiDragon Jan 8, 2025
31cd6b9
Address review comment
MattiDragon Jan 8, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions mappings/net/minecraft/block/AbstractBlock.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <init> (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
Expand Down
18 changes: 18 additions & 0 deletions mappings/net/minecraft/block/Blocks.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
5 changes: 5 additions & 0 deletions mappings/net/minecraft/block/LeafLitterBlock.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
24 changes: 24 additions & 0 deletions mappings/net/minecraft/block/LeavesBlock.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <init> (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
Expand All @@ -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
20 changes: 20 additions & 0 deletions mappings/net/minecraft/block/SegmentedBlock.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
CLASS net/minecraft/class_10596 net/minecraft/block/SegmentedBlock
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
6 changes: 6 additions & 0 deletions mappings/net/minecraft/block/SegmentedFlowerBlock.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
CLASS net/minecraft/class_10594 net/minecraft/block/SegmentedFlowerBlock
MattiDragon marked this conversation as resolved.
Show resolved Hide resolved
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;
10 changes: 10 additions & 0 deletions mappings/net/minecraft/client/particle/LeavesParticle.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 <init> (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 <init> (Lnet/minecraft/class_4002;)V
Expand All @@ -13,3 +19,7 @@ CLASS net/minecraft/class_8253 net/minecraft/client/particle/LeavesParticle
FIELD field_55134 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
ARG 1 spriteProvider
CLASS class_10604 TintedLeavesFactory
FIELD field_55867 spriteProvider Lnet/minecraft/class_4002;
METHOD <init> (Lnet/minecraft/class_4002;)V
ARG 1 spriteProvider
2 changes: 2 additions & 0 deletions mappings/net/minecraft/item/Items.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/sound/BlockSoundGroup.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 <init> (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
Expand Down
1 change: 1 addition & 0 deletions mappings/net/minecraft/state/property/Properties.mapping
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down