Port to 1.21.4

build.gradle

@@ -65,7 +65,8 @@ neoForge {
         }
 
         data {
-            data()
+            //data()
+            clientData() // Update run type from `data` to `clientData`
 
             // example of overriding the workingDirectory set in configureEach above, uncomment if you want to use it
             // gameDirectory = project.file('run-data')

gradle.properties

@@ -7,20 +7,20 @@ org.gradle.configuration-cache=true
 
 #read more on this at https://github.com/neoforged/ModDevGradle?tab=readme-ov-file#better-minecraft-parameter-names--javadoc-parchment
 # you can also find the latest versions at: https://parchmentmc.org/docs/getting-started
-parchment_minecraft_version=1.21.3
-parchment_mappings_version=2024.12.07
+parchment_minecraft_version=1.21.4
+parchment_mappings_version=2025.01.19
 # Environment Properties
 # You can find the latest versions here: https://projects.neoforged.net/neoforged/neoforge
 # The Minecraft version must agree with the Neo version to get a valid artifact
-minecraft_version=1.21.3
+minecraft_version=1.21.4
 # The Minecraft version range can use any release version of Minecraft as bounds.
 # Snapshots, pre-releases, and release candidates are not guaranteed to sort properly
 # as they do not follow standard versioning conventions.
-minecraft_version_range=[1.21.3]
+minecraft_version_range=[1.21.4]
 # The Neo version must agree with the Minecraft version to get a valid artifact
-neo_version=21.3.63
+neo_version=21.4.89-beta
 # The Neo version range can use any version of Neo as bounds
-neo_version_range=[21.3.63,)
+neo_version_range=[21.4.89-beta,)
 # The loader version range can only use the major version of FML as bounds
 loader_version_range=[1,)
 
@@ -34,7 +34,7 @@ mod_name=Infinity Ores
 # The license of the mod. Review your options at https://choosealicense.com/. All Rights Reserved is the default.
 mod_license=MIT
 # The mod version. See https://semver.org/
-mod_version=1.21.3-1.0.1
+mod_version=1.21.4-1.0.1
 # The group ID for the mod. It is only important when publishing as an artifact to a Maven repository.
 # This should match the base package used for the mod sources.
 # See https://maven.apache.org/guides/mini/guide-naming-conventions.html

src/generated/resources/assets/infinityores/items/ancient_debris.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "infinityores:block/ancient_debris"
+  }
+}

src/generated/resources/assets/infinityores/items/budding_amethyst.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "infinityores:block/budding_amethyst"
+  }
+}

src/generated/resources/assets/infinityores/items/coal_ore.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "infinityores:block/coal_ore"
+  }
+}

src/generated/resources/assets/infinityores/items/copper_ore.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "infinityores:block/copper_ore"
+  }
+}

src/generated/resources/assets/infinityores/items/diamond_ore.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "infinityores:block/diamond_ore"
+  }
+}

src/generated/resources/assets/infinityores/items/emerald_ore.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "infinityores:block/emerald_ore"
+  }
+}

src/generated/resources/assets/infinityores/items/glowstone.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "infinityores:block/glowstone"
+  }
+}

src/generated/resources/assets/infinityores/items/gold_ore.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "infinityores:block/gold_ore"
+  }
+}

src/generated/resources/assets/infinityores/items/iron_ore.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "infinityores:block/iron_ore"
+  }
+}

src/generated/resources/assets/infinityores/items/lapis_ore.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "infinityores:block/lapis_ore"
+  }
+}

src/generated/resources/assets/infinityores/items/nether_quartz_ore.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "infinityores:block/nether_quartz_ore"
+  }
+}

src/generated/resources/assets/infinityores/items/redstone_ore.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "infinityores:block/redstone_ore"
+  }
+}

src/generated/resources/assets/infinityores/items/tool.json

@@ -0,0 +1,6 @@
+{
+  "model": {
+    "type": "minecraft:model",
+    "model": "infinityores:item/tool"
+  }
+}

src/main/java/com/sherman/datagen/ModDataGen.java

@@ -1,7 +1,6 @@
 package com.sherman.datagen;
 
-import com.sherman.datagen.client.ModBlockStateProvider;
-import com.sherman.datagen.client.ModItemModelProvider;
+import com.sherman.datagen.client.ModModelProvider;
 import com.sherman.datagen.client.ModLanguageProvider;
 import com.sherman.datagen.server.ModBlockLootSubProvider;
 import com.sherman.datagen.server.ModBlockTagProvider;
@@ -13,7 +12,6 @@
 import net.minecraft.world.level.storage.loot.parameters.LootContextParamSets;
 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;
 
 import java.util.List;
