From 203e6b2369fac5e6db19758140adebddb5435f1d Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 13 Nov 2024 18:31:05 +0000 Subject: [PATCH] 24w46a --- fabric-data-generation-api-v1/build.gradle | 8 +- .../v1/provider/FabricModelProvider.java | 6 +- .../ModelProviderBlockDefinitionsMixin.java | 6 +- ...java => ModelProviderItemAssetsMixin.java} | 16 +- .../datagen/client/ModelProviderMixin.java | 20 +- ...-data-generation-api-v1.client.mixins.json | 2 +- .../loot/FabricBlockLootTableGenerator.java | 2 +- .../FabricBlockLootTableProvider.java | 2 +- .../v1/provider/FabricLootTableProvider.java | 2 +- .../v1/provider/FabricRecipeProvider.java | 8 +- .../v1/provider/FabricTagProvider.java | 2 +- .../ConditionBlockLootTableGenerator.java | 2 +- .../mixin/datagen/TagProviderMixin.java | 2 +- .../loot/BlockLootTableGeneratorAccessor.java | 2 +- .../loot/BlockLootTableGeneratorMixin.java | 2 +- ...abric-data-generation-api-v1.accesswidener | 658 +++++++++--------- .../atlases/atlas_source_test.json | 9 - .../blockstates/block_that_drops_nothing.json | 7 - .../block_with_vanilla_loot_table.json | 7 - .../blockstates/block_without_item.json | 7 - .../blockstates/block_without_loot_table.json | 7 - .../blockstates/simple_block.json | 7 - .../items/simple_block.json | 6 - .../block/block_that_drops_nothing.json | 6 - .../block/block_with_vanilla_loot_table.json | 6 - .../models/block/block_without_item.json | 6 - .../block/block_without_loot_table.json | 6 - .../models/block/simple_block.json | 6 - .../datagen/DataGeneratorTestEntrypoint.java | 4 +- .../DataGeneratorClientTestEntrypoint.java | 4 +- .../template.accesswidener | 34 +- .../item/ArmorKnockbackResistanceTest.java | 4 +- .../mixin/loot/JsonDataLoaderMixin.java | 2 +- .../v1/ingredient/CustomIngredient.java | 6 +- .../ingredient/CustomIngredientImpl.java | 10 +- .../ingredient/builtin/AllIngredient.java | 7 +- .../ingredient/builtin/AnyIngredient.java | 13 +- .../builtin/ComponentsIngredient.java | 6 +- .../builtin/CustomDataIngredient.java | 6 +- .../builtin/DifferenceIngredient.java | 10 +- .../fabric-recipe-api-v1.accesswidener | 1 - .../ingredient/IngredientMatchTests.java | 38 +- .../registry/sync/RegistryLoaderMixin.java | 2 +- .../rendering/CapeFeatureRendererMixin.java | 4 +- .../rendering/TooltipComponentTestInit.java | 4 +- .../rendering/client/ArmorRenderingTests.java | 2 +- .../client/CustomAtlasSourcesTest.java | 3 +- .../conditions/OverlayConditionsMetadata.java | 2 +- .../conditions/JsonDataLoaderMixin.java | 2 +- .../resource/loader/ModNioResourcePack.java | 4 +- .../resource/loader/ModResourcePackUtil.java | 5 +- .../loader/PlaceholderResourcePack.java | 10 +- gradle.properties | 36 +- gradle/javadoc.accesswidener | 2 +- 54 files changed, 477 insertions(+), 564 deletions(-) rename fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/{ModelProviderItemDefinitionsMixin.java => ModelProviderItemAssetsMixin.java} (81%) delete mode 100644 fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/atlases/atlas_source_test.json delete mode 100644 fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/block_that_drops_nothing.json delete mode 100644 fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/block_with_vanilla_loot_table.json delete mode 100644 fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/block_without_item.json delete mode 100644 fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/block_without_loot_table.json delete mode 100644 fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/simple_block.json delete mode 100644 fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/items/simple_block.json delete mode 100644 fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/block_that_drops_nothing.json delete mode 100644 fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/block_with_vanilla_loot_table.json delete mode 100644 fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/block_without_item.json delete mode 100644 fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/block_without_loot_table.json delete mode 100644 fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/simple_block.json diff --git a/fabric-data-generation-api-v1/build.gradle b/fabric-data-generation-api-v1/build.gradle index 8621ac608..27975a5ab 100644 --- a/fabric-data-generation-api-v1/build.gradle +++ b/fabric-data-generation-api-v1/build.gradle @@ -89,14 +89,14 @@ tasks.register('generateAccessWidener') { accessWidener += "\n" accessWidener += file("template.accesswidener").text + "\n" - visitMethods(classes["net/minecraft/data/server/recipe/RecipeGenerator"]) { name, desc, owner -> + visitMethods(classes["net/minecraft/data/recipe/RecipeGenerator"]) { name, desc, owner -> if (it.name == "generate") return accessWidener += "transitive-accessible\tmethod\t${owner}\t${name}\t${desc}\n" } - visitMethods(classes["net/minecraft/data/client/BlockStateModelGenerator"]) { name, desc, owner -> + visitMethods(classes["net/minecraft/client/data/BlockStateModelGenerator"]) { name, desc, owner -> if (desc == "()V") // Skip over methods that dont take any arguments, as they are specific to minecraft. return @@ -104,11 +104,11 @@ tasks.register('generateAccessWidener') { accessWidener += "transitive-accessible\tmethod\t${owner}\t${name}\t${desc}\n" } - visitMethods(classes["net/minecraft/data/server/loottable/BlockLootTableGenerator"]) { name, desc, owner -> + visitMethods(classes["net/minecraft/data/loottable/BlockLootTableGenerator"]) { name, desc, owner -> accessWidener += "transitive-accessible\tmethod\t${owner}\t${name}\t${desc}\n" } - visitMethods(classes["net/minecraft/data/client/ItemModelGenerator"]) { name, desc, owner -> + visitMethods(classes["net/minecraft/client/data/ItemModelGenerator"]) { name, desc, owner -> accessWidener += "transitive-accessible\tmethod\t${owner}\t${name}\t${desc}\n" } diff --git a/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/api/client/datagen/v1/provider/FabricModelProvider.java b/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/api/client/datagen/v1/provider/FabricModelProvider.java index 3a2ec3bb0..11f90005d 100644 --- a/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/api/client/datagen/v1/provider/FabricModelProvider.java +++ b/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/api/client/datagen/v1/provider/FabricModelProvider.java @@ -16,9 +16,9 @@ package net.fabricmc.fabric.api.client.datagen.v1.provider; -import net.minecraft.data.client.BlockStateModelGenerator; -import net.minecraft.data.client.ItemModelGenerator; -import net.minecraft.data.client.ModelProvider; +import net.minecraft.client.data.BlockStateModelGenerator; +import net.minecraft.client.data.ItemModelGenerator; +import net.minecraft.client.data.ModelProvider; import net.fabricmc.fabric.api.datagen.v1.FabricDataGenerator; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; diff --git a/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderBlockDefinitionsMixin.java b/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderBlockDefinitionsMixin.java index ea8809047..843932e7b 100644 --- a/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderBlockDefinitionsMixin.java +++ b/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderBlockDefinitionsMixin.java @@ -25,13 +25,13 @@ import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; import net.minecraft.block.Block; -import net.minecraft.data.client.ModelProvider; +import net.minecraft.client.data.ModelProvider; import net.minecraft.registry.entry.RegistryEntry; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.impl.datagen.client.FabricModelProviderDefinitions; -@Mixin(ModelProvider.class_10406.class) +@Mixin(ModelProvider.BlockStateSuppliers.class) public class ModelProviderBlockDefinitionsMixin implements FabricModelProviderDefinitions { @Unique private FabricDataOutput fabricDataOutput; @@ -42,7 +42,7 @@ public class ModelProviderBlockDefinitionsMixin implements FabricModelProviderDe } // Target the first .filter() call, to filter out blocks that are not from the mod we are processing. - @Redirect(method = "method_65462", at = @At(value = "INVOKE", target = "Ljava/util/stream/Stream;filter(Ljava/util/function/Predicate;)Ljava/util/stream/Stream;", ordinal = 0, remap = false)) + @Redirect(method = "validate", at = @At(value = "INVOKE", target = "Ljava/util/stream/Stream;filter(Ljava/util/function/Predicate;)Ljava/util/stream/Stream;", ordinal = 0, remap = false)) private Stream> filterBlocksForProcessingMod(Stream> instance, Predicate> predicate) { return instance.filter((block) -> { if (fabricDataOutput != null) { diff --git a/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderItemDefinitionsMixin.java b/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderItemAssetsMixin.java similarity index 81% rename from fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderItemDefinitionsMixin.java rename to fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderItemAssetsMixin.java index 738dccf7c..62146864a 100644 --- a/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderItemDefinitionsMixin.java +++ b/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderItemAssetsMixin.java @@ -29,8 +29,8 @@ import org.spongepowered.asm.mixin.Unique; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Redirect; -import net.minecraft.class_10434; -import net.minecraft.data.client.ModelProvider; +import net.minecraft.client.data.ModelProvider; +import net.minecraft.client.item.ItemAsset; import net.minecraft.item.BlockItem; import net.minecraft.item.Item; import net.minecraft.registry.Registries; @@ -39,11 +39,11 @@ import net.minecraft.registry.entry.RegistryEntry; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; import net.fabricmc.fabric.impl.datagen.client.FabricModelProviderDefinitions; -@Mixin(ModelProvider.class_10407.class) -public class ModelProviderItemDefinitionsMixin implements FabricModelProviderDefinitions { +@Mixin(ModelProvider.ItemAssets.class) +public class ModelProviderItemAssetsMixin implements FabricModelProviderDefinitions { @Shadow @Final - private Map field_55249; + private Map ITEM_ASSETS; @Unique private FabricDataOutput fabricDataOutput; @@ -53,12 +53,12 @@ public class ModelProviderItemDefinitionsMixin implements FabricModelProviderDef } @WrapOperation(method = "method_65470", at = @At(value = "INVOKE", target = "Ljava/util/Map;containsKey(Ljava/lang/Object;)Z", ordinal = 1, remap = false)) - private boolean filterItemsForProcessingMod(Map map, Object o, Operation original) { + private boolean filterItemsForProcessingMod(Map map, Object o, Operation original) { BlockItem blockItem = (BlockItem) o; if (fabricDataOutput != null) { // Only generate the item model if the block state json was registered - if (field_55249.containsKey(blockItem)) { + if (ITEM_ASSETS.containsKey(blockItem)) { return false; } @@ -71,7 +71,7 @@ public class ModelProviderItemDefinitionsMixin implements FabricModelProviderDef return original.call(map, blockItem); } - @Redirect(method = "method_65469", at = @At(value = "INVOKE", target = "Ljava/util/stream/Stream;filter(Ljava/util/function/Predicate;)Ljava/util/stream/Stream;", ordinal = 0, remap = false)) + @Redirect(method = "resolveAndValidate", at = @At(value = "INVOKE", target = "Ljava/util/stream/Stream;filter(Ljava/util/function/Predicate;)Ljava/util/stream/Stream;", ordinal = 0, remap = false)) private Stream> filterItemsForProcessingMod(Stream> instance, Predicate> predicate) { return instance.filter((item) -> { if (fabricDataOutput != null) { diff --git a/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderMixin.java b/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderMixin.java index 7c79119e5..844dd6aa0 100644 --- a/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderMixin.java +++ b/fabric-data-generation-api-v1/src/client/java/net/fabricmc/fabric/mixin/datagen/client/ModelProviderMixin.java @@ -27,11 +27,11 @@ import org.spongepowered.asm.mixin.injection.Redirect; import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable; +import net.minecraft.client.data.BlockStateModelGenerator; +import net.minecraft.client.data.ItemModelGenerator; +import net.minecraft.client.data.ModelProvider; import net.minecraft.data.DataOutput; import net.minecraft.data.DataWriter; -import net.minecraft.data.client.BlockStateModelGenerator; -import net.minecraft.data.client.ItemModelGenerator; -import net.minecraft.data.client.ModelProvider; import net.fabricmc.fabric.api.client.datagen.v1.provider.FabricModelProvider; import net.fabricmc.fabric.api.datagen.v1.FabricDataOutput; @@ -49,7 +49,7 @@ public class ModelProviderMixin { } } - @Redirect(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/data/client/BlockStateModelGenerator;register()V")) + @Redirect(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/data/BlockStateModelGenerator;register()V")) private void registerBlockStateModels(BlockStateModelGenerator instance) { if (((Object) this) instanceof FabricModelProvider fabricModelProvider) { fabricModelProvider.generateBlockStateModels(instance); @@ -59,7 +59,7 @@ public class ModelProviderMixin { } } - @Redirect(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/data/client/ItemModelGenerator;register()V")) + @Redirect(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/data/ItemModelGenerator;register()V")) private void registerItemModels(ItemModelGenerator instance) { if (((Object) this) instanceof FabricModelProvider fabricModelProvider) { fabricModelProvider.generateItemModels(instance); @@ -69,11 +69,11 @@ public class ModelProviderMixin { } } - @Inject(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/data/client/BlockStateModelGenerator;register()V")) + @Inject(method = "run", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/data/BlockStateModelGenerator;register()V")) private void setFabricDataOutput(DataWriter writer, CallbackInfoReturnable> cir, - @Local ModelProvider.class_10406 blockDefinitions, - @Local ModelProvider.class_10407 itemDefinitions) { - ((FabricModelProviderDefinitions) blockDefinitions).setFabricDataOutput(fabricDataOutput); - ((FabricModelProviderDefinitions) itemDefinitions).setFabricDataOutput(fabricDataOutput); + @Local ModelProvider.BlockStateSuppliers blockStateSuppliers, + @Local ModelProvider.ItemAssets itemAssets) { + ((FabricModelProviderDefinitions) blockStateSuppliers).setFabricDataOutput(fabricDataOutput); + ((FabricModelProviderDefinitions) itemAssets).setFabricDataOutput(fabricDataOutput); } } diff --git a/fabric-data-generation-api-v1/src/client/resources/fabric-data-generation-api-v1.client.mixins.json b/fabric-data-generation-api-v1/src/client/resources/fabric-data-generation-api-v1.client.mixins.json index e721b2eeb..e1707333b 100644 --- a/fabric-data-generation-api-v1/src/client/resources/fabric-data-generation-api-v1.client.mixins.json +++ b/fabric-data-generation-api-v1/src/client/resources/fabric-data-generation-api-v1.client.mixins.json @@ -5,7 +5,7 @@ "client": [ "MinecraftClientMixin", "ModelProviderBlockDefinitionsMixin", - "ModelProviderItemDefinitionsMixin", + "ModelProviderItemAssetsMixin", "ModelProviderMixin" ], "injectors": { diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/loot/FabricBlockLootTableGenerator.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/loot/FabricBlockLootTableGenerator.java index 1a1abbe7d..55f35efe1 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/loot/FabricBlockLootTableGenerator.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/loot/FabricBlockLootTableGenerator.java @@ -18,7 +18,7 @@ package net.fabricmc.fabric.api.datagen.v1.loot; import com.google.common.base.Preconditions; -import net.minecraft.data.server.loottable.BlockLootTableGenerator; +import net.minecraft.data.loottable.BlockLootTableGenerator; import net.fabricmc.fabric.api.resource.conditions.v1.ResourceCondition; import net.fabricmc.fabric.impl.datagen.loot.ConditionBlockLootTableGenerator; diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricBlockLootTableProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricBlockLootTableProvider.java index 17110b80f..833f05809 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricBlockLootTableProvider.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricBlockLootTableProvider.java @@ -28,7 +28,7 @@ import com.google.common.collect.Sets; import net.minecraft.block.Block; import net.minecraft.data.DataWriter; -import net.minecraft.data.server.loottable.BlockLootTableGenerator; +import net.minecraft.data.loottable.BlockLootTableGenerator; import net.minecraft.loot.LootTable; import net.minecraft.loot.context.LootContextTypes; import net.minecraft.registry.Registries; diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLootTableProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLootTableProvider.java index 1c460bdfc..898df2262 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLootTableProvider.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricLootTableProvider.java @@ -22,7 +22,7 @@ import com.google.common.base.Preconditions; import org.jetbrains.annotations.ApiStatus; import net.minecraft.data.DataProvider; -import net.minecraft.data.server.loottable.LootTableGenerator; +import net.minecraft.data.loottable.LootTableGenerator; import net.minecraft.loot.LootTable; import net.minecraft.registry.RegistryKey; diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java index da8b44685..2efa3608e 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricRecipeProvider.java @@ -33,11 +33,9 @@ import net.minecraft.advancement.AdvancementEntry; import net.minecraft.data.DataOutput; import net.minecraft.data.DataProvider; import net.minecraft.data.DataWriter; -import net.minecraft.data.server.recipe.CraftingRecipeJsonBuilder; -import net.minecraft.data.server.recipe.RecipeExporter; -import net.minecraft.data.server.recipe.RecipeGenerator; -import net.minecraft.data.server.recipe.ShapedRecipeJsonBuilder; -import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; +import net.minecraft.data.recipe.CraftingRecipeJsonBuilder; +import net.minecraft.data.recipe.RecipeExporter; +import net.minecraft.data.recipe.RecipeGenerator; import net.minecraft.recipe.Recipe; import net.minecraft.registry.RegistryKey; import net.minecraft.registry.RegistryKeys; diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagProvider.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagProvider.java index cac205fc0..0207f5089 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagProvider.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/api/datagen/v1/provider/FabricTagProvider.java @@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable; import net.minecraft.block.Block; import net.minecraft.block.entity.BlockEntityType; -import net.minecraft.data.server.tag.TagProvider; +import net.minecraft.data.tag.TagProvider; import net.minecraft.enchantment.Enchantment; import net.minecraft.entity.EntityType; import net.minecraft.fluid.Fluid; diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/loot/ConditionBlockLootTableGenerator.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/loot/ConditionBlockLootTableGenerator.java index 401a74738..a344eca19 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/loot/ConditionBlockLootTableGenerator.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/impl/datagen/loot/ConditionBlockLootTableGenerator.java @@ -19,7 +19,7 @@ package net.fabricmc.fabric.impl.datagen.loot; import java.util.Collections; import net.minecraft.block.Block; -import net.minecraft.data.server.loottable.BlockLootTableGenerator; +import net.minecraft.data.loottable.BlockLootTableGenerator; import net.minecraft.loot.LootTable; import net.minecraft.resource.featuretoggle.FeatureFlags; diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagProviderMixin.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagProviderMixin.java index 3ae295511..9bd3b1037 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagProviderMixin.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/TagProviderMixin.java @@ -21,7 +21,7 @@ import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.ModifyArg; -import net.minecraft.data.server.tag.TagProvider; +import net.minecraft.data.tag.TagProvider; import net.minecraft.registry.tag.TagBuilder; import net.fabricmc.fabric.impl.datagen.FabricTagBuilder; diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/loot/BlockLootTableGeneratorAccessor.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/loot/BlockLootTableGeneratorAccessor.java index 9dbca28e4..c2099a19b 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/loot/BlockLootTableGeneratorAccessor.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/loot/BlockLootTableGeneratorAccessor.java @@ -19,7 +19,7 @@ package net.fabricmc.fabric.mixin.datagen.loot; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.gen.Accessor; -import net.minecraft.data.server.loottable.BlockLootTableGenerator; +import net.minecraft.data.loottable.BlockLootTableGenerator; import net.minecraft.registry.RegistryWrapper; @Mixin(BlockLootTableGenerator.class) diff --git a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/loot/BlockLootTableGeneratorMixin.java b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/loot/BlockLootTableGeneratorMixin.java index 4ac0f6e0e..348d0e3c8 100644 --- a/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/loot/BlockLootTableGeneratorMixin.java +++ b/fabric-data-generation-api-v1/src/main/java/net/fabricmc/fabric/mixin/datagen/loot/BlockLootTableGeneratorMixin.java @@ -18,7 +18,7 @@ package net.fabricmc.fabric.mixin.datagen.loot; import org.spongepowered.asm.mixin.Mixin; -import net.minecraft.data.server.loottable.BlockLootTableGenerator; +import net.minecraft.data.loottable.BlockLootTableGenerator; import net.fabricmc.fabric.api.datagen.v1.loot.FabricBlockLootTableGenerator; diff --git a/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.accesswidener b/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.accesswidener index e06c9348a..4dc39eef0 100644 --- a/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.accesswidener +++ b/fabric-data-generation-api-v1/src/main/resources/fabric-data-generation-api-v1.accesswidener @@ -6,16 +6,16 @@ accessWidener v2 named accessible field net/minecraft/data/DataGenerator output Lnet/minecraft/data/DataOutput; mutable field net/minecraft/data/DataGenerator output Lnet/minecraft/data/DataOutput; -accessible class net/minecraft/data/server/recipe/RecipeGenerator$RecipeProvider -extendable method net/minecraft/data/server/recipe/RecipeGenerator$RecipeProvider run (Lnet/minecraft/data/DataWriter;)Ljava/util/concurrent/CompletableFuture; +accessible class net/minecraft/data/recipe/RecipeGenerator$RecipeProvider +extendable method net/minecraft/data/recipe/RecipeGenerator$RecipeProvider run (Lnet/minecraft/data/DataWriter;)Ljava/util/concurrent/CompletableFuture; -accessible field net/minecraft/data/server/tag/TagProvider$ProvidedTagBuilder builder Lnet/minecraft/registry/tag/TagBuilder; -extendable method net/minecraft/data/server/tag/TagProvider$ProvidedTagBuilder add (Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/data/server/tag/TagProvider$ProvidedTagBuilder; -extendable method net/minecraft/data/server/tag/TagProvider$ProvidedTagBuilder add ([Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/data/server/tag/TagProvider$ProvidedTagBuilder; +accessible field net/minecraft/data/tag/TagProvider$ProvidedTagBuilder builder Lnet/minecraft/registry/tag/TagBuilder; +transitive-extendable method net/minecraft/data/tag/TagProvider$ProvidedTagBuilder add (Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/data/tag/TagProvider$ProvidedTagBuilder; +transitive-extendable method net/minecraft/data/tag/TagProvider$ProvidedTagBuilder add ([Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/data/tag/TagProvider$ProvidedTagBuilder; -accessible field net/minecraft/data/server/tag/TagProvider tagBuilders Ljava/util/Map; +accessible field net/minecraft/data/tag/TagProvider tagBuilders Ljava/util/Map; -accessible field net/minecraft/data/server/loottable/BlockLootTableGenerator lootTables Ljava/util/Map; +accessible field net/minecraft/data/loottable/BlockLootTableGenerator lootTables Ljava/util/Map; extendable method net/minecraft/registry/tag/TagEntry (Lnet/minecraft/util/Identifier;ZZ)V accessible field net/minecraft/registry/tag/TagEntry id Lnet/minecraft/util/Identifier; @@ -37,341 +37,339 @@ accessible field net/minecraft/loot/context/LootContextTypes MAP Lcom/google/com transitive-accessible method net/minecraft/data/family/BlockFamilies register (Lnet/minecraft/block/Block;)Lnet/minecraft/data/family/BlockFamily$Builder; -transitive-accessible field net/minecraft/data/client/BlockStateModelGenerator blockStateCollector Ljava/util/function/Consumer; -transitive-accessible field net/minecraft/data/client/BlockStateModelGenerator modelCollector Ljava/util/function/BiConsumer; +transitive-accessible field net/minecraft/client/data/BlockStateModelGenerator blockStateCollector Ljava/util/function/Consumer; +transitive-accessible field net/minecraft/client/data/BlockStateModelGenerator modelCollector Ljava/util/function/BiConsumer; -transitive-accessible method net/minecraft/data/client/TextureKey of (Ljava/lang/String;)Lnet/minecraft/data/client/TextureKey; -transitive-accessible method net/minecraft/data/client/TextureKey of (Ljava/lang/String;Lnet/minecraft/data/client/TextureKey;)Lnet/minecraft/data/client/TextureKey; +transitive-accessible method net/minecraft/client/data/TextureKey of (Ljava/lang/String;)Lnet/minecraft/client/data/TextureKey; +transitive-accessible method net/minecraft/client/data/TextureKey of (Ljava/lang/String;Lnet/minecraft/client/data/TextureKey;)Lnet/minecraft/client/data/TextureKey; -transitive-extendable method net/minecraft/data/server/tag/TagProvider$ProvidedTagBuilder add ([Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/data/server/tag/TagProvider$ProvidedTagBuilder; +transitive-accessible method net/minecraft/client/data/TexturedModel makeFactory (Ljava/util/function/Function;Lnet/minecraft/client/data/Model;)Lnet/minecraft/client/data/TexturedModel$Factory; -transitive-accessible method net/minecraft/data/client/TexturedModel makeFactory (Ljava/util/function/Function;Lnet/minecraft/data/client/Model;)Lnet/minecraft/data/client/TexturedModel$Factory; +transitive-accessible class net/minecraft/client/data/BlockStateModelGenerator$BlockTexturePool +transitive-accessible class net/minecraft/client/data/BlockStateModelGenerator$LogTexturePool -transitive-accessible class net/minecraft/data/client/BlockStateModelGenerator$BlockTexturePool -transitive-accessible class net/minecraft/data/client/BlockStateModelGenerator$LogTexturePool - -accessible class net/minecraft/data/client/ModelProvider$class_10406 -accessible class net/minecraft/data/client/ModelProvider$class_10407 +accessible class net/minecraft/client/data/ModelProvider$ItemAssets +accessible class net/minecraft/client/data/ModelProvider$BlockStateSuppliers ### Generated access wideners below -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator generate ()V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator generateFamilies (Lnet/minecraft/resource/featuretoggle/FeatureSet;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerSingleOutputShapelessRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;Ljava/lang/String;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerShapelessRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;Ljava/lang/String;I)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerSmelting (Ljava/util/List;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;FILjava/lang/String;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerBlasting (Ljava/util/List;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;FILjava/lang/String;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerMultipleOptions (Lnet/minecraft/recipe/RecipeSerializer;Lnet/minecraft/recipe/AbstractCookingRecipe$RecipeFactory;Ljava/util/List;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;FILjava/lang/String;Ljava/lang/String;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerNetheriteUpgradeRecipe (Lnet/minecraft/item/Item;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerSmithingTrimRecipe (Lnet/minecraft/item/Item;Lnet/minecraft/registry/RegistryKey;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offer2x2CompactingRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerCompactingRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;Ljava/lang/String;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerCompactingRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerPlanksRecipe2 (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/registry/tag/TagKey;I)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerPlanksRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/registry/tag/TagKey;I)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerBarkBlockRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerBoatRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerChestBoatRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator createButtonRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/server/recipe/CraftingRecipeJsonBuilder; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator createDoorRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/server/recipe/CraftingRecipeJsonBuilder; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator createFenceRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/server/recipe/CraftingRecipeJsonBuilder; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator createFenceGateRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/server/recipe/CraftingRecipeJsonBuilder; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerPressurePlateRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator createPressurePlateRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/server/recipe/CraftingRecipeJsonBuilder; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerSlabRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator createSlabRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/server/recipe/CraftingRecipeJsonBuilder; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator createStairsRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/server/recipe/CraftingRecipeJsonBuilder; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator createTrapdoorRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/server/recipe/CraftingRecipeJsonBuilder; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator createSignRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/server/recipe/CraftingRecipeJsonBuilder; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerHangingSignRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerDyeableRecipes (Ljava/util/List;Ljava/util/List;Ljava/lang/String;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerDyeablesRecipes (Ljava/util/List;Ljava/util/List;Lnet/minecraft/item/Item;Ljava/lang/String;Lnet/minecraft/recipe/book/RecipeCategory;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerCarpetRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerBedRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerBannerRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerStainedGlassDyeingRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerStainedGlassPaneRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerStainedGlassPaneDyeingRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerTerracottaDyeingRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerConcretePowderDyeingRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerCandleDyeingRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerWallRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator getWallRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/server/recipe/CraftingRecipeJsonBuilder; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerPolishedStoneRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator createCondensingRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/server/recipe/CraftingRecipeJsonBuilder; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerCutCopperRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator createCutCopperRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/server/recipe/ShapedRecipeJsonBuilder; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerChiseledBlockRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerMosaicRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator createChiseledBlockRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/server/recipe/ShapedRecipeJsonBuilder; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerStonecuttingRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerStonecuttingRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;I)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerCrackingRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerReversibleCompactingRecipes (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerReversibleCompactingRecipesWithCompactingRecipeGroup (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Ljava/lang/String;Ljava/lang/String;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerReversibleCompactingRecipesWithReverseRecipeGroup (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Ljava/lang/String;Ljava/lang/String;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerReversibleCompactingRecipes (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerSmithingTemplateCopyingRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerSmithingTemplateCopyingRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator generateCookingRecipes (Ljava/lang/String;Lnet/minecraft/recipe/RecipeSerializer;Lnet/minecraft/recipe/AbstractCookingRecipe$RecipeFactory;I)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerFoodCookingRecipe (Ljava/lang/String;Lnet/minecraft/recipe/RecipeSerializer;Lnet/minecraft/recipe/AbstractCookingRecipe$RecipeFactory;ILnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;F)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerWaxingRecipes (Lnet/minecraft/resource/featuretoggle/FeatureSet;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerGrateRecipe (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerBulbRecipe (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator offerSuspiciousStewRecipe (Lnet/minecraft/item/Item;Lnet/minecraft/block/SuspiciousStewIngredient;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator generateFamily (Lnet/minecraft/data/family/BlockFamily;Lnet/minecraft/resource/featuretoggle/FeatureSet;)V -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator getVariantRecipeInput (Lnet/minecraft/data/family/BlockFamily;Lnet/minecraft/data/family/BlockFamily$Variant;)Lnet/minecraft/block/Block; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator requireEnteringFluid (Lnet/minecraft/block/Block;)Lnet/minecraft/advancement/AdvancementCriterion; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator conditionsFromItem (Lnet/minecraft/predicate/NumberRange$IntRange;Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/advancement/AdvancementCriterion; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator conditionsFromItem (Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/advancement/AdvancementCriterion; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator conditionsFromTag (Lnet/minecraft/registry/tag/TagKey;)Lnet/minecraft/advancement/AdvancementCriterion; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator conditionsFromPredicates ([Lnet/minecraft/predicate/item/ItemPredicate$Builder;)Lnet/minecraft/advancement/AdvancementCriterion; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator conditionsFromItemPredicates ([Lnet/minecraft/predicate/item/ItemPredicate;)Lnet/minecraft/advancement/AdvancementCriterion; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator hasItem (Lnet/minecraft/item/ItemConvertible;)Ljava/lang/String; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator getItemPath (Lnet/minecraft/item/ItemConvertible;)Ljava/lang/String; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator getRecipeName (Lnet/minecraft/item/ItemConvertible;)Ljava/lang/String; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator convertBetween (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)Ljava/lang/String; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator getSmeltingItemPath (Lnet/minecraft/item/ItemConvertible;)Ljava/lang/String; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator getBlastingItemPath (Lnet/minecraft/item/ItemConvertible;)Ljava/lang/String; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator ingredientFromTag (Lnet/minecraft/registry/tag/TagKey;)Lnet/minecraft/recipe/Ingredient; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator createShaped (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/data/server/recipe/ShapedRecipeJsonBuilder; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator createShaped (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;I)Lnet/minecraft/data/server/recipe/ShapedRecipeJsonBuilder; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator createShapeless (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator createShapeless (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder; -transitive-accessible method net/minecraft/data/server/recipe/RecipeGenerator createShapeless (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;I)Lnet/minecraft/data/server/recipe/ShapelessRecipeJsonBuilder; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createStoneState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/data/client/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/data/client/BlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createMudBrickState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/data/client/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/data/client/BlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createDeepslateState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/data/client/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/data/client/BlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_65399 (Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerParentedItemModel (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_65402 (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/class_10401;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_65398 (Lnet/minecraft/item/Item;)Lnet/minecraft/util/Identifier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_65400 (Lnet/minecraft/item/Item;Lnet/minecraft/block/Block;)Lnet/minecraft/util/Identifier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_65401 (Lnet/minecraft/item/Item;Lnet/minecraft/block/Block;Ljava/lang/String;)Lnet/minecraft/util/Identifier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_65414 (Lnet/minecraft/item/Item;Lnet/minecraft/block/Block;Ljava/lang/String;)Lnet/minecraft/util/Identifier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerItemModel (Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerItemModel (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerItemModel (Lnet/minecraft/block/Block;Ljava/lang/String;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_65416 (Lnet/minecraft/block/Block;Ljava/lang/String;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createNorthDefaultHorizontalRotationStates ()Lnet/minecraft/data/client/BlockStateVariantMap; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createSouthDefaultHorizontalRotationStates ()Lnet/minecraft/data/client/BlockStateVariantMap; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createEastDefaultHorizontalRotationStates ()Lnet/minecraft/data/client/BlockStateVariantMap; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createNorthDefaultRotationStates ()Lnet/minecraft/data/client/BlockStateVariantMap; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createBlockStateWithRandomHorizontalRotations (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/VariantsBlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createModelVariantWithRandomHorizontalRotations (Lnet/minecraft/util/Identifier;)[Lnet/minecraft/data/client/BlockStateVariant; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createBlockStateWithTwoModelAndRandomInversion (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/VariantsBlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createBooleanModelMap (Lnet/minecraft/state/property/BooleanProperty;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateVariantMap; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerMirrorable (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerRotatable (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerBrushableBlock (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createButtonBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator fillDoorVariantMap (Lnet/minecraft/data/client/BlockStateVariantMap$QuadrupleProperty;Lnet/minecraft/block/enums/DoubleBlockHalf;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateVariantMap$QuadrupleProperty; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createDoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createCustomFenceBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createFenceBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createWallBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createFenceGateBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Z)Lnet/minecraft/data/client/BlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createStairsBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createOrientableTrapdoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createTrapdoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createSingletonBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/VariantsBlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createAxisRotatedVariantMap ()Lnet/minecraft/data/client/BlockStateVariantMap; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createUvLockedColumnBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/data/client/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/data/client/BlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createAxisRotatedBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerAxisRotated (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerNorthDefaultHorizontalRotated (Lnet/minecraft/block/Block;Lnet/minecraft/data/client/TexturedModel$Factory;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createAxisRotatedBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerAxisRotated (Lnet/minecraft/block/Block;Lnet/minecraft/data/client/TexturedModel$Factory;Lnet/minecraft/data/client/TexturedModel$Factory;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCreakingHeart (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createSubModel (Lnet/minecraft/block/Block;Ljava/lang/String;Lnet/minecraft/data/client/Model;Ljava/util/function/Function;)Lnet/minecraft/util/Identifier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createPressurePlateBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createSlabBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_65420 (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCubeAllModelTexturePool (Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/BlockStateModelGenerator$BlockTexturePool; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerDoor (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerParentedDoor (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerOrientableTrapdoor (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerTrapdoor (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerParentedTrapdoor (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerLog (Lnet/minecraft/block/Block;)Lnet/minecraft/data/client/BlockStateModelGenerator$LogTexturePool; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerSimpleState (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerStateWithModelReference (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerTintableCross (Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerTintableCross (Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;Lnet/minecraft/data/client/TextureMap;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerTintableCrossBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerTintableCrossBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;Lnet/minecraft/data/client/TextureMap;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerTintableCrossBlockStateWithStages (Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;Lnet/minecraft/state/property/Property;[I)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_65407 (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerFlowerPotPlant (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCoralFan (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerGourd (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCoral (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerDoubleBlock (Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_65417 (Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_65421 (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerDoubleBlock (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerTurnableRail (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerStraightRail (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerBuiltinWithParticle (Lnet/minecraft/block/Block;Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerBuiltinWithParticle (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_65419 (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)Lnet/minecraft/util/Identifier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_65422 (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerWoolAndCarpet (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerFlowerbed (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerRandomHorizontalRotations (Lnet/minecraft/data/client/TexturedModel$Factory;[Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerSouthDefaultHorizontalFacing (Lnet/minecraft/data/client/TexturedModel$Factory;[Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerGlassPane (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCommandBlock (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerAnvil (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator getBambooBlockStateVariants (I)Ljava/util/List; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createUpDefaultFacingVariantMap ()Lnet/minecraft/data/client/BlockStateVariantMap; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createValueFencedModelMap (Lnet/minecraft/state/property/Property;Ljava/lang/Comparable;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateVariantMap; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerBeehive (Lnet/minecraft/block/Block;Ljava/util/function/Function;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCrop (Lnet/minecraft/block/Block;Lnet/minecraft/state/property/Property;[I)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCooker (Lnet/minecraft/block/Block;Lnet/minecraft/data/client/TexturedModel$Factory;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCampfire ([Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerAzalea (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerPottedAzaleaBush (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerMushroomBlock (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCubeWithCustomTextures (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Ljava/util/function/BiFunction;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerNorthDefaultHorizontalRotatable (Lnet/minecraft/block/Block;Lnet/minecraft/data/client/TextureMap;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerDispenserLikeOrientable (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCopperBulb (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator createCopperBulbBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/data/client/BlockStateSupplier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerWaxedCopperBulb (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerAmethyst (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator getDripstoneVariant (Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/enums/Thickness;)Lnet/minecraft/data/client/BlockStateVariant; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerNetherrackBottomCustomTop (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerRod (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator getFireFloorModels (Lnet/minecraft/block/Block;)Ljava/util/List; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator getFireSideModels (Lnet/minecraft/block/Block;)Ljava/util/List; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator getFireUpModels (Lnet/minecraft/block/Block;)Ljava/util/List; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator buildBlockStateVariants (Ljava/util/List;Ljava/util/function/UnaryOperator;)Ljava/util/List; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerLantern (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerTopSoil (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/data/client/BlockStateVariant;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerWeightedPressurePlate (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerParented (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerNorthDefaultHorizontalRotation (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerPiston (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/data/client/TextureMap;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerTorch (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator getTurtleEggModel (ILjava/lang/String;Lnet/minecraft/data/client/TextureMap;)Lnet/minecraft/util/Identifier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator getTurtleEggModel (Ljava/lang/Integer;Ljava/lang/Integer;)Lnet/minecraft/util/Identifier; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerMultifaceBlock (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerMultifaceBlock (Lnet/minecraft/block/Block;Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerMultifaceBlockModel (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerPaleMossCarpet (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerHangingMoss (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator supplyChiseledBookshelfModels (Lnet/minecraft/data/client/MultipartBlockStateSupplier;Lnet/minecraft/data/client/When$PropertyCondition;Lnet/minecraft/data/client/VariantSettings$Rotation;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator supplyChiseledBookshelfModel (Lnet/minecraft/data/client/MultipartBlockStateSupplier;Lnet/minecraft/data/client/When$PropertyCondition;Lnet/minecraft/data/client/VariantSettings$Rotation;Lnet/minecraft/state/property/BooleanProperty;Lnet/minecraft/data/client/Model;Z)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerShulkerBox (Lnet/minecraft/block/Block;Lnet/minecraft/util/DyeColor;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerPlantPart (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/data/client/BlockStateModelGenerator$CrossType;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerRoots (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator addJigsawOrientationToVariant (Lnet/minecraft/block/enums/Orientation;Lnet/minecraft/data/client/BlockStateVariant;)Lnet/minecraft/data/client/BlockStateVariant; -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_65406 (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/SkullBlock$SkullType;Lnet/minecraft/util/Identifier;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_65405 (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/util/DyeColor;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_65404 (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Z)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_65415 (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/util/DyeColor;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator method_65409 (Lnet/minecraft/block/Block;Lnet/minecraft/class_10515$class_10516;)V -transitive-accessible method net/minecraft/data/client/BlockStateModelGenerator registerCandle (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator createSilkTouchCondition ()Lnet/minecraft/loot/condition/LootCondition$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator createWithoutSilkTouchCondition ()Lnet/minecraft/loot/condition/LootCondition$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator createWithShearsCondition ()Lnet/minecraft/loot/condition/LootCondition$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator createWithSilkTouchOrShearsCondition ()Lnet/minecraft/loot/condition/LootCondition$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator createWithoutShearsOrSilkTouchCondition ()Lnet/minecraft/loot/condition/LootCondition$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator applyExplosionDecay (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/loot/function/LootFunctionConsumingBuilder;)Lnet/minecraft/loot/function/LootFunctionConsumingBuilder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator addSurvivesExplosionCondition (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/loot/condition/LootConditionConsumingBuilder;)Lnet/minecraft/loot/condition/LootConditionConsumingBuilder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator drops (Lnet/minecraft/block/Block;Lnet/minecraft/loot/condition/LootCondition$Builder;Lnet/minecraft/loot/entry/LootPoolEntry$Builder;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator dropsWithSilkTouch (Lnet/minecraft/block/Block;Lnet/minecraft/loot/entry/LootPoolEntry$Builder;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator dropsWithShears (Lnet/minecraft/block/Block;Lnet/minecraft/loot/entry/LootPoolEntry$Builder;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator dropsWithSilkTouchOrShears (Lnet/minecraft/block/Block;Lnet/minecraft/loot/entry/LootPoolEntry$Builder;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator drops (Lnet/minecraft/block/Block;Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator drops (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/loot/provider/number/LootNumberProvider;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator drops (Lnet/minecraft/block/Block;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/loot/provider/number/LootNumberProvider;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator dropsWithSilkTouch (Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator pottedPlantDrops (Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator slabDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator dropsWithProperty (Lnet/minecraft/block/Block;Lnet/minecraft/state/property/Property;Ljava/lang/Comparable;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator nameableContainerDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator shulkerBoxDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator copperOreDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator lapisOreDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator redstoneOreDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator bannerDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator beeNestDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator beehiveDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator glowBerryDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator oreDrops (Lnet/minecraft/block/Block;Lnet/minecraft/item/Item;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator mushroomBlockDrops (Lnet/minecraft/block/Block;Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator shortPlantDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator dropsWithShears (Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator dropsWithSilkTouchOrShears (Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator multifaceGrowthDrops (Lnet/minecraft/block/Block;Lnet/minecraft/loot/condition/LootCondition$Builder;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator multifaceGrowthDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator paleMossCarpetDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator leavesDrops (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;[F)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator oakLeavesDrops (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;[F)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator mangroveLeavesDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator cropDrops (Lnet/minecraft/block/Block;Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;Lnet/minecraft/loot/condition/LootCondition$Builder;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator seagrassDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator tallPlantDrops (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator candleDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator flowerbedDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator candleCakeDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator generate ()V -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator addVinePlantDrop (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator doorDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator addPottedPlantDrops (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator addDropWithSilkTouch (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator addDrop (Lnet/minecraft/block/Block;Lnet/minecraft/item/ItemConvertible;)V -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator addDropWithSilkTouch (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator addDrop (Lnet/minecraft/block/Block;)V -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator addDrop (Lnet/minecraft/block/Block;Ljava/util/function/Function;)V -transitive-accessible method net/minecraft/data/server/loottable/BlockLootTableGenerator addDrop (Lnet/minecraft/block/Block;Lnet/minecraft/loot/LootTable$Builder;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65426 (Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65434 (Lnet/minecraft/item/Item;Lnet/minecraft/data/client/Model;)Lnet/minecraft/util/Identifier; -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65442 (Lnet/minecraft/item/Item;Lnet/minecraft/data/client/Model;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65438 (Lnet/minecraft/item/Item;Ljava/lang/String;Lnet/minecraft/data/client/Model;)Lnet/minecraft/util/Identifier; -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65432 (Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;Lnet/minecraft/data/client/Model;)Lnet/minecraft/util/Identifier; -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65441 (Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;Lnet/minecraft/data/client/Model;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65433 (Lnet/minecraft/item/Item;Lnet/minecraft/class_10401;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65437 (Lnet/minecraft/item/Item;Ljava/lang/String;Lnet/minecraft/class_10401;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65440 (Lnet/minecraft/item/Item;)Ljava/util/List; -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65443 (Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65444 (Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator registerClock (Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65431 (Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/util/Identifier; -transitive-accessible method net/minecraft/data/client/ItemModelGenerator uploadArmor (Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/util/Identifier; -transitive-accessible method net/minecraft/data/client/ItemModelGenerator uploadArmor (Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65429 (Lnet/minecraft/item/Item;Lnet/minecraft/registry/RegistryKey;Ljava/lang/String;Z)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65445 (Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65435 (Lnet/minecraft/item/Item;Lnet/minecraft/data/client/Model;Ljava/lang/String;)Lnet/minecraft/util/Identifier; -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65446 (Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65447 (Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65436 (Lnet/minecraft/item/Item;Lnet/minecraft/class_10460;Lnet/minecraft/class_10439$class_10441;Lnet/minecraft/class_10439$class_10441;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65448 (Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65449 (Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65450 (Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65451 (Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65452 (Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65439 (Lnet/minecraft/class_10439$class_10441;Lnet/minecraft/class_10439$class_10441;)Lnet/minecraft/class_10439$class_10441; -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65453 (Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65454 (Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65430 (Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65455 (Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65456 (Lnet/minecraft/item/Item;)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65427 (Lnet/minecraft/item/Item;I)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65428 (Lnet/minecraft/item/Item;II)V -transitive-accessible method net/minecraft/data/client/ItemModelGenerator method_65457 (Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator generate ()V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator generateFamilies (Lnet/minecraft/resource/featuretoggle/FeatureSet;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerSingleOutputShapelessRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;Ljava/lang/String;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerShapelessRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;Ljava/lang/String;I)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerSmelting (Ljava/util/List;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;FILjava/lang/String;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerBlasting (Ljava/util/List;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;FILjava/lang/String;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerMultipleOptions (Lnet/minecraft/recipe/RecipeSerializer;Lnet/minecraft/recipe/AbstractCookingRecipe$RecipeFactory;Ljava/util/List;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;FILjava/lang/String;Ljava/lang/String;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerNetheriteUpgradeRecipe (Lnet/minecraft/item/Item;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerSmithingTrimRecipe (Lnet/minecraft/item/Item;Lnet/minecraft/registry/RegistryKey;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offer2x2CompactingRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerCompactingRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;Ljava/lang/String;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerCompactingRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerPlanksRecipe2 (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/registry/tag/TagKey;I)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerPlanksRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/registry/tag/TagKey;I)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerBarkBlockRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerBoatRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerChestBoatRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createButtonRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/recipe/CraftingRecipeJsonBuilder; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createDoorRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/recipe/CraftingRecipeJsonBuilder; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createFenceRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/recipe/CraftingRecipeJsonBuilder; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createFenceGateRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/recipe/CraftingRecipeJsonBuilder; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerPressurePlateRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createPressurePlateRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/recipe/CraftingRecipeJsonBuilder; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerSlabRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createSlabRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/recipe/CraftingRecipeJsonBuilder; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createStairsRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/recipe/CraftingRecipeJsonBuilder; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createTrapdoorRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/recipe/CraftingRecipeJsonBuilder; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createSignRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/recipe/CraftingRecipeJsonBuilder; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerHangingSignRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerDyeableRecipes (Ljava/util/List;Ljava/util/List;Ljava/lang/String;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerDyeablesRecipes (Ljava/util/List;Ljava/util/List;Lnet/minecraft/item/Item;Ljava/lang/String;Lnet/minecraft/recipe/book/RecipeCategory;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerCarpetRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerBedRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerBannerRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerStainedGlassDyeingRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerStainedGlassPaneRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerStainedGlassPaneDyeingRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerTerracottaDyeingRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerConcretePowderDyeingRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerCandleDyeingRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerWallRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator getWallRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/recipe/CraftingRecipeJsonBuilder; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerPolishedStoneRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createCondensingRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/recipe/CraftingRecipeJsonBuilder; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerCutCopperRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createCutCopperRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/recipe/ShapedRecipeJsonBuilder; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerChiseledBlockRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerMosaicRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createChiseledBlockRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)Lnet/minecraft/data/recipe/ShapedRecipeJsonBuilder; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerStonecuttingRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerStonecuttingRecipe (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;I)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerCrackingRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerReversibleCompactingRecipes (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerReversibleCompactingRecipesWithCompactingRecipeGroup (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Ljava/lang/String;Ljava/lang/String;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerReversibleCompactingRecipesWithReverseRecipeGroup (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Ljava/lang/String;Ljava/lang/String;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerReversibleCompactingRecipes (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerSmithingTemplateCopyingRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerSmithingTemplateCopyingRecipe (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/recipe/Ingredient;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator generateCookingRecipes (Ljava/lang/String;Lnet/minecraft/recipe/RecipeSerializer;Lnet/minecraft/recipe/AbstractCookingRecipe$RecipeFactory;I)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerFoodCookingRecipe (Ljava/lang/String;Lnet/minecraft/recipe/RecipeSerializer;Lnet/minecraft/recipe/AbstractCookingRecipe$RecipeFactory;ILnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;F)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerWaxingRecipes (Lnet/minecraft/resource/featuretoggle/FeatureSet;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerGrateRecipe (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerBulbRecipe (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator offerSuspiciousStewRecipe (Lnet/minecraft/item/Item;Lnet/minecraft/block/SuspiciousStewIngredient;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator generateFamily (Lnet/minecraft/data/family/BlockFamily;Lnet/minecraft/resource/featuretoggle/FeatureSet;)V +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator getVariantRecipeInput (Lnet/minecraft/data/family/BlockFamily;Lnet/minecraft/data/family/BlockFamily$Variant;)Lnet/minecraft/block/Block; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator requireEnteringFluid (Lnet/minecraft/block/Block;)Lnet/minecraft/advancement/AdvancementCriterion; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator conditionsFromItem (Lnet/minecraft/predicate/NumberRange$IntRange;Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/advancement/AdvancementCriterion; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator conditionsFromItem (Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/advancement/AdvancementCriterion; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator conditionsFromTag (Lnet/minecraft/registry/tag/TagKey;)Lnet/minecraft/advancement/AdvancementCriterion; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator conditionsFromPredicates ([Lnet/minecraft/predicate/item/ItemPredicate$Builder;)Lnet/minecraft/advancement/AdvancementCriterion; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator conditionsFromItemPredicates ([Lnet/minecraft/predicate/item/ItemPredicate;)Lnet/minecraft/advancement/AdvancementCriterion; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator hasItem (Lnet/minecraft/item/ItemConvertible;)Ljava/lang/String; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator getItemPath (Lnet/minecraft/item/ItemConvertible;)Ljava/lang/String; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator getRecipeName (Lnet/minecraft/item/ItemConvertible;)Ljava/lang/String; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator convertBetween (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/item/ItemConvertible;)Ljava/lang/String; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator getSmeltingItemPath (Lnet/minecraft/item/ItemConvertible;)Ljava/lang/String; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator getBlastingItemPath (Lnet/minecraft/item/ItemConvertible;)Ljava/lang/String; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator ingredientFromTag (Lnet/minecraft/registry/tag/TagKey;)Lnet/minecraft/recipe/Ingredient; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createShaped (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/data/recipe/ShapedRecipeJsonBuilder; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createShaped (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;I)Lnet/minecraft/data/recipe/ShapedRecipeJsonBuilder; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createShapeless (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemStack;)Lnet/minecraft/data/recipe/ShapelessRecipeJsonBuilder; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createShapeless (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/data/recipe/ShapelessRecipeJsonBuilder; +transitive-accessible method net/minecraft/data/recipe/RecipeGenerator createShapeless (Lnet/minecraft/recipe/book/RecipeCategory;Lnet/minecraft/item/ItemConvertible;I)Lnet/minecraft/data/recipe/ShapelessRecipeJsonBuilder; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createStoneState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/data/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/client/data/BlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createMudBrickState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/data/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/client/data/BlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createDeepslateState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/data/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/client/data/BlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerItemModel (Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerParentedItemModel (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerTintedItemModel (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/render/item/tint/TintSource;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator uploadItemModel (Lnet/minecraft/item/Item;)Lnet/minecraft/util/Identifier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator uploadBlockItemModel (Lnet/minecraft/item/Item;Lnet/minecraft/block/Block;)Lnet/minecraft/util/Identifier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator uploadBlockItemModel (Lnet/minecraft/item/Item;Lnet/minecraft/block/Block;Ljava/lang/String;)Lnet/minecraft/util/Identifier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator uploadTwoLayerBlockItemModel (Lnet/minecraft/item/Item;Lnet/minecraft/block/Block;Ljava/lang/String;)Lnet/minecraft/util/Identifier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerItemModel (Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerItemModel (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerItemModel (Lnet/minecraft/block/Block;Ljava/lang/String;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerTwoLayerItemModel (Lnet/minecraft/block/Block;Ljava/lang/String;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createNorthDefaultHorizontalRotationStates ()Lnet/minecraft/client/data/BlockStateVariantMap; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createSouthDefaultHorizontalRotationStates ()Lnet/minecraft/client/data/BlockStateVariantMap; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createEastDefaultHorizontalRotationStates ()Lnet/minecraft/client/data/BlockStateVariantMap; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createNorthDefaultRotationStates ()Lnet/minecraft/client/data/BlockStateVariantMap; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createBlockStateWithRandomHorizontalRotations (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/VariantsBlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createModelVariantWithRandomHorizontalRotations (Lnet/minecraft/util/Identifier;)[Lnet/minecraft/client/data/BlockStateVariant; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createBlockStateWithTwoModelAndRandomInversion (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/VariantsBlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createBooleanModelMap (Lnet/minecraft/state/property/BooleanProperty;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/BlockStateVariantMap; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerMirrorable (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerRotatable (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerBrushableBlock (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createButtonBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/BlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator fillDoorVariantMap (Lnet/minecraft/client/data/BlockStateVariantMap$QuadrupleProperty;Lnet/minecraft/block/enums/DoubleBlockHalf;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/BlockStateVariantMap$QuadrupleProperty; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createDoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/BlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createCustomFenceBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/BlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createFenceBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/BlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createWallBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/BlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createFenceGateBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Z)Lnet/minecraft/client/data/BlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createStairsBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/BlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createOrientableTrapdoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/BlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createTrapdoorBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/BlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createSingletonBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/VariantsBlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createAxisRotatedVariantMap ()Lnet/minecraft/client/data/BlockStateVariantMap; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createUvLockedColumnBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/TextureMap;Ljava/util/function/BiConsumer;)Lnet/minecraft/client/data/BlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createAxisRotatedBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/BlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerAxisRotated (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerNorthDefaultHorizontalRotated (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/TexturedModel$Factory;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createAxisRotatedBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/BlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerAxisRotated (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/TexturedModel$Factory;Lnet/minecraft/client/data/TexturedModel$Factory;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCreakingHeart (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createSubModel (Lnet/minecraft/block/Block;Ljava/lang/String;Lnet/minecraft/client/data/Model;Ljava/util/function/Function;)Lnet/minecraft/util/Identifier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createPressurePlateBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/BlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createSlabBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/BlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerGrassTinted (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCubeAllModelTexturePool (Lnet/minecraft/block/Block;)Lnet/minecraft/client/data/BlockStateModelGenerator$BlockTexturePool; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerDoor (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerParentedDoor (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerOrientableTrapdoor (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerTrapdoor (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerParentedTrapdoor (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerLog (Lnet/minecraft/block/Block;)Lnet/minecraft/client/data/BlockStateModelGenerator$LogTexturePool; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerSimpleState (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerStateWithModelReference (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerTintableCross (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/BlockStateModelGenerator$CrossType;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerTintableCross (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/BlockStateModelGenerator$CrossType;Lnet/minecraft/client/data/TextureMap;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerTintableCrossBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/BlockStateModelGenerator$CrossType;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerTintableCrossBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/BlockStateModelGenerator$CrossType;Lnet/minecraft/client/data/TextureMap;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerTintableCrossBlockStateWithStages (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/BlockStateModelGenerator$CrossType;Lnet/minecraft/state/property/Property;[I)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerFlowerPotPlantAndItem (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/client/data/BlockStateModelGenerator$CrossType;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerFlowerPotPlant (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/client/data/BlockStateModelGenerator$CrossType;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCoralFan (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerGourd (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCoral (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerDoubleBlock (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/BlockStateModelGenerator$CrossType;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerDoubleBlockAndItem (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/BlockStateModelGenerator$CrossType;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerGrassTintedDoubleBlockAndItem (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerDoubleBlock (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerTurnableRail (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerStraightRail (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerBuiltinWithParticle (Lnet/minecraft/block/Block;Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerBuiltinWithParticle (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator uploadParticleModel (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)Lnet/minecraft/util/Identifier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerBuilltin (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerWoolAndCarpet (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerFlowerbed (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerRandomHorizontalRotations (Lnet/minecraft/client/data/TexturedModel$Factory;[Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerSouthDefaultHorizontalFacing (Lnet/minecraft/client/data/TexturedModel$Factory;[Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerGlassAndPane (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCommandBlock (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerAnvil (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getBambooBlockStateVariants (I)Ljava/util/List; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createUpDefaultFacingVariantMap ()Lnet/minecraft/client/data/BlockStateVariantMap; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createValueFencedModelMap (Lnet/minecraft/state/property/Property;Ljava/lang/Comparable;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/BlockStateVariantMap; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerBeehive (Lnet/minecraft/block/Block;Ljava/util/function/Function;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCrop (Lnet/minecraft/block/Block;Lnet/minecraft/state/property/Property;[I)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCooker (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/TexturedModel$Factory;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCampfire ([Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerAzalea (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerPottedAzaleaBush (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerMushroomBlock (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCubeWithCustomTextures (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Ljava/util/function/BiFunction;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerNorthDefaultHorizontalRotatable (Lnet/minecraft/block/Block;Lnet/minecraft/client/data/TextureMap;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerDispenserLikeOrientable (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCopperBulb (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator createCopperBulbBlockState (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/client/data/BlockStateSupplier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerWaxedCopperBulb (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerAmethyst (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getDripstoneVariant (Lnet/minecraft/util/math/Direction;Lnet/minecraft/block/enums/Thickness;)Lnet/minecraft/client/data/BlockStateVariant; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerNetherrackBottomCustomTop (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerRod (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getFireFloorModels (Lnet/minecraft/block/Block;)Ljava/util/List; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getFireSideModels (Lnet/minecraft/block/Block;)Ljava/util/List; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getFireUpModels (Lnet/minecraft/block/Block;)Ljava/util/List; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator buildBlockStateVariants (Ljava/util/List;Ljava/util/function/UnaryOperator;)Ljava/util/List; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerLantern (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerTopSoil (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/data/BlockStateVariant;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerWeightedPressurePlate (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerParented (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerNorthDefaultHorizontalRotation (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerPiston (Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Lnet/minecraft/client/data/TextureMap;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerTorch (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getTurtleEggModel (ILjava/lang/String;Lnet/minecraft/client/data/TextureMap;)Lnet/minecraft/util/Identifier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator getTurtleEggModel (Ljava/lang/Integer;Ljava/lang/Integer;)Lnet/minecraft/util/Identifier; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerMultifaceBlock (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerMultifaceBlock (Lnet/minecraft/block/Block;Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerMultifaceBlockModel (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerPaleMossCarpet (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerHangingMoss (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator supplyChiseledBookshelfModels (Lnet/minecraft/client/data/MultipartBlockStateSupplier;Lnet/minecraft/client/data/When$PropertyCondition;Lnet/minecraft/client/data/VariantSettings$Rotation;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator supplyChiseledBookshelfModel (Lnet/minecraft/client/data/MultipartBlockStateSupplier;Lnet/minecraft/client/data/When$PropertyCondition;Lnet/minecraft/client/data/VariantSettings$Rotation;Lnet/minecraft/state/property/BooleanProperty;Lnet/minecraft/client/data/Model;Z)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerShulkerBox (Lnet/minecraft/block/Block;Lnet/minecraft/util/DyeColor;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerPlantPart (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/client/data/BlockStateModelGenerator$CrossType;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerRoots (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator addJigsawOrientationToVariant (Lnet/minecraft/block/enums/Orientation;Lnet/minecraft/client/data/BlockStateVariant;)Lnet/minecraft/client/data/BlockStateVariant; +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerSkull (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/block/SkullBlock$SkullType;Lnet/minecraft/util/Identifier;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerBanner (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/util/DyeColor;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerChest (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/util/Identifier;Z)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerBed (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;Lnet/minecraft/util/DyeColor;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerSpecialItemModel (Lnet/minecraft/block/Block;Lnet/minecraft/client/render/item/model/special/SpecialModelRenderer$Unbaked;)V +transitive-accessible method net/minecraft/client/data/BlockStateModelGenerator registerCandle (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator createSilkTouchCondition ()Lnet/minecraft/loot/condition/LootCondition$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator createWithoutSilkTouchCondition ()Lnet/minecraft/loot/condition/LootCondition$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator createWithShearsCondition ()Lnet/minecraft/loot/condition/LootCondition$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator createWithSilkTouchOrShearsCondition ()Lnet/minecraft/loot/condition/LootCondition$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator createWithoutShearsOrSilkTouchCondition ()Lnet/minecraft/loot/condition/LootCondition$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator applyExplosionDecay (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/loot/function/LootFunctionConsumingBuilder;)Lnet/minecraft/loot/function/LootFunctionConsumingBuilder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator addSurvivesExplosionCondition (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/loot/condition/LootConditionConsumingBuilder;)Lnet/minecraft/loot/condition/LootConditionConsumingBuilder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator drops (Lnet/minecraft/block/Block;Lnet/minecraft/loot/condition/LootCondition$Builder;Lnet/minecraft/loot/entry/LootPoolEntry$Builder;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator dropsWithSilkTouch (Lnet/minecraft/block/Block;Lnet/minecraft/loot/entry/LootPoolEntry$Builder;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator dropsWithShears (Lnet/minecraft/block/Block;Lnet/minecraft/loot/entry/LootPoolEntry$Builder;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator dropsWithSilkTouchOrShears (Lnet/minecraft/block/Block;Lnet/minecraft/loot/entry/LootPoolEntry$Builder;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator drops (Lnet/minecraft/block/Block;Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator drops (Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/loot/provider/number/LootNumberProvider;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator drops (Lnet/minecraft/block/Block;Lnet/minecraft/item/ItemConvertible;Lnet/minecraft/loot/provider/number/LootNumberProvider;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator dropsWithSilkTouch (Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator pottedPlantDrops (Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator slabDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator dropsWithProperty (Lnet/minecraft/block/Block;Lnet/minecraft/state/property/Property;Ljava/lang/Comparable;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator nameableContainerDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator shulkerBoxDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator copperOreDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator lapisOreDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator redstoneOreDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator bannerDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator beeNestDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator beehiveDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator glowBerryDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator oreDrops (Lnet/minecraft/block/Block;Lnet/minecraft/item/Item;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator mushroomBlockDrops (Lnet/minecraft/block/Block;Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator shortPlantDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator dropsWithShears (Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator dropsWithSilkTouchOrShears (Lnet/minecraft/item/ItemConvertible;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator multifaceGrowthDrops (Lnet/minecraft/block/Block;Lnet/minecraft/loot/condition/LootCondition$Builder;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator multifaceGrowthDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator paleMossCarpetDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator leavesDrops (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;[F)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator oakLeavesDrops (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;[F)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator mangroveLeavesDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator cropDrops (Lnet/minecraft/block/Block;Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;Lnet/minecraft/loot/condition/LootCondition$Builder;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator seagrassDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator tallPlantDrops (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator candleDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator flowerbedDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator candleCakeDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator generate ()V +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator addVinePlantDrop (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator doorDrops (Lnet/minecraft/block/Block;)Lnet/minecraft/loot/LootTable$Builder; +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator addPottedPlantDrops (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator addDropWithSilkTouch (Lnet/minecraft/block/Block;Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator addDrop (Lnet/minecraft/block/Block;Lnet/minecraft/item/ItemConvertible;)V +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator addDropWithSilkTouch (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator addDrop (Lnet/minecraft/block/Block;)V +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator addDrop (Lnet/minecraft/block/Block;Ljava/util/function/Function;)V +transitive-accessible method net/minecraft/data/loottable/BlockLootTableGenerator addDrop (Lnet/minecraft/block/Block;Lnet/minecraft/loot/LootTable$Builder;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator register (Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator upload (Lnet/minecraft/item/Item;Lnet/minecraft/client/data/Model;)Lnet/minecraft/util/Identifier; +transitive-accessible method net/minecraft/client/data/ItemModelGenerator register (Lnet/minecraft/item/Item;Lnet/minecraft/client/data/Model;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerSubModel (Lnet/minecraft/item/Item;Ljava/lang/String;Lnet/minecraft/client/data/Model;)Lnet/minecraft/util/Identifier; +transitive-accessible method net/minecraft/client/data/ItemModelGenerator uploadWithTextureSource (Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;Lnet/minecraft/client/data/Model;)Lnet/minecraft/util/Identifier; +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerWithTextureSource (Lnet/minecraft/item/Item;Lnet/minecraft/item/Item;Lnet/minecraft/client/data/Model;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerWithTintedOverlay (Lnet/minecraft/item/Item;Lnet/minecraft/client/render/item/tint/TintSource;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerWithTintedLayer (Lnet/minecraft/item/Item;Ljava/lang/String;Lnet/minecraft/client/render/item/tint/TintSource;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator createCompassRangeDispatchEntries (Lnet/minecraft/item/Item;)Ljava/util/List; +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerCompass (Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerRecoveryCompass (Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerClock (Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator uploadTwoLayers (Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/util/Identifier; +transitive-accessible method net/minecraft/client/data/ItemModelGenerator uploadArmor (Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)Lnet/minecraft/util/Identifier; +transitive-accessible method net/minecraft/client/data/ItemModelGenerator uploadArmor (Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;Lnet/minecraft/util/Identifier;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerArmor (Lnet/minecraft/item/Item;Lnet/minecraft/registry/RegistryKey;Ljava/lang/String;Z)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerBundle (Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator uploadOpenBundleModel (Lnet/minecraft/item/Item;Lnet/minecraft/client/data/Model;Ljava/lang/String;)Lnet/minecraft/util/Identifier; +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerBow (Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerCrossbow (Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerCondition (Lnet/minecraft/item/Item;Lnet/minecraft/client/render/item/property/bool/BooleanProperty;Lnet/minecraft/client/render/item/model/ItemModel$Unbaked;Lnet/minecraft/client/render/item/model/ItemModel$Unbaked;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerWithBrokenCondition (Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerBrush (Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerFishingRod (Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerGoatHorn (Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerShield (Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator createModelWithInHandVariant (Lnet/minecraft/client/render/item/model/ItemModel$Unbaked;Lnet/minecraft/client/render/item/model/ItemModel$Unbaked;)Lnet/minecraft/client/render/item/model/ItemModel$Unbaked; +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerWithInHandModel (Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerTrident (Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerPotionTinted (Lnet/minecraft/item/Item;Lnet/minecraft/util/Identifier;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerPotion (Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerTippedArrow (Lnet/minecraft/item/Item;)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerDyeable (Lnet/minecraft/item/Item;I)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerSpawnEgg (Lnet/minecraft/item/Item;II)V +transitive-accessible method net/minecraft/client/data/ItemModelGenerator registerWithDyeableOverlay (Lnet/minecraft/item/Item;)V +transitive-extendable method net/minecraft/client/data/ModelProvider getName ()Ljava/lang/String; +transitive-extendable method net/minecraft/data/DynamicRegistriesProvider getName ()Ljava/lang/String; transitive-extendable method net/minecraft/data/MetadataProvider getName ()Ljava/lang/String; transitive-extendable method net/minecraft/data/SnbtProvider getName ()Ljava/lang/String; -transitive-extendable method net/minecraft/data/client/ModelProvider getName ()Ljava/lang/String; +transitive-extendable method net/minecraft/data/advancement/AdvancementProvider getName ()Ljava/lang/String; transitive-extendable method net/minecraft/data/dev/NbtProvider getName ()Ljava/lang/String; +transitive-extendable method net/minecraft/data/loottable/LootTableProvider getName ()Ljava/lang/String; transitive-extendable method net/minecraft/data/report/BiomeParametersProvider getName ()Ljava/lang/String; transitive-extendable method net/minecraft/data/report/BlockListProvider getName ()Ljava/lang/String; transitive-extendable method net/minecraft/data/report/CommandSyntaxProvider getName ()Ljava/lang/String; transitive-extendable method net/minecraft/data/report/ItemListProvider getName ()Ljava/lang/String; transitive-extendable method net/minecraft/data/report/RegistryDumpProvider getName ()Ljava/lang/String; -transitive-extendable method net/minecraft/data/server/DynamicRegistriesProvider getName ()Ljava/lang/String; -transitive-extendable method net/minecraft/data/server/advancement/AdvancementProvider getName ()Ljava/lang/String; -transitive-extendable method net/minecraft/data/server/loottable/LootTableProvider getName ()Ljava/lang/String; -transitive-extendable method net/minecraft/data/server/tag/TagProvider getName ()Ljava/lang/String; +transitive-extendable method net/minecraft/data/tag/TagProvider getName ()Ljava/lang/String; diff --git a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/atlases/atlas_source_test.json b/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/atlases/atlas_source_test.json deleted file mode 100644 index 3cb5aef6a..000000000 --- a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/atlases/atlas_source_test.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "sources": [ - { - "type": "minecraft:directory", - "prefix": "example/", - "source": "example" - } - ] -} \ No newline at end of file diff --git a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/block_that_drops_nothing.json b/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/block_that_drops_nothing.json deleted file mode 100644 index 707016945..000000000 --- a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/block_that_drops_nothing.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "fabric-data-gen-api-v1-testmod:block/block_that_drops_nothing" - } - } -} \ No newline at end of file diff --git a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/block_with_vanilla_loot_table.json b/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/block_with_vanilla_loot_table.json deleted file mode 100644 index ad3d23375..000000000 --- a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/block_with_vanilla_loot_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "fabric-data-gen-api-v1-testmod:block/block_with_vanilla_loot_table" - } - } -} \ No newline at end of file diff --git a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/block_without_item.json b/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/block_without_item.json deleted file mode 100644 index a8229d59c..000000000 --- a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/block_without_item.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "fabric-data-gen-api-v1-testmod:block/block_without_item" - } - } -} \ No newline at end of file diff --git a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/block_without_loot_table.json b/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/block_without_loot_table.json deleted file mode 100644 index bee4d7aa4..000000000 --- a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/block_without_loot_table.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "fabric-data-gen-api-v1-testmod:block/block_without_loot_table" - } - } -} \ No newline at end of file diff --git a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/simple_block.json b/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/simple_block.json deleted file mode 100644 index 2c44e3a8b..000000000 --- a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/blockstates/simple_block.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "variants": { - "": { - "model": "fabric-data-gen-api-v1-testmod:block/simple_block" - } - } -} \ No newline at end of file diff --git a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/items/simple_block.json b/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/items/simple_block.json deleted file mode 100644 index 90438fd92..000000000 --- a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/items/simple_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "model": { - "type": "minecraft:model", - "model": "fabric-data-gen-api-v1-testmod:block/simple_block" - } -} \ No newline at end of file diff --git a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/block_that_drops_nothing.json b/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/block_that_drops_nothing.json deleted file mode 100644 index f95015493..000000000 --- a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/block_that_drops_nothing.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "fabric-data-gen-api-v1-testmod:block/block_that_drops_nothing" - } -} \ No newline at end of file diff --git a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/block_with_vanilla_loot_table.json b/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/block_with_vanilla_loot_table.json deleted file mode 100644 index d0305da8e..000000000 --- a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/block_with_vanilla_loot_table.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "fabric-data-gen-api-v1-testmod:block/block_with_vanilla_loot_table" - } -} \ No newline at end of file diff --git a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/block_without_item.json b/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/block_without_item.json deleted file mode 100644 index 057501ec5..000000000 --- a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/block_without_item.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "fabric-data-gen-api-v1-testmod:block/block_without_item" - } -} \ No newline at end of file diff --git a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/block_without_loot_table.json b/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/block_without_loot_table.json deleted file mode 100644 index 4f2d7ce03..000000000 --- a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/block_without_loot_table.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "fabric-data-gen-api-v1-testmod:block/block_without_loot_table" - } -} \ No newline at end of file diff --git a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/simple_block.json b/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/simple_block.json deleted file mode 100644 index 15b751ea3..000000000 --- a/fabric-data-generation-api-v1/src/testmod/generated/resourcepacks/example_builtin/assets/fabric-data-gen-api-v1-testmod/models/block/simple_block.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "parent": "minecraft:block/cube_all", - "textures": { - "all": "fabric-data-gen-api-v1-testmod:block/simple_block" - } -} \ No newline at end of file diff --git a/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java b/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java index 345d7b876..438542e97 100644 --- a/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java +++ b/fabric-data-generation-api-v1/src/testmod/java/net/fabricmc/fabric/test/datagen/DataGeneratorTestEntrypoint.java @@ -45,8 +45,8 @@ import net.minecraft.block.BlockKeys; import net.minecraft.component.ComponentChanges; import net.minecraft.component.DataComponentTypes; import net.minecraft.data.DataOutput; -import net.minecraft.data.server.recipe.RecipeExporter; -import net.minecraft.data.server.recipe.RecipeGenerator; +import net.minecraft.data.recipe.RecipeExporter; +import net.minecraft.data.recipe.RecipeGenerator; import net.minecraft.entity.EntityType; import net.minecraft.entity.attribute.EntityAttributes; import net.minecraft.item.Items; diff --git a/fabric-data-generation-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/datagen/client/DataGeneratorClientTestEntrypoint.java b/fabric-data-generation-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/datagen/client/DataGeneratorClientTestEntrypoint.java index 7f02437b2..09a0a6f4d 100644 --- a/fabric-data-generation-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/datagen/client/DataGeneratorClientTestEntrypoint.java +++ b/fabric-data-generation-api-v1/src/testmodClient/java/net/fabricmc/fabric/test/datagen/client/DataGeneratorClientTestEntrypoint.java @@ -22,12 +22,12 @@ import java.util.List; import java.util.concurrent.CompletableFuture; import java.util.function.BiConsumer; +import net.minecraft.client.data.BlockStateModelGenerator; +import net.minecraft.client.data.ItemModelGenerator; import net.minecraft.client.texture.atlas.AtlasSource; import net.minecraft.client.texture.atlas.AtlasSourceManager; import net.minecraft.client.texture.atlas.DirectoryAtlasSource; import net.minecraft.data.DataOutput; -import net.minecraft.data.client.BlockStateModelGenerator; -import net.minecraft.data.client.ItemModelGenerator; import net.minecraft.registry.RegistryWrapper; import net.minecraft.util.Identifier; diff --git a/fabric-data-generation-api-v1/template.accesswidener b/fabric-data-generation-api-v1/template.accesswidener index 22d792b27..d954c8afc 100644 --- a/fabric-data-generation-api-v1/template.accesswidener +++ b/fabric-data-generation-api-v1/template.accesswidener @@ -1,16 +1,16 @@ accessible field net/minecraft/data/DataGenerator output Lnet/minecraft/data/DataOutput; mutable field net/minecraft/data/DataGenerator output Lnet/minecraft/data/DataOutput; -accessible class net/minecraft/data/server/recipe/RecipeGenerator$RecipeProvider -extendable method net/minecraft/data/server/recipe/RecipeGenerator$RecipeProvider run (Lnet/minecraft/data/DataWriter;)Ljava/util/concurrent/CompletableFuture; +accessible class net/minecraft/data/recipe/RecipeGenerator$RecipeProvider +extendable method net/minecraft/data/recipe/RecipeGenerator$RecipeProvider run (Lnet/minecraft/data/DataWriter;)Ljava/util/concurrent/CompletableFuture; -accessible field net/minecraft/data/server/tag/TagProvider$ProvidedTagBuilder builder Lnet/minecraft/registry/tag/TagBuilder; -extendable method net/minecraft/data/server/tag/TagProvider$ProvidedTagBuilder add (Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/data/server/tag/TagProvider$ProvidedTagBuilder; -extendable method net/minecraft/data/server/tag/TagProvider$ProvidedTagBuilder add ([Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/data/server/tag/TagProvider$ProvidedTagBuilder; +accessible field net/minecraft/data/tag/TagProvider$ProvidedTagBuilder builder Lnet/minecraft/registry/tag/TagBuilder; +transitive-extendable method net/minecraft/data/tag/TagProvider$ProvidedTagBuilder add (Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/data/tag/TagProvider$ProvidedTagBuilder; +transitive-extendable method net/minecraft/data/tag/TagProvider$ProvidedTagBuilder add ([Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/data/tag/TagProvider$ProvidedTagBuilder; -accessible field net/minecraft/data/server/tag/TagProvider tagBuilders Ljava/util/Map; +accessible field net/minecraft/data/tag/TagProvider tagBuilders Ljava/util/Map; -accessible field net/minecraft/data/server/loottable/BlockLootTableGenerator lootTables Ljava/util/Map; +accessible field net/minecraft/data/loottable/BlockLootTableGenerator lootTables Ljava/util/Map; extendable method net/minecraft/registry/tag/TagEntry (Lnet/minecraft/util/Identifier;ZZ)V accessible field net/minecraft/registry/tag/TagEntry id Lnet/minecraft/util/Identifier; @@ -32,20 +32,18 @@ accessible field net/minecraft/loot/context/LootContextTypes MAP Lcom/google/com transitive-accessible method net/minecraft/data/family/BlockFamilies register (Lnet/minecraft/block/Block;)Lnet/minecraft/data/family/BlockFamily$Builder; -transitive-accessible field net/minecraft/data/client/BlockStateModelGenerator blockStateCollector Ljava/util/function/Consumer; -transitive-accessible field net/minecraft/data/client/BlockStateModelGenerator modelCollector Ljava/util/function/BiConsumer; +transitive-accessible field net/minecraft/client/data/BlockStateModelGenerator blockStateCollector Ljava/util/function/Consumer; +transitive-accessible field net/minecraft/client/data/BlockStateModelGenerator modelCollector Ljava/util/function/BiConsumer; -transitive-accessible method net/minecraft/data/client/TextureKey of (Ljava/lang/String;)Lnet/minecraft/data/client/TextureKey; -transitive-accessible method net/minecraft/data/client/TextureKey of (Ljava/lang/String;Lnet/minecraft/data/client/TextureKey;)Lnet/minecraft/data/client/TextureKey; +transitive-accessible method net/minecraft/client/data/TextureKey of (Ljava/lang/String;)Lnet/minecraft/client/data/TextureKey; +transitive-accessible method net/minecraft/client/data/TextureKey of (Ljava/lang/String;Lnet/minecraft/client/data/TextureKey;)Lnet/minecraft/client/data/TextureKey; -transitive-extendable method net/minecraft/data/server/tag/TagProvider$ProvidedTagBuilder add ([Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/data/server/tag/TagProvider$ProvidedTagBuilder; +transitive-accessible method net/minecraft/client/data/TexturedModel makeFactory (Ljava/util/function/Function;Lnet/minecraft/client/data/Model;)Lnet/minecraft/client/data/TexturedModel$Factory; -transitive-accessible method net/minecraft/data/client/TexturedModel makeFactory (Ljava/util/function/Function;Lnet/minecraft/data/client/Model;)Lnet/minecraft/data/client/TexturedModel$Factory; +transitive-accessible class net/minecraft/client/data/BlockStateModelGenerator$BlockTexturePool +transitive-accessible class net/minecraft/client/data/BlockStateModelGenerator$LogTexturePool -transitive-accessible class net/minecraft/data/client/BlockStateModelGenerator$BlockTexturePool -transitive-accessible class net/minecraft/data/client/BlockStateModelGenerator$LogTexturePool - -accessible class net/minecraft/data/client/ModelProvider$class_10406 -accessible class net/minecraft/data/client/ModelProvider$class_10407 +accessible class net/minecraft/client/data/ModelProvider$ItemAssets +accessible class net/minecraft/client/data/ModelProvider$BlockStateSuppliers ### Generated access wideners below diff --git a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/ArmorKnockbackResistanceTest.java b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/ArmorKnockbackResistanceTest.java index c4a8dd25b..6c5acb99d 100644 --- a/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/ArmorKnockbackResistanceTest.java +++ b/fabric-item-api-v1/src/testmod/java/net/fabricmc/fabric/test/item/ArmorKnockbackResistanceTest.java @@ -21,7 +21,7 @@ import java.util.Map; import net.minecraft.item.ArmorItem; import net.minecraft.item.Item; import net.minecraft.item.equipment.ArmorMaterial; -import net.minecraft.item.equipment.EquipmentModels; +import net.minecraft.item.equipment.EquipmentAssetKeys; import net.minecraft.item.equipment.EquipmentType; import net.minecraft.registry.Registries; import net.minecraft.registry.Registry; @@ -57,7 +57,7 @@ public class ArmorKnockbackResistanceTest implements ModInitializer { 0, 0.5F, ItemTags.REPAIRS_LEATHER_ARMOR, - EquipmentModels.IRON + EquipmentAssetKeys.IRON ); } } diff --git a/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/mixin/loot/JsonDataLoaderMixin.java b/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/mixin/loot/JsonDataLoaderMixin.java index 0f2ad8ccc..886275182 100644 --- a/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/mixin/loot/JsonDataLoaderMixin.java +++ b/fabric-loot-api-v3/src/main/java/net/fabricmc/fabric/mixin/loot/JsonDataLoaderMixin.java @@ -38,7 +38,7 @@ import net.fabricmc.fabric.impl.loot.LootUtil; @Mixin(JsonDataLoader.class) public class JsonDataLoaderMixin { - @Inject(method = "load", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/resource/ResourceFinder;toResourceId(Lnet/minecraft/util/Identifier;)Lnet/minecraft/util/Identifier;", shift = At.Shift.AFTER)) + @Inject(method = "load(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/resource/ResourceFinder;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/util/Map;)V", at = @At(value = "INVOKE_ASSIGN", target = "Lnet/minecraft/resource/ResourceFinder;toResourceId(Lnet/minecraft/util/Identifier;)Lnet/minecraft/util/Identifier;", shift = At.Shift.AFTER)) private static void fillSourceMap(ResourceManager manager, ResourceFinder resourceFinder, DynamicOps ops, Codec codec, Map result, CallbackInfo ci, @Local Map.Entry entry, @Local(ordinal = 1) Identifier id) { final String dirName = ((ResourceFinderAccessor) resourceFinder).getDirectoryName(); if (!LootDataType.LOOT_TABLES.registryKey().getValue().getPath().equals(dirName)) return; diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/CustomIngredient.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/CustomIngredient.java index dde5cc288..7a1d31887 100644 --- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/CustomIngredient.java +++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/api/recipe/v1/ingredient/CustomIngredient.java @@ -16,7 +16,7 @@ package net.fabricmc.fabric.api.recipe.v1.ingredient; -import java.util.List; +import java.util.stream.Stream; import org.jetbrains.annotations.ApiStatus; @@ -73,7 +73,7 @@ public interface CustomIngredient { * *

Note: no caching needs to be done by the implementation, this is already handled by the ingredient itself. */ - List> getMatchingItems(); + Stream> getMatchingItems(); /** * Returns whether this ingredient always requires {@linkplain #test direct stack testing}. @@ -97,7 +97,7 @@ public interface CustomIngredient { */ default SlotDisplay toDisplay() { // Matches the vanilla logic in Ingredient.toDisplay() - return RegistryEntryList.of(getMatchingItems()).getStorage().map( + return RegistryEntryList.of(getMatchingItems().toList()).getStorage().map( SlotDisplay.TagSlotDisplay::new, (itemEntries) -> new SlotDisplay.CompositeSlotDisplay( itemEntries.stream().map(Ingredient::createDisplayWithRemainder).toList() diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/CustomIngredientImpl.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/CustomIngredientImpl.java index 1c8497004..00d3d66b8 100644 --- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/CustomIngredientImpl.java +++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/CustomIngredientImpl.java @@ -16,11 +16,11 @@ package net.fabricmc.fabric.impl.recipe.ingredient; -import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; import java.util.concurrent.ConcurrentHashMap; +import java.util.stream.Stream; import com.mojang.serialization.Codec; import com.mojang.serialization.DataResult; @@ -93,12 +93,8 @@ public class CustomIngredientImpl extends Ingredient { } @Override - public List> getMatchingItems() { - if (this.matchingItems == null) { - this.matchingItems = customIngredient.getMatchingItems(); - } - - return this.matchingItems; + public Stream> getMatchingItems() { + return customIngredient.getMatchingItems(); } @Override diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/AllIngredient.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/AllIngredient.java index dbc784013..a77e205d6 100644 --- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/AllIngredient.java +++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/AllIngredient.java @@ -18,6 +18,7 @@ package net.fabricmc.fabric.impl.recipe.ingredient.builtin; import java.util.ArrayList; import java.util.List; +import java.util.stream.Stream; import com.mojang.serialization.MapCodec; @@ -54,16 +55,16 @@ public class AllIngredient extends CombinedIngredient { } @Override - public List> getMatchingItems() { + public Stream> getMatchingItems() { // There's always at least one sub ingredient, so accessing ingredients[0] is safe. - List> previewStacks = new ArrayList<>(ingredients.getFirst().getMatchingItems()); + List> previewStacks = new ArrayList<>(ingredients.getFirst().getMatchingItems().toList()); for (int i = 1; i < ingredients.size(); ++i) { Ingredient ing = ingredients.get(i); previewStacks.removeIf(entry -> !ing.test(entry.value().getDefaultStack())); } - return previewStacks; + return previewStacks.stream(); } @Override diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/AnyIngredient.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/AnyIngredient.java index 31ac55ee5..2e8ef0f25 100644 --- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/AnyIngredient.java +++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/AnyIngredient.java @@ -16,8 +16,8 @@ package net.fabricmc.fabric.impl.recipe.ingredient.builtin; -import java.util.ArrayList; import java.util.List; +import java.util.stream.Stream; import com.mojang.serialization.MapCodec; @@ -54,14 +54,9 @@ public class AnyIngredient extends CombinedIngredient { } @Override - public List> getMatchingItems() { - List> previewStacks = new ArrayList<>(); - - for (Ingredient ingredient : ingredients) { - previewStacks.addAll(ingredient.getMatchingItems()); - } - - return previewStacks; + public Stream> getMatchingItems() { + return ingredients.stream() + .flatMap(Ingredient::getMatchingItems); } @Override diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/ComponentsIngredient.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/ComponentsIngredient.java index e29a7547b..cca76536f 100644 --- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/ComponentsIngredient.java +++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/ComponentsIngredient.java @@ -16,10 +16,10 @@ package net.fabricmc.fabric.impl.recipe.ingredient.builtin; -import java.util.List; import java.util.Map; import java.util.Objects; import java.util.Optional; +import java.util.stream.Stream; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; @@ -84,14 +84,14 @@ public class ComponentsIngredient implements CustomIngredient { } @Override - public List> getMatchingItems() { + public Stream> getMatchingItems() { return base.getMatchingItems(); } @Override public SlotDisplay toDisplay() { return new SlotDisplay.CompositeSlotDisplay( - base.getMatchingItems().stream().map(this::createEntryDisplay).toList() + base.getMatchingItems().map(this::createEntryDisplay).toList() ); } diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/CustomDataIngredient.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/CustomDataIngredient.java index f3f968354..66346b8ec 100644 --- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/CustomDataIngredient.java +++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/CustomDataIngredient.java @@ -16,7 +16,7 @@ package net.fabricmc.fabric.impl.recipe.ingredient.builtin; -import java.util.List; +import java.util.stream.Stream; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; @@ -60,14 +60,14 @@ public class CustomDataIngredient implements CustomIngredient { } @Override - public List> getMatchingItems() { + public Stream> getMatchingItems() { return base.getMatchingItems(); } @Override public SlotDisplay toDisplay() { return new SlotDisplay.CompositeSlotDisplay( - base.getMatchingItems().stream().map(this::createEntryDisplay).toList() + base.getMatchingItems().map(this::createEntryDisplay).toList() ); } diff --git a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/DifferenceIngredient.java b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/DifferenceIngredient.java index 8c26efbce..4d17637a7 100644 --- a/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/DifferenceIngredient.java +++ b/fabric-recipe-api-v1/src/main/java/net/fabricmc/fabric/impl/recipe/ingredient/builtin/DifferenceIngredient.java @@ -17,6 +17,7 @@ package net.fabricmc.fabric.impl.recipe.ingredient.builtin; import java.util.List; +import java.util.stream.Stream; import com.mojang.serialization.MapCodec; import com.mojang.serialization.codecs.RecordCodecBuilder; @@ -49,11 +50,10 @@ public class DifferenceIngredient implements CustomIngredient { } @Override - public List> getMatchingItems() { - final List> subtractedMatchingItems = subtracted.getMatchingItems(); - return base.getMatchingItems().stream() - .filter(registryEntry -> !subtractedMatchingItems.contains(registryEntry)) - .toList(); + public Stream> getMatchingItems() { + final List> subtractedMatchingItems = subtracted.getMatchingItems().toList(); + return base.getMatchingItems() + .filter(registryEntry -> !subtractedMatchingItems.contains(registryEntry)); } @Override diff --git a/fabric-recipe-api-v1/src/main/resources/fabric-recipe-api-v1.accesswidener b/fabric-recipe-api-v1/src/main/resources/fabric-recipe-api-v1.accesswidener index 2c746f9b0..9115d0c69 100644 --- a/fabric-recipe-api-v1/src/main/resources/fabric-recipe-api-v1.accesswidener +++ b/fabric-recipe-api-v1/src/main/resources/fabric-recipe-api-v1.accesswidener @@ -2,7 +2,6 @@ accessWidener v2 named extendable class net/minecraft/recipe/Ingredient accessible method net/minecraft/recipe/Ingredient (Lnet/minecraft/registry/entry/RegistryEntryList;)V -accessible field net/minecraft/recipe/Ingredient matchingItems Ljava/util/List; accessible method net/minecraft/recipe/Ingredient createDisplayWithRemainder (Lnet/minecraft/registry/entry/RegistryEntry;)Lnet/minecraft/recipe/display/SlotDisplay; accessible field net/minecraft/network/ClientConnection channel Lio/netty/channel/Channel; diff --git a/fabric-recipe-api-v1/src/testmod/java/net/fabricmc/fabric/test/recipe/ingredient/IngredientMatchTests.java b/fabric-recipe-api-v1/src/testmod/java/net/fabricmc/fabric/test/recipe/ingredient/IngredientMatchTests.java index c4a6fe997..914f3c071 100644 --- a/fabric-recipe-api-v1/src/testmod/java/net/fabricmc/fabric/test/recipe/ingredient/IngredientMatchTests.java +++ b/fabric-recipe-api-v1/src/testmod/java/net/fabricmc/fabric/test/recipe/ingredient/IngredientMatchTests.java @@ -42,9 +42,9 @@ public class IngredientMatchTests { public void testAllIngredient(TestContext context) { Ingredient allIngredient = DefaultCustomIngredients.all(Ingredient.ofItems(Items.APPLE, Items.CARROT), Ingredient.ofItems(Items.STICK, Items.CARROT)); - assertEquals(1, allIngredient.getMatchingItems().size()); - assertEquals(Items.CARROT, allIngredient.getMatchingItems().getFirst().value()); - assertEquals(false, allIngredient.getMatchingItems().isEmpty()); + assertEquals(1, allIngredient.getMatchingItems().toList().size()); + assertEquals(Items.CARROT, allIngredient.getMatchingItems().toList().getFirst().value()); + assertEquals(false, allIngredient.getMatchingItems().toList().isEmpty()); assertEquals(false, allIngredient.test(new ItemStack(Items.APPLE))); assertEquals(true, allIngredient.test(new ItemStack(Items.CARROT))); @@ -52,8 +52,8 @@ public class IngredientMatchTests { Ingredient emptyAllIngredient = DefaultCustomIngredients.all(Ingredient.ofItems(Items.APPLE), Ingredient.ofItems(Items.STICK)); - assertEquals(0, emptyAllIngredient.getMatchingItems().size()); - assertEquals(true, emptyAllIngredient.getMatchingItems().isEmpty()); + assertEquals(0, emptyAllIngredient.getMatchingItems().toList().size()); + assertEquals(true, emptyAllIngredient.getMatchingItems().toList().isEmpty()); assertEquals(false, emptyAllIngredient.test(new ItemStack(Items.APPLE))); assertEquals(false, emptyAllIngredient.test(new ItemStack(Items.STICK))); @@ -65,12 +65,12 @@ public class IngredientMatchTests { public void testAnyIngredient(TestContext context) { Ingredient anyIngredient = DefaultCustomIngredients.any(Ingredient.ofItems(Items.APPLE, Items.CARROT), Ingredient.ofItems(Items.STICK, Items.CARROT)); - assertEquals(4, anyIngredient.getMatchingItems().size()); - assertEquals(Items.APPLE, anyIngredient.getMatchingItems().getFirst().value()); - assertEquals(Items.CARROT, anyIngredient.getMatchingItems().get(1).value()); - assertEquals(Items.STICK, anyIngredient.getMatchingItems().get(2).value()); - assertEquals(Items.CARROT, anyIngredient.getMatchingItems().get(3).value()); - assertEquals(false, anyIngredient.getMatchingItems().isEmpty()); + assertEquals(4, anyIngredient.getMatchingItems().toList().size()); + assertEquals(Items.APPLE, anyIngredient.getMatchingItems().toList().getFirst().value()); + assertEquals(Items.CARROT, anyIngredient.getMatchingItems().toList().get(1).value()); + assertEquals(Items.STICK, anyIngredient.getMatchingItems().toList().get(2).value()); + assertEquals(Items.CARROT, anyIngredient.getMatchingItems().toList().get(3).value()); + assertEquals(false, anyIngredient.getMatchingItems().toList().isEmpty()); assertEquals(true, anyIngredient.test(new ItemStack(Items.APPLE))); assertEquals(true, anyIngredient.test(new ItemStack(Items.CARROT))); @@ -83,9 +83,9 @@ public class IngredientMatchTests { public void testDifferenceIngredient(TestContext context) { Ingredient differenceIngredient = DefaultCustomIngredients.difference(Ingredient.ofItems(Items.APPLE, Items.CARROT), Ingredient.ofItems(Items.STICK, Items.CARROT)); - assertEquals(1, differenceIngredient.getMatchingItems().size()); - assertEquals(Items.APPLE, differenceIngredient.getMatchingItems().getFirst().value()); - assertEquals(false, differenceIngredient.getMatchingItems().isEmpty()); + assertEquals(1, differenceIngredient.getMatchingItems().toList().size()); + assertEquals(Items.APPLE, differenceIngredient.getMatchingItems().toList().getFirst().value()); + assertEquals(false, differenceIngredient.getMatchingItems().toList().isEmpty()); assertEquals(true, differenceIngredient.test(new ItemStack(Items.APPLE))); assertEquals(false, differenceIngredient.test(new ItemStack(Items.CARROT))); @@ -113,15 +113,15 @@ public class IngredientMatchTests { assertEquals(true, undamagedIngredient.test(renamedUndamagedDiamondPickaxe)); assertEquals(false, noNameUndamagedIngredient.test(renamedUndamagedDiamondPickaxe)); - assertEquals(3, undamagedIngredient.getMatchingItems().size()); - ItemStack result0 = undamagedIngredient.getMatchingItems().getFirst().value().getDefaultStack(); - ItemStack result1 = undamagedIngredient.getMatchingItems().get(1).value().getDefaultStack(); + assertEquals(3, undamagedIngredient.getMatchingItems().toList().size()); + ItemStack result0 = undamagedIngredient.getMatchingItems().toList().getFirst().value().getDefaultStack(); + ItemStack result1 = undamagedIngredient.getMatchingItems().toList().get(1).value().getDefaultStack(); assertEquals(Items.DIAMOND_PICKAXE, result0.getItem()); assertEquals(Items.NETHERITE_PICKAXE, result1.getItem()); assertEquals(ComponentChanges.EMPTY, result0.getComponentChanges()); assertEquals(ComponentChanges.EMPTY, result1.getComponentChanges()); - assertEquals(false, undamagedIngredient.getMatchingItems().isEmpty()); + assertEquals(false, undamagedIngredient.getMatchingItems().toList().isEmpty()); // Undamaged is fine assertEquals(true, undamagedIngredient.test(new ItemStack(Items.DIAMOND_PICKAXE))); @@ -192,7 +192,7 @@ public class IngredientMatchTests { stack.set(DataComponentTypes.CUSTOM_DATA, NbtComponent.of(rejectedNbt2)); assertEquals(false, customDataIngredient.test(stack)); - List> matchingItems = customDataIngredient.getMatchingItems(); + List> matchingItems = customDataIngredient.getMatchingItems().toList(); assertEquals(1, matchingItems.size()); assertEquals(Items.STICK, matchingItems.getFirst().value()); // Test disabled as the vanilla API no longer exposes the stack with data. diff --git a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryLoaderMixin.java b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryLoaderMixin.java index 9b04e4ff2..17a35077f 100644 --- a/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryLoaderMixin.java +++ b/fabric-registry-sync-v0/src/main/java/net/fabricmc/fabric/mixin/registry/sync/RegistryLoaderMixin.java @@ -91,7 +91,7 @@ public class RegistryLoaderMixin { }, at = @At( value = "INVOKE", - target = "Lnet/minecraft/resource/ResourceFinder;method_65309(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/resource/ResourceFinder;" + target = "Lnet/minecraft/resource/ResourceFinder;json(Lnet/minecraft/registry/RegistryKey;)Lnet/minecraft/resource/ResourceFinder;" ) ) private static ResourceFinder prependDirectoryWithNamespace(RegistryKey> registryKey, Operation original) { diff --git a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/CapeFeatureRendererMixin.java b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/CapeFeatureRendererMixin.java index ffd7b5df1..52f77e10b 100644 --- a/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/CapeFeatureRendererMixin.java +++ b/fabric-rendering-v1/src/client/java/net/fabricmc/fabric/mixin/client/rendering/CapeFeatureRendererMixin.java @@ -22,16 +22,16 @@ import com.llamalad7.mixinextras.sugar.Local; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; +import net.minecraft.client.render.entity.equipment.EquipmentModel; import net.minecraft.client.render.entity.feature.CapeFeatureRenderer; import net.minecraft.client.render.entity.state.PlayerEntityRenderState; import net.minecraft.item.ItemStack; -import net.minecraft.item.equipment.EquipmentModel; import net.fabricmc.fabric.api.client.rendering.v1.LivingEntityFeatureRenderEvents; @Mixin(CapeFeatureRenderer.class) public class CapeFeatureRendererMixin { - @WrapOperation(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/feature/CapeFeatureRenderer;hasCustomModelForLayer(Lnet/minecraft/item/ItemStack;Lnet/minecraft/item/equipment/EquipmentModel$LayerType;)Z"), method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/state/PlayerEntityRenderState;FF)V") + @WrapOperation(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/render/entity/feature/CapeFeatureRenderer;hasCustomModelForLayer(Lnet/minecraft/item/ItemStack;Lnet/minecraft/client/render/entity/equipment/EquipmentModel$LayerType;)Z"), method = "render(Lnet/minecraft/client/util/math/MatrixStack;Lnet/minecraft/client/render/VertexConsumerProvider;ILnet/minecraft/client/render/entity/state/PlayerEntityRenderState;FF)V") public boolean injectCapeRenderCheck(CapeFeatureRenderer instance, ItemStack itemStack, EquipmentModel.LayerType layerType, Operation original, @Local(argsOnly = true) PlayerEntityRenderState state) { if (!LivingEntityFeatureRenderEvents.ALLOW_CAPE_RENDER.invoker().allowCapeRender(state)) { return false; diff --git a/fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/TooltipComponentTestInit.java b/fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/TooltipComponentTestInit.java index 79571bfb8..3fffb2a73 100644 --- a/fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/TooltipComponentTestInit.java +++ b/fabric-rendering-v1/src/testmod/java/net/fabricmc/fabric/test/rendering/TooltipComponentTestInit.java @@ -23,7 +23,7 @@ import net.minecraft.item.ArmorItem; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.item.equipment.ArmorMaterial; -import net.minecraft.item.equipment.EquipmentModels; +import net.minecraft.item.equipment.EquipmentAssetKeys; import net.minecraft.item.equipment.EquipmentType; import net.minecraft.item.tooltip.TooltipData; import net.minecraft.registry.Registries; @@ -79,7 +79,7 @@ public class TooltipComponentTestInit implements ModInitializer { 0, 0.5F, ItemTags.REPAIRS_LEATHER_ARMOR, - EquipmentModels.IRON + EquipmentAssetKeys.IRON ); } } diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/ArmorRenderingTests.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/ArmorRenderingTests.java index 6a2d6228c..c82511201 100644 --- a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/ArmorRenderingTests.java +++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/ArmorRenderingTests.java @@ -36,7 +36,7 @@ public class ArmorRenderingTests implements ClientModInitializer { public void onInitializeClient() { ArmorRenderer.register((matrices, vertexConsumers, stack, renderState, slot, light, model) -> { if (armorModel == null) { - armorModel = new BipedEntityModel<>(MinecraftClient.getInstance().getEntityModelLoader().getModelPart(EntityModelLayers.PLAYER_OUTER_ARMOR)); + armorModel = new BipedEntityModel<>(MinecraftClient.getInstance().getLoadedEntityModels().getModelPart(EntityModelLayers.PLAYER_OUTER_ARMOR)); } armorModel.setAngles(renderState); diff --git a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/CustomAtlasSourcesTest.java b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/CustomAtlasSourcesTest.java index c3e91eda8..351b38981 100644 --- a/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/CustomAtlasSourcesTest.java +++ b/fabric-rendering-v1/src/testmodClient/java/net/fabricmc/fabric/test/rendering/client/CustomAtlasSourcesTest.java @@ -113,7 +113,8 @@ public class CustomAtlasSourcesTest implements ClientModInitializer { int imageWidth = image.getWidth(); int imageHeight = image.getHeight(); - AnimationResourceMetadata animationMetadata = metadata.decode(AnimationResourceMetadata.READER).orElse(AnimationResourceMetadata.EMPTY); + AnimationResourceMetadata animationMetadata = metadata.decode(AnimationResourceMetadata.field_55537) + .orElse(new AnimationResourceMetadata(Optional.empty(), Optional.empty(), Optional.empty(), 1, false)); SpriteDimensions dimensions = animationMetadata.getSize(imageWidth, imageHeight); int frameWidth = dimensions.width(); int frameHeight = dimensions.height(); diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/OverlayConditionsMetadata.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/OverlayConditionsMetadata.java index a856fe03b..dbd70706c 100644 --- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/OverlayConditionsMetadata.java +++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/impl/resource/conditions/OverlayConditionsMetadata.java @@ -31,7 +31,7 @@ import net.fabricmc.fabric.api.resource.conditions.v1.ResourceConditions; public record OverlayConditionsMetadata(List overlays) { public static final Codec CODEC = Entry.CODEC.listOf().fieldOf("entries").xmap(OverlayConditionsMetadata::new, OverlayConditionsMetadata::overlays).codec(); - public static final ResourceMetadataSerializer SERIALIZER = ResourceMetadataSerializer.fromCodec(ResourceConditions.OVERLAYS_KEY, CODEC); + public static final ResourceMetadataSerializer SERIALIZER = new ResourceMetadataSerializer<>(ResourceConditions.OVERLAYS_KEY, CODEC); public List appliedOverlays() { List appliedOverlays = new ArrayList<>(); diff --git a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/JsonDataLoaderMixin.java b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/JsonDataLoaderMixin.java index b7dc7622c..66979d215 100644 --- a/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/JsonDataLoaderMixin.java +++ b/fabric-resource-conditions-api-v1/src/main/java/net/fabricmc/fabric/mixin/resource/conditions/JsonDataLoaderMixin.java @@ -46,7 +46,7 @@ public class JsonDataLoaderMixin { @Unique private static final Object SKIP_DATA_MARKER = new Object(); - @WrapOperation(method = "load", at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/Codec;parse(Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;", remap = false)) + @WrapOperation(method = "load(Lnet/minecraft/resource/ResourceManager;Lnet/minecraft/resource/ResourceFinder;Lcom/mojang/serialization/DynamicOps;Lcom/mojang/serialization/Codec;Ljava/util/Map;)V", at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/Codec;parse(Lcom/mojang/serialization/DynamicOps;Ljava/lang/Object;)Lcom/mojang/serialization/DataResult;", remap = false)) private static DataResult applyResourceConditions(Codec instance, DynamicOps dynamicOps, Object object, Operation> original, @Local(argsOnly = true) ResourceFinder resourceFinder, @Local Map.Entry entry) { diff --git a/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModNioResourcePack.java b/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModNioResourcePack.java index 7846bf359..286ea53c9 100644 --- a/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModNioResourcePack.java +++ b/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModNioResourcePack.java @@ -48,7 +48,7 @@ import net.minecraft.resource.InputSupplier; import net.minecraft.resource.ResourcePack; import net.minecraft.resource.ResourcePackInfo; import net.minecraft.resource.ResourceType; -import net.minecraft.resource.metadata.ResourceMetadataReader; +import net.minecraft.resource.metadata.ResourceMetadataSerializer; import net.minecraft.text.Text; import net.minecraft.util.Identifier; import net.minecraft.util.PathUtil; @@ -279,7 +279,7 @@ public class ModNioResourcePack implements ResourcePack, ModResourcePack { } @Override - public T parseMetadata(ResourceMetadataReader metaReader) throws IOException { + public T parseMetadata(ResourceMetadataSerializer metaReader) throws IOException { try (InputStream is = Objects.requireNonNull(openFile("pack.mcmeta")).get()) { return AbstractFileResourcePack.parseMetadata(metaReader, is); } diff --git a/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModResourcePackUtil.java b/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModResourcePackUtil.java index 9163e00a4..2f20ce58b 100644 --- a/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModResourcePackUtil.java +++ b/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/ModResourcePackUtil.java @@ -34,6 +34,7 @@ import java.util.Set; import com.google.common.base.Charsets; import com.google.gson.Gson; import com.google.gson.JsonObject; +import com.mojang.serialization.JsonOps; import org.apache.commons.io.IOUtils; import org.jetbrains.annotations.Nullable; import org.slf4j.Logger; @@ -153,7 +154,9 @@ public final class ModResourcePackUtil { } public static JsonObject getMetadataPackJson(int packVersion, Text description) { - return PackResourceMetadata.SERIALIZER.toJson(getMetadataPack(packVersion, description)); + return PackResourceMetadata.SERIALIZER.codec().encodeStart(JsonOps.INSTANCE, getMetadataPack(packVersion, description)) + .getOrThrow() + .getAsJsonObject(); } public static String serializeMetadata(int packVersion, String description) { diff --git a/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/PlaceholderResourcePack.java b/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/PlaceholderResourcePack.java index 129c70eec..001c13753 100644 --- a/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/PlaceholderResourcePack.java +++ b/fabric-resource-loader-v0/src/main/java/net/fabricmc/fabric/impl/resource/loader/PlaceholderResourcePack.java @@ -21,6 +21,9 @@ import java.nio.charset.StandardCharsets; import java.util.Collections; import java.util.Set; +import com.google.gson.JsonElement; +import com.mojang.serialization.DataResult; +import com.mojang.serialization.JsonOps; import org.apache.commons.io.IOUtils; import org.jetbrains.annotations.Nullable; @@ -32,7 +35,7 @@ import net.minecraft.resource.ResourcePackProfile; import net.minecraft.resource.ResourceType; import net.minecraft.resource.metadata.PackResourceMetadata; import net.minecraft.resource.metadata.ResourceMetadataMap; -import net.minecraft.resource.metadata.ResourceMetadataReader; +import net.minecraft.resource.metadata.ResourceMetadataSerializer; import net.minecraft.text.Text; import net.minecraft.util.Identifier; @@ -53,7 +56,8 @@ public record PlaceholderResourcePack(ResourceType type, ResourcePackInfo metada switch (segments[0]) { case "pack.mcmeta": return () -> { - String metadata = ModResourcePackUtil.GSON.toJson(PackResourceMetadata.SERIALIZER.toJson(getMetadata())); + DataResult result = PackResourceMetadata.SERIALIZER.codec().encodeStart(JsonOps.INSTANCE, getMetadata()); + String metadata = result.getOrThrow().toString(); return IOUtils.toInputStream(metadata, StandardCharsets.UTF_8); }; case "pack.png": @@ -84,7 +88,7 @@ public record PlaceholderResourcePack(ResourceType type, ResourcePackInfo metada @Nullable @Override - public T parseMetadata(ResourceMetadataReader metaReader) { + public T parseMetadata(ResourceMetadataSerializer metaReader) { return ResourceMetadataMap.of(PackResourceMetadata.SERIALIZER, getMetadata()).get(metaReader); } diff --git a/gradle.properties b/gradle.properties index 77a0acbc6..0b8078c85 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,9 @@ org.gradle.jvmargs=-Xmx2560M org.gradle.parallel=true -version=0.108.0 -minecraft_version=24w45a -yarn_version=+build.1 +version=0.108.1 +minecraft_version=24w46a +yarn_version=+build.3 loader_version=0.16.9 installer_version=1.0.1 @@ -20,38 +20,38 @@ fabric-blockrenderlayer-v1-version=2.0.4 fabric-command-api-v1-version=1.2.58 fabric-command-api-v2-version=2.2.37 fabric-commands-v0-version=0.2.75 -fabric-content-registries-v0-version=9.1.8 +fabric-content-registries-v0-version=9.1.9 fabric-crash-report-info-v1-version=0.3.4 -fabric-data-attachment-api-v1-version=1.3.0 -fabric-data-generation-api-v1-version=22.0.1 +fabric-data-attachment-api-v1-version=1.3.1 +fabric-data-generation-api-v1-version=22.0.2 fabric-dimensions-v1-version=4.0.8 fabric-entity-events-v1-version=2.0.8 fabric-events-interaction-v0-version=3.0.2 fabric-game-rule-api-v1-version=1.0.60 -fabric-gametest-api-v1-version=2.0.15 -fabric-item-api-v1-version=11.1.8 -fabric-item-group-api-v1-version=4.1.17 +fabric-gametest-api-v1-version=2.0.16 +fabric-item-api-v1-version=11.1.9 +fabric-item-group-api-v1-version=4.1.18 fabric-key-binding-api-v1-version=1.0.54 fabric-keybindings-v0-version=0.2.52 fabric-lifecycle-events-v1-version=2.5.0 -fabric-loot-api-v2-version=3.0.27 -fabric-loot-api-v3-version=1.0.15 +fabric-loot-api-v2-version=3.0.28 +fabric-loot-api-v3-version=1.0.16 fabric-message-api-v1-version=6.0.21 fabric-model-loading-api-v1-version=3.0.9 fabric-networking-api-v1-version=4.3.5 -fabric-object-builder-api-v1-version=18.0.0 +fabric-object-builder-api-v1-version=18.0.1 fabric-particles-v1-version=4.0.10 -fabric-recipe-api-v1-version=7.0.4 -fabric-registry-sync-v0-version=5.2.3 +fabric-recipe-api-v1-version=8.0.0 +fabric-registry-sync-v0-version=5.2.4 fabric-renderer-api-v1-version=4.0.5 fabric-renderer-indigo-version=1.9.5 fabric-rendering-data-attachment-v1-version=0.3.55 fabric-rendering-fluids-v1-version=3.1.15 -fabric-rendering-v1-version=9.0.0 -fabric-resource-conditions-api-v1-version=5.0.10 -fabric-resource-loader-v0-version=3.0.7 +fabric-rendering-v1-version=9.0.1 +fabric-resource-conditions-api-v1-version=5.0.11 +fabric-resource-loader-v0-version=3.0.8 fabric-screen-api-v1-version=2.0.34 -fabric-screen-handler-api-v1-version=1.3.101 +fabric-screen-handler-api-v1-version=1.3.102 fabric-sound-api-v1-version=1.0.30 fabric-transfer-api-v1-version=5.4.3 fabric-transitive-access-wideners-v1-version=6.1.10 diff --git a/gradle/javadoc.accesswidener b/gradle/javadoc.accesswidener index dbb9408ba..77d734e96 100644 --- a/gradle/javadoc.accesswidener +++ b/gradle/javadoc.accesswidener @@ -1,5 +1,5 @@ accessWidener v2 named # Place access wideners that are required during javadoc generation here -accessible class net/minecraft/data/server/recipe/RecipeGenerator$RecipeProvider +accessible class net/minecraft/data/recipe/RecipeGenerator$RecipeProvider accessible class net/minecraft/item/ItemGroup$StackVisibility