diff options
| author | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 19:32:44 -0800 |
|---|---|---|
| committer | Jason Mitchell <mitchej@gmail.com> | 2023-01-28 19:32:44 -0800 |
| commit | 55f64675b42ac8d3c557cc850f78664bee006f6f (patch) | |
| tree | 2afd26dd3d5e6f763119bc192b57c66a1a075922 /src/main/java/gtPlusPlus/preloader/asm | |
| parent | 0f5dfd01b877b6a1019e0671b88d07974aae68c0 (diff) | |
| download | GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.gz GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.tar.bz2 GT5-Unofficial-55f64675b42ac8d3c557cc850f78664bee006f6f.zip | |
[ci skip] spotlessApply with the new settings
Diffstat (limited to 'src/main/java/gtPlusPlus/preloader/asm')
18 files changed, 588 insertions, 467 deletions
diff --git a/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java b/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java index efc35b8a72..42f9c40f39 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java +++ b/src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java @@ -1,13 +1,16 @@ package gtPlusPlus.preloader.asm; -import cpw.mods.fml.common.FMLLog; -import gtPlusPlus.preloader.Preloader_Logger; import java.io.File; import java.util.ArrayList; + import net.minecraftforge.common.config.Configuration; import net.minecraftforge.common.config.Property; + import org.apache.logging.log4j.Level; +import cpw.mods.fml.common.FMLLog; +import gtPlusPlus.preloader.Preloader_Logger; + public class AsmConfig { public static boolean loaded; @@ -104,8 +107,7 @@ public class AsmConfig { propOrder.add(prop.getName()); prop = config.get("general", "enabledLwjglKeybindingFix", true); - prop.comment = - "Prevents the game crashing from having invalid keybinds. https://github.com/alkcorp/GTplusplus/issues/544"; + prop.comment = "Prevents the game crashing from having invalid keybinds. https://github.com/alkcorp/GTplusplus/issues/544"; prop.setLanguageKey("gtpp.enabledLwjglKeybindingFix").setRequiresMcRestart(true); enabledLwjglKeybindingFix = prop.getBoolean(true); propOrder.add(prop.getName()); @@ -150,8 +152,8 @@ public class AsmConfig { Preloader_Logger.INFO("COFH Patch - Enabled: " + enableCofhPatch); Preloader_Logger.INFO("Gc Fuel Changes Patch - Enabled: " + enableGcFuelChanges); Preloader_Logger.INFO("Thaumcraft Aspect Safety Patch - Enabled: " + enableTcAspectSafety); - Preloader_Logger.INFO( - "Fix bad usage of EntityLivingBase.setHealth Patch - Enabled: " + enabledFixEntitySetHealth); + Preloader_Logger + .INFO("Fix bad usage of EntityLivingBase.setHealth Patch - Enabled: " + enabledFixEntitySetHealth); } catch (Exception var3) { FMLLog.log(Level.ERROR, var3, "GT++ ASM had a problem loading it's config", new Object[0]); diff --git a/src/main/java/gtPlusPlus/preloader/asm/ClassesToTransform.java b/src/main/java/gtPlusPlus/preloader/asm/ClassesToTransform.java index 8f4809dcd6..a3fd8789c6 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/ClassesToTransform.java +++ b/src/main/java/gtPlusPlus/preloader/asm/ClassesToTransform.java @@ -15,31 +15,24 @@ public class ClassesToTransform { public static final String TINKERS_FLUID_BLOCK = "tconstruct.smeltery.blocks.TConstructFluid"; public static final String GALACTICRAFT_FLUID_UTILS = "micdoodle8.mods.galacticraft.core.util.FluidUtil"; - public static final String GALACTICRAFT_TILE_ENTITY_FUEL_LOADER = - "micdoodle8.mods.galacticraft.core.tile.TileEntityFuelLoader"; - public static final String GALACTICRAFT_ENTITY_AUTO_ROCKET = - "micdoodle8.mods.galacticraft.api.prefab.entity.EntityAutoRocket"; + public static final String GALACTICRAFT_TILE_ENTITY_FUEL_LOADER = "micdoodle8.mods.galacticraft.core.tile.TileEntityFuelLoader"; + public static final String GALACTICRAFT_ENTITY_AUTO_ROCKET = "micdoodle8.mods.galacticraft.api.prefab.entity.EntityAutoRocket"; public static final String GT_UTILITY = "gregtech.api.util.GT_Utility"; public static final String GT_ACHIEVEMENTS = "gregtech.loaders.misc.GT_Achievements"; public static final String GT_CLIENT_PROXY = "gregtech.common.GT_Client"; public static final String GT_PACKET_TILE_ENTITY = "gregtech.api.net.GT_Packet_TileEntity"; public static final String GT_BASE_META_TILE_ENTITY = "gregtech.api.metatileentity.BaseMetaTileEntity"; - public static final String GT_MTE_CHARCOAL_PIT = - "gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_Charcoal_Pit"; + public static final String GT_MTE_CHARCOAL_PIT = "gregtech.common.tileentities.machines.multi.GT_MetaTileEntity_Charcoal_Pit"; public static final String GT_ITEM_MACHINES = "gregtech.common.blocks.GT_Item_Machines"; public static final String GT_METAGENERATED_TOOL = "gregtech.api.items.GT_MetaGenerated_Tool"; public static final String GT_BLOCK_MACHINES = "gregtech.common.blocks.GT_Block_Machines"; - public static final String GT_MTE_HATCH_ENERGY = - "gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy"; + public static final String GT_MTE_HATCH_ENERGY = "gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy"; public static final String GT_METAPIPE_ITEM = "gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Item"; - public static final String GT_METAPIPE_FLUID = - "gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid"; - public static final String GT_METAPIPE_FRAME = - "gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame"; + public static final String GT_METAPIPE_FLUID = "gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Fluid"; + public static final String GT_METAPIPE_FRAME = "gregtech.api.metatileentity.implementations.GT_MetaPipeEntity_Frame"; - public static final String GTPP_MTE_HATCH_RTG = - "gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy_RTG"; + public static final String GTPP_MTE_HATCH_RTG = "gtPlusPlus.xmod.gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Energy_RTG"; public static final String THAUMCRAFT_ITEM_WISP_ESSENCE = "thaumcraft.common.items.ItemWispEssence"; public static final String THAUMCRAFT_CRAFTING_MANAGER = "thaumcraft.common.lib.crafting.ThaumcraftCraftingManager"; @@ -51,15 +44,13 @@ public class ClassesToTransform { public static final String IC2_BLOCK_MACHINE1 = "ic2.core.block.machine.BlockMachine"; public static final String IC2_BLOCK_MACHINE2 = "ic2.core.block.machine.BlockMachine2"; public static final String IC2_BLOCK_MACHINE3 = "ic2.core.block.machine.BlockMachine3"; - public static final String IC2_BLOCK_KINETIC_GENERATOR = - "ic2.core.block.kineticgenerator.block.BlockKineticGenerator"; + public static final String IC2_BLOCK_KINETIC_GENERATOR = "ic2.core.block.kineticgenerator.block.BlockKineticGenerator"; public static final String IC2_BLOCK_HEAT_GENERATOR = "ic2.core.block.heatgenerator.block.BlockHeatGenerator"; public static final String IC2_BLOCK_GENERATOR = "ic2.core.block.generator.block.BlockGenerator"; public static final String IC2_BLOCK_REACTOR_ACCESS_HATCH = "ic2.core.block.reactor.block.BlockReactorAccessHatch"; public static final String IC2_BLOCK_REACTOR_CHAMBER = "ic2.core.block.reactor.block.BlockReactorChamber"; public static final String IC2_BLOCK_REACTOR_FLUID_PORT = "ic2.core.block.reactor.block.BlockReactorFluidPort"; - public static final String IC2_BLOCK_REACTOR_REDSTONE_PORT = - "ic2.core.block.reactor.block.BlockReactorRedstonePort"; + public static final String IC2_BLOCK_REACTOR_REDSTONE_PORT = "ic2.core.block.reactor.block.BlockReactorRedstonePort"; public static final String IC2_BLOCK_REACTOR_VESSEL = "ic2.core.block.reactor.block.BlockReactorVessel"; public static final String IC2_BLOCK_PERSONAL = "ic2.core.block.personal.BlockPersonal.class"; public static final String IC2_BLOCK_CHARGEPAD = "ic2.core.block.wiring.BlockChargepad.class"; diff --git a/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java b/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java index 853038a972..6f464484a5 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java +++ b/src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java @@ -1,7 +1,13 @@ package gtPlusPlus.preloader.asm; +import java.io.File; +import java.util.Arrays; + +import net.minecraftforge.common.config.Configuration; + import com.google.common.eventbus.EventBus; import com.google.common.eventbus.Subscribe; + import cpw.mods.fml.common.DummyModContainer; import cpw.mods.fml.common.LoadController; import cpw.mods.fml.common.ModMetadata; @@ -11,9 +17,6 @@ import cpw.mods.fml.common.event.FMLPostInitializationEvent; import cpw.mods.fml.common.event.FMLPreInitializationEvent; import gtPlusPlus.preloader.CORE_Preloader; import gtPlusPlus.preloader.Preloader_Logger; -import java.io.File; -import java.util.Arrays; -import net.minecraftforge.common.config.Configuration; public class Preloader_DummyContainer extends DummyModContainer { @@ -64,8 +67,8 @@ public class Preloader_DummyContainer extends DummyModContainer { } public static void handleConfigFile(final FMLPreInitializationEvent event) { - final Configuration config = - new Configuration(new File(event.getModConfigurationDirectory(), "GTplusplus/GTplusplus.cfg")); + final Configuration config = new Configuration( + new File(event.getModConfigurationDirectory(), "GTplusplus/GTplusplus.cfg")); config.load(); // BGM Watchdog diff --git a/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java b/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java index 90cf1b9e10..16095d00e4 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java +++ b/src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java @@ -1,5 +1,12 @@ package gtPlusPlus.preloader.asm; +import java.io.File; +import java.text.NumberFormat; +import java.util.Locale; +import java.util.Map; + +import net.minecraft.launchwrapper.Launch; + import cpw.mods.fml.relauncher.IFMLLoadingPlugin; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.MCVersion; import cpw.mods.fml.relauncher.IFMLLoadingPlugin.SortingIndex; @@ -7,11 +14,6 @@ import gtPlusPlus.core.util.reflect.ReflectionUtils; import gtPlusPlus.preloader.CORE_Preloader; import gtPlusPlus.preloader.Preloader_Logger; import gtPlusPlus.preloader.asm.transformers.Preloader_Transformer_Handler; -import java.io.File; -import java.text.NumberFormat; -import java.util.Locale; -import java.util.Map; -import net.minecraft.launchwrapper.Launch; @SortingIndex(10097) @MCVersion(value = "1.7.10") @@ -33,7 +35,7 @@ public class Preloader_FMLLoadingPlugin implements IFMLLoadingPlugin { @Override public String[] getASMTransformerClass() { // This will return the name of the class - return new String[] {Preloader_Transformer_Handler.class.getName()}; + return new String[] { Preloader_Transformer_Handler.class.getName() }; } @Override @@ -69,16 +71,24 @@ public class Preloader_FMLLoadingPlugin implements IFMLLoadingPlugin { } CORE_Preloader.DEV_ENVIRONMENT = (Boolean) Launch.blackboard.get("fml.deobfuscatedEnvironment"); CORE_Preloader.DEBUG_MODE = AsmConfig.debugMode; - Preloader_Logger.INFO("Running on " + gtPlusPlus.preloader.CORE_Preloader.JAVA_VERSION - + " | Development Environment: " + CORE_Preloader.DEV_ENVIRONMENT); + Preloader_Logger.INFO( + "Running on " + gtPlusPlus.preloader.CORE_Preloader.JAVA_VERSION + + " | Development Environment: " + + CORE_Preloader.DEV_ENVIRONMENT); // Preloader_Logger.INFO("Is Client? "+Utils.isClient()+" | Is Server? "+Utils.isServer()); Locale aDefaultLocale = Locale.getDefault(); NumberFormat aFormat = NumberFormat.getInstance(); - Locale aDisplayLocale = - ReflectionUtils.getFieldValue(ReflectionUtils.getField(Locale.class, "defaultDisplayLocale")); - Locale aFormatLocale = - ReflectionUtils.getFieldValue(ReflectionUtils.getField(Locale.class, "defaultFormatLocale")); - Preloader_Logger.INFO("Locale: " + aDefaultLocale + " | Test: " + aFormat.format(1000000000) + " | Display: " - + aDisplayLocale + " | Format: " + aFormatLocale); + Locale aDisplayLocale = ReflectionUtils + .getFieldValue(ReflectionUtils.getField(Locale.class, "defaultDisplayLocale")); + Locale aFormatLocale = ReflectionUtils + .getFieldValue(ReflectionUtils.getField(Locale.class, "defaultFormatLocale")); + Preloader_Logger.INFO( + "Locale: " + aDefaultLocale + + " | Test: " + + aFormat.format(1000000000) + + " | Display: " + + aDisplayLocale + + " | Format: " + + aFormatLocale); } } diff --git a/src/main/java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java b/src/main/java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java index d48e191054..28f28e783b 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java +++ b/src/main/java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java @@ -1,8 +1,9 @@ package gtPlusPlus.preloader.asm; +import java.util.Map; + import cpw.mods.fml.relauncher.IFMLCallHook; import gtPlusPlus.preloader.Preloader_Logger; -import java.util.Map; public class Preloader_SetupClass implements IFMLCallHook { 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<String, Integer>) ReflectionUtils.getField(OreDictionaryArbiter.class, "oreIDs") .get(null); - oreStacks = (TMap<Integer, ArrayList<ItemStack>>) - ReflectionUtils.getField(OreDictionaryArbiter.class, "oreStacks") - .get(null); - stackIDs = (TMap<ItemWrapper, ArrayList<Integer>>) - ReflectionUtils.getField(OreDictionaryArbiter.class, "stackIDs") - .get(null); - stackNames = (TMap<ItemWrapper, ArrayList<String>>) - ReflectionUtils.getField(OreDictionaryArbiter.class, "stackNames") - .get(null); + oreStacks = (TMap<Integer, ArrayList<ItemStack>>) ReflectionUtils + .getField(OreDictionaryArbiter.class, "oreStacks").get(null); + stackIDs = (TMap<ItemWrapper, ArrayList<Integer>>) ReflectionUtils + .getField(OreDictionaryArbiter.class, "stackIDs").get(null); + stackNames = (TMap<ItemWrapper, ArrayList<String>>) ReflectionUtils + .getField(OreDictionaryArbiter.class, "stackNames").get(null); } catch (Throwable t) { oreIDs = HashBiMap.create(); oreStacks = new THashMap<Integer, ArrayList<ItemStack>>(); 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", "<init>", "(III)V", false); + INVOKESPECIAL, + "micdoodle8/mods/galacticraft/api/vector/BlockVec3", + "<init>", + "(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; @@ -13,6 +14,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_IC2_GetHarvestTool { private final boolean isValid; @@ -72,8 +75,8 @@ public class ClassTransformer_IC2_GetHarvestTool { injectMethod(aName_damageDropped); } else if (aClassName.equals("ic2.core.block.generator.block.BlockGenerator") || aClassName.equals("ic2.core.block.machine.BlockMachine")) { - injectMethod(aName_damageDropped); - } + injectMethod(aName_damageDropped); + } } } @@ -119,7 +122,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); @@ -196,23 +203,23 @@ public class ClassTransformer_IC2_GetHarvestTool { } } 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); - } - } else { - if (name.equals("getHarvestTool")) { - methodVisitor = null; - } else { - methodVisitor = super.visitMethod(access, name, desc, signature, exceptions); - } - } + 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 { + methodVisitor = super.visitMethod(access, name, desc, signature, exceptions); + } + } if (methodVisitor == null) { - FMLRelaunchLog.log( - "[GT++ ASM] IC2 getHarvestTool Patch", Level.INFO, "Found method " + name + ", removing."); + FMLRelaunchLog + .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 d968d17ef5..3f6de75f9d 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 @@ -8,14 +8,13 @@ import static org.objectweb.asm.Opcodes.ASM5; import static org.objectweb.asm.Opcodes.ILOAD; import static org.objectweb.asm.Opcodes.INVOKESTATIC; -import cpw.mods.fml.relauncher.FMLRelaunchLog; -import gtPlusPlus.core.util.Utils; -import gtPlusPlus.core.util.reflect.ReflectionUtils; import java.lang.reflect.Field; import java.util.HashMap; + import net.minecraft.client.Minecraft; import net.minecraft.client.settings.GameSettings; import net.minecraft.client.settings.KeyBinding; + import org.apache.logging.log4j.Level; import org.objectweb.asm.ClassReader; import org.objectweb.asm.ClassVisitor; @@ -23,6 +22,10 @@ import org.objectweb.asm.ClassWriter; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; +import cpw.mods.fml.relauncher.FMLRelaunchLog; +import gtPlusPlus.core.util.Utils; +import gtPlusPlus.core.util.reflect.ReflectionUtils; + public class ClassTransformer_LWJGL_Keyboard { private final boolean isValid; @@ -35,8 +38,7 @@ public class ClassTransformer_LWJGL_Keyboard { * Gets a key's name * * @param key The key - * @return a String with the key's human readable name in it or null if the key - * is unnamed + * @return a String with the key's human readable name in it or null if the key is unnamed */ public static synchronized String getKeyName(int key) { if (init()) { @@ -115,8 +117,7 @@ public class ClassTransformer_LWJGL_Keyboard { String[] y = (String[]) o; return y; } - } catch (IllegalArgumentException | IllegalAccessException e) { - } + } catch (IllegalArgumentException | IllegalAccessException e) {} } return new String[] {}; } @@ -140,8 +141,8 @@ public class ClassTransformer_LWJGL_Keyboard { } else { isValid = false; } - FMLRelaunchLog.log( - "[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Valid? " + isValid + "."); + FMLRelaunchLog + .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Valid? " + isValid + "."); reader = aTempReader; writer = aTempWriter; } @@ -164,9 +165,15 @@ public class ClassTransformer_LWJGL_Keyboard { MethodVisitor mv; boolean didInject = false; FMLRelaunchLog.log( - "[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Injecting " + "getKeyName" + "."); + "[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); + ACC_PUBLIC + ACC_STATIC + ACC_SYNCHRONIZED, + "getKeyName", + "(I)Ljava/lang/String;", + null, + null); mv.visitCode(); Label l0 = new Label(); mv.visitLabel(l0); @@ -186,8 +193,8 @@ 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."); + FMLRelaunchLog + .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Method injection complete."); return didInject; } @@ -196,7 +203,9 @@ public class ClassTransformer_LWJGL_Keyboard { 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 + "."); + "[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(); @@ -216,8 +225,8 @@ public class ClassTransformer_LWJGL_Keyboard { mv.visitMaxs(1, 1); mv.visitEnd(); didInject = true; - FMLRelaunchLog.log( - "[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Method injection complete."); + FMLRelaunchLog + .log("[GT++ ASM] LWJGL Keybinding index out of bounds fix", Level.INFO, "Method injection complete."); return didInject; } @@ -228,7 +237,7 @@ public class ClassTransformer_LWJGL_Keyboard { this.cv = cv; } - private final String[] aMethodsToStrip = new String[] {"func_74298_c", "getKeyDisplayString"}; + private final String[] aMethodsToStrip = new String[] { "func_74298_c", "getKeyDisplayString" }; @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { @@ -268,7 +277,7 @@ public class ClassTransformer_LWJGL_Keyboard { this.cv = cv; } - private final String[] aMethodsToStrip = new String[] {"getKeyName"}; + private final String[] aMethodsToStrip = new String[] { "getKeyName" }; @Override public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) { 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 c73b97aa6d..cb88d7bc07 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 @@ -32,8 +32,6 @@ import static org.objectweb.asm.Opcodes.LDIV; import static org.objectweb.asm.Opcodes.LREM; import static org.objectweb.asm.Opcodes.NEW; -import cpw.mods.fml.relauncher.FMLRelaunchLog; -import gtPlusPlus.preloader.DevHelper; import org.apache.logging.log4j.Level; import org.objectweb.asm.AnnotationVisitor; import org.objectweb.asm.ClassReader; @@ -42,6 +40,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_TC_ItemWispEssence { private final boolean isValid; @@ -59,7 +60,7 @@ public class ClassTransformer_TC_ItemWispEssence { String aGetColour = obfuscated ? DevHelper.getSRG("getColorFromItemStack") : "getColorFromItemStack"; aTempReader = new ClassReader(basicClass); aTempWriter = new ClassWriter(aTempReader, ClassWriter.COMPUTE_FRAMES); - aTempReader.accept(new AddAdapter(aTempWriter, new String[] {"getAspects", aGetColour}), 0); + aTempReader.accept(new AddAdapter(aTempWriter, new String[] { "getAspects", aGetColour }), 0); injectMethod("getAspects", aTempWriter, obfuscated); injectMethod(aGetColour, aTempWriter, obfuscated); if (aTempReader != null && aTempWriter != null) { @@ -154,10 +155,10 @@ public class ClassTransformer_TC_ItemWispEssence { Label l8 = new Label(); mv.visitJumpInsn(GOTO, l8); mv.visitLabel(l7); - mv.visitFrame(F_APPEND, 1, new Object[] {"thaumcraft/api/aspects/AspectList"}, 0, null); + mv.visitFrame(F_APPEND, 1, new Object[] { "thaumcraft/api/aspects/AspectList" }, 0, null); mv.visitInsn(ACONST_NULL); mv.visitLabel(l8); - mv.visitFrame(F_SAME1, 0, null, 1, new Object[] {"thaumcraft/api/aspects/AspectList"}); + mv.visitFrame(F_SAME1, 0, null, 1, new Object[] { "thaumcraft/api/aspects/AspectList" }); mv.visitInsn(ARETURN); mv.visitLabel(l3); mv.visitLineNumber(149, l3); @@ -310,7 +311,9 @@ public class ClassTransformer_TC_ItemWispEssence { if (found) { FMLRelaunchLog.log( - "[GT++ ASM] Thaumcraft WispEssence_Patch", Level.INFO, "Found method " + name + ", removing."); + "[GT++ ASM] Thaumcraft WispEssence_Patch", + Level.INFO, + "Found method " + name + ", removing."); } return methodVisitor; } diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java index 676c072eb2..831da8f90d 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java @@ -2,16 +2,19 @@ package gtPlusPlus.preloader.asm.transformers; import static org.objectweb.asm.Opcodes.*; -import cpw.mods.fml.common.Loader; -import gtPlusPlus.core.util.reflect.ReflectionUtils; -import gtPlusPlus.preloader.Preloader_Logger; import java.lang.reflect.Field; import java.lang.reflect.Method; + import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; + import org.apache.logging.log4j.Level; import org.objectweb.asm.*; +import cpw.mods.fml.common.Loader; +import gtPlusPlus.core.util.reflect.ReflectionUtils; +import gtPlusPlus.preloader.Preloader_Logger; + public class ClassTransformer_TT_ThaumicRestorer { private final boolean isValid; @@ -44,15 +47,15 @@ public class ClassTransformer_TT_ThaumicRestorer { // thaumic.tinkerer.common.block.tile.TileRepairer private static final boolean isTConstructTool(ItemStack aStack) { - return ReflectionUtils.invoke(null, mIsTcTool, new Object[] {aStack}); + return ReflectionUtils.invoke(null, mIsTcTool, new Object[] { aStack }); } private static final int getDamage(ItemStack aStack) { - return (int) ReflectionUtils.invokeNonBool(null, mGetTcDamage, new Object[] {aStack}); + return (int) ReflectionUtils.invokeNonBool(null, mGetTcDamage, new Object[] { aStack }); } private static final boolean fixDamage(ItemStack aStack, int aAmount) { - return ReflectionUtils.invoke(null, mFixTcDamage, new Object[] {aStack, aAmount}); + return ReflectionUtils.invoke(null, mFixTcDamage, new Object[] { aStack, aAmount }); } private static final int drawEssentia(TileEntity aTile) { @@ -60,7 +63,7 @@ public class ClassTransformer_TT_ThaumicRestorer { } private static final void sparkle(float a, float b, float c, int d) { - ReflectionUtils.invokeVoid(ReflectionUtils.getFieldValue(mProxyTC), mSparkle, new Object[] {a, b, c, d}); + ReflectionUtils.invokeVoid(ReflectionUtils.getFieldValue(mProxyTC), mSparkle, new Object[] { a, b, c, d }); } public static void updateEntity(TileEntity aTile) { @@ -72,14 +75,14 @@ public class ClassTransformer_TT_ThaumicRestorer { mThaumicTinkerer = ReflectionUtils.getClass("thaumic.tinkerer.common.ThaumicTinkerer"); mTCProxy = ReflectionUtils.getClass("thaumcraft.common.CommonProxy"); // Set the methods we need - mIsTcTool = ReflectionUtils.getMethod( - mTinkersConstructCompat, "isTConstructTool", new Class[] {ItemStack.class}); - mGetTcDamage = - ReflectionUtils.getMethod(mTinkersConstructCompat, "getDamage", new Class[] {ItemStack.class}); - mFixTcDamage = ReflectionUtils.getMethod( - mTinkersConstructCompat, "fixDamage", new Class[] {ItemStack.class, int.class}); - mSparkle = ReflectionUtils.getMethod( - mTCProxy, "sparkle", new Class[] {float.class, float.class, float.class, int.class}); + mIsTcTool = ReflectionUtils + .getMethod(mTinkersConstructCompat, "isTConstructTool", new Class[] { ItemStack.class }); + mGetTcDamage = ReflectionUtils + .getMethod(mTinkersConstructCompat, "getDamage", new Class[] { ItemStack.class }); + mFixTcDamage = ReflectionUtils + .getMethod(mTinkersConstructCompat, "fixDamage", new Class[] { ItemStack.class, int.class }); + mSparkle = ReflectionUtils + .getMethod(mTCProxy, "sparkle", new Class[] { float.class, float.class, float.class, int.class }); mDrawEssentia = ReflectionUtils.getMethod(mTileRepairerClass, "drawEssentia", new Class[] {}); // Set the fields we need mRepairTiconTools = ReflectionUtils.getField(mTTConfigHandler, "repairTConTools"); @@ -101,8 +104,7 @@ public class ClassTransformer_TT_ThaumicRestorer { ReflectionUtils.setField(aTile, mTicksExisted, ticksExisted); boolean aDidRun = false; if (ticksExisted % 10 == 0) { - if (Loader.isModLoaded("TConstruct") - && repairTConTools + if (Loader.isModLoaded("TConstruct") && repairTConTools && inventorySlots[0] != null && isTConstructTool(inventorySlots[0])) { final int dmg = getDamage(inventorySlots[0]); @@ -126,8 +128,7 @@ public class ClassTransformer_TT_ThaumicRestorer { dmgLastTick = ((inventorySlots[0] == null) ? 0 : getDamage(inventorySlots[0])); aDidRun = true; } - if (inventorySlots[0] != null - && inventorySlots[0].getItemDamage() > 0 + if (inventorySlots[0] != null && inventorySlots[0].getItemDamage() > 0 && inventorySlots[0].getItem().isRepairable()) { final int essentia2 = drawEssentia(aTile); final int dmg2 = inventorySlots[0].getItemDamage(); @@ -273,7 +274,10 @@ public class ClassTransformer_TT_ThaumicRestorer { mv.visitLineNumber(61, l4); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";"); + GETFIELD, + "thaumic/tinkerer/common/block/tile/TileRepairer", + "inventorySlots", + "[L" + aItemStack + ";"); mv.visitInsn(ICONST_0); mv.visitInsn(AALOAD); mv.visitJumpInsn(IFNULL, l3); @@ -282,7 +286,10 @@ public class ClassTransformer_TT_ThaumicRestorer { mv.visitLineNumber(62, l5); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";"); + GETFIELD, + "thaumic/tinkerer/common/block/tile/TileRepairer", + "inventorySlots", + "[L" + aItemStack + ";"); mv.visitInsn(ICONST_0); mv.visitInsn(AALOAD); mv.visitMethodInsn( @@ -297,7 +304,10 @@ public class ClassTransformer_TT_ThaumicRestorer { mv.visitLineNumber(63, l6); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";"); + GETFIELD, + "thaumic/tinkerer/common/block/tile/TileRepairer", + "inventorySlots", + "[L" + aItemStack + ";"); mv.visitInsn(ICONST_0); mv.visitInsn(AALOAD); mv.visitMethodInsn( @@ -318,14 +328,21 @@ public class ClassTransformer_TT_ThaumicRestorer { mv.visitLineNumber(65, l9); mv.visitVarInsn(ALOAD, 0); mv.visitMethodInsn( - INVOKEVIRTUAL, "thaumic/tinkerer/common/block/tile/TileRepairer", "drawEssentia", "()I", false); + INVOKEVIRTUAL, + "thaumic/tinkerer/common/block/tile/TileRepairer", + "drawEssentia", + "()I", + false); mv.visitVarInsn(ISTORE, 2); Label l10 = new Label(); mv.visitLabel(l10); mv.visitLineNumber(66, l10); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";"); + GETFIELD, + "thaumic/tinkerer/common/block/tile/TileRepairer", + "inventorySlots", + "[L" + aItemStack + ";"); mv.visitInsn(ICONST_0); mv.visitInsn(AALOAD); mv.visitVarInsn(ILOAD, 2); @@ -356,7 +373,10 @@ public class ClassTransformer_TT_ThaumicRestorer { mv.visitLabel(l14); mv.visitLineNumber(69, l14); mv.visitFieldInsn( - GETSTATIC, "thaumic/tinkerer/common/ThaumicTinkerer", "tcProxy", "Lthaumcraft/common/CommonProxy;"); + GETSTATIC, + "thaumic/tinkerer/common/ThaumicTinkerer", + "tcProxy", + "Lthaumcraft/common/CommonProxy;"); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn(GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "xCoord", "I"); mv.visitInsn(I2D); @@ -401,7 +421,7 @@ public class ClassTransformer_TT_ThaumicRestorer { Label l17 = new Label(); mv.visitJumpInsn(GOTO, l17); mv.visitLabel(l13); - mv.visitFrame(Opcodes.F_APPEND, 2, new Object[] {Opcodes.INTEGER, Opcodes.INTEGER}, 0, null); + mv.visitFrame(Opcodes.F_APPEND, 2, new Object[] { Opcodes.INTEGER, Opcodes.INTEGER }, 0, null); mv.visitVarInsn(ALOAD, 0); mv.visitInsn(ICONST_0); mv.visitFieldInsn(PUTFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "tookLastTick", "Z"); @@ -420,7 +440,10 @@ public class ClassTransformer_TT_ThaumicRestorer { mv.visitVarInsn(ALOAD, 0); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";"); + GETFIELD, + "thaumic/tinkerer/common/block/tile/TileRepairer", + "inventorySlots", + "[L" + aItemStack + ";"); mv.visitInsn(ICONST_0); mv.visitInsn(AALOAD); Label l19 = new Label(); @@ -429,10 +452,13 @@ public class ClassTransformer_TT_ThaumicRestorer { Label l20 = new Label(); mv.visitJumpInsn(GOTO, l20); mv.visitLabel(l19); - mv.visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] {"thaumic/tinkerer/common/block/tile/TileRepairer"}); + mv.visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] { "thaumic/tinkerer/common/block/tile/TileRepairer" }); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";"); + GETFIELD, + "thaumic/tinkerer/common/block/tile/TileRepairer", + "inventorySlots", + "[L" + aItemStack + ";"); mv.visitInsn(ICONST_0); mv.visitInsn(AALOAD); mv.visitMethodInsn( @@ -445,9 +471,9 @@ public class ClassTransformer_TT_ThaumicRestorer { mv.visitFrame( Opcodes.F_FULL, 2, - new Object[] {"thaumic/tinkerer/common/block/tile/TileRepairer", Opcodes.INTEGER}, + new Object[] { "thaumic/tinkerer/common/block/tile/TileRepairer", Opcodes.INTEGER }, 2, - new Object[] {"thaumic/tinkerer/common/block/tile/TileRepairer", Opcodes.INTEGER}); + new Object[] { "thaumic/tinkerer/common/block/tile/TileRepairer", Opcodes.INTEGER }); mv.visitFieldInsn(PUTFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "dmgLastTick", "I"); Label l21 = new Label(); mv.visitLabel(l21); @@ -458,21 +484,30 @@ public class ClassTransformer_TT_ThaumicRestorer { mv.visitFrame(Opcodes.F_CHOP, 1, null, 0, null); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";"); + GETFIELD, + "thaumic/tinkerer/common/block/tile/TileRepairer", + "inventorySlots", + "[L" + aItemStack + ";"); mv.visitInsn(ICONST_0); mv.visitInsn(AALOAD); Label l22 = new Label(); mv.visitJumpInsn(IFNULL, l22); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";"); + GETFIELD, + "thaumic/tinkerer/common/block/tile/TileRepairer", + "inventorySlots", + "[L" + aItemStack + ";"); mv.visitInsn(ICONST_0); mv.visitInsn(AALOAD); mv.visitMethodInsn(INVOKEVIRTUAL, "" + aItemStack + "", "" + aGetItemDamage + "", "()I", false); mv.visitJumpInsn(IFLE, l22); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";"); + GETFIELD, + "thaumic/tinkerer/common/block/tile/TileRepairer", + "inventorySlots", + "[L" + aItemStack + ";"); mv.visitInsn(ICONST_0); mv.visitInsn(AALOAD); mv.visitMethodInsn(INVOKEVIRTUAL, "" + aItemStack + "", "" + aGetItem + "", "()L" + aItem + ";", false); @@ -483,14 +518,21 @@ public class ClassTransformer_TT_ThaumicRestorer { mv.visitLineNumber(79, l23); mv.visitVarInsn(ALOAD, 0); mv.visitMethodInsn( - INVOKEVIRTUAL, "thaumic/tinkerer/common/block/tile/TileRepairer", "drawEssentia", "()I", false); + INVOKEVIRTUAL, + "thaumic/tinkerer/common/block/tile/TileRepairer", + "drawEssentia", + "()I", + false); mv.visitVarInsn(ISTORE, 1); Label l24 = new Label(); mv.visitLabel(l24); mv.visitLineNumber(80, l24); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";"); + GETFIELD, + "thaumic/tinkerer/common/block/tile/TileRepairer", + "inventorySlots", + "[L" + aItemStack + ";"); mv.visitInsn(ICONST_0); mv.visitInsn(AALOAD); mv.visitMethodInsn(INVOKEVIRTUAL, "" + aItemStack + "", "" + aGetItemDamage + "", "()I", false); @@ -500,7 +542,10 @@ public class ClassTransformer_TT_ThaumicRestorer { mv.visitLineNumber(81, l25); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";"); + GETFIELD, + "thaumic/tinkerer/common/block/tile/TileRepairer", + "inventorySlots", + "[L" + aItemStack + ";"); mv.visitInsn(ICONST_0); mv.visitInsn(AALOAD); mv.visitInsn(ICONST_0); @@ -529,7 +574,10 @@ public class ClassTransformer_TT_ThaumicRestorer { mv.visitLabel(l29); mv.visitLineNumber(85, l29); mv.visitFieldInsn( - GETSTATIC, "thaumic/tinkerer/common/ThaumicTinkerer", "tcProxy", "Lthaumcraft/common/CommonProxy;"); + GETSTATIC, + "thaumic/tinkerer/common/ThaumicTinkerer", + "tcProxy", + "Lthaumcraft/common/CommonProxy;"); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn(GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "xCoord", "I"); mv.visitInsn(I2D); @@ -574,7 +622,7 @@ public class ClassTransformer_TT_ThaumicRestorer { Label l32 = new Label(); mv.visitJumpInsn(GOTO, l32); mv.visitLabel(l28); - mv.visitFrame(Opcodes.F_APPEND, 2, new Object[] {Opcodes.INTEGER, Opcodes.INTEGER}, 0, null); + mv.visitFrame(Opcodes.F_APPEND, 2, new Object[] { Opcodes.INTEGER, Opcodes.INTEGER }, 0, null); mv.visitVarInsn(ALOAD, 0); mv.visitInsn(ICONST_0); mv.visitFieldInsn(PUTFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "tookLastTick", "Z"); @@ -593,7 +641,10 @@ public class ClassTransformer_TT_ThaumicRestorer { mv.visitVarInsn(ALOAD, 0); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";"); + GETFIELD, + "thaumic/tinkerer/common/block/tile/TileRepairer", + "inventorySlots", + "[L" + aItemStack + ";"); mv.visitInsn(ICONST_0); mv.visitInsn(AALOAD); Label l34 = new Label(); @@ -602,18 +653,23 @@ public class ClassTransformer_TT_ThaumicRestorer { Label l35 = new Label(); mv.visitJumpInsn(GOTO, l35); mv.visitLabel(l34); - mv.visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] {"thaumic/tinkerer/common/block/tile/TileRepairer"}); + mv.visitFrame(Opcodes.F_SAME1, 0, null, 1, new Object[] { "thaumic/tinkerer/common/block/tile/TileRepairer" }); mv.visitVarInsn(ALOAD, 0); mv.visitFieldInsn( - GETFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "inventorySlots", "[L" + aItemStack + ";"); + GETFIELD, + "thaumic/tinkerer/common/block/tile/TileRepairer", + "inventorySlots", + "[L" + aItemStack + ";"); mv.visitInsn(ICONST_0); mv.visitInsn(AALOAD); mv.visitMethodInsn(INVOKEVIRTUAL, "" + aItemStack + "", "" + aGetItemDamage + "", "()I", false); mv.visitLabel(l35); mv.visitFrame( - Opcodes.F_FULL, 1, new Object[] {"thaumic/tinkerer/common/block/tile/TileRepairer"}, 2, new Object[] { - "thaumic/tinkerer/common/block/tile/TileRepairer", Opcodes.INTEGER - }); + Opcodes.F_FULL, + 1, + new Object[] { "thaumic/tinkerer/common/block/tile/TileRepairer" }, + 2, + new Object[] { "thaumic/tinkerer/common/block/tile/TileRepairer", Opcodes.INTEGER }); mv.visitFieldInsn(PUTFIELD, "thaumic/tinkerer/common/block/tile/TileRepairer", "dmgLastTick", "I"); mv.visitLabel(l1); mv.visitLineNumber(92, l1); @@ -643,7 +699,7 @@ public class ClassTransformer_TT_ThaumicRestorer { this.cv = cv; } - private final String[] aMethodsToStrip = new String[] {"updateEntity", "func_145845_h"}; + private final String[] aMethodsToStrip = new String[] { "updateEntity", "func_145845_h" }; public boolean isObfuscated = false; @Override @@ -668,8 +724,8 @@ public class ClassTransformer_TT_ThaumicRestorer { } if (found) { - Preloader_Logger.LOG( - "Thaumic Tinkerer RepairItem Patch", Level.INFO, "Found method " + name + ", removing."); + Preloader_Logger + .LOG("Thaumic Tinkerer RepairItem Patch", Level.INFO, "Found method " + name + ", removing."); } return methodVisitor; } diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java index 5148df0349..98a1ab48e4 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.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_TiConFluids { // Leftover Code, in case I ever want to inject interfaces. @@ -67,8 +68,12 @@ public class ClassTransformer_TiConFluids { FMLRelaunchLog.log( "[GT++ ASM] Bright Fluids", Level.INFO, - "Injecting " + methodName + " into " + className + ". [" - + (isObfuscated ? "Obfuscated" : "Unobfuscated") + "]"); + "Injecting " + methodName + + " into " + + className + + ". [" + + (isObfuscated ? "Obfuscated" : "Unobfuscated") + + "]"); // Account for Obfuscated constructor args. String IBlockAccessName = isObfuscated ? "ahl" : "net/minecraft/world/IBlockAccess"; String aConstructorTypes = "(L" + IBlockAccessName + ";III)I"; @@ -94,7 +99,7 @@ public class ClassTransformer_TiConFluids { mv.visitInsn(IRETURN); mv.visitLabel(l2); mv.visitLineNumber(21, l2); - mv.visitFrame(F_APPEND, 1, new Object[] {INTEGER}, 0, null); + mv.visitFrame(F_APPEND, 1, new Object[] { INTEGER }, 0, null); mv.visitVarInsn(ALOAD, 0); mv.visitVarInsn(ALOAD, 1); mv.visitVarInsn(ILOAD, 2); @@ -102,7 +107,11 @@ public class ClassTransformer_TiConFluids { mv.visitVarInsn(ILOAD, 4); // net.minecraftforge.fluids.BlockFluidClassic.getLightValue(IBlockAccess, int, int, int) mv.visitMethodInsn( - INVOKESPECIAL, "net/minecraftforge/fluids/BlockFluidClassic", methodName, aConstructorTypes, false); + INVOKESPECIAL, + "net/minecraftforge/fluids/BlockFluidClassic", + methodName, + aConstructorTypes, + false); mv.visitInsn(IRETURN); Label l4 = new Label(); mv.visitLabel(l4); @@ -134,7 +143,9 @@ public class ClassTransformer_TiConFluids { MethodVisitor methodVisitor = super.visitMethod(access, name, desc, signature, exceptions); if (name.equals(methodName) && desc.equals(aConstructorTypes)) { FMLRelaunchLog.log( - "[GT++ ASM] OreDictTransformer", Level.INFO, "Found target method. [" + mIsObfuscated + "]"); + "[GT++ ASM] OreDictTransformer", + Level.INFO, + "Found target method. [" + mIsObfuscated + "]"); return new localMethodVisitor(methodVisitor, mIsObfuscated); } 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 34425a49c3..ee82871d6a 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java @@ -6,12 +6,13 @@ import static org.objectweb.asm.Opcodes.IFEQ; import static org.objectweb.asm.Opcodes.INVOKESTATIC; import static org.objectweb.asm.Opcodes.RETURN; -import cpw.mods.fml.relauncher.FMLRelaunchLog; import org.apache.logging.log4j.Level; import org.objectweb.asm.ClassVisitor; import org.objectweb.asm.Label; import org.objectweb.asm.MethodVisitor; +import cpw.mods.fml.relauncher.FMLRelaunchLog; + public class Preloader_ClassTransformer { public static final class OreDictionaryVisitor extends ClassVisitor { @@ -46,13 +47,15 @@ public class Preloader_ClassTransformer { @Override public void visitCode() { FMLRelaunchLog.log( - "[GT++ ASM] OreDictTransformer", Level.INFO, "Fixing Forge's poor attempt at an oreDictionary."); + "[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]"); + FMLRelaunchLog + .log("[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Unobfuscated]"); super.visitMethodInsn( INVOKESTATIC, "gtPlusPlus/preloader/Preloader_GT_OreDict", @@ -60,8 +63,8 @@ public class Preloader_ClassTransformer { "(Ljava/lang/String;Lnet/minecraft/item/ItemStack;)Z", false); } else { - FMLRelaunchLog.log( - "[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Obfuscated]"); + FMLRelaunchLog + .log("[GT++ ASM] OreDictTransformer", Level.INFO, "Injecting target method. [Obfuscated]"); super.visitMethodInsn( INVOKESTATIC, "gtPlusPlus/preloader/Preloader_GT_OreDict", diff --git a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java index 3735f08860..7e5f4d3f6f 100644 --- a/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java +++ b/src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java @@ -4,12 +4,11 @@ public class Preloader_ClassTransformer2 { /** * - * So what I'd try is something like patch a new field into BaseMetaTileEntity to hold the ItemNBT, - * then patch GT_Block_Machines.breakBlock to store the ItemNBT into that field by calling setItemNBT, - * and then patch BaseMetaTileEntity.getDrops to retrieve that field instead of calling setItemNBT - * But there's probably a simpler solution if all you want to do is fix this - * for your super tanks rather than for all GT machines - * (which would only include saving the output count for chest buffers and item distributors...) + * So what I'd try is something like patch a new field into BaseMetaTileEntity to hold the ItemNBT, then patch + * GT_Block_Machines.breakBlock to store the ItemNBT into that field by calling setItemNBT, and then patch + * BaseMetaTileEntity.getDrops to retrieve that field instead of calling setItemNBT But there's probably a simpler + * solution if all you want to do is fix this for your super tanks rather than for all GT machines (which would only + * include saving the output count for chest buffers and item distributors...) * */ } 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 283bb47413..7ce78e16cc 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 @@ -2,6 +2,15 @@ package gtPlusPlus.preloader.asm.transformers; import static gtPlusPlus.preloader.asm.ClassesToTransform.*; +import java.io.File; +import java.io.IOException; + +import net.minecraft.launchwrapper.IClassTransformer; +import net.minecraft.launchwrapper.Launch; + +import org.objectweb.asm.ClassReader; +import org.objectweb.asm.ClassWriter; + import cpw.mods.fml.relauncher.CoreModManager; import cpw.mods.fml.relauncher.ReflectionHelper; import gtPlusPlus.api.objects.data.AutoMap; @@ -10,12 +19,6 @@ import gtPlusPlus.preloader.DevHelper; import gtPlusPlus.preloader.Preloader_Logger; import gtPlusPlus.preloader.asm.AsmConfig; import gtPlusPlus.preloader.asm.transformers.Preloader_ClassTransformer.OreDictionaryVisitor; -import java.io.File; -import java.io.IOException; -import net.minecraft.launchwrapper.IClassTransformer; -import net.minecraft.launchwrapper.Launch; -import org.objectweb.asm.ClassReader; -import org.objectweb.asm.ClassWriter; public class Preloader_Transformer_Handler implements IClassTransformer { @@ -24,8 +27,7 @@ public class Preloader_Transformer_Handler implements IClassTransformer { static { mConfig = new AsmConfig(new File("config/GTplusplus/asm.cfg")); - Preloader_Logger.INFO( - "Config Location: " + AsmConfig.config.getConfigFile().getAbsolutePath()); + Preloader_Logger.INFO("Config Location: " + AsmConfig.config.getConfigFile().getAbsolutePath()); Preloader_Logger.INFO("Is DevHelper Valid? " + DevHelper.mIsValidHelper); IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_BASE_TILE_ENTITY); IC2_WRENCH_PATCH_CLASS_NAMES.add(IC2_BLOCK_MACHINE1); @@ -79,28 +81,22 @@ public class Preloader_Transformer_Handler implements IClassTransformer { final boolean obfuscated = checkObfuscated(); // Fix LWJGL index array out of bounds on keybinding IDs - if ((transformedName.equals(LWJGL_KEYBOARD) - || transformedName.equals(MINECRAFT_GAMESETTINGS_OBF) - || transformedName.equals(MINECRAFT_GAMESETTINGS)) - && AsmConfig.enabledLwjglKeybindingFix - // Do not transform if using lwjgl3 + if ((transformedName.equals(LWJGL_KEYBOARD) || transformedName.equals(MINECRAFT_GAMESETTINGS_OBF) + || transformedName.equals(MINECRAFT_GAMESETTINGS)) && AsmConfig.enabledLwjglKeybindingFix + // Do not transform if using lwjgl3 && !ReflectionUtils.doesClassExist("org.lwjgl.system.Platform")) { boolean isClientSettingsClass = false; if (!transformedName.equals("org.lwjgl.input.Keyboard")) { isClientSettingsClass = true; } 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(); } // Enable mapping of Tickets and loaded chunks. - Forge if (transformedName.equals(FORGE_CHUNK_MANAGER) && AsmConfig.enableChunkDebugging) { Preloader_Logger.INFO("Chunkloading Patch", "Transforming " + transformedName); - return new ClassTransformer_Forge_ChunkLoading(basicClass, false) - .getWriter() - .toByteArray(); + return new ClassTransformer_Forge_ChunkLoading(basicClass, false).getWriter().toByteArray(); } // Fix the OreDictionary - Forge @@ -114,38 +110,28 @@ public class Preloader_Transformer_Handler implements IClassTransformer { // Fix the OreDictionary COFH if (transformedName.equals(COFH_ORE_DICTIONARY_ARBITER) && (AsmConfig.enableCofhPatch || !obfuscated)) { Preloader_Logger.INFO("COFH", "Transforming " + transformedName); - return new ClassTransformer_COFH_OreDictionaryArbiter(basicClass) - .getWriter() - .toByteArray(); + return new ClassTransformer_COFH_OreDictionaryArbiter(basicClass).getWriter().toByteArray(); } // Fix Tinkers Fluids if (transformedName.equals(TINKERS_FLUID_BLOCK) && AsmConfig.enableTiConFluidLighting) { Preloader_Logger.INFO("Bright Fluids", "Transforming " + transformedName); - return new ClassTransformer_TiConFluids("getLightValue", obfuscated, basicClass) - .getWriter() - .toByteArray(); + return new ClassTransformer_TiConFluids("getLightValue", obfuscated, basicClass).getWriter().toByteArray(); } // Fix GC stuff if (AsmConfig.enableGcFuelChanges) { if (transformedName.equals(GALACTICRAFT_FLUID_UTILS)) { Preloader_Logger.INFO("Galacticraft FluidUtils Patch", "Transforming " + transformedName); - return new ClassTransformer_GC_FluidUtil(basicClass, false) - .getWriter() - .toByteArray(); + return new ClassTransformer_GC_FluidUtil(basicClass, false).getWriter().toByteArray(); } if (transformedName.equals(GALACTICRAFT_TILE_ENTITY_FUEL_LOADER)) { Preloader_Logger.INFO("Galacticraft Fuel_Loader Patch", "Transforming " + transformedName); - return new ClassTransformer_GC_FuelLoader(basicClass, false) - .getWriter() - .toByteArray(); + return new ClassTransformer_GC_FuelLoader(basicClass, false).getWriter().toByteArray(); } if (transformedName.equals(GALACTICRAFT_ENTITY_AUTO_ROCKET)) { Preloader_Logger.INFO("Galacticraft EntityAutoRocket Patch", "Transforming " + transformedName); - return new ClassTransformer_GC_EntityAutoRocket(basicClass, false) - .getWriter() - .toByteArray(); + return new ClassTransformer_GC_EntityAutoRocket(basicClass, false).getWriter().toByteArray(); } } @@ -153,8 +139,7 @@ public class Preloader_Transformer_Handler implements IClassTransformer { for (String y : IC2_WRENCH_PATCH_CLASS_NAMES) { if (transformedName.equals(y)) { Preloader_Logger.INFO("IC2 getHarvestTool Patch", "Transforming " + transformedName); - return new ClassTransformer_IC2_GetHarvestTool(basicClass, obfuscated, transformedName) - .getWriter() + return new ClassTransformer_IC2_GetHarvestTool(basicClass, obfuscated, transformedName).getWriter() .toByteArray(); } } @@ -163,9 +148,7 @@ public class Preloader_Transformer_Handler implements IClassTransformer { // Patching ItemWispEssence to allow invalid item handling if (transformedName.equals(THAUMCRAFT_ITEM_WISP_ESSENCE) && AsmConfig.enableTcAspectSafety) { Preloader_Logger.INFO("Thaumcraft WispEssence_Patch", "Transforming " + transformedName); - return new ClassTransformer_TC_ItemWispEssence(basicClass, obfuscated) - .getWriter() - .toByteArray(); + return new ClassTransformer_TC_ItemWispEssence(basicClass, obfuscated).getWriter().toByteArray(); } return basicClass; |