fixed some electrolyzing and centrifuging recipes

GregTech-Intergalactical · Nov 6, 2023 · a664e36 · a664e36
1 parent 9029a89
commit a664e36
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java b/common/src/main/java/muramasa/gregtech/data/GregTechMaterialEvents.java
@@ -238,6 +238,7 @@ public static void onMaterialEvent(GregTechMaterialEvent event){
         event.setMaterial(Limestone).asDust(ROCK);
         event.setMaterial(LithiumChloride).asDust();
         event.setMaterial(Magnesia).asDust();
+        event.setMaterial(MagnesiumCarbonate).asDust();
         event.setMaterial(MagnesiumChloride).asDust();
         event.setMaterial(Marble).asDust(ROCK);
         event.setMaterial(Massicot).asDust();
@@ -253,6 +254,8 @@ public static void onMaterialEvent(GregTechMaterialEvent event){
         event.setMaterial(ReactionCatalyst).asDust();
         event.setMaterial(RedGranite).asDust(ROCK);
         event.setMaterial(SiliconDioxide).asDust();
+        event.setMaterial(Shale).asDust(ROCK);
+        event.setMaterial(Slate).asDust(ROCK);
         event.setMaterial(SodiumAluminate).asDust();
         event.setMaterial(SodiumBisulfate).asDust();
         event.setMaterial(SodiumHydroxide).asDust();
@@ -618,7 +621,7 @@ private static void processInto(GregTechMaterialEvent event){
          *  Organic
          **/
         event.setMaterial(AntimonyTrioxide).mats(of(Antimony, 2, Oxygen, 3)).elecTicks(250);
-        event.setMaterial(Clay).mats(of(Sodium, 2, Lithium, 1, Aluminium, 2, Silicon, 2, Water, 6)).elecTicks(182);
+        event.setMaterial(Clay).mats(of(Alumina, 5, SiliconDioxide, 12, Water, 1, Sodium, 1, Lithium, 1), 18).elecTicks(182);
         event.setMaterial(CupricOxide).mats(of(Copper, 1, Oxygen, 1)).elecTicks(72);
         event.setMaterial(DarkAsh).mats(of(Carbon, 1, Ash, 1), 1);
         event.setMaterial(Dibenzene).mats(of(Carbon,12,Hydrogen,10));
@@ -637,7 +640,7 @@ private static void processInto(GregTechMaterialEvent event){
         event.setMaterial(AmmoniumChloride).mats(of(Nitrogen,1, Hydrogen,4,Chlorine,1));
         event.setMaterial(ArsenicTrioxide).mats(of(Arsenic, 2, Oxygen, 3)).elecTicks(180);
         event.setMaterial(Biotite).mats(b -> b.put(Potassium, 2).put(Magnesium, 6).put(Alumina, 15).put(SiliconDioxide, 18).put(Fluorine, 4)).elecTicks(440);
-        event.setMaterial(BlackGranite).mats(of(SiliconDioxide, 4, Biotite, 1));
+        event.setMaterial(BlackGranite).mats(of(Biotite, 1, PotassiumFeldspar, 1, Flint, 1));
         event.setMaterial(BorosilicateGlass).mats(of(Boron, 1, Silicon, 7, Oxygen,14));
         event.setMaterial(Brick).mats(of(Aluminium, 4, Silicon, 3, Oxygen, 12));
         event.setMaterial(CalciumChloride).mats(of(Calcium, 1, Chlorine, 2)).elecTicks(1024);
@@ -653,7 +656,7 @@ private static void processInto(GregTechMaterialEvent event){
         event.setMaterial(Fluorite).mats(of(Calcium, 1, Fluorine, 2));
         event.setMaterial(IndiumGalliumPhosphide).mats(of(Indium, 1, Gallium, 1, Phosphor, 1));
         event.setMaterial(IridiumSodiumOxide).mats(of(Iridium,1,Sodium,1,Oxygen,2));
-        event.setMaterial(Komatiite).mats(of(Olivine, 1, /* MgCO3, 2, */Flint, 6, DarkAsh, 3));
+        event.setMaterial(Komatiite).mats(of(Olivine, 1, MagnesiumCarbonate, 2, Flint, 6, DarkAsh, 3));
         event.setMaterial(Limestone).mats(of(Calcite, 1));
         event.setMaterial(LithiumChloride).mats(of(Lithium, 1, Chlorine, 1)).elecTicks(64);
         event.setMaterial(Magnesia).mats(of(Magnesium, 1, Oxygen, 1)).elecTicks(40);
@@ -669,8 +672,10 @@ private static void processInto(GregTechMaterialEvent event){
         event.setMaterial(Quartzite).mats(of(Silicon, 1, Oxygen, 2)).elecTicks(60);
         event.setMaterial(Quicklime).mats(of(Calcium, 1, Oxygen, 1)).elecTicks(56);
         event.setMaterial(ReactionCatalyst).mats(of(Copper,1,Zinc,1,Aluminium,2,Oxygen,4));
-        event.setMaterial(RedGranite).mats(of(Aluminium, 2, PotassiumFeldspar, 1, Oxygen, 3)).elecTicks(120);
+        event.setMaterial(RedGranite).mats(of(Biotite, 1, PotassiumFeldspar, 1, Flint, 1)).elecTicks(120);
         event.setMaterial(SiliconDioxide).mats(of(Silicon, 1, Oxygen, 2)).elecTicks(240);
+        event.setMaterial(Shale).mats(of(Calcite, 2, MilkyQuartz, 1, Clay, 1));
+        //event.setMaterial(Slate).mats(of())
         event.setMaterial(SodiumAluminate).mats(of(Sodium, 1, Aluminium, 1, Oxygen, 2));
         event.setMaterial(SodiumBisulfate).mats(of(Sodium, 1, Hydrogen, 1, Sulfur, 1, Oxygen, 4)).elecTicks(600);
         event.setMaterial(SodiumHydroxide).mats(of(Sodium, 1, Oxygen, 1, Hydrogen, 1)).elecTicks(36);
@@ -1382,7 +1387,7 @@ private static void flags(GregTechMaterialEvent event){
                 TungstenSteel, Brass, Nichrome, Electrum, Bronze, Stibnite, Wulfenite, RedAlloy, SterlingSilver, RoseGold, BatteryAlloy, SolderingAlloy);
         CENT15.add(Kanthal, IndiumGalliumPhosphide, BlackSteel, RedGarnet, YellowGarnet, BismuthBronze, BlackBronze, VanadiumSteel, CobaltBrass,
                 Pitchblende, Redstone, HSSS);
-        CENT20.add(Lapis, Tetrahedrite, RedSteel, BlueSteel, Basalt, HSSE, Cooperite, HSSG);
+        CENT20.add(Lapis, Tetrahedrite, RedSteel, BlueSteel, Basalt, HSSE, Cooperite, HSSG, Komatiite);
         CENT.add(CENT5.all().toArray(new Material[0]));
         CENT.add(CENT10.all().toArray(new Material[0]));
         CENT.add(CENT15.all().toArray(new Material[0]));

diff --git a/common/src/main/java/muramasa/gregtech/data/Materials.java b/common/src/main/java/muramasa/gregtech/data/Materials.java
@@ -1,5 +1,6 @@
 package muramasa.gregtech.data;
 
+import io.github.gregtechintergalactical.gtcore.GTCore;
 import muramasa.antimatter.AntimatterAPI;
 import muramasa.antimatter.Ref;
 import muramasa.antimatter.material.Material;
@@ -315,6 +316,7 @@ public class Materials {
     public static Material IridiumSodiumOxide = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "iridium_sodium_oxide", 0xffffff, NONE));
     public static Material LithiumChloride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "lithium_chloride", 0xdedefa, DULL));
     public static Material Magnesia = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "magnesia", 0xffffff, DULL));
+    public static Material MagnesiumCarbonate = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "magnesium_carbonate", 0xF0E6E6, DULL));
     public static Material MagnesiumChloride = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "magnesium_chloride", 0xd40d5c, DULL));
     public static Material Massicot = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "massicot", 0xffdd55, DULL));
     public static Material Obsidian = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "obsidian", 0x503264, DULL));
