Remove unused Thaumcraft compat

13 files changed, 0 insertions, 1058 deletions

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..0000000000
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionRecipe_Wrapper.java
+++ /dev/null
@@ -1,18 +0,0 @@
-package gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe;
-
-import net.minecraft.item.ItemStack;
-
-public class TC_InfusionRecipe_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/research/TC_PageType_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_PageType_Wrapper.java
deleted file mode 100644
index 3a06ac1b90..0000000000
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_PageType_Wrapper.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research;
-
-public class TC_PageType_Wrapper {
-
-    public static final TC_PageType_Wrapper TEXT = null;
-    public static final TC_PageType_Wrapper TEXT_CONCEALED = null;
-    public static final TC_PageType_Wrapper NORMAL_CRAFTING = null;
-    public static final TC_PageType_Wrapper ARCANE_CRAFTING = null;
-    public static final TC_PageType_Wrapper CRUCIBLE_CRAFTING = null;
-    public static final TC_PageType_Wrapper INFUSION_CRAFTING = null;
-    public static final TC_PageType_Wrapper COMPOUND_CRAFTING = null;
-    public static final TC_PageType_Wrapper SMELTING = null;
-    public static final TC_PageType_Wrapper INFUSION_ENCHANTMENT = null;
-    public static final TC_PageType_Wrapper IMAGE = null;
-    public static final TC_PageType_Wrapper ASPECTS = null;
-}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java
deleted file mode 100644
index 5ed57574d2..0000000000
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java
+++ /dev/null
@@ -1,92 +0,0 @@
-package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research;
-
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
-
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
-
-import org.apache.logging.log4j.Level;
-
-import cpw.mods.fml.common.FMLLog;
-
-public class TC_ResearchCategories_Wrapper {
-
-    public static LinkedHashMap<String, TC_ResearchCategoryList_Wrapper> researchCategories = new LinkedHashMap<String, TC_ResearchCategoryList_Wrapper>();
-
-    public static TC_ResearchCategoryList_Wrapper getResearchList(String key) {
-        return (TC_ResearchCategoryList_Wrapper) researchCategories.get(key);
-    }
-
-    public static String getCategoryName(String key) {
-        return StatCollector.translateToLocal("tc.research_category." + key);
-    }
-
-    public static TC_ResearchItem_Wrapper getResearch(String key) {
-        Collection rc = researchCategories.values();
-        Iterator i$ = rc.iterator();
-
-        while (i$.hasNext()) {
-            Object cat = i$.next();
-            Collection rl = ((TC_ResearchCategoryList_Wrapper) cat).research.values();
-            Iterator i$1 = rl.iterator();
-
-            while (i$1.hasNext()) {
-                Object ri = i$1.next();
-                if (((TC_ResearchItem_Wrapper) ri).key.equals(key)) {
-                    return (TC_ResearchItem_Wrapper) ri;
-                }
-            }
-        }
-
-        return null;
-    }
-
-    public static void registerCategory(String key, ResourceLocation icon, ResourceLocation background) {
-        if (getResearchList(key) == null) {
-            TC_ResearchCategoryList_Wrapper rl = new TC_ResearchCategoryList_Wrapper(icon, background);
-            researchCategories.put(key, rl);
-        }
-    }
-
-    public static void addResearch(TC_ResearchItem_Wrapper ri) {
-        TC_ResearchCategoryList_Wrapper rl = getResearchList(ri.category);
-        if (rl != null && !rl.research.containsKey(ri.key)) {
-            if (!ri.isVirtual()) {
-                Iterator i$ = rl.research.values().iterator();
-
-                while (i$.hasNext()) {
-                    TC_ResearchItem_Wrapper rr = (TC_ResearchItem_Wrapper) i$.next();
-                    if (rr.displayColumn == ri.displayColumn && rr.displayRow == ri.displayRow) {
-                        FMLLog.log(
-                                Level.FATAL,
-                                "[Thaumcraft] Research [" + ri.getName()
-                                        + "] not added as it overlaps with existing research ["
-                                        + rr.getName()
-                                        + "]",
-                                new Object[0]);
-                        return;
-                    }
-                }
-            }
-
-            rl.research.put(ri.key, ri);
-            if (ri.displayColumn < rl.minDisplayColumn) {
-                rl.minDisplayColumn = ri.displayColumn;
-            }
-
-            if (ri.displayRow < rl.minDisplayRow) {
-                rl.minDisplayRow = ri.displayRow;
-            }
-
-            if (ri.displayColumn > rl.maxDisplayColumn) {
-                rl.maxDisplayColumn = ri.displayColumn;
-            }
-
-            if (ri.displayRow > rl.maxDisplayRow) {
-                rl.maxDisplayRow = ri.displayRow;
-            }
-        }
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java
deleted file mode 100644
index f8066abe2d..0000000000
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research;
-
-import java.util.HashMap;
-import java.util.Map;
-
-import net.minecraft.util.ResourceLocation;
-
-public class TC_ResearchCategoryList_Wrapper {
-
-    public int minDisplayColumn;
-    public int minDisplayRow;
-    public int maxDisplayColumn;
-    public int maxDisplayRow;
-    public ResourceLocation icon;
-    public ResourceLocation background;
-    public Map<String, TC_ResearchItem_Wrapper> research = new HashMap<String, TC_ResearchItem_Wrapper>();
-
-    public TC_ResearchCategoryList_Wrapper(ResourceLocation icon, ResourceLocation background) {
-        this.icon = icon;
-        this.background = background;
-    }
-}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java
deleted file mode 100644
index 1baefdc465..0000000000
--- a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java
+++ /dev/null
@@ -1,245 +0,0 @@
-package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research;
-
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.StatCollector;
-
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper;
-import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_Aspect_Wrapper;
-import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
-
-public class TC_ResearchItem_Wrapper {
-
-    public final String key;
-    public final String category;
-    public final TC_AspectList_Wrapper tags;
-    public String[] parents = null;
-    public String[] parentsHidden = null;
-    public String[] siblings = null;
-    public final int displayColumn;
-    public final int displayRow;
-    public final ItemStack icon_item;
-    public final ResourceLocation icon_resource;
-    private int complexity;
-    private boolean isSpecial;
-    private boolean isSecondary;
-    private boolean isRound;
-    private boolean isStub;
-    private boolean isVirtual;
-    private boolean isConcealed;
-    private boolean isHidden;
-    private boolean isLost;
-    private boolean isAutoUnlock;
-    private ItemStack[] itemTriggers;
-    private String[] entityTriggers;
-    private TC_Aspect_Wrapper[] aspectTriggers;
-    private Object[] pages = null;
-
-    public TC_ResearchItem_Wrapper(String key, String category) {
-        this.key = key;
-        this.category = category;
-        this.tags = new TC_AspectList_Wrapper();
-        this.icon_resource = null;
-        this.icon_item = null;
-        this.displayColumn = 0;
-        this.displayRow = 0;
-        this.setVirtual();
-    }
-
-    public TC_ResearchItem_Wrapper(String key, String category, TC_AspectList_Wrapper tags, int col, int row,
-            int complex, ResourceLocation icon) {
-        this.key = key;
-        this.category = category;
-        this.tags = tags;
-        this.icon_resource = icon;
-        this.icon_item = null;
-        this.displayColumn = col;
-        this.displayRow = row;
-        this.complexity = complex;
-        if (this.complexity < 1) {
-            this.complexity = 1;
-        }
-
-        if (this.complexity > 3) {
-            this.complexity = 3;
-        }
-    }
-
-    public TC_ResearchItem_Wrapper(String key, String category, TC_AspectList_Wrapper tags, int col, int row,
-            int complex, ItemStack icon) {
-        this.key = key;
-        this.category = category;
-        this.tags = tags;
-        this.icon_item = icon;
-        this.icon_resource = null;
-        this.displayColumn = col;
-        this.displayRow = row;
-        this.complexity = complex;
-        if (this.complexity < 1) {
-            this.complexity = 1;
-        }
-
-        if (this.complexity > 3) {
-            this.complexity = 3;
-        }
-    }
-
-    public TC_ResearchItem_Wrapper setSpecial() {
-        this.isSpecial = true;
-        return this;
-    }
-
-    public TC_ResearchItem_Wrapper setStub() {
-        this.isStub = true;
-        return this;
-    }
-
-    public TC_ResearchItem_Wrapper setLost() {
-        this.isLost = true;
-        return this;
-    }
-
-    public TC_ResearchItem_Wrapper setConcealed() {
-        this.isConcealed = true;
-        return this;
-    }
-
-    public TC_ResearchItem_Wrapper setHidden() {
-        this.isHidden = true;
-        return this;
-    }
-
-    public TC_ResearchItem_Wrapper setVirtual() {
-        this.isVirtual = true;
-        return this;
-    }
-
-    public TC_ResearchItem_Wrapper setParents(String... par) {
-        this.parents = par;
-        return this;
-    }
-
-    public TC_ResearchItem_Wrapper setParentsHidden(String... par) {
-        this.parentsHidden = par;
-        return this;
-    }
-
-    public TC_ResearchItem_Wrapper setSiblings(String... sib) {
-        this.siblings = sib;
-        return this;
-    }
-
-    public TC_ResearchItem_Wrapper setPages(Object... par) {
-        this.pages = par;
-        return this;
-    }
-
-    public Object[] getPages() {
-        return this.pages;
-    }
-
-    public TC_ResearchItem_Wrapper setItemTriggers(ItemStack... par) {
-        this.itemTriggers = par;
-        return this;
-    }
-
-    public TC_ResearchItem_Wrapper setEntityTriggers(String... par) {
-        this.entityTriggers = par;
-        return this;
-    }
-
-    public TC_ResearchItem_Wrapper setAspectTriggers(TC_Aspect_Wrapper... par) {
-        this.aspectTriggers = par;
-        return this;
-    }
-
-    public ItemStack[] getItemTriggers() {
-        return this.itemTriggers;
-    }
-
-    public String[] getEntityTriggers() {
-        return this.entityTriggers;
-    }
-
-    public TC_Aspect_Wrapper[] getAspectTriggers() {
-        return this.aspectTriggers;
-    }
-
-    public TC_ResearchItem_Wrapper registerResearchItem() {
-        ThaumcraftUtils.addResearch(this);
-        return this;
-    }
-
-    public String getName() {
-        return StatCollector.translateToLocal("tc.research_name." + this.key);
-    }
-
-    public String getText() {
-        return StatCollector.translateToLocal("tc.research_text." + this.key);
-    }
-
-    public boolean isSpecial() {
-        return this.isSpecial;
-    }
-
-    public boolean isStub() {
-        return this.isStub;
-    }
-
-    public boolean isLost() {
-        return this.isLost;
-    }
-
-    public boolean isConcealed() {
-        return this.isConcealed;
-    }
-
-    public boolean isHidden() {
-        return this.isHidden;
-    }
-
-    public boolean isVirtual() {
-        return this.isVirtual;
-    }
-
-    public boolean isAutoUnlock() {
-        return this.isAutoUnlock;
-    }
-
-    public TC_ResearchItem_Wrapper setAutoUnlock() {
-        this.isAutoUnlock = true;
-        return this;
-    }
-
-    public boolean isRound() {
-        return this.isRound;
-    }
-
-    public TC_ResearchItem_Wrapper setRound() {
-        this.isRound = true;
-        return this;
-    }
-
-    public boolean isSecondary() {
-        return this.isSecondary;
-    }
-
-    public TC_Re