diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/ChunkMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/ChunkMixin.java similarity index 98% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/client/ChunkMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/ChunkMixin.java index 7a184ae..d0aabec 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/ChunkMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/ChunkMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.client; +package com.falsepattern.endlessids.mixin.mixins.client.vanilla; import com.falsepattern.endlessids.Hooks; import com.falsepattern.endlessids.constants.ExtendedConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/NetHandlerPlayClientMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/NetHandlerPlayClientMixin.java similarity index 96% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/client/NetHandlerPlayClientMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/NetHandlerPlayClientMixin.java index 2243d10..abe5cb8 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/NetHandlerPlayClientMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/NetHandlerPlayClientMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.client; +package com.falsepattern.endlessids.mixin.mixins.client.vanilla; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/RenderGlobalMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/RenderGlobalMixin.java similarity index 93% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/client/RenderGlobalMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/RenderGlobalMixin.java index 84f07c8..afeab19 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/RenderGlobalMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/client/vanilla/RenderGlobalMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.client; +package com.falsepattern.endlessids.mixin.mixins.client.vanilla; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/BlockFireMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/BlockFireMixin.java similarity index 91% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/BlockFireMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/BlockFireMixin.java index 69fa86f..6d88a0a 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/BlockFireMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/BlockFireMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common; +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.misc; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/DataWatcherMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/DataWatcherMixin.java similarity index 98% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/DataWatcherMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/DataWatcherMixin.java index 503ca51..f962745 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/DataWatcherMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/DataWatcherMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common; +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.misc; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ItemInWorldManagerMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/ItemInWorldManagerMixin.java similarity index 90% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ItemInWorldManagerMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/ItemInWorldManagerMixin.java index 28713e8..6a02c9d 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ItemInWorldManagerMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/ItemInWorldManagerMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common; +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.misc; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/StatListMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/StatListMixin.java similarity index 90% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/StatListMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/StatListMixin.java index 0432562..380bb80 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/StatListMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/StatListMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common; +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.misc; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/WorldMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/WorldMixin.java similarity index 90% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/WorldMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/WorldMixin.java index c98660c..0265831 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/WorldMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/misc/WorldMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common; +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.misc; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/PacketBufferMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/PacketBufferMixin.java similarity index 96% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/PacketBufferMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/PacketBufferMixin.java index 43a4561..1d7bb17 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/PacketBufferMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/PacketBufferMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common; +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.networking; import io.netty.buffer.ByteBuf; import net.minecraft.item.Item; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/PlayerControllerMPMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/PlayerControllerMPMixin.java similarity index 90% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/PlayerControllerMPMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/PlayerControllerMPMixin.java index 203e381..847040b 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/PlayerControllerMPMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/PlayerControllerMPMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common; +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.networking; import com.falsepattern.endlessids.asm.Constants; import com.falsepattern.endlessids.constants.ExtendedConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/S21PacketChunkDataMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S21PacketChunkDataMixin.java similarity index 95% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/S21PacketChunkDataMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S21PacketChunkDataMixin.java index 2b572b9..ecd2468 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/S21PacketChunkDataMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S21PacketChunkDataMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common; +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.networking; import com.falsepattern.endlessids.Hooks; import com.falsepattern.endlessids.asm.Constants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/S22PacketMultiBlockChangeMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S22PacketMultiBlockChangeMixin.java similarity index 96% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/S22PacketMultiBlockChangeMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S22PacketMultiBlockChangeMixin.java index 642e7fd..c10b149 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/S22PacketMultiBlockChangeMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S22PacketMultiBlockChangeMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common; +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.networking; import net.minecraft.block.Block; import net.minecraft.network.play.server.S22PacketMultiBlockChange; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/S24PacketBlockActionMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S24PacketBlockActionMixin.java similarity index 90% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/S24PacketBlockActionMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S24PacketBlockActionMixin.java index 3f227ae..326ebb8 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/S24PacketBlockActionMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S24PacketBlockActionMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common; +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.networking; import com.falsepattern.endlessids.asm.Constants; import com.falsepattern.endlessids.constants.ExtendedConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/S26PacketMapChunkBulkMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S26PacketMapChunkBulkMixin.java similarity index 90% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/S26PacketMapChunkBulkMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S26PacketMapChunkBulkMixin.java index 5e4161c..2caa51d 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/S26PacketMapChunkBulkMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/networking/S26PacketMapChunkBulkMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common; +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.networking; import com.falsepattern.endlessids.constants.ExtendedConstants; import com.falsepattern.endlessids.constants.VanillaConstants; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/AnvilChunkLoaderMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/storage/AnvilChunkLoaderMixin.java similarity index 98% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/AnvilChunkLoaderMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/storage/AnvilChunkLoaderMixin.java index 8d72391..7d8790f 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/AnvilChunkLoaderMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/storage/AnvilChunkLoaderMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common; +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.storage; import com.falsepattern.endlessids.Hooks; import com.falsepattern.endlessids.mixin.helpers.IExtendedBlockStorageMixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ExtendedBlockStorageMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/storage/ExtendedBlockStorageMixin.java similarity index 97% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ExtendedBlockStorageMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/storage/ExtendedBlockStorageMixin.java index 59d63cf..7392902 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ExtendedBlockStorageMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/storage/ExtendedBlockStorageMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common; +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.storage; import com.falsepattern.endlessids.Hooks; import com.falsepattern.endlessids.mixin.helpers.IExtendedBlockStorageMixin; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ItemStackMixin.java b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/storage/ItemStackMixin.java similarity index 95% rename from src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ItemStackMixin.java rename to src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/storage/ItemStackMixin.java index 5ff3dfa..a7c7d73 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/ItemStackMixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/mixins/common/vanilla/storage/ItemStackMixin.java @@ -1,4 +1,4 @@ -package com.falsepattern.endlessids.mixin.mixins.common; +package com.falsepattern.endlessids.mixin.mixins.common.vanilla.storage; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java index 1999d45..4a6b08f 100644 --- a/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java +++ b/src/main/java/com/falsepattern/endlessids/mixin/plugin/Mixin.java @@ -9,24 +9,35 @@ import java.util.Set; import java.util.function.Supplier; public enum Mixin { - AnvilChunkLoaderMixin(builder(Side.COMMON).mixin("AnvilChunkLoaderMixin")), - BlockFireMixin(builder(Side.COMMON).mixin("BlockFireMixin")), - DataWatcherMixin(builder(Side.COMMON).condition(() -> IEConfig.extendDataWatcher).mixin("DataWatcherMixin")), - ExtendedBlockStorageMixin(builder(Side.COMMON).mixin("ExtendedBlockStorageMixin")), - ItemInWorldManagerMixin(builder(Side.COMMON).mixin("ItemInWorldManagerMixin")), - ItemStackMixin(builder(Side.COMMON).mixin("ItemStackMixin")), - PacketBufferMixin(builder(Side.COMMON).mixin("PacketBufferMixin")), - PlayerControllerMPMixin(builder(Side.COMMON).mixin("PlayerControllerMPMixin")), - S21PacketChunkDataMixin(builder(Side.COMMON).mixin("S21PacketChunkDataMixin")), - S22PacketMultiBlockChangeMixin(builder(Side.COMMON).mixin("S22PacketMultiBlockChangeMixin")), - S24PacketBlockActionMixin(builder(Side.COMMON).mixin("S24PacketBlockActionMixin")), - S26PacketMapChunkBulkMixin(builder(Side.COMMON).mixin("S26PacketMapChunkBulkMixin")), - StatListMixin(builder(Side.COMMON).mixin("StatListMixin")), - WorldMixin(builder(Side.COMMON).mixin("WorldMixin")), - - ChunkMixin(builder(Side.CLIENT).mixin("ChunkMixin")), - NetHandlerPlayClientMixin(builder(Side.CLIENT).mixin("NetHandlerPlayClientMixin")), - RenderGlobalMixin(builder(Side.CLIENT).mixin("RenderGlobalMixin")), + //BEGIN Minecraft + //BEGIN common + //BEGIN storage + AnvilChunkLoaderMixin(builder(Side.COMMON).mixin("vanilla.storage.AnvilChunkLoaderMixin")), + ExtendedBlockStorageMixin(builder(Side.COMMON).mixin("vanilla.storage.ExtendedBlockStorageMixin")), + ItemStackMixin(builder(Side.COMMON).mixin("vanilla.storage.ItemStackMixin")), + //END storage + //BEGIN networking + PlayerControllerMPMixin(builder(Side.COMMON).mixin("vanilla.networking.PlayerControllerMPMixin")), + S21PacketChunkDataMixin(builder(Side.COMMON).mixin("vanilla.networking.S21PacketChunkDataMixin")), + S22PacketMultiBlockChangeMixin(builder(Side.COMMON).mixin("vanilla.networking.S22PacketMultiBlockChangeMixin")), + S24PacketBlockActionMixin(builder(Side.COMMON).mixin("vanilla.networking.S24PacketBlockActionMixin")), + S26PacketMapChunkBulkMixin(builder(Side.COMMON).mixin("vanilla.networking.S26PacketMapChunkBulkMixin")), + //END networking + //BEGIN misc + BlockFireMixin(builder(Side.COMMON).mixin("vanilla.misc.BlockFireMixin")), + DataWatcherMixin(builder(Side.COMMON).condition(() -> IEConfig.extendDataWatcher).mixin("vanilla.misc.DataWatcherMixin")), + ItemInWorldManagerMixin(builder(Side.COMMON).mixin("vanilla.misc.ItemInWorldManagerMixin")), + PacketBufferMixin(builder(Side.COMMON).mixin("vanilla.misc.PacketBufferMixin")), + StatListMixin(builder(Side.COMMON).mixin("vanilla.misc.StatListMixin")), + WorldMixin(builder(Side.COMMON).mixin("vanilla.misc.WorldMixin")), + //END misc + //END common + //BEGIN client + ChunkMixin(builder(Side.CLIENT).mixin("vanilla.ChunkMixin")), + NetHandlerPlayClientMixin(builder(Side.CLIENT).mixin("vanilla.NetHandlerPlayClientMixin")), + RenderGlobalMixin(builder(Side.CLIENT).mixin("vanilla.RenderGlobalMixin")), + //END client + //END Minecraft ; public final String mixin;