Skip to content

Commit b79f446

Browse files
TarLaboratoriesDilithiumThorideGhostipedia
authored
Change some formulas to make them more accurate (#4017)
Co-authored-by: DilithiumThoride <lilithiumathena@gmail.com> Co-authored-by: Ghostipedia / Caitlynn <46772882+Ghostipedia@users.noreply.github.com>
1 parent d9622f9 commit b79f446

File tree

3 files changed

+10
-19
lines changed

3 files changed

+10
-19
lines changed

‎src/main/java/com/gregtechceu/gtceu/common/data/materials/FirstDegreeMaterials.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public static void register() {
7777
.gem(3).ore(2, 1)
7878
.color(0xdbfeff).secondaryColor(0xa0c4d7).iconSet(GEM_HORIZONTAL)
7979
.appendFlags(EXT_METAL, NO_SMASHING, NO_SMELTING, HIGH_SIFTER_OUTPUT)
80-
.components(Aluminium, 2, Silicon, 1, Fluorine, 2, Hydrogen, 2, Oxygen, 6)
80+
.components(Aluminium, 2, Silicon, 1, Oxygen, 4, Fluorine, 2)
8181
.buildAndRegister();
8282

8383
Bone = new Material.Builder(GTCEu.id("bone"))
@@ -652,7 +652,7 @@ public static void register() {
652652
Tetrahedrite = new Material.Builder(GTCEu.id("tetrahedrite"))
653653
.dust().ore()
654654
.color(0xa3a09b).secondaryColor(0x143313)
655-
.components(Copper, 3, Antimony, 1, Sulfur, 3, Iron, 1)
655+
.components(Copper, 2, Iron, 1, Antimony, 1, Sulfur, 3)
656656
.buildAndRegister();
657657

658658
TinAlloy = new Material.Builder(GTCEu.id("tin_alloy"))
@@ -668,7 +668,7 @@ public static void register() {
668668
.gem(3).ore()
669669
.color(0xe8d73a).secondaryColor(0xf4680f).iconSet(GEM_HORIZONTAL)
670670
.appendFlags(EXT_METAL, NO_SMASHING, NO_SMELTING, HIGH_SIFTER_OUTPUT)
671-
.components(Aluminium, 2, Silicon, 1, Fluorine, 1, Hydrogen, 2)
671+
.components(Aluminium, 2, Silicon, 1, Oxygen, 5, Fluorine, 1, Hydrogen, 1)
672672
.buildAndRegister();
673673

674674
Tungstate = new Material.Builder(GTCEu.id("tungstate"))
@@ -1059,7 +1059,7 @@ public static void register() {
10591059
GlauconiteSand = new Material.Builder(GTCEu.id("glauconite_sand"))
10601060
.dust().ore(3, 1)
10611061
.color(0x1da351).secondaryColor(0x1a6e8f).iconSet(SAND)
1062-
.components(Potassium, 1, Magnesium, 2, Aluminium, 4, Hydrogen, 2, Oxygen, 12)
1062+
.components(Potassium, 1, Magnesium, 2, Aluminium, 2, Silicon, 3, Oxygen, 12, Hydrogen, 2, Water, 1)
10631063
.buildAndRegister();
10641064

10651065
Malachite = new Material.Builder(GTCEu.id("malachite"))
@@ -1083,7 +1083,7 @@ public static void register() {
10831083
Alunite = new Material.Builder(GTCEu.id("alunite"))
10841084
.dust().ore(3, 1)
10851085
.color(0xfbd677).secondaryColor(0xe11e0a).iconSet(METALLIC)
1086-
.components(Potassium, 1, Aluminium, 3, Silicon, 2, Hydrogen, 6, Oxygen, 14)
1086+
.components(Potassium, 1, Aluminium, 2, Silicon, 2, Hydrogen, 6, Oxygen, 14)
10871087
.buildAndRegister();
10881088

10891089
Talc = new Material.Builder(GTCEu.id("talc"))
@@ -1551,7 +1551,7 @@ public static void register() {
15511551
Pyrochlore = new Material.Builder(GTCEu.id("pyrochlore"))
15521552
.dust().ore()
15531553
.color(0x5b4838).secondaryColor(0x331400).iconSet(METALLIC)
1554-
.components(Calcium, 2, Niobium, 2, Oxygen, 7)
1554+
.components(Calcium, 2, Niobium, 2, Oxygen, 6, Fluorine, 1)
15551555
.buildAndRegister();
15561556

15571557
PotassiumHydroxide = new Material.Builder(GTCEu.id("potassium_hydroxide"))

‎src/main/java/com/gregtechceu/gtceu/common/data/materials/SecondDegreeMaterials.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ public static void register() {
6161
.gem().ore(2, 1)
6262
.color(0xa7e404).secondaryColor(0x166439).iconSet(RUBY)
6363
.appendFlags(EXT_METAL, NO_SMASHING, NO_SMELTING, HIGH_SIFTER_OUTPUT)
64-
.components(Magnesium, 2, Iron, 1, SiliconDioxide, 2)
64+
.components(Magnesium, 1, Iron, 1, SiliconDioxide, 2)
6565
.buildAndRegister();
6666

6767
Opal = new Material.Builder(GTCEu.id("opal"))
@@ -229,14 +229,14 @@ public static void register() {
229229
.dust().ore(3, 1)
230230
.color(0xede8a3).secondaryColor(0xcdb44c).iconSet(ROUGH)
231231
.flags(DISABLE_DECOMPOSITION)
232-
.components(Sodium, 1, Magnesium, 6, Silicon, 12, Hydrogen, 4, Water, 5, Oxygen, 36)
232+
.components(Sodium, 1, Magnesium, 6, Silicon, 12, Hydrogen, 6, Water, 5, Oxygen, 36)
233233
.buildAndRegister();
234234

235235
FullersEarth = new Material.Builder(GTCEu.id("fullers_earth"))
236236
.langValue("Fuller's Earth")
237237
.dust().ore(2, 1)
238238
.color(0xf3efbb).secondaryColor(0xb8d066).iconSet(FINE)
239-
.components(Magnesium, 1, Silicon, 4, Hydrogen, 1, Water, 4, Oxygen, 11)
239+
.components(Magnesium, 2, Silicon, 4, Oxygen, 14, Hydrogen, 4, Water, 1)
240240
.buildAndRegister();
241241

242242
Pitchblende = new Material.Builder(GTCEu.id("pitchblende"))
@@ -276,8 +276,7 @@ public static void register() {
276276
Zeolite = new Material.Builder(GTCEu.id("zeolite"))
277277
.dust().ore(3, 1)
278278
.color(0xf2e3e0).secondaryColor(0xeabeb4)
279-
.flags(DISABLE_DECOMPOSITION)
280-
.components(Sodium, 1, Calcium, 4, Silicon, 27, Aluminium, 9, Water, 28, Oxygen, 72)
279+
.components(Sodium, 2, Aluminium, 2, Silicon, 3, Oxygen, 10, Water, 2)
281280
.buildAndRegister();
282281

283282
Concrete = new Material.Builder(GTCEu.id("concrete"))

‎src/main/java/com/gregtechceu/gtceu/data/recipe/serialized/chemistry/SeparationRecipes.java‎

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -426,14 +426,6 @@ public static void init(Consumer<FinishedRecipe> provider) {
426426
.outputFluids(Oxygen.getFluid(9000))
427427
.duration(270).EUt(VA[LV] * 2L).save(provider);
428428

429-
ELECTROLYZER_RECIPES.recipeBuilder("zeolite_electrolysis")
430-
.inputItems(dust, Zeolite, 41)
431-
.outputItems(dust, Sodium)
432-
.outputItems(dust, Calcium, 4)
433-
.outputItems(dust, Silicon, 27)
434-
.outputItems(dust, Aluminium, 9)
435-
.duration(656).EUt(VA[MV]).save(provider);
436-
437429
ELECTROLYZER_RECIPES.recipeBuilder("bentonite_electrolysis")
438430
.inputItems(dust, Bentonite, 30)
439431
.outputItems(dust, Sodium)

0 commit comments

Comments
 (0)