+ Added config for the Large Extruder.

+ Added config for machine component assemblers.
+ Added recipes for Large Extruder and its casings.
% Changed default config value for custom circuits. It was true, now it is false.
$ Tweaked ASM class handling when conditions are not met.

2 files changed, 17 insertions, 5 deletions

diff --git a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
index e03e955336..f146b39eb7 100644
--- a/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
+++ b/src/Java/gtPlusPlus/preloader/Preloader_GT_OreDict.java
@@ -11,6 +11,11 @@ import net.minecraft.item.ItemStack;
 public class Preloader_GT_OreDict {
 
 	public static boolean shouldPreventRegistration(final String string, final ItemStack bannedItem) {
+		
+		if (bannedItem == null || (!CORE_Preloader.enableOldGTcircuits && !LoadedMods.Mekanism)) {
+			return false;
+		}
+		
 		try {
 			if (CORE_Preloader.enableOldGTcircuits){
 				if ((bannedItem != null) && ItemUtils.getModId(bannedItem).toLowerCase().equals("gregtech")){
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 9163b54709..3f65e5d102 100644
--- a/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
+++ b/src/Java/gtPlusPlus/preloader/asm/transformers/Preloader_Transformer_Handler.java
@@ -4,7 +4,10 @@ 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;
@@ -14,12 +17,16 @@ public class Preloader_Transformer_Handler implements IClassTransformer {
 	private final boolean mEnabled = false;
 
 	public byte[] transform(String name, String transformedName, byte[] basicClass) {
-		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 (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 (mEnabled) {
 			if(transformedName.equals("gregtech.api.metatileentity.BaseMetaTileEntity")) {
 				FMLRelaunchLog.log("[GT++ ASM] NBTFixer", Level.INFO, "Transforming %s", transformedName);