diff --git a/src/main/java/dev/micle/totemofreviving/data/DataGenerators.java b/src/main/java/dev/micle/totemofreviving/data/DataGenerators.java index 1d7607a..0117288 100644 --- a/src/main/java/dev/micle/totemofreviving/data/DataGenerators.java +++ b/src/main/java/dev/micle/totemofreviving/data/DataGenerators.java @@ -1,14 +1,13 @@ package dev.micle.totemofreviving.data; -import dev.micle.totemofreviving.TotemOfReviving; import dev.micle.totemofreviving.data.client.ModItemModelProvider; import net.minecraft.data.DataGenerator; -import net.minecraftforge.common.data.ExistingFileHelper; -import net.minecraftforge.data.event.GatherDataEvent; -import net.minecraftforge.eventbus.api.SubscribeEvent; -import net.minecraftforge.fml.common.Mod; +import net.neoforged.bus.api.SubscribeEvent; +import net.neoforged.fml.common.EventBusSubscriber; +import net.neoforged.neoforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.data.event.GatherDataEvent; -@Mod.EventBusSubscriber(modid = TotemOfReviving.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) +@EventBusSubscriber public class DataGenerators { @SubscribeEvent public static void gatherData(GatherDataEvent event) { @@ -17,6 +16,6 @@ public class DataGenerators { generator.addProvider(event.includeServer(), new ModItemModelProvider(generator, existingFileHelper)); - generator.addProvider(event.includeServer(), new ModRecipeProvider(generator)); + generator.addProvider(event.includeServer(), new ModRecipeProvider(generator.getPackOutput(), event.getLookupProvider())); } } diff --git a/src/main/java/dev/micle/totemofreviving/data/ModRecipeProvider.java b/src/main/java/dev/micle/totemofreviving/data/ModRecipeProvider.java index 7596f8f..a41de69 100644 --- a/src/main/java/dev/micle/totemofreviving/data/ModRecipeProvider.java +++ b/src/main/java/dev/micle/totemofreviving/data/ModRecipeProvider.java @@ -1,24 +1,26 @@ package dev.micle.totemofreviving.data; import dev.micle.totemofreviving.setup.ModItems; +import net.minecraft.core.HolderLookup; import net.minecraft.data.DataGenerator; -import net.minecraft.data.recipes.FinishedRecipe; +import net.minecraft.data.PackOutput; import net.minecraft.data.recipes.RecipeCategory; +import net.minecraft.data.recipes.RecipeOutput; import net.minecraft.data.recipes.RecipeProvider; import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.world.item.Items; import javax.annotation.ParametersAreNonnullByDefault; -import java.util.function.Consumer; +import java.util.concurrent.CompletableFuture; public class ModRecipeProvider extends RecipeProvider { - public ModRecipeProvider(DataGenerator generator) { - super(generator.getPackOutput()); + public ModRecipeProvider(PackOutput packOutput, CompletableFuture registries) { + super(packOutput, registries); } - @Override @ParametersAreNonnullByDefault - protected void buildRecipes(Consumer consumer) { + @Override + protected void buildRecipes(RecipeOutput consumer) { ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, ModItems.STRAW_TOTEM.get()) .define('W', Items.WHEAT) .define('|', Items.STICK) diff --git a/src/main/java/dev/micle/totemofreviving/data/client/ModItemModelProvider.java b/src/main/java/dev/micle/totemofreviving/data/client/ModItemModelProvider.java index e0f0c86..14710e2 100644 --- a/src/main/java/dev/micle/totemofreviving/data/client/ModItemModelProvider.java +++ b/src/main/java/dev/micle/totemofreviving/data/client/ModItemModelProvider.java @@ -10,10 +10,10 @@ import dev.micle.totemofreviving.item.totem.IronTotemItem; import dev.micle.totemofreviving.item.totem.NetheriteTotemItem; import dev.micle.totemofreviving.item.totem.StrawTotemItem; import net.minecraft.data.DataGenerator; -import net.minecraftforge.client.model.generators.ItemModelBuilder; -import net.minecraftforge.client.model.generators.ItemModelProvider; -import net.minecraftforge.client.model.generators.ModelFile; -import net.minecraftforge.common.data.ExistingFileHelper; +import net.neoforged.neoforge.client.model.generators.ItemModelBuilder; +import net.neoforged.neoforge.client.model.generators.ItemModelProvider; +import net.neoforged.neoforge.client.model.generators.ModelFile; +import net.neoforged.neoforge.common.data.ExistingFileHelper; public class ModItemModelProvider extends ItemModelProvider { public ModItemModelProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) {