just fix more bugs

just fix more bugs

1 files changed, 18 insertions, 21 deletions

diff --git a/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java b/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java
index 558b134ea9..35e608b0ca 100644
--- a/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java
+++ b/src/Java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java
@@ -3,31 +3,23 @@ package gtPlusPlus.xmod.thaumcraft;
 import java.util.Arrays;
 import java.util.List;
 
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-import gregtech.api.enums.GT_Values;
-import gregtech.api.interfaces.internal.IThaumcraftCompat;
-import gregtech.api.util.GT_Utility;
-
 import gtPlusPlus.api.objects.Logger;
 import gtPlusPlus.api.objects.data.AutoMap;
 import gtPlusPlus.api.objects.data.Pair;
 import gtPlusPlus.core.lib.LoadedMods;
 import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_Aspects.TC_AspectStack_Ex;
+import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectCompat;
+import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectStack;
 import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
+import net.minecraft.init.Items;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 
 public class HANDLER_Thaumcraft {	
 
-	public static IThaumcraftCompat sThaumcraftCompat;
+	public static GTPP_AspectCompat sThaumcraftCompat;
 	public static Item mResearchNotes;
-	public static final AutoMap<Pair<ItemStack, TC_AspectStack_Ex[]>> sItemsToGetAspects = new AutoMap<Pair<ItemStack, TC_AspectStack_Ex[]>>();
-
-	static {
-		sThaumcraftCompat = (IThaumcraftCompat) GT_Utility.callConstructor("gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectCompat", 0, null, GT_Values.D1, new Object[0]);
-	}
+	public static final AutoMap<Pair<ItemStack, GTPP_AspectStack[]>> sItemsToGetAspects = new AutoMap<Pair<ItemStack, GTPP_AspectStack[]>>();
 	
 	public static void preInit(){
 		if (LoadedMods.Thaumcraft){
@@ -37,10 +29,9 @@ public class HANDLER_Thaumcraft {
 	public static void init(){
 		if (LoadedMods.Thaumcraft){
 			try {
-				mResearchNotes = (Item) ReflectionUtils.getField(Class.forName("thaumcraft.common.config.ConfigItems"), "itemResearchNotes").get(null);
+				mResearchNotes = (Item) ReflectionUtils.getField(ReflectionUtils.getClass("thaumcraft.common.config.ConfigItems"), "itemResearchNotes").get(null);
 			}
-			catch (IllegalArgumentException | IllegalAccessException | NoSuchFieldException
-					| ClassNotFoundException e) {
+			catch (IllegalArgumentException | IllegalAccessException e) {
 				mResearchNotes = Items.paper;
 			}
 		}
@@ -48,10 +39,16 @@ public class HANDLER_Thaumcraft {
 
 	public static void postInit(){
 		if (LoadedMods.Thaumcraft){
-			if (!sItemsToGetAspects.isEmpty()) {
-				for (Pair<ItemStack, TC_AspectStack_Ex[]> j : sItemsToGetAspects) {
+			//Add Custom Aspects	
+			
+			
+			//sThaumcraftCompat = (IThaumcraftCompat) GT_Utility.callConstructor("gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectCompat", 0, null, GT_Values.D1, new Object[0]);
+			sThaumcraftCompat = new GTPP_AspectCompat();	
+			
+			if (!sItemsToGetAspects.isEmpty() && false) {
+				for (Pair<ItemStack, GTPP_AspectStack[]> j : sItemsToGetAspects) {
 					if (j .getKey() != null && (j.getValue() != null && j.getValue().length > 0)) {
-						List<TC_AspectStack_Ex> list = Arrays.asList(j.getValue());
+						List<GTPP_AspectStack> list = Arrays.asList(j.getValue());
 						if (ThaumcraftUtils.registerThaumcraftAspectsToItem(j.getKey(), list, true)) {
 							Logger.WARNING("[Aspect] Successfully added Aspects to "+j.getKey().getDisplayName()+".");
 						}