-
Notifications
You must be signed in to change notification settings - Fork 379
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch '24w44a' into 1.21.2-rc2-fixes
- Loading branch information
Showing
132 changed files
with
915 additions
and
111 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
CLASS net/minecraft/class_10374 net/minecraft/block/EyeblossomBlock | ||
FIELD field_55066 CODEC Lcom/mojang/serialization/MapCodec; | ||
FIELD field_55067 NOTIFY_RANGE_XZ I | ||
FIELD field_55068 NOTIFY_RANGE_Y I | ||
FIELD field_55069 state Lnet/minecraft/class_10374$class_10375; | ||
METHOD <init> (Lnet/minecraft/class_10374$class_10375;Lnet/minecraft/class_4970$class_2251;)V | ||
ARG 1 state | ||
ARG 2 settings | ||
METHOD <init> (ZLnet/minecraft/class_4970$class_2251;)V | ||
ARG 1 open | ||
ARG 2 settings | ||
METHOD method_65149 (Lnet/minecraft/class_3218;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;Lnet/minecraft/class_2338;)V | ||
ARG 4 otherPos | ||
METHOD method_65150 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; | ||
ARG 0 instance | ||
METHOD method_65153 updateStateAndNotifyOthers (Lnet/minecraft/class_2680;Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)Z | ||
ARG 1 state | ||
ARG 2 world | ||
ARG 3 pos | ||
ARG 4 random | ||
CLASS class_10375 EyeblossomState | ||
FIELD field_55072 open Z | ||
FIELD field_55073 stewEffect Lnet/minecraft/class_6880; | ||
FIELD field_55074 effectLengthInSeconds F | ||
FIELD field_55075 longSound Lnet/minecraft/class_3414; | ||
FIELD field_55076 sound Lnet/minecraft/class_3414; | ||
FIELD field_55077 particleColor I | ||
METHOD <init> (Ljava/lang/String;IZLnet/minecraft/class_6880;FLnet/minecraft/class_3414;Lnet/minecraft/class_3414;I)V | ||
ARG 3 open | ||
ARG 4 stewEffect | ||
ARG 5 effectLengthInSeconds | ||
ARG 6 longSound | ||
ARG 7 sound | ||
ARG 8 particleColor | ||
METHOD method_65154 getToggledBlockState ()Lnet/minecraft/class_2680; | ||
METHOD method_65155 spawnTrailParticle (Lnet/minecraft/class_3218;Lnet/minecraft/class_2338;Lnet/minecraft/class_5819;)V | ||
ARG 1 world | ||
ARG 2 pos | ||
ARG 3 random | ||
METHOD method_65156 of (Z)Lnet/minecraft/class_10374$class_10375; | ||
ARG 0 open | ||
METHOD method_65157 isOpen ()Z | ||
METHOD method_65158 getLongSound ()Lnet/minecraft/class_3414; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,66 @@ | ||
CLASS net/minecraft/class_5778 net/minecraft/block/MultifaceBlock | ||
FIELD field_28413 UP_SHAPE Lnet/minecraft/class_265; | ||
FIELD field_28414 DOWN_SHAPE Lnet/minecraft/class_265; | ||
FIELD field_28415 EAST_SHAPE Lnet/minecraft/class_265; | ||
FIELD field_28416 WEST_SHAPE Lnet/minecraft/class_265; | ||
FIELD field_28417 SOUTH_SHAPE Lnet/minecraft/class_265; | ||
FIELD field_28418 NORTH_SHAPE Lnet/minecraft/class_265; | ||
FIELD field_28419 FACING_PROPERTIES Ljava/util/Map; | ||
FIELD field_28420 SHAPES_FOR_DIRECTIONS Ljava/util/Map; | ||
FIELD field_28421 DIRECTIONS [Lnet/minecraft/class_2350; | ||
FIELD field_28422 SHAPES Lcom/google/common/collect/ImmutableMap; | ||
FIELD field_28423 hasAllHorizontalDirections Z | ||
FIELD field_28424 canMirrorX Z | ||
FIELD field_28425 canMirrorZ Z | ||
FIELD field_55079 CODEC Lcom/mojang/serialization/MapCodec; | ||
METHOD method_33358 canGrowOn (Lnet/minecraft/class_1922;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z | ||
ARG 0 world | ||
ARG 1 direction | ||
ARG 2 pos | ||
ARG 3 state | ||
METHOD method_33361 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2680; | ||
ARG 4 direction | ||
METHOD method_33362 withDirection (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2680; | ||
ARG 1 state | ||
ARG 2 world | ||
ARG 3 pos | ||
ARG 4 direction | ||
METHOD method_33365 disableDirection (Lnet/minecraft/class_2680;Lnet/minecraft/class_2746;)Lnet/minecraft/class_2680; | ||
ARG 0 state | ||
ARG 1 direction | ||
METHOD method_33366 hasDirection (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z | ||
ARG 0 state | ||
ARG 1 direction | ||
METHOD method_33367 mirror (Lnet/minecraft/class_2680;Ljava/util/function/Function;)Lnet/minecraft/class_2680; | ||
ARG 1 state | ||
ARG 2 mirror | ||
METHOD method_33368 withAllDirections (Lnet/minecraft/class_2689;)Lnet/minecraft/class_2680; | ||
ARG 0 stateManager | ||
METHOD method_33369 canHaveDirection (Lnet/minecraft/class_2350;)Z | ||
ARG 1 direction | ||
METHOD method_33370 (Ljava/util/EnumMap;)V | ||
ARG 0 shapes | ||
METHOD method_33374 getProperty (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2746; | ||
ARG 0 direction | ||
METHOD method_33378 isWaterlogged ()Z | ||
METHOD method_33380 getShapeForState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265; | ||
ARG 0 state | ||
METHOD method_33381 hasAnyDirection (Lnet/minecraft/class_2680;)Z | ||
ARG 0 state | ||
METHOD method_33382 isNotFullBlock (Lnet/minecraft/class_2680;)Z | ||
ARG 0 state | ||
METHOD method_41437 flagToDirections (B)Ljava/util/Set; | ||
ARG 0 flag | ||
METHOD method_41438 canGrowWithDirection (Lnet/minecraft/class_1922;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z | ||
ARG 1 world | ||
ARG 2 state | ||
ARG 3 pos | ||
ARG 4 direction | ||
METHOD method_41439 directionsToFlag (Ljava/util/Collection;)B | ||
ARG 0 directions | ||
METHOD method_41440 collectDirections (Lnet/minecraft/class_2680;)Ljava/util/Set; | ||
ARG 0 state | ||
METHOD method_65162 canGrowOn (Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z | ||
ARG 0 world | ||
ARG 1 pos | ||
ARG 2 direction |
2 changes: 1 addition & 1 deletion
2
.../net/minecraft/block/LichenGrower.mapping → ...t/minecraft/block/MultifaceGrower.mapping
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,61 +1,2 @@ | ||
CLASS net/minecraft/class_5778 net/minecraft/block/MultifaceGrowthBlock | ||
FIELD field_28413 UP_SHAPE Lnet/minecraft/class_265; | ||
FIELD field_28414 DOWN_SHAPE Lnet/minecraft/class_265; | ||
FIELD field_28415 EAST_SHAPE Lnet/minecraft/class_265; | ||
FIELD field_28416 WEST_SHAPE Lnet/minecraft/class_265; | ||
FIELD field_28417 SOUTH_SHAPE Lnet/minecraft/class_265; | ||
FIELD field_28418 NORTH_SHAPE Lnet/minecraft/class_265; | ||
FIELD field_28419 FACING_PROPERTIES Ljava/util/Map; | ||
FIELD field_28420 SHAPES_FOR_DIRECTIONS Ljava/util/Map; | ||
FIELD field_28421 DIRECTIONS [Lnet/minecraft/class_2350; | ||
FIELD field_28422 SHAPES Lcom/google/common/collect/ImmutableMap; | ||
FIELD field_28423 hasAllHorizontalDirections Z | ||
FIELD field_28424 canMirrorX Z | ||
FIELD field_28425 canMirrorZ Z | ||
METHOD method_33358 canGrowOn (Lnet/minecraft/class_1922;Lnet/minecraft/class_2350;Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)Z | ||
ARG 0 world | ||
ARG 1 direction | ||
ARG 2 pos | ||
ARG 3 state | ||
METHOD method_33361 (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2680; | ||
ARG 4 direction | ||
METHOD method_33362 withDirection (Lnet/minecraft/class_2680;Lnet/minecraft/class_1922;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Lnet/minecraft/class_2680; | ||
ARG 1 state | ||
ARG 2 world | ||
ARG 3 pos | ||
ARG 4 direction | ||
METHOD method_33365 disableDirection (Lnet/minecraft/class_2680;Lnet/minecraft/class_2746;)Lnet/minecraft/class_2680; | ||
ARG 0 state | ||
ARG 1 direction | ||
METHOD method_33366 hasDirection (Lnet/minecraft/class_2680;Lnet/minecraft/class_2350;)Z | ||
ARG 0 state | ||
ARG 1 direction | ||
METHOD method_33367 mirror (Lnet/minecraft/class_2680;Ljava/util/function/Function;)Lnet/minecraft/class_2680; | ||
ARG 1 state | ||
ARG 2 mirror | ||
METHOD method_33368 withAllDirections (Lnet/minecraft/class_2689;)Lnet/minecraft/class_2680; | ||
ARG 0 stateManager | ||
METHOD method_33369 canHaveDirection (Lnet/minecraft/class_2350;)Z | ||
ARG 1 direction | ||
METHOD method_33370 (Ljava/util/EnumMap;)V | ||
ARG 0 shapes | ||
METHOD method_33374 getProperty (Lnet/minecraft/class_2350;)Lnet/minecraft/class_2746; | ||
ARG 0 direction | ||
METHOD method_33378 isWaterlogged ()Z | ||
METHOD method_33380 getShapeForState (Lnet/minecraft/class_2680;)Lnet/minecraft/class_265; | ||
ARG 0 state | ||
METHOD method_33381 hasAnyDirection (Lnet/minecraft/class_2680;)Z | ||
ARG 0 state | ||
METHOD method_33382 isNotFullBlock (Lnet/minecraft/class_2680;)Z | ||
ARG 0 state | ||
METHOD method_41437 flagToDirections (B)Ljava/util/Set; | ||
ARG 0 flag | ||
METHOD method_41438 canGrowWithDirection (Lnet/minecraft/class_1922;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Lnet/minecraft/class_2350;)Z | ||
ARG 1 world | ||
ARG 2 state | ||
ARG 3 pos | ||
ARG 4 direction | ||
METHOD method_41439 directionsToFlag (Ljava/util/Collection;)B | ||
ARG 0 directions | ||
METHOD method_41440 collectDirections (Lnet/minecraft/class_2680;)Ljava/util/Set; | ||
ARG 0 state | ||
CLASS net/minecraft/class_10376 net/minecraft/block/MultifaceGrowthBlock | ||
METHOD method_41432 getGrower ()Lnet/minecraft/class_7118; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,14 @@ | ||
CLASS net/minecraft/class_8167 net/minecraft/block/ParticleLeavesBlock | ||
FIELD field_46310 CODEC Lcom/mojang/serialization/MapCodec; | ||
FIELD field_55080 particle Lnet/minecraft/class_2394; | ||
FIELD field_55081 chance I | ||
METHOD <init> (ILnet/minecraft/class_2394;Lnet/minecraft/class_4970$class_2251;)V | ||
ARG 1 chance | ||
ARG 2 particle | ||
ARG 3 settings | ||
METHOD method_65163 (Lcom/mojang/serialization/codecs/RecordCodecBuilder$Instance;)Lcom/mojang/datafixers/kinds/App; | ||
ARG 0 instance | ||
METHOD method_65164 (Lnet/minecraft/class_8167;)Lnet/minecraft/class_2394; | ||
ARG 0 block | ||
METHOD method_65165 (Lnet/minecraft/class_8167;)Ljava/lang/Integer; | ||
ARG 0 block |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.