GTpp compat

6 files changed, 69 insertions, 7 deletions

diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/aOredictDequantizationInfo.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/aOredictDequantizationInfo.java
index bd9da066b2..0f71d1e017 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/aOredictDequantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/aOredictDequantizationInfo.java
@@ -26,12 +26,18 @@ public class aOredictDequantizationInfo implements iExchangeInfo {
         amount = qty;
     }
 
-    public aOredictDequantizationInfo(iHasElementalDefinition emIn, OrePrefixes prefix, Materials material,  int qty) {
+    public aOredictDequantizationInfo(iHasElementalDefinition emIn, OrePrefixes prefix, Materials material, int qty) {
         in = emIn;
         out = OreDictionary.getOreID(prefix.name() + material.mName);
         amount = qty;
     }
 
+    public aOredictDequantizationInfo(iHasElementalDefinition emIn, OrePrefixes prefix, String materialName, int qty) {
+        in = emIn;
+        out = OreDictionary.getOreID(prefix.name() + materialName);
+        amount = qty;
+    }
+
     @Override
     public iHasElementalDefinition input() {
         return in.clone();//MEH!
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/aOredictQuantizationInfo.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/aOredictQuantizationInfo.java
index d285fddbdc..61c6a39064 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/aOredictQuantizationInfo.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/aOredictQuantizationInfo.java
@@ -32,6 +32,12 @@ public class aOredictQuantizationInfo implements iExchangeInfo {
         out=emOut;
     }
 
+    public aOredictQuantizationInfo( OrePrefixes prefix, String materialName, int qty, iHasElementalDefinition emOut){
+        in=OreDictionary.getOreID(prefix.name() + materialName);
+        amount=qty;
+        out=emOut;
+    }
+
     @Override
     public Integer input() {
         return in;
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/classes/bTransformationInfo.java b/src/main/java/com/github/technus/tectech/elementalMatter/classes/bTransformationInfo.java
index 9c9b4779ff..5434c65d8f 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/classes/bTransformationInfo.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/classes/bTransformationInfo.java
@@ -75,8 +75,13 @@ public class bTransformationInfo {
         oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,name,qty));
     }
 
-    public void addOredict(iHasElementalDefinition em, OrePrefixes prefix, Materials material,  int qty){
+    public void addOredict(iHasElementalDefinition em, OrePrefixes prefix, Materials material, int qty){
         oredictQuantization.put(OreDictionary.getOreID(prefix.name() + material.mName),new aOredictQuantizationInfo(prefix,material,qty,em));
         oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,prefix,material,qty));
     }
+
+    public void addOredict(iHasElementalDefinition em, OrePrefixes prefix, String materialName, int qty){
+        oredictQuantization.put(OreDictionary.getOreID(prefix.name() + materialName),new aOredictQuantizationInfo(prefix,materialName,qty,em));
+        oredictDequantization.put(em.getDefinition(),new aOredictDequantizationInfo(em,prefix,materialName,qty));
+    }
 }
diff --git a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java
index 81be90e62f..5108c409cd 100644
--- a/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java
+++ b/src/main/java/com/github/technus/tectech/elementalMatter/definitions/dAtomDefinition.java
@@ -4,6 +4,8 @@ import com.github.technus.tectech.TecTech;
 import com.github.technus.tectech.auxiliary.TecTechConfig;
 import com.github.technus.tectech.elementalMatter.classes.*;
 import com.github.technus.tectech.elementalMatter.interfaces.iElementalDefinition;
+import com.github.technus.tectech.gtppAddon.GtppAtomLoader;
+import cpw.mods.fml.common.Loader;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.objects.XSTR;
@@ -727,6 +729,8 @@ public final class dAtomDefinition extends cElementalDefinition {
         } catch (tElementalException e) {
             if (TecTechConfig.DEBUG_MODE) e.printStackTrace();
         }
