Merge pull request #45 from GTNewHorizons/Silicon-Alu-change

Silicon alu change

Former-commit-id: 7168a7d07b6553c0eb3f9be4ba9beee503025217

2 files changed, 32 insertions, 21 deletions

diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
index ac747e00b0..70733182a1 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/common/loaders/RecipeLoader.java
@@ -965,6 +965,16 @@ public class RecipeLoader {
                     BW_Util.getMachineVoltageFromTier(6)
             );
         }
+        GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.Forsterit.get(OrePrefixes.dust, 7), GT_Values.NI, GT_Values.NF, Materials.Oxygen.getGas(2000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnesium, 2L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 200, 90);
+        GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.RedZircon.get(OrePrefixes.dust, 6), GT_Values.NI, GT_Values.NF, Materials.Oxygen.getGas(2000L), WerkstoffLoader.Zirconium.get(OrePrefixes.dust, 1), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 250, 90);
+        GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.Fayalit.get(OrePrefixes.dust, 7), GT_Values.NI, GT_Values.NF, Materials.Oxygen.getGas(2000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 2L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 320, 90);
+        GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.Prasiolite.get(OrePrefixes.dust, 16), GT_Values.NI, GT_Values.NF, GT_Values.NF, GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 5L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L), GT_Values.NI, GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 580, 90);
+        GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.Hedenbergit.get(OrePrefixes.dust, 10), GT_Values.NI, GT_Values.NF, Materials.Oxygen.getGas(2000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Calcium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 2L), GT_Values.NI, GT_Values.NI, GT_Values.NI, null, 300, 90);
+        GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.FuchsitAL.get(OrePrefixes.dust, 21), ItemList.Cell_Empty.get(2), GT_Values.NF, Materials.Oxygen.getGas(2000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 3L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), GT_Values.NI, GT_Values.NI, null, 390, 120);
+        GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.FuchsitCR.get(OrePrefixes.dust, 21), ItemList.Cell_Empty.get(2), GT_Values.NF, Materials.Oxygen.getGas(2000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Potassium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 3L), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 2), GT_Values.NI, GT_Values.NI, null, 460, 120);
+        GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.VanadioOxyDravit.get(OrePrefixes.dust, 53), ItemList.Cell_Empty.get(3), GT_Values.NF, Materials.Oxygen.getGas(19000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Vanadium, 3L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnalium, 6L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3), null, 710, 120);
+        GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.ChromoAluminoPovondrait.get(OrePrefixes.dust, 53), ItemList.Cell_Empty.get(3), GT_Values.NF, Materials.Oxygen.getGas(19000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Chrome, 3L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Magnalium, 6L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 3), null, 720, 120);
+        GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.FluorBuergerit.get(OrePrefixes.dust, 50), ItemList.Cell_Empty.get(1), GT_Values.NF, Materials.Oxygen.getGas(6000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Iron, 3L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 6L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Fluorine, 3), null, 730, 120);
+        GT_Values.RA.addElectrolyzerRecipe(WerkstoffLoader.Olenit.get(OrePrefixes.dust, 51), ItemList.Cell_Empty.get(1), GT_Values.NF, Materials.Oxygen.getGas(1000L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Sodium, 1L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Aluminiumoxide, 9L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.SiliconDioxide, 6L), GT_OreDictUnificator.get(OrePrefixes.dust, Materials.Boron, 3), GT_OreDictUnificator.get(OrePrefixes.cell, Materials.Hydrogen, 1), GT_Values.NI, null, 790, 120);
     }
-
 }
diff --git a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
index dbb486f555..593c48dcd9 100644
--- a/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
+++ b/src/main/java/com/github/bartimaeusnek/bartworks/system/material/WerkstoffLoader.java
@@ -248,11 +248,12 @@ public class WerkstoffLoader {
             new short[]{0x20, 0x20, 0x20, 0},
             "Fluor-Buergerite",
             subscriptNumbers("NaFe3Al6(Si6O18)(BO3)3O3F"),
+            new Werkstoff.Stats().setElektrolysis(false),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().addGems(),
             5,
             TextureSet.SET_RUBY,
-            Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon),
+            Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide),
             new Pair<>(Materials.Sodium, 1),
             new Pair<>(Materials.Iron, 3),
             new Pair<>(Materials.Aluminium, 6),
@@ -275,12 +276,12 @@ public class WerkstoffLoader {
             new short[]{0, 0x79, 0x6A, 0},
             "Chromo-Alumino-Povondraite",
             subscriptNumbers("NaCr3(Al4Mg2)(Si6O18)(BO3)3(OH)3O"),
-            Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND),
+            Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND).setElektrolysis(false),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().addGems(),
             7,
             TextureSet.SET_RUBY,
-            Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon),
+            Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide),
             new Pair<>(Materials.Sodium, 1),
             new Pair<>(Materials.Chrome, 3),
             new Pair<>(Materials.Magnalium, 6),
@@ -293,12 +294,12 @@ public class WerkstoffLoader {
             new short[]{0x60, 0xA0, 0xA0, 0},
             "Vanadio-Oxy-Dravite",
             subscriptNumbers("NaV3(Al4Mg2)(Si6O18)(BO3)3(OH)3O"),
-            Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND),
+            Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND).setElektrolysis(false),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().addGems(),
             8,
             TextureSet.SET_RUBY,
-            Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon),
+            Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide),
             new Pair<>(Materials.Sodium, 1),
             new Pair<>(Materials.Vanadium, 3),
             new Pair<>(Materials.Magnalium, 6),
