Ported datagens.

This commit is contained in:
2026-01-09 01:01:53 +01:00
parent 2bfe6b72e5
commit 2f1a9793a3
3 changed files with 18 additions and 17 deletions

View File

@ -1,14 +1,13 @@
package dev.micle.totemofreviving.data; package dev.micle.totemofreviving.data;
import dev.micle.totemofreviving.TotemOfReviving;
import dev.micle.totemofreviving.data.client.ModItemModelProvider; import dev.micle.totemofreviving.data.client.ModItemModelProvider;
import net.minecraft.data.DataGenerator; import net.minecraft.data.DataGenerator;
import net.minecraftforge.common.data.ExistingFileHelper; import net.neoforged.bus.api.SubscribeEvent;
import net.minecraftforge.data.event.GatherDataEvent; import net.neoforged.fml.common.EventBusSubscriber;
import net.minecraftforge.eventbus.api.SubscribeEvent; import net.neoforged.neoforge.common.data.ExistingFileHelper;
import net.minecraftforge.fml.common.Mod; import net.neoforged.neoforge.data.event.GatherDataEvent;
@Mod.EventBusSubscriber(modid = TotemOfReviving.MOD_ID, bus = Mod.EventBusSubscriber.Bus.MOD) @EventBusSubscriber
public class DataGenerators { public class DataGenerators {
@SubscribeEvent @SubscribeEvent
public static void gatherData(GatherDataEvent event) { 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 ModItemModelProvider(generator, existingFileHelper));
generator.addProvider(event.includeServer(), new ModRecipeProvider(generator)); generator.addProvider(event.includeServer(), new ModRecipeProvider(generator.getPackOutput(), event.getLookupProvider()));
} }
} }

View File

@ -1,24 +1,26 @@
package dev.micle.totemofreviving.data; package dev.micle.totemofreviving.data;
import dev.micle.totemofreviving.setup.ModItems; import dev.micle.totemofreviving.setup.ModItems;
import net.minecraft.core.HolderLookup;
import net.minecraft.data.DataGenerator; 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.RecipeCategory;
import net.minecraft.data.recipes.RecipeOutput;
import net.minecraft.data.recipes.RecipeProvider; import net.minecraft.data.recipes.RecipeProvider;
import net.minecraft.data.recipes.ShapedRecipeBuilder; import net.minecraft.data.recipes.ShapedRecipeBuilder;
import net.minecraft.world.item.Items; import net.minecraft.world.item.Items;
import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.ParametersAreNonnullByDefault;
import java.util.function.Consumer; import java.util.concurrent.CompletableFuture;
public class ModRecipeProvider extends RecipeProvider { public class ModRecipeProvider extends RecipeProvider {
public ModRecipeProvider(DataGenerator generator) { public ModRecipeProvider(PackOutput packOutput, CompletableFuture<HolderLookup.Provider> registries) {
super(generator.getPackOutput()); super(packOutput, registries);
} }
@Override
@ParametersAreNonnullByDefault @ParametersAreNonnullByDefault
protected void buildRecipes(Consumer<FinishedRecipe> consumer) { @Override
protected void buildRecipes(RecipeOutput consumer) {
ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, ModItems.STRAW_TOTEM.get()) ShapedRecipeBuilder.shaped(RecipeCategory.TOOLS, ModItems.STRAW_TOTEM.get())
.define('W', Items.WHEAT) .define('W', Items.WHEAT)
.define('|', Items.STICK) .define('|', Items.STICK)

View File

@ -10,10 +10,10 @@ import dev.micle.totemofreviving.item.totem.IronTotemItem;
import dev.micle.totemofreviving.item.totem.NetheriteTotemItem; import dev.micle.totemofreviving.item.totem.NetheriteTotemItem;
import dev.micle.totemofreviving.item.totem.StrawTotemItem; import dev.micle.totemofreviving.item.totem.StrawTotemItem;
import net.minecraft.data.DataGenerator; import net.minecraft.data.DataGenerator;
import net.minecraftforge.client.model.generators.ItemModelBuilder; import net.neoforged.neoforge.client.model.generators.ItemModelBuilder;
import net.minecraftforge.client.model.generators.ItemModelProvider; import net.neoforged.neoforge.client.model.generators.ItemModelProvider;
import net.minecraftforge.client.model.generators.ModelFile; import net.neoforged.neoforge.client.model.generators.ModelFile;
import net.minecraftforge.common.data.ExistingFileHelper; import net.neoforged.neoforge.common.data.ExistingFileHelper;
public class ModItemModelProvider extends ItemModelProvider { public class ModItemModelProvider extends ItemModelProvider {
public ModItemModelProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) { public ModItemModelProvider(DataGenerator generator, ExistingFileHelper existingFileHelper) {