% Refactored the entire project to stop using MiscUtils everywhere possible, now it's gtPlusPlus.

10 files changed, 448 insertions, 0 deletions

diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java
new file mode 100644
index 0000000000..7f4aa0541a
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_BigReactors.java
@@ -0,0 +1,19 @@
+package gtPlusPlus.core.common.compat;
+
+import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.item.ModItems;
+import net.minecraft.item.ItemStack;
+
+public class COMPAT_BigReactors {
+
+	public static void OreDict(){
+		run();
+	}
+	
+	private static final void run(){
+		GT_OreDictUnificator.registerOre("plateBlutonium", new ItemStack(ModItems.itemPlateBlutonium));
+		GT_OreDictUnificator.registerOre("plateCyanite", new ItemStack(ModItems.itemPlateCyanite));
+		GT_OreDictUnificator.registerOre("plateLudicrite", new ItemStack(ModItems.itemPlateLudicrite));
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
new file mode 100644
index 0000000000..efa86f0009
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_CompactWindmills.java
@@ -0,0 +1,171 @@
+package gtPlusPlus.core.common.compat;
+
+import static gtPlusPlus.core.handler.COMPAT_HANDLER.AddRecipeQueue;
+import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
+import gtPlusPlus.core.recipe.ShapedRecipeObject;
+import gtPlusPlus.core.util.item.UtilsItems;
+import net.minecraft.item.ItemStack;
+
+
+
+public class COMPAT_CompactWindmills {
+
+	//Change IC2 Upgrades
+	public static ItemStack kineticWind = UtilsItems.simpleMetaStack("IC2:blockKineticGenerator", 0, 1);
+	public static ItemStack shaftIron = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 11, 1);
+	public static ItemStack cableCopper = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 1367, 1);
+	public static String plateRubber = "ore:plateRubber";
+
+	//Machine Casings
+	public static ItemStack elvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 0, 1);
+	public static ItemStack lvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 1, 1);
+	public static ItemStack mvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 2, 1);
+	public static ItemStack hvCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 3, 1);
+	public static ItemStack evCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 4, 1);
+	public static ItemStack ivCasing = UtilsItems.simpleMetaStack("gregtech:gt.blockcasings", 5, 1);
+
+	//GT Transformers
+	public static ItemStack elvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 20, 1);
+	public static ItemStack lvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 21, 1);
+	public static ItemStack mvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 22, 1);
+	public static ItemStack hvTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 23, 1);
+	public static ItemStack evTransformer = UtilsItems.simpleMetaStack("gregtech:gt.blockmachines", 24, 1);
+
+	//Compact Windmills
+	public static ItemStack elvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 0, 1);
+	public static ItemStack lvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 1, 1);
+	public static ItemStack mvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 2, 1);
+	public static ItemStack hvWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 3, 1);
+	public static ItemStack evWindmill = UtilsItems.simpleMetaStack("CompactWindmills:blockCompactWindmill", 4, 1);
+
+	//Compact Rotors
+	public static ItemStack rotor2 = UtilsItems.getItemStack("CompactWindmills:WOOL", 1);
+	public static ItemStack rotor1 = UtilsItems.getItemStack("CompactWindmills:WOOD", 1);
+	public static ItemStack rotor3 = UtilsItems.getItemStack("CompactWindmills:ALLOY", 1);
+	public static ItemStack rotor4 = UtilsItems.getItemStack("CompactWindmills:CARBON", 1);
+	public static ItemStack rotor5 = UtilsItems.getItemStack("CompactWindmills:IRIDIUM", 1);
+
+	//IC2 Rotors
+	public static ItemStack rotorIC1 = UtilsItems.getItemStack("IC2:itemwoodrotor", 1);
+	public static ItemStack rotorIC2 = UtilsItems.getItemStack("IC2:itemironrotor", 1);
+	public static ItemStack rotorIC3 = UtilsItems.getItemStack("IC2:itemsteelrotor", 1);
+	public static ItemStack rotorIC4 = UtilsItems.getItemStack("IC2:itemwcarbonrotor", 1);
+	public static ItemStack rotorBlade1 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 7, 1);
+	public static ItemStack rotorBlade2 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 8, 1);
+	public static ItemStack rotorBlade3 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 10, 1);
+	public static ItemStack rotorBlade4 = UtilsItems.simpleMetaStack("IC2:itemRecipePart", 9, 1);
+
+	//Plates
+	public static String plateTier1 = "ore:plateMagnalium";
+	public static String plateTier2 = "ore:plateStainlessSteel";
+	public static String plateTier3 = "ore:plateTitanium";
+	public static String plateTier4 = "ore:plateTungstenSteel";
+	public static String plateTier5 = "ore:plateNichrome";
+	public static String plateCarbon = "ore:plateAlloyCarbon";
+	public static String plateAlloy = "ore:plateAlloyAdvanced";
+
+	//Circuits
+	public static String circuitTier1 = "ore:circuitGood";
+	public static String circuitTier2 = "ore:circuitAdvanced";
+	public static String circuitTier3 = "ore:circuitData";
+	public static String circuitTier4 = "ore:circuitElite";
+	public static String circuitTier5 = "ore:circuitMaster";
+
+	//Wooden Rotor
+	public static ShapedRecipeObject Wooden_Rotor = new ShapedRecipeObject(
+			rotorBlade1, "ore:plateAnyIron", "ore:plateAnyIron", 
+			"ore:screwAluminium", rotorIC1, "ore:screwAluminium", 
+			rotorBlade1, "plateAnyIron", rotorBlade1,
+			rotor1);
+	//Alloy Rotor
+	public static ShapedRecipeObject Alloy_Rotor = new ShapedRecipeObject(
+			plateAlloy, plateAlloy, plateAlloy, 
+			plateAlloy, rotorIC3, plateAlloy, 
+			plateAlloy,plateAlloy, plateAlloy,
+			rotor3);
+	//Carbon Rotor
+	public static ShapedRecipeObject Carbon_Rotor = new ShapedRecipeObject(
+			plateCarbon, rotorBlade4, plateCarbon,
+			rotorBlade4, rotor3, rotorBlade4,
+			plateCarbon, rotorBlade4, plateCarbon,
+			rotor4);
+
+	//Kinetic Wind Turbine
+	public static ShapedRecipeObject KWT = new ShapedRecipeObject(
+		plateCarbon, shaftIron, plateCarbon,
+		cableCopper, mvCasing, cableCopper,
+		plateRubber, plateCarbon, plateRubber,
+		kineticWind);
+		
+	//ELV Windmill
+	public static ShapedRecipeObject WM_ELV = new ShapedRecipeObject(
+	
+		circuitTier1, elvTransformer, circuitTier1,
+		plateTier1, lvCasing, plateTier1,
+		plateTier1, rotor1, plateTier1,
+		elvWindmill);
+		
+		
+	//LV Windmill
+	public static ShapedRecipeObject WM_LV = new ShapedRecipeObject(
+		circuitTier2, lvTransformer, circuitTier2,
+		plateTier2, mvCasing, plateTier2,
+		plateTier2, rotor2, plateTier2,
+		lvWindmill);
+		
+	//MV Windmill
+	public static ShapedRecipeObject WM_MV = new ShapedRecipeObject(
+		circuitTier3, mvTransformer, circuitTier3,
+		plateTier3, hvCasing, plateTier3,
+		plateTier3, rotor3, plateTier3,
+		mvWindmill);
+		
+	//HV Windmill
+	public static ShapedRecipeObject WM_HV = new ShapedRecipeObject(
+		circuitTier4, hvTransformer, circuitTier4,
+		plateTier4, evCasing, plateTier4,
+		plateTier4, rotor4, plateTier4,
+		hvWindmill);
+		
+	//EV Windmill
+	public static ShapedRecipeObject WM_EV = new ShapedRecipeObject(
+		circuitTier5, evTransformer, circuitTier5,
+		plateTier5, ivCasing, plateTier5,
+		plateTier5, rotor5, plateTier5,
+		evWindmill);
+
+	public static void OreDict(){
+		run();		
+	}
+
+	private static final void run(){
+		//RemoveRecipeQueue.add("CompactWindmills:WOOL");
+		//RemoveRecipeQueue.add("CompactWindmills:WOOD");
+		//RemoveRecipeQueue.add("CompactWindmills:ALLOY");
+		//RemoveRecipeQueue.add("CompactWindmills:CARBON");
+		//RemoveRecipeQueue.add("CompactWindmills:IRIDIUM");
+		
+		//Remove Recipes
+		RemoveRecipeQueue.add(kineticWind);
+		RemoveRecipeQueue.add(elvWindmill);
+		RemoveRecipeQueue.add(lvWindmill);
+		RemoveRecipeQueue.add(mvWindmill);
+		RemoveRecipeQueue.add(hvWindmill);
+		RemoveRecipeQueue.add(evWindmill);
+		RemoveRecipeQueue.add(rotor1);
+		RemoveRecipeQueue.add(rotor3);
+		RemoveRecipeQueue.add(rotor4);
+		
+		//Add Recipes
+		AddRecipeQueue.add(Wooden_Rotor);
+		AddRecipeQueue.add(Alloy_Rotor);
+		AddRecipeQueue.add(Carbon_Rotor);
+		AddRecipeQueue.add(KWT);
+		AddRecipeQueue.add(WM_ELV);
+		AddRecipeQueue.add(WM_LV);
+		AddRecipeQueue.add(WM_MV);
+		AddRecipeQueue.add(WM_HV);
+		AddRecipeQueue.add(WM_EV);
+
+	}
+}
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java
new file mode 100644
index 0000000000..d538b2df3d
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_EnderIO.java
@@ -0,0 +1,26 @@
+package gtPlusPlus.core.common.compat;
+
+import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.util.item.UtilsItems;
+import net.minecraft.item.ItemStack;
+
+public class COMPAT_EnderIO {
+
+	public static void OreDict(){
+		run();
+	}
+	
+	private static final void run(){
+		UtilsItems.getItemForOreDict("EnderIO:itemAlloy", "ingotVibrantAlloy", "Vibrant Alloy Ingot", 2);
+		GT_OreDictUnificator.registerOre("plateConductiveIron", new ItemStack(ModItems.itemPlateConductiveIron));
+		GT_OreDictUnificator.registerOre("plateDarkSteel", new ItemStack(ModItems.itemPlateDarkSteel));
+		GT_OreDictUnificator.registerOre("plateElectricalSteel", new ItemStack(ModItems.itemPlateElectricalSteel));
+		GT_OreDictUnificator.registerOre("plateEnergeticAlloy", new ItemStack(ModItems.itemPlateEnergeticAlloy));
+		GT_OreDictUnificator.registerOre("platePulsatingIron", new ItemStack(ModItems.itemPlatePulsatingIron));
+		GT_OreDictUnificator.registerOre("plateRedstoneAlloy", new ItemStack(ModItems.itemPlateRedstoneAlloy));
+		GT_OreDictUnificator.registerOre("plateSoularium", new ItemStack(ModItems.itemPlateSoularium));
+		GT_OreDictUnificator.registerOre("plateVibrantAlloy", new ItemStack(ModItems.itemPlateVibrantAlloy));
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
new file mode 100644
index 0000000000..c77f1475b9
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_ExtraUtils.java
@@ -0,0 +1,33 @@
+package gtPlusPlus.core.common.compat;
+
+import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.lib.CORE.configSwitches;
+import gtPlusPlus.core.recipe.RECIPES_Tools;
+import gtPlusPlus.core.util.item.UtilsItems;
+import gtPlusPlus.core.util.recipe.UtilsRecipe;
+import net.minecraft.item.ItemStack;
+
+public class COMPAT_ExtraUtils {
+
+	public static void OreDict(){
+		RECIPES_Tools.RECIPE_DivisionSigil = new ItemStack(UtilsItems.getItem("ExtraUtilities:divisionSigil"));
+		run();
+
+	}
+
+	private static final void run(){
+		UtilsItems.getItemForOreDict("ExtraUtilities:bedrockiumIngot", "ingotBedrockium", "Bedrockium Ingot", 0);
+		GT_OreDictUnificator.registerOre("plateBedrockium", new ItemStack(ModItems.itemPlateBedrockium));
+
+		if (configSwitches.enableAlternativeDivisionSigilRecipe){
+			//Division Sigil
+			UtilsRecipe.recipeBuilder(
+					"plateNetherStar", "gemIridium", "plateNetherStar",
+					"plateIridium", RECIPES_Tools.craftingToolHardHammer, "plateIridium",
+					"plateNetherStar", "gemIridium", "plateNetherStar",
+					RECIPES_Tools.RECIPE_DivisionSigil);
+		}
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
new file mode 100644
index 0000000000..14ec5dfd4d
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_IC2.java
@@ -0,0 +1,62 @@
+package gtPlusPlus.core.common.compat;
+
+
+import static gtPlusPlus.core.handler.COMPAT_HANDLER.RemoveRecipeQueue;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.lib.CORE.configSwitches;
+import gtPlusPlus.core.recipe.ShapedRecipeObject;
+import gtPlusPlus.core.util.item.UtilsItems;
+import net.minecraft.item.ItemStack;
+
+
+public class COMPAT_IC2 {
+
+	private static ItemStack itemCropnalyzer = UtilsItems.simpleMetaStack("IC2:itemCropnalyzer", 0, 1);
+	private static ItemStack itemSolarHelmet = UtilsItems.simpleMetaStack("IC2:itemSolarHelmet", 0, 1);
+
+	public static ShapedRecipeObject Cropnalyzer = new ShapedRecipeObject(
+			"ore:cableGt02Copper", "ore:cableGt02Copper", null, 
+			"minecraft:redstone", "ore:blockGlass", "minecraft:redstone", 
+			"minecraft:redstone", "ore:circuitBasic", "minecraft:redstone", 
+			itemCropnalyzer);
+	public static ShapedRecipeObject SolarHelmet = new ShapedRecipeObject(
+			"ore:plateIron", "ore:plateIron", "ore:plateIron", 
+			"ore:plateIron", "gregtech:gt.metaitem.01:32750", "ore:plateIron", 
+			"ore:craftingWireCopper", "ore:craftingWireCopper", "ore:craftingWireCopper",
+			itemSolarHelmet);
+
+
+
+	public static void OreDict(){
+		//Get ItemStacks for results
+		/*itemCropnalyzer = UtilsItems.getItemStack("IC2:itemCropnalyzer", 1);	
+		itemSolarHelmet = UtilsItems.getItemStack("IC2:itemSolarHelmet", 1);	*/
+		run();
+	}
+
+	private static final void run(){
+
+		if (configSwitches.disableIC2Recipes){
+
+
+
+			if (LoadedMods.Gregtech){
+				//Fuck these right off.
+				RemoveRecipeQueue.add("IC2:itemCable");
+				RemoveRecipeQueue.add("IC2:itemCable:1");
+				RemoveRecipeQueue.add("IC2:itemCable:2");
+				RemoveRecipeQueue.add("IC2:itemCable:3");
+				RemoveRecipeQueue.add("IC2:itemCable:5");
+				RemoveRecipeQueue.add("IC2:itemCable:6");
+				RemoveRecipeQueue.add("IC2:itemCable:10");
+				RemoveRecipeQueue.add("IC2:itemCable:13");
+				//RemoveRecipeQueue.add(itemCropnalyzer);		
+				//RemoveRecipeQueue.add(itemSolarHelmet);
+
+				//AddRecipeQueue.add(Cropnalyzer);
+				//AddRecipeQueue.add(SolarHelmet);
+			}
+		}
+	}
+
+}
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java
new file mode 100644
index 0000000000..3a996ed849
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_MorePlanets.java
@@ -0,0 +1,37 @@
+package gtPlusPlus.core.common.compat;
+
+import gtPlusPlus.core.util.item.UtilsItems;
+
+public class COMPAT_MorePlanets {
+
+	
+	public static void OreDict(){
+		run();
+	}
+	
+	private final static void run(){
+		//Metals
+		UtilsItems.getItemForOreDict("MorePlanet:kapteyn-b_item", "ingotFrozenIron", "Frozen Iron Ingot", 0);
+		UtilsItems.getItemForOreDict("MorePlanet:kapteyn-b_item", "ingotAnyIron", "Frozen Iron Ingot", 0);
+		UtilsItems.getItemForOreDict("MorePlanet:polongnius_item", "ingotPalladium", "Palladium Ingot", 5);
+		UtilsItems.getItemForOreDict("MorePlanet:fronos_item", "ingotIridium", "Iridium Ingot", 3);
+		UtilsItems.getItemForOreDict("MorePlanet:nibiru_item", "ingotNorium", "Norium Ingot", 1);
+		UtilsItems.getItemForOreDict("MorePlanet:venus_item", "ingotLead", "Lead Ingot", 0);
+		UtilsItems.getItemForOreDict("MorePlanet:diona_item", "ingotQuontonium", "Quontonium Ingot", 0);
+		UtilsItems.getItemForOreDict("MorePlanet:diona_item", "ingotFronisium", "Fronisium Ingot", 1);
+		UtilsItems.getItemForOreDict("MorePlanet:sirius-b_item", "ingotSulfur", "Sulfur Ingot", 3);
+		UtilsItems.getItemForOreDict("MorePlanet:koentus_item", "ingotKoentusMeteoricIron", "Koentus Meteoric Iron Ingot", 4);
+		UtilsItems.getItemForOreDict("MorePlanet:mercury_item", "ingotMetallic", "Metallic Ingot", 2);
+		UtilsItems.getItemForOreDict("MorePlanet:polongnius_item", "ingotPolongiusMeteoricIron", "Polongius Meteoric Iron Ingot", 4);
+		UtilsItems.getItemForOreDict("MorePlanet:mercury_item", "ingotMeteoricSteel", "Meteoric Steel Ingot", 3);
+		UtilsItems.getItemForOreDict("MorePlanet:sirius-b_item", "dustSulfur", "Sulfur Dust", 2);
+		
+		//Gems
+		UtilsItems.getItemForOreDict("MorePlanet:fronos_item", "gemBlackDiamond", "Black Diamond Gem", 2);
+		UtilsItems.getItemForOreDict("MorePlanet:koentus_item", "gemWhiteCrystal", "White Crystal", 0);
+		UtilsItems.getItemForOreDict("MorePlanet:nibiru_item", "gemRedCrystal", "Red Crystal", 0);
+		UtilsItems.getItemForOreDict("MorePlanet:pluto_item", "gemXeonius", "Xeonius Gem", 0);
+		UtilsItems.getItemForOreDict("MorePlanet:kapteyn-b_item", "gemUranium", "Uranium Gem", 1);
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java
new file mode 100644
index 0000000000..d471535e81
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_PneumaticCraft.java
@@ -0,0 +1,17 @@
+package gtPlusPlus.core.common.compat;
+
+import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.item.ModItems;
+import net.minecraft.item.ItemStack;
+
+public class COMPAT_PneumaticCraft {
+
+	public static void OreDict(){
+		run();
+	}
+	
+	private static final void run(){
+		GT_OreDictUnificator.registerOre("plateCompressedIron", new ItemStack(ModItems.itemPlateCompressedIron));		
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java
new file mode 100644
index 0000000000..4db8006a89
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_RFTools.java
@@ -0,0 +1,18 @@
+package gtPlusPlus.core.common.compat;
+
+import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.item.ModItems;
+import net.minecraft.item.ItemStack;
+
+public class COMPAT_RFTools {
+
+	public static void OreDict(){
+		run();
+	}
+	
+	private static final void run(){
+		GT_OreDictUnificator.registerOre("plateDimensionShard", new ItemStack(ModItems.itemPlateDimensionShard));
+		
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java
new file mode 100644
index 0000000000..6d7f08b55d
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_SimplyJetpacks.java
@@ -0,0 +1,18 @@
+package gtPlusPlus.core.common.compat;
+
+import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.item.ModItems;
+import net.minecraft.item.ItemStack;
+
+public class COMPAT_SimplyJetpacks {
+
+	public static void OreDict(){
+		run();
+	}
+	
+	private static final void run(){
+		GT_OreDictUnificator.registerOre("plateEnrichedSoularium", new ItemStack(ModItems.itemPlateEnrichedSoularium));
+		
+	}
+	
+}
diff --git a/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
new file mode 100644
index 0000000000..87fde9fa96
--- /dev/null
+++ b/src/Java/gtPlusPlus/core/common/compat/COMPAT_Thaumcraft.java
@@ -0,0 +1,47 @@
+package gtPlusPlus.core.common.compat;
+
+import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.item.ModItems;
+import gtPlusPlus.core.lib.LoadedMods;
+import gtPlusPlus.core.lib.CORE.configSwitches;
+import gtPlusPlus.core.util.item.UtilsItems;
+import net.minecraft.item.ItemStack;
+
+public class COMPAT_Thaumcraft {
+
+	public static void OreDict(){
+		UtilsItems.getItemForOreDict("Thaumcraft:ItemResource", "ingotVoidMetal", "Void Metal Ingot", 16);
+		GT_OreDictUnificator.registerOre("plateVoidMetal", new ItemStack(ModItems.itemPlateVoidMetal));
+		if (configSwitches.enableThaumcraftShardUnification){
+			run();
+		}
+	}
+
+	private static final void run(){
+
+		for(int i=0; i<=6; i++){
+			//Utils.LOG_INFO(""+i);
+			UtilsItems.getItemForOreDict("Thaumcraft:ItemShard", "shardAny", "TC Shard "+i, i);
+			GT_OreDictUnificator.registerOre("shardAny", UtilsItems.getItemStack("Thaumcraft:ItemShard:"+i, 1));
+			UtilsItems.getItemForOreDict("Thaumcraft:ItemShard", "gemInfusedAnything", "TC Shard "+i, i);
+			GT_OreDictUnificator.registerOre("gemInfusedAnything", UtilsItems.getItemStack("Thaumcraft:ItemShard:"+i, 1));
+			//System.out.println("TC Shard registration count is: "+i);        
+		}
+
+		if (LoadedMods.ForbiddenMagic){
+			for(int i=0; i<=6; i++){
+				//Utils.LOG_INFO(""+i);
+				UtilsItems.getItemForOreDict("ForbiddenMagic:NetherShard", "shardAny", "FM Shard "+i, i);
+				GT_OreDictUnificator.registerOre("shardAny", UtilsItems.getItemStack("ForbiddenMagic:NetherShard:"+i, 1));
+				UtilsItems.getItemForOreDict("ForbiddenMagic:NetherShard", "gemInfusedAnything", "FM Shard "+i, i);
+				GT_OreDictUnificator.registerOre("gemInfusedAnything", UtilsItems.getItemStack("ForbiddenMagic:NetherShard:"+i, 1));
+				//System.out.println("TC Shard registration count is: "+i);        
+			}
+			UtilsItems.getItemForOreDict("ForbiddenMagic:GluttonyShard", "shardAny", "FM Gluttony Shard", 0);
+			GT_OreDictUnificator.registerOre("shardAny", UtilsItems.getItemStack("ForbiddenMagic:GluttonyShard", 1));
+			UtilsItems.getItemForOreDict("ForbiddenMagic:GluttonyShard", "gemInfusedAnything", "FM Gluttony Shard", 0);
+			GT_OreDictUnificator.registerOre("gemInfusedAnything", UtilsItems.getItemStack("ForbiddenMagic:GluttonyShard", 1));	
+		}
+	}
+
+}