Remove unused Thaumcraft compat

20 files changed, 0 insertions, 1721 deletions

diff --git a/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
index f511e3e6ae..0593c833f3 100644
--- a/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
+++ b/src/main/java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
@@ -12,7 +12,6 @@ import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 import gtPlusPlus.xmod.ic2.HANDLER_IC2;
 import gtPlusPlus.xmod.ob.HANDLER_OpenBlocks;
 import gtPlusPlus.xmod.railcraft.HANDLER_Railcraft;
-import gtPlusPlus.xmod.thaumcraft.HANDLER_Thaumcraft;
 import gtPlusPlus.xmod.thermalfoundation.HANDLER_TF;
 import gtPlusPlus.xmod.tinkers.HANDLER_Tinkers;
 
@@ -31,7 +30,6 @@ public class COMPAT_IntermodStaging {
     public static void init(FMLInitializationEvent init) {
         HANDLER_GT.init();
         HANDLER_TF.init();
-        HANDLER_Thaumcraft.init();
         HANDLER_OpenBlocks.init();
     }
 
diff --git a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
index b54811947f..485e508805 100644
--- a/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
+++ b/src/main/java/gtPlusPlus/core/item/base/BaseItemComponent.java
@@ -2,7 +2,6 @@ package gtPlusPlus.core.item.base;
 
 import static gregtech.api.enums.Mods.GTPlusPlus;
 import static gregtech.api.enums.Mods.GregTech;
-import static gregtech.api.enums.Mods.Thaumcraft;
 
 import java.awt.Color;
 import java.util.HashMap;
@@ -78,14 +77,6 @@ public class BaseItemComponent extends Item {
         if (componentType == ComponentTypes.GEAR) {
             GT_OreDictUnificator.registerOre("gear" + material.getUnlocalizedName(), ItemUtils.getSimpleStack(this));
         }
-        if (Thaumcraft.isModLoaded()) {
-            // ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this),
-            // TC_Aspect_Wrapper.generate(TC_Aspects.METALLUM.mAspect), 1);
-            if (componentMaterial.isRadioactive) {
-                // ThaumcraftUtils.addAspectToItem(ItemUtils.getSimpleStack(this),
-                // TC_Aspect_Wrapper.generate(TC_Aspects.RADIO.mAspect), componentMaterial.vRadiationLevel);
-            }
-        }
         registerComponent();
 
         GT_LanguageManager.addStringLocalization("gtplusplus.item." + unlocalName + ".name", getFormattedLangName());
diff --git a/src/main/java/gtPlusPlus/core/material/Material.java b/src/main/java/gtPlusPlus/core/material/Material.java
index 8068d6ab35..fe1dcd618d 100644
--- a/src/main/java/gtPlusPlus/core/material/Material.java
+++ b/src/main/java/gtPlusPlus/core/material/Material.java
@@ -32,7 +32,6 @@ import gtPlusPlus.core.util.math.MathUtils;
 import gtPlusPlus.core.util.minecraft.FluidUtils;
 import gtPlusPlus.core.util.minecraft.ItemUtils;
 import gtPlusPlus.core.util.minecraft.MaterialUtils;
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
 import gtPlusPlus.xmod.tinkers.material.BaseTinkersMaterial;
 
 public class Material {
@@ -85,8 +84,6 @@ public class Material {
     public int vToolQuality;
     public int vHarvestLevel;
 
-    private TC_Aspect_Wrapper[] vAspects;
-
     public BaseTinkersMaterial vTiConHandler;
 
     public short werkstoffID;
@@ -531,8 +528,6 @@ public class Material {
                 this.vNeutrons = this.calculateNeutrons();
             }
 
-            this.vAspects = null;
-
             this.vMass = this.getMass();
 
             // Sets tool Durability
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java
deleted file mode 100644
index 0bca8535fe..0000000000
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/HANDLER_Thaumcraft.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package gtPlusPlus.xmod.thaumcraft;
-
-import static gregtech.api.enums.Mods.Thaumcraft;
-
-import net.minecraft.init.Items;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-
-import gtPlusPlus.api.objects.data.AutoMap;
-import gtPlusPlus.api.objects.data.Pair;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectCompat;
-import gtPlusPlus.xmod.thaumcraft.aspect.GTPP_AspectStack;
-
-public class HANDLER_Thaumcraft {
-
-    public static GTPP_AspectCompat sThaumcraftCompat;
-    public static Item mResearchNotes;
-    public static final AutoMap<Pair<ItemStack, GTPP_AspectStack[]>> sItemsToGetAspects = new AutoMap<Pair<ItemStack, GTPP_AspectStack[]>>();
-
-    public static void init() {
-        if (Thaumcraft.isModLoaded()) {
-            try {
-                mResearchNotes = (Item) ReflectionUtils
-                        .getField(ReflectionUtils.getClass("thaumcraft.common.config.ConfigItems"), "itemResearchNotes")
-                        .get(null);
-            } catch (IllegalArgumentException | IllegalAccessException e) {
-                mResearchNotes = Items.paper;
-            }
-        }
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
deleted file mode 100644
index feda254313..0000000000
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectCompat.java
+++ /dev/null
@@ -1,147 +0,0 @@
-package gtPlusPlus.xmod.thaumcraft.aspect;
-
-import static gregtech.api.enums.Mods.GTPlusPlus;
-
-import java.lang.reflect.InvocationTargetException;
-import java.lang.reflect.Method;
-import java.util.HashMap;
-import java.util.LinkedHashMap;
-import java.util.List;
-
-import net.minecraft.util.ResourceLocation;
-
-import gregtech.api.enums.TC_Aspects;
-import gregtech.common.GT_ThaumcraftCompat;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.Utils;
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper;
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
-
-public class GTPP_AspectCompat {
-
-    public static volatile Method m = null;
-
-    private static HashMap<String, TC_Aspect_Wrapper> mAspectCache = new LinkedHashMap<String, TC_Aspect_Wrapper>();
-
-    public static TC_Aspect_Wrapper ASPECT_BALANCE;
-    public static TC_Aspect_Wrapper ASPECT_LUST;
-    public static TC_Aspect_Wrapper ASPECT_STARBOUND;
-    public static TC_Aspect_Wrapper ASPECT_TOXIC;
-    public static TC_Aspect_Wrapper ASPECT_HEAVEN;
-
-    /*
-     * TC_Aspects.AER.mAspect = Aspect.AIR; TC_Aspects.ALIENIS.mAspect = Aspect.ELDRITCH; TC_Aspects.AQUA.mAspect =
-     * Aspect.WATER; TC_Aspects.ARBOR.mAspect = Aspect.TREE; TC_Aspects.AURAM.mAspect = Aspect.AURA;
-     * TC_Aspects.BESTIA.mAspect = Aspect.BEAST; TC_Aspects.COGNITIO.mAspect = Aspect.MIND; TC_Aspects.CORPUS.mAspect =
-     * Aspect.FLESH; TC_Aspects.EXANIMIS.mAspect = Aspect.UNDEAD; TC_Aspects.FABRICO.mAspect = Aspect.CRAFT;
-     * TC_Aspects.FAMES.mAspect = Aspect.HUNGER; TC_Aspects.GELUM.mAspect = Aspect.COLD; TC_Aspects.GRANUM.mAspect =
-     * Aspect.PLANT; TC_Aspects.HERBA.mAspect = Aspect.PLANT; TC_Aspects.HUMANUS.mAspect = Aspect.MAN;
-     * TC_Aspects.IGNIS.mAspect = Aspect.FIRE; TC_Aspects.INSTRUMENTUM.mAspect = Aspect.TOOL; TC_Aspects.ITER.mAspect =
-     * Aspect.TRAVEL; TC_Aspects.LIMUS.mAspect = Aspect.SLIME; TC_Aspects.LUCRUM.mAspect = Aspect.GREED;
-     * TC_Aspects.LUX.mAspect = Aspect.LIGHT; TC_Aspects.MACHINA.mAspect = Aspect.MECHANISM; TC_Aspects.MESSIS.mAspect =
-     * Aspect.CROP; TC_Aspects.METALLUM.mAspect = Aspect.METAL; TC_Aspects.METO.mAspect = Aspect.HARVEST;
-     * TC_Aspects.MORTUUS.mAspect = Aspect.DEATH; TC_Aspects.MOTUS.mAspect = Aspect.MOTION; TC_Aspects.ORDO.mAspect =
-     * Aspect.ORDER; TC_Aspects.PANNUS.mAspect = Aspect.CLOTH; TC_Aspects.PERDITIO.mAspect = Aspect.ENTROPY;
-     * TC_Aspects.PERFODIO.mAspect = Aspect.MINE; TC_Aspects.PERMUTATIO.mAspect = Aspect.EXCHANGE;
-     * TC_Aspects.POTENTIA.mAspect = Aspect.ENERGY; TC_Aspects.PRAECANTATIO.mAspect = Aspect.MAGIC;
-     * TC_Aspects.SANO.mAspect = Aspect.HEAL; TC_Aspects.SENSUS.mAspect = Aspect.SENSES; TC_Aspects.SPIRITUS.mAspect =
-     * Aspect.SOUL; TC_Aspects.TELUM.mAspect = Aspect.WEAPON; TC_Aspects.TERRA.mAspect = Aspect.EARTH;
-     * TC_Aspects.TEMPESTAS.mAspect = Aspect.WEATHER; TC_Aspects.TENEBRAE.mAspect = Aspect.DARKNESS;
-     * TC_Aspects.TUTAMEN.mAspect = Aspect.ARMOR; TC_Aspects.VACUOS.mAspect = Aspect.VOID; TC_Aspects.VENENUM.mAspect =
-     * Aspect.POISON; TC_Aspects.VICTUS.mAspect = Aspect.LIFE; TC_Aspects.VINCULUM.mAspect = Aspect.TRAP;
-     * TC_Aspects.VITIUM.mAspect = Aspect.TAINT; TC_Aspects.VITREUS.mAspect = Aspect.CRYSTAL; TC_Aspects.VOLATUS.mAspect
-     * = Aspect.FLIGHT;
-     */
-
-    public GTPP_AspectCompat() {
-
-        // Generate all existing Aspects as TC_Aspects
-        LinkedHashMap<String, Object> h = TC_Aspect_Wrapper.getVanillaAspectList();
-        for (String g : h.keySet()) {
-            Object aBaseAspect = h.get(g);
-            if (aBaseAspect != null && TC_Aspect_Wrapper.isObjectAnAspect(aBaseAspect)) {
-                TC_Aspect_Wrapper aS = TC_Aspect_Wrapper.getAspect(g);
-                if (aS != null) {
-                    mAspectCache.put(g, aS);
-                    continue;
-                }
-            }
-        }
-
-        // Custom Aspects
-        ASPECT_BALANCE = new TC_Aspect_Wrapper(
-                "Sagrausten",
-                Utils.rgbtoHexValue(125, 125, 125),
-                new TC_Aspect_Wrapper[] { ASPECT_STARBOUND, get(TC_Aspects.RADIO) },
-                new ResourceLocation(GTPlusPlus.ID + ":textures/aspects/" + "Sagrausten.png"),
-                false,
-                1,
-                "Ancient Knowledge");
-
-        ASPECT_LUST = new TC_Aspect_Wrapper(
-                "Slusium",
-                Utils.rgbtoHexValue(175, 125, 25),
-                new TC_Aspect_Wrapper[] { ASPECT_BALANCE, get(TC_Aspects.NEBRISUM) },
-                new ResourceLocation(GTPlusPlus.ID + ":textures/aspects/" + "Slusium.png"),
-                false,
-                1,
-                "Warped Thoughts");
-
-        ASPECT_STARBOUND = new TC_Aspect_Wrapper(
-                "Xenil",
-                Utils.rgbtoHexValue(25, 25, 25),
-                new TC_Aspect_Wrapper[] { get(TC_Aspects.MAGNETO), get(TC_Aspects.RADIO) },
-                new ResourceLocation(GTPlusPlus.ID + ":textures/aspects/" + "Xenil.png"),
-                false,
-                1,
-                "A beginning to something new");
-
-        ASPECT_TOXIC = new TC_Aspect_Wrapper(
-                "Xablum",
-                Utils.rgbtoHexValue(25, 185, 25),
-                new TC_Aspect_Wrapper[] { ASPECT_STARBOUND, ASPECT_LUST },
-                new ResourceLocation(GTPlusPlus.ID + ":textures/aspects/" + "Xablum.png"),
-                false,
-                1,
-                "Insanity");
-
-        ASPECT_HEAVEN = new TC_Aspect_Wrapper(
-                "Zetralt",
-                Utils.rgbtoHexValue(225, 225, 225),
-                new TC_Aspect_Wrapper[] { get(TC_Aspects.AURAM), ASPECT_TOXIC },
-                new ResourceLocation(GTPlusPlus.ID + ":textures/aspects/" + "Zetralt.png"),
-                false,
-                1,
-                "Control, Respect, Glory");
-    }
-
-    private TC_Aspect_Wrapper get(TC_Aspects aGtObjects) {
-        try {
-            return TC_Aspect_Wrapper.generate(aGtObjects.mAspect);
-        } catch (IllegalArgumentException e) {
-            e.printStackTrace();
-            return null;
-        }
-    }
-
-    public static final synchronized TC_AspectList_Wrapper getTC_AspectList_Wrapper(
-            final List<GTPP_AspectStack> aAspects) {
-        TC_AspectList_Wrapper o = null;
-        try {
-            if (m == null || (m != null && !m.isAccessible())) {
-                m = GT_ThaumcraftCompat.class.getDeclaredMethod("getTC_AspectList_Wrapper", List.class);
-                m.setAccessible(true);
-            }
-            if (m != null) {
-                o = (TC_AspectList_Wrapper) m.invoke(null, aAspects);
-            }
-        } catch (NoSuchMethodException | SecurityException | IllegalAccessException | IllegalArgumentException
-                | InvocationTargetException e) {
-            e.printStackTrace();
-        }
-        if (o == null) {
-            Logger.REFLECTION("[Aspect] Did not retrieve valid aspect list from reflective invocation.");
-        }
-        return o;
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectStack.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectStack.java
deleted file mode 100644
index e48bd64e53..0000000000
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/aspect/GTPP_AspectStack.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package gtPlusPlus.xmod.thaumcraft.aspect;
-
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
-
-public class GTPP_AspectStack {
-
-    public final TC_Aspect_Wrapper mAspect;
-    public final int mAmount;
-
-    public GTPP_AspectStack(TC_Aspect_Wrapper aAspect, int aAmount) {
-        mAspect = aAspect;
-        mAmount = aAmount;
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_AspectList_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_AspectList_Wrapper.java
deleted file mode 100644
index 346d0d3c8b..0000000000
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_AspectList_Wrapper.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect;
-
-import net.minecraft.item.ItemStack;
-
-public class TC_AspectList_Wrapper {
-
-    // thaumcraft.api.aspects.Aspect;
-    // thaumcraft.api.aspects.AspectList;
-
-    public TC_AspectList_Wrapper() {}
-
-    public TC_AspectList_Wrapper(ItemStack stack) {}
-
-    public TC_AspectList_Wrapper(Object invoke) {
-        // TODO Auto-generated constructor stub
-    }
-
-    public int size() {
-        // TODO Auto-generated method stub
-        return 0;
-    }
-
-    public Object getVanillaAspectList() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    public void add(TC_Aspect_Wrapper mAspect, int mAmount) {
-        // TODO Auto-generated method stub
-
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java
deleted file mode 100644
index 76d1998527..0000000000
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java
+++ /dev/null
@@ -1,327 +0,0 @@
-package gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect;
-
-import static gregtech.api.enums.Mods.GTPlusPlus;
-
-import java.lang.reflect.Array;
-import java.lang.reflect.Constructor;
-import java.lang.reflect.Field;
-import java.lang.reflect.Method;
-import java.util.LinkedHashMap;
-import java.util.Map;
-
-import net.minecraft.util.ResourceLocation;
-
-import gregtech.api.enums.TC_Aspects;
-import gregtech.api.util.GT_LanguageManager;
-import gtPlusPlus.api.objects.Logger;
-import gtPlusPlus.core.util.reflect.ReflectionUtils;
-import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
-
-/**
- * Wrapper class for Thaumcraft Aspects. Used to avoid compile time dependencies.
- * 
- * @author Alkalus
- *
- */
-public class TC_Aspect_Wrapper {
-
-    private static Class mClass_Aspect;
-    private static Field mField_Aspects;
-
-    private final String tag;
-    private final TC_Aspect_Wrapper[] components;
-    private final int color;
-    private String chatcolor;
-    private final ResourceLocation image;
-    private final int blend;
-
-    public final Object mAspect;
-
-    /**
-     * May be null, but links back to the TC_Aspects class from GT for convinience.
-     */
-    public final TC_Aspects mGtEnumField;
-
-    /**
-     * Statically set the Class objects
-     */
-    static {
-        mClass_Aspect = ReflectionUtils.getClass("thaumcraft.api.aspects.Aspect");
-    }
-
-    /**
-     * Gets the total aspect list from Thaumcraft, which should contain all other registered aspects.
-     * 
-     * @return - A LinkedHashMap(String, Aspect);
-     */
-    public static LinkedHashMap<String, Object> getVanillaAspectList() {
-        try {
-            if (mField_Aspects == null) {
-                mField_Aspects = ReflectionUtils.getField(mClass_Aspect, "aspects");
-            }
-            return (LinkedHashMap<String, Object>) mField_Aspects.get(null);
-        } catch (IllegalArgumentException | IllegalAccessException e) {
-            Logger.REFLECTION("Failed configuring TC Aspect compatibility.");
-            return new LinkedHashMap<String, Object>();
-        }
-    }
-
-    public static Object getVanillaAspectObject(String aAspectName) {
-        return getVanillaAspectList().get(aAspectName);
-    }
-
-    /**
-     * Vanilla Aspect Constructor
-     * 
-     * @param tag       - Aspect Name
-     * @param color
-     * @param chatcolor
-     * @param blend
-     */
-    public TC_Aspect_Wrapper(String tag, int color, String chatcolor, int blend, String aTooltip) {
-        this(tag, color, (TC_Aspect_Wrapper[]) null, blend, aTooltip);
-        this.chatcolor = chatcolor;
-    }
-
-    /**
-     *
-     * Vanilla Aspect Constructor
-     * 
-     * @param tag        - Aspect Name
-     * @param color
-     * @param components
-     */
-    public TC_Aspect_Wrapper(String tag, int color, TC_Aspect_Wrapper[] components, String aTooltip) {
-        this(tag, color, components, false, 1, aTooltip);
-    }
-
-    /**
-     *
-     * Vanilla Aspect Constructor
-     * 
-     * @param tag        - Aspect Name
-     * @param color
-     * @param components
-     * @param blend
-     */
-    public TC_Aspect_Wrapper(String tag, int color, TC_Aspect_Wrapper[] components, int blend, String aTooltip) {
-        this(tag, color, components, false, blend, aTooltip);
-    }
-
-    /**
-     *
-     * Vanilla Aspect Constructor
-     * 
-     * @param tag        - Aspect Name
-     * @param color
-     * @param components
-     * @param image
-     * @param blend
-     */
-    public TC_Aspect_Wrapper(String tag, int color, TC_Aspect_Wrapper[] components, boolean vanilla, int blend,
-            String aTooltip) {
-        this(
-                tag,
-                color,
-                components,
-                vanilla ? new ResourceLocation("thaumcraft", "textures/aspects/" + tag.toLowerCase() + ".png")
-                        : new ResourceLocation(GTPlusPlus.ID, "textures/aspects/" + tag.toLowerCase() + ".png"),
-                vanilla,
-                blend,
-                aTooltip);
-    }
-
-    private static int aInternalAspectIDAllocation = 1;
-
-    public TC_Aspect_Wrapper(String tag, int color, TC_Aspect_Wrapper[] components, ResourceLocation image,
-            boolean vanilla, int blend, String aTooltip) {
-        if (components == null) {
-            components = new TC_Aspect_Wrapper[] {};
-        }
-        // String aTag = vanilla ? tag.toLowerCase() : "custom"+(aInternalAspectIDAllocation++);
-        String aTag = tag.toLowerCase();
-        if (getAspectList().containsKey(tag.toLowerCase())) {
-            this.tag = aTag;
-            this.components = components;
-            this.color = color;
-            this.image = image;
-            this.blend = blend;
-            this.mAspect = null;
-            this.mGtEnumField = null;
-        } else {
-            this.tag = aTag;
-            this.components = components;
-            this.color = color;
-            this.image = image;
-            this.blend = blend;
-            this.mAspect = vanilla ? getVanillaAspectObject(this.tag) : this.generateTcAspect();
-
-            // Set GT Type if exists
-            TC_Aspects y = null;
-            for (TC_Aspects e : TC_Aspects.values()) {
-                try {
-                    String gtTag = ThaumcraftUtils.getTagFromAspectObject(e.mAspect);
-                    if (gtTag != null) {
-                        if (gtTag.equals(this.tag)) {
-                            y = e;
-                            break;
-                        }
-                    }
-                } catch (IllegalArgumentException e1) {
-                    e1.printStackTrace();
-                }
-            }
-            this.mGtEnumField = y;
-            mInternalAspectCache.put(this.tag, this);
-            // Double link custom Aspects, but internalise names using custom# instead
-            if (!vanilla) {
-                mInternalAspectCache.put("custom" + (aInternalAspectIDAllocation++), this);
-                GT_LanguageManager.addStringLocalization("tc.aspect." + aTag, aTooltip);
-            }
-            Logger.INFO("[Thaumcraft++] Adding support for Aspect: " + tag);
-        }
-    }
-
-    /**
-     * Generates a TC_Aspect from an object, presummed to be a TC Aspect.
-     * 
-     * @param aBaseAspect - The TC Aspect to generate from.
-     * @return
-     * @throws IllegalArgumentException
-     * @throws IllegalAccessException
-     */
-    @SuppressWarnings("unused")
-    public static TC_Aspect_Wrapper generate(Object aBaseAspect) {
-        try {
-            Field aTagF = ReflectionUtils.getField(mClass_Aspect, "tag");
-            if (aTagF == null) {
-                return null;
-            }
-            String aTafB = (String) aTagF.get(aBaseAspect);
-            if (aTafB == null) {
-                return null;
-            }
-            String aTag = aTafB.toLowerCase();
-            if (aTag != null && getAspectList().containsKey(aTag.toLowerCase())) {
-                return getAspect(aTag);
-            } else {
-                TC_Aspect_Wrapper aTemp = new TC_Aspect_Wrapper(
-                        aTag,
-                        (int) ReflectionUtils.getField(mClass_Aspect, "color").get(aBaseAspect),
-                        generateAspectArrayInternal(
-                                ReflectionUtils.getField(mClass_Aspect, "components"),
-                                (aBaseAspect)),
-                        (ResourceLocation) ReflectionUtils.getField(mClass_Aspect, "image").get(aBaseAspect),
-                        true,
-                        (int) ReflectionUtils.getField(mClass_Aspect, "blend").get(aBaseAspect),
-                        "");
-                if (aTemp != null) {
-                    aTemp.chatcolor = (String) ReflectionUtils.getField(mClass_Aspect, "chatcolor").get(aBaseAspect);
-                    return aTemp;
-                } else {
-                    return null;
-                }
-            }
-        } catch (Throwable t) {
-            t.printStackTrace();
-            return null;
-        }
-    }
-
-    /**
-     * Internal Map containing all the TC_Aspects.
-     */
-    private static Map<String, TC_Aspect_Wrapper> mInternalAspectCache = new LinkedHashMap<String, TC_Aspect_Wrapper>();
-
-    /**
-     * Public getter for all TC_Aspects
-     * 
-     * @param aAspectName - Aspect Name
-     * @return - A GT++ Aspect wrapper or null. (TC_Aspect)
-     */
-    public static TC_Aspect_Wrapper getAspect(String aAspectName) {
-        String aName = aAspectName.toLowerCase();
-        TC_Aspect_Wrapper g = mInternalAspectCache.get(aName);
-        if (g != null) {
-            return g;
-        } else {
-            try {
-                TC_Aspect_Wrapper aTemp = generate(getVanillaAspectList().get(aName));
-                if (aTemp != null) {
-                    mInternalAspectCache.put(aName, aTemp);
-                    return aTemp;
-                }
-            } catch (IllegalArgumentException e) {
-                e.printStackTrace();
-            }
-        }
-        return null;
-    }
-
-    public static Map<String, TC_Aspect_Wrapper> getAspectList() {
-        return mInternalAspectCache;
-    }
-
-    private static TC_Aspect_Wrapper[] generateAspectArrayInternal(Field aField, Object aInstance) {
-        // thaumcraft.api.aspects.Aspect.Aspect()
-        Object[] components;
-        TC_Aspect_Wrapper[] aAspectArray;
-        try {
-            components = (Object[]) aField.get(aInstance);
-            aAspectArray = new TC_Aspect_Wrapper[components == null ? 0 : components.length];
-            if (aAspectArray.length > 0) {
-                int i = 0;
-                for (Object g : components) {
-                    aAspectArray[i] = getAspect((String) ReflectionUtils.getField(mClass_Aspect, "tag").get(g));
-                    i++;
-                }
-            }
-        } catch (IllegalArgumentException | IllegalAccessException e) {
-            e.printStackTrace();
-            aAspectArray = new TC_Aspect_Wrapper[0];
-        }
-        return aAspectArray;
-    }
-
-    /**
-     * Tasty code to generate TC Aspects reflectively.
-     * 
-     * @return
-     */
-    public Object generateTcAspect() {
-        try {
-            // thaumcraft.api.aspects.Aspect.Aspect()
-            Object aAspectArray = (Object[]) Array.newInstance(mClass_Aspect, 0);
-            if (components.length > 0) {
-                aAspectArray = (Object[]) Array.newInstance(mClass_Aspect, components.length);
-                int i = 0;
-                for (TC_Aspect_Wrapper g : components) {
-                    if (g != null && g.mAspect != null) ((Object[]) aAspectArray)[i++] = g.mAspect;
-                }
-            }
-            Constructor constructor = mClass_Aspect.getConstructor(
-                    String.class,
-                    int.class,
-                    aAspectArray.getClass(),
-                    ResourceLocation.class,
-                    int.class);
-            Object myObject = constructor.newInstance(tag, color, aAspectArray, image, blend);
-
-            // Set chat colour
-            if (chatcolor != null && chatcolor.length() > 0) {
-                Method setChatColour = ReflectionUtils.getMethod(mClass_Aspect, "setChatcolor", String.class);
-                if (setChatColour != null) {
-                    setChatColour.invoke(myObject, chatcolor);
-                }
-            }
-            return myObject;
-        } catch (Throwable t) {
-            t.printStackTrace();
-            return null;
-        }
-    }
-
-    public static boolean isObjectAnAspect(Object aAspect) {
-        return mClass_Aspect.isInstance(aAspect);
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/Base_Recipe_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/Base_Recipe_Wrapper.java
deleted file mode 100644
index 8a173e2b0a..0000000000
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/Base_Recipe_Wrapper.java
+++ /dev/null
@@ -1,10 +0,0 @@
-package gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe;
-
-import net.minecraft.item.ItemStack;
-
-public interface Base_Recipe_Wrapper {
-
-    public abstract ItemStack getRecipeOutput();
-
-    public abstract ItemStack getRecipeInput();
-}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_CrucibleRecipe_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_CrucibleRecipe_Wrapper.java
deleted file mode 100644
index 004c18955c..0000000000
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_CrucibleRecipe_Wrapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe;
-
-import net.minecraft.item.ItemStack;
-
-public class TC_CrucibleRecipe_Wrapper implements Base_Recipe_Wrapper {
-
-    @Override
-    public ItemStack getRecipeInput() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public ItemStack getRecipeOutput() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_IArcaneRecipe_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_IArcaneRecipe_Wrapper.java
deleted file mode 100644
index 8276af9f0e..0000000000
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_IArcaneRecipe_Wrapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe;
-
-import net.minecraft.item.ItemStack;
-
-public class TC_IArcaneRecipe_Wrapper implements Base_Recipe_Wrapper {
-
-    @Override
-    public ItemStack getRecipeInput() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public ItemStack getRecipeOutput() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionEnchantmentRecipe_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionEnchantmentRecipe_Wrapper.java
deleted file mode 100644
index 9431978ca0..0000000000
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionEnchantmentRecipe_Wrapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe;
-
-import net.minecraft.item.ItemStack;
-
-public class TC_InfusionEnchantmentRecipe_Wrapper implements Base_Recipe_Wrapper {
-
-    @Override
-    public ItemStack getRecipeInput() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-
-    @Override
-    public ItemStack getRecipeOutput() {
-        // TODO Auto-generated method stub
-        return null;
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionRecipe_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionRecipe_Wrapper.java
deleted file mode 100644
index 0338644949..00