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

Datagen refactors (#2905) 

* `BlockStateDefinitionProvider` -> `ModelProvider`

`BlockStateDefinitionProvider` is inaccurate, as it also handles all the models in the game including item models.

Also moved everything from `data/client/model` down to just `data/client` as they're *all* model related so there's no point in having it be separate.

Should probably backport this to 1.18, and maybe even 1.17.1 if #2904 is merged. Also recommend the rename is reflected in the Fabric API implementation also.

* Make all providers and generators plural where appropriate

Also change `WorldgenListProvider` to `WorldgenProvider`... why did it have `List` in the first place?

* Change to singular prefixes

* Fix some incorrect names

* Update Tag.mapping

* Update RecipeProvider.mapping

* Update RecipeProvider.mapping

* Fix bad merge

Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: modmuss50 <modmuss50@gmail.com>
This commit is contained in:
Shnupbups 2022-02-11 19:55:08 +11:00 committed by GitHub
parent 81898922c6
commit 0a36582e4b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 49 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping → mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGenerator
CLASS net/minecraft/class_4910 net/minecraft/data/client/BlockStateModelGenerator
FIELD field_22830 blockStateCollector Ljava/util/function/Consumer;
FIELD field_22831 modelCollector Ljava/util/function/BiConsumer;
FIELD field_22832 simpleItemModelExemptionCollector Ljava/util/function/Consumer;
@ -329,7 +329,7 @@ CLASS net/minecraft/class_4910 net/minecraft/data/client/model/BlockStateModelGe
METHOD method_25694 registerMushroomBlock (Lnet/minecraft/class_2248;)V
ARG 1 mushroomBlock
METHOD method_25695 registerComparator ()V
METHOD method_25696 registerFurnaceLikeOrientable (Lnet/minecraft/class_2248;)V
METHOD method_25696 registerDispenserLikeOrientable (Lnet/minecraft/class_2248;)V
ARG 1 block
METHOD method_25697 registerSmoothStone ()V
METHOD method_25698 registerNetherrackBottomCustomTop (Lnet/minecraft/class_2248;)V

2
mappings/net/minecraft/data/client/model/BlockStateSupplier.mapping → mappings/net/minecraft/data/client/BlockStateSupplier.mapping
View File

@ -1,3 +1,3 @@
CLASS net/minecraft/class_4917 net/minecraft/data/client/model/BlockStateSupplier
CLASS net/minecraft/class_4917 net/minecraft/data/client/BlockStateSupplier
COMMENT A supplier of a block state JSON definition.
METHOD method_25743 getBlock ()Lnet/minecraft/class_2248;

2
mappings/net/minecraft/data/client/model/BlockStateVariant.mapping → mappings/net/minecraft/data/client/BlockStateVariant.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_4935 net/minecraft/data/client/model/BlockStateVariant
CLASS net/minecraft/class_4935 net/minecraft/data/client/BlockStateVariant
COMMENT The supplier for a {@code ModelVariant}'s JSON representation.
FIELD field_22884 properties Ljava/util/Map;
METHOD method_25824 create ()Lnet/minecraft/class_4935;

2
mappings/net/minecraft/data/client/model/BlockStateVariantMap.mapping → mappings/net/minecraft/data/client/BlockStateVariantMap.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_4926 net/minecraft/data/client/model/BlockStateVariantMap
CLASS net/minecraft/class_4926 net/minecraft/data/client/BlockStateVariantMap
COMMENT An equivalence to the {@code Map<String, WeightedUnbakedModel>}
COMMENT passed to the constructor of {@code ModelVariantMap}.
FIELD field_22863 variants Ljava/util/Map;

2
mappings/net/minecraft/data/client/model/Model.mapping → mappings/net/minecraft/data/client/Model.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_4942 net/minecraft/data/client/model/Model
CLASS net/minecraft/class_4942 net/minecraft/data/client/Model
FIELD field_22901 parent Ljava/util/Optional;
FIELD field_22902 requiredTextures Ljava/util/Set;
FIELD field_22903 variant Ljava/util/Optional;

2
mappings/net/minecraft/data/client/model/ModelIds.mapping → mappings/net/minecraft/data/client/ModelIds.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_4941 net/minecraft/data/client/model/ModelIds
CLASS net/minecraft/class_4941 net/minecraft/data/client/ModelIds
METHOD method_25840 getItemModelId (Lnet/minecraft/class_1792;)Lnet/minecraft/class_2960;
ARG 0 item
METHOD method_25841 getItemSubModelId (Lnet/minecraft/class_1792;Ljava/lang/String;)Lnet/minecraft/class_2960;

2
mappings/net/minecraft/data/client/BlockStateDefinitionProvider.mapping → mappings/net/minecraft/data/client/ModelProvider.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_4916 net/minecraft/data/client/BlockStateDefinitionProvider
CLASS net/minecraft/class_4916 net/minecraft/data/client/ModelProvider
FIELD field_22845 LOGGER Lorg/slf4j/Logger;
FIELD field_22846 GSON Lcom/google/gson/Gson;
FIELD field_22847 generator Lnet/minecraft/class_2403;

2
mappings/net/minecraft/data/client/model/Models.mapping → mappings/net/minecraft/data/client/Models.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_4943 net/minecraft/data/client/model/Models
CLASS net/minecraft/class_4943 net/minecraft/data/client/Models
FIELD field_22908 PARTICLE Lnet/minecraft/class_4942;
FIELD field_22958 STEM_GROWTH_STAGES [Lnet/minecraft/class_4942;
METHOD method_25855 block (Ljava/lang/String;Ljava/lang/String;[Lnet/minecraft/class_4945;)Lnet/minecraft/class_4942;

2
mappings/net/minecraft/data/client/model/MultipartBlockStateSupplier.mapping → mappings/net/minecraft/data/client/MultipartBlockStateSupplier.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_4922 net/minecraft/data/client/model/MultipartBlockStateSupplier
CLASS net/minecraft/class_4922 net/minecraft/data/client/MultipartBlockStateSupplier
FIELD field_22855 block Lnet/minecraft/class_2248;
FIELD field_22856 multiparts Ljava/util/List;
METHOD <init> (Lnet/minecraft/class_2248;)V

2
mappings/net/minecraft/data/client/model/PropertiesMap.mapping → mappings/net/minecraft/data/client/PropertiesMap.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_4934 net/minecraft/data/client/model/PropertiesMap
CLASS net/minecraft/class_4934 net/minecraft/data/client/PropertiesMap
COMMENT Represents a set of property to value pairs, used as conditions for model
COMMENT application.
COMMENT

2
mappings/net/minecraft/data/client/model/SimpleModelSupplier.mapping → mappings/net/minecraft/data/client/SimpleModelSupplier.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_4940 net/minecraft/data/client/model/SimpleModelSupplier
CLASS net/minecraft/class_4940 net/minecraft/data/client/SimpleModelSupplier
FIELD field_22900 parent Lnet/minecraft/class_2960;
METHOD <init> (Lnet/minecraft/class_2960;)V
ARG 1 parent

2
mappings/net/minecraft/data/client/model/TextureKey.mapping → mappings/net/minecraft/data/client/TextureKey.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_4945 net/minecraft/data/client/model/TextureKey
CLASS net/minecraft/class_4945 net/minecraft/data/client/TextureKey
FIELD field_23007 name Ljava/lang/String;
FIELD field_23008 parent Lnet/minecraft/class_4945;
METHOD <init> (Ljava/lang/String;Lnet/minecraft/class_4945;)V

2
mappings/net/minecraft/data/client/model/TexturedModel.mapping → mappings/net/minecraft/data/client/TexturedModel.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_4946 net/minecraft/data/client/model/TexturedModel
CLASS net/minecraft/class_4946 net/minecraft/data/client/TexturedModel
COMMENT Represents a model with texture variables defined.
FIELD field_23036 CUBE_ALL Lnet/minecraft/class_4946$class_4947;
FIELD field_23037 CUBE_MIRRORED_ALL Lnet/minecraft/class_4946$class_4947;

2
mappings/net/minecraft/data/client/model/VariantSetting.mapping → mappings/net/minecraft/data/client/VariantSetting.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_4938 net/minecraft/data/client/model/VariantSetting
CLASS net/minecraft/class_4938 net/minecraft/data/client/VariantSetting
FIELD field_22896 key Ljava/lang/String;
FIELD field_22897 writer Ljava/util/function/Function;
METHOD <init> (Ljava/lang/String;Ljava/util/function/Function;)V

2
mappings/net/minecraft/data/client/model/VariantSettings.mapping → mappings/net/minecraft/data/client/VariantSettings.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_4936 net/minecraft/data/client/model/VariantSettings
CLASS net/minecraft/class_4936 net/minecraft/data/client/VariantSettings
FIELD field_22885 X Lnet/minecraft/class_4938;
FIELD field_22886 Y Lnet/minecraft/class_4938;
FIELD field_22887 MODEL Lnet/minecraft/class_4938;

2
mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping → mappings/net/minecraft/data/client/VariantsBlockStateSupplier.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_4925 net/minecraft/data/client/model/VariantsBlockStateSupplier
CLASS net/minecraft/class_4925 net/minecraft/data/client/VariantsBlockStateSupplier
FIELD field_22859 block Lnet/minecraft/class_2248;
FIELD field_22860 variants Ljava/util/List;
FIELD field_22861 definedProperties Ljava/util/Set;

2
mappings/net/minecraft/data/client/model/When.mapping → mappings/net/minecraft/data/client/When.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_4918 net/minecraft/data/client/model/When
CLASS net/minecraft/class_4918 net/minecraft/data/client/When
METHOD method_25744 create ()Lnet/minecraft/class_4918$class_4921;
METHOD method_25745 validate (Lnet/minecraft/class_2689;)V
ARG 1 stateManager

2
mappings/net/minecraft/data/report/WorldgenListProvider.mapping → mappings/net/minecraft/data/report/WorldgenProvider.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_5475 net/minecraft/data/report/WorldgenListProvider
CLASS net/minecraft/class_5475 net/minecraft/data/report/WorldgenProvider
FIELD field_26377 LOGGER Lorg/slf4j/Logger;
FIELD field_26378 GSON Lcom/google/gson/Gson;
FIELD field_26379 generator Lnet/minecraft/class_2403;

2
mappings/net/minecraft/data/server/AdvancementsProvider.mapping → mappings/net/minecraft/data/server/AdvancementProvider.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_2409 net/minecraft/data/server/AdvancementsProvider
CLASS net/minecraft/class_2409 net/minecraft/data/server/AdvancementProvider
FIELD field_11288 root Lnet/minecraft/class_2403;
FIELD field_11289 tabGenerators Ljava/util/List;
FIELD field_11290 LOGGER Lorg/slf4j/Logger;

2
mappings/net/minecraft/data/server/BlockTagsProvider.mapping → mappings/net/minecraft/data/server/BlockTagProvider.mapping
View File

@ -1,3 +1,3 @@
CLASS net/minecraft/class_2466 net/minecraft/data/server/BlockTagsProvider
CLASS net/minecraft/class_2466 net/minecraft/data/server/BlockTagProvider
METHOD <init> (Lnet/minecraft/class_2403;)V
ARG 1 root

2
mappings/net/minecraft/data/server/EntityTypeTagsProvider.mapping → mappings/net/minecraft/data/server/EntityTypeTagProvider.mapping
View File

@ -1,3 +1,3 @@
CLASS net/minecraft/class_2467 net/minecraft/data/server/EntityTypeTagsProvider
CLASS net/minecraft/class_2467 net/minecraft/data/server/EntityTypeTagProvider
METHOD <init> (Lnet/minecraft/class_2403;)V
ARG 1 root

2
mappings/net/minecraft/data/server/FluidTagsProvider.mapping → mappings/net/minecraft/data/server/FluidTagProvider.mapping
View File

@ -1,3 +1,3 @@
CLASS net/minecraft/class_2469 net/minecraft/data/server/FluidTagsProvider
CLASS net/minecraft/class_2469 net/minecraft/data/server/FluidTagProvider
METHOD <init> (Lnet/minecraft/class_2403;)V
ARG 1 root

2
mappings/net/minecraft/data/server/GameEventTagsProvider.mapping → mappings/net/minecraft/data/server/GameEventTagProvider.mapping
View File

@ -1,3 +1,3 @@
CLASS net/minecraft/class_5746 net/minecraft/data/server/GameEventTagsProvider
CLASS net/minecraft/class_5746 net/minecraft/data/server/GameEventTagProvider
METHOD <init> (Lnet/minecraft/class_2403;)V
ARG 1 root

2
mappings/net/minecraft/data/server/ItemTagsProvider.mapping → mappings/net/minecraft/data/server/ItemTagProvider.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_2471 net/minecraft/data/server/ItemTagsProvider
CLASS net/minecraft/class_2471 net/minecraft/data/server/ItemTagProvider
FIELD field_23783 blockTags Ljava/util/function/Function;
METHOD <init> (Lnet/minecraft/class_2403;Lnet/minecraft/class_2466;)V
ARG 1 root

2
mappings/net/minecraft/data/server/LootTablesProvider.mapping → mappings/net/minecraft/data/server/LootTableProvider.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_2438 net/minecraft/data/server/LootTablesProvider
CLASS net/minecraft/class_2438 net/minecraft/data/server/LootTableProvider
FIELD field_11353 root Lnet/minecraft/class_2403;
FIELD field_11354 lootTypeGenerators Ljava/util/List;
FIELD field_11355 LOGGER Lorg/slf4j/Logger;

42
mappings/net/minecraft/data/server/RecipesProvider.mapping → mappings/net/minecraft/data/server/RecipeProvider.mapping
View File

@ -1,4 +1,4 @@
CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider
CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipeProvider
FIELD field_11373 root Lnet/minecraft/class_2403;
FIELD field_11374 LOGGER Lorg/slf4j/Logger;
FIELD field_11375 GSON Lcom/google/gson/Gson;
@ -22,7 +22,7 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider
METHOD method_10422 requireEnteringFluid (Lnet/minecraft/class_2248;)Lnet/minecraft/class_2037$class_2039;
ARG 0 block
METHOD method_10423 conditionsFromItemPredicates ([Lnet/minecraft/class_2073;)Lnet/minecraft/class_2066$class_2068;
ARG 0 items
ARG 0 predicates
METHOD method_10425 saveRecipe (Lnet/minecraft/class_2408;Lcom/google/gson/JsonObject;Ljava/nio/file/Path;)V
ARG 0 cache
ARG 1 json
@ -100,8 +100,8 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider
ARG 2 input
METHOD method_29728 offerNetheriteUpgradeRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1792;Lnet/minecraft/class_1792;)V
ARG 0 exporter
ARG 1 output
ARG 2 input
ARG 1 input
ARG 2 output
METHOD method_32233 offerCandleDyeingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)V
ARG 0 exporter
ARG 1 output
@ -224,8 +224,8 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider
ARG 0 output
ARG 1 input
METHOD method_33714 convertBetween (Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;)Ljava/lang/String;
ARG 0 from
ARG 1 to
ARG 0 to
ARG 1 from
METHOD method_33715 offerStonecuttingRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;I)V
ARG 0 exporter
ARG 1 output
@ -279,10 +279,10 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider
COMMENT <p>The shaped recipe converts 9 items in a square to a compacted form of the item.
COMMENT <p>The shapeless recipe converts the compacted form to 9 of the normal form.
ARG 0 exporter
ARG 1 compacted
COMMENT compacted output item, e.g. block of copper
ARG 2 input
ARG 1 input
COMMENT input item used to craft compacted item, e.g. copper ingot
ARG 2 compacted
COMMENT compacted output item, e.g. block of copper
METHOD method_36444 offerSingleOutputShapelessRecipe (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;Ljava/lang/String;)V
ARG 0 exporter
ARG 1 output
@ -294,20 +294,20 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider
ARG 2 input
ARG 3 group
ARG 4 outputCount
METHOD method_36446 offerReversibleCompactingRecipesWithCompactedItemGroup (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;Ljava/lang/String;Ljava/lang/String;)V
METHOD method_36446 offerReversibleCompactingRecipesWithCompactingRecipeGroup (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;Ljava/lang/String;Ljava/lang/String;)V
ARG 0 exporter
ARG 1 compacted
ARG 2 input
ARG 3 compactedItemId
ARG 4 compactedItemGroup
ARG 1 input
ARG 2 compacted
ARG 3 compactingRecipeName
ARG 4 compactingRecipeGroup
METHOD method_36447 offerReversibleCompactingRecipes (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V
ARG 0 exporter
ARG 1 input
ARG 2 compacted
ARG 3 compactedItemId
ARG 4 compactedItemGroup
ARG 5 inputItemId
ARG 6 inputItemGroup
ARG 3 compactingRecipeName
ARG 4 compactingRecipeGroup
ARG 5 reverseRecipeName
ARG 6 reverseRecipeGroup
METHOD method_36448 offerCookingRecipe (Ljava/util/function/Consumer;Ljava/lang/String;Lnet/minecraft/class_3957;ILnet/minecraft/class_1935;Lnet/minecraft/class_1935;F)V
ARG 0 exporter
ARG 1 cooker
@ -316,12 +316,12 @@ CLASS net/minecraft/class_2446 net/minecraft/data/server/RecipesProvider
ARG 4 input
ARG 5 output
ARG 6 experience
METHOD method_36449 offerReversibleCompactingRecipesWithInputItemGroup (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;Ljava/lang/String;Ljava/lang/String;)V
METHOD method_36449 offerReversibleCompactingRecipesWithReverseRecipeGroup (Ljava/util/function/Consumer;Lnet/minecraft/class_1935;Lnet/minecraft/class_1935;Ljava/lang/String;Ljava/lang/String;)V
ARG 0 exporter
ARG 1 input
ARG 2 compacted
ARG 3 inputItemId
ARG 4 inputItemGroup
ARG 3 reverseRecipeName
ARG 4 reverseRecipeGroup
METHOD method_36450 getRecipeName (Lnet/minecraft/class_1935;)Ljava/lang/String;
ARG 0 item
METHOD method_36451 getSmeltingItemPath (Lnet/minecraft/class_1935;)Ljava/lang/String;

4
mappings/net/minecraft/tag/Tag.mapping
View File

@ -63,8 +63,8 @@ CLASS net/minecraft/class_3494 net/minecraft/tag/Tag
METHOD method_32831 forEachTagId (Ljava/util/function/Consumer;)V
ARG 1 consumer
METHOD method_32832 canAdd (Ljava/util/function/Predicate;Ljava/util/function/Predicate;)Z
ARG 1 existenceTest
ARG 2 duplicationTest
ARG 1 objectExistsTest
ARG 2 tagExistsTest
METHOD method_32833 forEachGroupId (Ljava/util/function/Consumer;)V
ARG 1 consumer
CLASS class_3497 TagEntry