@@ -311,12 +312,12 @@ public class WerkstoffLoader {
             new short[]{210, 210, 210, 0},
             "Olenite",
             subscriptNumbers("NaAl3Al6(Si6O18)(BO3)3O3OH"),
-            Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND),
+            Werkstoff.Types.getDefaultStatForType(Werkstoff.Types.COMPOUND).setElektrolysis(false),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().addGems(),
             9,
             TextureSet.SET_RUBY,
-            Arrays.asList(Materials.Sodium, Materials.Boron, Materials.Silicon),
+            Arrays.asList(Materials.Sodium, Materials.Boron, Materials.SiliconDioxide),
             new Pair<>(Materials.Sodium, 1),
             new Pair<>(Materials.Aluminium, 9),
             new Pair<>(Materials.Silicon, 6),
@@ -433,12 +434,12 @@ public class WerkstoffLoader {
     public static final Werkstoff RedZircon = new Werkstoff(
             new short[]{195, 19, 19, 0},
             "Red Zircon",
-            new Werkstoff.Stats().setElektrolysis(true).setMeltingPoint(2130),
+            new Werkstoff.Stats().setElektrolysis(false).setMeltingPoint(2130),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().addGems(),
             19,
             TextureSet.SET_GEM_VERTICAL,
-            Arrays.asList(WerkstoffLoader.Zirconium, Materials.Silicon),
+            Arrays.asList(WerkstoffLoader.Zirconium, Materials.SiliconDioxide),
             new Pair<>(WerkstoffLoader.Zirconium, 1),
             new Pair<>(Materials.Silicon, 1),
             new Pair<>(Materials.Oxygen, 4)
@@ -483,12 +484,12 @@ public class WerkstoffLoader {
     public static final Werkstoff Fayalit = new Werkstoff(
             new short[]{50, 50, 50, 0},
             "Fayalite",
-            new Werkstoff.Stats().setElektrolysis(true),
+            new Werkstoff.Stats().setElektrolysis(false),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().addGems(),
             23,
             TextureSet.SET_QUARTZ,
-            Arrays.asList(Materials.Iron, Materials.Silicon),
+            Arrays.asList(Materials.Iron, Materials.SiliconDioxide),
             new Pair<>(Materials.Iron, 2),
             new Pair<>(Materials.Silicon, 1),
             new Pair<>(Materials.Oxygen, 4)
@@ -496,12 +497,12 @@ public class WerkstoffLoader {
     public static final Werkstoff Forsterit = new Werkstoff(
             new short[]{255, 255, 255, 0},
             "Forsterite",
-            new Werkstoff.Stats().setElektrolysis(true),
+            new Werkstoff.Stats().setElektrolysis(false),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().addGems(),
             24,
             TextureSet.SET_QUARTZ,
-            Arrays.asList(Materials.Magnesium, Materials.Silicon),
+            Arrays.asList(Materials.Magnesium, Materials.SiliconDioxide),
             new Pair<>(Materials.Magnesium, 2),
             new Pair<>(Materials.Silicon, 1),
             new Pair<>(Materials.Oxygen, 4)
@@ -509,12 +510,12 @@ public class WerkstoffLoader {
     public static final Werkstoff Hedenbergit = new Werkstoff(
             new short[]{100, 150, 100, 0},
             "Hedenbergite",
-            new Werkstoff.Stats().setElektrolysis(true),
+            new Werkstoff.Stats().setElektrolysis(false),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().addGems(),
             25,
             TextureSet.SET_QUARTZ,
-            Arrays.asList(Materials.Iron, Materials.Calcium, Materials.Silicon),
+            Arrays.asList(Materials.Iron, Materials.Calcium, Materials.SiliconDioxide),
             new Pair<>(Materials.Calcium, 1),
             new Pair<>(Materials.Iron, 1),
             new Pair<>(Materials.Silicon, 2),
@@ -552,12 +553,12 @@ public class WerkstoffLoader {
             new short[]{0x4D, 0x7F, 0x64, 0},
             "Green Fuchsite",
             subscriptNumbers("KAl3Si3O10(OH)2"),
-            new Werkstoff.Stats().setElektrolysis(true),
+            new Werkstoff.Stats().setElektrolysis(false),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures(),
             28,
             TextureSet.SET_METALLIC,
-            Arrays.asList(Materials.Potassium, Materials.Aluminium, Materials.Silicon),
+            Arrays.asList(Materials.Potassium, Materials.Aluminiumoxide, Materials.SiliconDioxide),
             new Pair<>(Materials.Potassium, 1),
             new Pair<>(Materials.Aluminium, 3),
             new Pair<>(Materials.Silicon, 3),
@@ -569,12 +570,12 @@ public class WerkstoffLoader {
             new short[]{128, 0, 0, 0},
             "Red Fuchsite",
             subscriptNumbers("KCr3Si3O10(OH)2"),
-            new Werkstoff.Stats().setElektrolysis(true),
+            new Werkstoff.Stats().setElektrolysis(false),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures(),
             29,
             TextureSet.SET_METALLIC,
-            Arrays.asList(Materials.Potassium, Materials.Chrome, Materials.Silicon),
+            Arrays.asList(Materials.Potassium, Materials.Chrome, Materials.SiliconDioxide),
             new Pair<>(Materials.Potassium, 1),
             new Pair<>(Materials.Chrome, 3),
             new Pair<>(Materials.Silicon, 3),
@@ -646,7 +647,7 @@ public class WerkstoffLoader {
     public static final Werkstoff Prasiolite = new Werkstoff(
             new short[]{0xD0, 0xDD, 0x95, 0},
             "Prasiolite",
-            new Werkstoff.Stats().setElektrolysis(true).setMeltingPoint(1923),
+            new Werkstoff.Stats().setElektrolysis(false).setMeltingPoint(1923),
             Werkstoff.Types.COMPOUND,
             new Werkstoff.GenerationFeatures().addGems(),
             35,