move mixin related hooks and interfaces under mixin package (#255)

gradle.properties

@@ -46,7 +46,7 @@ usesMixins = true
 # Adds some debug arguments like verbose output and export
 usesMixinDebug = true
 # Specify the location of your implementation of IMixinPlugin. Leave it empty otherwise.
-mixinPlugin = 
+mixinPlugin =
 # Specify the package that contains all of your Mixins. You may only place Mixins in this package or the build will fail!
 mixinsPackage = mixins
 # Specify the core mod entry class if you use a core mod. This class must implement IFMLLoadingPlugin!

src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinBlock_FixXray.java

@@ -7,10 +7,10 @@
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.Shadow;
 
-import com.mitchej123.hodgepodge.common.BlockInvoker_FixXray;
+import com.mitchej123.hodgepodge.mixins.interfaces.BlockExt_FixXray;
 
 @Mixin(Block.class)
-public abstract class MixinBlock_FixXray implements BlockInvoker_FixXray {
+public abstract class MixinBlock_FixXray implements BlockExt_FixXray {
 
     @Shadow
     public abstract AxisAlignedBB getCollisionBoundingBoxFromPool(World worldIn, int x, int y, int z);

src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinKeyBinding.java

@@ -16,10 +16,10 @@
 
 import com.google.common.collect.ArrayListMultimap;
 import com.google.common.collect.Multimap;
-import com.mitchej123.hodgepodge.common.KeyBindingDuck;
+import com.mitchej123.hodgepodge.mixins.interfaces.KeyBindingExt;
 
 @Mixin(KeyBinding.class)
-public class MixinKeyBinding implements KeyBindingDuck {
+public class MixinKeyBinding implements KeyBindingExt {
 
     @Shadow
     @Final

src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinMinecraft_UpdateKeys.java

@@ -7,7 +7,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import com.mitchej123.hodgepodge.common.KeyBindingDuck;
+import com.mitchej123.hodgepodge.mixins.interfaces.KeyBindingExt;
 
 @Mixin(Minecraft.class)
 public class MixinMinecraft_UpdateKeys {
@@ -19,7 +19,7 @@ public class MixinMinecraft_UpdateKeys {
             method = "setIngameFocus",
             at = @At(value = "INVOKE", target = "Lnet/minecraft/util/MouseHelper;grabMouseCursor()V"))
     private void hodgepodge$updateKeysStates(CallbackInfo ci) {
-        ((KeyBindingDuck) Minecraft.getMinecraft().gameSettings.keyBindAttack).hodgepodge$updateKeyStates();
+        ((KeyBindingExt) Minecraft.getMinecraft().gameSettings.keyBindAttack).hodgepodge$updateKeyStates();
     }
 
 }

src/main/java/com/mitchej123/hodgepodge/mixins/early/minecraft/MixinWorld_FixXray.java

@@ -9,7 +9,7 @@
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Redirect;
 
-import com.mitchej123.hodgepodge.common.BlockInvoker_FixXray;
+import com.mitchej123.hodgepodge.mixins.interfaces.BlockExt_FixXray;
 
 @Mixin(World.class)
 public class MixinWorld_FixXray {
@@ -23,7 +23,7 @@ public class MixinWorld_FixXray {
                     value = "INVOKE",
                     target = "Lnet/minecraft/block/Block;getCollisionBoundingBoxFromPool(Lnet/minecraft/world/World;III)Lnet/minecraft/util/AxisAlignedBB;"))
     private AxisAlignedBB hodgepodge$fixXray(Block block, World world, int x, int y, int z) {
-        if (((BlockInvoker_FixXray) block).hodgepodge$shouldRayTraceStopOnBlock(world, x, y, z)) {
+        if (((BlockExt_FixXray) block).hodgepodge$shouldRayTraceStopOnBlock(world, x, y, z)) {
             return hodgepodge$DUMMY_AABB;
         }
         return null;

src/main/java/com/mitchej123/hodgepodge/common/ThaumcraftMixinMethods.java → src/main/java/com/mitchej123/hodgepodge/mixins/hooks/ThaumcraftMixinMethods.java

@@ -1,4 +1,4 @@
-package com.mitchej123.hodgepodge.common;
+package com.mitchej123.hodgepodge.mixins.hooks;
 
 import java.util.ArrayList;
 

src/main/java/com/mitchej123/hodgepodge/common/BlockInvoker_FixXray.java → src/main/java/com/mitchej123/hodgepodge/mixins/interfaces/BlockExt_FixXray.java

@@ -1,8 +1,8 @@
-package com.mitchej123.hodgepodge.common;
+package com.mitchej123.hodgepodge.mixins.interfaces;
 
 import net.minecraft.world.World;
 
-public interface BlockInvoker_FixXray {
+public interface BlockExt_FixXray {
 
     boolean hodgepodge$shouldRayTraceStopOnBlock(World worldIn, int x, int y, int z);
 }

src/main/java/com/mitchej123/hodgepodge/mixins/interfaces/KeyBindingExt.java

@@ -0,0 +1,6 @@
+package com.mitchej123.hodgepodge.mixins.interfaces;
+
+public interface KeyBindingExt {
+
+    void hodgepodge$updateKeyStates();
+}

src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinEntityGolemBase.java

@@ -13,7 +13,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
-import com.mitchej123.hodgepodge.common.ThaumcraftMixinMethods;
+import com.mitchej123.hodgepodge.mixins.hooks.ThaumcraftMixinMethods;
 
 import thaumcraft.common.entities.golems.EntityGolemBase;
 import thaumcraft.common.entities.golems.Marker;

src/main/java/com/mitchej123/hodgepodge/mixins/late/thaumcraft/MixinItemGolemBell.java

@@ -10,7 +10,7 @@
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
-import com.mitchej123.hodgepodge.common.ThaumcraftMixinMethods;
+import com.mitchej123.hodgepodge.mixins.hooks.ThaumcraftMixinMethods;
 
 import thaumcraft.common.entities.golems.ItemGolemBell;
 import thaumcraft.common.entities.golems.Marker;

src/main/resources/mixins.hodgepodge.json

@@ -1,7 +1,6 @@
 {
   "required": true,
   "minVersion": "0.8.3-GTNH",
-  "package": "com.mitchej123.hodgepodge.mixins",
   "refmap": "mixins.hodgepodge.refmap.json",
   "target": "@env(DEFAULT)",
   "compatibilityLevel": "JAVA_8"