@@ -22,23 +20,20 @@
 
 @EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD)
 public class ModDataGen {
+
     @SubscribeEvent
-    public static void gatherData(GatherDataEvent event) {
+    public static void gatherData(GatherDataEvent.Client event) {
         DataGenerator generator = event.getGenerator();
         PackOutput packOutput = generator.getPackOutput();
         CompletableFuture<Provider> lookupProvider = event.getLookupProvider();
-        ExistingFileHelper helper = event.getExistingFileHelper();
 
-        if (event.includeServer()) {
-            generator.addProvider(true, new LootTableProvider(packOutput, Set.of(),
-                    List.of(new LootTableProvider.SubProviderEntry(ModBlockLootSubProvider::new, LootContextParamSets.BLOCK)), lookupProvider));
-            generator.addProvider(true, new ModRecipeProvider.Runner(packOutput, lookupProvider));
-            generator.addProvider(true, new ModBlockTagProvider(packOutput, lookupProvider, helper));
-        }
-        if (event.includeClient()) {
-            generator.addProvider(true, new ModLanguageProvider(packOutput));
-            generator.addProvider(true, new ModItemModelProvider(packOutput, helper));
-            generator.addProvider(true, new ModBlockStateProvider(packOutput, helper));
-        }
+        event.addProvider(new LootTableProvider(packOutput, Set.of(),
+                List.of(new LootTableProvider.SubProviderEntry(ModBlockLootSubProvider::new, LootContextParamSets.BLOCK)), lookupProvider));
+        event.addProvider(new ModRecipeProvider.Runner(packOutput, lookupProvider));
+        event.addProvider(new ModBlockTagProvider(packOutput, lookupProvider));
+
+        event.addProvider(new ModLanguageProvider(packOutput));
+        event.addProvider(new ModModelProvider(packOutput));
+
     }
 }

src/main/java/com/sherman/datagen/client/ModModelProvider.java

@@ -0,0 +1,35 @@
+package com.sherman.datagen.client;
+
+import com.sherman.registry.ModRegistry;
+import net.minecraft.client.data.models.BlockModelGenerators;
+import net.minecraft.client.data.models.ItemModelGenerators;
+import net.minecraft.client.data.models.ModelProvider;
+import net.minecraft.client.data.models.model.ModelTemplates;
+import net.minecraft.data.PackOutput;
+
+import static com.sherman.InfinityOres.MOD_ID;
+
+public class ModModelProvider extends ModelProvider {
+
+    public ModModelProvider(PackOutput output) {
+        super(output, MOD_ID);
+    }
+
+    @Override
+    protected void registerModels(BlockModelGenerators blockModels, ItemModelGenerators itemModels) {
+        blockModels.createTrivialCube(ModRegistry.ANCIENT_DEBRIS.get());
+        blockModels.createTrivialCube(ModRegistry.BUDDING_AMETHYST.get());
+        blockModels.createTrivialCube(ModRegistry.COAL_ORE.get());
+        blockModels.createTrivialCube(ModRegistry.COPPER_ORE.get());
+        blockModels.createTrivialCube(ModRegistry.DIAMOND_ORE.get());
+        blockModels.createTrivialCube(ModRegistry.EMERALD_ORE.get());
+        blockModels.createTrivialCube(ModRegistry.GOLD_ORE.get());
+        blockModels.createTrivialCube(ModRegistry.IRON_ORE.get());
+        blockModels.createTrivialCube(ModRegistry.GLOWSTONE.get());
+        blockModels.createTrivialCube(ModRegistry.LAPIS_ORE.get());
+        blockModels.createTrivialCube(ModRegistry.NETHER_QUARTZ_ORE.get());
+        blockModels.createTrivialCube(ModRegistry.REDSTONE_ORE.get());
+
+        itemModels.generateFlatItem(ModRegistry.TOOL.get(), ModelTemplates.FLAT_ITEM);
+    }
+}

src/main/java/com/sherman/datagen/server/ModBlockTagProvider.java

@@ -7,16 +7,14 @@
 import net.minecraft.data.PackOutput;
 import net.minecraft.tags.BlockTags;
 import net.neoforged.neoforge.common.data.BlockTagsProvider;
-import net.neoforged.neoforge.common.data.ExistingFileHelper;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.concurrent.CompletableFuture;
 
 public class ModBlockTagProvider extends BlockTagsProvider {
 
-    public ModBlockTagProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, @Nullable ExistingFileHelper existingFileHelper) {
-        super(output, lookupProvider, InfinityOres.MOD_ID, existingFileHelper);
+    public ModBlockTagProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider) {
+        super(output, lookupProvider, InfinityOres.MOD_ID);
     }
 
     @Override