21w19a stuff (#2392)

* 19a

* Update Items.mapping

* things

* datagen stuff
This commit is contained in:
Shnupbups 2021-05-13 16:09:53 +10:00 committed by GitHub
parent 74d2d7a232
commit 4e9beace48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
12 changed files with 61 additions and 1 deletions

View File

@ -398,11 +398,13 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGe
ARG 1 modelId ARG 1 modelId
ARG 2 texture ARG 2 texture
ARG 3 modelCollector ARG 3 modelCollector
METHOD method_34852 registerLightningRod ()V
METHOD method_35868 registerSingleton (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;Lnet/minecraft/class_4942;)V METHOD method_35868 registerSingleton (Lnet/minecraft/class_2248;Lnet/minecraft/class_4944;Lnet/minecraft/class_4942;)V
ARG 1 block ARG 1 block
ARG 2 texture ARG 2 texture
ARG 3 model ARG 3 model
METHOD method_35869 registerLightModel ()V METHOD method_35869 registerLightModel ()V
METHOD method_36440 registerInfestedDeepslate ()V
CLASS class_4911 BuiltinModelPool CLASS class_4911 BuiltinModelPool
FIELD field_22835 modelId Lnet/minecraft/class_2960; FIELD field_22835 modelId Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_4910;Lnet/minecraft/class_2960;Lnet/minecraft/class_2248;)V METHOD <init> (Lnet/minecraft/class_4910;Lnet/minecraft/class_2960;Lnet/minecraft/class_2248;)V

View File

