From 3ac4531e2f71732fee2b636905ac357f16f133d2 Mon Sep 17 00:00:00 2001 From: "Luis C.M." <42545778+c0508383@users.noreply.github.com> Date: Tue, 25 Jun 2024 20:23:15 -0500 Subject: [PATCH] Moved battlegear API package into backhand package. --- .../mods/battlegear2/BattlemodeHookContainerClass.java | 4 ++-- .../battlegear2/client/BattlegearClientTickHandler.java | 8 ++++---- .../battlegear2/client/utils/BattlegearClientUtils.java | 2 +- .../battlegear2/client/utils/BattlegearRenderHelper.java | 4 +--- .../mods/battlegear2/coremod/BattlegearLoadingPlugin.java | 2 +- .../EntityAIControlledByPlayerTransformer.java | 2 +- .../transformers/EntityOtherPlayerMPTransformer.java | 2 +- .../coremod/transformers/EntityPlayerTransformer.java | 8 ++++---- .../coremod/transformers/ItemInWorldTransformer.java | 2 +- .../coremod/transformers/ModelBipedTransformer.java | 2 +- .../coremod/transformers/NetClientHandlerTransformer.java | 3 +-- .../transformers/PlayerControllerMPTransformer.java | 2 +- .../battlegear2/coremod/transformers/TransformerBase.java | 4 ++-- .../coremod/transformers/TransformerMethodProcess.java | 1 - .../battlegear2/packet/BattlegearAnimationPacket.java | 2 +- .../mods/battlegear2/packet/BattlegearSyncItemPacket.java | 3 +-- .../java/mods/battlegear2/packet/OffhandAttackPacket.java | 2 +- .../mods/battlegear2/packet/OffhandPlaceBlockPacket.java | 4 ++-- .../mods/battlegear2/packet/OffhandSwapClientPacket.java | 5 ++--- .../java/mods/battlegear2/packet/OffhandSwapPacket.java | 2 +- .../mods/battlegear2/packet/OffhandToServerPacket.java | 2 +- .../java/mods/battlegear2/utils/EnumBGAnimations.java | 2 +- .../mysteriumlib/asm/common/CustomLoadingPlugin.java | 2 +- .../mysteriumlib/asm/fixes/MysteriumPatchesFixesO.java | 6 +++--- src/main/java/xonin/backhand/ServerEventsHandler.java | 3 +-- src/main/java/xonin/backhand/ServerTickHandler.java | 2 +- .../backhand}/api/PlayerEventChild.java | 6 +----- .../backhand}/api/core/BattlegearTranslator.java | 2 +- .../backhand}/api/core/BattlegearUtils.java | 2 +- .../backhand}/api/core/IBattlePlayer.java | 2 +- .../backhand}/api/core/InventoryPlayerBattle.java | 2 +- .../backhand}/api/core/OffhandExtendedProperty.java | 2 +- .../java/xonin/backhand/client/ClientEventHandler.java | 2 +- .../java/xonin/backhand/client/ClientTickHandler.java | 3 +-- .../backhand/client/renderer/ItemRendererOffhand.java | 7 +------ 35 files changed, 46 insertions(+), 63 deletions(-) rename src/main/java/{mods/battlegear2 => xonin/backhand}/api/PlayerEventChild.java (95%) rename src/main/java/{mods/battlegear2 => xonin/backhand}/api/core/BattlegearTranslator.java (97%) rename src/main/java/{mods/battlegear2 => xonin/backhand}/api/core/BattlegearUtils.java (99%) rename src/main/java/{mods/battlegear2 => xonin/backhand}/api/core/IBattlePlayer.java (94%) rename src/main/java/{mods/battlegear2 => xonin/backhand}/api/core/InventoryPlayerBattle.java (99%) rename src/main/java/{mods/battlegear2 => xonin/backhand}/api/core/OffhandExtendedProperty.java (97%) diff --git a/src/main/java/mods/battlegear2/BattlemodeHookContainerClass.java b/src/main/java/mods/battlegear2/BattlemodeHookContainerClass.java index aaba9a7..77b88bb 100644 --- a/src/main/java/mods/battlegear2/BattlemodeHookContainerClass.java +++ b/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 { diff --git a/src/main/java/mods/battlegear2/client/BattlegearClientTickHandler.java b/src/main/java/mods/battlegear2/client/BattlegearClientTickHandler.java index a914a7e..69ce564 100644 --- a/src/main/java/mods/battlegear2/client/BattlegearClientTickHandler.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/client/utils/BattlegearClientUtils.java b/src/main/java/mods/battlegear2/client/utils/BattlegearClientUtils.java index 19a5231..b167d38 100644 --- a/src/main/java/mods/battlegear2/client/utils/BattlegearClientUtils.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/client/utils/BattlegearRenderHelper.java b/src/main/java/mods/battlegear2/client/utils/BattlegearRenderHelper.java index 6e9657c..b32eb66 100644 --- a/src/main/java/mods/battlegear2/client/utils/BattlegearRenderHelper.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/coremod/BattlegearLoadingPlugin.java b/src/main/java/mods/battlegear2/coremod/BattlegearLoadingPlugin.java index e061d3c..70167d2 100644 --- a/src/main/java/mods/battlegear2/coremod/BattlegearLoadingPlugin.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/coremod/transformers/EntityAIControlledByPlayerTransformer.java b/src/main/java/mods/battlegear2/coremod/transformers/EntityAIControlledByPlayerTransformer.java index e318933..8e6ade6 100644 --- a/src/main/java/mods/battlegear2/coremod/transformers/EntityAIControlledByPlayerTransformer.java +++ b/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 { diff --git a/src/main/java/mods/battlegear2/coremod/transformers/EntityOtherPlayerMPTransformer.java b/src/main/java/mods/battlegear2/coremod/transformers/EntityOtherPlayerMPTransformer.java index 9b296ab..6fc6c42 100644 --- a/src/main/java/mods/battlegear2/coremod/transformers/EntityOtherPlayerMPTransformer.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/coremod/transformers/EntityPlayerTransformer.java b/src/main/java/mods/battlegear2/coremod/transformers/EntityPlayerTransformer.java index 2362f14..6f19bf1 100644 --- a/src/main/java/mods/battlegear2/coremod/transformers/EntityPlayerTransformer.java +++ b/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 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"; } } } diff --git a/src/main/java/mods/battlegear2/coremod/transformers/ItemInWorldTransformer.java b/src/main/java/mods/battlegear2/coremod/transformers/ItemInWorldTransformer.java index e77eb15..27f0b15 100644 --- a/src/main/java/mods/battlegear2/coremod/transformers/ItemInWorldTransformer.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/coremod/transformers/ModelBipedTransformer.java b/src/main/java/mods/battlegear2/coremod/transformers/ModelBipedTransformer.java index 78b0d42..27fca2a 100644 --- a/src/main/java/mods/battlegear2/coremod/transformers/ModelBipedTransformer.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/coremod/transformers/NetClientHandlerTransformer.java b/src/main/java/mods/battlegear2/coremod/transformers/NetClientHandlerTransformer.java index 8f46339..0ab666a 100644 --- a/src/main/java/mods/battlegear2/coremod/transformers/NetClientHandlerTransformer.java +++ b/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 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++; diff --git a/src/main/java/mods/battlegear2/coremod/transformers/PlayerControllerMPTransformer.java b/src/main/java/mods/battlegear2/coremod/transformers/PlayerControllerMPTransformer.java index 65b6fe1..3109575 100644 --- a/src/main/java/mods/battlegear2/coremod/transformers/PlayerControllerMPTransformer.java +++ b/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 { diff --git a/src/main/java/mods/battlegear2/coremod/transformers/TransformerBase.java b/src/main/java/mods/battlegear2/coremod/transformers/TransformerBase.java index c88cce6..bcd309b 100644 --- a/src/main/java/mods/battlegear2/coremod/transformers/TransformerBase.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/coremod/transformers/TransformerMethodProcess.java b/src/main/java/mods/battlegear2/coremod/transformers/TransformerMethodProcess.java index c6010c0..5af9634 100644 --- a/src/main/java/mods/battlegear2/coremod/transformers/TransformerMethodProcess.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/packet/BattlegearAnimationPacket.java b/src/main/java/mods/battlegear2/packet/BattlegearAnimationPacket.java index db50e7c..272dd39 100644 --- a/src/main/java/mods/battlegear2/packet/BattlegearAnimationPacket.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/packet/BattlegearSyncItemPacket.java b/src/main/java/mods/battlegear2/packet/BattlegearSyncItemPacket.java index b9386ab..c2c4253 100644 --- a/src/main/java/mods/battlegear2/packet/BattlegearSyncItemPacket.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/packet/OffhandAttackPacket.java b/src/main/java/mods/battlegear2/packet/OffhandAttackPacket.java index cb5b3f2..854e1eb 100644 --- a/src/main/java/mods/battlegear2/packet/OffhandAttackPacket.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/packet/OffhandPlaceBlockPacket.java b/src/main/java/mods/battlegear2/packet/OffhandPlaceBlockPacket.java index e832dba..71ff013 100644 --- a/src/main/java/mods/battlegear2/packet/OffhandPlaceBlockPacket.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/packet/OffhandSwapClientPacket.java b/src/main/java/mods/battlegear2/packet/OffhandSwapClientPacket.java index a2563c0..e478916 100644 --- a/src/main/java/mods/battlegear2/packet/OffhandSwapClientPacket.java +++ b/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; /** diff --git a/src/main/java/mods/battlegear2/packet/OffhandSwapPacket.java b/src/main/java/mods/battlegear2/packet/OffhandSwapPacket.java index 2770da6..d2a12cd 100644 --- a/src/main/java/mods/battlegear2/packet/OffhandSwapPacket.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/packet/OffhandToServerPacket.java b/src/main/java/mods/battlegear2/packet/OffhandToServerPacket.java index 7befd00..b9b071d 100644 --- a/src/main/java/mods/battlegear2/packet/OffhandToServerPacket.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/utils/EnumBGAnimations.java b/src/main/java/mods/battlegear2/utils/EnumBGAnimations.java index a787195..335bb29 100644 --- a/src/main/java/mods/battlegear2/utils/EnumBGAnimations.java +++ b/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 { diff --git a/src/main/java/net/tclproject/mysteriumlib/asm/common/CustomLoadingPlugin.java b/src/main/java/net/tclproject/mysteriumlib/asm/common/CustomLoadingPlugin.java index 8f3b32c..29c2287 100644 --- a/src/main/java/net/tclproject/mysteriumlib/asm/common/CustomLoadingPlugin.java +++ b/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; diff --git a/src/main/java/net/tclproject/mysteriumlib/asm/fixes/MysteriumPatchesFixesO.java b/src/main/java/net/tclproject/mysteriumlib/asm/fixes/MysteriumPatchesFixesO.java index 4f7ae56..ac41585 100644 --- a/src/main/java/net/tclproject/mysteriumlib/asm/fixes/MysteriumPatchesFixesO.java +++ b/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; diff --git a/src/main/java/xonin/backhand/ServerEventsHandler.java b/src/main/java/xonin/backhand/ServerEventsHandler.java index a7603af..4197fa8 100644 --- a/src/main/java/xonin/backhand/ServerEventsHandler.java +++ b/src/main/java/xonin/backhand/ServerEventsHandler.java @@ -4,7 +4,7 @@ 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; @@ -12,7 +12,6 @@ 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; diff --git a/src/main/java/xonin/backhand/ServerTickHandler.java b/src/main/java/xonin/backhand/ServerTickHandler.java index 32bb10b..4b28419 100644 --- a/src/main/java/xonin/backhand/ServerTickHandler.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/api/PlayerEventChild.java b/src/main/java/xonin/backhand/api/PlayerEventChild.java similarity index 95% rename from src/main/java/mods/battlegear2/api/PlayerEventChild.java rename to src/main/java/xonin/backhand/api/PlayerEventChild.java index 6a82d30..4cf7b83 100644 --- a/src/main/java/mods/battlegear2/api/PlayerEventChild.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/api/core/BattlegearTranslator.java b/src/main/java/xonin/backhand/api/core/BattlegearTranslator.java similarity index 97% rename from src/main/java/mods/battlegear2/api/core/BattlegearTranslator.java rename to src/main/java/xonin/backhand/api/core/BattlegearTranslator.java index 6468000..503de66 100644 --- a/src/main/java/mods/battlegear2/api/core/BattlegearTranslator.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/api/core/BattlegearUtils.java b/src/main/java/xonin/backhand/api/core/BattlegearUtils.java similarity index 99% rename from src/main/java/mods/battlegear2/api/core/BattlegearUtils.java rename to src/main/java/xonin/backhand/api/core/BattlegearUtils.java index bc55835..0dd1b94 100644 --- a/src/main/java/mods/battlegear2/api/core/BattlegearUtils.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/api/core/IBattlePlayer.java b/src/main/java/xonin/backhand/api/core/IBattlePlayer.java similarity index 94% rename from src/main/java/mods/battlegear2/api/core/IBattlePlayer.java rename to src/main/java/xonin/backhand/api/core/IBattlePlayer.java index 352163d..7536207 100644 --- a/src/main/java/mods/battlegear2/api/core/IBattlePlayer.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/api/core/InventoryPlayerBattle.java b/src/main/java/xonin/backhand/api/core/InventoryPlayerBattle.java similarity index 99% rename from src/main/java/mods/battlegear2/api/core/InventoryPlayerBattle.java rename to src/main/java/xonin/backhand/api/core/InventoryPlayerBattle.java index d3a01fe..5428190 100644 --- a/src/main/java/mods/battlegear2/api/core/InventoryPlayerBattle.java +++ b/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; diff --git a/src/main/java/mods/battlegear2/api/core/OffhandExtendedProperty.java b/src/main/java/xonin/backhand/api/core/OffhandExtendedProperty.java similarity index 97% rename from src/main/java/mods/battlegear2/api/core/OffhandExtendedProperty.java rename to src/main/java/xonin/backhand/api/core/OffhandExtendedProperty.java index f47409d..85df0e3 100644 --- a/src/main/java/mods/battlegear2/api/core/OffhandExtendedProperty.java +++ b/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; diff --git a/src/main/java/xonin/backhand/client/ClientEventHandler.java b/src/main/java/xonin/backhand/client/ClientEventHandler.java index 07ebf42..cb10568 100644 --- a/src/main/java/xonin/backhand/client/ClientEventHandler.java +++ b/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; diff --git a/src/main/java/xonin/backhand/client/ClientTickHandler.java b/src/main/java/xonin/backhand/client/ClientTickHandler.java index 7a9289f..d362d71 100644 --- a/src/main/java/xonin/backhand/client/ClientTickHandler.java +++ b/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; diff --git a/src/main/java/xonin/backhand/client/renderer/ItemRendererOffhand.java b/src/main/java/xonin/backhand/client/renderer/ItemRendererOffhand.java index 70b1b83..662fdbf 100644 --- a/src/main/java/xonin/backhand/client/renderer/ItemRendererOffhand.java +++ b/src/main/java/xonin/backhand/client/renderer/ItemRendererOffhand.java @@ -1,14 +1,11 @@ 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; @@ -16,7 +13,6 @@ 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");