[U] Upgrade to 1.21.4.

Signed-off-by: 秋雨落 <[email protected]>

Author: qyl27

build.gradle

@@ -1,7 +1,7 @@
 plugins {
     id 'java-library'
     id 'maven-publish'
-    id 'net.neoforged.moddev' version '2.0.75'
+    id 'net.neoforged.moddev' version '2.0.78'
     id 'idea'
 }
 
@@ -34,7 +34,7 @@ neoForge {
 
     runs {
         data {
-            data()
+            serverData()
             logLevel = org.slf4j.event.Level.INFO
             programArguments.addAll '--mod', project.mod_id, '--all', '--output', file('output').getAbsolutePath(), '--existing', file('src/main/resources/').getAbsolutePath()
         }

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.02.16
 # 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.58
+neo_version=21.4.97-beta
 # The Neo version range can use any version of Neo as bounds
-neo_version_range=[21.3.58,)
+neo_version_range=[21.4,)
 # The loader version range can only use the major version of FML as bounds
 loader_version_range=[1,)
 

src/main/java/cx/rain/mc/toast/generator/data/ModData.java

@@ -16,16 +16,15 @@
 @EventBusSubscriber(modid = ToastGenerator.MODID, bus = EventBusSubscriber.Bus.MOD)
 public class ModData {
     @SubscribeEvent
-    public static void onData(GatherDataEvent event) {
+    public static void onData(GatherDataEvent.Server event) {
         var registries = event.getLookupProvider();
         var generator = event.getGenerator();
         var output = generator.getPackOutput();
-        var exHelper = event.getExistingFileHelper();
 
-        event.addProvider(true, new PackMetadataGenerator(output).add(PackMetadataSection.TYPE, new PackMetadataSection(Component.literal("The data-pack for Catopia"), DetectedVersion.BUILT_IN.getPackVersion(PackType.SERVER_DATA))));
-        event.addProvider(true, new ModAdvancementProvider(output, registries, exHelper));
-        event.addProvider(true, new ModRecipeProvider.Runner(output, registries));
-        var blockTags = event.addProvider(true, new ModBlockTagsProvider(output, registries, ToastGenerator.MODID, exHelper));
-        event.addProvider(true, new ModItemTagsProvider(output, registries, blockTags.contentsGetter(), ToastGenerator.MODID, exHelper));
+        event.addProvider(new PackMetadataGenerator(output).add(PackMetadataSection.TYPE, new PackMetadataSection(Component.literal("The data-pack for Catopia"), DetectedVersion.BUILT_IN.getPackVersion(PackType.SERVER_DATA))));
+        event.addProvider(new ModAdvancementProvider(output, registries));
+        event.addProvider(new ModRecipeProvider.Runner(output, registries));
+        var blockTags = event.addProvider(new ModBlockTagsProvider(output, registries, ToastGenerator.MODID));
+        event.addProvider(new ModItemTagsProvider(output, registries, blockTags.contentsGetter(), ToastGenerator.MODID));
     }
 }

src/main/java/cx/rain/mc/toast/generator/data/advancement/MemeAdvancements.java

@@ -6,11 +6,10 @@
 import net.minecraft.advancements.critereon.*;
 import net.minecraft.core.HolderLookup;
 import net.minecraft.core.registries.Registries;
+import net.minecraft.data.advancements.AdvancementSubProvider;
 import net.minecraft.world.entity.EntityType;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Blocks;
-import net.neoforged.neoforge.common.data.AdvancementProvider;
-import net.neoforged.neoforge.common.data.ExistingFileHelper;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Consumer;
@@ -19,11 +18,10 @@
 import static net.minecraft.advancements.Advancement.Builder.advancement;
 import static net.minecraft.network.chat.Component.literal;
 
-public class MemeAdvancements implements AdvancementProvider.AdvancementGenerator {
+public class MemeAdvancements implements AdvancementSubProvider {
 
     @Override
-    public void generate(HolderLookup.@NotNull Provider registries, @NotNull Consumer<AdvancementHolder> saver,
-                         @NotNull ExistingFileHelper existingFileHelper) {
+    public void generate(HolderLookup.@NotNull Provider registries, @NotNull Consumer<AdvancementHolder> saver) {
         var entityHolderGetter = registries.lookupOrThrow(Registries.ENTITY_TYPE);
         var itemHolderGetter = registries.lookupOrThrow(Registries.ITEM);
 
@@ -76,7 +74,6 @@ private static Criterion<UsingItemTrigger.TriggerInstance> lookEntityViaItem(Ent
                 EntityPredicate.Builder.entity()
                         .subPredicate(PlayerPredicate.Builder.player()
                                 .setLookingAt(entity)
-                                .build()),
-                item);
+                                .build()), item);
     }
 }

src/main/java/cx/rain/mc/toast/generator/data/advancement/ModAdvancementProvider.java

@@ -2,15 +2,13 @@
 
 import net.minecraft.core.HolderLookup;
 import net.minecraft.data.PackOutput;
-import net.neoforged.neoforge.common.data.AdvancementProvider;
-import net.neoforged.neoforge.common.data.ExistingFileHelper;
+import net.minecraft.data.advancements.AdvancementProvider;
 
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 
 public class ModAdvancementProvider extends AdvancementProvider {
-    public ModAdvancementProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries,
-                                  ExistingFileHelper existingFileHelper) {
-        super(output, registries, existingFileHelper, List.of(new MemeAdvancements()));
+    public ModAdvancementProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> registries) {
+        super(output, registries, List.of(new MemeAdvancements()));
     }
 }

src/main/java/cx/rain/mc/toast/generator/data/tag/ModBlockTagsProvider.java

@@ -3,17 +3,15 @@
 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.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.concurrent.CompletableFuture;
 
 public class ModBlockTagsProvider extends BlockTagsProvider {
 
     public ModBlockTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider,
-                                String modId, @Nullable ExistingFileHelper existingFileHelper) {
-        super(output, lookupProvider, modId, existingFileHelper);
+                                String modId) {
+        super(output, lookupProvider, modId);
     }
 
     @Override

src/main/java/cx/rain/mc/toast/generator/data/tag/ModItemTagsProvider.java

@@ -5,17 +5,14 @@
 import net.minecraft.data.tags.ItemTagsProvider;
 import net.minecraft.world.item.Items;
 import net.minecraft.world.level.block.Block;
-import net.neoforged.neoforge.common.Tags;
-import net.neoforged.neoforge.common.data.ExistingFileHelper;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
 
 import java.util.concurrent.CompletableFuture;
 
 public class ModItemTagsProvider extends ItemTagsProvider {
 
-    public ModItemTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, CompletableFuture<TagLookup<Block>> blockTags, String modId, @Nullable ExistingFileHelper existingFileHelper) {
-        super(output, lookupProvider, blockTags, modId, existingFileHelper);
+    public ModItemTagsProvider(PackOutput output, CompletableFuture<HolderLookup.Provider> lookupProvider, CompletableFuture<TagLookup<Block>> blockTags, String modId) {
+        super(output, lookupProvider, blockTags, modId);
     }
 
     @Override