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

Map various changes to block families (#2293) 

* Map deepslate block families

* Rename the BlockFamily.chsieled method to chiseled

* Update the names of copper block families to match the new oxidation level names

* Map the waxed oxidized cut copper block family

* Map various parameters related to block families in the RecipesProvider class
This commit is contained in:
haykam821 2021-04-08 05:41:25 -04:00 committed by GitHub
parent 1e508a3bdf
commit 8c4c969b5a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mappings/net/minecraft/data/family/BlockFamilies.mapping
View File

@ -37,14 +37,20 @@ CLASS net/minecraft/class_5793 net/minecraft/data/family/BlockFamilies
FIELD field_28515 MOSSY_STONE_BRICK Lnet/minecraft/class_5794;
FIELD field_28516 CUT_COPPER Lnet/minecraft/class_5794;
FIELD field_28517 WAXED_CUT_COPPER Lnet/minecraft/class_5794;
FIELD field_28518 LIGHTLY_WEATHERED_CUT_COPPER Lnet/minecraft/class_5794;
FIELD field_28519 WAXED_LIGHTLY_WEATHERED_CUT_COPPER Lnet/minecraft/class_5794;
FIELD field_28520 SEMI_WEATHERED_CUT_COPPER Lnet/minecraft/class_5794;
FIELD field_28521 WAXED_SEMI_WEATHERED_CUT_COPPER Lnet/minecraft/class_5794;
FIELD field_28522 WEATHERED_CUT_COPPER Lnet/minecraft/class_5794;
FIELD field_28518 EXPOSED_CUT_COPPER Lnet/minecraft/class_5794;
FIELD field_28519 WAXED_EXPOSED_CUT_COPPER Lnet/minecraft/class_5794;
FIELD field_28520 WEATHERED_CUT_COPPER Lnet/minecraft/class_5794;
FIELD field_28521 WAXED_WEATHERED_CUT_COPPER Lnet/minecraft/class_5794;
FIELD field_28522 OXIDIZED_CUT_COPPER Lnet/minecraft/class_5794;
FIELD field_28523 COBBLESTONE Lnet/minecraft/class_5794;
FIELD field_28524 MOSSY_COBBLESTONE Lnet/minecraft/class_5794;
FIELD field_28525 DIORITE Lnet/minecraft/class_5794;
FIELD field_28946 DEEPSLATE Lnet/minecraft/class_5794;
FIELD field_28947 POLISHED_DEEPSLATE Lnet/minecraft/class_5794;
FIELD field_28948 DEEPSLATE_TILE Lnet/minecraft/class_5794;
FIELD field_28949 DEEPSLATE_BRICK Lnet/minecraft/class_5794;
FIELD field_29079 COBBLED_DEEPSLATE Lnet/minecraft/class_5794;
FIELD field_33419 WAXED_OXIDIZED_CUT_COPPER Lnet/minecraft/class_5794;
METHOD method_33467 getFamilies ()Ljava/util/stream/Stream;
METHOD method_33468 register (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795;
ARG 0 baseBlock

4
mappings/net/minecraft/data/family/BlockFamily.mapping
View File

@ -28,7 +28,7 @@ CLASS net/minecraft/class_5794 net/minecraft/data/family/BlockFamily
METHOD method_33484 group (Ljava/lang/String;)Lnet/minecraft/class_5794$class_5795;
ARG 1 group
METHOD method_33485 noGenerateModels ()Lnet/minecraft/class_5794$class_5795;
METHOD method_33486 chsieled (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795;
METHOD method_33486 chiseled (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795;
ARG 1 block
METHOD method_33487 unlockCriterionName (Ljava/lang/String;)Lnet/minecraft/class_5794$class_5795;
ARG 1 unlockCriterionName
@ -51,6 +51,8 @@ CLASS net/minecraft/class_5794 net/minecraft/data/family/BlockFamily
ARG 1 block
METHOD method_33497 wall (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795;
ARG 1 block
METHOD method_34593 cracked (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795;
ARG 1 block
CLASS class_5796 Variant
FIELD field_28546 name Ljava/lang/String;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V

12
mappings/net/minecraft/data/server/RecipesProvider.mapping
View File

@ -143,12 +143,19 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider
COMMENT <p>Purpur is handled separately because both purpur and purpur pillars can be used to craft purpur slabs and stairs.
ARG 0 family
ARG 1 variant
METHOD method_33534 (Lnet/minecraft/class_5794;Ljava/util/function/Consumer;Lnet/minecraft/class_5794$class_5796;Lnet/minecraft/class_2248;)V
ARG 2 variant
ARG 3 block
METHOD method_33535 generateFamily (Ljava/util/function/Consumer;Lnet/minecraft/class_5794;)V
ARG 0 exporter
ARG 1 family
METHOD method_33536 (Lnet/minecraft/class_5797;Lnet/minecraft/class_5794$class_5796;Ljava/lang/String;)V
ARG 2 group
METHOD method_33537 createCondensingRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797;
ARG 0 outputItem
ARG 1 inputItem
METHOD method_33539 (Ljava/util/function/Consumer;Lnet/minecraft/class_5794;)V
ARG 1 family
METHOD method_33542 createTransmutationRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797;
ARG 0 outputItem
ARG 1 inputItem
@ -167,3 +174,8 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider
METHOD method_33555 createSignRecipe (Lnet/minecraft/class_1935;Lnet/minecraft/class_1856;)Lnet/minecraft/class_5797;
ARG 0 outputItem
ARG 1 inputItem
METHOD method_34662 offerCrackingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
COMMENT Offers a smelting recipe to the exporter that is used to convert the main block of a block family to its cracked variant.
ARG 0 exporter
ARG 1 result
ARG 2 input