Merge pull request #716 from SymmetricDevs/master-hotfixes

Hotfixes-0.1.12c
SymmetricDevs · Feb 5, 2024 · 0d082e6 · 0d082e6
2 parents a263b30 + 0983dbf
commit 0d082e6
Show file tree

Hide file tree

Showing 30 changed files with 375 additions and 190 deletions.
diff --git a/config/gregtech/worldgen/vein/overworld/talc_vein.json b/config/gregtech/worldgen/vein/overworld/talc_vein.json
@@ -0,0 +1,34 @@
+{
+  "weight": 90,
+  "density": 1,
+  "max_height": 60,
+  "min_height": 0,
+  "vein_populator": {
+    "type": "surface_rock",
+    "material": "talc"
+  },
+  "generator": {
+    "type": "layered",
+    "radius": [
+      15,
+      15
+    ]
+  },
+  "filler": {
+    "type": "layered",
+    "values": [
+      {
+        "primary": "ore:talc"
+      },
+      {
+        "secondary": "ore:soapstone"
+      },
+      {
+        "between": "ore:calcite"
+      },
+      {
+        "sporadic": "ore:magnesite"
+      }
+    ]
+  }
+}
diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy
@@ -3175,5 +3175,11 @@ public class FirstDegreeMaterials {
                 .components(Silicon, 1, Chlorine, 4)
                 .color(0x7fa3a0)
                 .build();
+
+        SaltyHydrofluoricAcid = new Material.Builder(8592, SuSyUtility.susyId("salty_hydrofluoric_acid"))
+                .liquid(new FluidBuilder().attribute(FluidAttributes.ACID))
+                .components(Salt, 1, HydrofluoricAcid, 1)
+                .colorAverage()
+                .build();
     }
 }
diff --git a/groovy/material/OrganicChemistryMaterials.groovy b/groovy/material/OrganicChemistryMaterials.groovy
@@ -1364,11 +1364,7 @@ public class OrganicChemistryMaterials {
                 .color(0x403c32)
                 .build();
 
-        CyclopentadieneSolution = new Material.Builder(15226, SuSyUtility.susyId('cyclopentadiene_solution'))
-                .liquid()
-                .components(Cyclopentadiene, 1, Benzene, 1)
-                .colorAverage()
-                .build();
+        //FREE ID: 15226
 
         Ferrocene = new Material.Builder(15227, SuSyUtility.susyId('ferrocene'))
                 .dust()
@@ -2481,5 +2477,17 @@ public class OrganicChemistryMaterials {
                 .components(Carbon, 1, Hydrogen, 1, Chlorine, 1, Fluorine, 2)
                 .color(0x8c5a99)
                 .build();
+
+        Acrolein = new Material.Builder(15402, SuSyUtility.susyId('acrolein'))
+                .fluid()
+                .components(Carbon, 3, Hydrogen, 4, Oxygen, 1)
+                .color(0x389c7a)
+                .build();
+
+        Dicyclopentadiene = new Material.Builder(15403, SuSyUtility.susyId('dicyclopentadiene'))
+                .fluid(new FluidBuilder().temperature(306))
+                .components(Carbon, 10, Hydrogen, 12)
+                .color(0x9c388b)
+                .build();
     }
 }
diff --git a/groovy/material/PetrochemistryMaterials.groovy b/groovy/material/PetrochemistryMaterials.groovy
@@ -316,5 +316,15 @@ public class PetrochemistryMaterials {
                 .liquid()
                 .color(0x7d782e)
                 .build();
+
+        CFiveFraction = new Material.Builder(20075, SuSyUtility.susyId('c_five_fraction'))
+                .fluid()
+                .color(0x9c8638)
+                .build();
+
+        DimerizedCFiveFraction = new Material.Builder(20076, SuSyUtility.susyId('c_five_fraction'))
+                .fluid()
+                .color(0x9c9538)
+                .build();
     }
 }           
diff --git a/groovy/material/SecondDegreeMaterials.groovy b/groovy/material/SecondDegreeMaterials.groovy
@@ -646,5 +646,12 @@ public class SecondDegreeMaterials {
                 .components(BerylliumChloride, 3, AluminiumChloride, 2, SiliconTetrachloride, 6, CarbonMonoxide, 18)
                 .colorAverage()
                 .build();
+
+        SupportedMolybdenumVanadium = new Material.Builder(13107, SuSyUtility.susyId("supported_molybdenum_vanadium"))
+                .dust()
+                .flags(GENERATE_CATALYST_BED)
+                .components(MolybdenumTrioxide, 1, VanadiumPentoxide, 1, Alumina, 1)
+                .colorAverage()
+                .build();
     }
 }
