diff --git a/build.gradle b/build.gradle index 5f6dd56f..5d3fde6e 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 93806ffc..71dba962 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.core.Holder; 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/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 8c8990e7..1b635a8f 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/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 98% 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 ed6373c8..58dfea8c 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 com.mojang.datafixers.util.Either; import net.minecraft.server.MinecraftServer; 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 92% 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 5b1fb097..b5e9cfec 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.UserApiService; import com.mojang.authlib.yggdrasil.YggdrasilAuthenticationService; 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 0e399bbc..861ce9f6 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 df850f75..ee1d7cb5 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 94% 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 8198f526..a8a8d5f7 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.ReloadableResourceManager; import org.spongepowered.asm.mixin.Mixin; 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 f50317da..f63ae7de 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.Util; import net.minecraft.core.Holder; 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 4144c333..c9fa3ecc 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.core.Holder; import net.minecraft.resources.ResourceKey; 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_blockstate/BlockBehaviourMixin.java b/common/src/main/java/org/embeddedt/modernfix/common/mixin/perf/compress_blockstate/BlockBehaviourMixin.java similarity index 85% 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 2ee283ed..2f307825 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 92% 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 cd893675..f0186503 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 91% 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 0bea8cf9..7d77a1ad 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 373c0eb1..52cbf441 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 a29f6ba7..11d6bd3a 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 b5ef858a..a443db3a 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 0c826e02..cbd70d11 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 aa58fd3d..3e87a8c0 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/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/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 50d1b650..0af066e6 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/java/org/embeddedt/modernfix/mixin/bugfix/mc218112/SynchedEntityDataMixin_Client.java b/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/mc218112/SynchedEntityDataMixin_Client.java deleted file mode 100644 index 18190e3f..00000000 --- a/common/src/main/java/org/embeddedt/modernfix/mixin/bugfix/mc218112/SynchedEntityDataMixin_Client.java +++ /dev/null @@ -1,48 +0,0 @@ -package org.embeddedt.modernfix.mixin.bugfix.mc218112; - -import net.minecraft.network.syncher.SynchedEntityData; -import net.minecraft.world.entity.Entity; -import org.embeddedt.modernfix.annotation.ClientOnlyMixin; -import org.spongepowered.asm.mixin.Final; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.Overwrite; -import org.spongepowered.asm.mixin.Shadow; - -import java.util.List; -import java.util.Map; -import java.util.concurrent.locks.ReadWriteLock; - -@Mixin(SynchedEntityData.class) -@ClientOnlyMixin -public abstract class SynchedEntityDataMixin_Client { - @Shadow @Final private ReadWriteLock lock; - - @Shadow private boolean isDirty; - - @Shadow protected abstract void assignValue(SynchedEntityData.DataItem target, SynchedEntityData.DataItem source); - - @Shadow @Final private Entity entity; - - @Shadow @Final private Map> itemsById; - - /** - * @author embeddedt - * @reason always unlock - */ - @Overwrite - public void assignValues(List> entries) { - this.lock.writeLock().lock(); - try { - for(SynchedEntityData.DataItem dataentry : entries) { - SynchedEntityData.DataItem dataentry1 = this.itemsById.get(dataentry.getAccessor().getId()); - if (dataentry1 != null) { - this.assignValue(dataentry1, dataentry); - this.entity.onSyncedDataUpdated(dataentry.getAccessor()); - } - } - } finally { - this.lock.writeLock().unlock(); - } - this.isDirty = true; - } -} diff --git a/common/src/main/resources/modernfix-common.mixins.json b/common/src/main/resources/modernfix-common.mixins.json index fdfb8823..912d7b5c 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_17", "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 8fff0638..420f12e7 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 5ea71cb7..61f0ad81 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/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 6ad6cc2f..f49282b3 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 5c4357f5..73da4584 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; @@ -11,6 +11,7 @@ import net.minecraftforge.client.event.RenderGameOverlayEvent; import net.minecraftforge.client.event.ScreenEvent; 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.server.ServerStartedEvent; @@ -21,6 +22,7 @@ import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent; import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext; import net.minecraftforge.fml.util.ObfuscationReflectionHelper; +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 b9744be0..2ff67a49 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,11 +20,13 @@ import net.minecraftforge.network.NetworkConstants; import net.minecraftforge.registries.ForgeRegistries; import net.minecraftforge.server.ServerLifecycleHooks; 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.forge.packet.PacketHandler; +import org.embeddedt.modernfix.forge.registry.ObjectHolderClearer; @Mod(ModernFix.MODID) public class ModernFixForge { @@ -37,7 +39,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(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(() -> NetworkConstants.IGNORESERVERONLY, (a, b) -> true)); ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, ModernFixConfig.COMMON_CONFIG); PacketHandler.register(); 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 f4a45ad0..213e768a 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.util.ObfuscationReflectionHelper; 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 9e6dcac0..428145b7 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.embeddedt.modernfix.load.ModWorkManagerQueue; import org.slf4j.Logger; +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 d93cf395..195b2c34 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.internal.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 80% 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..124f970e 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; @@ -11,7 +11,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; @Mixin(Minecraft.class) @ClientOnlyMixin public class MinecraftMixin_Forge { - @Inject(method = "loadWorld", at = @At("HEAD"), remap = false) + @Inject(method = "doLoadLevel", at = @At("HEAD"), remap = false) private void recordWorldLoadStart(CallbackInfo ci) { ModernFixClient.worldLoadStartTime = System.nanoTime(); } 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 f426527e..813d55e3 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.api.ingredients.ITypedIngredient; import mezz.jei.common.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 93% 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 db85d728..b0e3955c 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,4 +1,4 @@ -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; @@ -6,8 +6,8 @@ import net.minecraftforge.fml.ModContainer; 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.searchtree.REIBackedSearchTree; +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 fae68135..293b2022 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.slf4j.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 e0bbd844..7453ed34 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.slf4j.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 4251904c..7cd52242 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; @@ -39,7 +39,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.slf4j.Logger; import org.spongepowered.asm.mixin.Final; 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 91% 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 2095d7f0..a3954573 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.core.AppEng; import appeng.init.client.InitAutoRotatingModel; @@ -7,8 +7,8 @@ import net.minecraft.client.resources.model.ModelBakery; 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.spongepowered.asm.mixin.Final; +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/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 e414aacf..ae962507 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.ForgeModelBakery; 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 a11e6842..d6704ce2 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 3884b121..a80675ed 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.util.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/kubejs/RecipeEventJSMixin.java b/forge/src/main/java/org/embeddedt/modernfix/forge/mixin/perf/kubejs/RecipeEventJSMixin.java similarity index 97% 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 05c02e81..8eb46394 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 dev.latvian.mods.kubejs.recipe.RecipeEventJS; import org.embeddedt.modernfix.ModernFix; 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 afd6061b..f98c6f46 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 97% 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 89337b87..44b8675f 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 c1e5808f..b2f79aa1 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/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 ca1d5778..e556618a 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.network.NetworkEvent; @@ -8,6 +8,7 @@ import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.fml.DistExecutor; 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 53e44d54..4f2a9059 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.util.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 92% 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 6f48b77c..7346062e 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,4 +1,4 @@ -package org.embeddedt.modernfix.searchtree; +package org.embeddedt.modernfix.forge.searchtree; import mezz.jei.api.ingredients.ITypedIngredient; import mezz.jei.common.Internal; @@ -7,7 +7,8 @@ import mezz.jei.common.ingredients.IngredientFilterApi; import mezz.jei.common.runtime.JeiRuntime; import net.minecraft.world.item.ItemStack; import org.embeddedt.modernfix.ModernFix; -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.lang.reflect.Field; import java.util.ArrayList; 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 be77b525..3089fc51 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 722efee7..77a9f4e0 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,10 +21,10 @@ import net.minecraftforge.fml.loading.moddiscovery.ExplodedDirectoryLocator; import net.minecraftforge.fml.util.ObfuscationReflectionHelper; import net.minecraftforge.network.PacketDistributor; import net.minecraftforge.server.ServerLifecycleHooks; -import org.embeddedt.modernfix.classloading.FastAccessTransformerList; +import org.embeddedt.modernfix.forge.classloading.FastAccessTransformerList; 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.*; @@ -139,7 +139,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 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",