aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/preloader/asm/transformers
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2024-05-24 19:04:17 +0100
committerRaven Szewczyk <git@eigenraven.me>2024-05-24 19:04:17 +0100
commit69ce418e29e22391f60cdd55815727762a78c33a (patch)
tree97be683e94b8a541d7578760a154f16d4dea38e2 /src/main/java/gtPlusPlus/preloader/asm/transformers
parent38f38a991e433f6eff30476b87a71eeadee228ce (diff)
downloadGT5-Unofficial-69ce418e29e22391f60cdd55815727762a78c33a.tar.gz
GT5-Unofficial-69ce418e29e22391f60cdd55815727762a78c33a.tar.bz2
GT5-Unofficial-69ce418e29e22391f60cdd55815727762a78c33a.zip
Apply updated GT5u spotless configs
Diffstat (limited to 'src/main/java/gtPlusPlus/preloader/asm/transformers')
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java37
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java88
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java82
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java106
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java30
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java19
6 files changed, 178 insertions, 184 deletions
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java
index 84fecda974..0b41846928 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java
@@ -78,15 +78,15 @@ public class ClassTransformer_COFH_OreDictionaryArbiter {
MethodVisitor mv;
if (aMethodName.equals("registerOreDictionaryEntry")) {
FMLRelaunchLog.log(
- "[GT++ ASM] COFH OreDictionaryArbiter Patch",
- Level.INFO,
- "Injecting " + aMethodName + " into " + className + ". ItemStack: " + aItemStack);
+ "[GT++ ASM] COFH OreDictionaryArbiter Patch",
+ Level.INFO,
+ "Injecting " + aMethodName + " into " + className + ". ItemStack: " + aItemStack);
mv = getWriter().visitMethod(
- ACC_PUBLIC + ACC_STATIC,
- "registerOreDictionaryEntry",
- "(L" + aItemStack + ";Ljava/lang/String;)V",
- null,
- null);
+ ACC_PUBLIC + ACC_STATIC,
+ "registerOreDictionaryEntry",
+ "(L" + aItemStack + ";Ljava/lang/String;)V",
+ null,
+ null);
mv.visitCode();
Label l0 = new Label();
mv.visitLabel(l0);
@@ -94,11 +94,11 @@ public class ClassTransformer_COFH_OreDictionaryArbiter {
mv.visitVarInsn(ALOAD, 0);
mv.visitVarInsn(ALOAD, 1);
mv.visitMethodInsn(
- INVOKESTATIC,
- "gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter$FixCOFH",
- "registerOreDictionaryEntry",
- "(L" + aItemStack + ";Ljava/lang/String;)V",
- false);
+ INVOKESTATIC,
+ "gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter$FixCOFH",
+ "registerOreDictionaryEntry",
+ "(L" + aItemStack + ";Ljava/lang/String;)V",
+ false);
Label l1 = new Label();
mv.visitLabel(l1);
mv.visitLineNumber(62, l1);
@@ -141,13 +141,16 @@ public class ClassTransformer_COFH_OreDictionaryArbiter {
static {
try {
oreIDs = (BiMap<String, Integer>) ReflectionUtils.getField(OreDictionaryArbiter.class, "oreIDs")
- .get(null);
+ .get(null);
oreStacks = (TMap<Integer, ArrayList<ItemStack>>) ReflectionUtils
- .getField(OreDictionaryArbiter.class, "oreStacks").get(null);
+ .getField(OreDictionaryArbiter.class, "oreStacks")
+ .get(null);
stackIDs = (TMap<ItemWrapper, ArrayList<Integer>>) ReflectionUtils
- .getField(OreDictionaryArbiter.class, "stackIDs").get(null);
+ .getField(OreDictionaryArbiter.class, "stackIDs")
+ .get(null);
stackNames = (TMap<ItemWrapper, ArrayList<String>>) ReflectionUtils
- .getField(OreDictionaryArbiter.class, "stackNames").get(null);
+ .getField(OreDictionaryArbiter.class, "stackNames")
+ .get(null);
} catch (Throwable t) {
oreIDs = HashBiMap.create();
oreStacks = new THashMap<>();
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java
index da5907e6fd..7aa5ff4f90 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java
@@ -53,9 +53,9 @@ public class ClassTransformer_IC2_GetHarvestTool {
aName_damageDropped = obfuscated ? "func_149692_a" : "damageDropped";
FMLRelaunchLog.log(
- "[GT++ ASM] IC2 getHarvestTool Patch",
- Level.INFO,
- "Attempting to patch in mode " + className + ". Obfuscated? " + obfuscated);
+ "[GT++ ASM] IC2 getHarvestTool Patch",
+ Level.INFO,
+ "Attempting to patch in mode " + className + ". Obfuscated? " + obfuscated);
aTempReader = new ClassReader(basicClass);
aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES);
@@ -75,14 +75,14 @@ public class ClassTransformer_IC2_GetHarvestTool {
FMLRelaunchLog.log("[GT++ ASM] IC2 getHarvestTool Patch", Level.INFO, "Attempting Method Injection.");
injectMethod("getHarvestTool");
if (aClassName.equals("ic2.core.block.machine.BlockMachine2")
- || aClassName.equals("ic2.core.block.machine.BlockMachine3")
- || aClassName.equals("ic2.core.block.wiring.BlockElectric")) {
+ || aClassName.equals("ic2.core.block.machine.BlockMachine3")
+ || aClassName.equals("ic2.core.block.wiring.BlockElectric")) {
injectMethod(aName_getItemDropped);
injectMethod(aName_damageDropped);
} else if (aClassName.equals("ic2.core.block.generator.block.BlockGenerator")
- || aClassName.equals("ic2.core.block.machine.BlockMachine")) {
- injectMethod(aName_damageDropped);
- }
+ || aClassName.equals("ic2.core.block.machine.BlockMachine")) {
+ injectMethod(aName_damageDropped);
+ }
}
}
@@ -113,11 +113,11 @@ public class ClassTransformer_IC2_GetHarvestTool {
mv.visitLineNumber(63, l0);
mv.visitVarInsn(ILOAD, 1);
mv.visitMethodInsn(
- INVOKESTATIC,
- "gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool",
- "getHarvestTool",
- "(I)Ljava/lang/String;",
- false);
+ INVOKESTATIC,
+ "gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool",
+ "getHarvestTool",
+ "(I)Ljava/lang/String;",
+ false);
mv.visitInsn(ARETURN);
Label l1 = new Label();
mv.visitLabel(l1);
@@ -128,11 +128,11 @@ public class ClassTransformer_IC2_GetHarvestTool {
didInject = true;
} else if (aMethodName.equals(aName_getItemDropped)) {
mv = cw.visitMethod(
- ACC_PUBLIC,
- aName_getItemDropped,
- "(ILjava/util/Random;I)Lnet/minecraft/item/Item;",
- null,
- null);
+ ACC_PUBLIC,
+ aName_getItemDropped,
+ "(ILjava/util/Random;I)Lnet/minecraft/item/Item;",
+ null,
+ null);
mv.visitCode();
Label l0 = new Label();
mv.visitLabel(l0);
@@ -142,11 +142,11 @@ public class ClassTransformer_IC2_GetHarvestTool {
mv.visitVarInsn(ALOAD, 2);
mv.visitVarInsn(ILOAD, 3);
mv.visitMethodInsn(
- INVOKESTATIC,
- "gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool",
- "getItemDropped",
- "(Lnet/minecraft/block/Block;ILjava/util/Random;I)Lnet/minecraft/item/Item;",
- false);
+ INVOKESTATIC,
+ "gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool",
+ "getItemDropped",
+ "(Lnet/minecraft/block/Block;ILjava/util/Random;I)Lnet/minecraft/item/Item;",
+ false);
mv.visitInsn(ARETURN);
Label l1 = new Label();
mv.visitLabel(l1);
@@ -165,11 +165,11 @@ public class ClassTransformer_IC2_GetHarvestTool {
mv.visitLineNumber(48, l0);
mv.visitVarInsn(ILOAD, 1);
mv.visitMethodInsn(
- INVOKESTATIC,
- "gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool",
- "damageDropped",
- "(I)I",
- false);
+ INVOKESTATIC,
+ "gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool",
+ "damageDropped",
+ "(I)I",
+ false);
mv.visitInsn(IRETURN);
Label l1 = new Label();
mv.visitLabel(l1);
@@ -196,8 +196,8 @@ public class ClassTransformer_IC2_GetHarvestTool {
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
MethodVisitor methodVisitor;
if (aClassName.equals("ic2.core.block.machine.BlockMachine2")
- || aClassName.equals("ic2.core.block.machine.BlockMachine3")
- || aClassName.equals("ic2.core.block.wiring.BlockElectric")) {
+ || aClassName.equals("ic2.core.block.machine.BlockMachine3")
+ || aClassName.equals("ic2.core.block.wiring.BlockElectric")) {
if (name.equals(aName_getItemDropped)) {
methodVisitor = null;
} else if (name.equals(aName_damageDropped)) {
@@ -208,24 +208,24 @@ public class ClassTransformer_IC2_GetHarvestTool {
methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
}
} else if (aClassName.equals("ic2.core.block.generator.block.BlockGenerator")
- || aClassName.equals("ic2.core.block.machine.BlockMachine")) {
- if (name.equals(aName_damageDropped)) {
- methodVisitor = null;
- } else if (name.equals("getHarvestTool")) {
- methodVisitor = null;
- } else {
- methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
- }
+ || aClassName.equals("ic2.core.block.machine.BlockMachine")) {
+ if (name.equals(aName_damageDropped)) {
+ methodVisitor = null;
+ } else if (name.equals("getHarvestTool")) {
+ methodVisitor = null;
+ } else {
+ methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
+ }
+ } else {
+ if (name.equals("getHarvestTool")) {
+ methodVisitor = null;
} else {
- if (name.equals("getHarvestTool")) {
- methodVisitor = null;
- } else {
- methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
- }
+ methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
}
+ }
if (methodVisitor == null) {
FMLRelaunchLog
- .log("[GT++ ASM] IC2 getHarvestTool Patch", Level.INFO, "Found method " + name + ", removing.");
+ .log("[GT++ ASM] IC2 getHarvestTool Patch", Level.INFO, "Found method " + name + ", removing.");
}
return methodVisitor;
}
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java
index f478a0f1f1..4d3c78e6bd 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java
@@ -50,13 +50,13 @@ public class ClassTransformer_LWJGL_Keyboard {
String aCachedValue = mBadKeyCache.get("key-" + key);
if (aCachedValue == null) {
FMLRelaunchLog.log(
- "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
- Level.INFO,
- "Unable to map key code " + key + " to LWJGL keymap.");
+ "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
+ Level.INFO,
+ "Unable to map key code " + key + " to LWJGL keymap.");
FMLRelaunchLog.log(
- "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
- Level.INFO,
- "Caching key value to be empty.");
+ "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
+ Level.INFO,
+ "Caching key value to be empty.");
// mBadKeyCache.put("key-"+key, getKeyName()[0x00]);
aCachedValue = "FIX!";
mBadKeyCache.put("key-" + key, aCachedValue);
@@ -68,9 +68,9 @@ public class ClassTransformer_LWJGL_Keyboard {
public static void trySetClientKey(int aKey) {
if (Utils.isClient() && ReflectionUtils.doesClassExist("net.minecraft.client.Minecraft")) {
FMLRelaunchLog.log(
- "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
- Level.INFO,
- "Trying to set key value to be empty.");
+ "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
+ Level.INFO,
+ "Trying to set key value to be empty.");
GameSettings options = Minecraft.getMinecraft().gameSettings;
KeyBinding[] akeybinding = Minecraft.getMinecraft().gameSettings.keyBindings;
int i = akeybinding.length;
@@ -78,9 +78,9 @@ public class ClassTransformer_LWJGL_Keyboard {
if (keybinding != null && keybinding.getKeyCode() == aKey) {
options.setOptionKeyBinding(keybinding, 0);
FMLRelaunchLog.log(
- "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
- Level.INFO,
- "Set keybind " + aKey + " to 0.");
+ "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
+ Level.INFO,
+ "Set keybind " + aKey + " to 0.");
break;
}
}
@@ -140,7 +140,7 @@ public class ClassTransformer_LWJGL_Keyboard {
isValid = false;
}
FMLRelaunchLog
- .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Valid? " + isValid + ".");
+ .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Valid? " + isValid + ".");
reader = aTempReader;
writer = aTempWriter;
}
@@ -162,27 +162,21 @@ public class ClassTransformer_LWJGL_Keyboard {
public boolean injectLWJGLPatch(ClassWriter cw) {
MethodVisitor mv;
boolean didInject = false;
- FMLRelaunchLog.log(
- "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
- Level.INFO,
- "Injecting " + "getKeyName" + ".");
- mv = cw.visitMethod(
- ACC_PUBLIC + ACC_STATIC + ACC_SYNCHRONIZED,
- "getKeyName",
- "(I)Ljava/lang/String;",
- null,
- null);
+ FMLRelaunchLog
+ .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Injecting " + "getKeyName" + ".");
+ mv = cw
+ .visitMethod(ACC_PUBLIC + ACC_STATIC + ACC_SYNCHRONIZED, "getKeyName", "(I)Ljava/lang/String;", null, null);
mv.visitCode();
Label l0 = new Label();
mv.visitLabel(l0);
mv.visitLineNumber(49, l0);
mv.visitVarInsn(ILOAD, 0);
mv.visitMethodInsn(
- INVOKESTATIC,
- "gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard",
- "getKeyName",
- "(I)Ljava/lang/String;",
- false);
+ INVOKESTATIC,
+ "gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard",
+ "getKeyName",
+ "(I)Ljava/lang/String;",
+ false);
mv.visitInsn(ARETURN);
Label l1 = new Label();
mv.visitLabel(l1);
@@ -192,7 +186,7 @@ public class ClassTransformer_LWJGL_Keyboard {
didInject = true;
FMLRelaunchLog
- .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Method injection complete.");
+ .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Method injection complete.");
return didInject;
}
@@ -200,10 +194,8 @@ public class ClassTransformer_LWJGL_Keyboard {
MethodVisitor mv;
boolean didInject = false;
String aMethodName = this.isClientSettingsObfuscated ? "func_74298_c" : "getKeyDisplayString";
- FMLRelaunchLog.log(
- "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
- Level.INFO,
- "Injecting " + aMethodName + ".");
+ FMLRelaunchLog
+ .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Injecting " + aMethodName + ".");
mv = cw.visitMethod(ACC_PUBLIC + ACC_STATIC, aMethodName, "(I)Ljava/lang/String;", null, null);
mv.visitCode();
Label l0 = new Label();
@@ -211,11 +203,11 @@ public class ClassTransformer_LWJGL_Keyboard {
mv.visitLineNumber(130, l0);
mv.visitVarInsn(ILOAD, 0);
mv.visitMethodInsn(
- INVOKESTATIC,
- "gtPlusPlus/preloader/keyboard/BetterKeyboard",
- "getKeyDisplayString",
- "(I)Ljava/lang/String;",
- false);
+ INVOKESTATIC,
+ "gtPlusPlus/preloader/keyboard/BetterKeyboard",
+ "getKeyDisplayString",
+ "(I)Ljava/lang/String;",
+ false);
mv.visitInsn(ARETURN);
Label l1 = new Label();
mv.visitLabel(l1);
@@ -224,7 +216,7 @@ public class ClassTransformer_LWJGL_Keyboard {
mv.visitEnd();
didInject = true;
FMLRelaunchLog
- .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Method injection complete.");
+ .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Method injection complete.");
return didInject;
}
@@ -260,9 +252,9 @@ public class ClassTransformer_LWJGL_Keyboard {
}
if (found) {
FMLRelaunchLog.log(
- "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
- Level.INFO,
- "Found method " + name + ", removing.");
+ "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
+ Level.INFO,
+ "Found method " + name + ", removing.");
}
return methodVisitor;
}
@@ -295,9 +287,9 @@ public class ClassTransformer_LWJGL_Keyboard {
}
if (found) {
FMLRelaunchLog.log(
- "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
- Level.INFO,
- "Found method " + name + ", removing.");
+ "[GT++ ASM] LWJGL Keybinding index out of bounds fix",
+ Level.INFO,
+ "Found method " + name + ", removing.");
}
return methodVisitor;
}
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java
index 98e1e7d473..cf8b08d40c 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java
@@ -52,9 +52,9 @@ public class ClassTransformer_TC_ItemWispEssence {
ClassReader aTempReader = null;
ClassWriter aTempWriter = null;
FMLRelaunchLog.log(
- "[GT++ ASM] Thaumcraft WispEssence_Patch",
- Level.INFO,
- "Are we patching obfuscated methods? " + obfuscated2);
+ "[GT++ ASM] Thaumcraft WispEssence_Patch",
+ Level.INFO,
+ "Are we patching obfuscated methods? " + obfuscated2);
String aGetColour = obfuscated2 ? "func_82790_a" : "getColorFromItemStack";
aTempReader = new ClassReader(basicClass);
aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES);
@@ -94,11 +94,11 @@ public class ClassTransformer_TC_ItemWispEssence {
if (aMethodName.equals("getAspects")) {
mv = cw.visitMethod(
- ACC_PUBLIC,
- "getAspects",
- "(Lnet/minecraft/item/ItemStack;)Lthaumcraft/api/aspects/AspectList;",
- null,
- null);
+ ACC_PUBLIC,
+ "getAspects",
+ "(Lnet/minecraft/item/ItemStack;)Lthaumcraft/api/aspects/AspectList;",
+ null,
+ null);
mv.visitCode();
Label l0 = new Label();
mv.visitLabel(l0);
@@ -131,17 +131,17 @@ public class ClassTransformer_TC_ItemWispEssence {
mv.visitVarInsn(ALOAD, 2);
mv.visitVarInsn(ALOAD, 1);
mv.visitMethodInsn(
- INVOKEVIRTUAL,
- "net/minecraft/item/ItemStack",
- aGetTagCompound,
- "()Lnet/minecraft/nbt/NBTTagCompound;",
- false);
+ INVOKEVIRTUAL,
+ "net/minecraft/item/ItemStack",
+ aGetTagCompound,
+ "()Lnet/minecraft/nbt/NBTTagCompound;",
+ false);
mv.visitMethodInsn(
- INVOKEVIRTUAL,
- "thaumcraft/api/aspects/AspectList",
- "readFromNBT",
- "(Lnet/minecraft/nbt/NBTTagCompound;)V",
- false);
+ INVOKEVIRTUAL,
+ "thaumcraft/api/aspects/AspectList",
+ "readFromNBT",
+ "(Lnet/minecraft/nbt/NBTTagCompound;)V",
+ false);
Label l6 = new Label();
mv.visitLabel(l6);
mv.visitLineNumber(147, l6);
@@ -166,12 +166,12 @@ public class ClassTransformer_TC_ItemWispEssence {
Label l9 = new Label();
mv.visitLabel(l9);
mv.visitLocalVariable(
- "this",
- "LgtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence;",
- null,
- l0,
- l9,
- 0);
+ "this",
+ "LgtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence;",
+ null,
+ l0,
+ l9,
+ 0);
mv.visitLocalVariable("itemstack", "Lnet/minecraft/item/ItemStack;", null, l0, l9, 1);
mv.visitLocalVariable("aspects", "Lthaumcraft/api/aspects/AspectList;", null, l5, l3, 2);
mv.visitMaxs(2, 3);
@@ -205,11 +205,11 @@ public class ClassTransformer_TC_ItemWispEssence {
mv.visitVarInsn(ALOAD, 0);
mv.visitVarInsn(ALOAD, 1);
mv.visitMethodInsn(
- INVOKEVIRTUAL,
- "thaumcraft/common/items/ItemWispEssence",
- "getAspects",
- "(Lnet/minecraft/item/ItemStack;)Lthaumcraft/api/aspects/AspectList;",
- false);
+ INVOKEVIRTUAL,
+ "thaumcraft/common/items/ItemWispEssence",
+ "getAspects",
+ "(Lnet/minecraft/item/ItemStack;)Lthaumcraft/api/aspects/AspectList;",
+ false);
Label l3 = new Label();
mv.visitJumpInsn(IFNULL, l3);
Label l4 = new Label();
@@ -218,17 +218,17 @@ public class ClassTransformer_TC_ItemWispEssence {
mv.visitVarInsn(ALOAD, 0);
mv.visitVarInsn(ALOAD, 1);
mv.visitMethodInsn(
- INVOKEVIRTUAL,
- "thaumcraft/common/items/ItemWispEssence",
- "getAspects",
- "(Lnet/minecraft/item/ItemStack;)Lthaumcraft/api/aspects/AspectList;",
- false);
+ INVOKEVIRTUAL,
+ "thaumcraft/common/items/ItemWispEssence",
+ "getAspects",
+ "(Lnet/minecraft/item/ItemStack;)Lthaumcraft/api/aspects/AspectList;",
+ false);
mv.visitMethodInsn(
- INVOKEVIRTUAL,
- "thaumcraft/api/aspects/AspectList",
- "getAspects",
- "()[Lthaumcraft/api/aspects/Aspect;",
- false);
+ INVOKEVIRTUAL,
+ "thaumcraft/api/aspects/AspectList",
+ "getAspects",
+ "()[Lthaumcraft/api/aspects/Aspect;",
+ false);
mv.visitInsn(ICONST_0);
mv.visitInsn(AALOAD);
mv.visitMethodInsn(INVOKEVIRTUAL, "thaumcraft/api/aspects/Aspect", "getColor", "()I", false);
@@ -240,10 +240,10 @@ public class ClassTransformer_TC_ItemWispEssence {
mv.visitLdcInsn(new Long(500L));
mv.visitInsn(LDIV);
mv.visitFieldInsn(
- GETSTATIC,
- "thaumcraft/common/items/ItemWispEssence",
- "displayAspects",
- "[Lthaumcraft/api/aspects/Aspect;");
+ GETSTATIC,
+ "thaumcraft/common/items/ItemWispEssence",
+ "displayAspects",
+ "[Lthaumcraft/api/aspects/Aspect;");
mv.visitInsn(ARRAYLENGTH);
mv.visitInsn(I2L);
mv.visitInsn(LREM);
@@ -253,10 +253,10 @@ public class ClassTransformer_TC_ItemWispEssence {
mv.visitLabel(l5);
mv.visitLineNumber(204, l5);
mv.visitFieldInsn(
- GETSTATIC,
- "thaumcraft/common/items/ItemWispEssence",
- "displayAspects",
- "[Lthaumcraft/api/aspects/Aspect;");
+ GETSTATIC,
+ "thaumcraft/common/items/ItemWispEssence",
+ "displayAspects",
+ "[Lthaumcraft/api/aspects/Aspect;");
mv.visitVarInsn(ILOAD, 3);
mv.visitInsn(AALOAD);
mv.visitMethodInsn(INVOKEVIRTUAL, "thaumcraft/api/aspects/Aspect", "getColor", "()I", false);
@@ -273,9 +273,9 @@ public class ClassTransformer_TC_ItemWispEssence {
}
FMLRelaunchLog.log(
- "[GT++ ASM] Thaumcraft WispEssence_Patch",
- Level.INFO,
- "Method injection complete. " + (obfuscated ? "Obfuscated" : "Non-Obfuscated"));
+ "[GT++ ASM] Thaumcraft WispEssence_Patch",
+ Level.INFO,
+ "Method injection complete. " + (obfuscated ? "Obfuscated" : "Non-Obfuscated"));
return didInject;
}
@@ -308,10 +308,8 @@ public class ClassTransformer_TC_ItemWispEssence {
}
if (found) {
- FMLRelaunchLog.log(
- "[GT++ ASM] Thaumcraft WispEssence_Patch",
- Level.INFO,
- "Found method " + name + ", removing.");
+ FMLRelaunchLog
+ .log("[GT++ ASM] Thaumcraft WispEssence_Patch", Level.INFO, "Found method " + name + ", removing.");
}
return methodVisitor;
}
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java
index ee82871d6a..82526b1290 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java
@@ -46,31 +46,29 @@ public class Preloader_ClassTransformer {
@Override
public void visitCode() {
- FMLRelaunchLog.log(
- "[GT++ ASM] OreDictTransformer",
- Level.INFO,
- "Fixing Forge's poor attempt at an oreDictionary.");
+ FMLRelaunchLog
+ .log("[GT++ ASM] OreDictTransformer", Level.INFO, "Fixing Forge's poor attempt at an oreDictionary.");
super.visitCode();
super.visitVarInsn(ALOAD, 0);
super.visitVarInsn(ALOAD, 1);
if (!mObfuscated) {
FMLRelaunchLog
- .log("[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Unobfuscated]");
+ .log("[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Unobfuscated]");
super.visitMethodInsn(
- INVOKESTATIC,
- "gtPlusPlus/preloader/Preloader_GT_OreDict",
- "shouldPreventRegistration",
- "(Ljava/lang/String;Lnet/minecraft/item/ItemStack;)Z",
- false);
+ INVOKESTATIC,
+ "gtPlusPlus/preloader/Preloader_GT_OreDict",
+ "shouldPreventRegistration",
+ "(Ljava/lang/String;Lnet/minecraft/item/ItemStack;)Z",
+ false);
} else {
FMLRelaunchLog
- .log("[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Obfuscated]");
+ .log("[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Obfuscated]");
super.visitMethodInsn(
- INVOKESTATIC,
- "gtPlusPlus/preloader/Preloader_GT_OreDict",
- "shouldPreventRegistration",
- "(Ljava/lang/String;Ladd;)Z",
- false);
+ INVOKESTATIC,
+ "gtPlusPlus/preloader/Preloader_GT_OreDict",
+ "shouldPreventRegistration",
+ "(Ljava/lang/String;Ladd;)Z",
+ false);
}
Label endLabel = new Label();
super.visitJumpInsn(IFEQ, endLabel);
diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
index abdff476ea..922ce88e27 100644
--- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
+++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
@@ -47,12 +47,13 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
public byte[] transform(String name, String transformedName, byte[] basicClass) {
// Fix LWJGL index array out of bounds on keybinding IDs
if ((transformedName.equals(LWJGL_KEYBOARD) || transformedName.equals(MINECRAFT_GAMESETTINGS))
- && AsmConfig.enabledLwjglKeybindingFix
- // Do not transform if using lwjgl3
- && !ReflectionUtils.doesClassExist("org.lwjgl.system.Platform")) {
+ && AsmConfig.enabledLwjglKeybindingFix
+ // Do not transform if using lwjgl3
+ && !ReflectionUtils.doesClassExist("org.lwjgl.system.Platform")) {
boolean isClientSettingsClass = !transformedName.equals("org.lwjgl.input.Keyboard");
Preloader_Logger.INFO("LWJGL Keybinding index out of bounds fix", "Transforming " + transformedName);
- return new ClassTransformer_LWJGL_Keyboard(basicClass, isClientSettingsClass).getWriter().toByteArray();
+ return new ClassTransformer_LWJGL_Keyboard(basicClass, isClientSettingsClass).getWriter()
+ .toByteArray();
}
// Fix the OreDictionary - Forge
@@ -65,15 +66,17 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
// Fix the OreDictionary COFH
if (transformedName.equals(COFH_ORE_DICTIONARY_ARBITER)
- && (AsmConfig.enableCofhPatch || CORE_Preloader.DEV_ENVIRONMENT)) {
+ && (AsmConfig.enableCofhPatch || CORE_Preloader.DEV_ENVIRONMENT)) {
Preloader_Logger.INFO("COFH", "Transforming " + transformedName);
- return new ClassTransformer_COFH_OreDictionaryArbiter(basicClass).getWriter().toByteArray();
+ return new ClassTransformer_COFH_OreDictionaryArbiter(basicClass).getWriter()
+ .toByteArray();
}
if (IC2_WRENCH_PATCH_CLASS_NAMES.contains(transformedName)) {
Preloader_Logger.INFO("IC2 getHarvestTool Patch", "Transforming " + transformedName);
return new ClassTransformer_IC2_GetHarvestTool(basicClass, !CORE_Preloader.DEV_ENVIRONMENT, transformedName)
- .getWriter().toByteArray();
+ .getWriter()
+ .toByteArray();
}
// Fix Thaumcraft stuff
@@ -81,7 +84,7 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
if (transformedName.equals(THAUMCRAFT_ITEM_WISP_ESSENCE) && AsmConfig.enableTcAspectSafety) {
Preloader_Logger.INFO("Thaumcraft WispEssence_Patch", "Transforming " + transformedName);
return new ClassTransformer_TC_ItemWispEssence(basicClass, !CORE_Preloader.DEV_ENVIRONMENT).getWriter()
- .toByteArray();
+ .toByteArray();
}
return basicClass;