From 55f64675b42ac8d3c557cc850f78664bee006f6f Mon Sep 17 00:00:00 2001 From: Jason Mitchell Date: Sat, 28 Jan 2023 19:32:44 -0800 Subject: [ci skip] spotlessApply with the new settings --- ...ClassTransformer_COFH_OreDictionaryArbiter.java | 55 +++---- .../ClassTransformer_Forge_ChunkLoading.java | 165 +++++++++++++-------- .../ClassTransformer_GC_EntityAutoRocket.java | 164 ++++++++++++-------- .../ClassTransformer_GC_FluidUtil.java | 41 +++-- .../ClassTransformer_GC_FuelLoader.java | 164 ++++++++------------ .../ClassTransformer_IC2_GetHarvestTool.java | 47 +++--- .../ClassTransformer_LWJGL_Keyboard.java | 45 +++--- .../ClassTransformer_TC_ItemWispEssence.java | 15 +- .../ClassTransformer_TT_ThaumicRestorer.java | 152 +++++++++++++------ .../transformers/ClassTransformer_TiConFluids.java | 25 +++- .../transformers/Preloader_ClassTransformer.java | 15 +- .../transformers/Preloader_ClassTransformer2.java | 11 +- .../Preloader_Transformer_Handler.java | 61 +++----- 13 files changed, 537 insertions(+), 423 deletions(-) (limited to 'src/main/java/gtPlusPlus/preloader/asm/transformers') 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 eea82c33e5..bb167c3261 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 @@ -7,25 +7,30 @@ import static org.objectweb.asm.Opcodes.ASM5; import static org.objectweb.asm.Opcodes.INVOKESTATIC; import static org.objectweb.asm.Opcodes.RETURN; +import java.util.ArrayList; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +import org.apache.logging.log4j.Level; +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassVisitor; +import org.objectweb.asm.ClassWriter; +import org.objectweb.asm.Label; +import org.objectweb.asm.MethodVisitor; + import cofh.core.util.oredict.OreDictionaryArbiter; import cofh.lib.util.ItemWrapper; + import com.google.common.base.Strings; import com.google.common.collect.BiMap; import com.google.common.collect.HashBiMap; + import cpw.mods.fml.relauncher.FMLRelaunchLog; import gnu.trove.map.TMap; import gnu.trove.map.hash.THashMap; import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.preloader.DevHelper; -import java.util.ArrayList; -import net.minecraft.item.ItemStack; -import net.minecraftforge.oredict.OreDictionary; -import org.apache.logging.log4j.Level; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassVisitor; -import org.objectweb.asm.ClassWriter; -import org.objectweb.asm.Label; -import org.objectweb.asm.MethodVisitor; public class ClassTransformer_COFH_OreDictionaryArbiter { @@ -77,21 +82,20 @@ public class ClassTransformer_COFH_OreDictionaryArbiter { } catch (ClassNotFoundException e) { isObfuscated = true; } - String aItemStack = - isObfuscated ? DevHelper.getObfuscated("net/minecraft/item/ItemStack") : "net/minecraft/item/ItemStack"; + String aItemStack = isObfuscated ? DevHelper.getObfuscated("net/minecraft/item/ItemStack") + : "net/minecraft/item/ItemStack"; MethodVisitor mv; if (aMethodName.equals("registerOreDictionaryEntry")) { FMLRelaunchLog.log( "[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); + mv = getWriter().visitMethod( + ACC_PUBLIC + ACC_STATIC, + "registerOreDictionaryEntry", + "(L" + aItemStack + ";Ljava/lang/String;)V", + null, + null); mv.visitCode(); Label l0 = new Label(); mv.visitLabel(l0); @@ -147,15 +151,12 @@ public class ClassTransformer_COFH_OreDictionaryArbiter { try { oreIDs = (BiMap) ReflectionUtils.getField(OreDictionaryArbiter.class, "oreIDs") .get(null); - oreStacks = (TMap>) - ReflectionUtils.getField(OreDictionaryArbiter.class, "oreStacks") - .get(null); - stackIDs = (TMap>) - ReflectionUtils.getField(OreDictionaryArbiter.class, "stackIDs") - .get(null); - stackNames = (TMap>) - ReflectionUtils.getField(OreDictionaryArbiter.class, "stackNames") - .get(null); + oreStacks = (TMap>) ReflectionUtils + .getField(OreDictionaryArbiter.class, "oreStacks").get(null); + stackIDs = (TMap>) ReflectionUtils + .getField(OreDictionaryArbiter.class, "stackIDs").get(null); + stackNames = (TMap>) ReflectionUtils + .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_Forge_ChunkLoading.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java index cfb4663734..e26c5b0d03 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java @@ -2,8 +2,6 @@ package gtPlusPlus.preloader.asm.transformers; import static org.objectweb.asm.Opcodes.*; -import cpw.mods.fml.relauncher.FMLRelaunchLog; -import gtPlusPlus.preloader.DevHelper; import org.apache.logging.log4j.Level; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; @@ -11,6 +9,9 @@ import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; +import cpw.mods.fml.relauncher.FMLRelaunchLog; +import gtPlusPlus.preloader.DevHelper; + public class ClassTransformer_Forge_ChunkLoading { // The qualified name of the class we plan to transform. @@ -47,12 +48,11 @@ public class ClassTransformer_Forge_ChunkLoading { if (reader != null && writer != null && !doesMethodAlreadyExist) { - aChunkCoordIntPair = obfuscated - ? DevHelper.getObfuscated("net/minecraft/world/ChunkCoordIntPair") + aChunkCoordIntPair = obfuscated ? DevHelper.getObfuscated("net/minecraft/world/ChunkCoordIntPair") : "net/minecraft/world/ChunkCoordIntPair"; aWorld = obfuscated ? DevHelper.getObfuscated("net/minecraft/world/World") : "net/minecraft/world/World"; - aEntity = - obfuscated ? DevHelper.getObfuscated("net/minecraft/entity/Entity") : "net/minecraft/entity/Entity"; + aEntity = obfuscated ? DevHelper.getObfuscated("net/minecraft/entity/Entity") + : "net/minecraft/entity/Entity"; injectMethod("forceChunk"); injectMethod("unforceChunk"); @@ -76,16 +76,17 @@ public class ClassTransformer_Forge_ChunkLoading { public void injectMethod(String aMethodName) { MethodVisitor mv; FMLRelaunchLog.log( - "[GT++ ASM] Chunkloading Patch", Level.INFO, "Injecting " + aMethodName + " into " + className + "."); + "[GT++ ASM] Chunkloading Patch", + Level.INFO, + "Injecting " + aMethodName + " into " + className + "."); if (aMethodName.equals("forceChunk")) { - mv = getWriter() - .visitMethod( - ACC_PUBLIC + ACC_STATIC, - "forceChunk", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V", - null, - null); + mv = getWriter().visitMethod( + ACC_PUBLIC + ACC_STATIC, + "forceChunk", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V", + null, + null); mv.visitCode(); Label l0 = new Label(); mv.visitLabel(l0); @@ -166,7 +167,10 @@ public class ClassTransformer_Forge_ChunkLoading { mv.visitFieldInsn(GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "tickets", "Ljava/util/Map;"); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "net/minecraftforge/common/ForgeChunkManager$Ticket", "world", "L" + aWorld + ";"); + GETFIELD, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "world", + "L" + aWorld + ";"); mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true); mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); mv.visitVarInsn(ALOAD, 0); @@ -270,10 +274,16 @@ public class ClassTransformer_Forge_ChunkLoading { "()Lcom/google/common/collect/ImmutableSetMultimap$Builder;", false); mv.visitFieldInsn( - GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "forcedChunks", "Ljava/util/Map;"); + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "forcedChunks", + "Ljava/util/Map;"); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "net/minecraftforge/common/ForgeChunkManager$Ticket", "world", "L" + aWorld + ";"); + GETFIELD, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "world", + "L" + aWorld + ";"); mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true); mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); mv.visitMethodInsn( @@ -301,10 +311,16 @@ public class ClassTransformer_Forge_ChunkLoading { mv.visitLabel(l12); mv.visitLineNumber(748, l12); mv.visitFieldInsn( - GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "forcedChunks", "Ljava/util/Map;"); + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "forcedChunks", + "Ljava/util/Map;"); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "net/minecraftforge/common/ForgeChunkManager$Ticket", "world", "L" + aWorld + ";"); + GETFIELD, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "world", + "L" + aWorld + ";"); mv.visitVarInsn(ALOAD, 2); mv.visitMethodInsn( INVOKEINTERFACE, @@ -368,7 +384,7 @@ public class ClassTransformer_Forge_ChunkLoading { false); mv.visitLabel(l14); mv.visitLineNumber(754, l14); - mv.visitFrame(F_APPEND, 1, new Object[] {"com/google/common/collect/ImmutableSetMultimap"}, 0, null); + mv.visitFrame(F_APPEND, 1, new Object[] { "com/google/common/collect/ImmutableSetMultimap" }, 0, null); mv.visitInsn(RETURN); Label l17 = new Label(); mv.visitLabel(l17); @@ -388,13 +404,12 @@ public class ClassTransformer_Forge_ChunkLoading { } else if (aMethodName.equals("unforceChunk")) { - mv = getWriter() - .visitMethod( - ACC_PUBLIC + ACC_STATIC, - "unforceChunk", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V", - null, - null); + mv = getWriter().visitMethod( + ACC_PUBLIC + ACC_STATIC, + "unforceChunk", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;L" + aChunkCoordIntPair + ";)V", + null, + null); mv.visitCode(); Label l0 = new Label(); mv.visitLabel(l0); @@ -461,10 +476,16 @@ public class ClassTransformer_Forge_ChunkLoading { mv.visitLabel(l5); mv.visitLineNumber(788, l5); mv.visitFieldInsn( - GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "forcedChunks", "Ljava/util/Map;"); + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "forcedChunks", + "Ljava/util/Map;"); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "net/minecraftforge/common/ForgeChunkManager$Ticket", "world", "L" + aWorld + ";"); + GETFIELD, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "world", + "L" + aWorld + ";"); mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true); mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); mv.visitMethodInsn( @@ -502,10 +523,16 @@ public class ClassTransformer_Forge_ChunkLoading { mv.visitLabel(l8); mv.visitLineNumber(791, l8); mv.visitFieldInsn( - GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "forcedChunks", "Ljava/util/Map;"); + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "forcedChunks", + "Ljava/util/Map;"); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "net/minecraftforge/common/ForgeChunkManager$Ticket", "world", "L" + aWorld + ";"); + GETFIELD, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "world", + "L" + aWorld + ";"); mv.visitVarInsn(ALOAD, 3); mv.visitMethodInsn( INVOKEINTERFACE, @@ -543,14 +570,13 @@ public class ClassTransformer_Forge_ChunkLoading { } else if (aMethodName.equals("requestTicket")) { - mv = getWriter() - .visitMethod( - ACC_PUBLIC + ACC_STATIC, - "requestTicket", - "(Ljava/lang/Object;L" + aWorld - + ";Lnet/minecraftforge/common/ForgeChunkManager$Type;)Lnet/minecraftforge/common/ForgeChunkManager$Ticket;", - null, - null); + mv = getWriter().visitMethod( + ACC_PUBLIC + ACC_STATIC, + "requestTicket", + "(Ljava/lang/Object;L" + aWorld + + ";Lnet/minecraftforge/common/ForgeChunkManager$Type;)Lnet/minecraftforge/common/ForgeChunkManager$Ticket;", + null, + null); mv.visitCode(); Label l0 = new Label(); mv.visitLabel(l0); @@ -605,10 +631,14 @@ public class ClassTransformer_Forge_ChunkLoading { mv.visitInsn(ARETURN); mv.visitLabel(l2); mv.visitLineNumber(662, l2); - mv.visitFrame(F_APPEND, 1, new Object[] {"cpw/mods/fml/common/ModContainer"}, 0, null); + mv.visitFrame(F_APPEND, 1, new Object[] { "cpw/mods/fml/common/ModContainer" }, 0, null); mv.visitVarInsn(ALOAD, 3); mv.visitMethodInsn( - INVOKEINTERFACE, "cpw/mods/fml/common/ModContainer", "getModId", "()Ljava/lang/String;", true); + INVOKEINTERFACE, + "cpw/mods/fml/common/ModContainer", + "getModId", + "()Ljava/lang/String;", + true); mv.visitVarInsn(ASTORE, 4); Label l5 = new Label(); mv.visitLabel(l5); @@ -644,7 +674,7 @@ public class ClassTransformer_Forge_ChunkLoading { mv.visitInsn(ATHROW); mv.visitLabel(l6); mv.visitLineNumber(669, l6); - mv.visitFrame(F_APPEND, 1, new Object[] {"java/lang/String"}, 0, null); + mv.visitFrame(F_APPEND, 1, new Object[] { "java/lang/String" }, 0, null); mv.visitVarInsn(ALOAD, 4); mv.visitMethodInsn( INVOKESTATIC, @@ -675,7 +705,10 @@ public class ClassTransformer_Forge_ChunkLoading { mv.visitLabel(l11); mv.visitLineNumber(673, l11); mv.visitFieldInsn( - GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "warnedMods", "Ljava/util/Set;"); + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "warnedMods", + "Ljava/util/Set;"); mv.visitVarInsn(ALOAD, 4); mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Set", "contains", "(Ljava/lang/Object;)Z", true); Label l12 = new Label(); @@ -706,13 +739,16 @@ public class ClassTransformer_Forge_ChunkLoading { mv.visitLabel(l14); mv.visitLineNumber(676, l14); mv.visitFieldInsn( - GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "warnedMods", "Ljava/util/Set;"); + GETSTATIC, + "net/minecraftforge/common/ForgeChunkManager", + "warnedMods", + "Ljava/util/Set;"); mv.visitVarInsn(ALOAD, 4); mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Set", "add", "(Ljava/lang/Object;)Z", true); mv.visitInsn(POP); mv.visitLabel(l12); mv.visitLineNumber(678, l12); - mv.visitFrame(F_APPEND, 1, new Object[] {INTEGER}, 0, null); + mv.visitFrame(F_APPEND, 1, new Object[] { INTEGER }, 0, null); mv.visitInsn(ACONST_NULL); mv.visitInsn(ARETURN); mv.visitLabel(l10); @@ -776,13 +812,12 @@ public class ClassTransformer_Forge_ChunkLoading { } else if (aMethodName.equals("releaseTicket")) { - mv = getWriter() - .visitMethod( - ACC_PUBLIC + ACC_STATIC, - "releaseTicket", - "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)V", - null, - null); + mv = getWriter().visitMethod( + ACC_PUBLIC + ACC_STATIC, + "releaseTicket", + "(Lnet/minecraftforge/common/ForgeChunkManager$Ticket;)V", + null, + null); mv.visitCode(); Label l0 = new Label(); mv.visitLabel(l0); @@ -827,7 +862,10 @@ public class ClassTransformer_Forge_ChunkLoading { mv.visitFieldInsn(GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "tickets", "Ljava/util/Map;"); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "net/minecraftforge/common/ForgeChunkManager$Ticket", "world", "L" + aWorld + ";"); + GETFIELD, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "world", + "L" + aWorld + ";"); mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true); mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); mv.visitVarInsn(ALOAD, 0); @@ -891,7 +929,7 @@ public class ClassTransformer_Forge_ChunkLoading { mv.visitFrame( F_FULL, 3, - new Object[] {"net/minecraftforge/common/ForgeChunkManager$Ticket", TOP, "java/util/Iterator"}, + new Object[] { "net/minecraftforge/common/ForgeChunkManager$Ticket", TOP, "java/util/Iterator" }, 0, new Object[] {}); mv.visitVarInsn(ALOAD, 2); @@ -918,7 +956,11 @@ public class ClassTransformer_Forge_ChunkLoading { mv.visitLabel(l6); mv.visitLineNumber(708, l6); mv.visitFrame( - F_FULL, 1, new Object[] {"net/minecraftforge/common/ForgeChunkManager$Ticket"}, 0, new Object[] {}); + F_FULL, + 1, + new Object[] { "net/minecraftforge/common/ForgeChunkManager$Ticket" }, + 0, + new Object[] {}); mv.visitVarInsn(ALOAD, 0); mv.visitMethodInsn( INVOKESTATIC, @@ -967,7 +1009,10 @@ public class ClassTransformer_Forge_ChunkLoading { mv.visitFieldInsn(GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "tickets", "Ljava/util/Map;"); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "net/minecraftforge/common/ForgeChunkManager$Ticket", "world", "L" + aWorld + ";"); + GETFIELD, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "world", + "L" + aWorld + ";"); mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true); mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); mv.visitLdcInsn("Forge"); @@ -990,7 +1035,10 @@ public class ClassTransformer_Forge_ChunkLoading { mv.visitFieldInsn(GETSTATIC, "net/minecraftforge/common/ForgeChunkManager", "tickets", "Ljava/util/Map;"); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "net/minecraftforge/common/ForgeChunkManager$Ticket", "world", "L" + aWorld + ";"); + GETFIELD, + "net/minecraftforge/common/ForgeChunkManager$Ticket", + "world", + "L" + aWorld + ";"); mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Map", "get", "(Ljava/lang/Object;)Ljava/lang/Object;", true); mv.visitTypeInsn(CHECKCAST, "com/google/common/collect/Multimap"); mv.visitVarInsn(ALOAD, 0); @@ -1031,8 +1079,7 @@ public class ClassTransformer_Forge_ChunkLoading { @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { - if (name.equals("forceChunk") - || name.equals("unforceChunk") + if (name.equals("forceChunk") || name.equals("unforceChunk") || name.equals("requestTicket") || name.equals("releaseTicket")) { FMLRelaunchLog.log("[GT++ ASM] Chunkloading Patch", Level.INFO, "Found method " + name + ", Patching."); diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java index db3b9f3621..ca268f9f37 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java @@ -2,8 +2,6 @@ package gtPlusPlus.preloader.asm.transformers; import static org.objectweb.asm.Opcodes.*; -import cpw.mods.fml.relauncher.FMLRelaunchLog; -import gtPlusPlus.preloader.DevHelper; import org.apache.logging.log4j.Level; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; @@ -11,6 +9,9 @@ import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; +import cpw.mods.fml.relauncher.FMLRelaunchLog; +import gtPlusPlus.preloader.DevHelper; + public class ClassTransformer_GC_EntityAutoRocket { // The qualified name of the class we plan to transform. @@ -44,8 +45,8 @@ public class ClassTransformer_GC_EntityAutoRocket { if (reader != null && writer != null) { injectMethod(); } else { - FMLRelaunchLog.log( - "[GT++ ASM] Galacticraft EntityAutoRocket Patch", Level.INFO, "Failed to Inject new code."); + FMLRelaunchLog + .log("[GT++ ASM] Galacticraft EntityAutoRocket Patch", Level.INFO, "Failed to Inject new code."); } } @@ -63,35 +64,28 @@ public class ClassTransformer_GC_EntityAutoRocket { public void injectMethod() { - String aEntityPlayer = isObfuscated - ? DevHelper.getObfuscated("net/minecraft/entity/player/EntityPlayer") + String aEntityPlayer = isObfuscated ? DevHelper.getObfuscated("net/minecraft/entity/player/EntityPlayer") : "net/minecraft/entity/player/EntityPlayer"; - String aEntityPlayerMP = isObfuscated - ? DevHelper.getObfuscated("net/minecraft/entity/player/EntityPlayerMP") + String aEntityPlayerMP = isObfuscated ? DevHelper.getObfuscated("net/minecraft/entity/player/EntityPlayerMP") : "net/minecraft/entity/player/EntityPlayerMP"; - String aWorld = - isObfuscated ? DevHelper.getObfuscated("net/minecraft/world/World") : "net/minecraft/world/World"; - String aItemStack = - isObfuscated ? DevHelper.getObfuscated("net/minecraft/item/ItemStack") : "net/minecraft/item/ItemStack"; - String aEntity = - isObfuscated ? DevHelper.getObfuscated("net/minecraft/entity/Entity") : "net/minecraft/entity/Entity"; - String aWorldClient = isObfuscated - ? DevHelper.getObfuscated("net/minecraft/client/multiplayer/WorldClient") + String aWorld = isObfuscated ? DevHelper.getObfuscated("net/minecraft/world/World") + : "net/minecraft/world/World"; + String aItemStack = isObfuscated ? DevHelper.getObfuscated("net/minecraft/item/ItemStack") + : "net/minecraft/item/ItemStack"; + String aEntity = isObfuscated ? DevHelper.getObfuscated("net/minecraft/entity/Entity") + : "net/minecraft/entity/Entity"; + String aWorldClient = isObfuscated ? DevHelper.getObfuscated("net/minecraft/client/multiplayer/WorldClient") : "net/minecraft/client/multiplayer/WorldClient"; - String aDifficultyEnum = isObfuscated - ? DevHelper.getObfuscated("net/minecraft/world/EnumDifficulty") + String aDifficultyEnum = isObfuscated ? DevHelper.getObfuscated("net/minecraft/world/EnumDifficulty") : "net/minecraft/world/EnumDifficulty"; - String aWorldInfo = isObfuscated - ? DevHelper.getObfuscated("net/minecraft/world/storage/WorldInfo") + String aWorldInfo = isObfuscated ? DevHelper.getObfuscated("net/minecraft/world/storage/WorldInfo") : "net/minecraft/world/storage/WorldInfo"; String aItemInWorldManager = isObfuscated ? DevHelper.getObfuscated("net/minecraft/server/management/ItemInWorldManager") : "net/minecraft/server/management/ItemInWorldManager"; - String aWorldType = isObfuscated - ? DevHelper.getObfuscated("net/minecraft/world/WorldType") + String aWorldType = isObfuscated ? DevHelper.getObfuscated("net/minecraft/world/WorldType") : "net/minecraft/world/WorldType"; - String aGameType = isObfuscated - ? DevHelper.getObfuscated("net/minecraft/world/WorldSettings$GameType") + String aGameType = isObfuscated ? DevHelper.getObfuscated("net/minecraft/world/WorldSettings$GameType") : "net/minecraft/world/WorldSettings$GameType"; if (isValidTransformer()) { @@ -99,8 +93,8 @@ public class ClassTransformer_GC_EntityAutoRocket { "[GT++ ASM] Galacticraft EntityAutoRocket Patch", Level.INFO, "Injecting decodePacketdata into " + className + "."); - MethodVisitor mv = - getWriter().visitMethod(ACC_PUBLIC, "decodePacketdata", "(Lio/netty/buffer/ByteBuf;)V", null, null); + MethodVisitor mv = getWriter() + .visitMethod(ACC_PUBLIC, "decodePacketdata", "(Lio/netty/buffer/ByteBuf;)V", null, null); mv.visitCode(); Label l0 = new Label(); @@ -174,12 +168,15 @@ public class ClassTransformer_GC_EntityAutoRocket { false); mv.visitLabel(l4); mv.visitLineNumber(1038, l4); - mv.visitFrame(F_APPEND, 2, new Object[] {"net/minecraftforge/fluids/FluidStack", INTEGER}, 0, null); + mv.visitFrame(F_APPEND, 2, new Object[] { "net/minecraftforge/fluids/FluidStack", INTEGER }, 0, null); mv.visitVarInsn(ALOAD, 0); mv.visitVarInsn(ALOAD, 1); mv.visitMethodInsn(INVOKEVIRTUAL, "io/netty/buffer/ByteBuf", "readBoolean", "()Z", false); mv.visitFieldInsn( - PUTFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "landing", "Z"); + PUTFIELD, + "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", + "landing", + "Z"); Label l8 = new Label(); mv.visitLabel(l8); mv.visitLineNumber(1039, l8); @@ -211,7 +208,11 @@ public class ClassTransformer_GC_EntityAutoRocket { mv.visitVarInsn(ALOAD, 1); mv.visitMethodInsn(INVOKEVIRTUAL, "io/netty/buffer/ByteBuf", "readInt", "()I", false); mv.visitMethodInsn( - INVOKESPECIAL, "micdoodle8/mods/galacticraft/api/vector/BlockVec3", "", "(III)V", false); + INVOKESPECIAL, + "micdoodle8/mods/galacticraft/api/vector/BlockVec3", + "", + "(III)V", + false); mv.visitFieldInsn( PUTFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", @@ -226,7 +227,10 @@ public class ClassTransformer_GC_EntityAutoRocket { mv.visitLdcInsn(new Double("8000.0")); mv.visitInsn(DDIV); mv.visitFieldInsn( - PUTFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "motionX", "D"); + PUTFIELD, + "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", + "motionX", + "D"); Label l12 = new Label(); mv.visitLabel(l12); mv.visitLineNumber(1047, l12); @@ -236,7 +240,10 @@ public class ClassTransformer_GC_EntityAutoRocket { mv.visitLdcInsn(new Double("8000.0")); mv.visitInsn(DDIV); mv.visitFieldInsn( - PUTFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "motionY", "D"); + PUTFIELD, + "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", + "motionY", + "D"); Label l13 = new Label(); mv.visitLabel(l13); mv.visitLineNumber(1048, l13); @@ -246,7 +253,10 @@ public class ClassTransformer_GC_EntityAutoRocket { mv.visitLdcInsn(new Double("8000.0")); mv.visitInsn(DDIV); mv.visitFieldInsn( - PUTFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "motionZ", "D"); + PUTFIELD, + "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", + "motionZ", + "D"); Label l14 = new Label(); mv.visitLabel(l14); mv.visitLineNumber(1049, l14); @@ -256,7 +266,10 @@ public class ClassTransformer_GC_EntityAutoRocket { mv.visitLdcInsn(new Double("8000.0")); mv.visitInsn(DDIV); mv.visitFieldInsn( - PUTFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "lastMotionY", "D"); + PUTFIELD, + "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", + "lastMotionY", + "D"); Label l15 = new Label(); mv.visitLabel(l15); mv.visitLineNumber(1050, l15); @@ -345,8 +358,11 @@ public class ClassTransformer_GC_EntityAutoRocket { mv.visitJumpInsn(GOTO, l22); mv.visitLabel(l21); mv.visitFrame( - F_SAME1, 0, null, 1, new Object[] {"micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket" - }); + F_SAME1, + 0, + null, + 1, + new Object[] { "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket" }); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( GETFIELD, @@ -357,15 +373,11 @@ public class ClassTransformer_GC_EntityAutoRocket { mv.visitFrame( F_FULL, 4, - new Object[] { - "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", - "io/netty/buffer/ByteBuf", - "net/minecraftforge/fluids/FluidStack", - INTEGER - }, + new Object[] { "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", + "io/netty/buffer/ByteBuf", "net/minecraftforge/fluids/FluidStack", INTEGER }, 2, - new Object[] {"micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "java/lang/String" - }); + new Object[] { "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", + "java/lang/String" }); mv.visitFieldInsn( PUTFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", @@ -400,7 +412,10 @@ public class ClassTransformer_GC_EntityAutoRocket { mv.visitVarInsn(ALOAD, 1); mv.visitMethodInsn(INVOKEVIRTUAL, "io/netty/buffer/ByteBuf", "readBoolean", "()Z", false); mv.visitFieldInsn( - PUTFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "statusValid", "Z"); + PUTFIELD, + "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", + "statusValid", + "Z"); Label l26 = new Label(); mv.visitLabel(l26); mv.visitLineNumber(1066, l26); @@ -466,7 +481,10 @@ public class ClassTransformer_GC_EntityAutoRocket { mv.visitFieldInsn(GETFIELD, "" + aEntity + "", "dimension", "I"); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "dimension", "I"); + GETFIELD, + "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", + "dimension", + "I"); Label l35 = new Label(); mv.visitJumpInsn(IF_ICMPEQ, l35); Label l36 = new Label(); @@ -480,7 +498,10 @@ public class ClassTransformer_GC_EntityAutoRocket { mv.visitLineNumber(1080, l37); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "dimension", "I"); + GETFIELD, + "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", + "dimension", + "I"); mv.visitVarInsn(ALOAD, 5); mv.visitFieldInsn(GETFIELD, "" + aEntity + "", "worldObj", "L" + aWorld + ";"); mv.visitFieldInsn(GETFIELD, aWorld, "difficultySetting", "L" + aDifficultyEnum + ";"); @@ -493,9 +514,16 @@ public class ClassTransformer_GC_EntityAutoRocket { mv.visitVarInsn(ALOAD, 5); mv.visitTypeInsn(CHECKCAST, "" + aEntityPlayerMP + ""); mv.visitFieldInsn( - GETFIELD, "" + aEntityPlayerMP + "", "theItemInWorldManager", "L" + aItemInWorldManager + ";"); + GETFIELD, + "" + aEntityPlayerMP + "", + "theItemInWorldManager", + "L" + aItemInWorldManager + ";"); mv.visitMethodInsn( - INVOKEVIRTUAL, "" + aItemInWorldManager + "", "getGameType", "()L" + aGameType + ";", false); + INVOKEVIRTUAL, + "" + aItemInWorldManager + "", + "getGameType", + "()L" + aGameType + ";", + false); mv.visitMethodInsn(INVOKEVIRTUAL, "" + aGameType + "", "getID", "()I", false); mv.visitMethodInsn( INVOKESTATIC, @@ -516,7 +544,7 @@ public class ClassTransformer_GC_EntityAutoRocket { mv.visitJumpInsn(GOTO, l27); mv.visitLabel(l35); mv.visitLineNumber(1085, l35); - mv.visitFrame(F_APPEND, 2, new Object[] {INTEGER, "" + aEntity + ""}, 0, null); + mv.visitFrame(F_APPEND, 2, new Object[] { INTEGER, "" + aEntity + "" }, 0, null); mv.visitVarInsn(ALOAD, 5); mv.visitVarInsn(ALOAD, 0); mv.visitMethodInsn(INVOKEVIRTUAL, "" + aEntity + "", "mountEntity", "(L" + aEntity + ";)V", false); @@ -588,7 +616,10 @@ public class ClassTransformer_GC_EntityAutoRocket { mv.visitFieldInsn(GETFIELD, "" + aEntity + "", "dimension", "I"); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "dimension", "I"); + GETFIELD, + "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", + "dimension", + "I"); Label l47 = new Label(); mv.visitJumpInsn(IF_ICMPEQ, l47); Label l48 = new Label(); @@ -602,7 +633,10 @@ public class ClassTransformer_GC_EntityAutoRocket { mv.visitLineNumber(1104, l49); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", "dimension", "I"); + GETFIELD, + "micdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket", + "dimension", + "I"); mv.visitVarInsn(ALOAD, 5); mv.visitFieldInsn(GETFIELD, "" + aEntity + "", "worldObj", "L" + aWorld + ";"); mv.visitFieldInsn(GETFIELD, aWorld, "difficultySetting", "L" + aDifficultyEnum + ";"); @@ -615,9 +649,16 @@ public class ClassTransformer_GC_EntityAutoRocket { mv.visitVarInsn(ALOAD, 5); mv.visitTypeInsn(CHECKCAST, "" + aEntityPlayerMP + ""); mv.visitFieldInsn( - GETFIELD, "" + aEntityPlayerMP + "", "theItemInWorldManager", "L" + aItemInWorldManager + ";"); + GETFIELD, + "" + aEntityPlayerMP + "", + "theItemInWorldManager", + "L" + aItemInWorldManager + ";"); mv.visitMethodInsn( - INVOKEVIRTUAL, "" + aItemInWorldManager + "", "getGameType", "()L" + aGameType + ";", false); + INVOKEVIRTUAL, + "" + aItemInWorldManager + "", + "getGameType", + "()L" + aGameType + ";", + false); mv.visitMethodInsn(INVOKEVIRTUAL, "" + aGameType + "", "getID", "()I", false); mv.visitMethodInsn( INVOKESTATIC, @@ -638,7 +679,7 @@ public class ClassTransformer_GC_EntityAutoRocket { mv.visitJumpInsn(GOTO, l27); mv.visitLabel(l47); mv.visitLineNumber(1109, l47); - mv.visitFrame(F_APPEND, 1, new Object[] {"" + aEntity + ""}, 0, null); + mv.visitFrame(F_APPEND, 1, new Object[] { "" + aEntity + "" }, 0, null); mv.visitVarInsn(ALOAD, 5); mv.visitVarInsn(ALOAD, 0); mv.visitMethodInsn(INVOKEVIRTUAL, "" + aEntity + "", "mountEntity", "(L" + aEntity + ";)V", false); @@ -685,7 +726,12 @@ public class ClassTransformer_GC_EntityAutoRocket { Label l54 = new Label(); mv.visitLabel(l54); mv.visitLocalVariable( - "this", "Lmicdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket;", null, l0, l54, 0); + "this", + "Lmicdoodle8/mods/galacticraft/api/prefab/entity/EntityAutoRocket;", + null, + l0, + l54, + 0); mv.visitLocalVariable("buffer", "Lio/netty/buffer/ByteBuf;", null, l0, l54, 1); mv.visitLocalVariable("g", "Lnet/minecraftforge/fluids/FluidStack;", null, l2, l54, 2); mv.visitLocalVariable("aBufferData", "I", null, l3, l54, 3); @@ -702,15 +748,15 @@ public class ClassTransformer_GC_EntityAutoRocket { public localClassVisitor(ClassVisitor cv) { super(ASM5, cv); - FMLRelaunchLog.log( - "[GT++ ASM] Galacticraft EntityAutoRocket Patch", Level.INFO, "Inspecting Class " + className); + FMLRelaunchLog + .log("[GT++ ASM] Galacticraft EntityAutoRocket Patch", Level.INFO, "Inspecting Class " + className); } @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { if (name.equals("decodePacketdata")) { - FMLRelaunchLog.log( - "[GT++ ASM] Galacticraft EntityAutoRocket Patch", Level.INFO, "Removing method " + name); + FMLRelaunchLog + .log("[GT++ ASM] Galacticraft EntityAutoRocket Patch", Level.INFO, "Removing method " + name); return null; } MethodVisitor methodVisitor = super.visitMethod(access, name, desc, signature, exceptions); diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java index ec2a9cecbb..8ed7241b63 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java @@ -2,7 +2,6 @@ package gtPlusPlus.preloader.asm.transformers; import static org.objectweb.asm.Opcodes.*; -import cpw.mods.fml.relauncher.FMLRelaunchLog; import org.apache.logging.log4j.Level; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; @@ -10,6 +9,8 @@ import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; +import cpw.mods.fml.relauncher.FMLRelaunchLog; + public class ClassTransformer_GC_FluidUtil { // The qualified name of the class we plan to transform. @@ -78,7 +79,12 @@ public class ClassTransformer_GC_FluidUtil { mv.visitJumpInsn(GOTO, l1); Label l2 = new Label(); mv.visitLabel(l2); - mv.visitFrame(F_FULL, 3, new Object[] {"java/lang/String", TOP, "java/util/Iterator"}, 0, new Object[] {}); + mv.visitFrame( + F_FULL, + 3, + new Object[] { "java/lang/String", TOP, "java/util/Iterator" }, + 0, + new Object[] {}); mv.visitVarInsn(ALOAD, 2); mv.visitMethodInsn(INVOKEINTERFACE, "java/util/Iterator", "next", "()Ljava/lang/Object;", true); mv.visitTypeInsn(CHECKCAST, "java/lang/String"); @@ -113,13 +119,12 @@ public class ClassTransformer_GC_FluidUtil { mv.visitMaxs(2, 3); mv.visitEnd(); } else if (aMethodName.equals("fillWithGCFuel")) { - mv = getWriter() - .visitMethod( - ACC_PUBLIC + ACC_STATIC, - "fillWithGCFuel", - "(Lnet/minecraftforge/fluids/FluidTank;Lnet/minecraftforge/fluids/FluidStack;Z)I", - null, - null); + mv = getWriter().visitMethod( + ACC_PUBLIC + ACC_STATIC, + "fillWithGCFuel", + "(Lnet/minecraftforge/fluids/FluidTank;Lnet/minecraftforge/fluids/FluidStack;Z)I", + null, + null); mv.visitCode(); Label l0 = new Label(); mv.visitLabel(l0); @@ -176,14 +181,8 @@ public class ClassTransformer_GC_FluidUtil { mv.visitFrame( F_FULL, 6, - new Object[] { - "net/minecraftforge/fluids/FluidTank", - "net/minecraftforge/fluids/FluidStack", - INTEGER, - "net/minecraftforge/fluids/FluidStack", - TOP, - "java/util/Iterator" - }, + new Object[] { "net/minecraftforge/fluids/FluidTank", "net/minecraftforge/fluids/FluidStack", + INTEGER, "net/minecraftforge/fluids/FluidStack", TOP, "java/util/Iterator" }, 0, new Object[] {}); mv.visitVarInsn(ALOAD, 5); @@ -236,12 +235,8 @@ public class ClassTransformer_GC_FluidUtil { mv.visitFrame( F_FULL, 4, - new Object[] { - "net/minecraftforge/fluids/FluidTank", - "net/minecraftforge/fluids/FluidStack", - INTEGER, - "net/minecraftforge/fluids/FluidStack" - }, + new Object[] { "net/minecraftforge/fluids/FluidTank", "net/minecraftforge/fluids/FluidStack", + INTEGER, "net/minecraftforge/fluids/FluidStack" }, 0, new Object[] {}); mv.visitVarInsn(ALOAD, 3); diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java index 13137824d8..e9589ff756 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java @@ -2,8 +2,6 @@ package gtPlusPlus.preloader.asm.transformers; import static org.objectweb.asm.Opcodes.*; -import cpw.mods.fml.relauncher.FMLRelaunchLog; -import gtPlusPlus.preloader.DevHelper; import org.apache.logging.log4j.Level; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; @@ -11,6 +9,9 @@ import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; +import cpw.mods.fml.relauncher.FMLRelaunchLog; +import gtPlusPlus.preloader.DevHelper; + public class ClassTransformer_GC_FuelLoader { // The qualified name of the class we plan to transform. @@ -61,12 +62,11 @@ public class ClassTransformer_GC_FuelLoader { } public void injectMethod() { - String aWorld = - isObfuscated ? DevHelper.getObfuscated("net/minecraft/world/World") : "net/minecraft/world/World"; - String aItemStack = - isObfuscated ? DevHelper.getObfuscated("net/minecraft/item/ItemStack") : "net/minecraft/item/ItemStack"; - String aTileEntity = isObfuscated - ? DevHelper.getObfuscated("net/minecraft/tileentity/TileEntity") + String aWorld = isObfuscated ? DevHelper.getObfuscated("net/minecraft/world/World") + : "net/minecraft/world/World"; + String aItemStack = isObfuscated ? DevHelper.getObfuscated("net/minecraft/item/ItemStack") + : "net/minecraft/item/ItemStack"; + String aTileEntity = isObfuscated ? DevHelper.getObfuscated("net/minecraft/tileentity/TileEntity") : "net/minecraft/tileentity/TileEntity"; if (isValidTransformer()) { @@ -104,7 +104,10 @@ public class ClassTransformer_GC_FuelLoader { mv.visitVarInsn(ALOAD, 0); mv.visitInsn(ICONST_0); mv.visitFieldInsn( - PUTFIELD, "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", "loadedFuelLastTick", "Z"); + PUTFIELD, + "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", + "loadedFuelLastTick", + "Z"); Label l4 = new Label(); mv.visitLabel(l4); mv.visitLineNumber(63, l4); @@ -214,13 +217,8 @@ public class ClassTransformer_GC_FuelLoader { mv.visitFrame( F_FULL, 5, - new Object[] { - "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", - "net/minecraftforge/fluids/FluidStack", - TOP, - TOP, - INTEGER - }, + new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", + "net/minecraftforge/fluids/FluidStack", TOP, TOP, INTEGER }, 0, new Object[] {}); mv.visitVarInsn(ALOAD, 0); @@ -268,17 +266,9 @@ public class ClassTransformer_GC_FuelLoader { mv.visitFrame( F_FULL, 9, - new Object[] { - "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", - "net/minecraftforge/fluids/FluidStack", - TOP, - TOP, - INTEGER, - "net/minecraftforge/fluids/FluidStack", - INTEGER, - TOP, - "java/util/Iterator" - }, + new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", + "net/minecraftforge/fluids/FluidStack", TOP, TOP, INTEGER, + "net/minecraftforge/fluids/FluidStack", INTEGER, TOP, "java/util/Iterator" }, 0, new Object[] {}); mv.visitVarInsn(ALOAD, 8); @@ -333,39 +323,24 @@ public class ClassTransformer_GC_FuelLoader { mv.visitFrame( F_FULL, 9, - new Object[] { - "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", - "net/minecraftforge/fluids/FluidStack", - TOP, - TOP, - INTEGER, - "net/minecraftforge/fluids/FluidStack", - INTEGER, - "net/minecraftforge/fluids/Fluid", - "java/util/Iterator" - }, + new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", + "net/minecraftforge/fluids/FluidStack", TOP, TOP, INTEGER, + "net/minecraftforge/fluids/FluidStack", INTEGER, "net/minecraftforge/fluids/Fluid", + "java/util/Iterator" }, 0, new Object[] {}); mv.visitInsn(ICONST_0); mv.visitLabel(l23); - mv.visitFrame(F_SAME1, 0, null, 1, new Object[] {INTEGER}); + mv.visitFrame(F_SAME1, 0, null, 1, new Object[] { INTEGER }); mv.visitVarInsn(ISTORE, 6); mv.visitLabel(l18); mv.visitLineNumber(76, l18); mv.visitFrame( F_FULL, 9, - new Object[] { - "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", - "net/minecraftforge/fluids/FluidStack", - TOP, - TOP, - INTEGER, - "net/minecraftforge/fluids/FluidStack", - INTEGER, - TOP, - "java/util/Iterator" - }, + new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", + "net/minecraftforge/fluids/FluidStack", TOP, TOP, INTEGER, + "net/minecraftforge/fluids/FluidStack", INTEGER, TOP, "java/util/Iterator" }, 0, new Object[] {}); mv.visitVarInsn(ALOAD, 8); @@ -381,15 +356,9 @@ public class ClassTransformer_GC_FuelLoader { mv.visitFrame( F_FULL, 7, - new Object[] { - "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", - "net/minecraftforge/fluids/FluidStack", - TOP, - TOP, - INTEGER, - "net/minecraftforge/fluids/FluidStack", - INTEGER - }, + new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", + "net/minecraftforge/fluids/FluidStack", TOP, TOP, INTEGER, + "net/minecraftforge/fluids/FluidStack", INTEGER }, 0, new Object[] {}); mv.visitVarInsn(ALOAD, 5); @@ -447,7 +416,7 @@ public class ClassTransformer_GC_FuelLoader { mv.visitFrame(F_SAME, 0, null, 0, null); mv.visitInsn(ICONST_0); mv.visitLabel(l28); - mv.visitFrame(F_SAME1, 0, null, 1, new Object[] {INTEGER}); + mv.visitFrame(F_SAME1, 0, null, 1, new Object[] { INTEGER }); mv.visitVarInsn(ISTORE, 6); mv.visitLabel(l25); mv.visitLineNumber(88, l25); @@ -500,10 +469,8 @@ public class ClassTransformer_GC_FuelLoader { mv.visitFrame( F_FULL, 2, - new Object[] { - "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", - "net/minecraftforge/fluids/FluidStack" - }, + new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", + "net/minecraftforge/fluids/FluidStack" }, 0, new Object[] {}); mv.visitVarInsn(ALOAD, 0); @@ -552,7 +519,7 @@ public class ClassTransformer_GC_FuelLoader { mv.visitFrame( F_APPEND, 3, - new Object[] {INTEGER, INTEGER, "[Lnet/minecraftforge/common/util/ForgeDirection;"}, + new Object[] { INTEGER, INTEGER, "[Lnet/minecraftforge/common/util/ForgeDirection;" }, 0, null); mv.visitVarInsn(ALOAD, 4); @@ -631,7 +598,7 @@ public class ClassTransformer_GC_FuelLoader { mv.visitFrame( F_APPEND, 2, - new Object[] {"net/minecraftforge/common/util/ForgeDirection", "" + aTileEntity + ""}, + new Object[] { "net/minecraftforge/common/util/ForgeDirection", "" + aTileEntity + "" }, 0, null); mv.visitVarInsn(ALOAD, 6); @@ -738,15 +705,9 @@ public class ClassTransformer_GC_FuelLoader { mv.visitFrame( F_FULL, 7, - new Object[] { - "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", - "net/minecraftforge/fluids/FluidStack", - TOP, - TOP, - "net/minecraftforge/fluids/FluidStack", - TOP, - "java/util/Iterator" - }, + new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", + "net/minecraftforge/fluids/FluidStack", TOP, TOP, "net/minecraftforge/fluids/FluidStack", + TOP, "java/util/Iterator" }, 0, new Object[] {}); mv.visitVarInsn(ALOAD, 6); @@ -801,13 +762,8 @@ public class ClassTransformer_GC_FuelLoader { mv.visitFrame( F_FULL, 5, - new Object[] { - "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", - "net/minecraftforge/fluids/FluidStack", - TOP, - TOP, - "net/minecraftforge/fluids/FluidStack" - }, + new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", + "net/minecraftforge/fluids/FluidStack", TOP, TOP, "net/minecraftforge/fluids/FluidStack" }, 0, new Object[] {}); mv.visitVarInsn(ALOAD, 4); @@ -925,33 +881,26 @@ public class ClassTransformer_GC_FuelLoader { mv.visitFrame( F_FULL, 6, - new Object[] { - "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", - "net/minecraftforge/fluids/FluidStack", - TOP, - INTEGER, - "net/minecraftforge/fluids/FluidStack", - INTEGER - }, + new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", + "net/minecraftforge/fluids/FluidStack", TOP, INTEGER, + "net/minecraftforge/fluids/FluidStack", INTEGER }, 1, - new Object[] {"micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader"}); + new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader" }); mv.visitInsn(ICONST_0); mv.visitLabel(l67); mv.visitFrame( F_FULL, 6, - new Object[] { - "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", - "net/minecraftforge/fluids/FluidStack", - TOP, - INTEGER, - "net/minecraftforge/fluids/FluidStack", - INTEGER - }, + new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", + "net/minecraftforge/fluids/FluidStack", TOP, INTEGER, + "net/minecraftforge/fluids/FluidStack", INTEGER }, 2, - new Object[] {"micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", INTEGER}); + new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", INTEGER }); mv.visitFieldInsn( - PUTFIELD, "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", "loadedFuelLastTick", "Z"); + PUTFIELD, + "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader", + "loadedFuelLastTick", + "Z"); Label l68 = new Label(); mv.visitLabel(l68); mv.visitLineNumber(137, l68); @@ -975,14 +924,19 @@ public class ClassTransformer_GC_FuelLoader { mv.visitFrame( F_FULL, 1, - new Object[] {"micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader"}, + new Object[] { "micdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader" }, 0, new Object[] {}); mv.visitInsn(RETURN); Label l69 = new Label(); mv.visitLabel(l69); mv.visitLocalVariable( - "this", "Lmicdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader;", null, l0, l69, 0); + "this", + "Lmicdoodle8/mods/galacticraft/core/tile/TileEntityFuelLoader;", + null, + l0, + l69, + 0); mv.visitLocalVariable("liquid", "Lnet/minecraftforge/fluids/FluidStack;", null, l5, l2, 1); mv.visitLocalVariable("amount", "I", null, l37, l32, 2); mv.visitLocalVariable("filled", "I", null, l36, l32, 3); @@ -1007,8 +961,8 @@ public class ClassTransformer_GC_FuelLoader { public localClassVisitor(ClassVisitor cv) { super(ASM5, cv); - FMLRelaunchLog.log( - "[GT++ ASM] Galacticraft Fuel_Loader Patch", Level.INFO, "Inspecting Class " + className); + FMLRelaunchLog + .log("[GT++ ASM] Galacticraft Fuel_Loader Patch", Level.INFO, "Inspecting Class " + className); } @Override 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 659f76ca0e..7dde3c4c55 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 @@ -2,10 +2,11 @@ package gtPlusPlus.preloader.asm.transformers; import static org.objectweb.asm.Opcodes.*; -import cpw.mods.fml.relauncher.FMLRelaunchLog; import java.util.Random; + import net.minecraft.block.Block; import net.minecraft.item.Item; + import org.apache.logging.log4j.Level; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor