From 0a36582e4be19e28fe9f9f20f54a90d68240c51d Mon Sep 17 00:00:00 2001 From: Shnupbups Date: Fri, 11 Feb 2022 19:55:08 +1100 Subject: [PATCH] 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 --- .../BlockStateModelGenerator.mapping | 4 +- .../{model => }/BlockStateSupplier.mapping | 2 +- .../{model => }/BlockStateVariant.mapping | 2 +- .../{model => }/BlockStateVariantMap.mapping | 2 +- .../data/client/{model => }/Model.mapping | 2 +- .../data/client/{model => }/ModelIds.mapping | 2 +- ...Provider.mapping => ModelProvider.mapping} | 2 +- .../data/client/{model => }/Models.mapping | 2 +- .../MultipartBlockStateSupplier.mapping | 2 +- .../client/{model => }/PropertiesMap.mapping | 2 +- .../{model => }/SimpleModelSupplier.mapping | 2 +- .../client/{model => }/TextureKey.mapping | 2 +- .../client/{model => }/TexturedModel.mapping | 2 +- .../client/{model => }/VariantSetting.mapping | 2 +- .../{model => }/VariantSettings.mapping | 2 +- .../VariantsBlockStateSupplier.mapping | 2 +- .../data/client/{model => }/When.mapping | 2 +- ...vider.mapping => WorldgenProvider.mapping} | 2 +- ...er.mapping => AdvancementProvider.mapping} | 2 +- ...vider.mapping => BlockTagProvider.mapping} | 2 +- ....mapping => EntityTypeTagProvider.mapping} | 2 +- ...vider.mapping => FluidTagProvider.mapping} | 2 +- ...r.mapping => GameEventTagProvider.mapping} | 2 +- ...ovider.mapping => ItemTagProvider.mapping} | 2 +- ...ider.mapping => LootTableProvider.mapping} | 2 +- ...rovider.mapping => RecipeProvider.mapping} | 42 +++++++++---------- mappings/net/minecraft/tag/Tag.mapping | 4 +- 27 files changed, 49 insertions(+), 49 deletions(-) rename mappings/net/minecraft/data/client/{model => }/BlockStateModelGenerator.mapping (99%) rename mappings/net/minecraft/data/client/{model => }/BlockStateSupplier.mapping (57%) rename mappings/net/minecraft/data/client/{model => }/BlockStateVariant.mapping (86%) rename mappings/net/minecraft/data/client/{model => }/BlockStateVariantMap.mapping (99%) rename mappings/net/minecraft/data/client/{model => }/Model.mapping (95%) rename mappings/net/minecraft/data/client/{model => }/ModelIds.mapping (90%) rename mappings/net/minecraft/data/client/{BlockStateDefinitionProvider.mapping => ModelProvider.mapping} (89%) rename mappings/net/minecraft/data/client/{model => }/Models.mapping (90%) rename mappings/net/minecraft/data/client/{model => }/MultipartBlockStateSupplier.mapping (93%) rename mappings/net/minecraft/data/client/{model => }/PropertiesMap.mapping (91%) rename mappings/net/minecraft/data/client/{model => }/SimpleModelSupplier.mapping (57%) rename mappings/net/minecraft/data/client/{model => }/TextureKey.mapping (87%) rename mappings/net/minecraft/data/client/{model => }/TexturedModel.mapping (97%) rename mappings/net/minecraft/data/client/{model => }/VariantSetting.mapping (88%) rename mappings/net/minecraft/data/client/{model => }/VariantSettings.mapping (89%) rename mappings/net/minecraft/data/client/{model => }/VariantsBlockStateSupplier.mapping (94%) rename mappings/net/minecraft/data/client/{model => }/When.mapping (97%) rename mappings/net/minecraft/data/report/{WorldgenListProvider.mapping => WorldgenProvider.mapping} (99%) rename mappings/net/minecraft/data/server/{AdvancementsProvider.mapping => AdvancementProvider.mapping} (97%) rename mappings/net/minecraft/data/server/{BlockTagsProvider.mapping => BlockTagProvider.mapping} (91%) rename mappings/net/minecraft/data/server/{EntityTypeTagsProvider.mapping => EntityTypeTagProvider.mapping} (88%) rename mappings/net/minecraft/data/server/{FluidTagsProvider.mapping => FluidTagProvider.mapping} (91%) rename mappings/net/minecraft/data/server/{GameEventTagsProvider.mapping => GameEventTagProvider.mapping} (89%) rename mappings/net/minecraft/data/server/{ItemTagsProvider.mapping => ItemTagProvider.mapping} (97%) rename mappings/net/minecraft/data/server/{LootTablesProvider.mapping => LootTableProvider.mapping} (98%) rename mappings/net/minecraft/data/server/{RecipesProvider.mapping => RecipeProvider.mapping} (95%) diff --git a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping similarity index 99% rename from mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping rename to mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping index 61202bda34..4c08f16b96 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateModelGenerator.mapping +++ b/mappings/net/minecraft/data/client/BlockStateModelGenerator.mapping @@ -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 diff --git a/mappings/net/minecraft/data/client/model/BlockStateSupplier.mapping b/mappings/net/minecraft/data/client/BlockStateSupplier.mapping similarity index 57% rename from mappings/net/minecraft/data/client/model/BlockStateSupplier.mapping rename to mappings/net/minecraft/data/client/BlockStateSupplier.mapping index a822ea5107..0852e21725 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateSupplier.mapping +++ b/mappings/net/minecraft/data/client/BlockStateSupplier.mapping @@ -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; diff --git a/mappings/net/minecraft/data/client/model/BlockStateVariant.mapping b/mappings/net/minecraft/data/client/BlockStateVariant.mapping similarity index 86% rename from mappings/net/minecraft/data/client/model/BlockStateVariant.mapping rename to mappings/net/minecraft/data/client/BlockStateVariant.mapping index b6221dfdca..99562be3eb 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateVariant.mapping +++ b/mappings/net/minecraft/data/client/BlockStateVariant.mapping @@ -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; diff --git a/mappings/net/minecraft/data/client/model/BlockStateVariantMap.mapping b/mappings/net/minecraft/data/client/BlockStateVariantMap.mapping similarity index 99% rename from mappings/net/minecraft/data/client/model/BlockStateVariantMap.mapping rename to mappings/net/minecraft/data/client/BlockStateVariantMap.mapping index c09acee2ae..b5320258ce 100644 --- a/mappings/net/minecraft/data/client/model/BlockStateVariantMap.mapping +++ b/mappings/net/minecraft/data/client/BlockStateVariantMap.mapping @@ -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} COMMENT passed to the constructor of {@code ModelVariantMap}. FIELD field_22863 variants Ljava/util/Map; diff --git a/mappings/net/minecraft/data/client/model/Model.mapping b/mappings/net/minecraft/data/client/Model.mapping similarity index 95% rename from mappings/net/minecraft/data/client/model/Model.mapping rename to mappings/net/minecraft/data/client/Model.mapping index 016ba9f834..401d5eace8 100644 --- a/mappings/net/minecraft/data/client/model/Model.mapping +++ b/mappings/net/minecraft/data/client/Model.mapping @@ -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; diff --git a/mappings/net/minecraft/data/client/model/ModelIds.mapping b/mappings/net/minecraft/data/client/ModelIds.mapping similarity index 90% rename from mappings/net/minecraft/data/client/model/ModelIds.mapping rename to mappings/net/minecraft/data/client/ModelIds.mapping index d9026d513b..72625bb88a 100644 --- a/mappings/net/minecraft/data/client/model/ModelIds.mapping +++ b/mappings/net/minecraft/data/client/ModelIds.mapping @@ -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; diff --git a/mappings/net/minecraft/data/client/BlockStateDefinitionProvider.mapping b/mappings/net/minecraft/data/client/ModelProvider.mapping similarity index 89% rename from mappings/net/minecraft/data/client/BlockStateDefinitionProvider.mapping rename to mappings/net/minecraft/data/client/ModelProvider.mapping index 681995bcd9..f489fb1dcd 100644 --- a/mappings/net/minecraft/data/client/BlockStateDefinitionProvider.mapping +++ b/mappings/net/minecraft/data/client/ModelProvider.mapping @@ -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; diff --git a/mappings/net/minecraft/data/client/model/Models.mapping b/mappings/net/minecraft/data/client/Models.mapping similarity index 90% rename from mappings/net/minecraft/data/client/model/Models.mapping rename to mappings/net/minecraft/data/client/Models.mapping index 504a1085a2..cf9978ba35 100644 --- a/mappings/net/minecraft/data/client/model/Models.mapping +++ b/mappings/net/minecraft/data/client/Models.mapping @@ -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; diff --git a/mappings/net/minecraft/data/client/model/MultipartBlockStateSupplier.mapping b/mappings/net/minecraft/data/client/MultipartBlockStateSupplier.mapping similarity index 93% rename from mappings/net/minecraft/data/client/model/MultipartBlockStateSupplier.mapping rename to mappings/net/minecraft/data/client/MultipartBlockStateSupplier.mapping index a6fc2793af..d5efc7e186 100644 --- a/mappings/net/minecraft/data/client/model/MultipartBlockStateSupplier.mapping +++ b/mappings/net/minecraft/data/client/MultipartBlockStateSupplier.mapping @@ -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 (Lnet/minecraft/class_2248;)V diff --git a/mappings/net/minecraft/data/client/model/PropertiesMap.mapping b/mappings/net/minecraft/data/client/PropertiesMap.mapping similarity index 91% rename from mappings/net/minecraft/data/client/model/PropertiesMap.mapping rename to mappings/net/minecraft/data/client/PropertiesMap.mapping index 0f1015ec96..37b6c3f7a1 100644 --- a/mappings/net/minecraft/data/client/model/PropertiesMap.mapping +++ b/mappings/net/minecraft/data/client/PropertiesMap.mapping @@ -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 diff --git a/mappings/net/minecraft/data/client/model/SimpleModelSupplier.mapping b/mappings/net/minecraft/data/client/SimpleModelSupplier.mapping similarity index 57% rename from mappings/net/minecraft/data/client/model/SimpleModelSupplier.mapping rename to mappings/net/minecraft/data/client/SimpleModelSupplier.mapping index 6f4811ec58..0d856da1b6 100644 --- a/mappings/net/minecraft/data/client/model/SimpleModelSupplier.mapping +++ b/mappings/net/minecraft/data/client/SimpleModelSupplier.mapping @@ -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 (Lnet/minecraft/class_2960;)V ARG 1 parent diff --git a/mappings/net/minecraft/data/client/model/TextureKey.mapping b/mappings/net/minecraft/data/client/TextureKey.mapping similarity index 87% rename from mappings/net/minecraft/data/client/model/TextureKey.mapping rename to mappings/net/minecraft/data/client/TextureKey.mapping index 1956b41d3b..02d4038e11 100644 --- a/mappings/net/minecraft/data/client/model/TextureKey.mapping +++ b/mappings/net/minecraft/data/client/TextureKey.mapping @@ -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 (Ljava/lang/String;Lnet/minecraft/class_4945;)V diff --git a/mappings/net/minecraft/data/client/model/TexturedModel.mapping b/mappings/net/minecraft/data/client/TexturedModel.mapping similarity index 97% rename from mappings/net/minecraft/data/client/model/TexturedModel.mapping rename to mappings/net/minecraft/data/client/TexturedModel.mapping index 1c75b333c6..d159ccbe89 100644 --- a/mappings/net/minecraft/data/client/model/TexturedModel.mapping +++ b/mappings/net/minecraft/data/client/TexturedModel.mapping @@ -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; diff --git a/mappings/net/minecraft/data/client/model/VariantSetting.mapping b/mappings/net/minecraft/data/client/VariantSetting.mapping similarity index 88% rename from mappings/net/minecraft/data/client/model/VariantSetting.mapping rename to mappings/net/minecraft/data/client/VariantSetting.mapping index 644eb87537..cfece20329 100644 --- a/mappings/net/minecraft/data/client/model/VariantSetting.mapping +++ b/mappings/net/minecraft/data/client/VariantSetting.mapping @@ -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 (Ljava/lang/String;Ljava/util/function/Function;)V diff --git a/mappings/net/minecraft/data/client/model/VariantSettings.mapping b/mappings/net/minecraft/data/client/VariantSettings.mapping similarity index 89% rename from mappings/net/minecraft/data/client/model/VariantSettings.mapping rename to mappings/net/minecraft/data/client/VariantSettings.mapping index 9043490c86..77b62b9376 100644 --- a/mappings/net/minecraft/data/client/model/VariantSettings.mapping +++ b/mappings/net/minecraft/data/client/VariantSettings.mapping @@ -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; diff --git a/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping b/mappings/net/minecraft/data/client/VariantsBlockStateSupplier.mapping similarity index 94% rename from mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping rename to mappings/net/minecraft/data/client/VariantsBlockStateSupplier.mapping index 3e88b1af7c..4e0dab63c3 100644 --- a/mappings/net/minecraft/data/client/model/VariantsBlockStateSupplier.mapping +++ b/mappings/net/minecraft/data/client/VariantsBlockStateSupplier.mapping @@ -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; diff --git a/mappings/net/minecraft/data/client/model/When.mapping b/mappings/net/minecraft/data/client/When.mapping similarity index 97% rename from mappings/net/minecraft/data/client/model/When.mapping rename to mappings/net/minecraft/data/client/When.mapping index 252da77613..0357afcdde 100644 --- a/mappings/net/minecraft/data/client/model/When.mapping +++ b/mappings/net/minecraft/data/client/When.mapping @@ -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 diff --git a/mappings/net/minecraft/data/report/WorldgenListProvider.mapping b/mappings/net/minecraft/data/report/WorldgenProvider.mapping similarity index 99% rename from mappings/net/minecraft/data/report/WorldgenListProvider.mapping rename to mappings/net/minecraft/data/report/WorldgenProvider.mapping index ac14723975..3795f150f0 100644 --- a/mappings/net/minecraft/data/report/WorldgenListProvider.mapping +++ b/mappings/net/minecraft/data/report/WorldgenProvider.mapping @@ -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; diff --git a/mappings/net/minecraft/data/server/AdvancementsProvider.mapping b/mappings/net/minecraft/data/server/AdvancementProvider.mapping similarity index 97% rename from mappings/net/minecraft/data/server/AdvancementsProvider.mapping rename to mappings/net/minecraft/data/server/AdvancementProvider.mapping index 1253f0ced7..1c4f3b415d 100644 --- a/mappings/net/minecraft/data/server/AdvancementsProvider.mapping +++ b/mappings/net/minecraft/data/server/AdvancementProvider.mapping @@ -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; diff --git a/mappings/net/minecraft/data/server/BlockTagsProvider.mapping b/mappings/net/minecraft/data/server/BlockTagProvider.mapping similarity index 91% rename from mappings/net/minecraft/data/server/BlockTagsProvider.mapping rename to mappings/net/minecraft/data/server/BlockTagProvider.mapping index 1588352e99..8c70185ba8 100644 --- a/mappings/net/minecraft/data/server/BlockTagsProvider.mapping +++ b/mappings/net/minecraft/data/server/BlockTagProvider.mapping @@ -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 (Lnet/minecraft/class_2403;)V ARG 1 root diff --git a/mappings/net/minecraft/data/server/EntityTypeTagsProvider.mapping b/mappings/net/minecraft/data/server/EntityTypeTagProvider.mapping similarity index 88% rename from mappings/net/minecraft/data/server/EntityTypeTagsProvider.mapping rename to mappings/net/minecraft/data/server/EntityTypeTagProvider.mapping index a788b1ff9b..5c439d95a3 100644 --- a/mappings/net/minecraft/data/server/EntityTypeTagsProvider.mapping +++ b/mappings/net/minecraft/data/server/EntityTypeTagProvider.mapping @@ -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 (Lnet/minecraft/class_2403;)V ARG 1 root diff --git a/mappings/net/minecraft/data/server/FluidTagsProvider.mapping b/mappings/net/minecraft/data/server/FluidTagProvider.mapping similarity index 91% rename from mappings/net/minecraft/data/server/FluidTagsProvider.mapping rename to mappings/net/minecraft/data/server/FluidTagProvider.mapping index 7a53de0519..0314466b58 100644 --- a/mappings/net/minecraft/data/server/FluidTagsProvider.mapping +++ b/mappings/net/minecraft/data/server/FluidTagProvider.mapping @@ -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 (Lnet/minecraft/class_2403;)V ARG 1 root diff --git a/mappings/net/minecraft/data/server/GameEventTagsProvider.mapping b/mappings/net/minecraft/data/server/GameEventTagProvider.mapping similarity index 89% rename from mappings/net/minecraft/data/server/GameEventTagsProvider.mapping rename to mappings/net/minecraft/data/server/GameEventTagProvider.mapping index ae0a693467..23fe0f75a6 100644 --- a/mappings/net/minecraft/data/server/GameEventTagsProvider.mapping +++ b/mappings/net/minecraft/data/server/GameEventTagProvider.mapping @@ -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 (Lnet/minecraft/class_2403;)V ARG 1 root diff --git a/mappings/net/minecraft/data/server/ItemTagsProvider.mapping b/mappings/net/minecraft/data/server/ItemTagProvider.mapping similarity index 97% rename from mappings/net/minecraft/data/server/ItemTagsProvider.mapping rename to mappings/net/minecraft/data/server/ItemTagProvider.mapping index 9760926415..e8090f40b0 100644 --- a/mappings/net/minecraft/data/server/ItemTagsProvider.mapping +++ b/mappings/net/minecraft/data/server/ItemTagProvider.mapping @@ -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 (Lnet/minecraft/class_2403;Lnet/minecraft/class_2466;)V ARG 1 root diff --git a/mappings/net/minecraft/data/server/LootTablesProvider.mapping b/mappings/net/minecraft/data/server/LootTableProvider.mapping similarity index 98% rename from mappings/net/minecraft/data/server/LootTablesProvider.mapping rename to mappings/net/minecraft/data/server/LootTableProvider.mapping index a32b65fd69..d6fd5ca5e8 100644 --- a/mappings/net/minecraft/data/server/LootTablesProvider.mapping +++ b/mappings/net/minecraft/data/server/LootTableProvider.mapping @@ -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; diff --git a/mappings/net/minecraft/data/server/RecipesProvider.mapping b/mappings/net/minecraft/data/server/RecipeProvider.mapping similarity index 95% rename from mappings/net/minecraft/data/server/RecipesProvider.mapping rename to mappings/net/minecraft/data/server/RecipeProvider.mapping index 88c588a190..f678f24edc 100644 --- a/mappings/net/minecraft/data/server/RecipesProvider.mapping +++ b/mappings/net/minecraft/data/server/RecipeProvider.mapping @@ -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

The shaped recipe converts 9 items in a square to a compacted form of the item. COMMENT

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; diff --git a/mappings/net/minecraft/tag/Tag.mapping b/mappings/net/minecraft/tag/Tag.mapping index 6db8789762..afd596ea70 100644 --- a/mappings/net/minecraft/tag/Tag.mapping +++ b/mappings/net/minecraft/tag/Tag.mapping @@ -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