@@ -464,6 +466,8 @@ public class Materials {
     public static Material Marble = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "marble", 0xc8c8c8, NONE));
     public static Material Quartzite = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "quartzite", 0xe6cdcd, QUARTZ));
     public static Material RedGranite = AntimatterAPI.register(Material.class, new Material(GTIRef.ID, "red_granite", 0xff0080, ROUGH));
+    public static Material Shale = AntimatterAPI.register(Material.class, new Material(GTCore.ID, "shale", 0x8E8EA8, NONE));
+    public static Material Slate = AntimatterAPI.register(Material.class, new Material(GTCore.ID, "slate", 0x94979C, NONE));
 
     /**
      ** Misc

diff --git a/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalReactorLoader.java b/common/src/main/java/muramasa/gregtech/loader/machines/ChemicalReactorLoader.java
@@ -206,6 +206,8 @@ private static void addShared(){
         //TITANIUMTETRACHLORIDE
         CHEMICAL_REACTING.RB().ii(of(DUST.getMaterialTag(Rutile), 1), of(DUST.getMaterialTag(Carbon), 1)).fi(Chlorine.getGas(4000), Calcite.getLiquid(L)).fo(TitaniumTetrachloride.getLiquid(5000),CarbonDioxide.getGas(3000)).add("titanium_tetrachloride",500, 480);
         CHEMICAL_REACTING.RB().ii(of(DUST.getMaterialTag(Ilmenite), 5), of(DUST.getMaterialTag(Carbon), 3)).fi(Chlorine.getGas(7000), Calcite.getLiquid(L)).io(DUST.get(FerricChloride, 4)).fo(TitaniumTetrachloride.getLiquid(5000),CarbonMonoxide.getGas(6000)).add("titanium_tetrachloride_2",500, 480);
+        // Magnesium Chloride
+        CHEMICAL_REACTING.RB().ii(DUST.getMaterialIngredient(MagnesiumCarbonate, 5)).fi(HydrochloricAcid.getLiquid(4000)).io(DUST.get(MagnesiumChloride, 3)).fo(Water.getLiquid(3000), CarbonDioxide.getGas(3000)).add("magnesium_chloride", 144, 16);
         //Alumina chain
         CHEMICAL_REACTING.RB().fi(SulfuricAcid.getLiquid(7000)).ii(DUST.getMaterialIngredient(Fluorite, 3)).fo(HydrogenFluoride.getGas(4000)).io(DUST.get(CalciumSulfate, 6)).add("hydrogen_fluoride", 160, 16);
         CHEMICAL_REACTING.RB().fi(Fluorine.getGas(1000), Hydrogen.getGas(1000)).fo(HydrogenFluoride.getGas(2000)).add("hydrogen_fluoride_1", 16, 16);