reorganize mixins in preparation for multiple mods

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;

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;