diff --git a/forge/gradle.properties b/forge/gradle.properties deleted file mode 100644 index 32f842a6..00000000 --- a/forge/gradle.properties +++ /dev/null @@ -1 +0,0 @@ -loom.platform=forge \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index d3b14649..0a32bf41 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,8 +6,8 @@ mixinextras_version=0.2.0-beta.9 mod_id=modernfix minecraft_version=1.20.2 -enabled_platforms=fabric,forge -forge_version=1.20.2-48.0.40 +enabled_platforms=fabric,neoforge +forge_version=20.2.86 # parchment_version=2023.07.09 refined_storage_version=4392788 jei_version=16.0.0.28 diff --git a/forge/build.gradle b/neoforge/build.gradle similarity index 91% rename from forge/build.gradle rename to neoforge/build.gradle index 5487310b..2b40a067 100644 --- a/forge/build.gradle +++ b/neoforge/build.gradle @@ -6,18 +6,7 @@ plugins { architectury { platformSetupLoomIde() - forge() -} - -loom { - forge { - convertAccessWideners = true - extraAccessWideners.add loom.accessWidenerPath.get().asFile.name - - mixinConfig "modernfix-common.mixins.json" - mixinConfig "modernfix-forge.mixins.json" - } - mixin.defaultRefmapName = "modernfix.refmap.json" + neoForge() } configurations { @@ -41,10 +30,11 @@ repositories { includeGroup "extra-mods" } } + maven { url "https://maven.neoforged.net" } } dependencies { - forge "net.minecraftforge:forge:${rootProject.forge_version}" + neoForge "net.neoforged:neoforge:${rootProject.forge_version}" implementation(annotationProcessor("com.github.llamalad7.mixinextras:mixinextras-common:${rootProject.mixinextras_version}")) implementation(include("com.github.llamalad7.mixinextras:mixinextras-forge:${rootProject.mixinextras_version}")) // Remove the next line if you don't want to depend on the API diff --git a/neoforge/gradle.properties b/neoforge/gradle.properties new file mode 100644 index 00000000..2914393d --- /dev/null +++ b/neoforge/gradle.properties @@ -0,0 +1 @@ +loom.platform=neoforge \ No newline at end of file diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/ModernFixConfig.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/ModernFixConfig.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/ModernFixConfig.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/ModernFixConfig.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/classloading/ATInjector.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/classloading/ATInjector.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/classloading/ATInjector.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/classloading/ATInjector.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/classloading/ClassLoadHack.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/classloading/ClassLoadHack.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/classloading/ClassLoadHack.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/classloading/ClassLoadHack.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/classloading/FastAccessTransformerList.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/classloading/FastAccessTransformerList.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/classloading/FastAccessTransformerList.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/classloading/FastAccessTransformerList.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/classloading/ModFileScanDataDeduplicator.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/classloading/ModFileScanDataDeduplicator.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/classloading/ModFileScanDataDeduplicator.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/classloading/ModFileScanDataDeduplicator.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/config/ConfigFixer.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/config/ConfigFixer.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/config/ConfigFixer.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/config/ConfigFixer.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/config/NightConfigFixer.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/config/NightConfigFixer.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/config/NightConfigFixer.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/config/NightConfigFixer.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/datagen/RuntimeDatagen.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/datagen/RuntimeDatagen.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/datagen/RuntimeDatagen.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/datagen/RuntimeDatagen.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/dynresources/IModelBakerImpl.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/dynresources/IModelBakerImpl.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/dynresources/IModelBakerImpl.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/dynresources/IModelBakerImpl.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModelBakeEventHelper.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModelBakeEventHelper.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModelBakeEventHelper.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModelBakeEventHelper.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixClientForge.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixClientForge.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixClientForge.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixClientForge.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/load/ModResourcePackPathFixer.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/load/ModResourcePackPathFixer.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/load/ModResourcePackPathFixer.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/load/ModResourcePackPathFixer.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/load/ModWorkManagerQueue.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/load/ModWorkManagerQueue.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/load/ModWorkManagerQueue.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/load/ModWorkManagerQueue.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/blueprint_modif_memory_leak/ObjectModificationManagerMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/blueprint_modif_memory_leak/ObjectModificationManagerMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/blueprint_modif_memory_leak/ObjectModificationManagerMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/blueprint_modif_memory_leak/ObjectModificationManagerMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/chunk_deadlock/ChunkMapLoadMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/chunk_deadlock/ChunkMapLoadMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/chunk_deadlock/ChunkMapLoadMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/chunk_deadlock/ChunkMapLoadMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/chunk_deadlock/ServerChunkCache_CurrentLoadingMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/chunk_deadlock/ServerChunkCache_CurrentLoadingMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/chunk_deadlock/ServerChunkCache_CurrentLoadingMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/chunk_deadlock/ServerChunkCache_CurrentLoadingMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/ctm_resourceutil_cme/ResourceUtilMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/ctm_resourceutil_cme/ResourceUtilMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/ctm_resourceutil_cme/ResourceUtilMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/ctm_resourceutil_cme/ResourceUtilMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/extra_experimental_screen/CreateWorldScreenMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/extra_experimental_screen/CreateWorldScreenMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/extra_experimental_screen/CreateWorldScreenMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/extra_experimental_screen/CreateWorldScreenMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/forge_vehicle_packets/ServerGamePacketListenerImplMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/forge_vehicle_packets/ServerGamePacketListenerImplMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/forge_vehicle_packets/ServerGamePacketListenerImplMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/forge_vehicle_packets/ServerGamePacketListenerImplMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/removed_dimensions/LevelStorageSourceMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/removed_dimensions/LevelStorageSourceMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/removed_dimensions/LevelStorageSourceMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/removed_dimensions/LevelStorageSourceMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheCyclicMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheCyclicMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheCyclicMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheCyclicMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheRSMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheRSMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheRSMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheRSMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapClientMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapClientMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapClientMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapClientMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/NetworkHooksMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/NetworkHooksMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/NetworkHooksMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/NetworkHooksMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/devenv/GameDataMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/devenv/GameDataMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/devenv/GameDataMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/devenv/GameDataMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/branding/BrandingControlMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/branding/BrandingControlMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/branding/BrandingControlMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/branding/BrandingControlMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/measure_time/MinecraftMixin_Forge.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/measure_time/MinecraftMixin_Forge.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/measure_time/MinecraftMixin_Forge.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/measure_time/MinecraftMixin_Forge.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/registry_event_progress/GameDataMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/registry_event_progress/GameDataMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/registry_event_progress/GameDataMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/registry_event_progress/GameDataMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ItemModelMesherForgeMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ItemModelMesherForgeMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ItemModelMesherForgeMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ItemModelMesherForgeMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ItemOverridesForgeMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ItemOverridesForgeMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ItemOverridesForgeMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ItemOverridesForgeMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/supermartijncore/ClientRegistrationHandlerMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/supermartijncore/ClientRegistrationHandlerMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/supermartijncore/ClientRegistrationHandlerMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/supermartijncore/ClientRegistrationHandlerMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_forge_dummies/NamespacedHolderHelperMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_forge_dummies/NamespacedHolderHelperMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_forge_dummies/NamespacedHolderHelperMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_forge_dummies/NamespacedHolderHelperMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/forge_registry_lambda/RegistryObjectMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/forge_registry_lambda/RegistryObjectMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/forge_registry_lambda/RegistryObjectMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/forge_registry_lambda/RegistryObjectMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/RecipeEventJSMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/RecipeEventJSMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/RecipeEventJSMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/RecipeEventJSMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/model_optimizations/OBJLoaderMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/model_optimizations/OBJLoaderMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/model_optimizations/OBJLoaderMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/model_optimizations/OBJLoaderMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/reduce_blockstate_cache_rebuilds/GameDataMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/reduce_blockstate_cache_rebuilds/GameDataMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/reduce_blockstate_cache_rebuilds/GameDataMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/reduce_blockstate_cache_rebuilds/GameDataMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ForgePathPackResourcesMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ForgePathPackResourcesMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ForgePathPackResourcesMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ForgePathPackResourcesMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/rewrite_registry/ForgeRegistryMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/rewrite_registry/ForgeRegistryMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/rewrite_registry/ForgeRegistryMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/rewrite_registry/ForgeRegistryMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/rewrite_registry/ForgeRegistrySnapshotMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/rewrite_registry/ForgeRegistrySnapshotMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/rewrite_registry/ForgeRegistrySnapshotMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/rewrite_registry/ForgeRegistrySnapshotMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/tag_id_caching/TagEntryMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/tag_id_caching/TagEntryMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/tag_id_caching/TagEntryMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/tag_id_caching/TagEntryMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/tag_id_caching/TagOrElementLocationMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/tag_id_caching/TagOrElementLocationMixin.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/tag_id_caching/TagOrElementLocationMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/tag_id_caching/TagOrElementLocationMixin.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/packet/NetworkUtils.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/packet/NetworkUtils.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/packet/NetworkUtils.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/packet/NetworkUtils.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/packet/PacketHandler.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/packet/PacketHandler.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/packet/PacketHandler.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/packet/PacketHandler.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/registry/FastForgeRegistry.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/registry/FastForgeRegistry.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/registry/FastForgeRegistry.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/registry/FastForgeRegistry.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/registry/ObjectHolderClearer.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/registry/ObjectHolderClearer.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/registry/ObjectHolderClearer.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/registry/ObjectHolderClearer.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/rs/IFluidExternalStorageCache.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/rs/IFluidExternalStorageCache.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/rs/IFluidExternalStorageCache.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/rs/IFluidExternalStorageCache.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/rs/IItemExternalStorageCache.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/rs/IItemExternalStorageCache.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/rs/IItemExternalStorageCache.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/rs/IItemExternalStorageCache.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/util/AsyncLoadingScreen.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/util/AsyncLoadingScreen.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/util/AsyncLoadingScreen.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/util/AsyncLoadingScreen.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/forge/util/ModUtil.java b/neoforge/src/main/java/org/embeddedt/modernfix/forge/util/ModUtil.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/forge/util/ModUtil.java rename to neoforge/src/main/java/org/embeddedt/modernfix/forge/util/ModUtil.java diff --git a/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java b/neoforge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java similarity index 100% rename from forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java rename to neoforge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java diff --git a/forge/src/main/resources/META-INF/mods.toml b/neoforge/src/main/resources/META-INF/mods.toml similarity index 100% rename from forge/src/main/resources/META-INF/mods.toml rename to neoforge/src/main/resources/META-INF/mods.toml diff --git a/forge/src/main/resources/modernfix-forge.mixins.json b/neoforge/src/main/resources/modernfix-forge.mixins.json similarity index 100% rename from forge/src/main/resources/modernfix-forge.mixins.json rename to neoforge/src/main/resources/modernfix-forge.mixins.json diff --git a/forge/src/main/resources/pack.mcmeta b/neoforge/src/main/resources/pack.mcmeta similarity index 100% rename from forge/src/main/resources/pack.mcmeta rename to neoforge/src/main/resources/pack.mcmeta