diff --git a/gradle.properties b/gradle.properties
index e34d6965..575678b4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,9 +5,9 @@ junit_version=5.10.0-M1
 mixinextras_version=0.3.2
 
 mod_id=modernfix
-minecraft_version=24w45a
-enabled_platforms=fabric
-forge_version=21.3.1-beta
+minecraft_version=1.21.4
+enabled_platforms=fabric,neoforge
+forge_version=21.4.0-beta
 parchment_version=2024.07.07
 parchment_mc_version=1.21
 refined_storage_version=4392788
@@ -16,10 +16,10 @@ rei_version=13.0.678
 ctm_version=1.21-1.2.0+2
 kubejs_version=1902.6.0-build.142
 rhino_version=1902.2.2-build.268
-supported_minecraft_versions=1.21.1
+supported_minecraft_versions=1.21.4
 
-fabric_loader_version=0.16.7
-fabric_api_version=0.106.1+1.21.3
+fabric_loader_version=0.16.9
+fabric_api_version=0.111.0+1.21.4
 
 continuity_version=3.0.0-beta.4+1.20.2
 
diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/datagen/RuntimeDatagen.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/datagen/RuntimeDatagen.java
index e93afa5c..aa761027 100644
--- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/datagen/RuntimeDatagen.java
+++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/datagen/RuntimeDatagen.java
@@ -56,7 +56,7 @@ public class RuntimeDatagen {
         Path path = Paths.get(RESOURCES_OUT_DIR);
         CompletableFuture<HolderLookup.Provider> lookupProvider = CompletableFuture.supplyAsync(VanillaRegistries::createLookup, Util.backgroundExecutor());
         GatherDataEvent.DataGeneratorConfig dataGeneratorConfig = new GatherDataEvent.DataGeneratorConfig(mods, path, Collections.emptyList(),
-                lookupProvider, true, true, true, true, true, mods.isEmpty() || IS_FLAT);
+                lookupProvider, true, true, true, true, null);
         if (!mods.contains("forge")) {
             //If we aren't generating data for forge, automatically add forge as an existing so mods can access forge's data
             existingMods.add("forge");
@@ -67,7 +67,8 @@ public class RuntimeDatagen {
         List<PackResources> oldPacks = new ArrayList<>(manager.listPacks().collect(Collectors.toList()));
         oldPacks.add(Minecraft.getInstance().getVanillaPackResources());
         ObfuscationReflectionHelper.setPrivateValue(ExistingFileHelper.class, existingFileHelper, new MultiPackResourceManager(PackType.CLIENT_RESOURCES, oldPacks), "clientResources");
-        ModLoader.runEventGenerator(mc->new GatherDataEvent(mc, dataGeneratorConfig.makeGenerator(p->dataGeneratorConfig.isFlat() ? p : p.resolve(mc.getModId()), dataGeneratorConfig.getMods().contains(mc.getModId())), dataGeneratorConfig, existingFileHelper));
+        ModLoader.runEventGenerator(mc->new GatherDataEvent.Client(mc, dataGeneratorConfig.makeGenerator(p->dataGeneratorConfig.isFlat() ? p : p.resolve(mc.getModId()), dataGeneratorConfig.getMods().contains(mc.getModId())), dataGeneratorConfig, existingFileHelper));
+        ModLoader.runEventGenerator(mc->new GatherDataEvent.Server(mc, dataGeneratorConfig.makeGenerator(p->dataGeneratorConfig.isFlat() ? p : p.resolve(mc.getModId()), dataGeneratorConfig.getMods().contains(mc.getModId())), dataGeneratorConfig, existingFileHelper));
         dataGeneratorConfig.runAll();
         ObfuscationReflectionHelper.setPrivateValue(DatagenModLoader.class, null, false, "runningDataGen");
         ModernFix.LOGGER.info("Finished runtime datagen.");
diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java
index c8c3b16d..acca3e95 100644
--- a/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java
+++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java
@@ -1,25 +1,14 @@
 package org.embeddedt.modernfix.neoforge.mixin.perf.dynamic_resources;
 
-import com.google.common.base.Stopwatch;
-import net.minecraft.client.resources.model.BakedModel;
-import net.minecraft.client.resources.model.ModelResourceLocation;
 import net.neoforged.bus.api.Event;
-import net.neoforged.fml.ModContainer;
-import net.neoforged.fml.ModList;
 import net.neoforged.fml.ModLoader;
-import net.neoforged.fml.util.ObfuscationReflectionHelper;
 import net.neoforged.neoforge.client.ClientHooks;
 import net.neoforged.neoforge.client.event.ModelEvent;
 import org.embeddedt.modernfix.ModernFix;
-import org.embeddedt.modernfix.neoforge.dynresources.ModelBakeEventHelper;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-import java.lang.reflect.Method;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
 @Mixin(ClientHooks.class)
 public class ForgeHooksClientMixin {
     /**
@@ -30,6 +19,7 @@ public class ForgeHooksClientMixin {
         if(ModLoader.hasErrors())
             return;
         ModelEvent.ModifyBakingResult bakeEvent = ((ModelEvent.ModifyBakingResult)event);
+        /*
         ModelBakeEventHelper helper = new ModelBakeEventHelper(bakeEvent.getModels());
         Method acceptEv = ObfuscationReflectionHelper.findMethod(ModContainer.class, "acceptEvent", Event.class);
         ModList.get().forEachModContainer((id, mc) -> {
@@ -46,5 +36,7 @@ public class ForgeHooksClientMixin {
                 ModernFix.LOGGER.warn("Mod '{}' took {} in the model bake event", id, timer);
             }
         });
+         */
+        ModernFix.LOGGER.warn("ModifyBakingResult support not reimplemented yet");
     }
 }