aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gtPlusPlus/preloader/asm
diff options
context:
space:
mode:
authorJason Mitchell <mitchej@gmail.com>2023-01-28 19:32:44 -0800
committerJason Mitchell <mitchej@gmail.com>2023-01-28 19:32:44 -0800
commit55f64675b42ac8d3c557cc850f78664bee006f6f (patch)
tree2afd26dd3d5e6f763119bc192b57c66a1a075922 /src/main/java/gtPlusPlus/preloader/asm
parent0f5dfd01b877b6a1019e0671b88d07974aae68c0 (diff)
downloadGT5-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')
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/AsmConfig.java14
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/ClassesToTransform.java27
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java13
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/Preloader_FMLLoadingPlugin.java38
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/Preloader_SetupClass.java3
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_COFH_OreDictionaryArbiter.java55
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_Forge_ChunkLoading.java165
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_EntityAutoRocket.java164
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FluidUtil.java41
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_GC_FuelLoader.java164
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_IC2_GetHarvestTool.java47
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_LWJGL_Keyboard.java45
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TC_ItemWispEssence.java15
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TT_ThaumicRestorer.java152
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/ClassTransformer_TiConFluids.java25
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java15
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java11
-rw-r--r--src/main/java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java61
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"