Package restructuring for modern FML

build.gradle

@@ -90,7 +90,7 @@ subprojects {
 
     processResources {
         def mixinFileList = []
-        def mixinDirectory = file("src/main/java/org/embeddedt/modernfix/mixin")
+        def mixinDirectory = file("src/main/java/org/embeddedt/modernfix/" + project.name + "/mixin")
         fileTree(mixinDirectory).visit { FileVisitDetails details ->
             if(details.file.isFile()) {
                 def fileName = mixinDirectory.relativePath(details.file).toString().replaceFirst(/\.java$/, "").replace('/', '.')

common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/chunk_deadlock/ServerChunkCacheMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.bugfix.chunk_deadlock;
+package org.embeddedt.modernfix.common.mixin.bugfix.chunk_deadlock;
 
 import com.mojang.datafixers.util.Either;
 import net.minecraft.server.level.ChunkHolder;

common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/concurrency/MinecraftMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.bugfix.concurrency;
+package org.embeddedt.modernfix.common.mixin.bugfix.concurrency;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.util.thread.BlockableEventLoop;

common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/concurrency/RenderTypeMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.bugfix.concurrency;
+package org.embeddedt.modernfix.common.mixin.bugfix.concurrency;
 
 import it.unimi.dsi.fastutil.objects.ObjectOpenCustomHashSet;
 import net.minecraft.client.renderer.RenderType;

common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/concurrency/StaticTagHelperMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.bugfix.concurrency;
+package org.embeddedt.modernfix.common.mixin.bugfix.concurrency;
 
 import net.minecraft.tags.StaticTagHelper;
 import net.minecraft.tags.TagCollection;

common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/edge_chunk_not_saved/ChunkManagerMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.bugfix.edge_chunk_not_saved;
+package org.embeddedt.modernfix.common.mixin.bugfix.edge_chunk_not_saved;
 
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.ProtoChunk;

common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/mc218112/SynchedEntityDataMixin_Client.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.bugfix.mc218112;
+package org.embeddedt.modernfix.common.mixin.bugfix.mc218112;
 
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.world.entity.Entity;

common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/packet_leak/ClientPlayNetHandlerMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.bugfix.packet_leak;
+package org.embeddedt.modernfix.common.mixin.bugfix.packet_leak;
 
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import net.minecraft.network.FriendlyByteBuf;

common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/packet_leak/SCustomPayloadPlayPacketMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.bugfix.packet_leak;
+package org.embeddedt.modernfix.common.mixin.bugfix.packet_leak;
 
 import net.minecraft.network.protocol.game.ClientGamePacketListener;
 import net.minecraft.network.FriendlyByteBuf;

common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/ChunkHolderMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.bugfix.paper_chunk_patches;
+package org.embeddedt.modernfix.common.mixin.bugfix.paper_chunk_patches;
 
 import com.mojang.datafixers.util.Either;
 import net.minecraft.server.level.ChunkHolder;

common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/ChunkMapMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.bugfix.paper_chunk_patches;
+package org.embeddedt.modernfix.common.mixin.bugfix.paper_chunk_patches;
 
 import net.minecraft.server.level.ChunkHolder;
 import net.minecraft.server.level.ChunkMap;

common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/SortedArraySetMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.bugfix.paper_chunk_patches;
+package org.embeddedt.modernfix.common.mixin.bugfix.paper_chunk_patches;
 
 import net.minecraft.util.SortedArraySet;
 import org.spongepowered.asm.mixin.Mixin;

common/src/main/java/org/embeddedt/modernfix/common/mixin/core/SynchedEntityDataMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.core;
+package org.embeddedt.modernfix.common.mixin.core;
 
 import net.minecraft.network.syncher.SynchedEntityData;
 import net.minecraft.world.entity.Entity;

common/src/main/java/org/embeddedt/modernfix/common/mixin/devenv/MinecraftMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.devenv;
+package org.embeddedt.modernfix.common.mixin.devenv;
 
 import com.mojang.authlib.minecraft.OfflineSocialInteractions;
 import com.mojang.authlib.minecraft.SocialInteractionsService;

common/src/main/java/org/embeddedt/modernfix/common/mixin/devenv/NarratorMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.devenv;
+package org.embeddedt.modernfix.common.mixin.devenv;
 
 import com.mojang.text2speech.Narrator;
 import com.mojang.text2speech.NarratorDummy;

common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/direct_stack_trace/CrashReportMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.feature.direct_stack_trace;
+package org.embeddedt.modernfix.common.mixin.feature.direct_stack_trace;
 
 import net.minecraft.CrashReport;
 import net.minecraft.CrashReportCategory;

common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/BootstrapMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.feature.measure_time;
+package org.embeddedt.modernfix.common.mixin.feature.measure_time;
 
 import com.google.common.base.Stopwatch;
 import net.minecraft.server.Bootstrap;

common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.feature.measure_time;
+package org.embeddedt.modernfix.common.mixin.feature.measure_time;
 
 import com.mojang.datafixers.util.Function4;
 import net.minecraft.client.Minecraft;

common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/ProfiledReloadInstanceMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.feature.measure_time;
+package org.embeddedt.modernfix.common.mixin.feature.measure_time;
 
 import net.minecraft.server.packs.resources.PreparableReloadListener;
 import net.minecraft.server.packs.resources.ProfiledReloadInstance;

common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/SimpleReloadableResourceManagerMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.feature.measure_time;
+package org.embeddedt.modernfix.common.mixin.feature.measure_time;
 
 import net.minecraft.server.packs.resources.SimpleReloadableResourceManager;
 import org.apache.logging.log4j.Logger;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/biome_zoomer/FuzzyOffsetBiomeZoomerMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.biome_zoomer;
+package org.embeddedt.modernfix.common.mixin.perf.biome_zoomer;
 
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.biome.BiomeManager;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/boost_worker_count/UtilMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.boost_worker_count;
+package org.embeddedt.modernfix.common.mixin.perf.boost_worker_count;
 
 import net.minecraft.Util;
 import org.embeddedt.modernfix.ModernFix;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_blockstate_cache_arrays/AbstractBlockStateCacheMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.cache_blockstate_cache_arrays;
+package org.embeddedt.modernfix.common.mixin.perf.cache_blockstate_cache_arrays;
 
 import net.minecraft.world.level.block.SupportType;
 import net.minecraft.core.Direction;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_model_materials/BlockModelMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.cache_model_materials;
+package org.embeddedt.modernfix.common.mixin.perf.cache_model_materials;
 
 import com.mojang.datafixers.util.Either;
 import net.minecraft.client.renderer.block.model.BlockModel;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_model_materials/MultipartMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.cache_model_materials;
+package org.embeddedt.modernfix.common.mixin.perf.cache_model_materials;
 
 import net.minecraft.client.renderer.block.model.multipart.MultiPart;
 import net.minecraft.resources.ResourceLocation;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_model_materials/VanillaModelMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.cache_model_materials;
+package org.embeddedt.modernfix.common.mixin.perf.cache_model_materials;
 
 import com.mojang.datafixers.util.Pair;
 import net.minecraft.client.renderer.block.model.BlockModel;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ChunkGeneratorMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.cache_strongholds;
+package org.embeddedt.modernfix.common.mixin.perf.cache_strongholds;
 
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerLevel;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.cache_strongholds;
+package org.embeddedt.modernfix.common.mixin.perf.cache_strongholds;
 
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.MinecraftServer;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_upgraded_structures/StructureManagerMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.cache_upgraded_structures;
+package org.embeddedt.modernfix.common.mixin.perf.cache_upgraded_structures;
 
 import com.mojang.datafixers.DataFixer;
 import net.minecraft.resources.ResourceLocation;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compress_biome_container/MixinBiomeContainer.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.compress_biome_container;
+package org.embeddedt.modernfix.common.mixin.perf.compress_biome_container;
 
 import it.unimi.dsi.fastutil.objects.Reference2ShortMap;
 import it.unimi.dsi.fastutil.objects.Reference2ShortOpenHashMap;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compress_blockstate/BlockBehaviourMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.compress_blockstate;
+package org.embeddedt.modernfix.common.mixin.perf.compress_blockstate;
 
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import net.minecraft.world.level.block.state.BlockState;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compress_blockstate/BlockStateBaseMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.compress_blockstate;
+package org.embeddedt.modernfix.common.mixin.perf.compress_blockstate;
 
 import com.google.common.collect.ImmutableMap;
 import com.mojang.serialization.MapCodec;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.dedicated_reload_executor;
+package org.embeddedt.modernfix.common.mixin.perf.dedicated_reload_executor;
 
 import net.minecraft.client.Minecraft;
 import org.embeddedt.modernfix.ModernFix;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftServerMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.dedicated_reload_executor;
+package org.embeddedt.modernfix.common.mixin.perf.dedicated_reload_executor;
 
 import net.minecraft.server.MinecraftServer;
 import org.embeddedt.modernfix.ModernFix;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/deduplicate_location/MixinResourceLocation.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.deduplicate_location;
+package org.embeddedt.modernfix.common.mixin.perf.deduplicate_location;
 
 import net.minecraft.resources.ResourceLocation;
 import org.embeddedt.modernfix.dedup.IdentifierCaches;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_dfu/DataFixersMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.dynamic_dfu;
+package org.embeddedt.modernfix.common.mixin.perf.dynamic_dfu;
 
 import com.mojang.datafixers.DataFixer;
 import net.minecraft.util.datafix.DataFixers;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockElementFaceDeserializerMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.dynamic_resources;
+package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources;
 
 import com.google.gson.JsonDeserializationContext;
 import com.google.gson.JsonElement;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockModelShaperMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.dynamic_resources;
+package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources;
 
 import net.minecraft.client.renderer.block.BlockModelShaper;
 import net.minecraft.client.resources.model.BakedModel;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemModelShaperMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.dynamic_resources;
+package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources;
 
 import net.minecraft.client.renderer.ItemModelShaper;
 import net.minecraft.client.resources.model.BakedModel;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemRendererMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.dynamic_resources;
+package org.embeddedt.modernfix.common.mixin.perf.dynamic_resources;
 
 import net.minecraft.client.renderer.ItemModelShaper;
 import net.minecraft.client.renderer.entity.ItemRenderer;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_structure_manager/StructureManagerMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.dynamic_structure_manager;
+package org.embeddedt.modernfix.common.mixin.perf.dynamic_structure_manager;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_font_loading/LegacyUnicodeBitmapsProviderMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.faster_font_loading;
+package org.embeddedt.modernfix.common.mixin.perf.faster_font_loading;
 
 import com.mojang.blaze3d.platform.NativeImage;
 import net.minecraft.client.gui.font.providers.LegacyUnicodeBitmapsProvider;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_texture_loading/TextureAtlasMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.faster_texture_loading;
+package org.embeddedt.modernfix.common.mixin.perf.faster_texture_loading;
 
 import com.mojang.blaze3d.platform.NativeImage;
 import com.mojang.datafixers.util.Pair;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_texture_stitching/StitcherMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.faster_texture_stitching;
+package org.embeddedt.modernfix.common.mixin.perf.faster_texture_stitching;
 
 import com.mojang.datafixers.util.Pair;
 import it.unimi.dsi.fastutil.objects.ObjectArrayList;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/BooleanPropertyMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.model_optimizations;
+package org.embeddedt.modernfix.common.mixin.perf.model_optimizations;
 
 import com.google.common.collect.ImmutableSet;
 import net.minecraft.world.level.block.state.properties.BooleanProperty;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/PropertyMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.model_optimizations;
+package org.embeddedt.modernfix.common.mixin.perf.model_optimizations;
 
 import net.minecraft.world.level.block.state.properties.Property;
 import org.embeddedt.modernfix.dedup.IdentifierCaches;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/SelectorMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.model_optimizations;
+package org.embeddedt.modernfix.common.mixin.perf.model_optimizations;
 
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/TransformationMatrixMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.model_optimizations;
+package org.embeddedt.modernfix.common.mixin.perf.model_optimizations;
 
 import com.mojang.math.Matrix4f;
 import com.mojang.math.Transformation;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/nbt_memory_usage/CompoundTagMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.nbt_memory_usage;
+package org.embeddedt.modernfix.common.mixin.perf.nbt_memory_usage;
 
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.nbt.Tag;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/nuke_empty_chunk_sections/MixinChunk.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.nuke_empty_chunk_sections;
+package org.embeddedt.modernfix.common.mixin.perf.nuke_empty_chunk_sections;
 
 import net.minecraft.world.level.ChunkPos;
 import net.minecraft.world.level.chunk.UpgradeData;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlockStateBaseMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.reduce_blockstate_cache_rebuilds;
+package org.embeddedt.modernfix.common.mixin.perf.reduce_blockstate_cache_rebuilds;
 
 import net.minecraft.world.level.block.state.BlockBehaviour;
 import org.embeddedt.modernfix.duck.IBlockState;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlocksMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.reduce_blockstate_cache_rebuilds;
+package org.embeddedt.modernfix.common.mixin.perf.reduce_blockstate_cache_rebuilds;
 
 import net.minecraft.world.level.block.Blocks;
 import org.embeddedt.modernfix.blockstate.BlockStateCacheHandler;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_biome_temperature_cache/BiomeMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.remove_biome_temperature_cache;
+package org.embeddedt.modernfix.common.mixin.perf.remove_biome_temperature_cache;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.biome.Biome;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_spawn_chunks/MinecraftServerMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.remove_spawn_chunks;
+package org.embeddedt.modernfix.common.mixin.perf.remove_spawn_chunks;
 
 import net.minecraft.server.MinecraftServer;
 import net.minecraft.server.level.ServerChunkCache;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_spawn_chunks/ServerChunkCacheAccessor.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.remove_spawn_chunks;
+package org.embeddedt.modernfix.common.mixin.perf.remove_spawn_chunks;
 
 import net.minecraft.server.level.DistanceManager;
 import net.minecraft.server.level.ServerChunkCache;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_spawn_chunks/ServerLevelMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.remove_spawn_chunks;
+package org.embeddedt.modernfix.common.mixin.perf.remove_spawn_chunks;
 
 import net.minecraft.server.level.ServerChunkCache;
 import net.minecraft.server.level.ServerLevel;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reuse_datapacks/MinecraftMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.reuse_datapacks;
+package org.embeddedt.modernfix.common.mixin.perf.reuse_datapacks;
 
 import com.google.common.collect.ImmutableList;
 import net.minecraft.client.Minecraft;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reuse_datapacks/MinecraftServerMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.reuse_datapacks;
+package org.embeddedt.modernfix.common.mixin.perf.reuse_datapacks;
 
 import com.google.common.collect.ImmutableList;
 import net.minecraft.client.Minecraft;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/state_definition_construct/StateDefinitionMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.state_definition_construct;
+package org.embeddedt.modernfix.common.mixin.perf.state_definition_construct;
 
 import com.google.common.collect.ImmutableSortedMap;
 import net.minecraft.world.level.block.state.StateDefinition;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/thread_priorities/IntegratedServerMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.thread_priorities;
+package org.embeddedt.modernfix.common.mixin.perf.thread_priorities;
 
 import com.mojang.authlib.GameProfileRepository;
 import com.mojang.authlib.minecraft.MinecraftSessionService;

common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/thread_priorities/UtilMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.thread_priorities;
+package org.embeddedt.modernfix.common.mixin.perf.thread_priorities;
 
 import net.minecraft.Util;
 import org.spongepowered.asm.mixin.Mixin;

common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/BlockColorsMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.safety;
+package org.embeddedt.modernfix.common.mixin.safety;
 
 import net.minecraft.client.color.block.BlockColors;
 import org.embeddedt.modernfix.annotation.ClientOnlyMixin;

common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/ItemColorsMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.safety;
+package org.embeddedt.modernfix.common.mixin.safety;
 
 import net.minecraft.client.color.item.ItemColors;
 import org.embeddedt.modernfix.annotation.ClientOnlyMixin;

common/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java

@@ -11,6 +11,7 @@ import org.spongepowered.asm.mixin.extensibility.IMixinInfo;
 
 import java.io.File;
 import java.util.*;
+import java.util.regex.Pattern;
 
 public class ModernFixMixinPlugin implements IMixinConfigPlugin {
     private static final String MIXIN_PACKAGE_ROOT = "org.embeddedt.modernfix.mixin.";
@@ -61,6 +62,7 @@ public class ModernFixMixinPlugin implements IMixinConfigPlugin {
 
     @Override
     public boolean shouldApplyMixin(String targetClassName, String mixinClassName) {
+        mixinClassName = ModernFixEarlyConfig.sanitize(mixinClassName);
         if (!mixinClassName.startsWith(MIXIN_PACKAGE_ROOT)) {
             this.logger.error("Expected mixin '{}' to start with package root '{}', treating as foreign and " +
                     "disabling!", mixinClassName, MIXIN_PACKAGE_ROOT);

common/src/main/java/org/embeddedt/modernfix/core/config/ModernFixEarlyConfig.java

@@ -17,6 +17,7 @@ import org.objectweb.asm.tree.ClassNode;
 import java.io.*;
 import java.nio.charset.StandardCharsets;
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 public class ModernFixEarlyConfig {
@@ -49,6 +50,12 @@ public class ModernFixEarlyConfig {
     private static final String MIXIN_CLIENT_ONLY_DESC = "Lorg/embeddedt/modernfix/annotation/ClientOnlyMixin;";
     private static final String MIXIN_REQUIRES_MOD_DESC = "Lorg/embeddedt/modernfix/annotation/RequiresMod;";
 
+    private static final Pattern PLATFORM_PREFIX = Pattern.compile("(forge|fabric|common)\\.");
+
+    public static String sanitize(String mixinClassName) {
+        return PLATFORM_PREFIX.matcher(mixinClassName).replaceFirst("");
+    }
+
     private final Set<String> mixinOptions = new ObjectOpenHashSet<>();
     private final Map<String, String> mixinsMissingMods = new Object2ObjectOpenHashMap<>();
 
@@ -66,8 +73,9 @@ public class ModernFixEarlyConfig {
             try(Reader reader = new BufferedReader(new InputStreamReader(stream, StandardCharsets.UTF_8))) {
                 JsonObject configObject = (JsonObject)new JsonParser().parse(reader);
                 JsonArray mixinList = configObject.getAsJsonArray("mixins");
+                String packageName = configObject.get("package").getAsString().replace('.', '/');
                 for(JsonElement mixin : mixinList) {
-                    mixinPaths.add("org/embeddedt/modernfix/mixin/" + mixin.getAsString().replace('.', '/') + ".class");
+                    mixinPaths.add(packageName + "/" + mixin.getAsString().replace('.', '/') + ".class");
                 }
             } catch(IOException | JsonParseException e) {
                 LOGGER.error("Error loading config " + configFile, e);
@@ -102,7 +110,7 @@ public class ModernFixEarlyConfig {
                     }
                 }
                 if(isMixin) {
-                    String mixinClassName = node.name.replace("org/embeddedt/modernfix/mixin/", "").replace('/', '.');
+                    String mixinClassName = sanitize(node.name.replace('/', '.')).replace("org.embeddedt.modernfix.mixin.", "");
                     if(!requiredModPresent)
                         mixinsMissingMods.put(mixinClassName, requiredModId);
                     else if(isClientOnly && !ModernFixPlatformHooks.isClient())

common/src/main/resources/modernfix-common.mixins.json

@@ -1,7 +1,7 @@
 {
   "required": true,
   "minVersion": "0.8",
-  "package": "org.embeddedt.modernfix.mixin",
+  "package": "org.embeddedt.modernfix.common.mixin",
   "plugin": "org.embeddedt.modernfix.core.ModernFixMixinPlugin",
   "compatibilityLevel": "JAVA_8",
   "mixins": [

fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/ClientPlayNetHandlerMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.core;
+package org.embeddedt.modernfix.fabric.mixin.core;
 
 import net.minecraft.client.multiplayer.ClientPacketListener;
 import org.embeddedt.modernfix.ModernFixClientFabric;

fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/feature/branding/GuiMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.feature.branding;
+package org.embeddedt.modernfix.fabric.mixin.feature.branding;
 
 import net.minecraft.client.gui.components.DebugScreenOverlay;
 import org.embeddedt.modernfix.ModernFixClientFabric;

fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/feature/measure_time/MinecraftMixin_Fabric.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.feature.measure_time;
+package org.embeddedt.modernfix.fabric.mixin.feature.measure_time;
 
 import net.minecraft.client.Minecraft;
 import org.embeddedt.modernfix.ModernFixClient;

fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.dynamic_resources;
+package org.embeddedt.modernfix.fabric.mixin.perf.dynamic_resources;
 
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;

fabric/src/main/resources/modernfix-fabric.mixins.json

@@ -1,6 +1,6 @@
 {
   "required": true,
-  "package": "org.embeddedt.modernfix.mixin",
+  "package": "org.embeddedt.modernfix.fabric.mixin",
   "plugin": "org.embeddedt.modernfix.core.ModernFixMixinPlugin",
   "compatibilityLevel": "JAVA_8",
   "minVersion": "0.8",

forge/src/main/java/org/embeddedt/modernfix/duck/IExtendedForgeModelBakery.java

@@ -1,4 +0,0 @@
-package org.embeddedt.modernfix.duck;
-
-public interface IExtendedForgeModelBakery extends IExtendedModelBakery {
-}

forge/src/main/java/org/embeddedt/modernfix/forge/ModernFixConfig.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.core.config;
+package org.embeddedt.modernfix.forge;
 
 import com.google.common.collect.ImmutableList;
 import net.minecraft.resources.ResourceLocation;

forge/src/main/java/org/embeddedt/modernfix/forge/classloading/FastAccessTransformerList.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.classloading;
+package org.embeddedt.modernfix.forge.classloading;
 
 import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet;
 import net.minecraftforge.accesstransformer.AccessTransformer;

forge/src/main/java/org/embeddedt/modernfix/forge/classloading/ModFileScanDataDeduplicator.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.classloading;
+package org.embeddedt.modernfix.forge.classloading;
 
 import com.google.common.collect.Interner;
 import com.google.common.collect.Interners;

forge/src/main/java/org/embeddedt/modernfix/forge/classloading/ModernFixResourceFinder.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.classloading;
+package org.embeddedt.modernfix.forge.classloading;
 
 import com.google.common.collect.*;
 import net.minecraftforge.fml.loading.FMLLoader;

forge/src/main/java/org/embeddedt/modernfix/forge/dynamicresources/DynamicModelBakeEvent.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.dynamicresources;
+package org.embeddedt.modernfix.forge.dynamicresources;
 
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.client.resources.model.UnbakedModel;

forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixClientForge.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix;
+package org.embeddedt.modernfix.forge.init;
 
 import com.mojang.blaze3d.platform.InputConstants;
 import net.minecraft.client.KeyMapping;
@@ -9,6 +9,7 @@ import net.minecraftforge.client.event.RecipesUpdatedEvent;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.gui.ForgeIngameGui;
 import net.minecraftforge.client.settings.KeyConflictContext;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.TagsUpdatedEvent;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.world.WorldEvent;
@@ -21,6 +22,7 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.server.FMLServerStartedEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import org.embeddedt.modernfix.ModernFixClient;
 import org.embeddedt.modernfix.screen.ModernFixConfigScreen;
 
 public class ModernFixClientForge {

forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix;
+package org.embeddedt.modernfix.forge.init;
 
 import net.minecraft.world.item.Item;
 import net.minecraftforge.api.distmarker.Dist;
@@ -20,12 +20,14 @@ import net.minecraftforge.fml.network.FMLNetworkConstants;
 import net.minecraftforge.fml.server.ServerLifecycleHooks;
 import net.minecraftforge.registries.ForgeRegistries;
 import org.apache.commons.lang3.tuple.Pair;
-import org.embeddedt.modernfix.classloading.ModFileScanDataDeduplicator;
-import org.embeddedt.modernfix.core.config.ModernFixConfig;
+import org.embeddedt.modernfix.ModernFix;
+import org.embeddedt.modernfix.ModernFixClient;
+import org.embeddedt.modernfix.forge.classloading.ModFileScanDataDeduplicator;
+import org.embeddedt.modernfix.forge.ModernFixConfig;
 import org.embeddedt.modernfix.entity.EntityDataIDSyncHandler;
-import org.embeddedt.modernfix.packet.PacketHandler;
-import org.embeddedt.modernfix.registry.ObjectHolderClearer;
-import org.embeddedt.modernfix.util.KubeUtil;
+import org.embeddedt.modernfix.forge.packet.PacketHandler;
+import org.embeddedt.modernfix.forge.registry.ObjectHolderClearer;
+import org.embeddedt.modernfix.forge.util.KubeUtil;
 
 @Mod(ModernFix.MODID)
 public class ModernFixForge {
@@ -38,7 +40,7 @@ public class ModernFixForge {
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::commonSetup);
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onLoadComplete);
         FMLJavaModLoadingContext.get().getModEventBus().addGenericListener(Item.class, this::registerItems);
-        DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> MinecraftForge.EVENT_BUS.register(new ModernFixClient()));
+        DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> MinecraftForge.EVENT_BUS.register(new ModernFixClientForge()));
         ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.DISPLAYTEST, () -> Pair.of(() -> FMLNetworkConstants.IGNORESERVERONLY, (a, b) -> true));
         ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ModernFixConfig.COMMON_CONFIG);
         if(ModList.get().isLoaded("kubejs"))

forge/src/main/java/org/embeddedt/modernfix/forge/load/ModWorkManagerQueue.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.load;
+package org.embeddedt.modernfix.forge.load;
 
 import net.minecraftforge.fml.ModWorkManager;
 import net.minecraftforge.fml.common.ObfuscationReflectionHelper;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/chunk_deadlock/valhesia/BlockStateBaseMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.bugfix.chunk_deadlock.valhesia;
+package org.embeddedt.modernfix.forge.mixin.bugfix.chunk_deadlock.valhesia;
 
 import com.stal111.valhelsia_structures.init.ModBlocks;
 import net.minecraft.core.BlockPos;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/preserve_early_window_pos/WindowMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.bugfix.preserve_early_window_pos;
+package org.embeddedt.modernfix.forge.mixin.bugfix.preserve_early_window_pos;
 
 import com.mojang.blaze3d.platform.Monitor;
 import com.mojang.blaze3d.platform.ScreenManager;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/refinedstorage/te_bug/FluidExternalStorageCacheMixin.java

@@ -1,11 +1,11 @@
-package org.embeddedt.modernfix.mixin.bugfix.refinedstorage.te_bug;
+package org.embeddedt.modernfix.forge.mixin.bugfix.refinedstorage.te_bug;
 
 import com.refinedmods.refinedstorage.api.network.INetwork;
 import com.refinedmods.refinedstorage.apiimpl.storage.externalstorage.FluidExternalStorageCache;
 import net.minecraftforge.fluids.FluidStack;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import org.embeddedt.modernfix.annotation.RequiresMod;
-import org.embeddedt.modernfix.duck.rs.IFluidExternalStorageCache;
+import org.embeddedt.modernfix.forge.rs.IFluidExternalStorageCache;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/refinedstorage/te_bug/FluidExternalStorageMixin.java

@@ -1,10 +1,10 @@
-package org.embeddedt.modernfix.mixin.bugfix.refinedstorage.te_bug;
+package org.embeddedt.modernfix.forge.mixin.bugfix.refinedstorage.te_bug;
 
 import com.refinedmods.refinedstorage.apiimpl.storage.externalstorage.FluidExternalStorage;
 import com.refinedmods.refinedstorage.apiimpl.storage.externalstorage.FluidExternalStorageCache;
 import net.minecraftforge.fluids.capability.IFluidHandler;
 import org.embeddedt.modernfix.annotation.RequiresMod;
-import org.embeddedt.modernfix.duck.rs.IFluidExternalStorageCache;
+import org.embeddedt.modernfix.forge.rs.IFluidExternalStorageCache;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/refinedstorage/te_bug/FluidExternalStorageProviderMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.bugfix.refinedstorage.te_bug;
+package org.embeddedt.modernfix.forge.mixin.bugfix.refinedstorage.te_bug;
 
 import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorage;
 import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageContext;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/refinedstorage/te_bug/ItemExternalStorageCacheMixin.java

@@ -1,11 +1,11 @@
-package org.embeddedt.modernfix.mixin.bugfix.refinedstorage.te_bug;
+package org.embeddedt.modernfix.forge.mixin.bugfix.refinedstorage.te_bug;
 
 import com.refinedmods.refinedstorage.api.network.INetwork;
 import com.refinedmods.refinedstorage.apiimpl.storage.externalstorage.ItemExternalStorageCache;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
 import org.embeddedt.modernfix.annotation.RequiresMod;
-import org.embeddedt.modernfix.duck.rs.IItemExternalStorageCache;
+import org.embeddedt.modernfix.forge.rs.IItemExternalStorageCache;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 import org.spongepowered.asm.mixin.injection.At;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/refinedstorage/te_bug/ItemExternalStorageMixin.java

@@ -1,10 +1,10 @@
-package org.embeddedt.modernfix.mixin.bugfix.refinedstorage.te_bug;
+package org.embeddedt.modernfix.forge.mixin.bugfix.refinedstorage.te_bug;
 
 import com.refinedmods.refinedstorage.apiimpl.storage.externalstorage.ItemExternalStorage;
 import com.refinedmods.refinedstorage.apiimpl.storage.externalstorage.ItemExternalStorageCache;
 import net.minecraftforge.items.IItemHandler;
 import org.embeddedt.modernfix.annotation.RequiresMod;
-import org.embeddedt.modernfix.duck.rs.IItemExternalStorageCache;
+import org.embeddedt.modernfix.forge.rs.IItemExternalStorageCache;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/refinedstorage/te_bug/ItemExternalStorageProviderMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.bugfix.refinedstorage.te_bug;
+package org.embeddedt.modernfix.forge.mixin.bugfix.refinedstorage.te_bug;
 
 import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorage;
 import com.refinedmods.refinedstorage.api.storage.externalstorage.IExternalStorageContext;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/remove_block_chunkloading/RemoveBlockGoalMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.bugfix.remove_block_chunkloading;
+package org.embeddedt.modernfix.forge.mixin.bugfix.remove_block_chunkloading;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.entity.LivingEntity;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/starlight_emptiness/StarLightEngineMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.bugfix.starlight_emptiness;
+package org.embeddedt.modernfix.forge.mixin.bugfix.starlight_emptiness;
 
 import ca.spottedleaf.starlight.common.light.StarLightEngine;
 import net.minecraft.world.level.chunk.ChunkAccess;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/tf_cme_on_load/TwilightForestModMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.bugfix.tf_cme_on_load;
+package org.embeddedt.modernfix.forge.mixin.bugfix.tf_cme_on_load;
 
 import org.embeddedt.modernfix.annotation.RequiresMod;
 import org.spongepowered.asm.mixin.Mixin;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java

@@ -1,8 +1,8 @@
-package org.embeddedt.modernfix.mixin.core;
+package org.embeddedt.modernfix.forge.mixin.core;
 
 import net.minecraft.server.Bootstrap;
 import org.apache.logging.log4j.Logger;
-import org.embeddedt.modernfix.load.ModWorkManagerQueue;
+import org.embeddedt.modernfix.forge.load.ModWorkManagerQueue;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/devenv/GameDataMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.devenv;
+package org.embeddedt.modernfix.forge.mixin.devenv;
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.registries.ForgeRegistry;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/branding/BrandingControlMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.feature.branding;
+package org.embeddedt.modernfix.forge.mixin.feature.branding;
 
 import com.google.common.collect.ImmutableList;
 import net.minecraftforge.fml.BrandingControl;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/measure_time/MinecraftMixin_Forge.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.feature.measure_time;
+package org.embeddedt.modernfix.forge.mixin.feature.measure_time;
 
 import net.minecraft.client.Minecraft;
 import org.embeddedt.modernfix.ModernFixClient;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/ClientLifecycleHandlerMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.async_jei;
+package org.embeddedt.modernfix.forge.mixin.perf.async_jei;
 
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.helpers.IModIdHelper;
@@ -18,7 +18,7 @@ import org.embeddedt.modernfix.annotation.ClientOnlyMixin;
 import org.embeddedt.modernfix.annotation.RequiresMod;
 import org.embeddedt.modernfix.jei.async.JEILoadingInterruptedException;
 import org.embeddedt.modernfix.jei.async.JEIReloadThread;
-import org.embeddedt.modernfix.util.JEIUtil;
+import org.embeddedt.modernfix.forge.util.JEIUtil;
 import org.spongepowered.asm.mixin.Final;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Overwrite;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/IngredientListElementFactoryMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.async_jei;
+package org.embeddedt.modernfix.forge.mixin.perf.async_jei;
 
 import mezz.jei.api.ingredients.IIngredientType;
 import mezz.jei.api.runtime.IIngredientManager;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/InputConstantsMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.async_jei;
+package org.embeddedt.modernfix.forge.mixin.perf.async_jei;
 
 import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.blaze3d.systems.RenderSystem;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/JeiStarterMixin.java

@@ -1,4 +1,4 @@
-package org.embeddedt.modernfix.mixin.perf.async_jei;
+package org.embeddedt.modernfix.forge.mixin.perf.async_jei;
 
 import mezz.jei.api.IModPlugin;
 import mezz.jei.api.helpers.IModIdHelper;

forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/PluginCallerMixin.java

@@ -1,11 +1,11 @@
-package org.embeddedt.modernfix.mixin.perf.async_jei;
+package org.embeddedt.modernfix.forge.mixin.perf.async_jei;
 
 import mezz.jei.api.IModPlugin;
 import mezz.jei.load.PluginCaller;
 import net.minecraft.client.Minecraft;
 import org.embeddedt.modernfix.ModernFix;
 import org.embeddedt.modernfix.annotation.RequiresMod;
-import org.embeddedt.modernfix.core.config.ModernFixConfig;
+import org.embeddedt.modernfix.forge.ModernFixConfig;
 import org.embeddedt.modernfix.jei.async.IAsyncJeiStarter;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;