diff --git a/gradle.properties b/gradle.properties index 00b318dc..b8b4adc5 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,7 +6,7 @@ org.gradle.configuration-cache=true mod_group=com.github.minecraftschurlimods mod_id=bibliocraft -mod_version=1.0.0 +mod_version=1.1.0 mod_name=Bibliocraft Legacy mod_vendor=MinecraftschurliMods mod_authors=IchHabeHunger54, Minecraftschurli diff --git a/src/api/java/com/github/minecraftschurlimods/bibliocraft/api/BibliocraftApi.java b/src/api/java/com/github/minecraftschurlimods/bibliocraft/api/BibliocraftApi.java index 4aa5f8de..5bf0fb9c 100644 --- a/src/api/java/com/github/minecraftschurlimods/bibliocraft/api/BibliocraftApi.java +++ b/src/api/java/com/github/minecraftschurlimods/bibliocraft/api/BibliocraftApi.java @@ -1,5 +1,6 @@ package com.github.minecraftschurlimods.bibliocraft.api; +import com.github.minecraftschurlimods.bibliocraft.api.datagen.BibliocraftDatagenHelper; import com.github.minecraftschurlimods.bibliocraft.api.lockandkey.LockAndKeyBehaviors; import com.github.minecraftschurlimods.bibliocraft.api.woodtype.BibliocraftWoodTypeRegistry; import net.neoforged.fml.loading.FMLEnvironment; diff --git a/src/api/java/com/github/minecraftschurlimods/bibliocraft/api/BibliocraftDatagenHelper.java b/src/api/java/com/github/minecraftschurlimods/bibliocraft/api/datagen/BibliocraftDatagenHelper.java similarity index 78% rename from src/api/java/com/github/minecraftschurlimods/bibliocraft/api/BibliocraftDatagenHelper.java rename to src/api/java/com/github/minecraftschurlimods/bibliocraft/api/datagen/BibliocraftDatagenHelper.java index db87b8c5..26700c1a 100644 --- a/src/api/java/com/github/minecraftschurlimods/bibliocraft/api/BibliocraftDatagenHelper.java +++ b/src/api/java/com/github/minecraftschurlimods/bibliocraft/api/datagen/BibliocraftDatagenHelper.java @@ -1,5 +1,6 @@ -package com.github.minecraftschurlimods.bibliocraft.api; +package com.github.minecraftschurlimods.bibliocraft.api.datagen; +import com.github.minecraftschurlimods.bibliocraft.api.BibliocraftApi; import com.github.minecraftschurlimods.bibliocraft.api.woodtype.BibliocraftWoodType; import net.minecraft.data.loot.BlockLootSubProvider; import net.minecraft.data.recipes.RecipeOutput; @@ -95,14 +96,16 @@ public interface BibliocraftDatagenHelper { void generateRecipesFor(RecipeOutput output, BibliocraftWoodType woodType, String modId); /** - * Generates block and item models, block and item tags, loot tables, and recipes for Bibliocraft blocks with a {@link BibliocraftWoodType}. Call this directly from a {@link GatherDataEvent} handler! - * Note: Language files are not created by this method because they would overwrite each other (since they all operate on the same file). Call the language helpers from your own language provider instead. + * Generates language files, block and item models, block and item tags, loot tables, and recipes for Bibliocraft blocks with a {@link BibliocraftWoodType}. Call this directly from a {@link GatherDataEvent} handler! * - * @param woodType The {@link BibliocraftWoodType} to generate the files for. - * @param modId The namespace to store the files under, where applicable. - * @param event The {@link GatherDataEvent} whose handler this is called from. + * @param woodType The {@link BibliocraftWoodType} to generate the files for. + * @param modId The namespace to store the files under, where applicable. + * @param event The {@link GatherDataEvent} whose handler this is called from. + * @param englishLanguageProvider The {@link LanguageProvider} to use for generating english translations. + * @param blockTagsProvider The {@link BlockTagsProvider} to use for generating block tags. It is strongly suggested this be a {@link NonClearingBlockTagsProvider}. + * @param itemTagsProvider The {@link ItemTagsProvider} to use for generating item tags. It is strongly suggested this be a {@link NonClearingItemTagsProvider}. */ - void generateAllFor(BibliocraftWoodType woodType, String modId, GatherDataEvent event); + void generateAllFor(BibliocraftWoodType woodType, String modId, GatherDataEvent event, LanguageProvider englishLanguageProvider, BlockTagsProvider blockTagsProvider, ItemTagsProvider itemTagsProvider); /** * Marks all {@link BibliocraftWoodType}s from the given mod as to-be-datagenned. This method is thread-safe. @@ -180,13 +183,15 @@ default void generateRecipes(RecipeOutput output, String modId) { } /** - * Generates block and item models, block and item tags, loot tables, and recipes for Bibliocraft blocks with your mod's wood type(s). Call this directly from a {@link GatherDataEvent} handler! - * Note: Language files are not created by this method because they would overwrite each other (since they all operate on the same file). Call the language helpers from your own language provider instead. + * Generates language files, block and item models, block and item tags, loot tables, and recipes for Bibliocraft blocks with your mod's wood type(s). Call this directly from a {@link GatherDataEvent} handler! * - * @param modId The namespace to store the files under, where applicable. - * @param event The {@link GatherDataEvent} whose handler this is called from. + * @param modId The namespace to store the files under, where applicable. + * @param event The {@link GatherDataEvent} whose handler this is called from. + * @param englishLanguageProvider The {@link LanguageProvider} to use for generating english translations. + * @param blockTagsProvider The {@link BlockTagsProvider} to use for generating block tags. It is strongly suggested this be a {@link NonClearingBlockTagsProvider}. + * @param itemTagsProvider The {@link ItemTagsProvider} to use for generating item tags. It is strongly suggested this be a {@link NonClearingItemTagsProvider}. */ - default void generateAll(String modId, GatherDataEvent event) { - getWoodTypesToGenerate().forEach(woodType -> generateAllFor(woodType, modId, event)); + default void generateAll(String modId, GatherDataEvent event, LanguageProvider englishLanguageProvider, BlockTagsProvider blockTagsProvider, ItemTagsProvider itemTagsProvider) { + getWoodTypesToGenerate().forEach(woodType -> generateAllFor(woodType, modId, event, englishLanguageProvider, blockTagsProvider, itemTagsProvider)); } } diff --git a/src/api/java/com/github/minecraftschurlimods/bibliocraft/api/datagen/NonClearingBlockTagsProvider.java b/src/api/java/com/github/minecraftschurlimods/bibliocraft/api/datagen/NonClearingBlockTagsProvider.java new file mode 100644 index 00000000..7b483f20 --- /dev/null +++ b/src/api/java/com/github/minecraftschurlimods/bibliocraft/api/datagen/NonClearingBlockTagsProvider.java @@ -0,0 +1,34 @@ +package com.github.minecraftschurlimods.bibliocraft.api.datagen; + +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.neoforged.neoforge.common.data.BlockTagsProvider; +import net.neoforged.neoforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; + +import java.util.concurrent.CompletableFuture; + +/** + * The default {@link BlockTagsProvider} implementation clears the builders before calling {@link BlockTagsProvider#addTags(HolderLookup.Provider)}. + * We don't want that, so we override {@link BlockTagsProvider#addTags(HolderLookup.Provider)} to not do that. + */ +public abstract class NonClearingBlockTagsProvider extends BlockTagsProvider { + // Store the provider here because while the superclass has it, it is private there. + private final CompletableFuture lookupProvider; + + /** + * See super constructor for information. + */ + public NonClearingBlockTagsProvider(PackOutput output, CompletableFuture lookupProvider, String modId, @Nullable ExistingFileHelper existingFileHelper) { + super(output, lookupProvider, modId, existingFileHelper); + this.lookupProvider = lookupProvider; + } + + @Override + protected CompletableFuture createContentsProvider() { + return lookupProvider.thenApply(provider -> { + addTags(provider); + return provider; + }); + } +} diff --git a/src/api/java/com/github/minecraftschurlimods/bibliocraft/api/datagen/NonClearingItemTagsProvider.java b/src/api/java/com/github/minecraftschurlimods/bibliocraft/api/datagen/NonClearingItemTagsProvider.java new file mode 100644 index 00000000..08a43e6a --- /dev/null +++ b/src/api/java/com/github/minecraftschurlimods/bibliocraft/api/datagen/NonClearingItemTagsProvider.java @@ -0,0 +1,70 @@ +package com.github.minecraftschurlimods.bibliocraft.api.datagen; + +import net.minecraft.core.HolderLookup; +import net.minecraft.data.PackOutput; +import net.minecraft.data.tags.ItemTagsProvider; +import net.minecraft.tags.TagBuilder; +import net.minecraft.tags.TagKey; +import net.minecraft.world.item.Item; +import net.minecraft.world.level.block.Block; +import net.neoforged.neoforge.common.data.ExistingFileHelper; +import org.jetbrains.annotations.Nullable; + +import java.util.Optional; +import java.util.concurrent.CompletableFuture; + +/** + * The default {@link ItemTagsProvider} implementation clears the builders before calling {@link ItemTagsProvider#addTags(HolderLookup.Provider)}. + * We don't want that, so we override {@link ItemTagsProvider#addTags(HolderLookup.Provider)} to not do that. + */ +public abstract class NonClearingItemTagsProvider extends ItemTagsProvider { + // Store the provider here because while the superclass has it, it is private there. + private final CompletableFuture lookupProvider; + + /** + * See super constructor for information. + */ + public NonClearingItemTagsProvider(PackOutput output, CompletableFuture lookupProvider, CompletableFuture> blockTags) { + super(output, lookupProvider, blockTags); + this.lookupProvider = lookupProvider; + } + + /** + * See super constructor for information. + */ + @Deprecated + public NonClearingItemTagsProvider(PackOutput output, CompletableFuture lookupProvider, CompletableFuture> parentProvider, CompletableFuture> blockTags) { + super(output, lookupProvider, parentProvider, blockTags); + this.lookupProvider = lookupProvider; + } + + /** + * See super constructor for information. + */ + public NonClearingItemTagsProvider(PackOutput output, CompletableFuture lookupProvider, CompletableFuture> blockTags, String modId, @Nullable ExistingFileHelper existingFileHelper) { + super(output, lookupProvider, blockTags, modId, existingFileHelper); + this.lookupProvider = lookupProvider; + } + + /** + * See super constructor for information. + */ + public NonClearingItemTagsProvider(PackOutput output, CompletableFuture lookupProvider, CompletableFuture> parentProvider, CompletableFuture> blockTags, String modId, @Nullable ExistingFileHelper existingFileHelper) { + super(output, lookupProvider, parentProvider, blockTags, modId, existingFileHelper); + this.lookupProvider = lookupProvider; + } + + @Override + protected CompletableFuture createContentsProvider() { + return lookupProvider.thenApply(provider -> { + addTags(provider); + return provider; + }).thenCombine(blockTags, (provider, tagLookup) -> { + tagsToCopy.forEach((block, item) -> { + TagBuilder tagBuilder = getOrCreateRawBuilder(item); + tagLookup.apply(block).orElseThrow(() -> new IllegalStateException("Missing block tag " + item.location())).build().forEach(tagBuilder::add); + }); + return provider; + }); + } +} diff --git a/src/data/java/com/github/minecraftschurlimods/bibliocraft/datagen/BCDatagen.java b/src/data/java/com/github/minecraftschurlimods/bibliocraft/datagen/BCDatagen.java index 3c1ad3c3..8d5bc063 100644 --- a/src/data/java/com/github/minecraftschurlimods/bibliocraft/datagen/BCDatagen.java +++ b/src/data/java/com/github/minecraftschurlimods/bibliocraft/datagen/BCDatagen.java @@ -1,7 +1,7 @@ package com.github.minecraftschurlimods.bibliocraft.datagen; import com.github.minecraftschurlimods.bibliocraft.api.BibliocraftApi; -import com.github.minecraftschurlimods.bibliocraft.api.BibliocraftDatagenHelper; +import com.github.minecraftschurlimods.bibliocraft.api.datagen.BibliocraftDatagenHelper; import com.github.minecraftschurlimods.bibliocraft.datagen.assets.BCBlockStateProvider; import com.github.minecraftschurlimods.bibliocraft.datagen.assets.BCEnglishLanguageProvider; import com.github.minecraftschurlimods.bibliocraft.datagen.assets.BCItemModelProvider; @@ -29,11 +29,7 @@ private static void gatherData(GatherDataEvent event) { ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); CompletableFuture lookupProvider = event.getLookupProvider(); - BibliocraftDatagenHelper helper = BibliocraftApi.getDatagenHelper(); - helper.addWoodTypesToGenerateByModid("minecraft"); - helper.generateAll(BibliocraftApi.MOD_ID, event); - - generator.addProvider(event.includeClient(), new BCEnglishLanguageProvider(output)); + BCEnglishLanguageProvider language = generator.addProvider(event.includeClient(), new BCEnglishLanguageProvider(output)); generator.addProvider(event.includeClient(), new BCBlockStateProvider(output, existingFileHelper)); generator.addProvider(event.includeClient(), new BCItemModelProvider(output, existingFileHelper)); generator.addProvider(event.includeClient(), new BCSoundDefinitionsProvider(output, existingFileHelper)); @@ -41,6 +37,10 @@ private static void gatherData(GatherDataEvent event) { generator.addProvider(event.includeServer(), new BCLootTableProvider(output, lookupProvider)); generator.addProvider(event.includeServer(), new BCRecipeProvider(output, lookupProvider)); BCBlockTagsProvider blockTags = generator.addProvider(event.includeServer(), new BCBlockTagsProvider(output, lookupProvider, existingFileHelper)); - generator.addProvider(event.includeServer(), new BCItemTagsProvider(output, lookupProvider, blockTags.contentsGetter(), existingFileHelper)); + BCItemTagsProvider itemTags = generator.addProvider(event.includeServer(), new BCItemTagsProvider(output, lookupProvider, blockTags.contentsGetter(), existingFileHelper)); + + BibliocraftDatagenHelper helper = BibliocraftApi.getDatagenHelper(); + helper.addWoodTypesToGenerateByModid("minecraft"); + helper.generateAll(BibliocraftApi.MOD_ID, event, language, blockTags, itemTags); } } diff --git a/src/data/java/com/github/minecraftschurlimods/bibliocraft/datagen/assets/BCEnglishLanguageProvider.java b/src/data/java/com/github/minecraftschurlimods/bibliocraft/datagen/assets/BCEnglishLanguageProvider.java index 288f882c..bb307767 100644 --- a/src/data/java/com/github/minecraftschurlimods/bibliocraft/datagen/assets/BCEnglishLanguageProvider.java +++ b/src/data/java/com/github/minecraftschurlimods/bibliocraft/datagen/assets/BCEnglishLanguageProvider.java @@ -21,7 +21,6 @@ public BCEnglishLanguageProvider(PackOutput output) { @Override protected void addTranslations() { - BibliocraftApi.getDatagenHelper().generateEnglishTranslations(this); add(BCBlocks.CLEAR_FANCY_GOLD_LAMP.get(), "Fancy Gold Lamp"); add(BCBlocks.CLEAR_FANCY_IRON_LAMP.get(), "Fancy Iron Lamp"); add(BCBlocks.CLEAR_FANCY_GOLD_LANTERN.get(), "Fancy Gold Lantern"); diff --git a/src/data/java/com/github/minecraftschurlimods/bibliocraft/datagen/data/BCBlockTagsProvider.java b/src/data/java/com/github/minecraftschurlimods/bibliocraft/datagen/data/BCBlockTagsProvider.java index 16899c36..30d063df 100644 --- a/src/data/java/com/github/minecraftschurlimods/bibliocraft/datagen/data/BCBlockTagsProvider.java +++ b/src/data/java/com/github/minecraftschurlimods/bibliocraft/datagen/data/BCBlockTagsProvider.java @@ -1,18 +1,24 @@ package com.github.minecraftschurlimods.bibliocraft.datagen.data; import com.github.minecraftschurlimods.bibliocraft.api.BibliocraftApi; +import com.github.minecraftschurlimods.bibliocraft.api.datagen.NonClearingBlockTagsProvider; import com.github.minecraftschurlimods.bibliocraft.init.BCBlocks; import com.github.minecraftschurlimods.bibliocraft.init.BCTags; import com.github.minecraftschurlimods.bibliocraft.util.DatagenUtil; import net.minecraft.core.HolderLookup; +import net.minecraft.core.registries.Registries; import net.minecraft.data.PackOutput; +import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.BlockTags; +import net.minecraft.tags.TagBuilder; +import net.minecraft.tags.TagKey; import net.neoforged.neoforge.common.data.BlockTagsProvider; import net.neoforged.neoforge.common.data.ExistingFileHelper; +import java.util.Map; import java.util.concurrent.CompletableFuture; -public final class BCBlockTagsProvider extends BlockTagsProvider { +public final class BCBlockTagsProvider extends NonClearingBlockTagsProvider { public BCBlockTagsProvider(PackOutput output, CompletableFuture lookupProvider, ExistingFileHelper existingFileHelper) { super(output, lookupProvider, BibliocraftApi.MOD_ID, existingFileHelper); } diff --git a/src/data/java/com/github/minecraftschurlimods/bibliocraft/datagen/data/BCItemTagsProvider.java b/src/data/java/com/github/minecraftschurlimods/bibliocraft/datagen/data/BCItemTagsProvider.java index 12207d6c..a8c580d1 100644 --- a/src/data/java/com/github/minecraftschurlimods/bibliocraft/datagen/data/BCItemTagsProvider.java +++ b/src/data/java/com/github/minecraftschurlimods/bibliocraft/datagen/data/BCItemTagsProvider.java @@ -1,6 +1,7 @@ package com.github.minecraftschurlimods.bibliocraft.datagen.data; import com.github.minecraftschurlimods.bibliocraft.api.BibliocraftApi; +import com.github.minecraftschurlimods.bibliocraft.api.datagen.NonClearingItemTagsProvider; import com.github.minecraftschurlimods.bibliocraft.init.BCItems; import com.github.minecraftschurlimods.bibliocraft.init.BCTags; import net.minecraft.core.HolderLookup; @@ -15,7 +16,7 @@ import java.util.concurrent.CompletableFuture; -public final class BCItemTagsProvider extends ItemTagsProvider { +public final class BCItemTagsProvider extends NonClearingItemTagsProvider { public BCItemTagsProvider(PackOutput output, CompletableFuture lookupProvider, CompletableFuture> lookup, ExistingFileHelper existingFileHelper) { super(output, lookupProvider, lookup, BibliocraftApi.MOD_ID, existingFileHelper); } diff --git a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e b/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e deleted file mode 100644 index 9ce62f31..00000000 --- a/src/generated/resources/.cache/735031f3addf80804addae5e3f53249900116f1e +++ /dev/null @@ -1,2 +0,0 @@ -// 1.21.1 2024-10-08T15:03:43.8146922 Sound Definitions -e34bbd29e26f4ac4e3c41786f3c4a661d0dc7fe3 assets/bibliocraft/sounds.json diff --git a/src/main/java/com/github/minecraftschurlimods/bibliocraft/apiimpl/BibliocraftDatagenHelperImpl.java b/src/main/java/com/github/minecraftschurlimods/bibliocraft/apiimpl/BibliocraftDatagenHelperImpl.java index 7818dbbc..00728464 100644 --- a/src/main/java/com/github/minecraftschurlimods/bibliocraft/apiimpl/BibliocraftDatagenHelperImpl.java +++ b/src/main/java/com/github/minecraftschurlimods/bibliocraft/apiimpl/BibliocraftDatagenHelperImpl.java @@ -1,7 +1,7 @@ package com.github.minecraftschurlimods.bibliocraft.apiimpl; import com.github.minecraftschurlimods.bibliocraft.api.BibliocraftApi; -import com.github.minecraftschurlimods.bibliocraft.api.BibliocraftDatagenHelper; +import com.github.minecraftschurlimods.bibliocraft.api.datagen.BibliocraftDatagenHelper; import com.github.minecraftschurlimods.bibliocraft.api.woodtype.BibliocraftWoodType; import com.github.minecraftschurlimods.bibliocraft.client.model.TableModel; import com.github.minecraftschurlimods.bibliocraft.content.seat.SeatBackBlock; @@ -87,16 +87,17 @@ public List getWoodTypesToGenerate() { } @Override - public void generateAllFor(BibliocraftWoodType woodType, String modId, GatherDataEvent event) { + public void generateAllFor(BibliocraftWoodType woodType, String modId, GatherDataEvent event, LanguageProvider englishLanguageProvider, BlockTagsProvider blockTagsProvider, ItemTagsProvider itemTagsProvider) { DataGenerator generator = event.getGenerator(); PackOutput output = generator.getPackOutput(); ExistingFileHelper existingFileHelper = event.getExistingFileHelper(); CompletableFuture lookupProvider = event.getLookupProvider(); + generateEnglishTranslationsFor(englishLanguageProvider, woodType); generator.addProvider(event.includeClient(), new BlockStateProvider(output, BibliocraftApi.MOD_ID, existingFileHelper) { @Override protected void registerStatesAndModels() { - BibliocraftApi.getDatagenHelper().generateBlockStates(this); + generateBlockStatesFor(this, woodType); } @Override @@ -107,7 +108,7 @@ public String getName() { generator.addProvider(event.includeClient(), new ItemModelProvider(output, BibliocraftApi.MOD_ID, existingFileHelper) { @Override protected void registerModels() { - BibliocraftApi.getDatagenHelper().generateItemModels(this); + generateItemModelsFor(this, woodType); } @Override @@ -120,7 +121,7 @@ public String getName() { @Override protected void generate() { - BibliocraftApi.getDatagenHelper().generateLootTables(this::add); + generateLootTablesFor(this::add, woodType); } @Override @@ -142,29 +143,7 @@ public String getName() { generator.addProvider(event.includeServer(), new RecipeProvider(output, lookupProvider) { @Override protected void buildRecipes(RecipeOutput output) { - BibliocraftApi.getDatagenHelper().generateRecipes(output, modId); - } - - @Override - public String getName() { - return super.getName() + " (Bibliocraft datagen helper for wood type " + woodType.id() + ")"; - } - }); - var blockTags = generator.addProvider(event.includeServer(), new BlockTagsProvider(output, lookupProvider, modId, existingFileHelper) { - @Override - protected void addTags(HolderLookup.Provider provider) { - BibliocraftApi.getDatagenHelper().generateBlockTags(this::tag); - } - - @Override - public String getName() { - return super.getName() + " (Bibliocraft datagen helper for wood type " + woodType.id() + ")"; - } - }); - generator.addProvider(event.includeServer(), new ItemTagsProvider(output, lookupProvider, blockTags.contentsGetter(), modId, existingFileHelper) { - @Override - protected void addTags(HolderLookup.Provider provider) { - BibliocraftApi.getDatagenHelper().generateItemTags(this::tag); + generateRecipesFor(output, woodType, modId); } @Override @@ -172,6 +151,8 @@ public String getName() { return super.getName() + " (Bibliocraft datagen helper for wood type " + woodType.id() + ")"; } }); + generateBlockTagsFor(blockTagsProvider::tag, woodType); + generateItemTagsFor(itemTagsProvider::tag, woodType); } @Override diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg index d987c032..f124080a 100644 --- a/src/main/resources/META-INF/accesstransformer.cfg +++ b/src/main/resources/META-INF/accesstransformer.cfg @@ -1,3 +1,6 @@ +public net.minecraft.data.tags.IntrinsicHolderTagsProvider tag(Lnet/minecraft/tags/TagKey;)Lnet/minecraft/data/tags/IntrinsicHolderTagsProvider$IntrinsicTagAppender; +public net.minecraft.data.tags.ItemTagsProvider blockTags +public net.minecraft.data.tags.ItemTagsProvider tagsToCopy public net.minecraft.world.level.block.entity.BaseContainerBlockEntity lockKey public net.minecraft.world.level.block.entity.BeaconBlockEntity lockKey public-f net.minecraft.data.loot.LootTableProvider getName()Ljava/lang/String; diff --git a/src/main/resources/META-INF/services/com.github.minecraftschurlimods.bibliocraft.api.BibliocraftDatagenHelper b/src/main/resources/META-INF/services/com.github.minecraftschurlimods.bibliocraft.api.datagen.BibliocraftDatagenHelper similarity index 100% rename from src/main/resources/META-INF/services/com.github.minecraftschurlimods.bibliocraft.api.BibliocraftDatagenHelper rename to src/main/resources/META-INF/services/com.github.minecraftschurlimods.bibliocraft.api.datagen.BibliocraftDatagenHelper diff --git a/src/test/java/com/github/minecraftschurlimods/bibliocraft/test/BibliocraftApiTest.java b/src/test/java/com/github/minecraftschurlimods/bibliocraft/test/BibliocraftApiTest.java index 61ab6c15..f4ebea45 100644 --- a/src/test/java/com/github/minecraftschurlimods/bibliocraft/test/BibliocraftApiTest.java +++ b/src/test/java/com/github/minecraftschurlimods/bibliocraft/test/BibliocraftApiTest.java @@ -1,7 +1,7 @@ package com.github.minecraftschurlimods.bibliocraft.test; import com.github.minecraftschurlimods.bibliocraft.api.BibliocraftApi; -import com.github.minecraftschurlimods.bibliocraft.api.BibliocraftDatagenHelper; +import com.github.minecraftschurlimods.bibliocraft.api.datagen.BibliocraftDatagenHelper; import com.github.minecraftschurlimods.bibliocraft.api.woodtype.BibliocraftWoodTypeRegistry; import com.github.minecraftschurlimods.bibliocraft.apiimpl.BibliocraftDatagenHelperImpl; import com.github.minecraftschurlimods.bibliocraft.apiimpl.BibliocraftWoodTypeRegistryImpl;