$ Fixed Core Mod Not loading outside of Dev. environment.

$ Fixed a spelling mistake in the circuit components to hide list.
^ Version Bump.

6 files changed, 29 insertions, 14 deletions

diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java
index 384c051ce3..d8b1159539 100644
--- a/src/Java/gtPlusPlus/core/lib/CORE.java
+++ b/src/Java/gtPlusPlus/core/lib/CORE.java
@@ -34,7 +34,7 @@ public class CORE {
 
 	public static final String name = "GT++";
 	public static final String MODID = "miscutils";
-	public static final String VERSION = "1.6.07-release";
+	public static final String VERSION = "1.6.09-release";
 	public static String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase();
 	public static String USER_COUNTRY = GeoUtils.determineUsersCountry();
 	public static boolean isModUpToDate = Utils.isModUpToDate();
diff --git a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
index 1a5d3eea25..960506cbc3 100644
--- a/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
+++ b/src/Java/gtPlusPlus/core/recipe/RECIPES_Old_Circuits.java
@@ -214,17 +214,21 @@ public class RECIPES_Old_Circuits  implements IOreRecipeRegistrator {
 					"Circuit_Wetwarecomputer", 
 					"Circuit_Wetwaresupercomputer", 
 					"Circuit_Wetwaremainframe", 
-					"Circuit_Parts_RawCrystalChip,",
+					"Circuit_Parts_RawCrystalChip",
 					//Circuits Additions in .30/.31
 					"Circuit_Board_Plastic",
 					"Circuit_Parts_GlassFiber",
 					"Circuit_Parts_PetriDish",
-					"Circuit_Microprocessor"
-					
+					"Circuit_Microprocessor"					
 			};
 
 			for (String component : CircuitToHide){
+				try {
 				API.hideItem(ItemList.valueOf(component).get(1L, new Object[0]));
+				} catch (IllegalArgumentException I){
+					Utils.LOG_INFO("Could not find "+component+" in the Gregtech item list.");
+					Utils.LOG_INFO("This is NOT an error, simply a notification.");
+				}
 			}			
 		}
 		return true;
diff --git a/src/Java/gtPlusPlus/preloader/CORE_Preloader.java b/src/Java/gtPlusPlus/preloader/CORE_Preloader.java
index c6d09acbb7..09ce810ccd 100644
--- a/src/Java/gtPlusPlus/preloader/CORE_Preloader.java
+++ b/src/Java/gtPlusPlus/preloader/CORE_Preloader.java
@@ -1,16 +1,13 @@
 package gtPlusPlus.preloader;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
-import cpw.mods.fml.common.versioning.ArtifactVersion;
-import scala.actors.threadpool.Arrays;
-
 public class CORE_Preloader {
 	public static final String NAME = "GT++ Preloader";
 	public static final String MODID = "GT++_Preloader";
-	public static final String VERSION = "0.1-Alpha";
+	public static final String VERSION = "0.3-Alpha";
 	public static boolean enableOldGTcircuits = false;
-	@SuppressWarnings("unchecked")
-	public static List<ArtifactVersion> DEPENDENCIES = new ArrayList<>(Arrays.asList(new String[] {"required-before:gregtech;"}));
+	public static List<?> DEPENDENCIES = new ArrayList<>(Arrays.asList(new String[] {"required-before:gregtech;"}));
 }
diff --git a/src/Java/gtPlusPlus/preloader/asm/Preloader_ClassTransformer.java b/src/Java/gtPlusPlus/preloader/asm/Preloader_ClassTransformer.java
index e3a022dd6a..f9b1a07269 100644
--- a/src/Java/gtPlusPlus/preloader/asm/Preloader_ClassTransformer.java
+++ b/src/Java/gtPlusPlus/preloader/asm/Preloader_ClassTransformer.java
@@ -13,7 +13,7 @@ public class Preloader_ClassTransformer implements IClassTransformer {
 	@Override
     public byte[] transform(String name, String transformedName, byte[] basicClass) {
         if(transformedName.equals("net.minecraftforge.oredict.OreDictionary")) {
-            FMLRelaunchLog.log("[GT++] OreDictTransformer", Level.INFO, "Transforming %s", transformedName);
+            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();
@@ -31,9 +31,20 @@ private static final class OreDictionaryVisitor extends ClassVisitor {
         public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions) {
             MethodVisitor methodVisitor = super.visitMethod(access, name, desc, signature, exceptions);
             if(name.equals("registerOreImpl") && desc.equals("(Ljava/lang/String;Lnet/minecraft/item/ItemStack;)V")) {
-                FMLRelaunchLog.log("[GT++] OreDictTransformer", Level.INFO, "Found target method.");
+                FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Found target method.");
                 return new RegisterOreImplVisitor(methodVisitor);
             }
+            else if(name.equals("registerOreImpl") && desc.equals("(Ljava/lang/String;Ladd;)V")) {
+                FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Found target method. [Obfuscated]");
+                return new RegisterOreImplVisitor(methodVisitor);
+            }
+            else {
+            	//FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Dd not find target method.");
+            	//FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Found: "+name);
+            	//FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, ""+desc);
+            	//FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, ""+signature);
+            	//FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, ""+exceptions);
+            }
             return methodVisitor;
         }
         
@@ -48,6 +59,7 @@ private static final class OreDictionaryVisitor extends ClassVisitor {
         @SuppressWarnings("deprecation")
 		@Override
         public void visitCode() {
+        	FMLRelaunchLog.log("[GT++ ASM] OreDictTransformer", Level.INFO, "Fixing Forge's poor attempt at an oreDictionary.");
             super.visitCode();
             super.visitVarInsn(ALOAD, 0);
             super.visitVarInsn(ALOAD, 1);
diff --git a/src/Java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java b/src/Java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java
index 6aa78ec858..a54abab9cf 100644
--- a/src/Java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java
+++ b/src/Java/gtPlusPlus/preloader/asm/Preloader_DummyContainer.java
@@ -2,6 +2,7 @@ package gtPlusPlus.preloader.asm;
 
 import java.io.File;
 import java.util.Arrays;
+import java.util.List;
 
 import com.google.common.eventbus.EventBus;
 import com.google.common.eventbus.Subscribe;
@@ -9,6 +10,7 @@ import com.google.common.eventbus.Subscribe;
 import cpw.mods.fml.common.*;
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.event.*;
+import cpw.mods.fml.common.versioning.ArtifactVersion;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.preloader.CORE_Preloader;
 import net.minecraftforge.common.config.Configuration;
@@ -29,7 +31,7 @@ public class Preloader_DummyContainer extends DummyModContainer {
 		meta.updateUrl = "";
 		meta.screenshots = new String[0];
 		meta.logoFile = "";
-		meta.dependencies = CORE_Preloader.DEPENDENCIES;
+		meta.dependencies = (List<ArtifactVersion>) CORE_Preloader.DEPENDENCIES;
 
 	}
 	
diff --git a/src/resources/mcmod.info b/src/resources/mcmod.info
index 92c69a2bb5..8313737b3d 100644
--- a/src/resources/mcmod.info
+++ b/src/resources/mcmod.info
@@ -5,7 +5,7 @@
   "description": "Adds a few various Multiblocks, Machines, etc to Gregtech and a plethora of other mods (Nearly 30!)",
   "credits": "",
   "logoFile": "",
-  "version": "1.6.07-release",
+  "version": "1.6.09-release",
   "mcversion": "1.7.10",
   "url": "https://github.com/draknyte1/GTplusplus/wiki",
   "updateUrl": "https://github.com/draknyte1/GTplusplus/releases/latest",