+
+        if(Loader.isModLoaded("miscutils")) new GtppAtomLoader().run();
     }
 
     public static dAtomDefinition getFirstStableIsotope(int element) {
diff --git a/src/main/java/com/github/technus/tectech/gtppAddon/GtppAtomLoader.java b/src/main/java/com/github/technus/tectech/gtppAddon/GtppAtomLoader.java
new file mode 100644
index 0000000000..1cefb4c170
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/gtppAddon/GtppAtomLoader.java
@@ -0,0 +1,45 @@
+package com.github.technus.tectech.gtppAddon;
+
+import com.github.technus.tectech.elementalMatter.classes.cElementalDefinitionStack;
+import gregtech.api.enums.OrePrefixes;
+import gtPlusPlus.core.material.ELEMENT;
+import gtPlusPlus.core.material.MaterialGenerator;
+
+import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.getBestUnstableIsotope;
+import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.getFirstStableIsotope;
+import static com.github.technus.tectech.elementalMatter.definitions.dAtomDefinition.transformation;
+
+public class GtppAtomLoader implements Runnable{
+    @Override
+    public void run() {
+        transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(10), 144), ELEMENT.getInstance().NEON.getFluid(144));
+        MaterialGenerator.generate(ELEMENT.getInstance().GERMANIUM);
+        transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(32), 144), OrePrefixes.dust, ELEMENT.getInstance().GERMANIUM.getUnlocalizedName(),1);
+        transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(34), 144), OrePrefixes.dust, ELEMENT.getInstance().SELENIUM.getUnlocalizedName(),1);
+        transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(35), 144), ELEMENT.getInstance().BROMINE.getFluid(144));
+        transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(36), 144), ELEMENT.getInstance().KRYPTON.getFluid(144));
+        transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(40), 144),OrePrefixes.dust, ELEMENT.getInstance().ZIRCONIUM.getUnlocalizedName(),1);
+        transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(43), 144),OrePrefixes.dust, ELEMENT.getInstance().TECHNETIUM.getUnlocalizedName(),1);
+        transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(44), 144),OrePrefixes.dust, ELEMENT.getInstance().RUTHENIUM.getUnlocalizedName(),1);
+        transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(45), 144),OrePrefixes.dust, ELEMENT.getInstance().RHODIUM.getUnlocalizedName(),1);
+        transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(53), 144),OrePrefixes.dust, ELEMENT.getInstance().IODINE.getUnlocalizedName(),1);
+        transformation.addFluid(new cElementalDefinitionStack(getFirstStableIsotope(54), 144),ELEMENT.getInstance().XENON.getFluid(144));
+        transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(72), 144),OrePrefixes.dust, ELEMENT.getInstance().HAFNIUM.getUnlocalizedName(),1);
+        transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(75), 144),OrePrefixes.dust, ELEMENT.getInstance().RHENIUM.getUnlocalizedName(),1);
+        transformation.addOredict(new cElementalDefinitionStack(getFirstStableIsotope(81), 144),OrePrefixes.dust, ELEMENT.getInstance().THALLIUM.getUnlocalizedName(),1);
+
+        transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(84),144),OrePrefixes.dust, ELEMENT.getInstance().POLONIUM.getUnlocalizedName(),1);
+        transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(85),144),OrePrefixes.dust, ELEMENT.getInstance().ASTATINE.getUnlocalizedName(),1);
+        transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(87),144),OrePrefixes.dust, ELEMENT.getInstance().FRANCIUM.getUnlocalizedName(),1);
+        transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(88),144),OrePrefixes.dust, ELEMENT.getInstance().RADIUM.getUnlocalizedName(),1);
+        transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(89),144),OrePrefixes.dust, ELEMENT.getInstance().ACTINIUM.getUnlocalizedName(),1);
+        transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(91),144),OrePrefixes.dust, ELEMENT.getInstance().PROTACTINIUM.getUnlocalizedName(),1);
+        transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(93),144),OrePrefixes.dust, ELEMENT.getInstance().NEPTUNIUM.getUnlocalizedName(),1);
+
+        transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(96),144),OrePrefixes.dust, ELEMENT.getInstance().CURIUM.getUnlocalizedName(),1);
+        transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(97),144),OrePrefixes.dust, ELEMENT.getInstance().BERKELIUM.getUnlocalizedName(),1);
+        transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(98),144),OrePrefixes.dust, ELEMENT.getInstance().CALIFORNIUM.getUnlocalizedName(),1);
+        transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(99),144),OrePrefixes.dust, ELEMENT.getInstance().EINSTEINIUM.getUnlocalizedName(),1);
+        transformation.addOredict(new cElementalDefinitionStack(getBestUnstableIsotope(100),144),OrePrefixes.dust, ELEMENT.getInstance().FERMIUM.getUnlocalizedName(),1);
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java b/src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java
index f893b70cf6..b07aeb9bd8 100644
--- a/src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/BloodyRecipeLoader.java
@@ -1,15 +1,11 @@
 package com.github.technus.tectech.loader;
 
-import com.github.technus.tectech.recipe.TT_recipeAdder;
-import net.minecraft.init.Blocks;
-import net.minecraft.item.ItemStack;
-
 /**
  * Created by Tec on 06.08.2017.
  */
 public class BloodyRecipeLoader implements Runnable {
     @Override
     public void run() {
-        TT_recipeAdder.addResearchableAssemblylineRecipe(new ItemStack(Blocks.cobblestone),100,new ItemStack[]{new ItemStack(Blocks.stone)},null,new ItemStack(Blocks.stone_button),30,30);
+
     }
 }