Moved battlegear API package into backhand package.

src/main/java/mods/battlegear2/BattlemodeHookContainerClass.java

@@ -9,8 +9,7 @@
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import mods.battlegear2.api.PlayerEventChild;
-import mods.battlegear2.api.core.*;
+import xonin.backhand.api.PlayerEventChild;
 import mods.battlegear2.packet.BattlegearSyncItemPacket;
 import mods.battlegear2.packet.OffhandConfigSyncPacket;
 import mods.battlegear2.packet.OffhandPlaceBlockPacket;
@@ -36,6 +35,7 @@
 import org.apache.logging.log4j.Level;
 import xonin.backhand.Backhand;
 import xonin.backhand.CommonProxy;
+import xonin.backhand.api.core.*;
 
 public final class BattlemodeHookContainerClass {
 

src/main/java/mods/battlegear2/client/BattlegearClientTickHandler.java

@@ -17,10 +17,10 @@
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import mods.battlegear2.BattlemodeHookContainerClass;
-import mods.battlegear2.api.PlayerEventChild;
-import mods.battlegear2.api.core.BattlegearUtils;
-import mods.battlegear2.api.core.IBattlePlayer;
-import mods.battlegear2.api.core.InventoryPlayerBattle;
+import xonin.backhand.api.PlayerEventChild;
+import xonin.backhand.api.core.BattlegearUtils;
+import xonin.backhand.api.core.IBattlePlayer;
+import xonin.backhand.api.core.InventoryPlayerBattle;
 import mods.battlegear2.packet.OffhandPlaceBlockPacket;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;

src/main/java/mods/battlegear2/client/utils/BattlegearClientUtils.java

@@ -1,6 +1,6 @@
 package mods.battlegear2.client.utils;
 
-import mods.battlegear2.api.core.BattlegearUtils;
+import xonin.backhand.api.core.BattlegearUtils;
 import net.minecraft.client.entity.EntityOtherPlayerMP;
 import net.minecraft.item.ItemStack;
 

src/main/java/mods/battlegear2/client/utils/BattlegearRenderHelper.java

@@ -5,15 +5,13 @@
 
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import mods.battlegear2.api.core.IBattlePlayer;
+import xonin.backhand.api.core.IBattlePlayer;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.renderer.GLAllocation;
 import net.minecraft.client.renderer.ItemRenderer;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.init.Blocks;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;

src/main/java/mods/battlegear2/coremod/BattlegearLoadingPlugin.java

@@ -4,7 +4,7 @@
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.Name;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.SortingIndex;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin.TransformerExclusions;
-import mods.battlegear2.api.core.BattlegearTranslator;
+import xonin.backhand.api.core.BattlegearTranslator;
 
 import java.io.File;
 import java.util.Map;

src/main/java/mods/battlegear2/coremod/transformers/EntityAIControlledByPlayerTransformer.java

@@ -1,6 +1,6 @@
 package mods.battlegear2.coremod.transformers;
 
-import mods.battlegear2.api.core.BattlegearTranslator;
+import xonin.backhand.api.core.BattlegearTranslator;
 import org.objectweb.asm.tree.MethodNode;
 
 public final class EntityAIControlledByPlayerTransformer extends TransformerMethodProcess {

src/main/java/mods/battlegear2/coremod/transformers/EntityOtherPlayerMPTransformer.java

@@ -1,6 +1,6 @@
 package mods.battlegear2.coremod.transformers;
 
-import mods.battlegear2.api.core.BattlegearTranslator;
+import xonin.backhand.api.core.BattlegearTranslator;
 import org.objectweb.asm.tree.*;
 
 import java.util.Iterator;

src/main/java/mods/battlegear2/coremod/transformers/EntityPlayerTransformer.java

@@ -1,7 +1,7 @@
 package mods.battlegear2.coremod.transformers;
 
-import mods.battlegear2.api.core.BattlegearTranslator;
-import mods.battlegear2.api.core.IBattlePlayer;
+import xonin.backhand.api.core.BattlegearTranslator;
+import xonin.backhand.api.core.IBattlePlayer;
 import net.tclproject.mysteriumlib.asm.common.CustomLoadingPlugin;
 
 import org.apache.logging.log4j.Level;
@@ -67,11 +67,11 @@ boolean processMethods(List<MethodNode> methods) {
                     AbstractInsnNode insn = it.next();
                     if (insn instanceof TypeInsnNode) {
                         if (((TypeInsnNode) insn).desc.equals(inventoryClassName)) {
-                            ((TypeInsnNode) insn).desc = "mods/battlegear2/api/core/InventoryPlayerBattle";
+                            ((TypeInsnNode) insn).desc = "xonin/backhand/api/core/InventoryPlayerBattle";
                         }
                     } else if (insn instanceof MethodInsnNode) {
                         if (((MethodInsnNode) insn).owner.equals(inventoryClassName)) {
-                            ((MethodInsnNode) insn).owner = "mods/battlegear2/api/core/InventoryPlayerBattle";
+                            ((MethodInsnNode) insn).owner = "xonin/backhand/api/core/InventoryPlayerBattle";
                         }
                     }
                 }

src/main/java/mods/battlegear2/coremod/transformers/ItemInWorldTransformer.java

@@ -1,6 +1,6 @@
 package mods.battlegear2.coremod.transformers;
 
-import mods.battlegear2.api.core.BattlegearTranslator;
+import xonin.backhand.api.core.BattlegearTranslator;
 import org.objectweb.asm.tree.*;
 
 import java.util.Iterator;

src/main/java/mods/battlegear2/coremod/transformers/ModelBipedTransformer.java

@@ -1,6 +1,6 @@
 package mods.battlegear2.coremod.transformers;
 
-import mods.battlegear2.api.core.BattlegearTranslator;
+import xonin.backhand.api.core.BattlegearTranslator;
 import org.objectweb.asm.tree.*;
 
 import java.util.Iterator;

src/main/java/mods/battlegear2/coremod/transformers/NetClientHandlerTransformer.java

@@ -1,6 +1,5 @@
 package mods.battlegear2.coremod.transformers;
 
-import mods.battlegear2.api.core.BattlegearTranslator;
 import org.objectweb.asm.tree.*;
 
 import java.util.List;
@@ -32,7 +31,7 @@ boolean processMethods(List<MethodNode> methods) {
 
                     if (nextNode instanceof JumpInsnNode && nextNode.getOpcode() == IFLT) {
                         LabelNode label = ((JumpInsnNode) nextNode).label;
-                        newList.add(new MethodInsnNode(INVOKESTATIC, "mods/battlegear2/api/core/InventoryPlayerBattle", "isValidSwitch", "(I)Z"));
+                        newList.add(new MethodInsnNode(INVOKESTATIC, "xonin/backhand/api/core/InventoryPlayerBattle", "isValidSwitch", "(I)Z"));
                         newList.add(new JumpInsnNode(IFEQ, label));//"if equal" branch
 
                         found++;

src/main/java/mods/battlegear2/coremod/transformers/PlayerControllerMPTransformer.java

@@ -1,6 +1,6 @@
 package mods.battlegear2.coremod.transformers;
 
-import mods.battlegear2.api.core.BattlegearTranslator;
+import xonin.backhand.api.core.BattlegearTranslator;
 import org.objectweb.asm.tree.MethodNode;
 
 public final class PlayerControllerMPTransformer extends TransformerMethodProcess {

src/main/java/mods/battlegear2/coremod/transformers/TransformerBase.java

@@ -1,6 +1,6 @@
 package mods.battlegear2.coremod.transformers;
 
-import mods.battlegear2.api.core.BattlegearTranslator;
+import xonin.backhand.api.core.BattlegearTranslator;
 import mods.battlegear2.coremod.BattlegearLoadingPlugin;
 import net.minecraft.launchwrapper.IClassTransformer;
 import org.apache.logging.log4j.Level;
@@ -18,7 +18,7 @@
 import java.util.List;
 
 public abstract class TransformerBase implements IClassTransformer, Opcodes {
-    public static final String UTILITY_CLASS = "mods/battlegear2/api/core/BattlegearUtils";
+    public static final String UTILITY_CLASS = "xonin/backhand/api/core/BattlegearUtils";
     public static final String SIMPLEST_METHOD_DESC = "()V";
     public Logger logger = LogManager.getLogger("battlegear2");
     protected final String classPath;

src/main/java/mods/battlegear2/coremod/transformers/TransformerMethodProcess.java

@@ -1,6 +1,5 @@
 package mods.battlegear2.coremod.transformers;
 
-import mods.battlegear2.api.core.BattlegearTranslator;
 import org.objectweb.asm.tree.FieldNode;
 import org.objectweb.asm.tree.MethodNode;
 

src/main/java/mods/battlegear2/packet/BattlegearAnimationPacket.java

@@ -2,7 +2,7 @@
 
 import cpw.mods.fml.common.network.ByteBufUtils;
 import io.netty.buffer.ByteBuf;
-import mods.battlegear2.api.core.IBattlePlayer;
+import xonin.backhand.api.core.IBattlePlayer;
 import mods.battlegear2.utils.EnumBGAnimations;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.world.WorldServer;

src/main/java/mods/battlegear2/packet/BattlegearSyncItemPacket.java

@@ -2,8 +2,7 @@
 
 import cpw.mods.fml.common.network.ByteBufUtils;
 import io.netty.buffer.ByteBuf;
-import mods.battlegear2.api.core.BattlegearUtils;
-import mods.battlegear2.api.core.InventoryPlayerBattle;
+import xonin.backhand.api.core.BattlegearUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;

src/main/java/mods/battlegear2/packet/OffhandAttackPacket.java

@@ -2,7 +2,7 @@
 
 import cpw.mods.fml.common.network.ByteBufUtils;
 import io.netty.buffer.ByteBuf;
-import mods.battlegear2.api.core.IBattlePlayer;
+import xonin.backhand.api.core.IBattlePlayer;
 import mods.battlegear2.utils.EnumBGAnimations;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;

src/main/java/mods/battlegear2/packet/OffhandPlaceBlockPacket.java

@@ -6,8 +6,8 @@
 import cpw.mods.fml.relauncher.Side;
 import io.netty.buffer.ByteBuf;
 import mods.battlegear2.BattlemodeHookContainerClass;
-import mods.battlegear2.api.PlayerEventChild;
-import mods.battlegear2.api.core.BattlegearUtils;
+import xonin.backhand.api.PlayerEventChild;
+import xonin.backhand.api.core.BattlegearUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;

src/main/java/mods/battlegear2/packet/OffhandSwapClientPacket.java

@@ -3,10 +3,9 @@
 
 import cpw.mods.fml.common.network.ByteBufUtils;
 import io.netty.buffer.ByteBuf;
-import mods.battlegear2.api.core.BattlegearUtils;
-import mods.battlegear2.api.core.InventoryPlayerBattle;
+import xonin.backhand.api.core.BattlegearUtils;
+import xonin.backhand.api.core.InventoryPlayerBattle;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemStack;
 import xonin.backhand.client.ClientTickHandler;
 
 /**

src/main/java/mods/battlegear2/packet/OffhandSwapPacket.java

@@ -2,7 +2,7 @@
 
 import cpw.mods.fml.common.network.ByteBufUtils;
 import io.netty.buffer.ByteBuf;
-import mods.battlegear2.api.core.BattlegearUtils;
+import xonin.backhand.api.core.BattlegearUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraft.item.ItemStack;

src/main/java/mods/battlegear2/packet/OffhandToServerPacket.java

@@ -2,7 +2,7 @@
 
 import cpw.mods.fml.common.network.ByteBufUtils;
 import io.netty.buffer.ByteBuf;
-import mods.battlegear2.api.core.BattlegearUtils;
+import xonin.backhand.api.core.BattlegearUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
 

src/main/java/mods/battlegear2/utils/EnumBGAnimations.java

@@ -1,6 +1,6 @@
 package mods.battlegear2.utils;
 
-import mods.battlegear2.api.core.IBattlePlayer;
+import xonin.backhand.api.core.IBattlePlayer;
 
 public enum EnumBGAnimations {
 

src/main/java/net/tclproject/mysteriumlib/asm/common/CustomLoadingPlugin.java

@@ -13,7 +13,7 @@
 import cpw.mods.fml.common.asm.transformers.DeobfuscationTransformer;
 import cpw.mods.fml.relauncher.CoreModManager;
 import cpw.mods.fml.relauncher.IFMLLoadingPlugin;
-import mods.battlegear2.api.core.BattlegearTranslator;
+import xonin.backhand.api.core.BattlegearTranslator;
 import mods.battlegear2.coremod.BattlegearLoadingPlugin;
 import net.tclproject.mysteriumlib.asm.core.ASMFix;
 import net.tclproject.mysteriumlib.asm.core.MetaReader;

src/main/java/net/tclproject/mysteriumlib/asm/fixes/MysteriumPatchesFixesO.java

@@ -8,9 +8,9 @@
 import invtweaks.InvTweaksContainerSectionManager;
 import invtweaks.api.container.ContainerSection;
 import mods.battlegear2.BattlemodeHookContainerClass;
-import mods.battlegear2.api.core.BattlegearUtils;
-import mods.battlegear2.api.core.IBattlePlayer;
-import mods.battlegear2.api.core.InventoryPlayerBattle;
+import xonin.backhand.api.core.BattlegearUtils;
+import xonin.backhand.api.core.IBattlePlayer;
+import xonin.backhand.api.core.InventoryPlayerBattle;
 import mods.battlegear2.client.BattlegearClientTickHandler;
 import net.minecraft.block.material.Material;
 import net.minecraft.client.Minecraft;

src/main/java/xonin/backhand/ServerEventsHandler.java

@@ -4,15 +4,14 @@
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.relauncher.Side;
-import mods.battlegear2.api.core.BattlegearUtils;
+import xonin.backhand.api.core.BattlegearUtils;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
 import net.minecraft.item.ItemBow;
 import net.minecraft.item.ItemStack;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.living.LivingHurtEvent;
-import net.minecraftforge.event.entity.player.ArrowLooseEvent;
 import net.minecraftforge.event.entity.player.ArrowNockEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;
 import net.minecraftforge.event.entity.player.PlayerUseItemEvent;

src/main/java/xonin/backhand/ServerTickHandler.java

@@ -5,7 +5,7 @@
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
 import cpw.mods.fml.common.gameevent.TickEvent;
 import cpw.mods.fml.relauncher.Side;
-import mods.battlegear2.api.core.BattlegearUtils;
+import xonin.backhand.api.core.BattlegearUtils;
 import mods.battlegear2.packet.BattlegearSyncItemPacket;
 import mods.battlegear2.packet.OffhandWorldHotswapPacket;
 import net.minecraft.entity.player.EntityPlayer;

src/main/java/mods/battlegear2/api/PlayerEventChild.java → src/main/java/xonin/backhand/api/PlayerEventChild.java

@@ -1,13 +1,9 @@
-package mods.battlegear2.api;
+package xonin.backhand.api;
 
 import cpw.mods.fml.common.eventhandler.Cancelable;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.projectile.EntityArrow;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.DamageSource;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.entity.player.ArrowLooseEvent;
 import net.minecraftforge.event.entity.player.EntityInteractEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.event.entity.player.PlayerInteractEvent;

src/main/java/mods/battlegear2/api/core/BattlegearTranslator.java → src/main/java/xonin/backhand/api/core/BattlegearTranslator.java

@@ -1,4 +1,4 @@
-package mods.battlegear2.api.core;
+package xonin.backhand.api.core;
 
 import net.tclproject.mysteriumlib.asm.common.CustomLoadingPlugin;
 

src/main/java/mods/battlegear2/api/core/BattlegearUtils.java → src/main/java/xonin/backhand/api/core/BattlegearUtils.java

@@ -1,4 +1,4 @@
-package mods.battlegear2.api.core;
+package xonin.backhand.api.core;
 
 import java.io.Closeable;
 import java.io.IOException;

src/main/java/mods/battlegear2/api/core/IBattlePlayer.java → src/main/java/xonin/backhand/api/core/IBattlePlayer.java

@@ -1,4 +1,4 @@
-package mods.battlegear2.api.core;
+package xonin.backhand.api.core;
 
 import net.minecraft.entity.Entity;
 

src/main/java/mods/battlegear2/api/core/InventoryPlayerBattle.java → src/main/java/xonin/backhand/api/core/InventoryPlayerBattle.java

@@ -1,4 +1,4 @@
-package mods.battlegear2.api.core;
+package xonin.backhand.api.core;
 
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;

src/main/java/mods/battlegear2/api/core/OffhandExtendedProperty.java → src/main/java/xonin/backhand/api/core/OffhandExtendedProperty.java

@@ -1,4 +1,4 @@
-package mods.battlegear2.api.core;
+package xonin.backhand.api.core;
 
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.player.EntityPlayer;

src/main/java/xonin/backhand/client/ClientEventHandler.java

@@ -2,7 +2,7 @@
 
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import mods.battlegear2.api.core.BattlegearUtils;
+import xonin.backhand.api.core.BattlegearUtils;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiIngame;
 import net.minecraft.client.model.ModelBiped;

src/main/java/xonin/backhand/client/ClientTickHandler.java

@@ -8,12 +8,11 @@
 import cpw.mods.fml.relauncher.SideOnly;
 import invtweaks.InvTweaks;
 import mods.battlegear2.BattlemodeHookContainerClass;
-import mods.battlegear2.api.core.BattlegearUtils;
+import xonin.backhand.api.core.BattlegearUtils;
 import mods.battlegear2.client.BattlegearClientTickHandler;
 import mods.battlegear2.packet.OffhandSwapPacket;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityClientPlayerMP;
-import net.minecraft.client.settings.KeyBinding;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.MovingObjectPosition;
 import org.lwjgl.input.Keyboard;

src/main/java/xonin/backhand/client/renderer/ItemRendererOffhand.java

@@ -1,22 +1,18 @@
 package xonin.backhand.client.renderer;
 
-import mods.battlegear2.api.core.IBattlePlayer;
-import xonin.backhand.client.ClientEventHandler;
-import mods.battlegear2.api.core.BattlegearUtils;
+import xonin.backhand.api.core.BattlegearUtils;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.entity.EntityClientPlayerMP;
 import net.minecraft.client.model.ModelBiped;
 import net.minecraft.client.renderer.*;
-import net.minecraft.client.renderer.entity.RenderManager;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.client.renderer.texture.TextureUtil;
 import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.init.Items;
 import net.minecraft.item.*;
 import net.minecraft.util.IIcon;
-import net.minecraft.util.MathHelper;
 import net.minecraft.util.ResourceLocation;
 import net.minecraftforge.client.ForgeHooksClient;
 import net.minecraftforge.client.IItemRenderer;
@@ -25,7 +21,6 @@
 import org.lwjgl.opengl.GL12;
 
 import static net.minecraftforge.client.IItemRenderer.ItemRenderType.*;
-import static net.minecraftforge.client.IItemRenderer.ItemRendererHelper.BLOCK_3D;
 
 public class ItemRendererOffhand extends ItemRenderer {
     private static final ResourceLocation RES_ITEM_GLINT = new ResourceLocation("textures/misc/enchanted_item_glint.png");