@ -30,6 +30,8 @@ CLASS net/minecraft/class_4926 net/minecraft/data/client/model/BlockStateVariant
METHOD method_25792 checkAllPropertyDefinitions ()V METHOD method_25792 checkAllPropertyDefinitions ()V
CLASS class_4927 SingleProperty CLASS class_4927 SingleProperty
FIELD field_22864 property Lnet/minecraft/class_2769; FIELD field_22864 property Lnet/minecraft/class_2769;
METHOD <init> (Lnet/minecraft/class_2769;)V
ARG 1 property
METHOD method_25793 register (Ljava/lang/Comparable;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4926$class_4927; METHOD method_25793 register (Ljava/lang/Comparable;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4926$class_4927;
ARG 1 value ARG 1 value
ARG 2 variant ARG 2 variant
@ -47,6 +49,9 @@ CLASS net/minecraft/class_4926 net/minecraft/data/client/model/BlockStateVariant
CLASS class_4928 DoubleProperty CLASS class_4928 DoubleProperty
FIELD field_22865 first Lnet/minecraft/class_2769; FIELD field_22865 first Lnet/minecraft/class_2769;
FIELD field_22866 second Lnet/minecraft/class_2769; FIELD field_22866 second Lnet/minecraft/class_2769;
METHOD <init> (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)V
ARG 1 first
ARG 2 second
METHOD method_25797 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4926$class_4928; METHOD method_25797 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4926$class_4928;
ARG 1 firstValue ARG 1 firstValue
ARG 2 secondValue ARG 2 secondValue
@ -71,6 +76,10 @@ CLASS net/minecraft/class_4926 net/minecraft/data/client/model/BlockStateVariant
FIELD field_22867 first Lnet/minecraft/class_2769; FIELD field_22867 first Lnet/minecraft/class_2769;
FIELD field_22868 second Lnet/minecraft/class_2769; FIELD field_22868 second Lnet/minecraft/class_2769;
FIELD field_22869 third Lnet/minecraft/class_2769; FIELD field_22869 third Lnet/minecraft/class_2769;
METHOD <init> (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)V
ARG 1 first
ARG 2 second
ARG 3 third
METHOD method_25805 register (Lnet/minecraft/class_4926$class_4932;)Lnet/minecraft/class_4926; METHOD method_25805 register (Lnet/minecraft/class_4926$class_4932;)Lnet/minecraft/class_4926;
ARG 1 variantFactory ARG 1 variantFactory
METHOD method_25806 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4926$class_4929; METHOD method_25806 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4926$class_4929;
@ -102,6 +111,11 @@ CLASS net/minecraft/class_4926 net/minecraft/data/client/model/BlockStateVariant
FIELD field_22871 second Lnet/minecraft/class_2769; FIELD field_22871 second Lnet/minecraft/class_2769;
FIELD field_22872 third Lnet/minecraft/class_2769; FIELD field_22872 third Lnet/minecraft/class_2769;
FIELD field_22873 fourth Lnet/minecraft/class_2769; FIELD field_22873 fourth Lnet/minecraft/class_2769;
METHOD <init> (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)V
ARG 1 first
ARG 2 second
ARG 3 third
ARG 4 fourth
METHOD method_25811 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4926$class_4930; METHOD method_25811 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4926$class_4930;
ARG 1 firstValue ARG 1 firstValue
ARG 2 secondValue ARG 2 secondValue
@ -140,6 +154,12 @@ CLASS net/minecraft/class_4926 net/minecraft/data/client/model/BlockStateVariant
FIELD field_22876 third Lnet/minecraft/class_2769; FIELD field_22876 third Lnet/minecraft/class_2769;
FIELD field_22877 fourth Lnet/minecraft/class_2769; FIELD field_22877 fourth Lnet/minecraft/class_2769;
FIELD field_22878 fifth Lnet/minecraft/class_2769; FIELD field_22878 fifth Lnet/minecraft/class_2769;
METHOD <init> (Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;Lnet/minecraft/class_2769;)V
ARG 1 first
ARG 2 second
ARG 3 third
ARG 4 fourth
ARG 5 fifth
METHOD method_25813 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4926$class_4931; METHOD method_25813 register (Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Ljava/lang/Comparable;Lnet/minecraft/class_4935;)Lnet/minecraft/class_4926$class_4931;
ARG 1 firstValue ARG 1 firstValue
ARG 2 secondValue ARG 2 secondValue

View File

@ -119,13 +119,17 @@ CLASS net/minecraft/class_4944 net/minecraft/data/client/model/Texture
ARG 0 block ARG 0 block
METHOD method_27168 wallSideEnd (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944; METHOD method_27168 wallSideEnd (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944;
ARG 0 block ARG 0 block
METHOD method_32231 candleCake (Lnet/minecraft/class_2248;)Lnet/minecraft/class_4944;
ARG 0 block
METHOD method_32232 cauldron (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944;
ARG 0 content
METHOD method_35908 copy (Lnet/minecraft/class_4945;Lnet/minecraft/class_4945;)Lnet/minecraft/class_4944; METHOD method_35908 copy (Lnet/minecraft/class_4945;Lnet/minecraft/class_4945;)Lnet/minecraft/class_4944;
ARG 1 parent ARG 1 parent
ARG 2 child ARG 2 child
METHOD method_35909 register (Lnet/minecraft/class_4945;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; METHOD method_35909 register (Lnet/minecraft/class_4945;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944;
ARG 1 key ARG 1 key
ARG 2 id ARG 2 id
METHOD method_35910 (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; METHOD method_35910 topBottom (Lnet/minecraft/class_2960;Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944;
ARG 0 top ARG 0 top
ARG 1 bottom ARG 1 bottom
METHOD method_35911 wool (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944; METHOD method_35911 wool (Lnet/minecraft/class_2960;)Lnet/minecraft/class_4944;

View File

@ -55,6 +55,14 @@ CLASS net/minecraft/class_5793 net/minecraft/data/family/BlockFamilies
FIELD field_33118 WOODEN_UNLOCK_CRITERION_NAME Ljava/lang/String; FIELD field_33118 WOODEN_UNLOCK_CRITERION_NAME Ljava/lang/String;
COMMENT The name of the criterion used for the recipe unlock advancements of wooden block families. COMMENT The name of the criterion used for the recipe unlock advancements of wooden block families.
FIELD field_33419 WAXED_OXIDIZED_CUT_COPPER Lnet/minecraft/class_5794; FIELD field_33419 WAXED_OXIDIZED_CUT_COPPER Lnet/minecraft/class_5794;
FIELD field_33681 WAXED_WEATHERED_COPPER Lnet/minecraft/class_5794;
FIELD field_33682 OXIDIZED_COPPER Lnet/minecraft/class_5794;
FIELD field_33683 WAXED_OXIDIZED_COPPER Lnet/minecraft/class_5794;
FIELD field_33684 COPPER_BLOCK Lnet/minecraft/class_5794;
FIELD field_33685 WAXED_COPPER_BLOCK Lnet/minecraft/class_5794;
FIELD field_33686 EXPOSED_COPPER Lnet/minecraft/class_5794;
FIELD field_33687 WAXED_EXPOSED_COPPER Lnet/minecraft/class_5794;
FIELD field_33688 WEATHERED_COPPER Lnet/minecraft/class_5794;
METHOD method_33467 getFamilies ()Ljava/util/stream/Stream; METHOD method_33467 getFamilies ()Ljava/util/stream/Stream;
METHOD method_33468 register (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795; METHOD method_33468 register (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795;
ARG 0 baseBlock ARG 0 baseBlock

View File

@ -5,6 +5,8 @@ CLASS net/minecraft/class_5794 net/minecraft/data/family/BlockFamily
FIELD field_28529 generateRecipes Z FIELD field_28529 generateRecipes Z
FIELD field_28530 group Ljava/lang/String; FIELD field_28530 group Ljava/lang/String;
FIELD field_28531 unlockCriterionName Ljava/lang/String; FIELD field_28531 unlockCriterionName Ljava/lang/String;
METHOD <init> (Lnet/minecraft/class_2248;)V
ARG 1 baseBlock
METHOD method_33469 getBaseBlock ()Lnet/minecraft/class_2248; METHOD method_33469 getBaseBlock ()Lnet/minecraft/class_2248;
METHOD method_33470 getVariant (Lnet/minecraft/class_5794$class_5796;)Lnet/minecraft/class_2248; METHOD method_33470 getVariant (Lnet/minecraft/class_5794$class_5796;)Lnet/minecraft/class_2248;
ARG 1 variant ARG 1 variant
@ -51,6 +53,8 @@ CLASS net/minecraft/class_5794 net/minecraft/data/family/BlockFamily
ARG 1 block ARG 1 block
METHOD method_34593 cracked (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795; METHOD method_34593 cracked (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795;
ARG 1 block ARG 1 block
METHOD method_36544 cut (Lnet/minecraft/class_2248;)Lnet/minecraft/class_5794$class_5795;
ARG 1 block
CLASS class_5796 Variant CLASS class_5796 Variant
FIELD field_28546 name Ljava/lang/String; FIELD field_28546 name Ljava/lang/String;
METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V METHOD <init> (Ljava/lang/String;ILjava/lang/String;)V

View File

@ -23,6 +23,10 @@ CLASS net/minecraft/class_2474 net/minecraft/data/server/AbstractTagProvider
FIELD field_23960 builder Lnet/minecraft/class_3494$class_3495; FIELD field_23960 builder Lnet/minecraft/class_3494$class_3495;
FIELD field_23961 registry Lnet/minecraft/class_2378; FIELD field_23961 registry Lnet/minecraft/class_2378;
FIELD field_23962 source Ljava/lang/String; FIELD field_23962 source Ljava/lang/String;
METHOD <init> (Lnet/minecraft/class_3494$class_3495;Lnet/minecraft/class_2378;Ljava/lang/String;)V
ARG 1 builder
ARG 2 registry
ARG 3 source
METHOD method_26792 addTag (Lnet/minecraft/class_3494$class_5123;)Lnet/minecraft/class_2474$class_5124; METHOD method_26792 addTag (Lnet/minecraft/class_3494$class_5123;)Lnet/minecraft/class_2474$class_5124;
ARG 1 identifiedTag ARG 1 identifiedTag
METHOD method_26793 add (Ljava/lang/Object;)Lnet/minecraft/class_2474$class_5124; METHOD method_26793 add (Ljava/lang/Object;)Lnet/minecraft/class_2474$class_5124;

View File

@ -123,3 +123,9 @@ CLASS net/minecraft/class_2430 net/minecraft/data/server/BlockLootTableGenerator
ARG 0 candle ARG 0 candle
METHOD method_33709 glowBerryDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53; METHOD method_33709 glowBerryDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
ARG 0 drop ARG 0 drop
METHOD method_34057 lapisOreDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
ARG 0 ore
METHOD method_34058 redstoneOreDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
ARG 0 ore
METHOD method_36545 copperOreDrops (Lnet/minecraft/class_2248;)Lnet/minecraft/class_52$class_53;
ARG 0 ore

View File

@ -748,6 +748,13 @@ CLASS net/minecraft/class_1802 net/minecraft/item/Items
ARG 0 block ARG 0 block
ARG 1 group ARG 1 group
ARG 2 blocks ARG 2 blocks
METHOD method_36679 register (Lnet/minecraft/class_2248;Ljava/util/Optional;)Lnet/minecraft/class_1792;
ARG 0 block
ARG 1 group
METHOD method_36680 createEmptyOptional (Ljava/lang/Object;)Ljava/util/Optional;
ARG 0 of
METHOD method_36682 (Lnet/minecraft/class_2248;Lnet/minecraft/class_1761;)Lnet/minecraft/class_1792;
ARG 1 group
METHOD method_7988 register (Lnet/minecraft/class_2248;Lnet/minecraft/class_1761;)Lnet/minecraft/class_1792; METHOD method_7988 register (Lnet/minecraft/class_2248;Lnet/minecraft/class_1761;)Lnet/minecraft/class_1792;
ARG 0 block ARG 0 block
ARG 1 group ARG 1 group

View File

@ -7,6 +7,7 @@ CLASS net/minecraft/class_1766 net/minecraft/item/MiningToolItem
ARG 1 attackDamage ARG 1 attackDamage
ARG 2 attackSpeed ARG 2 attackSpeed
ARG 3 material ARG 3 material
ARG 4 effectiveBlocks
ARG 5 settings ARG 5 settings
METHOD method_20273 (Lnet/minecraft/class_1309;)V METHOD method_20273 (Lnet/minecraft/class_1309;)V
ARG 0 e ARG 0 e

View File

@ -4,6 +4,8 @@ CLASS net/minecraft/class_1729 net/minecraft/screen/AbstractRecipeScreenHandler
ARG 2 recipe ARG 2 recipe
ARG 3 player ARG 3 player
METHOD method_30264 getCategory ()Lnet/minecraft/class_5421; METHOD method_30264 getCategory ()Lnet/minecraft/class_5421;
METHOD method_32339 canInsertIntoSlot (I)Z
ARG 1 index
METHOD method_7652 matches (Lnet/minecraft/class_1860;)Z METHOD method_7652 matches (Lnet/minecraft/class_1860;)Z
ARG 1 recipe ARG 1 recipe
METHOD method_7653 getCraftingWidth ()I METHOD method_7653 getCraftingWidth ()I

View File

@ -14,3 +14,4 @@ CLASS net/minecraft/class_1706 net/minecraft/screen/AnvilScreenHandler
METHOD method_20398 getNextCost (I)I METHOD method_20398 getNextCost (I)I
ARG 0 cost ARG 0 cost
METHOD method_7625 setNewItemName (Ljava/lang/String;)V METHOD method_7625 setNewItemName (Ljava/lang/String;)V
ARG 1 newItemName

View File

@ -15,3 +15,4 @@ CLASS net/minecraft/class_1723 net/minecraft/screen/PlayerScreenHandler
ARG 1 inventory ARG 1 inventory
ARG 2 onServer ARG 2 onServer
ARG 3 owner ARG 3 owner
METHOD method_29281 getCraftingInput ()Lnet/minecraft/class_1715;