diff --git a/groovy/material/SuSyMaterials.groovy b/groovy/material/SuSyMaterials.groovy
@@ -346,10 +346,6 @@ class SuSyMaterials {
         public static Material MidgradeGasoline;
         public static Material PremiumGasoline;
         public static Material SupremeGasoline;
-        public static Material PotassiumMolecularSieve;
-        public static Material CesiumMolecularSieve;
-        public static Material SaturatedPotassiumMolecularSieve;
-        public static Material SaturatedCesiumMolecularSieve;
         public static Material AcidicWastewater;
         public static Material ImpureTitaniumTetrachloride;
         public static Material DistilledTitaniumTetrachloride;
@@ -562,6 +558,8 @@ class SuSyMaterials {
         public static Material ColdSolventLubricantMixture;
         public static Material SulfuricLubricatingOil;
         public static Material DewaxedLubricantMixture;
+        public static Material CFiveFraction;
+        public static Material DimerizedCFiveFraction;
 
         // First Degree Materials
 
@@ -1006,6 +1004,7 @@ class SuSyMaterials {
         public static Material PhosphomolybdicAcid;
         public static Material UraniumDioxide;
         public static Material UraniumTetrafluoride;
+        public static Material SaltyHydrofluoricAcid;
         public static Material SiliconTetrachloride;
         public static Material PurifiedSiliconTetrachloride;
 
@@ -1184,6 +1183,7 @@ class SuSyMaterials {
         public static Material DilutedManganeseIIChlorideSolution;
         public static Material SupportedPalladium;
         public static Material MixedCyanideSolution;
+        public static Material SupportedMolybdenumVanadium;
         public static Material ChlorinatedBeryl;
 
         // Organic Chemistry Materials
@@ -1397,7 +1397,6 @@ class SuSyMaterials {
         public static Material IsoOctane;
         public static Material PurifiedIsoprene;
         public static Material Cyclopentadiene;
-        public static Material CyclopentadieneSolution;
         public static Material Ferrocene;
         public static Material Polyisoprene;
         public static Material Chloroethane;
@@ -1565,6 +1564,8 @@ class SuSyMaterials {
         public static Material GaseousMethacroleinMixture;
         public static Material GaseousMethacroleinResidue;
         public static Material AbsorbedMethacrolein;
+        public static Material Acrolein;
+        public static Material Dicyclopentadiene;
         public static Material EthyleneCarbonate;
         public static Material Tetraethyllead;
         public static Material TertButylHydroperoxide;

diff --git a/groovy/material/UnknownCompositionMaterials.groovy b/groovy/material/UnknownCompositionMaterials.groovy
@@ -1119,29 +1119,7 @@ public class UnknownCompositionMaterials {
                 .color(0xf26d1b)
                 .build();
 
-        PotassiumMolecularSieve = new Material.Builder(4225, SuSyUtility.susyId('potassium_molecular_sieve'))
-                .dust()
-                .iconSet(SHINY)
-                .color(0x7c8e94)
-                .build();
-
-        CesiumMolecularSieve = new Material.Builder(4226, SuSyUtility.susyId('cesium_molecular_sieve'))
-                .dust()
-                .iconSet(SHINY)
-                .color(0x9c7f73)
-                .build();
-
-        SaturatedPotassiumMolecularSieve = new Material.Builder(4227, SuSyUtility.susyId('saturated_potassium_molecular_sieve'))
-                .dust()
-                .color(0x7c8e94)
-                .build();
-
-        SaturatedCesiumMolecularSieve = new Material.Builder(4228, SuSyUtility.susyId('saturated_cesium_molecular_sieve'))
-                .dust()
-                .color(0x9c7f73)
-                .build();
-
-        //FREE IDs: 4229-4231
+        //FREE IDs: 4225-4231
 
         TitanylSulfateSolution = new Material.Builder(4232, SuSyUtility.susyId('titanyl_sulfate_solution'))
                 .liquid()

diff --git a/groovy/postInit/chemistry/ChemistryOverhaul.groovy b/groovy/postInit/chemistry/ChemistryOverhaul.groovy
@@ -1664,12 +1664,11 @@ DISTILLERY.recipeBuilder()
 //acetylene
 
 for (carbon in CarbonGlobals.sources) {
-    EBF.recipeBuilder()
+    ADVANCED_ARC_FURNACE.recipeBuilder()
             .inputs(ore('dustQuicklime') * 2)
             .inputs(ore(carbon.name) * carbon.equivalent(3))
             .outputs(metaitem('dustCalciumCarbide') * 3)
             .fluidOutputs(fluid('carbon_monoxide') * 1000)
-            .blastFurnaceTemp(2473)
             .EUt(120)
             .duration(400)
             .buildAndRegister()
@@ -3388,7 +3387,24 @@ BCR.recipeBuilder()
         .fluidInputs(fluid('water') * 100)
         .fluidInputs(fluid('ammonia') * 50)
         .fluidOutputs(fluid('diluted_ammonia_solution') * 100)
-        .duration(5)
+        .duration(1)
+        .EUt(30)
+        .buildAndRegister()
+
+MIXER.recipeBuilder()
+        .fluidInputs(fluid('ammonia_solution') * 1000)
+        .fluidInputs(fluid('water') * 1000)
+        .fluidOutputs(fluid('diluted_ammonia_solution') * 1000)
+        .duration(20)
+        .EUt(Globals.voltAmps[1])
+        .buildAndRegister()
+
+
+DISTILLATION_TOWER.recipeBuilder()
+        .fluidInputs(fluid('diluted_ammonia_solution') * 1000)
+        .fluidOutputs(fluid('water') * 1000)
+        .fluidOutputs(fluid('ammonia_solution') * 1000)
+        .duration(150)
         .EUt(30)
         .buildAndRegister()
 
@@ -3432,7 +3448,7 @@ DISTILLATION_TOWER.recipeBuilder()
         .fluidOutputs(fluid('diethylene_glycol') * 100)
         .fluidOutputs(fluid('ethylene_glycol') * 500)
         .fluidOutputs(fluid('water') * 400)
-        .duration(300)
+        .duration(200)
         .EUt(30)
         .buildAndRegister()
 
@@ -4344,3 +4360,38 @@ MIXER.recipeBuilder()
         .EUt(30)
         .duration(80)
         .buildAndRegister()
+
+// NaF Chemistry
+
+MIXER.recipeBuilder()
+        .inputs(ore('dustSodiumFluoride') * 2)
+        .fluidInputs(fluid('water') * 1000)
+        .fluidOutputs(fluid('sodium_fluoride_solution') * 1000)
+        .duration(20)
+        .EUt(30)
+        .buildAndRegister()
+
+BCR.recipeBuilder()
+        .fluidInputs(fluid('sodium_fluoride_solution') * 50)
+        .fluidOutputs(fluid('hydrogen_chloride') * 50)
+        .fluidOutputs(fluid('salty_hydrofluoric_acid') * 50)
+        .duration(2)
+        .EUt(30)
+        .buildAndRegister()
+
+DISTILLERY.recipeBuilder()
+        .fluidInputs(fluid('salty_hydrofluoric_acid') * 1000)
+        .outputs(metaitem('dustSalt') * 2)
+        .fluidOutputs(fluid('hydrofluoric_acid') * 1000)
+        .duration(20)
+        .EUt(30)
+        .buildAndRegister()
+
+//Ca(OH)2.H2O
+MIXER.recipeBuilder()
+        .inputs(ore('dustCalciumHydroxide') * 5)
+        .fluidInputs(fluid('water') * 1000)
+        .fluidOutputs(fluid('calcium_hydroxide_solution') * 1000)
+        .EUt(16)
+        .duration(100)
+        .buildAndRegister()
diff --git a/groovy/postInit/chemistry/OreSorting.groovy b/groovy/postInit/chemistry/OreSorting.groovy
@@ -306,15 +306,16 @@ def alluvial_tier_1 = [
 
 def alluvial_tier_2 = [
     'gregtech:ore_cassiterite_0' : 10000,
-    'susy:resource_block:11' : 10000
+    'susy:resource_block:10' : 100,
+    'susy:resource_block:11' : 5000
 ];
 
 
 def alluvial_tier_3 = [
     'minecraft:soul_sand' : 10000,
     'gregtech:ore_cassiterite_0' : 10000,
     'susy:resource_block:10' : 100,
-    'susy:resource_block:11' : 1000
+    'susy:resource_block:11' : 5000
 ];
 
 def alluvial_tier_4 = [

diff --git a/groovy/postInit/chemistry/Quenching.groovy b/groovy/postInit/chemistry/Quenching.groovy
@@ -164,3 +164,16 @@ for (entry in fluidMap) {
     }
 }
 
+// Air cooling
+recipemap('radiator').recipeBuilder()
+            .fluidInputs(fluid('hot_air') * 1000)
+            .fluidOutputs(liquid('air') * 1000)
+            .duration(100)
+            .buildAndRegister();
+
+recipemap('cooling_unit').recipeBuilder()
+            .fluidInputs(fluid('hot_air') * 1000)
+            .fluidOutputs(liquid('air') * 1000)
+            .duration(50)
+            .EUt(480)
+            .buildAndRegister();
diff --git a/groovy/postInit/chemistry/WaterPurificationChain.groovy b/groovy/postInit/chemistry/WaterPurificationChain.groovy
@@ -125,7 +125,7 @@ BR.recipeBuilder()
         .outputs(metaitem('dustBoricAcid') * 7)
         .fluidOutputs(fluid('boron_free_brine') * 1000)
         .duration(120)
-        .EUt(480)
+        .EUt(120)
         .buildAndRegister()
 
 BR.recipeBuilder()
@@ -134,15 +134,15 @@ BR.recipeBuilder()
         .outputs(metaitem('gregtechfoodoption:lithium_carbonate_dust') * 6)
         .fluidOutputs(fluid('lithium_free_brine') * 1000)
         .duration(120)
-        .EUt(480)
+        .EUt(120)
         .buildAndRegister()
 
 BCR.recipeBuilder()
         .fluidInputs(fluid('lithium_free_brine') * 50)
         .fluidInputs(fluid('chlorine') * 10)
         .fluidOutputs(fluid('chlorinated_brine') * 50)
         .duration(1)
-        .EUt(480)
+        .EUt(120)
         .buildAndRegister()
 
 VACUUM_CHAMBER.recipeBuilder()
@@ -151,15 +151,15 @@ VACUUM_CHAMBER.recipeBuilder()
         .fluidOutputs(fluid('impure_bromine') * 100)
         .fluidOutputs(fluid('wastewater_sludge') * 500)
         .duration(120)
-        .EUt(480)
+        .EUt(120)
         .buildAndRegister()
 
 CENTRIFUGE.recipeBuilder()
         .fluidInputs(fluid('impure_bromine') * 1000)
         .fluidOutputs(fluid('bromine') * 1000)
         .chancedOutput(metaitem('dustIodine'), 1000, 1000)
         .duration(120)
-        .EUt(480)
+        .EUt(120)
         .buildAndRegister()
 
 MSFD.recipeBuilder()

diff --git a/groovy/postInit/chemistry/elements/GoldChain.groovy b/groovy/postInit/chemistry/elements/GoldChain.groovy
@@ -11,6 +11,7 @@ DISTILLATION_TOWER = recipemap('distillation_tower')
 
 // Silver Dust * 1
 mods.gregtech.centrifuge.removeByInput(30, [metaitem('dustRawElectrum') * 2], null)
+mods.gregtech.mixer.removeByInput(30, [fluid('hydrochloric_acid') * 2000], [fluid('nitric_acid') * 1000])
 
 //GOLD AMALGAMATION (50% EFFICIENCY)
 MIXER.recipeBuilder()

diff --git a/groovy/postInit/chemistry/elements/ManganeseChain.groovy b/groovy/postInit/chemistry/elements/ManganeseChain.groovy
@@ -190,3 +190,13 @@ ROASTER.recipeBuilder()
     .duration(100)
     .EUt(120)
     .buildAndRegister()
+
+// Manganese hydroxide calcination
+
+ROASTER.recipeBuilder()
+    .inputs(ore('dustManganeseIiHydroxide') * 5)
+    .fluidOutputs(fluid('steam') * 1000)
+    .outputs(metaitem('dustManganeseIiOxide') * 2)
+    .duration(200)
+    .EUt(30)
+    .buildAndRegister()