From c6b38f340a53fc9100387ec5dbd207f9f3cbabca Mon Sep 17 00:00:00 2001 From: embeddedt <42941056+embeddedt@users.noreply.github.com> Date: Sun, 3 Dec 2023 20:33:08 -0500 Subject: [PATCH] Second rename pass, reaches main menu --- .../MappedRegistryMixin.java | 3 +- .../core/config/ModernFixEarlyConfig.java | 5 ++- .../platform/PlatformHookLoader.java | 2 +- .../ServerGamePacketListenerImplMixin.java | 36 ------------------- .../LevelStorageSourceMixin.java | 14 -------- .../{forge => neoforge}/ModernFixConfig.java | 2 +- .../classloading/ClassLoadHack.java | 2 +- .../ModFileScanDataDeduplicator.java | 2 +- .../config/ConfigFixer.java | 2 +- .../config/NightConfigFixer.java | 2 +- .../datagen/RuntimeDatagen.java | 2 +- .../dynresources/IModelBakerImpl.java | 2 +- .../dynresources/ModelBakeEventHelper.java | 2 +- .../init/ModernFixClientForge.java | 4 +-- .../init/ModernFixForge.java | 15 ++++---- .../load/ModResourcePackPathFixer.java | 2 +- .../ObjectModificationManagerMixin.java | 2 +- .../chunk_deadlock/ChunkMapLoadMixin.java | 2 +- .../ServerChunkCache_CurrentLoadingMixin.java | 2 +- .../cofh_core_crash/FlagManagerMixin.java | 2 +- .../ResourceUtilMixin.java | 2 +- .../CreateWorldScreenMixin.java | 2 +- .../RecipeBookSettingsMixin.java | 4 +-- .../ShapeCacheCyclicMixin.java | 2 +- .../ShapeCacheRSMixin.java | 2 +- .../mixin/core/BootstrapClientMixin.java | 2 +- .../mixin/core/BootstrapMixin.java | 2 +- .../mixin/core/NetworkHooksMixin.java | 4 +-- .../branding/BrandingControlMixin.java | 2 +- .../measure_time/MinecraftMixin_Forge.java | 2 +- .../GameDataMixin.java | 4 +-- .../RecipeManagerMixin.java | 2 +- .../ForgeHooksClientMixin.java | 4 +-- .../ItemOverridesForgeMixin.java | 2 +- .../ModelBakerImplMixin.java | 4 +-- .../dynamic_resources/ModelBakeryMixin.java | 2 +- .../ctm/CTMPackReloadListenerMixin.java | 3 +- .../ctm/TextureMetadataHandlerMixin.java | 10 +----- .../rs/ClientSetupMixin.java | 2 +- .../ClientRegistrationHandlerMixin.java | 2 +- .../mixin/perf/kubejs/RecipeEventJSMixin.java | 2 +- .../model_optimizations/OBJLoaderMixin.java | 2 +- .../ClientBookRegistryMixin.java | 2 +- .../BlockCallbacksMixin.java | 2 +- .../perf/tag_id_caching/TagEntryMixin.java | 2 +- .../TagOrElementLocationMixin.java | 2 +- .../packet/NetworkUtils.java | 2 +- .../packet/PacketHandler.java | 2 +- .../util/AsyncLoadingScreen.java | 2 +- .../{forge => neoforge}/util/ModUtil.java | 2 +- .../ModernFixPlatformHooksImpl.java | 8 ++--- .../resources/modernfix-neoforge.mixins.json | 2 +- 52 files changed, 67 insertions(+), 127 deletions(-) delete mode 100644 neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/forge_vehicle_packets/ServerGamePacketListenerImplMixin.java delete mode 100644 neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/removed_dimensions/LevelStorageSourceMixin.java rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/ModernFixConfig.java (97%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/classloading/ClassLoadHack.java (94%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/classloading/ModFileScanDataDeduplicator.java (98%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/config/ConfigFixer.java (98%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/config/NightConfigFixer.java (98%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/datagen/RuntimeDatagen.java (98%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/dynresources/IModelBakerImpl.java (54%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/dynresources/ModelBakeEventHelper.java (99%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/init/ModernFixClientForge.java (97%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/init/ModernFixForge.java (91%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/load/ModResourcePackPathFixer.java (93%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/bugfix/blueprint_modif_memory_leak/ObjectModificationManagerMixin.java (93%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/bugfix/chunk_deadlock/ChunkMapLoadMixin.java (97%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/bugfix/chunk_deadlock/ServerChunkCache_CurrentLoadingMixin.java (97%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java (96%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/bugfix/ctm_resourceutil_cme/ResourceUtilMixin.java (93%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/bugfix/extra_experimental_screen/CreateWorldScreenMixin.java (94%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java (93%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheCyclicMixin.java (91%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheRSMixin.java (93%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/core/BootstrapClientMixin.java (93%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/core/BootstrapMixin.java (95%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/core/NetworkHooksMixin.java (84%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/feature/branding/BrandingControlMixin.java (94%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/feature/measure_time/MinecraftMixin_Forge.java (90%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/feature/registry_event_progress/GameDataMixin.java (94%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java (90%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java (92%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/perf/dynamic_resources/ItemOverridesForgeMixin.java (96%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/perf/dynamic_resources/ModelBakerImplMixin.java (97%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/perf/dynamic_resources/ModelBakeryMixin.java (99%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java (97%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java (91%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java (96%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/perf/dynamic_resources/supermartijncore/ClientRegistrationHandlerMixin.java (97%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/perf/kubejs/RecipeEventJSMixin.java (97%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/perf/model_optimizations/OBJLoaderMixin.java (95%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java (97%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java (93%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/perf/tag_id_caching/TagEntryMixin.java (93%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/mixin/perf/tag_id_caching/TagOrElementLocationMixin.java (92%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/packet/NetworkUtils.java (61%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/packet/PacketHandler.java (96%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/util/AsyncLoadingScreen.java (97%) rename neoforge/src/main/java/org/embeddedt/modernfix/{forge => neoforge}/util/ModUtil.java (94%) rename neoforge/src/main/java/org/embeddedt/modernfix/platform/{forge => neoforge}/ModernFixPlatformHooksImpl.java (96%) diff --git a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/mojang_registry_size/MappedRegistryMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/mojang_registry_size/MappedRegistryMixin.java index ae4faf59..73fbb87a 100644 --- a/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/mojang_registry_size/MappedRegistryMixin.java +++ b/common/src/main/java/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 index a01bb22b..05cb9dfb 100644 --- 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 @@ public class ModernFixEarlyConfig { 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 class ModernFixEarlyConfig { } private void scanForAndBuildMixinOptions() { - List configFiles = ImmutableList.of("modernfix-common.mixins.json", "modernfix-fabric.mixins.json", "modernfix-forge.mixins.json"); + List configFiles = ImmutableList.of("modernfix-common.mixins.json", "modernfix-fabric.mixins.json", "modernfix-neoforge.mixins.json"); List mixinPaths = new ArrayList<>(); for(String configFile : configFiles) { InputStream stream = ModernFixEarlyConfig.class.getClassLoader().getResourceAsStream(configFile); @@ -175,7 +175,6 @@ public class ModernFixEarlyConfig { .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 index 87f4fca4..af44b445 100644 --- 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 @@ import java.lang.reflect.Constructor; 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/neoforge/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 deleted file mode 100644 index 5ba643af..00000000 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/forge_vehicle_packets/ServerGamePacketListenerImplMixin.java +++ /dev/null @@ -1,36 +0,0 @@ -package org.embeddedt.modernfix.forge.mixin.bugfix.forge_vehicle_packets; - -import net.minecraft.network.protocol.game.ServerboundMoveVehiclePacket; -import net.minecraft.server.level.ServerPlayer; -import net.minecraft.server.network.ServerGamePacketListenerImpl; -import net.minecraft.world.phys.Vec3; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Shadow; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Redirect; - -@Mixin(ServerGamePacketListenerImpl.class) -public class ServerGamePacketListenerImplMixin { - @Shadow public ServerPlayer player; - - @Redirect(method = "handleMoveVehicle", at = @At(value = "INVOKE", target = "Lnet/minecraft/server/level/ServerPlayer;absMoveTo(DDDFF)V")) - private void movePlayerUsingPositionRider(ServerPlayer player, double x, double y, double z, float yRot, float xRot, ServerboundMoveVehiclePacket packet) { - if(player == this.player) { - // use positionRider - Vec3 oldPos = this.player.position(); - yRot = this.player.getYRot(); - xRot = this.player.getXRot(); - float yHeadRot = this.player.getYHeadRot(); - this.player.getRootVehicle().positionRider(this.player); - // keep old rotation - this.player.setYRot(yRot); - this.player.setXRot(xRot); - this.player.setYHeadRot(yHeadRot); - // save old position - this.player.xo = oldPos.x; - this.player.yo = oldPos.y; - this.player.zo = oldPos.z; - } else - player.absMoveTo(x, y, z, yRot, xRot); - } -} diff --git a/neoforge/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 deleted file mode 100644 index 59b4ae8d..00000000 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/removed_dimensions/LevelStorageSourceMixin.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.embeddedt.modernfix.forge.mixin.bugfix.removed_dimensions; - -import net.minecraft.world.level.storage.LevelStorageSource; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.ModifyArg; - -@Mixin(LevelStorageSource.class) -public class LevelStorageSourceMixin { - @ModifyArg(method = "*", at = @At(value = "INVOKE", target = "Lcom/mojang/serialization/DataResult;getOrThrow(ZLjava/util/function/Consumer;)Ljava/lang/Object;", ordinal = 0), index = 0) - private static boolean alwaysAllowPartialDimensions(boolean flag) { - return true; - } -} diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/forge/ModernFixConfig.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/ModernFixConfig.java similarity index 97% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/ModernFixConfig.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/ModernFixConfig.java index b3add43c..891f186a 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/ModernFixConfig.java +++ b/neoforge/src/main/java/org/embeddedt/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/neoforge/src/main/java/org/embeddedt/modernfix/forge/classloading/ClassLoadHack.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/classloading/ClassLoadHack.java similarity index 94% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/classloading/ClassLoadHack.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/classloading/ClassLoadHack.java index 169de148..2a073cbc 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/classloading/ClassLoadHack.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/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/neoforge/src/main/java/org/embeddedt/modernfix/forge/classloading/ModFileScanDataDeduplicator.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/classloading/ModFileScanDataDeduplicator.java similarity index 98% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/classloading/ModFileScanDataDeduplicator.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/classloading/ModFileScanDataDeduplicator.java index 16c0f55b..4e607aa2 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/classloading/ModFileScanDataDeduplicator.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/classloading/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/neoforge/src/main/java/org/embeddedt/modernfix/forge/config/ConfigFixer.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/config/ConfigFixer.java similarity index 98% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/config/ConfigFixer.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/config/ConfigFixer.java index 5f34e2c7..7f310484 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/config/ConfigFixer.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/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/neoforge/src/main/java/org/embeddedt/modernfix/forge/config/NightConfigFixer.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/config/NightConfigFixer.java similarity index 98% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/config/NightConfigFixer.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/config/NightConfigFixer.java index 94874853..69fc507c 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/config/NightConfigFixer.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/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/neoforge/src/main/java/org/embeddedt/modernfix/forge/datagen/RuntimeDatagen.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/datagen/RuntimeDatagen.java similarity index 98% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/datagen/RuntimeDatagen.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/datagen/RuntimeDatagen.java index c7bb74d4..c2c8dc1b 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/datagen/RuntimeDatagen.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/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/neoforge/src/main/java/org/embeddedt/modernfix/forge/dynresources/IModelBakerImpl.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/dynresources/IModelBakerImpl.java similarity index 54% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/dynresources/IModelBakerImpl.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/dynresources/IModelBakerImpl.java index b2cced35..0de3e12f 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/dynresources/IModelBakerImpl.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/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/neoforge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModelBakeEventHelper.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/dynresources/ModelBakeEventHelper.java similarity index 99% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModelBakeEventHelper.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/dynresources/ModelBakeEventHelper.java index dda945ab..17302f30 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/dynresources/ModelBakeEventHelper.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/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/neoforge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixClientForge.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixClientForge.java similarity index 97% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixClientForge.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixClientForge.java index 2ebffe69..7eaf9018 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixClientForge.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/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.TickEvent; 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/neoforge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixForge.java similarity index 91% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/init/ModernFixForge.java index 5bab3acd..37df9424 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/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.apache.commons.lang3.tuple.Pair; 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 class ModernFixForge { PacketHandler.register(); ModFileScanDataDeduplicator.deduplicate(); ClassLoadHack.loadModClasses(); - ConfigFixer.replaceConfigHandlers(); + //ConfigFixer.replaceConfigHandlers(); } @SubscribeEvent diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/forge/load/ModResourcePackPathFixer.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/load/ModResourcePackPathFixer.java similarity index 93% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/load/ModResourcePackPathFixer.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/load/ModResourcePackPathFixer.java index bc189097..e95fb453 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/load/ModResourcePackPathFixer.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/blueprint_modif_memory_leak/ObjectModificationManagerMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/blueprint_modif_memory_leak/ObjectModificationManagerMixin.java similarity index 93% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/blueprint_modif_memory_leak/ObjectModificationManagerMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/blueprint_modif_memory_leak/ObjectModificationManagerMixin.java index 2be15e95..b3610d11 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/blueprint_modif_memory_leak/ObjectModificationManagerMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/blueprint_modif_memory_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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/chunk_deadlock/ChunkMapLoadMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/chunk_deadlock/ChunkMapLoadMixin.java similarity index 97% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/chunk_deadlock/ChunkMapLoadMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/chunk_deadlock/ChunkMapLoadMixin.java index 08f78d4b..79d9ec15 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/chunk_deadlock/ChunkMapLoadMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/chunk_deadlock/ServerChunkCache_CurrentLoadingMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/chunk_deadlock/ServerChunkCache_CurrentLoadingMixin.java similarity index 97% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/chunk_deadlock/ServerChunkCache_CurrentLoadingMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/chunk_deadlock/ServerChunkCache_CurrentLoadingMixin.java index 3174c2cc..3fac95fd 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/chunk_deadlock/ServerChunkCache_CurrentLoadingMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/chunk_deadlock/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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java similarity index 96% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java index c73ef328..ccbec8a2 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/cofh_core_crash/FlagManagerMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/ctm_resourceutil_cme/ResourceUtilMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/ctm_resourceutil_cme/ResourceUtilMixin.java similarity index 93% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/ctm_resourceutil_cme/ResourceUtilMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/ctm_resourceutil_cme/ResourceUtilMixin.java index 26844d70..868bbdb0 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/ctm_resourceutil_cme/ResourceUtilMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/ctm_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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/extra_experimental_screen/CreateWorldScreenMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/extra_experimental_screen/CreateWorldScreenMixin.java similarity index 94% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/extra_experimental_screen/CreateWorldScreenMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/extra_experimental_screen/CreateWorldScreenMixin.java index 569a6ca1..5ba2646e 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/extra_experimental_screen/CreateWorldScreenMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/extra_experimental_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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java similarity index 93% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java index 430e2185..f18ad746 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/recipe_book_type_desync/RecipeBookSettingsMixin.java @@ -1,4 +1,4 @@ -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; @@ -6,7 +6,7 @@ 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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheCyclicMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheCyclicMixin.java similarity index 91% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheCyclicMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheCyclicMixin.java index 3f1eb8e2..4f50e40c 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheCyclicMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/unsafe_modded_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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheRSMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheRSMixin.java similarity index 93% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheRSMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheRSMixin.java index c2a43839..8adbd23a 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/unsafe_modded_shape_caches/ShapeCacheRSMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/bugfix/unsafe_modded_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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapClientMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/BootstrapClientMixin.java similarity index 93% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapClientMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/BootstrapClientMixin.java index d1706ba7..45a0167f 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapClientMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/BootstrapMixin.java similarity index 95% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/BootstrapMixin.java index 893bd55d..369fc6f3 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/NetworkHooksMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/NetworkHooksMixin.java similarity index 84% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/NetworkHooksMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/core/NetworkHooksMixin.java index 8503d696..aaee04e9 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/NetworkHooksMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/branding/BrandingControlMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/branding/BrandingControlMixin.java similarity index 94% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/branding/BrandingControlMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/branding/BrandingControlMixin.java index b8ec0ec0..e6875c20 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/branding/BrandingControlMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/measure_time/MinecraftMixin_Forge.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/measure_time/MinecraftMixin_Forge.java similarity index 90% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/measure_time/MinecraftMixin_Forge.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/measure_time/MinecraftMixin_Forge.java index ee5a3927..3e2d512d 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/measure_time/MinecraftMixin_Forge.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/registry_event_progress/GameDataMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/registry_event_progress/GameDataMixin.java similarity index 94% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/registry_event_progress/GameDataMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/registry_event_progress/GameDataMixin.java index 715c4408..4170b69d 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/registry_event_progress/GameDataMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/feature/registry_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.fml.event.IModBusEvent; 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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java similarity index 90% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java index c1fc64a6..db84f9ce 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/datapack_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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java similarity index 92% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java index 3f58c226..bb8146dd 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ForgeHooksClientMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_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.ModLoader; 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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ItemOverridesForgeMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ItemOverridesForgeMixin.java similarity index 96% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ItemOverridesForgeMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ItemOverridesForgeMixin.java index 5057df90..0f758f7d 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ItemOverridesForgeMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java similarity index 97% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java index 7b68311a..25dc4aad 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakerImplMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_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.api.entrypoint.ModernFixClientIntegration; 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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ModelBakeryMixin.java similarity index 99% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ModelBakeryMixin.java index 2f36b941..94b81f46 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/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/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java similarity index 97% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java index 390f78f2..89e4d536 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/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.Shadow; 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; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java similarity index 91% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java index 37bd21bb..65630045 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java @@ -1,17 +1,14 @@ -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.Multimap; import com.google.common.collect.Sets; import com.mojang.datafixers.util.Pair; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; import net.minecraft.client.resources.model.*; import net.minecraft.resources.ResourceLocation; import org.embeddedt.modernfix.ModernFixClient; import org.embeddedt.modernfix.annotation.ClientOnlyMixin; import org.embeddedt.modernfix.annotation.RequiresMod; import org.embeddedt.modernfix.api.entrypoint.ModernFixClientIntegration; -import org.embeddedt.modernfix.forge.dynresources.IModelBakerImpl; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; @@ -19,10 +16,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.CTM; -import team.chisel.ctm.api.model.IModelCTM; -import team.chisel.ctm.client.mixin.ModelBakerImplAccessor; -import team.chisel.ctm.client.model.AbstractCTMBakedModel; -import team.chisel.ctm.client.model.ModelCTM; import team.chisel.ctm.client.texture.IMetadataSectionCTM; import team.chisel.ctm.client.util.ResourceUtil; import team.chisel.ctm.client.util.TextureMetadataHandler; @@ -30,7 +23,6 @@ import team.chisel.ctm.client.util.TextureMetadataHandler; import javax.annotation.Nonnull; import java.io.IOException; import java.util.*; -import java.util.function.Function; @Mixin(TextureMetadataHandler.class) @RequiresMod("ctm") diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java similarity index 96% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java index e7865e4a..13c6f183 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources.rs; +package org.embeddedt.modernfix.neoforge.mixin.perf.dynamic_resources.rs; import com.refinedmods.refinedstorage.render.BakedModelOverrideRegistry; import com.refinedmods.refinedstorage.setup.ClientSetup; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/supermartijncore/ClientRegistrationHandlerMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/supermartijncore/ClientRegistrationHandlerMixin.java similarity index 97% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/supermartijncore/ClientRegistrationHandlerMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/supermartijncore/ClientRegistrationHandlerMixin.java index 12e235a9..fe3fceec 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/supermartijncore/ClientRegistrationHandlerMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/dynamic_resources/supermartijncore/ClientRegistrationHandlerMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources.supermartijncore; +package org.embeddedt.modernfix.neoforge.mixin.perf.dynamic_resources.supermartijncore; import com.supermartijn642.core.registry.ClientRegistrationHandler; import com.supermartijn642.core.util.Pair; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/RecipeEventJSMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/kubejs/RecipeEventJSMixin.java similarity index 97% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/RecipeEventJSMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/kubejs/RecipeEventJSMixin.java index 1848edb6..a5d7503a 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/RecipeEventJSMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/kubejs/RecipeEventJSMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.forge.mixin.perf.kubejs; +package org.embeddedt.modernfix.neoforge.mixin.perf.kubejs; import dev.latvian.mods.kubejs.recipe.RecipesEventJS; import org.embeddedt.modernfix.ModernFix; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/model_optimizations/OBJLoaderMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/model_optimizations/OBJLoaderMixin.java similarity index 95% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/model_optimizations/OBJLoaderMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/model_optimizations/OBJLoaderMixin.java index e9acc049..d7de6de2 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/model_optimizations/OBJLoaderMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/model_optimizations/OBJLoaderMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.forge.mixin.perf.model_optimizations; +package org.embeddedt.modernfix.neoforge.mixin.perf.model_optimizations; import net.minecraft.resources.ResourceLocation; import net.neoforged.neoforge.client.model.obj.ObjLoader; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java similarity index 97% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java index 8e5d7529..15c3d59b 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.forge.mixin.perf.patchouli_deduplicate_books; +package org.embeddedt.modernfix.neoforge.mixin.perf.patchouli_deduplicate_books; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java similarity index 93% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java index ea80bcde..a9fe4735 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.forge.mixin.perf.reduce_blockstate_cache_rebuilds; +package org.embeddedt.modernfix.neoforge.mixin.perf.reduce_blockstate_cache_rebuilds; import com.google.common.collect.ImmutableList; import net.minecraft.core.Registry; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/tag_id_caching/TagEntryMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/tag_id_caching/TagEntryMixin.java similarity index 93% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/tag_id_caching/TagEntryMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/tag_id_caching/TagEntryMixin.java index 8bdc74b8..ccb95871 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/tag_id_caching/TagEntryMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/tag_id_caching/TagEntryMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.forge.mixin.perf.tag_id_caching; +package org.embeddedt.modernfix.neoforge.mixin.perf.tag_id_caching; import net.minecraft.resources.ResourceLocation; import net.minecraft.tags.TagEntry; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/tag_id_caching/TagOrElementLocationMixin.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/tag_id_caching/TagOrElementLocationMixin.java similarity index 92% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/tag_id_caching/TagOrElementLocationMixin.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/tag_id_caching/TagOrElementLocationMixin.java index 43575e93..4180a1fd 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/tag_id_caching/TagOrElementLocationMixin.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/mixin/perf/tag_id_caching/TagOrElementLocationMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.forge.mixin.perf.tag_id_caching; +package org.embeddedt.modernfix.neoforge.mixin.perf.tag_id_caching; import net.minecraft.resources.ResourceLocation; import net.minecraft.util.ExtraCodecs; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/forge/packet/NetworkUtils.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/packet/NetworkUtils.java similarity index 61% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/packet/NetworkUtils.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/packet/NetworkUtils.java index ddcd27ff..4f1d88dd 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/packet/NetworkUtils.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/packet/NetworkUtils.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.forge.packet; +package org.embeddedt.modernfix.neoforge.packet; public class NetworkUtils { public static boolean isCurrentlyVanilla; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/forge/packet/PacketHandler.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/packet/PacketHandler.java similarity index 96% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/packet/PacketHandler.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/packet/PacketHandler.java index 04933b90..4c9bba7a 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/packet/PacketHandler.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/packet/PacketHandler.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.forge.packet; +package org.embeddedt.modernfix.neoforge.packet; import net.minecraft.resources.ResourceLocation; import net.neoforged.api.distmarker.Dist; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/forge/util/AsyncLoadingScreen.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/util/AsyncLoadingScreen.java similarity index 97% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/util/AsyncLoadingScreen.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/util/AsyncLoadingScreen.java index dacbf5e7..3b11a888 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/util/AsyncLoadingScreen.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/util/AsyncLoadingScreen.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.forge.util; +package org.embeddedt.modernfix.neoforge.util; import net.neoforged.fml.loading.ImmediateWindowHandler; import org.lwjgl.glfw.GLFW; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/forge/util/ModUtil.java b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/util/ModUtil.java similarity index 94% rename from neoforge/src/main/java/org/embeddedt/modernfix/forge/util/ModUtil.java rename to neoforge/src/main/java/org/embeddedt/modernfix/neoforge/util/ModUtil.java index db372920..d63c8dc2 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/forge/util/ModUtil.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/neoforge/util/ModUtil.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.forge.util; +package org.embeddedt.modernfix.neoforge.util; import java.util.*; import java.util.concurrent.ForkJoinPool; diff --git a/neoforge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java b/neoforge/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java similarity index 96% rename from neoforge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java rename to neoforge/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java index 7d6e9c37..58f45578 100644 --- a/neoforge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java +++ b/neoforge/src/main/java/org/embeddedt/modernfix/platform/neoforge/ModernFixPlatformHooksImpl.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.platform.forge; +package org.embeddedt.modernfix.platform.neoforge; import com.google.common.collect.ArrayListMultimap; import com.google.common.collect.Multimap; @@ -22,9 +22,9 @@ import net.neoforged.neoforge.network.PacketDistributor; import net.neoforged.neoforge.server.ServerLifecycleHooks; import org.embeddedt.modernfix.api.constants.IntegrationConstants; import org.embeddedt.modernfix.core.ModernFixMixinPlugin; -import org.embeddedt.modernfix.forge.config.NightConfigFixer; -import org.embeddedt.modernfix.forge.init.ModernFixForge; -import org.embeddedt.modernfix.forge.packet.PacketHandler; +import org.embeddedt.modernfix.neoforge.config.NightConfigFixer; +import org.embeddedt.modernfix.neoforge.init.ModernFixForge; +import org.embeddedt.modernfix.neoforge.packet.PacketHandler; import org.embeddedt.modernfix.platform.ModernFixPlatformHooks; import org.embeddedt.modernfix.spark.SparkLaunchProfiler; import org.embeddedt.modernfix.util.CommonModUtil; diff --git a/neoforge/src/main/resources/modernfix-neoforge.mixins.json b/neoforge/src/main/resources/modernfix-neoforge.mixins.json index f63f1dfc..6555f46f 100644 --- a/neoforge/src/main/resources/modernfix-neoforge.mixins.json +++ b/neoforge/src/main/resources/modernfix-neoforge.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "org.embeddedt.modernfix.forge.mixin", + "package": "org.embeddedt.modernfix.neoforge.mixin", "plugin": "org.embeddedt.modernfix.core.ModernFixMixinPlugin", "compatibilityLevel": "JAVA_8", "minVersion": "0.8",