diff --git a/src/main/java/mods/battlegear2/coremod/transformers/BattlegearAccessTransformer.java b/src/main/java/mods/battlegear2/coremod/transformers/BattlegearAccessTransformer.java deleted file mode 100644 index 04dcd15..0000000 --- a/src/main/java/mods/battlegear2/coremod/transformers/BattlegearAccessTransformer.java +++ /dev/null @@ -1,11 +0,0 @@ -package mods.battlegear2.coremod.transformers; - -import java.io.IOException; - -import cpw.mods.fml.common.asm.transformers.AccessTransformer; - -public class BattlegearAccessTransformer extends AccessTransformer { - public BattlegearAccessTransformer() throws IOException { - super("theoffhandmod_at.cfg"); - } -} \ No newline at end of file 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 29c2287..c428146 100644 --- a/src/main/java/net/tclproject/mysteriumlib/asm/common/CustomLoadingPlugin.java +++ b/src/main/java/net/tclproject/mysteriumlib/asm/common/CustomLoadingPlugin.java @@ -14,7 +14,7 @@ import cpw.mods.fml.relauncher.CoreModManager; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; import xonin.backhand.api.core.BattlegearTranslator; -import mods.battlegear2.coremod.BattlegearLoadingPlugin; +import xonin.backhand.coremod.BackhandLoadingPlugin; import net.tclproject.mysteriumlib.asm.core.ASMFix; import net.tclproject.mysteriumlib.asm.core.MetaReader; import net.tclproject.mysteriumlib.asm.core.TargetClassTransformer; @@ -23,7 +23,7 @@ * Custom IFMLLoadingPlugin implementation. * @see IFMLLoadingPlugin * */ -@IFMLLoadingPlugin.TransformerExclusions({"net.tclproject", "mods.battlegear2.coremod"}) +@IFMLLoadingPlugin.TransformerExclusions({"net.tclproject", "xonin.backhand.coremod"}) public class CustomLoadingPlugin implements IFMLLoadingPlugin { /**A DeobfuscationTransformer instance for use inside this class.*/ @@ -134,7 +134,7 @@ public static boolean isObfuscated() { // Only exists in 1.7.10. Comment out if not needed. @Override public String getAccessTransformerClass() { - return "mods.battlegear2.coremod.transformers.BattlegearAccessTransformer"; + return "xonin.backhand.coremod.transformers.BattlegearAccessTransformer"; } @@ -161,7 +161,7 @@ public String getSetupClass() { @Override public void injectData(Map data) { debugOutputLocation = new File(data.get("mcLocation").toString(), "bg edited classes"); - BattlegearLoadingPlugin.debugOutputLocation = new File(data.get("mcLocation").toString(), "bg edited classes"); + BackhandLoadingPlugin.debugOutputLocation = new File(data.get("mcLocation").toString(), "bg edited classes"); BattlegearTranslator.obfuscatedEnv = Boolean.class.cast(data.get("runtimeDeobfuscationEnabled")); if (((ArrayList)data.get("coremodList")).contains("DragonAPIASMHandler")) { Logger.getGlobal().info("Core: Located DragonAPI in list of coremods"); diff --git a/src/main/java/net/tclproject/mysteriumlib/asm/fixes/MysteriumPatchesFixLoaderO.java b/src/main/java/net/tclproject/mysteriumlib/asm/fixes/MysteriumPatchesFixLoaderO.java index f326ff5..8ad4233 100644 --- a/src/main/java/net/tclproject/mysteriumlib/asm/fixes/MysteriumPatchesFixLoaderO.java +++ b/src/main/java/net/tclproject/mysteriumlib/asm/fixes/MysteriumPatchesFixLoaderO.java @@ -1,9 +1,9 @@ package net.tclproject.mysteriumlib.asm.fixes; -import mods.battlegear2.coremod.transformers.*; import net.tclproject.mysteriumlib.asm.common.CustomClassTransformer; import net.tclproject.mysteriumlib.asm.common.CustomLoadingPlugin; import net.tclproject.mysteriumlib.asm.common.FirstClassTransformer; +import xonin.backhand.coremod.transformers.*; public class MysteriumPatchesFixLoaderO extends CustomLoadingPlugin { diff --git a/src/main/java/mods/battlegear2/coremod/BattlegearLoadingPlugin.java b/src/main/java/xonin/backhand/coremod/BackhandLoadingPlugin.java similarity index 62% rename from src/main/java/mods/battlegear2/coremod/BattlegearLoadingPlugin.java rename to src/main/java/xonin/backhand/coremod/BackhandLoadingPlugin.java index 70167d2..38e81e0 100644 --- a/src/main/java/mods/battlegear2/coremod/BattlegearLoadingPlugin.java +++ b/src/main/java/xonin/backhand/coremod/BackhandLoadingPlugin.java @@ -1,4 +1,4 @@ -package mods.battlegear2.coremod; +package xonin.backhand.coremod; import cpw.mods.fml.relauncher.IFMLLoadingPlugin; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.Name; @@ -9,18 +9,18 @@ import java.io.File; import java.util.Map; -@TransformerExclusions({"mods.battlegear2.coremod"}) +@TransformerExclusions({"xonin.backhand.coremod"}) @Name("Mine and Blade: Battlegear2") @SortingIndex(1500) -public final class BattlegearLoadingPlugin implements IFMLLoadingPlugin { - - public static final String EntityPlayerTransformer = "mods.battlegear2.coremod.transformers.EntityPlayerTransformer"; - public static final String NetClientHandlerTransformer = "mods.battlegear2.coremod.transformers.NetClientHandlerTransformer"; - public static final String PlayerControllerMPTransformer = "mods.battlegear2.coremod.transformers.PlayerControllerMPTransformer"; - public static final String ItemInWorldTransformer = "mods.battlegear2.coremod.transformers.ItemInWorldTransformer"; - public static final String EntityAIControlledTransformer = "mods.battlegear2.coremod.transformers.EntityAIControlledByPlayerTransformer"; - public static final String EntityOtherPlayerMPTransformer = "mods.battlegear2.coremod.transformers.EntityOtherPlayerMPTransformer"; - public static final String AccessTransformer = "mods.battlegear2.coremod.transformers.BattlegearAccessTransformer"; +public final class BackhandLoadingPlugin implements IFMLLoadingPlugin { + + public static final String EntityPlayerTransformer = "xonin.backhand.coremod.transformers.EntityPlayerTransformer"; + public static final String NetClientHandlerTransformer = "xonin.backhand.coremod.transformers.NetClientHandlerTransformer"; + public static final String PlayerControllerMPTransformer = "xonin.backhand.coremod.transformers.PlayerControllerMPTransformer"; + public static final String ItemInWorldTransformer = "xonin.backhand.coremod.transformers.ItemInWorldTransformer"; + public static final String EntityAIControlledTransformer = "xonin.backhand.coremod.transformers.EntityAIControlledByPlayerTransformer"; + public static final String EntityOtherPlayerMPTransformer = "xonin.backhand.coremod.transformers.EntityOtherPlayerMPTransformer"; + public static final String AccessTransformer = "xonin.backhand.coremod.transformers.BattlegearAccessTransformer"; public static File debugOutputLocation; public static final String[] transformers = @@ -43,7 +43,6 @@ public String[] getASMTransformerClass() { @Override public String getModContainerClass() { - //return "mods.battlegear2.coremod.BattlegearCoremodContainer"; return null; } diff --git a/src/main/java/xonin/backhand/coremod/transformers/BackhandAccessTransformer.java b/src/main/java/xonin/backhand/coremod/transformers/BackhandAccessTransformer.java new file mode 100644 index 0000000..d1c71e5 --- /dev/null +++ b/src/main/java/xonin/backhand/coremod/transformers/BackhandAccessTransformer.java @@ -0,0 +1,11 @@ +package xonin.backhand.coremod.transformers; + +import java.io.IOException; + +import cpw.mods.fml.common.asm.transformers.AccessTransformer; + +public class BackhandAccessTransformer extends AccessTransformer { + public BackhandAccessTransformer() throws IOException { + super("theoffhandmod_at.cfg"); + } +} \ No newline at end of file diff --git a/src/main/java/mods/battlegear2/coremod/transformers/EntityAIControlledByPlayerTransformer.java b/src/main/java/xonin/backhand/coremod/transformers/EntityAIControlledByPlayerTransformer.java similarity index 95% rename from src/main/java/mods/battlegear2/coremod/transformers/EntityAIControlledByPlayerTransformer.java rename to src/main/java/xonin/backhand/coremod/transformers/EntityAIControlledByPlayerTransformer.java index 8e6ade6..e9dc0f4 100644 --- a/src/main/java/mods/battlegear2/coremod/transformers/EntityAIControlledByPlayerTransformer.java +++ b/src/main/java/xonin/backhand/coremod/transformers/EntityAIControlledByPlayerTransformer.java @@ -1,4 +1,4 @@ -package mods.battlegear2.coremod.transformers; +package xonin.backhand.coremod.transformers; import xonin.backhand.api.core.BattlegearTranslator; import org.objectweb.asm.tree.MethodNode; diff --git a/src/main/java/mods/battlegear2/coremod/transformers/EntityOtherPlayerMPTransformer.java b/src/main/java/xonin/backhand/coremod/transformers/EntityOtherPlayerMPTransformer.java similarity index 98% rename from src/main/java/mods/battlegear2/coremod/transformers/EntityOtherPlayerMPTransformer.java rename to src/main/java/xonin/backhand/coremod/transformers/EntityOtherPlayerMPTransformer.java index 0b35c3b..9e1fb04 100644 --- a/src/main/java/mods/battlegear2/coremod/transformers/EntityOtherPlayerMPTransformer.java +++ b/src/main/java/xonin/backhand/coremod/transformers/EntityOtherPlayerMPTransformer.java @@ -1,4 +1,4 @@ -package mods.battlegear2.coremod.transformers; +package xonin.backhand.coremod.transformers; import xonin.backhand.api.core.BattlegearTranslator; import org.objectweb.asm.tree.*; diff --git a/src/main/java/mods/battlegear2/coremod/transformers/EntityPlayerTransformer.java b/src/main/java/xonin/backhand/coremod/transformers/EntityPlayerTransformer.java similarity index 99% rename from src/main/java/mods/battlegear2/coremod/transformers/EntityPlayerTransformer.java rename to src/main/java/xonin/backhand/coremod/transformers/EntityPlayerTransformer.java index 6f19bf1..394803b 100644 --- a/src/main/java/mods/battlegear2/coremod/transformers/EntityPlayerTransformer.java +++ b/src/main/java/xonin/backhand/coremod/transformers/EntityPlayerTransformer.java @@ -1,4 +1,4 @@ -package mods.battlegear2.coremod.transformers; +package xonin.backhand.coremod.transformers; import xonin.backhand.api.core.BattlegearTranslator; import xonin.backhand.api.core.IBattlePlayer; diff --git a/src/main/java/mods/battlegear2/coremod/transformers/ItemInWorldTransformer.java b/src/main/java/xonin/backhand/coremod/transformers/ItemInWorldTransformer.java similarity index 98% rename from src/main/java/mods/battlegear2/coremod/transformers/ItemInWorldTransformer.java rename to src/main/java/xonin/backhand/coremod/transformers/ItemInWorldTransformer.java index 27f0b15..fb9dbdd 100644 --- a/src/main/java/mods/battlegear2/coremod/transformers/ItemInWorldTransformer.java +++ b/src/main/java/xonin/backhand/coremod/transformers/ItemInWorldTransformer.java @@ -1,4 +1,4 @@ -package mods.battlegear2.coremod.transformers; +package xonin.backhand.coremod.transformers; import xonin.backhand.api.core.BattlegearTranslator; import org.objectweb.asm.tree.*; diff --git a/src/main/java/mods/battlegear2/coremod/transformers/ModelBipedTransformer.java b/src/main/java/xonin/backhand/coremod/transformers/ModelBipedTransformer.java similarity index 97% rename from src/main/java/mods/battlegear2/coremod/transformers/ModelBipedTransformer.java rename to src/main/java/xonin/backhand/coremod/transformers/ModelBipedTransformer.java index 1878781..831f020 100644 --- a/src/main/java/mods/battlegear2/coremod/transformers/ModelBipedTransformer.java +++ b/src/main/java/xonin/backhand/coremod/transformers/ModelBipedTransformer.java @@ -1,4 +1,4 @@ -package mods.battlegear2.coremod.transformers; +package xonin.backhand.coremod.transformers; import xonin.backhand.api.core.BattlegearTranslator; import org.objectweb.asm.tree.*; diff --git a/src/main/java/mods/battlegear2/coremod/transformers/NetClientHandlerTransformer.java b/src/main/java/xonin/backhand/coremod/transformers/NetClientHandlerTransformer.java similarity index 98% rename from src/main/java/mods/battlegear2/coremod/transformers/NetClientHandlerTransformer.java rename to src/main/java/xonin/backhand/coremod/transformers/NetClientHandlerTransformer.java index 0ab666a..d40490a 100644 --- a/src/main/java/mods/battlegear2/coremod/transformers/NetClientHandlerTransformer.java +++ b/src/main/java/xonin/backhand/coremod/transformers/NetClientHandlerTransformer.java @@ -1,4 +1,4 @@ -package mods.battlegear2.coremod.transformers; +package xonin.backhand.coremod.transformers; import org.objectweb.asm.tree.*; diff --git a/src/main/java/mods/battlegear2/coremod/transformers/PlayerControllerMPTransformer.java b/src/main/java/xonin/backhand/coremod/transformers/PlayerControllerMPTransformer.java similarity index 95% rename from src/main/java/mods/battlegear2/coremod/transformers/PlayerControllerMPTransformer.java rename to src/main/java/xonin/backhand/coremod/transformers/PlayerControllerMPTransformer.java index 3109575..5ff2044 100644 --- a/src/main/java/mods/battlegear2/coremod/transformers/PlayerControllerMPTransformer.java +++ b/src/main/java/xonin/backhand/coremod/transformers/PlayerControllerMPTransformer.java @@ -1,4 +1,4 @@ -package mods.battlegear2.coremod.transformers; +package xonin.backhand.coremod.transformers; import xonin.backhand.api.core.BattlegearTranslator; import org.objectweb.asm.tree.MethodNode; diff --git a/src/main/java/mods/battlegear2/coremod/transformers/TransformerBase.java b/src/main/java/xonin/backhand/coremod/transformers/TransformerBase.java similarity index 97% rename from src/main/java/mods/battlegear2/coremod/transformers/TransformerBase.java rename to src/main/java/xonin/backhand/coremod/transformers/TransformerBase.java index bcd309b..121b8db 100644 --- a/src/main/java/mods/battlegear2/coremod/transformers/TransformerBase.java +++ b/src/main/java/xonin/backhand/coremod/transformers/TransformerBase.java @@ -1,7 +1,7 @@ -package mods.battlegear2.coremod.transformers; +package xonin.backhand.coremod.transformers; import xonin.backhand.api.core.BattlegearTranslator; -import mods.battlegear2.coremod.BattlegearLoadingPlugin; +import xonin.backhand.coremod.BackhandLoadingPlugin; import net.minecraft.launchwrapper.IClassTransformer; import org.apache.logging.log4j.Level; import org.apache.logging.log4j.LogManager; @@ -74,7 +74,7 @@ void addInterface(List interfaces) { public static void writeClassFile(ClassWriter cw, String name) { try { - File outDir = BattlegearLoadingPlugin.debugOutputLocation; + File outDir = BackhandLoadingPlugin.debugOutputLocation; outDir.mkdirs(); DataOutputStream dout = new DataOutputStream(new FileOutputStream(new File(outDir, name + ".class"))); dout.write(cw.toByteArray()); diff --git a/src/main/java/mods/battlegear2/coremod/transformers/TransformerMethodProcess.java b/src/main/java/xonin/backhand/coremod/transformers/TransformerMethodProcess.java similarity index 95% rename from src/main/java/mods/battlegear2/coremod/transformers/TransformerMethodProcess.java rename to src/main/java/xonin/backhand/coremod/transformers/TransformerMethodProcess.java index 5af9634..d5e111a 100644 --- a/src/main/java/mods/battlegear2/coremod/transformers/TransformerMethodProcess.java +++ b/src/main/java/xonin/backhand/coremod/transformers/TransformerMethodProcess.java @@ -1,4 +1,4 @@ -package mods.battlegear2.coremod.transformers; +package xonin.backhand.coremod.transformers; import org.objectweb.asm.tree.FieldNode; import org.objectweb.asm.tree.MethodNode;