naq line skip (#113)

* naq line skip

* fix dead lock

2 files changed, 181 insertions, 6 deletions

diff --git a/src/main/java/goodgenerator/items/MyMaterial.java b/src/main/java/goodgenerator/items/MyMaterial.java
index a0a4f08b47..bac634ffb1 100644
--- a/src/main/java/goodgenerator/items/MyMaterial.java
+++ b/src/main/java/goodgenerator/items/MyMaterial.java
@@ -598,7 +598,7 @@ public class MyMaterial implements Runnable {
             new short[] {0xc0, 0x92, 0xa8},
             "Titanium Trifluoride",
             subscriptNumbers("TiF3"),
-            new Werkstoff.Stats().setElektrolysis(true),
+            new Werkstoff.Stats().setElektrolysis(false),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().disable().onlyDust(),
             OffsetID + 54,
@@ -620,7 +620,7 @@ public class MyMaterial implements Runnable {
             new short[] {0xa6, 0xa6, 0xa6},
             "Gallium Hydroxide",
             subscriptNumbers("Ga(OH)3"),
-            new Werkstoff.Stats().setElektrolysis(true),
+            new Werkstoff.Stats().setElektrolysis(false),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().disable().onlyDust(),
             OffsetID + 56,
@@ -742,7 +742,7 @@ public class MyMaterial implements Runnable {
             new short[] {0xda, 0xda, 0xda},
             "Trinium Sulphate",
             subscriptNumbers("KeSO4"),
-            new Werkstoff.Stats().setElektrolysis(true),
+            new Werkstoff.Stats().setElektrolysis(false),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().disable().onlyDust(),
             OffsetID + 67,
@@ -775,7 +775,7 @@ public class MyMaterial implements Runnable {
             new short[] {0x52, 0x39, 0x39},
             "Enriched-Naquadah Sulphate",
             "Nq" + CharExchanger.shifter(8314) + subscriptNumbers("(SO4)2"),
-            new Werkstoff.Stats().setRadioactive(true).setElektrolysis(true),
+            new Werkstoff.Stats().setRadioactive(true).setElektrolysis(false),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().disable().onlyDust(),
             OffsetID + 70,
@@ -798,7 +798,7 @@ public class MyMaterial implements Runnable {
             new short[] {0x2b, 0x2e, 0x70},
             "Indium Phosphate",
             subscriptNumbers("InPO4"),
-            new Werkstoff.Stats().setToxic(true).setElektrolysis(true),
+            new Werkstoff.Stats().setToxic(true).setElektrolysis(false),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().disable().onlyDust(),
             OffsetID + 72,
@@ -851,7 +851,7 @@ public class MyMaterial implements Runnable {
             new short[] {0x1f, 0x1e, 0x33},
             "Naquadria Sulphate",
             subscriptNumbers("Nq*(SO4)2"),
-            new Werkstoff.Stats().setRadioactive(true).setToxic(true).setElektrolysis(true),
+            new Werkstoff.Stats().setRadioactive(true).setToxic(true).setElektrolysis(false),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().disable().onlyDust(),
             OffsetID + 77,
@@ -1385,6 +1385,36 @@ public class MyMaterial implements Runnable {
             OffsetID + 111,
             TextureSet.SET_SHINY);
 
+    public static final Werkstoff inertNaquadah = new Werkstoff(
+            new short[] {0x3b, 0x3b, 0x3b},
+            "Inert Naquadah",
+            new Werkstoff.Stats(),
+            Werkstoff.Types.MATERIAL,
+            new Werkstoff.GenerationFeatures().disable().onlyDust(),
+            OffsetID + 112,
+            TextureSet.SET_METALLIC,
+            new Pair<>(Naquadah, 1));
+
+    public static final Werkstoff inertEnrichedNaquadah = new Werkstoff(
+            new short[] {0x61, 0x44, 0x44},
+            "Inert Enriched Naquadah",
+            new Werkstoff.Stats().setRadioactive(true),
+            Werkstoff.Types.MATERIAL,
+            new Werkstoff.GenerationFeatures().disable().onlyDust(),
+            OffsetID + 113,
+            TextureSet.SET_METALLIC,
+            new Pair<>(NaquadahEnriched, 1));
+
+    public static final Werkstoff inertNaquadria = new Werkstoff(
+            new short[] {0x00, 0x00, 0x00},
+            "Inert Naquadria",
+            new Werkstoff.Stats().setRadioactive(true),
+            Werkstoff.Types.MATERIAL,
+            new Werkstoff.GenerationFeatures().disable().onlyDust(),
+            OffsetID + 114,
+            TextureSet.SET_METALLIC,
+            new Pair<>(Naquadria, 1));
+
     @Override
     public void run() {}
 }
diff --git a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
index 156e7b1481..08685d0b70 100644
--- a/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
+++ b/src/main/java/goodgenerator/loader/NaquadahReworkRecipeLoader.java
@@ -17,6 +17,8 @@ import gregtech.api.enums.OrePrefixes;
 import gregtech.api.util.*;
 import gregtech.common.items.CombType;
 import gregtech.loaders.misc.GT_Bees;
+import gtPlusPlus.core.item.chemistry.GenericChem;
+import gtPlusPlus.core.lib.CORE;
 import java.lang.reflect.*;
 import java.util.HashSet;
 import net.minecraft.item.ItemStack;
@@ -31,12 +33,155 @@ import net.minecraftforge.oredict.ShapedOreRecipe;
 import net.minecraftforge.oredict.ShapelessOreRecipe;
 import org.apache.commons.lang3.reflect.FieldUtils;
 
+@SuppressWarnings("deprecation")
 public class NaquadahReworkRecipeLoader {
 
     public static void RecipeLoad() {
 
         if (!EnableNaquadahRework) return;
 
+        if (LoadedList.GTPP) {
+            try {
+                // Naquadah (UEV)
+                CORE.RA.addQuantumTransformerRecipe(
+                        new ItemStack[] {
+                            naquadahEarth.get(OrePrefixes.dust, 32),
+                            Materials.SodiumHydroxide.getDust(64),
+                            GT_Utility.copyAmount(0, GenericChem.mSimpleNaquadahCatalyst)
+                        },
+                        new FluidStack[] {fluoroantimonicAcid.getFluidOrGas(16000), P507.getFluidOrGas(10)},
+                        new FluidStack[] {},
+                        new ItemStack[] {
+                            inertNaquadah.get(OrePrefixes.dust, 64),
+                            Materials.Titanium.getDust(64),
+                            Materials.Adamantium.getDust(64),
+                            Materials.Gallium.getDust(64)
+                        },
+                        new int[] {2500, 2500, 2500, 2500},
+                        20 * 20,
+                        (int) GT_Values.VP[9],
+                        2);
+                // Enriched Naquadah (UIV)
+                CORE.RA.addQuantumTransformerRecipe(
+                        new ItemStack[] {
+                            enrichedNaquadahEarth.get(OrePrefixes.dust, 32),
+                            Materials.Zinc.getDust(64),
+                            GT_Utility.copyAmount(0, GenericChem.mAdvancedNaquadahCatalyst)
+                        },
+                        new FluidStack[] {Materials.SulfuricAcid.getFluid(16000), P507.getFluidOrGas(10)},
+                        new FluidStack[] {wasteLiquid.getFluidOrGas(32000)},
+                        new ItemStack[] {
+                            inertEnrichedNaquadah.get(OrePrefixes.dust, 64),
+                            Materials.Trinium.getDust(64),
+                            ItemList.NaquadriaSupersolid.get(1)
+                        },
+                        new int[] {3300, 3300, 3300},
+                        20 * 20,
+                        (int) GT_Values.VP[11],
+                        3);
+                // Naquadria (UMV)
+                CORE.RA.addQuantumTransformerRecipe(
+                        new ItemStack[] {
+                            naquadriaEarth.get(OrePrefixes.dust, 32),
+                            Materials.Magnesium.getDust(64),
+                            GT_Utility.copyAmount(0, GenericChem.mAdvancedNaquadahCatalyst)
+                        },
+                        new FluidStack[] {
+                            Materials.PhosphoricAcid.getFluid(16000),
+                            Materials.SulfuricAcid.getFluid(16000),
+                            P507.getFluidOrGas(10)
+                        },
+                        new FluidStack[] {},
+                        new ItemStack[] {
+                            inertNaquadria.get(OrePrefixes.dust, 64),
+                            Materials.Barium.getDust(64),
+                            Materials.Indium.getDust(64)
+                        },
+                        new int[] {3300, 3300, 3300},
+                        20 * 20,
+                        (int) GT_Values.VP[12],
+                        4);
+                // Activate Them
+                MyRecipeAdder.instance.addNeutronActivatorRecipe(
+                        new FluidStack[] {Materials.Nickel.getPlasma(2880)},
+                        new ItemStack[] {
+                            inertNaquadah.get(OrePrefixes.dust, 64),
+                            inertNaquadah.get(OrePrefixes.dust, 64),
+                            inertNaquadah.get(OrePrefixes.dust, 64),
+                            inertNaquadah.get(OrePrefixes.dust, 64),
+                            inertNaquadah.get(OrePrefixes.dust, 64),
+                            inertNaquadah.get(OrePrefixes.dust, 64),
+                        },
+                        new FluidStack[] {Materials.Nickel.getMolten(2880)},
+                        new ItemStack[] {
+                            Materials.Naquadah.getDust(64),
+                            Materials.Naquadah.getDust(64),
+                            Materials.Naquadah.getDust(64),
+                            Materials.Naquadah.getDust(64),
+                            Materials.Naquadah.getDust(64),
+                            Materials.Naquadah.getDust(64),
+                            Materials.Naquadah.getDust(64),
+                            Materials.Naquadah.getDust(64),
+                            Materials.Naquadah.getDust(64),
+                        },
+                        2000,
+                        600,
+                        500);
+                MyRecipeAdder.instance.addNeutronActivatorRecipe(
+                        new FluidStack[] {Materials.Titanium.getPlasma(2880)},
+                        new ItemStack[] {
+                            inertEnrichedNaquadah.get(OrePrefixes.dust, 64),
+                            inertEnrichedNaquadah.get(OrePrefixes.dust, 64),
+                            inertEnrichedNaquadah.get(OrePrefixes.dust, 64),
+                            inertEnrichedNaquadah.get(OrePrefixes.dust, 64),
+                            inertEnrichedNaquadah.get(OrePrefixes.dust, 64),
+                            inertEnrichedNaquadah.get(OrePrefixes.dust, 64),
+                        },
+                        new FluidStack[] {Materials.Titanium.getMolten(2880)},
+                        new ItemStack[] {
+                            Materials.NaquadahEnriched.getDust(64),
+                            Materials.NaquadahEnriched.getDust(64),
+                            Materials.NaquadahEnriched.getDust(64),
+                            Materials.NaquadahEnriched.getDust(64),
+                            Materials.NaquadahEnriched.getDust(64),
+                            Materials.NaquadahEnriched.getDust(64),
+                            Materials.NaquadahEnriched.getDust(64),
+                            Materials.NaquadahEnriched.getDust(64),
+                            Materials.NaquadahEnriched.getDust(64),
+                        },
+                        2000,
+                        900,
+                        850);
+                MyRecipeAdder.instance.addNeutronActivatorRecipe(
+                        new FluidStack[] {Materials.Americium.getPlasma(2880)},
+                        new ItemStack[] {
+                            inertNaquadria.get(OrePrefixes.dust, 64),
+                            inertNaquadria.get(OrePrefixes.dust, 64),
+                            inertNaquadria.get(OrePrefixes.dust, 64),
+                            inertNaquadria.get(OrePrefixes.dust, 64),
+                            inertNaquadria.get(OrePrefixes.dust, 64),
+                            inertNaquadria.get(OrePrefixes.dust, 64),
+                        },
+                        new FluidStack[] {Materials.Americium.getMolten(2880)},
+                        new ItemStack[] {
+                            Materials.Naquadria.getDust(64),
+                            Materials.Naquadria.getDust(64),
+                            Materials.Naquadria.getDust(64),
+                            Materials.Naquadria.getDust(64),
+                            Materials.Naquadria.getDust(64),
+                            Materials.Naquadria.getDust(64),
+                            Materials.Naquadria.getDust(64),
+                            Materials.Naquadria.getDust(64),
+                            Materials.Naquadria.getDust(64),
+                        },
+                        2000,
+                        1100,
+                        1080);
+            } catch (Throwable t) {
+                // Cry about it
+            }
+        }
+
         // Fix shit
         GT_Values.RA.addPulveriserRecipe(
                 lowQualityNaquadriaSolution.get(OrePrefixes.cell, 1),