Merge pull request #65 from GTNewHorizons/unified-build-script2

Move sources and resources

14 files changed, 1226 insertions, 0 deletions

diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java
new file mode 100644
index 0000000000..fdcf7b8498
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/ThreadAspectScanner.java
@@ -0,0 +1,158 @@
+package gtPlusPlus.xmod.thaumcraft.objects;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.api.objects.data.AutoMap;
+import gtPlusPlus.api.objects.data.Pair;
+import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.core.util.data.FileUtils;
+import gtPlusPlus.core.util.minecraft.ItemUtils;
+import gtPlusPlus.xmod.thaumcraft.commands.CommandDumpAspects;
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+
+public class ThreadAspectScanner extends Thread {
+
+	public static boolean mDoWeScan = false;
+	private static final Map<String, AutoMap<ItemStack>> mAllGameContent = new HashMap<String, AutoMap<ItemStack>>();
+	public final File mAspectCacheFile;
+
+	public ThreadAspectScanner() {
+		mAspectCacheFile = FileUtils.getFile("config/GTplusplus", "AspectInfo", "txt");
+		mDoWeScan = true;		
+	}
+
+	private void tryCacheObject(ItemStack aStack) {
+		if (aStack == null) {
+			return;
+		}
+		String nameKey;
+		try {
+			nameKey = ItemUtils.getUnlocalizedItemName(aStack);
+		} catch (NullPointerException n) {
+			try {
+				nameKey = Utils.sanitizeString(aStack.getDisplayName().toLowerCase());
+			} catch (NullPointerException n2) {
+				try {
+					nameKey = aStack.getItem().getUnlocalizedName();
+				} catch (NullPointerException n3) {
+					nameKey = "BadItemsGalore";
+				}
+			}
+		}
+		AutoMap<ItemStack> m = new AutoMap<ItemStack>();
+		if (mAllGameContent.containsKey(nameKey)) {
+			m = mAllGameContent.get(nameKey);
+		}
+		m.put(aStack);
+		mAllGameContent.put(nameKey, m);
+	}
+
+	@SuppressWarnings({ "rawtypes" })
+	@Override
+	public void run() {
+		if (mDoWeScan) {
+			Iterator iterator;
+			Logger.INFO("Finding Blocks and Items to scan for Aspect data.");
+			long mBlocksCounter = 0;
+			long mItemsCounter = 0;
+
+			// First, find blocks
+			iterator = Block.blockRegistry.getKeys().iterator();
+			while (iterator.hasNext()) {
+				String s = (String) iterator.next();
+				Block block = (Block) Block.blockRegistry.getObject(s);
+				if (block != null) {
+					tryCacheObject(ItemUtils.getSimpleStack(block));
+					mBlocksCounter++;
+				}
+			}
+			Logger.INFO("Completed Block Scan. Counted "+mBlocksCounter);
+
+			// Second Find items, Skipping things that exist.
+			iterator = Item.itemRegistry.getKeys().iterator();
+			while (iterator.hasNext()) {
+				String s = (String) iterator.next();
+				Item item = (Item) Item.itemRegistry.getObject(s);
+				if (item != null) {
+					if (item.getHasSubtypes()) {
+						List q1 = new ArrayList();
+						item.getSubItems(item, item.getCreativeTab(), q1);
+						if (q1 != null && q1.size() > 0) {
+							for (int e = 0; e < q1.size(); e++) {
+								ItemStack check = ItemUtils.simpleMetaStack(item, e, 1);
+								if (check != null) {
+									tryCacheObject(check);
+									mItemsCounter++;
+								}
+							}
+						} else {
+							tryCacheObject(ItemUtils.getSimpleStack(item));
+							mItemsCounter++;
+						}
+					} else {
+						tryCacheObject(ItemUtils.getSimpleStack(item));
+						mItemsCounter++;
+					}
+				}
+			}
+			Logger.INFO("Completed Item Scan. Counted "+mItemsCounter);
+
+			Set<String> y = mAllGameContent.keySet();
+			Logger.INFO("Beginning iteration of "+y.size()+" itemstacks for aspect information.");
+
+			for (String key : y) {
+				//Logger.INFO("Looking for key: "+key);
+				if (mAllGameContent.containsKey(key)) {
+					AutoMap<ItemStack> group = mAllGameContent.get(key);
+					if (group == null || group.size() <= 0) {
+						continue;
+					}
+					for (ItemStack stack : group) {
+						thaumcraft.api.aspects.AspectList a = thaumcraft.common.lib.crafting.ThaumcraftCraftingManager
+								.getObjectTags(stack);
+						if (a == null) {
+							continue;
+						} else {
+							AutoMap<Pair<String, Integer>> aspectPairs = new AutoMap<Pair<String, Integer>>();
+							for (thaumcraft.api.aspects.Aspect c : a.getAspectsSortedAmount()) {
+								if (c != null) {
+									aspectPairs.put(new Pair<String, Integer>(c.getName(), a.getAmount(c)));
+								}
+							}
+							try {
+								List<String> mList = new ArrayList<String>();
+								mList.add(stack.getDisplayName() + " | Meta: " + stack.getItemDamage()
+								+ " | Unlocal: " + stack.getUnlocalizedName());
+								for (Pair<String, Integer> r : aspectPairs) {
+									if (r != null) {
+										mList.add(r.getKey() + " x" + r.getValue());
+									}
+								}
+								mList.add("");
+								if (mAspectCacheFile != null && mList.size() >= 3) {
+									FileUtils.appendListToFile(mAspectCacheFile, mList);
+								}
+							}
+							catch (Throwable t) {
+								Logger.INFO("Error while iterating one item. "+t);
+							}
+						}
+					}
+				}
+			}
+			Logger.INFO("Completed Aspect Iteration. AspectInfo.txt is now available to process in the GTplusplus configuration folder.");
+			CommandDumpAspects.mLastScanTime = System.currentTimeMillis();
+		}
+		return;
+	}
+
+}
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
new file mode 100644
index 0000000000..9df38ca384
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_AspectList_Wrapper.java
@@ -0,0 +1,40 @@
+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
new file mode 100644
index 0000000000..fda0fd27c5
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/aspect/TC_Aspect_Wrapper.java
@@ -0,0 +1,327 @@
+package gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect;
+
+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 gregtech.api.enums.TC_Aspects;
+import gregtech.api.util.GT_LanguageManager;
+import gtPlusPlus.api.objects.Logger;
+import gtPlusPlus.core.lib.CORE;
+import gtPlusPlus.core.util.reflect.ReflectionUtils;
+import gtPlusPlus.xmod.thaumcraft.util.ThaumcraftUtils;
+import net.minecraft.util.ResourceLocation;
+
+/**
+ * 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(CORE.MODID, "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
new file mode 100644
index 0000000000..914144445c
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/Base_Recipe_Wrapper.java
@@ -0,0 +1,10 @@
+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
new file mode 100644
index 0000000000..8ee4e7011d
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_CrucibleRecipe_Wrapper.java
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 0000000000..fede079f7b
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_IArcaneRecipe_Wrapper.java
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 0000000000..b52fa0e6a7
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionEnchantmentRecipe_Wrapper.java
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 0000000000..a0c539f937
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/recipe/TC_InfusionRecipe_Wrapper.java
@@ -0,0 +1,19 @@
+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
new file mode 100644
index 0000000000..d6c7f66988
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_PageType_Wrapper.java
@@ -0,0 +1,17 @@
+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
new file mode 100644
index 0000000000..93869cb8d8
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategories_Wrapper.java
@@ -0,0 +1,89 @@
+package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research;
+
+import cpw.mods.fml.common.FMLLog;
+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;
+
+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;
+			}
+		}
+
+	}
+}
\ No newline at end of file
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
new file mode 100644
index 0000000000..3e6f5b78f2
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchCategoryList_Wrapper.java
@@ -0,0 +1,21 @@
+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
new file mode 100644
index 0000000000..6372cc0371
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchItem_Wrapper.java
@@ -0,0 +1,246 @@
+package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research;
+
+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;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+
+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_ResearchItem_Wrapper setSecondary() {
+		this.isSecondary = true;
+		return this;
+	}
+
+	public int getComplexity() {
+		return this.complexity;
+	}
+
+	public TC_ResearchItem_Wrapper setComplexity(int complexity) {
+		this.complexity = complexity;
+		return this;
+	}
+
+	public TC_Aspect_Wrapper getResearchPrimaryTag() {
+		//TODO
+		return null;
+	}
+	
+}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchNoteData_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchNoteData_Wrapper.java
new file mode 100644
index 0000000000..5adf0150d9
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchNoteData_Wrapper.java
@@ -0,0 +1,14 @@
+package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research;
+
+public class TC_ResearchNoteData_Wrapper {
+
+	public TC_ResearchNoteData_Wrapper(Object researchNoteData) {
+		// TODO Auto-generated constructor stub
+	}
+
+	public Object getResearchNoteData() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+}
diff --git a/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java
new file mode 100644
index 0000000000..998f37bf8c
--- /dev/null
+++ b/src/main/java/gtPlusPlus/xmod/thaumcraft/objects/wrapper/research/TC_ResearchPage_Wrapper.java
@@ -0,0 +1,228 @@
+package gtPlusPlus.xmod.thaumcraft.objects.wrapper.research;
+
+import java.util.List;
+
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.aspect.TC_AspectList_Wrapper;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_CrucibleRecipe_Wrapper;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_IArcaneRecipe_Wrapper;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_InfusionEnchantmentRecipe_Wrapper;
+import gtPlusPlus.xmod.thaumcraft.objects.wrapper.recipe.TC_InfusionRecipe_Wrapper;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.crafting.FurnaceRecipes;
+import net.minecraft.item.crafting.IRecipe;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.StatCollector;
+
+public class TC_ResearchPage_Wrapper {
+	public TC_PageType_Wrapper type;
+	public String text;
+	public String research;
+	public ResourceLocation image;
+	public TC_AspectList_Wrapper aspects;
+	public Object recipe;
+	public ItemStack recipeOutput;
+
+	public TC_ResearchPage_Wrapper(String text) {
+		this.type = TC_PageType_Wrapper.TEXT;
+		this.text = null;
+		this.research = null;
+		this.image = null;
+		this.aspects = null;
+		this.recipe = null;
+		this.recipeOutput = null;
+		this.type = TC_PageType_Wrapper.TEXT;
+		this.text = text;
+	}
+
+	public TC_ResearchPage_Wrapper(String research, String text) {
+		this.type = TC_PageType_Wrapper.TEXT;
+		this.text = null;
+		this.research = null;
+		this.image = null;
+		this.aspects = null;
+		this.recipe = null;
+		this.recipeOutput = null;
+		this.type = TC_PageType_Wrapper.TEXT_CONCEALED;
+		this.research = research;
+		this.text = text;
+	}
+
+	public TC_ResearchPage_Wrapper(IRecipe recipe) {
+		this.type = TC_PageType_Wrapper.TEXT;
+		this.text = null;
+		this.research = null;
+		this.image = null;
+		this.aspects = null;
+		this.recipe = null;
+		this.recipeOutput = null;
+		this.type = TC_PageType_Wrapper.NORMAL_CRAFTING;
+		this.recipe = recipe;
+		this.recipeOutput = recipe.getRecipeOutput();
+	}
+
+	public TC_ResearchPage_Wrapper(IRecipe[] recipe) {
+		this.type = TC_PageType_Wrapper.TEXT;
+		this.text = null;
+		this.research = null;
+		this.image = null;
+		this.aspects = null;
+		this.recipe = null;
+		this.recipeOutput = null;
+		this.type = TC_PageType_Wrapper.NORMAL_CRAFTING;
+		this.recipe = recipe;
+	}
+
+	public TC_ResearchPage_Wrapper(TC_IArcaneRecipe_Wrapper[] recipe) {
+		this.type = TC_PageType_Wrapper.TEXT;
+		this.text = null;
+		this.research = null;
+		this.image = null;
+		this.aspects = null;
+		this.recipe = null;
+		this.recipeOutput = null;
+		this.type = TC_PageType_Wrapper.ARCANE_CRAFTING;
+		this.recipe = recipe;
+	}
+
+	public TC_ResearchPage_Wrapper(TC_CrucibleRecipe_Wrapper[] recipe) {
+		this.type = TC_PageType_Wrapper.TEXT;
+		this.text = null;
+		this.research = null;
+		this.image = null;
+		this.aspects = null;
+		this.recipe = null;
+		this.recipeOutput = null;
+		this.type = TC_PageType_Wrapper.CRUCIBLE_CRAFTING;
+		this.recipe = recipe;
+	}
+
+	public TC_ResearchPage_Wrapper(TC_InfusionRecipe_Wrapper[] recipe) {
+		this.type = TC_PageType_Wrapper.TEXT;
+		this.text = null;
+		this.research = null;
+		this.image = null;
+		this.aspects = null;
+		this.recipe = null;
+		this.recipeOutput = null;
+		this.type = TC_PageType_Wrapper.INFUSION_CRAFTING;
+		this.recipe = recipe;
+	}
+
+	public TC_ResearchPage_Wrapper(List recipe) {
+		this.type = TC_PageType_Wrapper.TEXT;
+		this.text = null;
+		this.research = null;
+		this.image = null;
+		this.aspects = null;
+		this.recipe = null;
+		this.recipeOutput = null;
+		this.type = TC_PageType_Wrapper.COMPOUND_CRAFTING;
+		this.recipe = recipe;
+	}
+
+	public TC_ResearchPage_Wrapper(TC_IArcaneRecipe_Wrapper recipe) {
+		this.type = TC_PageType_Wrapper.TEXT;
+		this.text = null;
+		this.research = null;
+		this.image = null;
+		this.aspects = null;
+		this.recipe = null;
+		this.recipeOutput = null;
+		this.type = TC_PageType_Wrapper.ARCANE_CRAFTING;
+		this.recipe = recipe;
+		this.recipeOutput = recipe.getRecipeOutput();
+	}
+
+	public TC_ResearchPage_Wrapper(TC_CrucibleRecipe_Wrapper recipe) {
+		this.type = TC_PageType_Wrapper.TEXT;
+		this.text = null;
+		this.research = null;
+		this.image = null;
+		this.aspects = null;
+		this.recipe = null;
+		this.recipeOutput = null;
+		this.type = TC_PageType_Wrapper.CRUCIBLE_CRAFTING;
+		this.recipe = recipe;
+		this.recipeOutput = recipe.getRecipeOutput();
+	}
+
+	public TC_ResearchPage_Wrapper(ItemStack input) {
+		this.type = TC_PageType_Wrapper.TEXT;
+		this.text = null;
+		this.research = null;
+		this.image = null;
+		this.aspects = null;
+		this.recipe = null;
+		this.recipeOutput = null;
+		this.type = TC_PageType_Wrapper.SMELTING;
+		this.recipe = input;
+		this.recipeOutput = FurnaceRecipes.smelting().getSmeltingResult(input);
+	}
+
+	public TC_ResearchPage_Wrapper(TC_InfusionRecipe_Wrapper recipe) {
+		this.type = TC_PageType_Wrapper.TEXT;
+		this.text = null;
+		this.research = null;
+		this.image = null;
+		this.aspects = null;
+		this.recipe = null;
+		this.recipeOutput = null;
+		this.type = TC_PageType_Wrapper.INFUSION_CRAFTING;
+		this.recipe = recipe;
+		if (recipe.getRecipeOutput() instanceof ItemStack) {
+			this.recipeOutput = (ItemStack) recipe.getRecipeOutput();
+		} else {
+			this.recipeOutput = recipe.getRecipeInput();
+		}
+
+	}
+
+	public TC_ResearchPage_Wrapper(TC_InfusionEnchantmentRecipe_Wrapper recipe) {
+		this.type = TC_PageType_Wrapper.TEXT;
+		this.text = null;
+		this.research = null;
+		this.image = null;
+		this.aspects = null;
+		this.recipe = null;
+		this.recipeOutput = null;
+		this.type = TC_PageType_Wrapper.INFUSION_ENCHANTMENT;
+		this.recipe = recipe;
+	}
+
+	public TC_ResearchPage_Wrapper(ResourceLocation image, String caption) {
+		this.type = TC_PageType_Wrapper.TEXT;
+		this.text = null;
+		this.research = null;
+		this.image = null;
+		this.aspects = null;
+		this.recipe = null;
+		this.recipeOutput = null;
+		this.type = TC_PageType_Wrapper.IMAGE;
+		this.image = image;
+		this.text = caption;
+	}
+
+	public TC_ResearchPage_Wrapper(TC_AspectList_Wrapper as) {
+		this.type = TC_PageType_Wrapper.TEXT;
+		this.text = null;
+		this.research = null;
+		this.image = null;
+		this.aspects = null;
+		this.recipe = null;
+		this.recipeOutput = null;
+		this.type = TC_PageType_Wrapper.ASPECTS;
+		this.aspects = as;
+	}
+
+	public String getTranslatedText() {
+		String ret = "";
+		if (this.text != null) {
+			ret = StatCollector.translateToLocal(this.text);
+			if (ret.isEmpty()) {
+				ret = this.text;
+			}
+		}
+
+		return ret;
+	}
+}
\ No newline at end of file