Merge pull request #738 from SymmetricDevs/master-hotfixes

Hotfixes-0.1.12d
SymmetricDevs · Feb 11, 2024 · 86d0cfe · 86d0cfe
2 parents 8522bf8 + 5fa19dc
commit 86d0cfe
Show file tree

Hide file tree

Showing 22 changed files with 136 additions and 80 deletions.
diff --git a/groovy/material/FirstDegreeMaterials.groovy b/groovy/material/FirstDegreeMaterials.groovy
@@ -257,12 +257,12 @@ public class FirstDegreeMaterials {
         GalliumPhosphate.setFormula("GaPO4", true)
 
         LithiumNiobate = new Material.Builder(8121, SuSyUtility.susyId('lithium_niobate'))
-                .gem().iconSet(RUBY)
+                .dust().gem().iconSet(RUBY)
                 .components(Lithium, 1, Niobium, 1, Oxygen, 3)
                 .color(0xbcabde)
                 .build()
 
-        LeadZirconateTitanite = new Material.Builder(8122, SuSyUtility.susyId('lead_zirconate_titanate'))
+        LeadZirconateTitanate = new Material.Builder(8122, SuSyUtility.susyId('lead_zirconate_titanate'))
                 .gem().iconSet(RUBY)
                 .components(Lead, 2, Zirconium, 1, Titanium, 1, Oxygen, 6)
                 .colorAverage()
@@ -1904,7 +1904,8 @@ public class FirstDegreeMaterials {
                 .build();
 
         LeadOxide = new Material.Builder(8388, SuSyUtility.susyId('lead_oxide'))
-                .dust()
+                .dust().gas(new FluidBuilder().temperature(1750))
+                .flags(NO_UNIFICATION)
                 .components(Lead, 1, Oxygen, 1)
                 .colorAverage()
                 .build()
@@ -2483,13 +2484,7 @@ public class FirstDegreeMaterials {
 
         AmmoniumDihydrogenPhosphate.setFormula("NH4H2PO4", true)
 
-        AluminiumCarbonate = new Material.Builder(8474, SuSyUtility.susyId('aluminium_carbonate'))
-                .dust()
-                .components(Aluminium, 2, Carbon, 3, Oxygen, 9)
-                .colorAverage()
-                .build();
-
-        AluminiumCarbonate.setFormula("Al2(CO3)3", true)
+        //FREE ID: 8474
 
         IronCarbonate = new Material.Builder(8475, SuSyUtility.susyId('iron_carbonate'))
                 .dust()

diff --git a/groovy/material/OrganicChemistryMaterials.groovy b/groovy/material/OrganicChemistryMaterials.groovy
@@ -1469,6 +1469,7 @@ public class OrganicChemistryMaterials {
 
         ParaXylene = new Material.Builder(15243, SuSyUtility.susyId('para_xylene'))
                 .dust().liquid()
+                .flags(NO_UNIFICATION)
                 .components(Carbon, 8, Hydrogen, 10)
                 .color(0x1a1611)
                 .build();
@@ -2485,7 +2486,7 @@ public class OrganicChemistryMaterials {
                 .build();
 
         Dicyclopentadiene = new Material.Builder(15403, SuSyUtility.susyId('dicyclopentadiene'))
-                .fluid(new FluidBuilder().temperature(306))
+                .liquid(new FluidBuilder().temperature(306))
                 .components(Carbon, 10, Hydrogen, 12)
                 .color(0x9c388b)
                 .build();

diff --git a/groovy/material/PetrochemistryMaterials.groovy b/groovy/material/PetrochemistryMaterials.groovy
@@ -322,7 +322,7 @@ public class PetrochemistryMaterials {
                 .color(0x9c8638)
                 .build();
 
-        DimerizedCFiveFraction = new Material.Builder(20076, SuSyUtility.susyId('c_five_fraction'))
+        DimerizedCFiveFraction = new Material.Builder(20076, SuSyUtility.susyId('dimerized_c_five_fraction'))
                 .fluid()
                 .color(0x9c9538)
                 .build();

diff --git a/groovy/material/SecondDegreeMaterials.groovy b/groovy/material/SecondDegreeMaterials.groovy
@@ -100,7 +100,7 @@ public class SecondDegreeMaterials {
                 .colorAverage()
                 .build();
 
-        CalciumHydroxideSolution = new Material.Builder(13013, SuSyUtility.susyId('calcium_hydroxide_solution'))
+        CalciumHydroxideSlurry = new Material.Builder(13013, SuSyUtility.susyId('calcium_hydroxide_slurry'))
                 .liquid()
                 .components(material('calcium_hydroxide'), 1, Water, 1)
                 .colorAverage()
@@ -378,7 +378,7 @@ public class SecondDegreeMaterials {
                 .components(AluminiumSulfate, 1, Water, 6)
                 .colorAverage()
                 .build();
-
+        
         //FREE ID: 13059
 
         CopperSulfateSolution = new Material.Builder(13060, SuSyUtility.susyId('copper_sulfate_solution'))

diff --git a/groovy/material/SuSyMaterials.groovy b/groovy/material/SuSyMaterials.groovy
@@ -619,7 +619,7 @@ class SuSyMaterials {
         public static Material AluminiumTrifluoride;
         public static Material GalliumPhosphate;
         public static Material LithiumNiobate;
-        public static Material LeadZirconateTitanite;
+        public static Material LeadZirconateTitanate;
         public static Material BoricAcid;
         public static Material AmorphousBoron;
         public static Material BoronTrioxide;
@@ -906,7 +906,6 @@ class SuSyMaterials {
         public static Material ElectrolyticChromium;
         public static Material GalliumTrioxide;
         public static Material AmmoniumDihydrogenPhosphate;
-        public static Material AluminiumCarbonate;
         public static Material IronCarbonate;
         public static Material AmmoniumDiuranate;
         public static Material VanadiumOxydichloride;
@@ -1099,7 +1098,7 @@ class SuSyMaterials {
         public static Material NitrateSolution;
         public static Material SodiumNitrateSolution;
         public static Material PotassiumHydroxideSolution;
-        public static Material CalciumHydroxideSolution;
+        public static Material CalciumHydroxideSlurry;
         public static Material DilutedPotassiumCarbonateSolution;
         public static Material SodiumSilicateSolution;
         public static Material SodiumAluminateSolution;

diff --git a/groovy/postInit/chemistry/ChemistryOverhaul.groovy b/groovy/postInit/chemistry/ChemistryOverhaul.groovy
@@ -26,6 +26,7 @@ EBF = recipemap('electric_blast_furnace')
 VULCANIZER = recipemap('vulcanizing_press')
 ALLOY_SMELTER = recipemap('alloy_smelter')
 ARC_FURNACE = recipemap('arc_furnace')
+ADVANCED_ARC_FURNACE = recipemap('advanced_arc_furnace')
 AUTOCLAVE = recipemap('autoclave')
 COMPRESSOR = recipemap('compressor')
 ASSEMBLER = recipemap('assembler')
@@ -301,13 +302,13 @@ DISTILLATION_TOWER.recipeBuilder()
 // Hydrofluoric acid
 
 BR.recipeBuilder()
-.inputs(ore('dustFluorite') * 3)
-.fluidInputs(fluid('sulfuric_acid') * 1000)
-.fluidOutputs(fluid('hydrogen_fluoride') * 2000)
-.outputs(metaitem('dustCalciumSulfate') * 6)
-.duration(30)
-.EUt(7)
-.buildAndRegister()
+        .inputs(ore('dustFluorite') * 3)
+        .fluidInputs(fluid('sulfuric_acid') * 1000)
+        .fluidOutputs(fluid('hydrogen_fluoride') * 2000)
+        .outputs(metaitem('dustCalciumSulfate') * 6)
+        .duration(30)
+        .EUt(7)
+        .buildAndRegister()
 
 CSTR.recipeBuilder()
         .fluidInputs(fluid('hydrogen') * 50)
@@ -318,12 +319,20 @@ CSTR.recipeBuilder()
         .buildAndRegister()
 
 BCR.recipeBuilder()
-.fluidInputs(fluid('hydrogen_fluoride') * 50)
-.fluidInputs(fluid('water') * 50)
-.fluidOutputs(fluid('hydrofluoric_acid') * 50)
-.duration(1)
-.EUt(7)
-.buildAndRegister()
+        .fluidInputs(fluid('hydrogen_fluoride') * 50)
+        .fluidInputs(fluid('water') * 50)
+        .fluidOutputs(fluid('hydrofluoric_acid') * 50)
+        .duration(1)
+        .EUt(7)
+        .buildAndRegister()
+
+DISTILLATION_TOWER.recipeBuilder()
+        .fluidInputs(fluid('hydrofluoric_acid') * 500)
+        .fluidOutputs(fluid('water') * 500)
+        .fluidOutputs(fluid('hydrogen_fluoride') * 500)
+        .duration(50)
+        .EUt(30)
+        .buildAndRegister()
 
 ROASTER.recipeBuilder()
 .inputs(ore('dustCalciumSulfate') * 6)
@@ -1158,7 +1167,7 @@ MIXER.recipeBuilder()
 .inputs(ore('dustAnyPuritySodium'))
 .inputs(ore('dustAnyPurityPotassium'))
 .fluidOutputs(fluid('sodium_potassium') * 1000)
-.duration(3000)
+.duration(300)
 .EUt(30)
 .buildAndRegister()
 
@@ -3400,11 +3409,22 @@ MIXER.recipeBuilder()
         .buildAndRegister()
 
 
+/*DISTILLATION_TOWER.recipeBuilder()
+        .disableDistilleryRecipes()
+        .circuitMeta(1)
+        .fluidInputs(fluid('diluted_ammonia_solution') * 1000)
+        .fluidOutputs(fluid('water') * 2000)
+        .fluidOutputs(fluid('ammonia') * 1000)
+        .duration(40)
+        .EUt(30)
+        .buildAndRegister() */
+
 DISTILLATION_TOWER.recipeBuilder()
+        //.circuitMeta(2)
         .fluidInputs(fluid('diluted_ammonia_solution') * 1000)
-        .fluidOutputs(fluid('water') * 1000)
         .fluidOutputs(fluid('ammonia_solution') * 1000)
-        .duration(150)
+        .fluidOutputs(fluid('water') * 1000)
+        .duration(20)
         .EUt(30)
         .buildAndRegister()
 
@@ -4387,11 +4407,22 @@ DISTILLERY.recipeBuilder()
         .EUt(30)
         .buildAndRegister()
 
-//Ca(OH)2.H2O
+// Calcium hydroxide slurry
+
 MIXER.recipeBuilder()
         .inputs(ore('dustCalciumHydroxide') * 5)
         .fluidInputs(fluid('water') * 1000)
-        .fluidOutputs(fluid('calcium_hydroxide_solution') * 1000)
+        .fluidOutputs(fluid('calcium_hydroxide_slurry') * 1000)
         .EUt(16)
         .duration(100)
         .buildAndRegister()
+
+// Zinc chloride soln.
+
+MIXER.recipeBuilder()
+        .fluidInputs(fluid('water') * 1000)
+        .inputs(ore('dustZincChloride') * 3)
+        .fluidOutputs(fluid('zinc_chloride_solution') * 1000)
+        .EUt(16)
+        .duration(80)
+        .buildAndRegister()
diff --git a/groovy/postInit/chemistry/GemChain.groovy b/groovy/postInit/chemistry/GemChain.groovy
@@ -10,6 +10,8 @@ AUTOCLAVE = recipemap('autoclave')
 BR = recipemap('batch_reactor')
 ROASTER = recipemap('roaster')
 TUBE_FURNACE = recipemap('tube_furnace')
+REACTION_FURNACE = recipemap('reaction_furnace')
+FORMING_PRESS = recipemap("forming_press")
 
 CVD.recipeBuilder()
         .notConsumable(metaitem('wafer.silicon'))
@@ -152,6 +154,14 @@ CRYSTALLIZER.recipeBuilder()
         .EUt(120)
         .buildAndRegister()
 
+CRYSTALLIZER.recipeBuilder()
+        .inputs(metaitem('seed_crystal.lithium_niobate'))
+        .inputs(ore('dustLithiumNiobate') * 20)
+        .outputs(metaitem('boule.lithium_niobate'))
+        .duration(400)
+        .EUt(120)
+        .buildAndRegister()
+
 CUTTER.recipeBuilder()
         .inputs(metaitem('boule.lithium_niobate'))
         .outputs(metaitem('seed_crystal.lithium_niobate'))
@@ -162,3 +172,27 @@ CUTTER.recipeBuilder()
 
 // Lead Zirconate Titanate
 
+ROASTER.recipeBuilder()
+        .inputs(ore('dustLeadOxide'))
+        .fluidOutputs(fluid('lead_oxide') * 1000)
+        .duration(200)
+        .EUt(120)
+        .buildAndRegister()
+
+REACTION_FURNACE.recipeBuilder()
+        .notConsumable(fluid('lead_oxide') * 1000)
+        .inputs(ore('dustLeadOxide') * 4)
+        .inputs(ore('dustTitaniumDioxide') * 3)
+        .inputs(ore('dustZirconiumDioxide') * 3)
+        .outputs(metaitem('dustLeadZirconateTitanate') * 10)
+        .duration(200)
+        .EUt(Globals.voltAmps[3])
+        .buildAndRegister()
+
+FORMING_PRESS.recipeBuilder()
+        .inputs(ore('dustLeadZirconateTitanate') * 10)
+        .notConsumable(metaitem('shape.mold.ball'))
+        .outputs(metaitem('gemLeadZirconateTitanate'))
+        .duration(500)
+        .EUt(Globals.voltAmps[1])
+        .buildAndRegister()
diff --git a/groovy/postInit/chemistry/elements/GoldChain.groovy b/groovy/postInit/chemistry/elements/GoldChain.groovy
@@ -11,7 +11,9 @@ 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])
+
+// Aqua Regia * 3000
+mods.gregtech.mixer.removeByInput(30, null, [fluid('nitric_acid') * 1000, fluid('hydrochloric_acid') * 2000])
 
 //GOLD AMALGAMATION (50% EFFICIENCY)
 MIXER.recipeBuilder()

diff --git a/groovy/postInit/chemistry/elements/IronChain.groovy b/groovy/postInit/chemistry/elements/IronChain.groovy
@@ -17,7 +17,6 @@ mods.gregtech.primitive_blast_furnace.removeByInput(1, [item('minecraft:iron_ing
 mods.gregtech.electric_blast_furnace.removeByInput(120, [item('minecraft:iron_ingot')], [fluid('oxygen') * 200])
 mods.gregtech.electric_blast_furnace.removeByInput(120, [metaitem('dustIron'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('oxygen') * 200])
 mods.gregtech.electric_blast_furnace.removeByInput(120, [metaitem('ingotWroughtIron')], [fluid('oxygen') * 200])
-mods.gregtech.electric_blast_furnace.removeByInput(120, [metaitem('ingotWroughtIron')], [fluid('oxygen') * 200])
 mods.gregtech.electric_blast_furnace.removeByInput(120, [metaitem('dustWroughtIron'), metaitem('circuit.integrated').withNbt(["Configuration": 2])], [fluid('oxygen') * 200])
 mods.gregtech.electric_blast_furnace.removeByInput(1920, [metaitem('dustIron') * 4, metaitem('dustCarbon')], null)
 mods.gregtech.electric_blast_furnace.removeByInput(1920, [metaitem('dustWroughtIron') * 4, metaitem('dustCarbon')], null)

diff --git a/groovy/postInit/chemistry/elements/UraniumChain.groovy b/groovy/postInit/chemistry/elements/UraniumChain.groovy
@@ -95,21 +95,13 @@ CENTRIFUGE.recipeBuilder()
 
 SIFTER.recipeBuilder()
         .fluidInputs(fluid('impure_uranyl_carbonate_solution') * 6000)
-        .chancedOutput(metaitem('dustAluminiumCarbonate') * 14, 1000, 1000)
+        .chancedOutput(metaitem('dustAluminiumHydroxide') * 7, 1000, 1000)
         .chancedOutput(metaitem('dustIronCarbonate') * 5, 4000, 1000)
         .fluidOutputs(fluid('uranyl_carbonate_solution') * 6000)
         .EUt(240)
         .duration(200)
         .buildAndRegister()
 
-ROASTER.recipeBuilder()
-        .inputs(ore('dustAluminiumCarbonate') * 14)
-        .outputs(metaitem('dustAlumina') * 5)
-        .fluidOutputs(fluid('carbon_dioxide') * 3000)
-        .EUt(120)
-        .duration(200)
-        .buildAndRegister()
-
 ROASTER.recipeBuilder()
         .inputs(ore('dustIronCarbonate') * 5)
         .outputs(metaitem('dustIronIiOxide') * 2)

diff --git a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Fuels.groovy
@@ -339,12 +339,11 @@ BR.recipeBuilder()
     .buildAndRegister()
 
 BR.recipeBuilder()
-    .inputs(ore('dustSodiumCyanoborohydride') * 14)
     .fluidInputs(fluid('one_two_diaminopropane_solution') * 2000)
-    .fluidInputs(fluid('hydrochloric_acid') * 2000)
+    .fluidInputs(fluid('hydrogen_chloride') * 1000)
     .fluidInputs(fluid('salicylaldehyde') * 2000)
     .outputs(metaitem('dustSalicylideneOneTwoPropanediamine'))
-    .fluidOutputs(fluid('wastewater') * 3000)
+    .fluidOutputs(fluid('diluted_hydrochloric_acid') * 2000)
     .duration(200)
     .EUt(120)
     .buildAndRegister()

diff --git a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Lubricants.groovy b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/Lubricants.groovy
@@ -610,7 +610,7 @@ DUMPER = recipemap('dumping')
 
     BR.recipeBuilder()
         .inputs(ore('dustDodecylbenzenesulfonicAcid') * 2)
-        .fluidInputs(fluid('calcium_hydroxide_solution') * 1000)
+        .fluidInputs(fluid('calcium_hydroxide_slurry') * 1000)
         .outputs(metaitem('dustCalciumDodecylbenzeneSulfonate'))
         .fluidOutputs(fluid('water') * 1000)
         .duration(200)
@@ -665,7 +665,7 @@ DUMPER = recipemap('dumping')
 
     BR.recipeBuilder()
         .inputs(ore('dustDinonylnaphthaleneSulfonicAcid') * 2)
-        .fluidInputs(fluid('calcium_hydroxide_solution') * 1000)
+        .fluidInputs(fluid('calcium_hydroxide_slurry') * 1000)
         .outputs(metaitem('dustCalciumDinonylnaphthaleneSulfonate'))
         .fluidOutputs(fluid('water') * 1000)
         .duration(200)
@@ -676,7 +676,7 @@ DUMPER = recipemap('dumping')
 
     POLYMERIZATION.recipeBuilder()
         .fluidInputs(fluid('ethylene_oxide') * 1000)
-        .notConsumable(fluid('boron_trifluoride') * 50)
+        .fluidInputs(fluid('boron_trifluoride') * 10)
         .fluidOutputs(fluid('polyethylene_glycol') * 1000)
         .duration(200)
         .EUt(240)
@@ -846,7 +846,7 @@ DUMPER = recipemap('dumping')
 
     BR.recipeBuilder()
         .inputs(ore('dustDidodecylbenzenesulfonicAcid') * 2)
-        .fluidInputs(fluid('calcium_hydroxide_solution') * 1000)
+        .fluidInputs(fluid('calcium_hydroxide_slurry') * 1000)
         .outputs(metaitem('dustCalciumDidodecylbenzeneSulfonate'))
         .fluidOutputs(fluid('water') * 1000)
         .duration(200)
@@ -958,12 +958,11 @@ DUMPER = recipemap('dumping')
 // Chelates: SALEN
 
 BR.recipeBuilder()
-    .inputs(ore('dustSodiumCyanoborohydride') * 14)
     .fluidInputs(fluid('ethylenediamine') * 1000)
-    .fluidInputs(fluid('hydrochloric_acid') * 2000)
+    .fluidInputs(fluid('hydrogen_chloride') * 1000)
     .fluidInputs(fluid('salicylaldehyde') * 2000)
     .outputs(metaitem('dustSalicylideneEthylenediamine'))
-    .fluidOutputs(fluid('wastewater') * 2000)
+    .fluidOutputs(fluid('diluted_hydrochloric_acid') * 2000)
     .duration(200)
     .EUt(120)
     .buildAndRegister()

diff --git a/groovy/postInit/chemistry/organic_chemistry/petrochemistry/OilOverhaul.groovy b/groovy/postInit/chemistry/organic_chemistry/petrochemistry/OilOverhaul.groovy
@@ -1004,7 +1004,6 @@ CRYSTALLIZER.recipeBuilder()
 .EUt(Globals.voltAmps[1])
 .buildAndRegister()
 
-mods.gregtech.extractor.removeByInput(30, [metaitem('dustParaXylene')])
 EXTRACTOR.recipeBuilder()
 .inputs(ore('dustParaXylene'))
 .fluidOutputs(fluid('para_xylene') * 1000)