mirrors/yarn
mirrors
/
yarn
mirror of https://github.com/FabricMC/yarn.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

22w42a Chiseled Bookshelves and Bamboo stuff (#3327) 

* 22w42a Chiseled Bookshelves and Bamboo stuff

including raft

* whoops forgot this

* more stuff

* more stuff

* Apply suggestions from code review
This commit is contained in:
Shnupbups 2022-10-21 04:36:31 +11:00 committed by GitHub
parent 9fc3154726
commit 52d825a351
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 141 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
mappings/net/minecraft/block/AbstractBlock.mapping
View File

@ -887,6 +887,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
FIELD field_23186 emissiveLightingPredicate Lnet/minecraft/class_4970$class_4973;
FIELD field_25185 toolRequired Z
FIELD field_38863 offsetType Ljava/util/function/Function;
FIELD field_40341 blockBreakParticles Z
METHOD <init> (Lnet/minecraft/class_3614;Ljava/util/function/Function;)V
ARG 1 material
ARG 2 mapColorProvider
@ -965,6 +966,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
ARG 0 state
METHOD method_43284 offsetType (Ljava/util/function/Function;)Lnet/minecraft/class_4970$class_2251;
ARG 1 offsetType
METHOD method_45477 noBlockBreakParticles ()Lnet/minecraft/class_4970$class_2251;
METHOD method_9617 of (Lnet/minecraft/class_3614;Lnet/minecraft/class_1767;)Lnet/minecraft/class_4970$class_2251;
ARG 0 material
ARG 1 color
@ -1015,7 +1017,11 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
FIELD field_23178 emissiveLightingPredicate Lnet/minecraft/class_4970$class_4973;
FIELD field_25184 toolRequired Z
FIELD field_38862 offsetType Lnet/minecraft/class_4970$class_2250;
FIELD field_40338 blockBreakParticles Z
FIELD field_40339 fluidState Lnet/minecraft/class_3610;
FIELD field_40340 ticksRandomly Z
METHOD <init> (Lnet/minecraft/class_2248;Lcom/google/common/collect/ImmutableMap;Lcom/mojang/serialization/MapCodec;)V
ARG 1 block
ARG 2 propertyMap
ARG 3 codec
METHOD method_26164 isIn (Lnet/minecraft/class_6862;)Z
@ -1268,6 +1274,7 @@ CLASS net/minecraft/class_4970 net/minecraft/block/AbstractBlock
METHOD method_40144 streamTags ()Ljava/util/stream/Stream;
METHOD method_41520 getRegistryEntry ()Lnet/minecraft/class_6880;
METHOD method_43280 getOffsetType ()Lnet/minecraft/class_4970$class_2250;
METHOD method_45475 hasBlockBreakParticles ()Z
CLASS class_3752 ShapeCache
FIELD field_16555 lightSubtracted I
FIELD field_16556 translucent Z

10
mappings/net/minecraft/block/AbstractButtonBlock.mapping
View File

@ -16,6 +16,16 @@ CLASS net/minecraft/class_2269 net/minecraft/block/AbstractButtonBlock
FIELD field_10730 FLOOR_Z_PRESSED_SHAPE Lnet/minecraft/class_265;
FIELD field_10731 WEST_SHAPE Lnet/minecraft/class_265;
FIELD field_10732 WEST_PRESSED_SHAPE Lnet/minecraft/class_265;
FIELD field_40296 clickOffSound Lnet/minecraft/class_3414;
FIELD field_40297 clickOnSound Lnet/minecraft/class_3414;
FIELD field_40298 pressTicks I
FIELD field_40299 wooden Z
METHOD <init> (Lnet/minecraft/class_4970$class_2251;IZLnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V
ARG 1 settings
ARG 2 pressTicks
ARG 3 wooden
ARG 4 clickOffSound
ARG 5 clickOnSound
METHOD method_21845 powerOn (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)V
ARG 1 state
ARG 2 world

2
mappings/net/minecraft/block/AbstractSignBlock.mapping
View File

@ -6,3 +6,5 @@ CLASS net/minecraft/class_2478 net/minecraft/block/AbstractSignBlock
ARG 1 settings
ARG 2 type
METHOD method_24025 getSignType ()Lnet/minecraft/class_4719;
METHOD method_45459 getSignType (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4719;
ARG 0 block

6
mappings/net/minecraft/block/Blocks.mapping
View File

@ -167,6 +167,12 @@ CLASS net/minecraft/class_2246 net/minecraft/block/Blocks
ARG 0 state
METHOD method_41424 (Lnet/minecraft/class_2680;)I
ARG 0 state
METHOD method_45451 createWoodenButtonBlock (Lnet/minecraft/class_2498;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)Lnet/minecraft/class_2269;
ARG 0 soundGroup
ARG 1 clickOffSound
ARG 2 clickOnSound
METHOD method_45452 createWoodenButtonBlock ()Lnet/minecraft/class_2269;
METHOD method_45453 createStoneButtonBlock ()Lnet/minecraft/class_2269;
METHOD method_9492 register (Ljava/lang/String;Lnet/minecraft/class_2248;)Lnet/minecraft/class_2248;
ARG 0 id
ARG 1 block

16
mappings/net/minecraft/block/ChiseledBookshelfBlock.mapping Normal file
View File

@ -0,0 +1,16 @@
CLASS net/minecraft/class_7714 net/minecraft/block/ChiseledBookshelfBlock
FIELD field_40305 BOOKS_STORED Lnet/minecraft/class_2758;
FIELD field_40306 LAST_INTERACTION_BOOK_SLOT Lnet/minecraft/class_2758;
METHOD method_45457 tryRemoveBook (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_7716;)Lnet/minecraft/class_1269;
ARG 0 state
ARG 1 world
ARG 2 pos
ARG 3 player
ARG 4 blockEntity
METHOD method_45458 tryAddBook (Lnet/minecraft/class_2680;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Lnet/minecraft/class_1657;Lnet/minecraft/class_7716;Lnet/minecraft/class_1799;)Lnet/minecraft/class_1269;
ARG 0 state
ARG 1 world
ARG 2 pos
ARG 3 player
ARG 4 blockEntity
ARG 5 stack

10
mappings/net/minecraft/block/DoorBlock.mapping
View File

@ -8,6 +8,12 @@ CLASS net/minecraft/class_2323 net/minecraft/block/DoorBlock
FIELD field_10944 EAST_SHAPE Lnet/minecraft/class_265;
FIELD field_10945 OPEN Lnet/minecraft/class_2746;
FIELD field_10946 HALF Lnet/minecraft/class_2754;
FIELD field_40307 closeSound Lnet/minecraft/class_3414;
FIELD field_40308 openSound Lnet/minecraft/class_3414;
METHOD <init> (Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V
ARG 1 settings
ARG 2 closeSound
ARG 3 openSound
METHOD method_10033 setOpen (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2680;Lnet/minecraft/class_2338;Z)V
ARG 1 entity
ARG 2 world
@ -17,6 +23,10 @@ CLASS net/minecraft/class_2323 net/minecraft/block/DoorBlock
METHOD method_10035 getHinge (Lnet/minecraft/class_1750;)Lnet/minecraft/class_2750;
ARG 1 ctx
METHOD method_10036 playOpenCloseSound (Lnet/minecraft/class_1297;Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;Z)V
ARG 1 entity
ARG 2 world
ARG 3 pos
ARG 4 open
METHOD method_24795 isWoodenDoor (Lnet/minecraft/class_1937;Lnet/minecraft/class_2338;)Z
ARG 0 world
ARG 1 pos

4
mappings/net/minecraft/block/PressurePlateBlock.mapping
View File

@ -1,7 +1,11 @@
CLASS net/minecraft/class_2440 net/minecraft/block/PressurePlateBlock
FIELD field_11358 POWERED Lnet/minecraft/class_2746;
FIELD field_11359 type Lnet/minecraft/class_2440$class_2441;
FIELD field_40311 depressSound Lnet/minecraft/class_3414;
FIELD field_40312 pressSound Lnet/minecraft/class_3414;
METHOD <init> (Lnet/minecraft/class_2440$class_2441;Lnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V
ARG 1 type
ARG 2 settings
ARG 3 depressSound
ARG 4 pressSound
CLASS class_2441 ActivationRule

4
mappings/net/minecraft/block/WeightedPressurePlateBlock.mapping
View File

@ -1,6 +1,10 @@
CLASS net/minecraft/class_2557 net/minecraft/block/WeightedPressurePlateBlock
FIELD field_11738 weight I
FIELD field_11739 POWER Lnet/minecraft/class_2758;
FIELD field_40326 depressSound Lnet/minecraft/class_3414;
FIELD field_40327 pressSound Lnet/minecraft/class_3414;
METHOD <init> (ILnet/minecraft/class_4970$class_2251;Lnet/minecraft/class_3414;Lnet/minecraft/class_3414;)V
ARG 1 weight
ARG 2 settings
ARG 3 depressSound
ARG 4 pressSound

14
mappings/net/minecraft/block/entity/ChiseledBookshelfBlockEntity.mapping Normal file
View File

@ -0,0 +1,14 @@
CLASS net/minecraft/class_7716 net/minecraft/block/entity/ChiseledBookshelfBlockEntity
FIELD field_40331 MAX_BOOKS I
FIELD field_40332 books Ljava/util/Deque;
METHOD <init> (Lnet/minecraft/class_2338;Lnet/minecraft/class_2680;)V
ARG 1 pos
ARG 2 state
METHOD method_45462 addBook (Lnet/minecraft/class_1799;)V
ARG 1 stack
METHOD method_45463 getBooksAsList (Ljava/util/Collection;)Lnet/minecraft/class_2371;
ARG 0 books
METHOD method_45464 getLastBook ()Lnet/minecraft/class_1799;
METHOD method_45466 getBookCount ()I
METHOD method_45467 isFull ()Z
METHOD method_45468 isEmpty ()Z

2
mappings/net/minecraft/class_7755.mapping
View File

@ -1,2 +0,0 @@
CLASS net/minecraft/class_7755
METHOD method_22954 getWaterPatch ()Lnet/minecraft/class_630;

6
mappings/net/minecraft/client/render/entity/model/BoatEntityModel.mapping
View File

@ -53,9 +53,15 @@ CLASS net/minecraft/class_554 net/minecraft/client/render/entity/model/BoatEntit
FIELD field_32465 LEFT Ljava/lang/String;
COMMENT The key of the left model part, whose value is {@value}.
FIELD field_3326 waterPatch Lnet/minecraft/class_630;
METHOD <init> (Lnet/minecraft/class_630;)V
ARG 1 root
METHOD method_2797 setPaddleAngle (Lnet/minecraft/class_1690;ILnet/minecraft/class_630;F)V
ARG 0 entity
ARG 1 sigma
ARG 2 part
ARG 3 angle
METHOD method_31985 getTexturedModelData ()Lnet/minecraft/class_5607;
METHOD method_45702 getParts (Lnet/minecraft/class_630;)Lcom/google/common/collect/ImmutableList$Builder;
ARG 1 root
METHOD method_45703 addParts (Lnet/minecraft/class_5610;)V
ARG 0 modelPartData

4
mappings/net/minecraft/client/render/entity/model/ChestBoatEntityModel.mapping Normal file
View File

@ -0,0 +1,4 @@
CLASS net/minecraft/class_7752 net/minecraft/client/render/entity/model/ChestBoatEntityModel
FIELD field_40467 CHEST_BOTTOM Ljava/lang/String;
FIELD field_40468 CHEST_LID Ljava/lang/String;
FIELD field_40469 CHEST_LOCK Ljava/lang/String;

4
mappings/net/minecraft/client/render/entity/model/ChestRaftEntityModel.mapping Normal file
View File

@ -0,0 +1,4 @@
CLASS net/minecraft/class_7753 net/minecraft/client/render/entity/model/ChestRaftEntityModel
FIELD field_40470 CHEST_BOTTOM Ljava/lang/String;
FIELD field_40471 CHEST_LID Ljava/lang/String;
FIELD field_40472 CHEST_LOCK Ljava/lang/String;

4
mappings/net/minecraft/client/render/entity/model/EntityModelLayers.mapping
View File

@ -63,3 +63,7 @@ CLASS net/minecraft/class_5602 net/minecraft/client/render/entity/model/EntityMo
ARG 0 id
METHOD method_42582 createChestBoat (Lnet/minecraft/class_1690$class_1692;)Lnet/minecraft/class_5601;
ARG 0 type
METHOD method_45717 createRaft (Lnet/minecraft/class_1690$class_1692;)Lnet/minecraft/class_5601;
ARG 0 type
METHOD method_45718 createChestRaft (Lnet/minecraft/class_1690$class_1692;)Lnet/minecraft/class_5601;
ARG 0 type

2
mappings/net/minecraft/client/render/entity/model/ModelWithWaterPatch.mapping Normal file
View File

@ -0,0 +1,2 @@
CLASS net/minecraft/class_7755 net/minecraft/client/render/entity/model/ModelWithWaterPatch
METHOD method_22954 getWaterPatch ()Lnet/minecraft/class_630;

19
mappings/net/minecraft/client/render/entity/model/RaftEntityModel.mapping Normal file
View File

@ -0,0 +1,19 @@
CLASS net/minecraft/class_7754 net/minecraft/client/render/entity/model/RaftEntityModel
FIELD field_40473 LEFT_PADDLE Ljava/lang/String;
FIELD field_40474 RIGHT_PADDLE Ljava/lang/String;
FIELD field_40475 BOTTOM Ljava/lang/String;
FIELD field_40476 leftPaddle Lnet/minecraft/class_630;
FIELD field_40477 rightPaddle Lnet/minecraft/class_630;
FIELD field_40478 parts Lcom/google/common/collect/ImmutableList;
METHOD <init> (Lnet/minecraft/class_630;)V
ARG 1 root
METHOD method_45710 getParts (Lnet/minecraft/class_630;)Lcom/google/common/collect/ImmutableList$Builder;
ARG 1 root
METHOD method_45712 setPaddleAngle (Lnet/minecraft/class_1690;ILnet/minecraft/class_630;F)V
ARG 0 entity
ARG 1 sigma
ARG 2 part
ARG 3 angle
METHOD method_45713 addParts (Lnet/minecraft/class_5610;)V
ARG 0 modelPartData
METHOD method_45714 getTexturedModelData ()Lnet/minecraft/class_5607;

4
mappings/net/minecraft/item/BannerItem.mapping
View File

@ -1,5 +1,9 @@
CLASS net/minecraft/class_1746 net/minecraft/item/BannerItem
FIELD field_30848 TRANSLATION_KEY_PREFIX Ljava/lang/String;
METHOD <init> (Lnet/minecraft/class_2248;Lnet/minecraft/class_2248;Lnet/minecraft/class_1792$class_1793;)V
ARG 1 bannerBlock
ARG 2 wallBannerBlock
ARG 3 settings
METHOD method_43707 (Ljava/util/List;Lnet/minecraft/class_1767;Ljava/lang/String;)V
ARG 2 translationKey
METHOD method_43708 (Lnet/minecraft/class_5321;)Ljava/lang/String;

1
mappings/net/minecraft/item/BlockItem.mapping
View File

@ -45,6 +45,7 @@ CLASS net/minecraft/class_1747 net/minecraft/item/BlockItem
ARG 5 state
METHOD method_7711 getBlock ()Lnet/minecraft/class_2248;
METHOD method_7712 place (Lnet/minecraft/class_1750;)Lnet/minecraft/class_1269;
ARG 1 context
METHOD method_7713 appendBlocks (Ljava/util/Map;Lnet/minecraft/class_1792;)V
ARG 1 map
ARG 2 item

4
mappings/net/minecraft/item/GoatHornItem.mapping
View File

@ -22,3 +22,7 @@ CLASS net/minecraft/class_7430 net/minecraft/item/GoatHornItem
ARG 1 entryList
METHOD method_43711 getInstrument (Lnet/minecraft/class_1799;)Ljava/util/Optional;
ARG 1 stack
METHOD method_45432 (Lnet/minecraft/class_6880;)Ljava/lang/Integer;
ARG 0 instrument
METHOD method_45433 (Lnet/minecraft/class_1799;Lnet/minecraft/class_6880;)V
ARG 1 instrument

14
mappings/net/minecraft/item/Items.mapping
View File

@ -322,6 +322,19 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items
FIELD field_37541 PEARLESCENT_FROGLIGHT Lnet/minecraft/class_1792;
FIELD field_37542 FROGSPAWN Lnet/minecraft/class_1792;
FIELD field_38418 REINFORCED_DEEPSLATE Lnet/minecraft/class_1792;
FIELD field_40213 BAMBOO_PLANKS Lnet/minecraft/class_1792;
FIELD field_40214 BAMBOO_MOSAIC Lnet/minecraft/class_1792;
FIELD field_40215 CHISELED_BOOKSHELF Lnet/minecraft/class_1792;
FIELD field_40216 BAMBOO_SLAB Lnet/minecraft/class_1792;
FIELD field_40217 BAMBOO_MOSAIC_SLAB Lnet/minecraft/class_1792;
FIELD field_40218 BAMBOO_FENCE Lnet/minecraft/class_1792;
FIELD field_40219 BAMBOO_STAIRS Lnet/minecraft/class_1792;
FIELD field_40220 BAMBOO_MOSAIC_STAIRS Lnet/minecraft/class_1792;
FIELD field_40221 BAMBOO_PRESSURE_PLATE Lnet/minecraft/class_1792;
FIELD field_40222 BAMBOO_DOOR Lnet/minecraft/class_1792;
FIELD field_40223 BAMBOO_BUTTON Lnet/minecraft/class_1792;
FIELD field_40226 BAMBOO_TRAPDOOR Lnet/minecraft/class_1792;
FIELD field_40227 BAMBOO_FENCE_GATE 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;
@ -778,6 +791,7 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items
FIELD field_8893 BLUE_BED Lnet/minecraft/class_1792;
METHOD method_35220 register (Lnet/minecraft/class_2248;[Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792;
ARG 0 block
ARG 1 blocks
METHOD method_7989 register (Lnet/minecraft/class_2248;)Lnet/minecraft/class_1792;
ARG 0 block
METHOD method_7990 register (Lnet/minecraft/class_2960;Lnet/minecraft/class_1792;)Lnet/minecraft/class_1792;

3
mappings/net/minecraft/sound/BlockSoundGroup.mapping
View File

@ -93,6 +93,9 @@ CLASS net/minecraft/class_2498 net/minecraft/sound/BlockSoundGroup
FIELD field_37644 SCULK Lnet/minecraft/class_2498;
FIELD field_37645 SCULK_VEIN Lnet/minecraft/class_2498;
FIELD field_37646 SCULK_SHRIEKER Lnet/minecraft/class_2498;
FIELD field_40313 HANGING_SIGN Lnet/minecraft/class_2498;
FIELD field_40314 BAMBOO_WOOD Lnet/minecraft/class_2498;
FIELD field_40315 NETHER_WOOD 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

2
mappings/net/minecraft/state/property/Properties.mapping
View File

@ -230,6 +230,8 @@ CLASS net/minecraft/class_2741 net/minecraft/state/property/Properties
FIELD field_37653 AGE_4_MAX I
FIELD field_37654 AGE_4 Lnet/minecraft/class_2758;
FIELD field_38423 CAN_SUMMON Lnet/minecraft/class_2746;
FIELD field_40343 BOOKS_STORED Lnet/minecraft/class_2758;
FIELD field_40344 LAST_INTERACTION_BOOK_SLOT Lnet/minecraft/class_2758;
METHOD method_11813 (Lnet/minecraft/class_2768;)Z
ARG 0 shape
METHOD method_11814 (Lnet/minecraft/class_2350;)Z

1
mappings/net/minecraft/util/SignType.mapping
View File

@ -10,6 +10,7 @@ CLASS net/minecraft/class_4719 net/minecraft/util/SignType
FIELD field_22183 CRIMSON Lnet/minecraft/class_4719;
FIELD field_22184 WARPED Lnet/minecraft/class_4719;
FIELD field_37657 MANGROVE Lnet/minecraft/class_4719;
FIELD field_40350 BAMBOO Lnet/minecraft/class_4719;
METHOD <init> (Ljava/lang/String;)V
ARG 1 name
METHOD method_24026 stream ()Ljava/util/stream/Stream;