diff --git a/build.gradle b/build.gradle index 9282c0a9..be8ab7bf 100644 --- a/build.gradle +++ b/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('/', '.') diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/chunk_deadlock/ServerChunkCacheMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/chunk_deadlock/ServerChunkCacheMixin.java similarity index 98% rename from common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/chunk_deadlock/ServerChunkCacheMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/chunk_deadlock/ServerChunkCacheMixin.java index 4b675a62..682577bd 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/chunk_deadlock/ServerChunkCacheMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/concurrency/MinecraftMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/concurrency/MinecraftMixin.java similarity index 95% rename from common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/concurrency/MinecraftMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/concurrency/MinecraftMixin.java index 65e5c56c..875fcbd7 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/concurrency/MinecraftMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/concurrency/RenderTypeMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/concurrency/RenderTypeMixin.java similarity index 94% rename from common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/concurrency/RenderTypeMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/concurrency/RenderTypeMixin.java index d8c308c8..88e6b5f0 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/concurrency/RenderTypeMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/concurrency/StaticTagHelperMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/concurrency/StaticTagHelperMixin.java similarity index 93% rename from common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/concurrency/StaticTagHelperMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/concurrency/StaticTagHelperMixin.java index 17d1d698..ec164f9a 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/concurrency/StaticTagHelperMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/edge_chunk_not_saved/ChunkManagerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/edge_chunk_not_saved/ChunkManagerMixin.java similarity index 96% rename from common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/edge_chunk_not_saved/ChunkManagerMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/edge_chunk_not_saved/ChunkManagerMixin.java index 188deb57..eff09266 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/edge_chunk_not_saved/ChunkManagerMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/mc218112/SynchedEntityDataMixin_Client.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/mc218112/SynchedEntityDataMixin_Client.java similarity index 96% rename from common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/mc218112/SynchedEntityDataMixin_Client.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/mc218112/SynchedEntityDataMixin_Client.java index 18190e3f..b9cdf3f8 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/mc218112/SynchedEntityDataMixin_Client.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/packet_leak/ClientPlayNetHandlerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/packet_leak/ClientPlayNetHandlerMixin.java similarity index 95% rename from common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/packet_leak/ClientPlayNetHandlerMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/packet_leak/ClientPlayNetHandlerMixin.java index 3dade1ed..630007a8 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/packet_leak/ClientPlayNetHandlerMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/packet_leak/SCustomPayloadPlayPacketMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/packet_leak/SCustomPayloadPlayPacketMixin.java similarity index 96% rename from common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/packet_leak/SCustomPayloadPlayPacketMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/packet_leak/SCustomPayloadPlayPacketMixin.java index 3c010f70..083f0c0f 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/packet_leak/SCustomPayloadPlayPacketMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/paper_chunk_patches/ChunkHolderMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/ChunkHolderMixin.java similarity index 97% rename from common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/paper_chunk_patches/ChunkHolderMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/ChunkHolderMixin.java index 0a51f6d7..c255628f 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/paper_chunk_patches/ChunkHolderMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/paper_chunk_patches/ChunkMapMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/ChunkMapMixin.java similarity index 97% rename from common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/paper_chunk_patches/ChunkMapMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/ChunkMapMixin.java index bd17c10a..760ed078 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/paper_chunk_patches/ChunkMapMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/paper_chunk_patches/SortedArraySetMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/SortedArraySetMixin.java similarity index 95% rename from common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/paper_chunk_patches/SortedArraySetMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/bugfix/paper_chunk_patches/SortedArraySetMixin.java index ea9e9167..0587964f 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/paper_chunk_patches/SortedArraySetMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/core/SynchedEntityDataMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/core/SynchedEntityDataMixin.java similarity index 94% rename from common/src/main/java/org/embeddedt/modernfix/mixin/core/SynchedEntityDataMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/core/SynchedEntityDataMixin.java index 9b7e505a..9737a2f2 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/core/SynchedEntityDataMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/devenv/MinecraftMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/devenv/MinecraftMixin.java similarity index 93% rename from common/src/main/java/org/embeddedt/modernfix/mixin/devenv/MinecraftMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/devenv/MinecraftMixin.java index 3e4b86c4..7346e1fc 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/devenv/MinecraftMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/devenv/NarratorMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/devenv/NarratorMixin.java similarity index 92% rename from common/src/main/java/org/embeddedt/modernfix/mixin/devenv/NarratorMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/devenv/NarratorMixin.java index 8d02ba42..5781d336 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/devenv/NarratorMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/feature/direct_stack_trace/CrashReportMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/direct_stack_trace/CrashReportMixin.java similarity index 92% rename from common/src/main/java/org/embeddedt/modernfix/mixin/feature/direct_stack_trace/CrashReportMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/direct_stack_trace/CrashReportMixin.java index 2457a5b8..2841921c 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/feature/direct_stack_trace/CrashReportMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/feature/measure_time/BootstrapMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/BootstrapMixin.java similarity index 94% rename from common/src/main/java/org/embeddedt/modernfix/mixin/feature/measure_time/BootstrapMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/BootstrapMixin.java index 53f11afc..daadae10 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/feature/measure_time/BootstrapMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/feature/measure_time/MinecraftMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin.java similarity index 96% rename from common/src/main/java/org/embeddedt/modernfix/mixin/feature/measure_time/MinecraftMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/MinecraftMixin.java index 19329d3f..15888bc8 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/feature/measure_time/MinecraftMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/feature/measure_time/ProfiledReloadInstanceMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/ProfiledReloadInstanceMixin.java similarity index 93% rename from common/src/main/java/org/embeddedt/modernfix/mixin/feature/measure_time/ProfiledReloadInstanceMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/ProfiledReloadInstanceMixin.java index 27a1a77f..349c082e 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/feature/measure_time/ProfiledReloadInstanceMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/feature/measure_time/SimpleReloadableResourceManagerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/SimpleReloadableResourceManagerMixin.java similarity index 92% rename from common/src/main/java/org/embeddedt/modernfix/mixin/feature/measure_time/SimpleReloadableResourceManagerMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/feature/measure_time/SimpleReloadableResourceManagerMixin.java index 1164ac16..ccf30cb4 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/feature/measure_time/SimpleReloadableResourceManagerMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/biome_zoomer/FuzzyOffsetBiomeZoomerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/biome_zoomer/FuzzyOffsetBiomeZoomerMixin.java similarity index 96% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/biome_zoomer/FuzzyOffsetBiomeZoomerMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/biome_zoomer/FuzzyOffsetBiomeZoomerMixin.java index fc72b8d3..7692697c 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/biome_zoomer/FuzzyOffsetBiomeZoomerMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/boost_worker_count/UtilMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/boost_worker_count/UtilMixin.java similarity index 92% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/boost_worker_count/UtilMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/boost_worker_count/UtilMixin.java index cf5dd15a..30a87a4f 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/boost_worker_count/UtilMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_blockstate_cache_arrays/AbstractBlockStateCacheMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_blockstate_cache_arrays/AbstractBlockStateCacheMixin.java similarity index 93% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_blockstate_cache_arrays/AbstractBlockStateCacheMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_blockstate_cache_arrays/AbstractBlockStateCacheMixin.java index 5ddea843..c82fa598 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_blockstate_cache_arrays/AbstractBlockStateCacheMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_model_materials/BlockModelMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_model_materials/BlockModelMixin.java similarity index 98% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_model_materials/BlockModelMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_model_materials/BlockModelMixin.java index 4796d40b..e9261426 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_model_materials/BlockModelMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_model_materials/MultipartMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_model_materials/MultipartMixin.java similarity index 93% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_model_materials/MultipartMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_model_materials/MultipartMixin.java index 51655b03..4d620db9 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_model_materials/MultipartMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_model_materials/VanillaModelMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_model_materials/VanillaModelMixin.java similarity index 96% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_model_materials/VanillaModelMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_model_materials/VanillaModelMixin.java index 04594dd4..96c455fe 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_model_materials/VanillaModelMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_strongholds/ChunkGeneratorMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ChunkGeneratorMixin.java similarity index 97% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_strongholds/ChunkGeneratorMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ChunkGeneratorMixin.java index 7ea2104d..761e0121 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_strongholds/ChunkGeneratorMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_strongholds/ServerLevelMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java similarity index 97% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_strongholds/ServerLevelMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_strongholds/ServerLevelMixin.java index 57332c5e..f23db308 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_strongholds/ServerLevelMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_upgraded_structures/StructureManagerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_upgraded_structures/StructureManagerMixin.java similarity index 94% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_upgraded_structures/StructureManagerMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/cache_upgraded_structures/StructureManagerMixin.java index b275666b..a6133fcd 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/cache_upgraded_structures/StructureManagerMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/compress_biome_container/MixinBiomeContainer.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compress_biome_container/MixinBiomeContainer.java similarity index 98% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/compress_biome_container/MixinBiomeContainer.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compress_biome_container/MixinBiomeContainer.java index d9abc9ab..66029f83 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/compress_biome_container/MixinBiomeContainer.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/compress_blockstate/BlockBehaviourMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compress_blockstate/BlockBehaviourMixin.java similarity index 84% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/compress_blockstate/BlockBehaviourMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compress_blockstate/BlockBehaviourMixin.java index 852b8f52..08bb7a52 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/compress_blockstate/BlockBehaviourMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/compress_blockstate/BlockStateBaseMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compress_blockstate/BlockStateBaseMixin.java similarity index 98% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/compress_blockstate/BlockStateBaseMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compress_blockstate/BlockStateBaseMixin.java index c3eeabd6..630c0234 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/compress_blockstate/BlockStateBaseMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/dedicated_reload_executor/MinecraftMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftMixin.java similarity index 90% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/dedicated_reload_executor/MinecraftMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftMixin.java index f0cc1747..6149a2c9 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/dedicated_reload_executor/MinecraftMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/dedicated_reload_executor/MinecraftServerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftServerMixin.java similarity index 90% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/dedicated_reload_executor/MinecraftServerMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dedicated_reload_executor/MinecraftServerMixin.java index 64204521..0eacee56 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/dedicated_reload_executor/MinecraftServerMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/deduplicate_location/MixinResourceLocation.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/deduplicate_location/MixinResourceLocation.java similarity index 92% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/deduplicate_location/MixinResourceLocation.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/deduplicate_location/MixinResourceLocation.java index aff6436e..eb2c8cba 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/deduplicate_location/MixinResourceLocation.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_dfu/DataFixersMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_dfu/DataFixersMixin.java similarity index 94% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_dfu/DataFixersMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_dfu/DataFixersMixin.java index f8e48cfa..71aea5e0 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_dfu/DataFixersMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/BlockElementFaceDeserializerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockElementFaceDeserializerMixin.java similarity index 94% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/BlockElementFaceDeserializerMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockElementFaceDeserializerMixin.java index 2d2c8214..2cd4a853 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/BlockElementFaceDeserializerMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/BlockModelShaperMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockModelShaperMixin.java similarity index 94% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/BlockModelShaperMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/BlockModelShaperMixin.java index b0fde164..6e4f35ba 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/BlockModelShaperMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ItemModelShaperMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemModelShaperMixin.java similarity index 97% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ItemModelShaperMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemModelShaperMixin.java index aaa93b1a..7472760d 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ItemModelShaperMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ItemRendererMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemRendererMixin.java similarity index 93% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ItemRendererMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_resources/ItemRendererMixin.java index 27e4e5d5..79b2d1d3 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ItemRendererMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_structure_manager/StructureManagerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_structure_manager/StructureManagerMixin.java similarity index 95% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_structure_manager/StructureManagerMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/dynamic_structure_manager/StructureManagerMixin.java index 4384dbcf..a68478d4 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_structure_manager/StructureManagerMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/faster_font_loading/LegacyUnicodeBitmapsProviderMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_font_loading/LegacyUnicodeBitmapsProviderMixin.java similarity index 97% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/faster_font_loading/LegacyUnicodeBitmapsProviderMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_font_loading/LegacyUnicodeBitmapsProviderMixin.java index 2da49308..e207de84 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/faster_font_loading/LegacyUnicodeBitmapsProviderMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/faster_texture_loading/TextureAtlasMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_texture_loading/TextureAtlasMixin.java similarity index 98% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/faster_texture_loading/TextureAtlasMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_texture_loading/TextureAtlasMixin.java index 45964183..7de5e189 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/faster_texture_loading/TextureAtlasMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/faster_texture_stitching/StitcherMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_texture_stitching/StitcherMixin.java similarity index 97% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/faster_texture_stitching/StitcherMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/faster_texture_stitching/StitcherMixin.java index 47e1878c..88924e9d 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/faster_texture_stitching/StitcherMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/model_optimizations/BooleanPropertyMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/BooleanPropertyMixin.java similarity index 91% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/model_optimizations/BooleanPropertyMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/BooleanPropertyMixin.java index 934449b7..f1fc0628 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/model_optimizations/BooleanPropertyMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/model_optimizations/PropertyMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/PropertyMixin.java similarity index 94% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/model_optimizations/PropertyMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/PropertyMixin.java index 6cb7b18c..b23735bf 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/model_optimizations/PropertyMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/model_optimizations/SelectorMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/SelectorMixin.java similarity index 95% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/model_optimizations/SelectorMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/SelectorMixin.java index dc0761aa..e4c818c7 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/model_optimizations/SelectorMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/model_optimizations/TransformationMatrixMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/TransformationMatrixMixin.java similarity index 92% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/model_optimizations/TransformationMatrixMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/model_optimizations/TransformationMatrixMixin.java index bda0834d..2b5bc8d8 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/model_optimizations/TransformationMatrixMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/nbt_memory_usage/CompoundTagMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/nbt_memory_usage/CompoundTagMixin.java similarity index 95% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/nbt_memory_usage/CompoundTagMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/nbt_memory_usage/CompoundTagMixin.java index 76c5ed14..4a12e9b1 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/nbt_memory_usage/CompoundTagMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/nuke_empty_chunk_sections/MixinChunk.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/nuke_empty_chunk_sections/MixinChunk.java similarity index 95% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/nuke_empty_chunk_sections/MixinChunk.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/nuke_empty_chunk_sections/MixinChunk.java index a6b6e1a1..18952296 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/nuke_empty_chunk_sections/MixinChunk.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/reduce_blockstate_cache_rebuilds/BlockStateBaseMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlockStateBaseMixin.java similarity index 95% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/reduce_blockstate_cache_rebuilds/BlockStateBaseMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlockStateBaseMixin.java index 815d307a..76d9fadf 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/reduce_blockstate_cache_rebuilds/BlockStateBaseMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/reduce_blockstate_cache_rebuilds/BlocksMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlocksMixin.java similarity index 87% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/reduce_blockstate_cache_rebuilds/BlocksMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reduce_blockstate_cache_rebuilds/BlocksMixin.java index 12de7b98..c72bd661 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/reduce_blockstate_cache_rebuilds/BlocksMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/remove_biome_temperature_cache/BiomeMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_biome_temperature_cache/BiomeMixin.java similarity index 88% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/remove_biome_temperature_cache/BiomeMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_biome_temperature_cache/BiomeMixin.java index 36a1991d..03b45602 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/remove_biome_temperature_cache/BiomeMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/remove_spawn_chunks/MinecraftServerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_spawn_chunks/MinecraftServerMixin.java similarity index 94% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/remove_spawn_chunks/MinecraftServerMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_spawn_chunks/MinecraftServerMixin.java index e6163627..411766e5 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/remove_spawn_chunks/MinecraftServerMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/remove_spawn_chunks/ServerChunkCacheAccessor.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_spawn_chunks/ServerChunkCacheAccessor.java similarity index 83% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/remove_spawn_chunks/ServerChunkCacheAccessor.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_spawn_chunks/ServerChunkCacheAccessor.java index 76ed3c26..1ae8cbaa 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/remove_spawn_chunks/ServerChunkCacheAccessor.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/remove_spawn_chunks/ServerLevelMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_spawn_chunks/ServerLevelMixin.java similarity index 94% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/remove_spawn_chunks/ServerLevelMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/remove_spawn_chunks/ServerLevelMixin.java index 7e61e732..f9b39b5f 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/remove_spawn_chunks/ServerLevelMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/reuse_datapacks/MinecraftMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reuse_datapacks/MinecraftMixin.java similarity index 98% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/reuse_datapacks/MinecraftMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reuse_datapacks/MinecraftMixin.java index f4645d60..6a5c2bd0 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/reuse_datapacks/MinecraftMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/reuse_datapacks/MinecraftServerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reuse_datapacks/MinecraftServerMixin.java similarity index 95% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/reuse_datapacks/MinecraftServerMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/reuse_datapacks/MinecraftServerMixin.java index 3231ecf2..66d76c21 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/reuse_datapacks/MinecraftServerMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/state_definition_construct/StateDefinitionMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/state_definition_construct/StateDefinitionMixin.java similarity index 94% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/state_definition_construct/StateDefinitionMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/state_definition_construct/StateDefinitionMixin.java index 867fbc26..1d32168d 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/state_definition_construct/StateDefinitionMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/thread_priorities/IntegratedServerMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/thread_priorities/IntegratedServerMixin.java similarity index 95% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/thread_priorities/IntegratedServerMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/thread_priorities/IntegratedServerMixin.java index 908e3ae4..731cfc7d 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/thread_priorities/IntegratedServerMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/thread_priorities/UtilMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/thread_priorities/UtilMixin.java similarity index 93% rename from common/src/main/java/org/embeddedt/modernfix/mixin/perf/thread_priorities/UtilMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/thread_priorities/UtilMixin.java index a764f519..71c7cb30 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/perf/thread_priorities/UtilMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/safety/BlockColorsMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/BlockColorsMixin.java similarity index 94% rename from common/src/main/java/org/embeddedt/modernfix/mixin/safety/BlockColorsMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/BlockColorsMixin.java index 5d1ffed0..38e360fb 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/safety/BlockColorsMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/mixin/safety/ItemColorsMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/ItemColorsMixin.java similarity index 93% rename from common/src/main/java/org/embeddedt/modernfix/mixin/safety/ItemColorsMixin.java rename to common/src/main/java/org/embeddedt/modernfix/common/mixin/safety/ItemColorsMixin.java index cc921521..b213ecb3 100644 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/safety/ItemColorsMixin.java +++ b/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; diff --git a/common/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java b/common/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java index 7e6e3252..f423bd1c 100644 --- a/common/src/main/java/org/embeddedt/modernfix/core/ModernFixMixinPlugin.java +++ b/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); 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 46f0d5fb..d91e5fc5 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 @@ -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 mixinOptions = new ObjectOpenHashSet<>(); private final Map 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()) diff --git a/common/src/main/resources/modernfix-common.mixins.json b/common/src/main/resources/modernfix-common.mixins.json index 08cf8500..352229f9 100644 --- a/common/src/main/resources/modernfix-common.mixins.json +++ b/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": [ diff --git a/fabric/src/main/java/org/embeddedt/modernfix/mixin/core/ClientPlayNetHandlerMixin.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/ClientPlayNetHandlerMixin.java similarity index 93% rename from fabric/src/main/java/org/embeddedt/modernfix/mixin/core/ClientPlayNetHandlerMixin.java rename to fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/core/ClientPlayNetHandlerMixin.java index ec2bad9d..cd825dcf 100644 --- a/fabric/src/main/java/org/embeddedt/modernfix/mixin/core/ClientPlayNetHandlerMixin.java +++ b/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; diff --git a/fabric/src/main/java/org/embeddedt/modernfix/mixin/feature/branding/GuiMixin.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/feature/branding/GuiMixin.java similarity index 91% rename from fabric/src/main/java/org/embeddedt/modernfix/mixin/feature/branding/GuiMixin.java rename to fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/feature/branding/GuiMixin.java index e963119f..61264955 100644 --- a/fabric/src/main/java/org/embeddedt/modernfix/mixin/feature/branding/GuiMixin.java +++ b/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; diff --git a/fabric/src/main/java/org/embeddedt/modernfix/mixin/feature/measure_time/MinecraftMixin_Fabric.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/feature/measure_time/MinecraftMixin_Fabric.java similarity index 90% rename from fabric/src/main/java/org/embeddedt/modernfix/mixin/feature/measure_time/MinecraftMixin_Fabric.java rename to fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/feature/measure_time/MinecraftMixin_Fabric.java index b2132f7d..caf6bf49 100644 --- a/fabric/src/main/java/org/embeddedt/modernfix/mixin/feature/measure_time/MinecraftMixin_Fabric.java +++ b/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; diff --git a/fabric/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java similarity index 99% rename from fabric/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ModelBakeryMixin.java rename to fabric/src/main/java/org/embeddedt/modernfix/fabric/mixin/perf/dynamic_resources/ModelBakeryMixin.java index 5109ccb2..d81f62cf 100644 --- a/fabric/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ModelBakeryMixin.java +++ b/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; diff --git a/fabric/src/main/resources/modernfix-fabric.mixins.json b/fabric/src/main/resources/modernfix-fabric.mixins.json index 8835aec2..c6246634 100644 --- a/fabric/src/main/resources/modernfix-fabric.mixins.json +++ b/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", diff --git a/forge/src/main/java/org/embeddedt/modernfix/duck/IExtendedForgeModelBakery.java b/forge/src/main/java/org/embeddedt/modernfix/duck/IExtendedForgeModelBakery.java deleted file mode 100644 index 0729fd1a..00000000 --- a/forge/src/main/java/org/embeddedt/modernfix/duck/IExtendedForgeModelBakery.java +++ /dev/null @@ -1,4 +0,0 @@ -package org.embeddedt.modernfix.duck; - -public interface IExtendedForgeModelBakery extends IExtendedModelBakery { -} diff --git a/forge/src/main/java/org/embeddedt/modernfix/core/config/ModernFixConfig.java b/forge/src/main/java/org/embeddedt/modernfix/forge/ModernFixConfig.java similarity index 96% rename from forge/src/main/java/org/embeddedt/modernfix/core/config/ModernFixConfig.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/ModernFixConfig.java index 5ff68b43..268344a9 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/core/config/ModernFixConfig.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/classloading/FastAccessTransformerList.java b/forge/src/main/java/org/embeddedt/modernfix/forge/classloading/FastAccessTransformerList.java similarity index 98% rename from forge/src/main/java/org/embeddedt/modernfix/classloading/FastAccessTransformerList.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/classloading/FastAccessTransformerList.java index 8aa229bd..8a97179b 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/classloading/FastAccessTransformerList.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/classloading/ModFileScanDataDeduplicator.java b/forge/src/main/java/org/embeddedt/modernfix/forge/classloading/ModFileScanDataDeduplicator.java similarity index 98% rename from forge/src/main/java/org/embeddedt/modernfix/classloading/ModFileScanDataDeduplicator.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/classloading/ModFileScanDataDeduplicator.java index 0604a4f1..9e5af881 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/classloading/ModFileScanDataDeduplicator.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/classloading/ModernFixResourceFinder.java b/forge/src/main/java/org/embeddedt/modernfix/forge/classloading/ModernFixResourceFinder.java similarity index 99% rename from forge/src/main/java/org/embeddedt/modernfix/classloading/ModernFixResourceFinder.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/classloading/ModernFixResourceFinder.java index 6c523043..01b76015 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/classloading/ModernFixResourceFinder.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicModelBakeEvent.java b/forge/src/main/java/org/embeddedt/modernfix/forge/dynamicresources/DynamicModelBakeEvent.java similarity index 96% rename from forge/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicModelBakeEvent.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/dynamicresources/DynamicModelBakeEvent.java index 312d5a4a..fc475ff6 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/dynamicresources/DynamicModelBakeEvent.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/ModernFixClientForge.java b/forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixClientForge.java similarity index 96% rename from forge/src/main/java/org/embeddedt/modernfix/ModernFixClientForge.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixClientForge.java index b361e948..ac42856a 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/ModernFixClientForge.java +++ b/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 { diff --git a/forge/src/main/java/org/embeddedt/modernfix/ModernFixForge.java b/forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java similarity index 89% rename from forge/src/main/java/org/embeddedt/modernfix/ModernFixForge.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/init/ModernFixForge.java index 6444a84c..09d88b53 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/ModernFixForge.java +++ b/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")) diff --git a/forge/src/main/java/org/embeddedt/modernfix/load/ModWorkManagerQueue.java b/forge/src/main/java/org/embeddedt/modernfix/forge/load/ModWorkManagerQueue.java similarity index 98% rename from forge/src/main/java/org/embeddedt/modernfix/load/ModWorkManagerQueue.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/load/ModWorkManagerQueue.java index b7ca9080..30909f11 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/load/ModWorkManagerQueue.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/chunk_deadlock/valhesia/BlockStateBaseMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/chunk_deadlock/valhesia/BlockStateBaseMixin.java similarity index 94% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/chunk_deadlock/valhesia/BlockStateBaseMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/chunk_deadlock/valhesia/BlockStateBaseMixin.java index c6e4f726..10ed695d 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/chunk_deadlock/valhesia/BlockStateBaseMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/preserve_early_window_pos/WindowMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/preserve_early_window_pos/WindowMixin.java similarity index 97% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/preserve_early_window_pos/WindowMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/preserve_early_window_pos/WindowMixin.java index 8ce0fa71..a543b777 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/preserve_early_window_pos/WindowMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/refinedstorage/te_bug/FluidExternalStorageCacheMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/refinedstorage/te_bug/FluidExternalStorageCacheMixin.java similarity index 92% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/refinedstorage/te_bug/FluidExternalStorageCacheMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/refinedstorage/te_bug/FluidExternalStorageCacheMixin.java index 924dcb8e..b199e781 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/refinedstorage/te_bug/FluidExternalStorageCacheMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/refinedstorage/te_bug/FluidExternalStorageMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/refinedstorage/te_bug/FluidExternalStorageMixin.java similarity index 89% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/refinedstorage/te_bug/FluidExternalStorageMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/refinedstorage/te_bug/FluidExternalStorageMixin.java index 83ffc56e..d45ae1e7 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/refinedstorage/te_bug/FluidExternalStorageMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/refinedstorage/te_bug/FluidExternalStorageProviderMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/refinedstorage/te_bug/FluidExternalStorageProviderMixin.java similarity index 96% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/refinedstorage/te_bug/FluidExternalStorageProviderMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/refinedstorage/te_bug/FluidExternalStorageProviderMixin.java index ccc4c730..2510342c 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/refinedstorage/te_bug/FluidExternalStorageProviderMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/refinedstorage/te_bug/ItemExternalStorageCacheMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/refinedstorage/te_bug/ItemExternalStorageCacheMixin.java similarity index 92% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/refinedstorage/te_bug/ItemExternalStorageCacheMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/refinedstorage/te_bug/ItemExternalStorageCacheMixin.java index 2f2cde14..e065f9a7 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/refinedstorage/te_bug/ItemExternalStorageCacheMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/refinedstorage/te_bug/ItemExternalStorageMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/refinedstorage/te_bug/ItemExternalStorageMixin.java similarity index 88% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/refinedstorage/te_bug/ItemExternalStorageMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/refinedstorage/te_bug/ItemExternalStorageMixin.java index da8ba691..7674fd67 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/refinedstorage/te_bug/ItemExternalStorageMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/refinedstorage/te_bug/ItemExternalStorageProviderMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/refinedstorage/te_bug/ItemExternalStorageProviderMixin.java similarity index 96% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/refinedstorage/te_bug/ItemExternalStorageProviderMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/refinedstorage/te_bug/ItemExternalStorageProviderMixin.java index a08b86dc..85e97e08 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/refinedstorage/te_bug/ItemExternalStorageProviderMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/remove_block_chunkloading/RemoveBlockGoalMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/remove_block_chunkloading/RemoveBlockGoalMixin.java similarity index 95% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/remove_block_chunkloading/RemoveBlockGoalMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/remove_block_chunkloading/RemoveBlockGoalMixin.java index 4f5d4521..1b012928 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/remove_block_chunkloading/RemoveBlockGoalMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/starlight_emptiness/StarLightEngineMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/starlight_emptiness/StarLightEngineMixin.java similarity index 96% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/starlight_emptiness/StarLightEngineMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/starlight_emptiness/StarLightEngineMixin.java index e04aecc5..e50f321d 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/starlight_emptiness/StarLightEngineMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/tf_cme_on_load/TwilightForestModMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/tf_cme_on_load/TwilightForestModMixin.java similarity index 93% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/tf_cme_on_load/TwilightForestModMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/bugfix/tf_cme_on_load/TwilightForestModMixin.java index 32dbcba3..cae4ffe7 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/bugfix/tf_cme_on_load/TwilightForestModMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/core/BootstrapMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java similarity index 87% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/core/BootstrapMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/core/BootstrapMixin.java index 4ec57d04..c80304af 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/core/BootstrapMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/devenv/GameDataMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/devenv/GameDataMixin.java similarity index 91% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/devenv/GameDataMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/devenv/GameDataMixin.java index 34f531a3..c9ab0be9 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/devenv/GameDataMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/feature/branding/BrandingControlMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/branding/BrandingControlMixin.java similarity index 94% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/feature/branding/BrandingControlMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/branding/BrandingControlMixin.java index 2ed56969..d00c48c6 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/feature/branding/BrandingControlMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/feature/measure_time/MinecraftMixin_Forge.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/measure_time/MinecraftMixin_Forge.java similarity index 90% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/feature/measure_time/MinecraftMixin_Forge.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/feature/measure_time/MinecraftMixin_Forge.java index 93c30028..b0695b87 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/feature/measure_time/MinecraftMixin_Forge.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/ClientLifecycleHandlerMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/ClientLifecycleHandlerMixin.java similarity index 97% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/ClientLifecycleHandlerMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/ClientLifecycleHandlerMixin.java index 1d23549a..f245b7f6 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/ClientLifecycleHandlerMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/IngredientListElementFactoryMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/IngredientListElementFactoryMixin.java similarity index 95% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/IngredientListElementFactoryMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/IngredientListElementFactoryMixin.java index 58222135..0638b900 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/IngredientListElementFactoryMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/InputConstantsMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/InputConstantsMixin.java similarity index 92% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/InputConstantsMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/InputConstantsMixin.java index 304aafaa..e5b49c66 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/InputConstantsMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/JeiStarterMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/JeiStarterMixin.java similarity index 97% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/JeiStarterMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/JeiStarterMixin.java index 6a8796c6..88a724ec 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/JeiStarterMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/PluginCallerMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/PluginCallerMixin.java similarity index 93% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/PluginCallerMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/PluginCallerMixin.java index 37dd6e34..408ba391 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/PluginCallerMixin.java +++ b/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; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/RecipeManagerInternalMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/RecipeManagerInternalMixin.java similarity index 94% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/RecipeManagerInternalMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/RecipeManagerInternalMixin.java index 56b4988d..d191d227 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_jei/RecipeManagerInternalMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_jei/RecipeManagerInternalMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.async_jei; +package org.embeddedt.modernfix.forge.mixin.perf.async_jei; import com.google.common.collect.ImmutableListMultimap; import mezz.jei.recipes.RecipeManagerInternal; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/CommandSourceStackAccess.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/CommandSourceStackAccess.java similarity index 82% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/CommandSourceStackAccess.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/CommandSourceStackAccess.java index e8073943..fd85b2e1 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/CommandSourceStackAccess.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/CommandSourceStackAccess.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.async_locator; +package org.embeddedt.modernfix.forge.mixin.perf.async_locator; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/DolphinSwimToTreasureGoalMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/DolphinSwimToTreasureGoalMixin.java similarity index 96% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/DolphinSwimToTreasureGoalMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/DolphinSwimToTreasureGoalMixin.java index bd79c9a0..8e824b84 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/DolphinSwimToTreasureGoalMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/DolphinSwimToTreasureGoalMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.async_locator; +package org.embeddedt.modernfix.forge.mixin.perf.async_locator; import com.google.common.collect.ImmutableSet; import net.minecraft.core.BlockPos; @@ -6,7 +6,7 @@ import net.minecraft.server.level.ServerLevel; import net.minecraft.world.entity.animal.Dolphin; import net.minecraft.world.level.levelgen.feature.StructureFeature; import org.embeddedt.modernfix.ModernFix; -import org.embeddedt.modernfix.structure.AsyncLocator; +import org.embeddedt.modernfix.forge.structure.AsyncLocator; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/EnderEyeItemMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/EnderEyeItemMixin.java similarity index 96% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/EnderEyeItemMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/EnderEyeItemMixin.java index 1ff2310d..e97504be 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/EnderEyeItemMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/EnderEyeItemMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.async_locator; +package org.embeddedt.modernfix.forge.mixin.perf.async_locator; import net.minecraft.advancements.critereon.UsedEnderEyeTrigger; import net.minecraft.core.BlockPos; @@ -15,7 +15,7 @@ import net.minecraft.world.level.Level; import net.minecraft.world.level.chunk.ChunkGenerator; import net.minecraft.world.level.levelgen.feature.StructureFeature; import net.minecraft.world.phys.HitResult; -import org.embeddedt.modernfix.structure.logic.EnderEyeItemLogic; +import org.embeddedt.modernfix.forge.structure.logic.EnderEyeItemLogic; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/ExplorationMapFunctionMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/ExplorationMapFunctionMixin.java similarity index 92% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/ExplorationMapFunctionMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/ExplorationMapFunctionMixin.java index 3412fffe..ee105c72 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/ExplorationMapFunctionMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/ExplorationMapFunctionMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.async_locator; +package org.embeddedt.modernfix.forge.mixin.perf.async_locator; import net.minecraft.core.BlockPos; import net.minecraft.server.level.ServerLevel; @@ -8,7 +8,7 @@ import net.minecraft.world.level.saveddata.maps.MapDecoration; import net.minecraft.world.level.storage.loot.LootContext; import net.minecraft.world.level.storage.loot.functions.ExplorationMapFunction; import net.minecraft.world.phys.Vec3; -import org.embeddedt.modernfix.structure.logic.ExplorationMapFunctionLogic; +import org.embeddedt.modernfix.forge.structure.logic.ExplorationMapFunctionLogic; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/EyeOfEnderAccess.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/EyeOfEnderAccess.java similarity index 79% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/EyeOfEnderAccess.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/EyeOfEnderAccess.java index ee8e8861..c35be48b 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/EyeOfEnderAccess.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/EyeOfEnderAccess.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.async_locator; +package org.embeddedt.modernfix.forge.mixin.perf.async_locator; import net.minecraft.world.entity.projectile.EyeOfEnder; import org.spongepowered.asm.mixin.Mixin; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/EyeOfEnderMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/EyeOfEnderMixin.java similarity index 88% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/EyeOfEnderMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/EyeOfEnderMixin.java index 0b3eadf8..74205bf3 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/EyeOfEnderMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/EyeOfEnderMixin.java @@ -1,7 +1,7 @@ -package org.embeddedt.modernfix.mixin.perf.async_locator; +package org.embeddedt.modernfix.forge.mixin.perf.async_locator; import net.minecraft.world.entity.projectile.EyeOfEnder; -import org.embeddedt.modernfix.structure.logic.EyeOfEnderData; +import org.embeddedt.modernfix.forge.structure.logic.EyeOfEnderData; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/LocateCommandAccess.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/LocateCommandAccess.java similarity index 86% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/LocateCommandAccess.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/LocateCommandAccess.java index 12cd19b5..385e5b71 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/LocateCommandAccess.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/LocateCommandAccess.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.async_locator; +package org.embeddedt.modernfix.forge.mixin.perf.async_locator; import com.mojang.brigadier.exceptions.SimpleCommandExceptionType; import net.minecraft.server.commands.LocateCommand; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/LocateCommandMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/LocateCommandMixin.java similarity index 90% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/LocateCommandMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/LocateCommandMixin.java index d02bddf6..3adf2789 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/LocateCommandMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/LocateCommandMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.async_locator; +package org.embeddedt.modernfix.forge.mixin.perf.async_locator; import net.minecraft.commands.CommandSource; import net.minecraft.commands.CommandSourceStack; @@ -6,7 +6,7 @@ import net.minecraft.server.MinecraftServer; import net.minecraft.server.commands.LocateCommand; import net.minecraft.server.level.ServerPlayer; import net.minecraft.world.level.levelgen.feature.StructureFeature; -import org.embeddedt.modernfix.structure.logic.LocateCommandLogic; +import org.embeddedt.modernfix.forge.structure.logic.LocateCommandLogic; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/MapItemAccess.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/MapItemAccess.java similarity index 90% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/MapItemAccess.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/MapItemAccess.java index 890b90b6..5dafab18 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/MapItemAccess.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/MapItemAccess.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.async_locator; +package org.embeddedt.modernfix.forge.mixin.perf.async_locator; import net.minecraft.resources.ResourceKey; import net.minecraft.world.item.ItemStack; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/MerchantOfferAccess.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/MerchantOfferAccess.java similarity index 83% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/MerchantOfferAccess.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/MerchantOfferAccess.java index d9d5bfb2..3dac2518 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/MerchantOfferAccess.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/MerchantOfferAccess.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.async_locator; +package org.embeddedt.modernfix.forge.mixin.perf.async_locator; import net.minecraft.world.item.trading.MerchantOffer; import org.spongepowered.asm.mixin.Mixin; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/TreasureMapForEmeraldsMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/TreasureMapForEmeraldsMixin.java similarity index 93% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/TreasureMapForEmeraldsMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/TreasureMapForEmeraldsMixin.java index 9ed5b23a..e912c92c 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/async_locator/TreasureMapForEmeraldsMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/async_locator/TreasureMapForEmeraldsMixin.java @@ -1,10 +1,10 @@ -package org.embeddedt.modernfix.mixin.perf.async_locator; +package org.embeddedt.modernfix.forge.mixin.perf.async_locator; import net.minecraft.world.entity.Entity; import net.minecraft.world.item.trading.MerchantOffer; import net.minecraft.world.level.levelgen.feature.StructureFeature; import net.minecraft.world.level.saveddata.maps.MapDecoration; -import org.embeddedt.modernfix.structure.logic.MerchantLogic; +import org.embeddedt.modernfix.forge.structure.logic.MerchantLogic; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/blast_search_trees/IngredientFilterInvoker.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/blast_search_trees/IngredientFilterInvoker.java similarity index 85% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/blast_search_trees/IngredientFilterInvoker.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/blast_search_trees/IngredientFilterInvoker.java index cd69f9c5..c8bd3ea8 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/blast_search_trees/IngredientFilterInvoker.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/blast_search_trees/IngredientFilterInvoker.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.blast_search_trees; +package org.embeddedt.modernfix.forge.mixin.perf.blast_search_trees; import mezz.jei.ingredients.IIngredientListElementInfo; import mezz.jei.ingredients.IngredientFilter; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/blast_search_trees/MinecraftMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/blast_search_trees/MinecraftMixin.java similarity index 91% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/blast_search_trees/MinecraftMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/blast_search_trees/MinecraftMixin.java index c400474c..b16ac7cc 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/blast_search_trees/MinecraftMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/blast_search_trees/MinecraftMixin.java @@ -1,11 +1,11 @@ -package org.embeddedt.modernfix.mixin.perf.blast_search_trees; +package org.embeddedt.modernfix.forge.mixin.perf.blast_search_trees; import net.minecraft.client.Minecraft; import net.minecraft.client.searchtree.SearchRegistry; import net.minecraftforge.fml.ModList; import org.embeddedt.modernfix.annotation.ClientOnlyMixin; import org.embeddedt.modernfix.searchtree.DummySearchTree; -import org.embeddedt.modernfix.searchtree.JEIBackedSearchTree; +import org.embeddedt.modernfix.forge.searchtree.JEIBackedSearchTree; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/datapack_reload_exceptions/LootTableManagerMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/LootTableManagerMixin.java similarity index 91% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/datapack_reload_exceptions/LootTableManagerMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/LootTableManagerMixin.java index 02c2a1a2..2631f448 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/datapack_reload_exceptions/LootTableManagerMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/LootTableManagerMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.datapack_reload_exceptions; +package org.embeddedt.modernfix.forge.mixin.perf.datapack_reload_exceptions; import net.minecraft.world.level.storage.loot.LootTables; import org.apache.logging.log4j.Logger; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java similarity index 90% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java index ba928c36..1a79f963 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/datapack_reload_exceptions/RecipeManagerMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.datapack_reload_exceptions; +package org.embeddedt.modernfix.forge.mixin.perf.datapack_reload_exceptions; import net.minecraft.world.item.crafting.RecipeManager; import org.apache.logging.log4j.Logger; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ItemModelMesherForgeMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ItemModelMesherForgeMixin.java similarity index 97% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ItemModelMesherForgeMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ItemModelMesherForgeMixin.java index b7a0758f..9fab54c9 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ItemModelMesherForgeMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ItemModelMesherForgeMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.dynamic_resources; +package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources; import net.minecraft.client.renderer.ItemModelShaper; import net.minecraft.client.resources.model.BakedModel; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ModelBakeryMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java similarity index 99% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ModelBakeryMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java index d68cf2d3..fbc8730d 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ModelBakeryMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ModelBakeryMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.dynamic_resources; +package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; @@ -37,7 +37,7 @@ import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.annotation.ClientOnlyMixin; import org.embeddedt.modernfix.duck.IExtendedModelBakery; import org.embeddedt.modernfix.dynamicresources.DynamicBakedModelProvider; -import org.embeddedt.modernfix.dynamicresources.DynamicModelBakeEvent; +import org.embeddedt.modernfix.forge.dynamicresources.DynamicModelBakeEvent; import org.embeddedt.modernfix.dynamicresources.ModelBakeryHelpers; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ae2/RegistrationMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ae2/RegistrationMixin.java similarity index 94% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ae2/RegistrationMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ae2/RegistrationMixin.java index 07f95f4c..bcbfee97 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ae2/RegistrationMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ae2/RegistrationMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.dynamic_resources.ae2; +package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources.ae2; import appeng.bootstrap.components.IModelBakeComponent; import appeng.bootstrap.components.ModelOverrideComponent; @@ -12,7 +12,7 @@ import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.annotation.ClientOnlyMixin; import org.embeddedt.modernfix.annotation.RequiresMod; -import org.embeddedt.modernfix.dynamicresources.DynamicModelBakeEvent; +import org.embeddedt.modernfix.forge.dynamicresources.DynamicModelBakeEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java similarity index 96% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java index ccbaa84b..b6ef6ea2 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/CTMPackReloadListenerMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.dynamic_resources.ctm; +package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources.ctm; import com.google.common.collect.ImmutableList; import net.minecraft.client.renderer.ItemBlockRenderTypes; @@ -19,7 +19,7 @@ import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.annotation.ClientOnlyMixin; import org.embeddedt.modernfix.annotation.RequiresMod; import org.embeddedt.modernfix.duck.IExtendedModelBakery; -import org.embeddedt.modernfix.dynamicresources.DynamicModelBakeEvent; +import org.embeddedt.modernfix.forge.dynamicresources.DynamicModelBakeEvent; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java similarity index 96% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java index 65a971f6..e1bc5547 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/ctm/TextureMetadataHandlerMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.dynamic_resources.ctm; +package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources.ctm; import com.mojang.datafixers.util.Pair; import net.minecraft.client.resources.model.BakedModel; @@ -9,7 +9,7 @@ import net.minecraftforge.client.model.ModelLoader; import net.minecraftforge.common.MinecraftForge; import org.embeddedt.modernfix.annotation.ClientOnlyMixin; import org.embeddedt.modernfix.annotation.RequiresMod; -import org.embeddedt.modernfix.dynamicresources.DynamicModelBakeEvent; +import org.embeddedt.modernfix.forge.dynamicresources.DynamicModelBakeEvent; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java similarity index 91% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java index 1fb44328..4369870e 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/rs/ClientSetupMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.dynamic_resources.rs; +package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources.rs; import com.refinedmods.refinedstorage.render.BakedModelOverrideRegistry; import com.refinedmods.refinedstorage.setup.ClientSetup; @@ -7,7 +7,7 @@ import net.minecraft.resources.ResourceLocation; import net.minecraftforge.common.MinecraftForge; import org.embeddedt.modernfix.annotation.ClientOnlyMixin; import org.embeddedt.modernfix.annotation.RequiresMod; -import org.embeddedt.modernfix.dynamicresources.DynamicModelBakeEvent; +import org.embeddedt.modernfix.forge.dynamicresources.DynamicModelBakeEvent; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/supermartijncore/ClientRegistrationHandlerMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/supermartijncore/ClientRegistrationHandlerMixin.java similarity index 94% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/supermartijncore/ClientRegistrationHandlerMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/supermartijncore/ClientRegistrationHandlerMixin.java index 0da765e1..682484f1 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/dynamic_resources/supermartijncore/ClientRegistrationHandlerMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/dynamic_resources/supermartijncore/ClientRegistrationHandlerMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.dynamic_resources.supermartijncore; +package org.embeddedt.modernfix.forge.mixin.perf.dynamic_resources.supermartijncore; import com.supermartijn642.core.registry.ClientRegistrationHandler; import com.supermartijn642.core.util.Pair; @@ -9,7 +9,7 @@ import net.minecraftforge.common.MinecraftForge; import net.minecraftforge.eventbus.api.SubscribeEvent; import org.embeddedt.modernfix.annotation.ClientOnlyMixin; import org.embeddedt.modernfix.annotation.RequiresMod; -import org.embeddedt.modernfix.dynamicresources.DynamicModelBakeEvent; +import org.embeddedt.modernfix.forge.dynamicresources.DynamicModelBakeEvent; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java similarity index 97% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java index 8aa3e2d8..9fe6f9c3 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_registry_validation/ForgeRegistryMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.fast_registry_validation; +package org.embeddedt.modernfix.forge.mixin.perf.fast_registry_validation; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; import net.minecraftforge.registries.ForgeRegistry; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/fast_registry_validation/ResourceKeyMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_registry_validation/ResourceKeyMixin.java similarity index 94% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/fast_registry_validation/ResourceKeyMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_registry_validation/ResourceKeyMixin.java index 804dce98..0c62d3fe 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/fast_registry_validation/ResourceKeyMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/fast_registry_validation/ResourceKeyMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.fast_registry_validation; +package org.embeddedt.modernfix.forge.mixin.perf.fast_registry_validation; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import net.minecraft.resources.ResourceKey; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/jeresources_startup/VillagerEntryMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/jeresources_startup/VillagerEntryMixin.java similarity index 95% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/jeresources_startup/VillagerEntryMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/jeresources_startup/VillagerEntryMixin.java index efeb8279..4d34ba27 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/jeresources_startup/VillagerEntryMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/jeresources_startup/VillagerEntryMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.jeresources_startup; +package org.embeddedt.modernfix.forge.mixin.perf.jeresources_startup; import jeresources.entry.VillagerEntry; import net.minecraft.client.Minecraft; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/CustomIngredientMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/CustomIngredientMixin.java similarity index 90% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/CustomIngredientMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/CustomIngredientMixin.java index ab9bc2c3..6348af03 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/CustomIngredientMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/CustomIngredientMixin.java @@ -1,11 +1,11 @@ -package org.embeddedt.modernfix.mixin.perf.kubejs; +package org.embeddedt.modernfix.forge.mixin.perf.kubejs; import dev.latvian.kubejs.item.ItemStackJS; import dev.latvian.kubejs.item.ingredient.CustomIngredient; import net.minecraft.world.item.crafting.Ingredient; import org.embeddedt.modernfix.annotation.RequiresMod; import org.embeddedt.modernfix.duck.ICachedIngredientJS; -import org.embeddedt.modernfix.util.KubeUtil; +import org.embeddedt.modernfix.forge.util.KubeUtil; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/IDFilterMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/IDFilterMixin.java similarity index 89% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/IDFilterMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/IDFilterMixin.java index 08d56f63..1278203b 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/IDFilterMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/IDFilterMixin.java @@ -1,10 +1,10 @@ -package org.embeddedt.modernfix.mixin.perf.kubejs; +package org.embeddedt.modernfix.forge.mixin.perf.kubejs; import dev.latvian.kubejs.recipe.RecipeJS; import dev.latvian.kubejs.recipe.filter.IDFilter; import net.minecraft.resources.ResourceLocation; import org.embeddedt.modernfix.annotation.RequiresMod; -import org.embeddedt.modernfix.util.KubeUtil; +import org.embeddedt.modernfix.forge.util.KubeUtil; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/RecipeEventJSMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/RecipeEventJSMixin.java similarity index 96% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/RecipeEventJSMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/RecipeEventJSMixin.java index 093e0ddc..076cb52e 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/RecipeEventJSMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/RecipeEventJSMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.kubejs; +package org.embeddedt.modernfix.forge.mixin.perf.kubejs; import com.google.gson.JsonObject; import cpw.mods.modlauncher.api.LamdbaExceptionUtils; @@ -9,8 +9,8 @@ import net.minecraft.resources.ResourceLocation; import net.minecraft.world.item.crafting.RecipeManager; import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.annotation.RequiresMod; -import org.embeddedt.modernfix.util.KubeUtil; -import org.embeddedt.modernfix.util.ModUtil; +import org.embeddedt.modernfix.forge.util.KubeUtil; +import org.embeddedt.modernfix.forge.util.ModUtil; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Overwrite; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/RecipeJSMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/RecipeJSMixin.java similarity index 97% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/RecipeJSMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/RecipeJSMixin.java index d257faaf..f9bbfb75 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/RecipeJSMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/RecipeJSMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.kubejs; +package org.embeddedt.modernfix.forge.mixin.perf.kubejs; import dev.latvian.kubejs.item.ItemStackJS; import dev.latvian.kubejs.item.ingredient.IngredientJS; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/TagIngredientJSMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/TagIngredientJSMixin.java similarity index 93% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/TagIngredientJSMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/TagIngredientJSMixin.java index 164492b1..ca101699 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/TagIngredientJSMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/TagIngredientJSMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.kubejs; +package org.embeddedt.modernfix.forge.mixin.perf.kubejs; import dev.latvian.kubejs.item.ItemStackJS; import dev.latvian.kubejs.item.ingredient.IngredientJS; @@ -7,7 +7,7 @@ import net.minecraft.tags.Tag; import net.minecraft.world.item.Item; import org.embeddedt.modernfix.annotation.RequiresMod; import org.embeddedt.modernfix.duck.ICachedIngredientJS; -import org.embeddedt.modernfix.util.KubeUtil; +import org.embeddedt.modernfix.forge.util.KubeUtil; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Shadow; import org.spongepowered.asm.mixin.injection.At; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/TagWrapperMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/TagWrapperMixin.java similarity index 95% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/TagWrapperMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/TagWrapperMixin.java index fcef520d..ada7a4e2 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/kubejs/TagWrapperMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/TagWrapperMixin.java @@ -1,11 +1,11 @@ -package org.embeddedt.modernfix.mixin.perf.kubejs; +package org.embeddedt.modernfix.forge.mixin.perf.kubejs; import dev.latvian.kubejs.server.TagEventJS; import dev.latvian.kubejs.util.UtilsJS; import me.shedaniel.architectury.registry.Registry; import net.minecraft.resources.ResourceLocation; import org.embeddedt.modernfix.annotation.RequiresMod; -import org.embeddedt.modernfix.util.KubeUtil; +import org.embeddedt.modernfix.forge.util.KubeUtil; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; import org.spongepowered.asm.mixin.injection.Inject; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/model_optimizations/OBJLoaderMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/model_optimizations/OBJLoaderMixin.java similarity index 95% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/model_optimizations/OBJLoaderMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/model_optimizations/OBJLoaderMixin.java index 6e137101..71a94070 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/model_optimizations/OBJLoaderMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/model_optimizations/OBJLoaderMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.model_optimizations; +package org.embeddedt.modernfix.forge.mixin.perf.model_optimizations; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.client.model.obj.MaterialLibrary; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java similarity index 97% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java index bbd41eb3..44d4819a 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/patchouli_deduplicate_books/ClientBookRegistryMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.patchouli_deduplicate_books; +package org.embeddedt.modernfix.forge.mixin.perf.patchouli_deduplicate_books; import net.minecraft.world.item.ItemStack; import net.minecraft.world.item.Items; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java similarity index 93% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java index df586c9f..85c718d3 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/reduce_blockstate_cache_rebuilds/BlockCallbacksMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.reduce_blockstate_cache_rebuilds; +package org.embeddedt.modernfix.forge.mixin.perf.reduce_blockstate_cache_rebuilds; import net.minecraft.world.level.block.Block; import net.minecraft.world.level.block.state.BlockState; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/reduce_blockstate_cache_rebuilds/GameDataMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/reduce_blockstate_cache_rebuilds/GameDataMixin.java similarity index 96% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/reduce_blockstate_cache_rebuilds/GameDataMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/reduce_blockstate_cache_rebuilds/GameDataMixin.java index 3df6d6ba..1bf49444 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/reduce_blockstate_cache_rebuilds/GameDataMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/reduce_blockstate_cache_rebuilds/GameDataMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.reduce_blockstate_cache_rebuilds; +package org.embeddedt.modernfix.forge.mixin.perf.reduce_blockstate_cache_rebuilds; import com.google.common.collect.Multimap; import net.minecraft.resources.ResourceLocation; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/ModFileResourcePackMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ModFileResourcePackMixin.java similarity index 98% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/ModFileResourcePackMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ModFileResourcePackMixin.java index ee0e070a..d8cc1e46 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/ModFileResourcePackMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/ModFileResourcePackMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.resourcepacks; +package org.embeddedt.modernfix.forge.mixin.perf.resourcepacks; import net.minecraft.server.packs.PackType; import net.minecraft.resources.ResourceLocation; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/VanillaPackMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/VanillaPackMixin.java similarity index 98% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/VanillaPackMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/VanillaPackMixin.java index f7382bd5..04688604 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/resourcepacks/VanillaPackMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/resourcepacks/VanillaPackMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.resourcepacks; +package org.embeddedt.modernfix.forge.mixin.perf.resourcepacks; import com.google.common.base.Joiner; import com.google.common.cache.CacheBuilder; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/rewrite_registry/ForgeRegistryMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/rewrite_registry/ForgeRegistryMixin.java similarity index 94% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/rewrite_registry/ForgeRegistryMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/rewrite_registry/ForgeRegistryMixin.java index 558796d1..621db8c5 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/rewrite_registry/ForgeRegistryMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/rewrite_registry/ForgeRegistryMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.rewrite_registry; +package org.embeddedt.modernfix.forge.mixin.perf.rewrite_registry; import com.google.common.collect.BiMap; import net.minecraft.core.Registry; @@ -6,7 +6,7 @@ import net.minecraft.resources.ResourceKey; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.registries.ForgeRegistry; import net.minecraftforge.registries.IForgeRegistryEntry; -import org.embeddedt.modernfix.registry.FastForgeRegistry; +import org.embeddedt.modernfix.forge.registry.FastForgeRegistry; import org.spongepowered.asm.mixin.Final; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mutable; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/rewrite_registry/ForgeRegistrySnapshotMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/rewrite_registry/ForgeRegistrySnapshotMixin.java similarity index 94% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/rewrite_registry/ForgeRegistrySnapshotMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/rewrite_registry/ForgeRegistrySnapshotMixin.java index 87fb4de7..8421e5cf 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/rewrite_registry/ForgeRegistrySnapshotMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/rewrite_registry/ForgeRegistrySnapshotMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.rewrite_registry; +package org.embeddedt.modernfix.forge.mixin.perf.rewrite_registry; import it.unimi.dsi.fastutil.objects.Object2ObjectOpenHashMap; import it.unimi.dsi.fastutil.objects.ObjectOpenHashSet; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/skip_first_datapack_reload/LevelSaveMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/skip_first_datapack_reload/LevelSaveMixin.java similarity index 93% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/skip_first_datapack_reload/LevelSaveMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/skip_first_datapack_reload/LevelSaveMixin.java index b66539a6..d56bdef4 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/skip_first_datapack_reload/LevelSaveMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/skip_first_datapack_reload/LevelSaveMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.skip_first_datapack_reload; +package org.embeddedt.modernfix.forge.mixin.perf.skip_first_datapack_reload; import net.minecraft.nbt.CompoundTag; import net.minecraft.nbt.NbtIo; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/skip_first_datapack_reload/MinecraftMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/skip_first_datapack_reload/MinecraftMixin.java similarity index 97% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/skip_first_datapack_reload/MinecraftMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/skip_first_datapack_reload/MinecraftMixin.java index 4d38360d..d60670b9 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/skip_first_datapack_reload/MinecraftMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/skip_first_datapack_reload/MinecraftMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.skip_first_datapack_reload; +package org.embeddedt.modernfix.forge.mixin.perf.skip_first_datapack_reload; import com.mojang.datafixers.util.Function4; import net.minecraft.client.Minecraft; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/skip_first_datapack_reload/SaveFormatAccessor.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/skip_first_datapack_reload/SaveFormatAccessor.java similarity index 84% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/skip_first_datapack_reload/SaveFormatAccessor.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/skip_first_datapack_reload/SaveFormatAccessor.java index ce3ac88f..6925949b 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/skip_first_datapack_reload/SaveFormatAccessor.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/skip_first_datapack_reload/SaveFormatAccessor.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.skip_first_datapack_reload; +package org.embeddedt.modernfix.forge.mixin.perf.skip_first_datapack_reload; import com.mojang.datafixers.DataFixer; import net.minecraft.world.level.storage.LevelStorageSource; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/jepb/PiglinBarteringRecipeBuilderMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/use_integrated_resources/jepb/PiglinBarteringRecipeBuilderMixin.java similarity index 93% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/jepb/PiglinBarteringRecipeBuilderMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/use_integrated_resources/jepb/PiglinBarteringRecipeBuilderMixin.java index 92453f26..be3ce33a 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/jepb/PiglinBarteringRecipeBuilderMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/use_integrated_resources/jepb/PiglinBarteringRecipeBuilderMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.use_integrated_resources.jepb; +package org.embeddedt.modernfix.forge.mixin.perf.use_integrated_resources.jepb; import com.thenatekirby.jepb.plugin.PiglinBarteringRecipeBuilder; import net.minecraft.server.MinecraftServer; diff --git a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/jeresources/LootTableHelperMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/use_integrated_resources/jeresources/LootTableHelperMixin.java similarity index 92% rename from forge/src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/jeresources/LootTableHelperMixin.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/use_integrated_resources/jeresources/LootTableHelperMixin.java index 06a0116f..eb2f4e2a 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/mixin/perf/use_integrated_resources/jeresources/LootTableHelperMixin.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/use_integrated_resources/jeresources/LootTableHelperMixin.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.mixin.perf.use_integrated_resources.jeresources; +package org.embeddedt.modernfix.forge.mixin.perf.use_integrated_resources.jeresources; import jeresources.util.LootTableHelper; import net.minecraft.server.MinecraftServer; diff --git a/forge/src/main/java/org/embeddedt/modernfix/packet/PacketHandler.java b/forge/src/main/java/org/embeddedt/modernfix/forge/packet/PacketHandler.java similarity index 93% rename from forge/src/main/java/org/embeddedt/modernfix/packet/PacketHandler.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/packet/PacketHandler.java index 4050c595..3b26ced4 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/packet/PacketHandler.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/packet/PacketHandler.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.packet; +package org.embeddedt.modernfix.forge.packet; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.api.distmarker.Dist; @@ -8,6 +8,7 @@ import net.minecraftforge.fml.network.NetworkRegistry; import net.minecraftforge.fml.network.simple.SimpleChannel; import org.embeddedt.modernfix.ModernFix; import org.embeddedt.modernfix.ModernFixClient; +import org.embeddedt.modernfix.packet.EntityIDSyncPacket; import java.util.function.Supplier; diff --git a/forge/src/main/java/org/embeddedt/modernfix/registry/FastForgeRegistry.java b/forge/src/main/java/org/embeddedt/modernfix/forge/registry/FastForgeRegistry.java similarity index 99% rename from forge/src/main/java/org/embeddedt/modernfix/registry/FastForgeRegistry.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/registry/FastForgeRegistry.java index 58016fb0..9d4c2f5c 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/registry/FastForgeRegistry.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/registry/FastForgeRegistry.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.registry; +package org.embeddedt.modernfix.forge.registry; import com.google.common.collect.BiMap; import com.google.common.collect.Iterators; diff --git a/forge/src/main/java/org/embeddedt/modernfix/registry/ObjectHolderClearer.java b/forge/src/main/java/org/embeddedt/modernfix/forge/registry/ObjectHolderClearer.java similarity index 97% rename from forge/src/main/java/org/embeddedt/modernfix/registry/ObjectHolderClearer.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/registry/ObjectHolderClearer.java index 0e12ff87..0d9ca662 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/registry/ObjectHolderClearer.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/registry/ObjectHolderClearer.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.registry; +package org.embeddedt.modernfix.forge.registry; import net.minecraft.resources.ResourceLocation; import net.minecraftforge.fml.common.ObfuscationReflectionHelper; diff --git a/forge/src/main/java/org/embeddedt/modernfix/duck/rs/IFluidExternalStorageCache.java b/forge/src/main/java/org/embeddedt/modernfix/forge/rs/IFluidExternalStorageCache.java similarity index 78% rename from forge/src/main/java/org/embeddedt/modernfix/duck/rs/IFluidExternalStorageCache.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/rs/IFluidExternalStorageCache.java index 87031bb2..4b7f192a 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/duck/rs/IFluidExternalStorageCache.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/rs/IFluidExternalStorageCache.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.duck.rs; +package org.embeddedt.modernfix.forge.rs; import net.minecraftforge.fluids.capability.IFluidHandler; diff --git a/forge/src/main/java/org/embeddedt/modernfix/duck/rs/IItemExternalStorageCache.java b/forge/src/main/java/org/embeddedt/modernfix/forge/rs/IItemExternalStorageCache.java similarity index 76% rename from forge/src/main/java/org/embeddedt/modernfix/duck/rs/IItemExternalStorageCache.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/rs/IItemExternalStorageCache.java index 133646a2..4d5555d5 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/duck/rs/IItemExternalStorageCache.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/rs/IItemExternalStorageCache.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.duck.rs; +package org.embeddedt.modernfix.forge.rs; import net.minecraftforge.items.IItemHandler; diff --git a/forge/src/main/java/org/embeddedt/modernfix/searchtree/JEIBackedSearchTree.java b/forge/src/main/java/org/embeddedt/modernfix/forge/searchtree/JEIBackedSearchTree.java similarity index 89% rename from forge/src/main/java/org/embeddedt/modernfix/searchtree/JEIBackedSearchTree.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/searchtree/JEIBackedSearchTree.java index b26ff661..b860d990 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/searchtree/JEIBackedSearchTree.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/searchtree/JEIBackedSearchTree.java @@ -1,11 +1,12 @@ -package org.embeddedt.modernfix.searchtree; +package org.embeddedt.modernfix.forge.searchtree; import mezz.jei.Internal; import mezz.jei.ingredients.IIngredientListElementInfo; import mezz.jei.ingredients.IngredientFilter; import mezz.jei.runtime.JeiRuntime; import net.minecraft.world.item.ItemStack; -import org.embeddedt.modernfix.mixin.perf.blast_search_trees.IngredientFilterInvoker; +import org.embeddedt.modernfix.forge.mixin.perf.blast_search_trees.IngredientFilterInvoker; +import org.embeddedt.modernfix.searchtree.DummySearchTree; import java.util.ArrayList; import java.util.List; diff --git a/forge/src/main/java/org/embeddedt/modernfix/structure/AsyncLocator.java b/forge/src/main/java/org/embeddedt/modernfix/forge/structure/AsyncLocator.java similarity index 99% rename from forge/src/main/java/org/embeddedt/modernfix/structure/AsyncLocator.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/structure/AsyncLocator.java index a5e3b484..8c95273a 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/structure/AsyncLocator.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/structure/AsyncLocator.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.structure; +package org.embeddedt.modernfix.forge.structure; import com.mojang.datafixers.util.Pair; import net.minecraft.core.BlockPos; diff --git a/forge/src/main/java/org/embeddedt/modernfix/structure/logic/CommonLogic.java b/forge/src/main/java/org/embeddedt/modernfix/forge/structure/logic/CommonLogic.java similarity index 95% rename from forge/src/main/java/org/embeddedt/modernfix/structure/logic/CommonLogic.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/structure/logic/CommonLogic.java index a8d0e438..84a2460f 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/structure/logic/CommonLogic.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/structure/logic/CommonLogic.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.structure.logic; +package org.embeddedt.modernfix.forge.structure.logic; import net.minecraft.core.BlockPos; import net.minecraft.network.chat.TranslatableComponent; @@ -12,7 +12,7 @@ import net.minecraft.world.level.block.entity.BlockEntity; import net.minecraft.world.level.block.entity.ChestBlockEntity; import net.minecraft.world.level.saveddata.maps.MapDecoration; import net.minecraft.world.level.saveddata.maps.MapItemSavedData; -import org.embeddedt.modernfix.mixin.perf.async_locator.MapItemAccess; +import org.embeddedt.modernfix.forge.mixin.perf.async_locator.MapItemAccess; public class CommonLogic { private CommonLogic() {} diff --git a/forge/src/main/java/org/embeddedt/modernfix/structure/logic/EnderEyeItemLogic.java b/forge/src/main/java/org/embeddedt/modernfix/forge/structure/logic/EnderEyeItemLogic.java similarity index 89% rename from forge/src/main/java/org/embeddedt/modernfix/structure/logic/EnderEyeItemLogic.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/structure/logic/EnderEyeItemLogic.java index 97c38111..0564b3a1 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/structure/logic/EnderEyeItemLogic.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/structure/logic/EnderEyeItemLogic.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.structure.logic; +package org.embeddedt.modernfix.forge.structure.logic; import com.google.common.collect.ImmutableSet; import net.minecraft.advancements.CriteriaTriggers; @@ -12,8 +12,8 @@ import net.minecraft.world.item.EnderEyeItem; import net.minecraft.world.level.levelgen.feature.StructureFeature; import net.minecraftforge.fml.ModList; import net.minecraftforge.registries.ForgeRegistries; -import org.embeddedt.modernfix.mixin.perf.async_locator.EyeOfEnderAccess; -import org.embeddedt.modernfix.structure.AsyncLocator; +import org.embeddedt.modernfix.forge.mixin.perf.async_locator.EyeOfEnderAccess; +import org.embeddedt.modernfix.forge.structure.AsyncLocator; public class EnderEyeItemLogic { private EnderEyeItemLogic() {} diff --git a/forge/src/main/java/org/embeddedt/modernfix/structure/logic/ExplorationMapFunctionLogic.java b/forge/src/main/java/org/embeddedt/modernfix/forge/structure/logic/ExplorationMapFunctionLogic.java similarity index 96% rename from forge/src/main/java/org/embeddedt/modernfix/structure/logic/ExplorationMapFunctionLogic.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/structure/logic/ExplorationMapFunctionLogic.java index b78e51b4..136c8b54 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/structure/logic/ExplorationMapFunctionLogic.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/structure/logic/ExplorationMapFunctionLogic.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.structure.logic; +package org.embeddedt.modernfix.forge.structure.logic; import com.google.common.collect.ImmutableSet; import net.minecraft.core.BlockPos; @@ -13,7 +13,7 @@ import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandlerModifiable; import org.embeddedt.modernfix.ModernFix; -import org.embeddedt.modernfix.structure.AsyncLocator; +import org.embeddedt.modernfix.forge.structure.AsyncLocator; import java.util.function.BiConsumer; diff --git a/forge/src/main/java/org/embeddedt/modernfix/structure/logic/EyeOfEnderData.java b/forge/src/main/java/org/embeddedt/modernfix/forge/structure/logic/EyeOfEnderData.java similarity index 62% rename from forge/src/main/java/org/embeddedt/modernfix/structure/logic/EyeOfEnderData.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/structure/logic/EyeOfEnderData.java index 1853d3e3..b1145a49 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/structure/logic/EyeOfEnderData.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/structure/logic/EyeOfEnderData.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.structure.logic; +package org.embeddedt.modernfix.forge.structure.logic; public interface EyeOfEnderData { void setLocateTaskOngoing(boolean locateTaskOngoing); diff --git a/forge/src/main/java/org/embeddedt/modernfix/structure/logic/LocateCommandLogic.java b/forge/src/main/java/org/embeddedt/modernfix/forge/structure/logic/LocateCommandLogic.java similarity index 83% rename from forge/src/main/java/org/embeddedt/modernfix/structure/logic/LocateCommandLogic.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/structure/logic/LocateCommandLogic.java index 173d8d75..40d7363e 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/structure/logic/LocateCommandLogic.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/structure/logic/LocateCommandLogic.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.structure.logic; +package org.embeddedt.modernfix.forge.structure.logic; import com.google.common.collect.ImmutableSet; import net.minecraft.commands.CommandSourceStack; @@ -6,8 +6,8 @@ import net.minecraft.core.BlockPos; import net.minecraft.network.chat.TextComponent; import net.minecraft.server.commands.LocateCommand; import net.minecraft.world.level.levelgen.feature.StructureFeature; -import org.embeddedt.modernfix.mixin.perf.async_locator.LocateCommandAccess; -import org.embeddedt.modernfix.structure.AsyncLocator; +import org.embeddedt.modernfix.forge.mixin.perf.async_locator.LocateCommandAccess; +import org.embeddedt.modernfix.forge.structure.AsyncLocator; public class LocateCommandLogic { private LocateCommandLogic() {} diff --git a/forge/src/main/java/org/embeddedt/modernfix/structure/logic/MerchantLogic.java b/forge/src/main/java/org/embeddedt/modernfix/forge/structure/logic/MerchantLogic.java similarity index 94% rename from forge/src/main/java/org/embeddedt/modernfix/structure/logic/MerchantLogic.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/structure/logic/MerchantLogic.java index 5f9ecd35..5b8e6eec 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/structure/logic/MerchantLogic.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/structure/logic/MerchantLogic.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.structure.logic; +package org.embeddedt.modernfix.forge.structure.logic; import com.google.common.collect.ImmutableSet; import net.minecraft.core.BlockPos; @@ -14,8 +14,8 @@ import net.minecraft.world.item.trading.MerchantOffer; import net.minecraft.world.level.levelgen.feature.StructureFeature; import net.minecraft.world.level.saveddata.maps.MapDecoration; import org.embeddedt.modernfix.ModernFix; -import org.embeddedt.modernfix.mixin.perf.async_locator.MerchantOfferAccess; -import org.embeddedt.modernfix.structure.AsyncLocator; +import org.embeddedt.modernfix.forge.mixin.perf.async_locator.MerchantOfferAccess; +import org.embeddedt.modernfix.forge.structure.AsyncLocator; import java.util.Optional; diff --git a/forge/src/main/java/org/embeddedt/modernfix/util/JEIUtil.java b/forge/src/main/java/org/embeddedt/modernfix/forge/util/JEIUtil.java similarity index 95% rename from forge/src/main/java/org/embeddedt/modernfix/util/JEIUtil.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/util/JEIUtil.java index a3575441..527750c6 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/util/JEIUtil.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/util/JEIUtil.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.util; +package org.embeddedt.modernfix.forge.util; import com.mojang.blaze3d.vertex.PoseStack; import net.minecraft.client.Minecraft; diff --git a/forge/src/main/java/org/embeddedt/modernfix/util/KubeUtil.java b/forge/src/main/java/org/embeddedt/modernfix/forge/util/KubeUtil.java similarity index 96% rename from forge/src/main/java/org/embeddedt/modernfix/util/KubeUtil.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/util/KubeUtil.java index 2df2f735..c0f496fd 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/util/KubeUtil.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/util/KubeUtil.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.util; +package org.embeddedt.modernfix.forge.util; import dev.latvian.kubejs.item.ItemStackJS; import dev.latvian.kubejs.recipe.RecipeJS; diff --git a/forge/src/main/java/org/embeddedt/modernfix/util/ModUtil.java b/forge/src/main/java/org/embeddedt/modernfix/forge/util/ModUtil.java similarity index 98% rename from forge/src/main/java/org/embeddedt/modernfix/util/ModUtil.java rename to forge/src/main/java/org/embeddedt/modernfix/forge/util/ModUtil.java index 2bfade5d..d97ea6ff 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/util/ModUtil.java +++ b/forge/src/main/java/org/embeddedt/modernfix/forge/util/ModUtil.java @@ -1,4 +1,4 @@ -package org.embeddedt.modernfix.util; +package org.embeddedt.modernfix.forge.util; import net.minecraftforge.eventbus.EventBus; import net.minecraftforge.eventbus.api.EventListenerHelper; diff --git a/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java b/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java index 3125fa82..8d754f58 100644 --- a/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java +++ b/forge/src/main/java/org/embeddedt/modernfix/platform/forge/ModernFixPlatformHooksImpl.java @@ -21,11 +21,11 @@ import net.minecraftforge.fml.loading.LoadingModList; import net.minecraftforge.fml.loading.moddiscovery.ExplodedDirectoryLocator; import net.minecraftforge.fml.network.PacketDistributor; import net.minecraftforge.fml.server.ServerLifecycleHooks; -import org.embeddedt.modernfix.classloading.FastAccessTransformerList; -import org.embeddedt.modernfix.classloading.ModernFixResourceFinder; +import org.embeddedt.modernfix.forge.classloading.FastAccessTransformerList; +import org.embeddedt.modernfix.forge.classloading.ModernFixResourceFinder; import org.embeddedt.modernfix.core.ModernFixMixinPlugin; import org.embeddedt.modernfix.dfu.DFUBlaster; -import org.embeddedt.modernfix.packet.PacketHandler; +import org.embeddedt.modernfix.forge.packet.PacketHandler; import org.embeddedt.modernfix.util.DummyList; import org.objectweb.asm.Opcodes; import org.objectweb.asm.tree.*; @@ -200,7 +200,7 @@ public class ModernFixPlatformHooksImpl { } public static void applyASMTransformers(String mixinClassName, ClassNode targetClass) { - if(mixinClassName.equals("org.embeddedt.modernfix.mixin.perf.compress_blockstate.BlockStateBaseMixin")) { + if(mixinClassName.equals("org.embeddedt.modernfix.common.compress_blockstate.perf.mixin.BlockStateBaseMixin")) { // Delete unused fields off BlockStateBase Set fieldsToDelete = Stream.of( "field_235702_f_", // isAir @@ -233,7 +233,7 @@ public class ModernFixPlatformHooksImpl { } } } - } else if(mixinClassName.equals("org.embeddedt.modernfix.mixin.bugfix.chunk_deadlock.valhesia.BlockStateBaseMixin")) { + } else if(mixinClassName.equals("org.embeddedt.modernfix.forge.valhesia.chunk_deadlock.bugfix.mixin.BlockStateBaseMixin")) { // We need to destroy Valhelsia's callback so it can never run getBlockState for(MethodNode m : targetClass.methods) { if(m.name.contains("valhelsia_placeDousedTorch")) { diff --git a/forge/src/main/resources/modernfix-forge.mixins.json b/forge/src/main/resources/modernfix-forge.mixins.json index 8835aec2..cd76ed5b 100644 --- a/forge/src/main/resources/modernfix-forge.mixins.json +++ b/forge/src/main/resources/modernfix-forge.mixins.json @@ -1,6 +1,6 @@ { "required": true, - "package": "org.embeddedt.modernfix.mixin", + "package": "org.embeddedt.modernfix.forge.mixin", "plugin": "org.embeddedt.modernfix.core.ModernFixMixinPlugin", "compatibilityLevel": "JAVA_8", "minVersion": "0.8",