+ Added some Computronics recipes I half rely upon if it's not installed.

5 files changed, 58 insertions, 1 deletions

diff --git a/.classpath b/.classpath
index 63adf24f81..ea1e3f1774 100644
--- a/.classpath
+++ b/.classpath
@@ -8,11 +8,11 @@
 	<classpathentry kind="lib" path="libs/Waila-1.5.10_1.7.10-deobf.jar"/>
 	<classpathentry kind="lib" path="libs/EnderIO-1.7.10-2.2.8.381-dev.jar" sourcepath="libsrc/EnderIO-1.7.10-2.2.8.381-sources.jar"/>
 	<classpathentry kind="lib" path="C:/eclipse/workspace/GTplusplus/libs/Railcraft_1.7.10-9.9.0.0.jar"/>
-	<classpathentry kind="lib" path="C:/eclipse/workspace/GTplusplus/libs/growthcraft-1.7.10-2.3.1-complete.jar"/>
 	<classpathentry kind="lib" path="C:/eclipse/workspace/GTplusplus/libs/CoFHCore-[1.7.10]3.0.3-303.jar"/>
 	<classpathentry kind="lib" path="libs/Baubles-deobf-1.7.10-1.0.1.10.jar"/>
 	<classpathentry kind="lib" path="libs/forestry_1.7.10-4.2.2.50-deobf.jar" sourcepath="/Forestry42/src/main/java"/>
 	<classpathentry kind="lib" path="libs/industrialcraft-2-2.2.783-experimental-deobf.jar"/>
 	<classpathentry kind="lib" path="libs/gregtech_1.7.10-5.08.30-dev.jar"/>
+	<classpathentry kind="lib" path="libs/growthcraft-1.7.10-2.3.1-complete.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
index 97b7369134..ccf2b83837 100644
--- a/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
+++ b/src/Java/gtPlusPlus/core/handler/COMPAT_IntermodStaging.java
@@ -1,5 +1,6 @@
 package gtPlusPlus.core.handler;
 
+import gtPlusPlus.xmod.Computronics.HANDLER_Computronics;
 import gtPlusPlus.xmod.forestry.HANDLER_FR;
 import gtPlusPlus.xmod.gregtech.HANDLER_GT;
 import gtPlusPlus.xmod.growthcraft.HANDLER_GC;
@@ -16,6 +17,7 @@ public class COMPAT_IntermodStaging {
 		HANDLER_FR.preInit();
 		HANDLER_Psych.preInit();
 		HANDLER_IC2.preInit();
+		HANDLER_Computronics.preInit();
 		
 	}
 
@@ -26,6 +28,7 @@ public class COMPAT_IntermodStaging {
 		HANDLER_FR.Init();
 		HANDLER_Psych.init();
 		HANDLER_IC2.init();
+		HANDLER_Computronics.init();
 	}
 
 	public static void postInit(){
@@ -35,6 +38,7 @@ public class COMPAT_IntermodStaging {
 		HANDLER_FR.postInit();
 		HANDLER_Psych.postInit();
 		HANDLER_IC2.postInit();
+		HANDLER_Computronics.postInit();
 	}
 
 
diff --git a/src/Java/gtPlusPlus/core/lib/LoadedMods.java b/src/Java/gtPlusPlus/core/lib/LoadedMods.java
index 1585fe06b3..440f72d2c8 100644
--- a/src/Java/gtPlusPlus/core/lib/LoadedMods.java
+++ b/src/Java/gtPlusPlus/core/lib/LoadedMods.java
@@ -34,6 +34,8 @@ public class LoadedMods {
 	public static boolean MiscUtils = true; //Dummy For MetaData Lookups in MT Wrapper
 	public static boolean ThermalFoundation = false;
 	public static boolean IHL = false;
+	public static boolean OpenComputers = false; //OpenComputers
+	public static boolean Computronics = false; //computronics
 	
 
 	
@@ -181,6 +183,16 @@ public class LoadedMods {
 			Utils.LOG_INFO("Components enabled for: Baubles");
 			totalMods++;
 		}
+		if (Loader.isModLoaded("OpenComputers") == true){
+			OpenComputers  = true;
+			Utils.LOG_INFO("Components enabled for: OpenComputers");
+			totalMods++;
+		}
+		if (Loader.isModLoaded("computronics") == true){
+			Computronics  = true;
+			Utils.LOG_INFO("Components enabled for: Computronics");
+			totalMods++;
+		}
 	
 		Utils.LOG_INFO("Content found for "+totalMods+" mods");
 		
diff --git a/src/Java/gtPlusPlus/xmod/Computronics/HANDLER_Computronics.java b/src/Java/gtPlusPlus/xmod/Computronics/HANDLER_Computronics.java
new file mode 100644
index 0000000000..c83441c350
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/Computronics/HANDLER_Computronics.java
@@ -0,0 +1,41 @@
+package gtPlusPlus.xmod.Computronics;
+
+import gregtech.GT_Mod;
+import gregtech.api.enums.GT_Values;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Materials;
+import gregtech.api.enums.OrePrefixes;
+import gregtech.api.util.GT_OreDictUnificator;
+import gtPlusPlus.core.lib.LoadedMods;
+
+public class HANDLER_Computronics {
+
+	public static void preInit(){
+		if (LoadedMods.Computronics){
+
+		}
+
+	}
+
+	public static void init(){
+		if (LoadedMods.Computronics){
+
+		}
+		else {
+			GT_Mod.gregtechproxy.addFluid("Argon", "Argon", Materials.Argon, 2, 295, GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Argon, 1L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Empty, 1L), 1000);
+			GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 1L), Materials.Air.getGas(1000L), Materials.Nitrogen.getGas(780L), 1600, 32, false);
+			GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 2L), Materials.Air.getGas(1000L), Materials.Oxygen.getGas(210L), 1600, 128, false);
+			GT_Values.RA.addDistilleryRecipe(ItemList.Circuit_Integrated.getWithDamage(0L, 3L), Materials.Air.getGas(1000L), Materials.Argon.getGas(5L), 6000, 512, false);
+			GT_Values.RA.addElectrolyzerRecipe(ItemList.Cell_Air.get(1), null, null, Materials.Air.getGas(2000L), ItemList.Cell_Empty.get(1), null, null, null, null, null, null, 800, 30);
+		}
+	}
+
+	public static void postInit(){
+		if (LoadedMods.Computronics){
+
+		}
+
+	}
+
+
+}
diff --git a/src/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png b/src/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png
new file mode 100644
index 0000000000..8e7cfbfa9f
--- /dev/null
+++ b/src/resources/assets/gregtech/textures/blocks/fluids/fluid.argon.png