$ Fixed weird loop lag from Itemutils.getItemStackOfAmountFromOreDict().

$ Fixed ASM circular loading issue.

3 files changed, 10 insertions, 15 deletions

diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java
index 535d1f778b..4b7ac94884 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer.java
@@ -15,7 +15,7 @@ import net.minecraftforge.common.config.Configuration;
 
 public class Preloader_ClassTransformer {
 
-	public boolean getConfig(){
+	public static boolean getConfig(){
 		final Configuration config = new Configuration(	new File(Utils.getMcDir(), "config/GTplusplus/GTplusplus.cfg"));
 		if (config != null){		
 			config.load();
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java
index 465d845c63..1763be7330 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_ClassTransformer2.java
@@ -29,7 +29,6 @@ import net.minecraft.block.BlockContainer;
 import net.minecraft.entity.Entity;
 import net.minecraft.entity.item.EntityItem;
 import net.minecraft.init.Blocks;
-import net.minecraft.init.Items;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
diff --git a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
index 3f65e5d102..6b10a056b8 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
@@ -4,10 +4,7 @@ import org.apache.logging.log4j.Level;
 import org.objectweb.asm.ClassReader;
 import org.objectweb.asm.ClassWriter;
 
-import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.relauncher.FMLRelaunchLog;
-import gtPlusPlus.core.lib.LoadedMods;
-import gtPlusPlus.preloader.CORE_Preloader;
 import gtPlusPlus.preloader.asm.transformers.Preloader_ClassTransformer.OreDictionaryVisitor;
 import gtPlusPlus.preloader.asm.transformers.Preloader_ClassTransformer2.GT_MetaTile_Visitor;
 import net.minecraft.launchwrapper.IClassTransformer;
@@ -17,16 +14,15 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
 	private final boolean mEnabled = false;
 
 	public byte[] transform(String name, String transformedName, byte[] basicClass) {
-		
-		if (CORE_Preloader.enableOldGTcircuits || Loader.isModLoaded("Mekanism")){
-			if(transformedName.equals("net.minecraftforge.oredict.OreDictionary")) {
-				FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Transforming %s", transformedName);
-				ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
-				new ClassReader(basicClass).accept(new OreDictionaryVisitor(classWriter), 0);
-				return classWriter.toByteArray();
-			}
-		}
-		
+
+
+		if(transformedName.equals("net.minecraftforge.oredict.OreDictionary")) {
+			FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Transforming %s", transformedName);
+			ClassWriter classWriter = new ClassWriter(ClassWriter.COMPUTE_FRAMES);
+			new ClassReader(basicClass).accept(new OreDictionaryVisitor(classWriter), 0);
+			return classWriter.toByteArray();
+		}		
+
 		if (mEnabled) {
 			if(transformedName.equals("gregtech.api.metatileentity.BaseMetaTileEntity")) {
 				FMLRelaunchLog.log("[GT++ ASM] NBTFixer", Level.INFO, "Transforming %s", transformedName);