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 bb63ccfe1..dfd2261ee 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 @@ -26,7 +26,6 @@ import static net.fabricmc.fabric.test.datagen.DataGeneratorTestContent.SIMPLE_I import java.io.IOException; import java.nio.file.Path; -import java.util.List; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.function.BiConsumer; @@ -39,10 +38,6 @@ import net.minecraft.advancement.Advancement; import net.minecraft.advancement.AdvancementFrame; import net.minecraft.advancement.criterion.OnKilledCriterion; import net.minecraft.block.Blocks; -import net.minecraft.client.texture.atlas.AtlasSource; -import net.minecraft.client.texture.atlas.AtlasSourceManager; -import net.minecraft.client.texture.atlas.DirectoryAtlasSource; -import net.minecraft.registry.RegistryKeys; import net.minecraft.data.DataOutput; import net.minecraft.data.client.BlockStateModelGenerator; import net.minecraft.data.client.ItemModelGenerator; @@ -50,8 +45,8 @@ import net.minecraft.data.server.recipe.RecipeJsonProvider; import net.minecraft.data.server.recipe.ShapelessRecipeJsonBuilder; import net.minecraft.entity.EntityType; import net.minecraft.entity.attribute.EntityAttributes; -import net.minecraft.item.Items; import net.minecraft.item.ItemStack; +import net.minecraft.item.Items; import net.minecraft.loot.LootPool; import net.minecraft.loot.LootTable; import net.minecraft.loot.LootTables; @@ -60,12 +55,16 @@ import net.minecraft.loot.entry.ItemEntry; import net.minecraft.loot.provider.number.ConstantLootNumberProvider; import net.minecraft.recipe.Ingredient; import net.minecraft.recipe.book.RecipeCategory; +import net.minecraft.registry.RegistryKeys; +import net.minecraft.registry.RegistryWrapper; import net.minecraft.registry.tag.BlockTags; import net.minecraft.registry.tag.ItemTags; import net.minecraft.registry.tag.TagKey; import net.minecraft.text.Text; import net.minecraft.util.Identifier; -import net.minecraft.registry.RegistryWrapper; +import net.minecraft.util.math.BlockPos; +import net.minecraft.util.math.GlobalPos; +import net.minecraft.world.World; import net.minecraft.world.biome.Biome; import net.minecraft.world.biome.BiomeKeys; @@ -104,7 +103,7 @@ public class DataGeneratorTestEntrypoint implements DataGeneratorEntrypoint { TestBlockTagProvider blockTagProvider = pack.addProvider(TestBlockTagProvider::new); pack.addProvider((output, registries) -> new TestItemTagProvider(output, registries, blockTagProvider)); pack.addProvider(TestBiomeTagProvider::new); - pack.addProvider(TestAtlasSourceProvider::new); + pack.addProvider(TestCodecDataProvider::new); } private static class TestRecipeProvider extends FabricRecipeProvider { @@ -358,19 +357,19 @@ public class DataGeneratorTestEntrypoint implements DataGeneratorEntrypoint { } } - private static class TestAtlasSourceProvider extends FabricCodecDataProvider<List<AtlasSource>> { - private TestAtlasSourceProvider(FabricDataOutput dataOutput) { - super(dataOutput, DataOutput.OutputType.RESOURCE_PACK, "atlases", AtlasSourceManager.LIST_CODEC); + private static class TestCodecDataProvider extends FabricCodecDataProvider<GlobalPos> { + private TestCodecDataProvider(FabricDataOutput dataOutput) { + super(dataOutput, DataOutput.OutputType.RESOURCE_PACK, "test_positions", GlobalPos.CODEC); } @Override - protected void configure(BiConsumer<Identifier, List<AtlasSource>> provider) { - provider.accept(new Identifier(MOD_ID, "atlas_source_test"), List.of(new DirectoryAtlasSource("example", "example/"))); + protected void configure(BiConsumer<Identifier, GlobalPos> provider) { + provider.accept(new Identifier(MOD_ID, "test_pos_1"), GlobalPos.create(World.OVERWORLD, BlockPos.ORIGIN)); } @Override public String getName() { - return "Atlas Sources"; + return "Codec data provider"; } } }