Second rename pass, reaches main menu

embeddedt · Dec 4, 2023 · c6b38f3 · c6b38f3
1 parent 69a9aa7
commit c6b38f3
Show file tree

Hide file tree

Showing 52 changed files with 67 additions and 127 deletions.
diff --git a/...a/org/embeddedt/modernfix/common/mixin/perf/mojang_registry_size/MappedRegistryMixin.java b/...a/org/embeddedt/modernfix/common/mixin/perf/mojang_registry_size/MappedRegistryMixin.java
@@ -15,7 +15,8 @@ public class MappedRegistryMixin {
      */
     @Redirect(
             method = "registerMapping(ILnet/minecraft/resources/ResourceKey;Ljava/lang/Object;Lcom/mojang/serialization/Lifecycle;)Lnet/minecraft/core/Holder$Reference;",
-            at = @At(value = "INVOKE", target = "Lit/unimi/dsi/fastutil/objects/ObjectList;size(I)V", remap = false)
+            at = @At(value = "INVOKE", target = "Lit/unimi/dsi/fastutil/objects/ObjectList;size(I)V", remap = false),
+            require = 0
     )
     private void setSizeSmart(ObjectList<?> list, int size) {
         if(list instanceof ObjectArrayList && size > list.size()) {

diff --git a/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java b/common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java
@@ -61,7 +61,7 @@ private static boolean modPresent(String modId) {
     private static final String MIXIN_REQUIRES_MOD_DESC = Type.getDescriptor(RequiresMod.class);
     private static final String MIXIN_DEV_ONLY_DESC = Type.getDescriptor(IgnoreOutsideDev.class);
 
-    private static final Pattern PLATFORM_PREFIX = Pattern.compile("(forge|fabric|common)\\.");
+    private static final Pattern PLATFORM_PREFIX = Pattern.compile("(neoforge|fabric|common)\\.");
 
     public static String sanitize(String mixinClassName) {
         return PLATFORM_PREFIX.matcher(mixinClassName).replaceFirst("");
@@ -77,7 +77,7 @@ public Map<String, String> getPermanentlyDisabledMixins() {
     }
 
     private void scanForAndBuildMixinOptions() {
-        List<String> configFiles = ImmutableList.of("modernfix-common.mixins.json", "modernfix-fabric.mixins.json", "modernfix-forge.mixins.json");
+        List<String> configFiles = ImmutableList.of("modernfix-common.mixins.json", "modernfix-fabric.mixins.json", "modernfix-neoforge.mixins.json");
         List<String> mixinPaths = new ArrayList<>();
         for(String configFile : configFiles) {
             InputStream stream = ModernFixEarlyConfig.class.getClassLoader().getResourceAsStream(configFile);
@@ -175,7 +175,6 @@ public DefaultSettingMapBuilder put(String key, Boolean value) {
             .put("mixin.devenv", isDevEnv)
             .put("mixin.perf.remove_spawn_chunks", isDevEnv)
             .putConditionally(() -> !isFabric, "mixin.bugfix.fix_config_crashes", true)
-            .putConditionally(() -> !isFabric, "mixin.bugfix.forge_at_inject_error", true)
             .putConditionally(() -> !isFabric, "mixin.feature.registry_event_progress", false)
             .putConditionally(() -> isFabric, "mixin.perf.clear_fabric_mapping_tables", false)
             .build();

diff --git a/common/src/main/java/org/embeddedt/modernfix/platform/PlatformHookLoader.java b/common/src/main/java/org/embeddedt/modernfix/platform/PlatformHookLoader.java
@@ -4,7 +4,7 @@
 
 class PlatformHookLoader {
     static ModernFixPlatformHooks findInstance() {
-        String[] locations = new String[] { "forge", "fabric" };
+        String[] locations = new String[] { "neoforge", "fabric" };
         for(String location : locations) {
             try {
                 Class<?> clz = Class.forName("org.embeddedt.modernfix.platform." + location + ".ModernFixPlatformHooksImpl");

diff --git a/...modernfix/forge/mixin/bugfix/forge_vehicle_packets/ServerGamePacketListenerImplMixin.java b/...modernfix/forge/mixin/bugfix/forge_vehicle_packets/ServerGamePacketListenerImplMixin.java
diff --git a/...rg/embeddedt/modernfix/forge/mixin/bugfix/removed_dimensions/LevelStorageSourceMixin.java b/...rg/embeddedt/modernfix/forge/mixin/bugfix/removed_dimensions/LevelStorageSourceMixin.java
diff --git a/...dedt/modernfix/forge/ModernFixConfig.java → ...t/modernfix/neoforge/ModernFixConfig.java b/...dedt/modernfix/forge/ModernFixConfig.java → ...t/modernfix/neoforge/ModernFixConfig.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge;
+package org.embeddedt.modernfix.neoforge;
 
 import com.google.common.collect.ImmutableList;
 import net.minecraft.resources.ResourceLocation;

diff --git a/...fix/forge/classloading/ClassLoadHack.java → .../neoforge/classloading/ClassLoadHack.java b/...fix/forge/classloading/ClassLoadHack.java → .../neoforge/classloading/ClassLoadHack.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.classloading;
+package org.embeddedt.modernfix.neoforge.classloading;
 
 /**
  * Sometimes mods have classes that circularly reference each other. If each of these classes ends up being loaded

diff --git a/...sloading/ModFileScanDataDeduplicator.java → ...sloading/ModFileScanDataDeduplicator.java b/...sloading/ModFileScanDataDeduplicator.java → ...sloading/ModFileScanDataDeduplicator.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.classloading;
+package org.embeddedt.modernfix.neoforge.classloading;
 
 import com.google.common.collect.Interner;
 import com.google.common.collect.Interners;

diff --git a/...t/modernfix/forge/config/ConfigFixer.java → ...odernfix/neoforge/config/ConfigFixer.java b/...t/modernfix/forge/config/ConfigFixer.java → ...odernfix/neoforge/config/ConfigFixer.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.config;
+package org.embeddedt.modernfix.neoforge.config;
 
 import net.neoforged.fml.ModContainer;
 import net.neoforged.fml.ModList;

diff --git a/...ernfix/forge/config/NightConfigFixer.java → ...fix/neoforge/config/NightConfigFixer.java b/...ernfix/forge/config/NightConfigFixer.java → ...fix/neoforge/config/NightConfigFixer.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.config;
+package org.embeddedt.modernfix.neoforge.config;
 
 import com.electronwill.nightconfig.core.file.FileWatcher;
 import cpw.mods.modlauncher.api.LamdbaExceptionUtils;

diff --git a/...dernfix/forge/datagen/RuntimeDatagen.java → ...nfix/neoforge/datagen/RuntimeDatagen.java b/...dernfix/forge/datagen/RuntimeDatagen.java → ...nfix/neoforge/datagen/RuntimeDatagen.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.datagen;
+package org.embeddedt.modernfix.neoforge.datagen;
 
 import net.minecraft.Util;
 import net.minecraft.client.Minecraft;

diff --git a/...x/forge/dynresources/IModelBakerImpl.java → ...eoforge/dynresources/IModelBakerImpl.java b/...x/forge/dynresources/IModelBakerImpl.java → ...eoforge/dynresources/IModelBakerImpl.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.dynresources;
+package org.embeddedt.modernfix.neoforge.dynresources;
 
 public interface IModelBakerImpl {
     void mfix$ignoreCache();

diff --git a/...ge/dynresources/ModelBakeEventHelper.java → ...ge/dynresources/ModelBakeEventHelper.java b/...ge/dynresources/ModelBakeEventHelper.java → ...ge/dynresources/ModelBakeEventHelper.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.dynresources;
+package org.embeddedt.modernfix.neoforge.dynresources;
 
 import com.google.common.collect.ForwardingMap;
 import com.google.common.collect.ImmutableSet;

diff --git a/...nfix/forge/init/ModernFixClientForge.java → ...x/neoforge/init/ModernFixClientForge.java b/...nfix/forge/init/ModernFixClientForge.java → ...x/neoforge/init/ModernFixClientForge.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.init;
+package org.embeddedt.modernfix.neoforge.init;
 
 import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
@@ -25,7 +25,7 @@
 import net.neoforged.neoforge.event.level.LevelEvent;
 import net.neoforged.neoforge.event.server.ServerStartedEvent;
 import org.embeddedt.modernfix.ModernFixClient;
-import org.embeddedt.modernfix.forge.config.NightConfigFixer;
+import org.embeddedt.modernfix.neoforge.config.NightConfigFixer;
 import org.embeddedt.modernfix.screen.ModernFixConfigScreen;
 
 import java.util.ArrayList;

diff --git a/.../modernfix/forge/init/ModernFixForge.java → ...dernfix/neoforge/init/ModernFixForge.java b/.../modernfix/forge/init/ModernFixForge.java → ...dernfix/neoforge/init/ModernFixForge.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.init;
+package org.embeddedt.modernfix.neoforge.init;
 
 import com.google.common.collect.ImmutableList;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
@@ -26,12 +26,11 @@
 import org.embeddedt.modernfix.ModernFix;
 import org.embeddedt.modernfix.core.ModernFixMixinPlugin;
 import org.embeddedt.modernfix.entity.EntityDataIDSyncHandler;
-import org.embeddedt.modernfix.forge.ModernFixConfig;
-import org.embeddedt.modernfix.forge.classloading.ClassLoadHack;
-import org.embeddedt.modernfix.forge.classloading.ModFileScanDataDeduplicator;
-import org.embeddedt.modernfix.forge.config.ConfigFixer;
-import org.embeddedt.modernfix.forge.config.NightConfigFixer;
-import org.embeddedt.modernfix.forge.packet.PacketHandler;
+import org.embeddedt.modernfix.neoforge.ModernFixConfig;
+import org.embeddedt.modernfix.neoforge.classloading.ClassLoadHack;
+import org.embeddedt.modernfix.neoforge.classloading.ModFileScanDataDeduplicator;
+import org.embeddedt.modernfix.neoforge.config.NightConfigFixer;
+import org.embeddedt.modernfix.neoforge.packet.PacketHandler;
 
 import java.util.List;
 
@@ -52,7 +51,7 @@ public ModernFixForge() {
         PacketHandler.register();
         ModFileScanDataDeduplicator.deduplicate();
         ClassLoadHack.loadModClasses();
-        ConfigFixer.replaceConfigHandlers();
+        //ConfigFixer.replaceConfigHandlers();
     }
 
     @SubscribeEvent

diff --git a/.../forge/load/ModResourcePackPathFixer.java → ...oforge/load/ModResourcePackPathFixer.java b/.../forge/load/ModResourcePackPathFixer.java → ...oforge/load/ModResourcePackPathFixer.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.load;
+package org.embeddedt.modernfix.neoforge.load;
 
 import net.neoforged.fml.ModList;
 import net.neoforged.neoforgespi.language.IModFileInfo;

diff --git a/..._leak/ObjectModificationManagerMixin.java → ..._leak/ObjectModificationManagerMixin.java b/..._leak/ObjectModificationManagerMixin.java → ..._leak/ObjectModificationManagerMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.bugfix.blueprint_modif_memory_leak;
+package org.embeddedt.modernfix.neoforge.mixin.bugfix.blueprint_modif_memory_leak;
 
 import com.google.gson.Gson;
 import com.teamabnormals.blueprint.core.util.modification.ObjectModificationManager;

diff --git a/...fix/chunk_deadlock/ChunkMapLoadMixin.java → ...fix/chunk_deadlock/ChunkMapLoadMixin.java b/...fix/chunk_deadlock/ChunkMapLoadMixin.java → ...fix/chunk_deadlock/ChunkMapLoadMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.bugfix.chunk_deadlock;
+package org.embeddedt.modernfix.neoforge.mixin.bugfix.chunk_deadlock;
 
 import com.llamalad7.mixinextras.injector.wrapoperation.Operation;
 import com.llamalad7.mixinextras.injector.wrapoperation.WrapOperation;

diff --git a/...ServerChunkCache_CurrentLoadingMixin.java → ...ServerChunkCache_CurrentLoadingMixin.java b/...ServerChunkCache_CurrentLoadingMixin.java → ...ServerChunkCache_CurrentLoadingMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.bugfix.chunk_deadlock;
+package org.embeddedt.modernfix.neoforge.mixin.bugfix.chunk_deadlock;
 
 import net.minecraft.server.level.ChunkHolder;
 import net.minecraft.server.level.ServerChunkCache;

diff --git a/...fix/cofh_core_crash/FlagManagerMixin.java → ...fix/cofh_core_crash/FlagManagerMixin.java b/...fix/cofh_core_crash/FlagManagerMixin.java → ...fix/cofh_core_crash/FlagManagerMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.bugfix.cofh_core_crash;
+package org.embeddedt.modernfix.neoforge.mixin.bugfix.cofh_core_crash;
 
 import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap;
 import org.embeddedt.modernfix.annotation.RequiresMod;

diff --git a/...m_resourceutil_cme/ResourceUtilMixin.java → ...m_resourceutil_cme/ResourceUtilMixin.java b/...m_resourceutil_cme/ResourceUtilMixin.java → ...m_resourceutil_cme/ResourceUtilMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.bugfix.ctm_resourceutil_cme;
+package org.embeddedt.modernfix.neoforge.mixin.bugfix.ctm_resourceutil_cme;
 
 import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
 import org.embeddedt.modernfix.annotation.RequiresMod;

diff --git a/...mental_screen/CreateWorldScreenMixin.java → ...mental_screen/CreateWorldScreenMixin.java b/...mental_screen/CreateWorldScreenMixin.java → ...mental_screen/CreateWorldScreenMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.bugfix.extra_experimental_screen;
+package org.embeddedt.modernfix.neoforge.mixin.bugfix.extra_experimental_screen;
 
 import com.mojang.serialization.Lifecycle;
 import net.minecraft.client.gui.screens.worldselection.CreateWorldScreen;

diff --git a/..._type_desync/RecipeBookSettingsMixin.java → ..._type_desync/RecipeBookSettingsMixin.java b/..._type_desync/RecipeBookSettingsMixin.java → ..._type_desync/RecipeBookSettingsMixin.java
@@ -1,12 +1,12 @@
-package org.embeddedt.modernfix.forge.mixin.bugfix.recipe_book_type_desync;
+package org.embeddedt.modernfix.neoforge.mixin.bugfix.recipe_book_type_desync;
 
 import com.llamalad7.mixinextras.sugar.Local;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.stats.RecipeBookSettings;
 import net.minecraft.world.inventory.RecipeBookType;
 import org.embeddedt.modernfix.ModernFix;
 import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
-import org.embeddedt.modernfix.forge.packet.NetworkUtils;
+import org.embeddedt.modernfix.neoforge.packet.NetworkUtils;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;

diff --git a/...d_shape_caches/ShapeCacheCyclicMixin.java → ...d_shape_caches/ShapeCacheCyclicMixin.java b/...d_shape_caches/ShapeCacheCyclicMixin.java → ...d_shape_caches/ShapeCacheCyclicMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.bugfix.unsafe_modded_shape_caches;
+package org.embeddedt.modernfix.neoforge.mixin.bugfix.unsafe_modded_shape_caches;
 
 import org.embeddedt.modernfix.ModernFix;
 import org.embeddedt.modernfix.annotation.RequiresMod;

diff --git a/...odded_shape_caches/ShapeCacheRSMixin.java → ...odded_shape_caches/ShapeCacheRSMixin.java b/...odded_shape_caches/ShapeCacheRSMixin.java → ...odded_shape_caches/ShapeCacheRSMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.bugfix.unsafe_modded_shape_caches;
+package org.embeddedt.modernfix.neoforge.mixin.bugfix.unsafe_modded_shape_caches;
 
 import org.embeddedt.modernfix.ModernFix;
 import org.embeddedt.modernfix.annotation.RequiresMod;

diff --git a/...orge/mixin/core/BootstrapClientMixin.java → ...orge/mixin/core/BootstrapClientMixin.java b/...orge/mixin/core/BootstrapClientMixin.java → ...orge/mixin/core/BootstrapClientMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.core;
+package org.embeddedt.modernfix.neoforge.mixin.core;
 
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.server.Bootstrap;

diff --git a/...nfix/forge/mixin/core/BootstrapMixin.java → ...x/neoforge/mixin/core/BootstrapMixin.java b/...nfix/forge/mixin/core/BootstrapMixin.java → ...x/neoforge/mixin/core/BootstrapMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.core;
+package org.embeddedt.modernfix.neoforge.mixin.core;
 
 import net.minecraft.server.Bootstrap;
 import net.neoforged.neoforge.network.NetworkConstants;

diff --git a/...x/forge/mixin/core/NetworkHooksMixin.java → ...eoforge/mixin/core/NetworkHooksMixin.java b/...x/forge/mixin/core/NetworkHooksMixin.java → ...eoforge/mixin/core/NetworkHooksMixin.java
@@ -1,8 +1,8 @@
-package org.embeddedt.modernfix.forge.mixin.core;
+package org.embeddedt.modernfix.neoforge.mixin.core;
 
 import net.minecraft.network.Connection;
 import net.neoforged.neoforge.network.NetworkHooks;
-import org.embeddedt.modernfix.forge.packet.NetworkUtils;
+import org.embeddedt.modernfix.neoforge.packet.NetworkUtils;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

diff --git a/...eature/branding/BrandingControlMixin.java → ...eature/branding/BrandingControlMixin.java b/...eature/branding/BrandingControlMixin.java → ...eature/branding/BrandingControlMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.feature.branding;
+package org.embeddedt.modernfix.neoforge.mixin.feature.branding;
 
 import com.google.common.collect.ImmutableList;
 import net.neoforged.fml.ModContainer;

diff --git a/...re/measure_time/MinecraftMixin_Forge.java → ...re/measure_time/MinecraftMixin_Forge.java b/...re/measure_time/MinecraftMixin_Forge.java → ...re/measure_time/MinecraftMixin_Forge.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.feature.measure_time;
+package org.embeddedt.modernfix.neoforge.mixin.feature.measure_time;
 
 import net.minecraft.client.Minecraft;
 import org.embeddedt.modernfix.ModernFixClient;

diff --git a/...egistry_event_progress/GameDataMixin.java → ...egistry_event_progress/GameDataMixin.java b/...egistry_event_progress/GameDataMixin.java → ...egistry_event_progress/GameDataMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.feature.registry_event_progress;
+package org.embeddedt.modernfix.neoforge.mixin.feature.registry_event_progress;
 
 import net.neoforged.bus.api.Event;
 import net.neoforged.fml.ModList;
@@ -9,7 +9,7 @@
 import net.neoforged.neoforge.registries.GameData;
 import net.neoforged.neoforge.registries.RegisterEvent;
 import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
-import org.embeddedt.modernfix.forge.util.AsyncLoadingScreen;
+import org.embeddedt.modernfix.neoforge.util.AsyncLoadingScreen;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;

diff --git a/...reload_exceptions/RecipeManagerMixin.java → ...reload_exceptions/RecipeManagerMixin.java b/...reload_exceptions/RecipeManagerMixin.java → ...reload_exceptions/RecipeManagerMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.perf.datapack_reload_exceptions;
+package org.embeddedt.modernfix.neoforge.mixin.perf.datapack_reload_exceptions;
 
 import net.minecraft.world.item.crafting.RecipeManager;
 import org.slf4j.Logger;

diff --git a/...amic_resources/ForgeHooksClientMixin.java → ...amic_resources/ForgeHooksClientMixin.java b/...amic_resources/ForgeHooksClientMixin.java → ...amic_resources/ForgeHooksClientMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources;
+package org.embeddedt.modernfix.neoforge.mixin.perf.dynamic_resources;
 
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.resources.ResourceLocation;
@@ -9,7 +9,7 @@
 import net.neoforged.fml.util.ObfuscationReflectionHelper;
 import net.neoforged.neoforge.client.ClientHooks;
 import net.neoforged.neoforge.client.event.ModelEvent;
-import org.embeddedt.modernfix.forge.dynresources.ModelBakeEventHelper;
+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;

diff --git a/...ic_resources/ItemOverridesForgeMixin.java → ...ic_resources/ItemOverridesForgeMixin.java b/...ic_resources/ItemOverridesForgeMixin.java → ...ic_resources/ItemOverridesForgeMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources;
+package org.embeddedt.modernfix.neoforge.mixin.perf.dynamic_resources;
 
 import net.minecraft.client.renderer.block.model.ItemOverride;
 import net.minecraft.client.renderer.block.model.ItemOverrides;

diff --git a/...ynamic_resources/ModelBakerImplMixin.java → ...ynamic_resources/ModelBakerImplMixin.java b/...ynamic_resources/ModelBakerImplMixin.java → ...ynamic_resources/ModelBakerImplMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources;
+package org.embeddedt.modernfix.neoforge.mixin.perf.dynamic_resources;
 
 import com.llamalad7.mixinextras.injector.ModifyExpressionValue;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
@@ -10,7 +10,7 @@
 import org.embeddedt.modernfix.duck.IExtendedModelBaker;
 import org.embeddedt.modernfix.duck.IExtendedModelBakery;
 import org.embeddedt.modernfix.dynamicresources.ModelMissingException;
-import org.embeddedt.modernfix.forge.dynresources.IModelBakerImpl;
+import org.embeddedt.modernfix.neoforge.dynresources.IModelBakerImpl;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

diff --git a/...f/dynamic_resources/ModelBakeryMixin.java → ...f/dynamic_resources/ModelBakeryMixin.java b/...f/dynamic_resources/ModelBakeryMixin.java → ...f/dynamic_resources/ModelBakeryMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources;
+package org.embeddedt.modernfix.neoforge.mixin.perf.dynamic_resources;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;

diff --git a/...urces/ctm/CTMPackReloadListenerMixin.java → ...urces/ctm/CTMPackReloadListenerMixin.java b/...urces/ctm/CTMPackReloadListenerMixin.java → ...urces/ctm/CTMPackReloadListenerMixin.java
@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources.ctm;
+package org.embeddedt.modernfix.neoforge.mixin.perf.dynamic_resources.ctm;
 
 import com.google.common.collect.ImmutableList;
 import net.minecraft.client.renderer.ItemBlockRenderTypes;
@@ -24,7 +24,6 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
-import team.chisel.ctm.client.model.AbstractCTMBakedModel;
 import team.chisel.ctm.client.util.CTMPackReloadListener;
 
 import java.util.Map;