From c863125b744ebac98edb5e8132554af9a9a0f4fa Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Fri, 16 Feb 2024 17:39:46 -0600 Subject: [PATCH 1/2] Fix ore vein errors --- .../worldgen/vein/nether/phosphorite_vein.json | 15 ++++++++++++--- .../worldgen/vein/overworld/bog_iron.json | 2 +- .../worldgen/vein/overworld/phosphorite_vein.json | 4 ++-- .../worldgen/vein/overworld/platinum_vein.json | 2 +- .../worldgen/vein/overworld/talc_vein.json | 2 +- groovy/material/OreMaterials.groovy | 6 +++--- 6 files changed, 20 insertions(+), 11 deletions(-) diff --git a/config/gregtech/worldgen/vein/nether/phosphorite_vein.json b/config/gregtech/worldgen/vein/nether/phosphorite_vein.json index 803141195..8e074fea2 100644 --- a/config/gregtech/worldgen/vein/nether/phosphorite_vein.json +++ b/config/gregtech/worldgen/vein/nether/phosphorite_vein.json @@ -17,13 +17,22 @@ "type": "layered", "values": [ { - "primary": "ore:phosphorite" + "primary": { + "block":"susy:resource_block", + "variant":"phosphorite" + } }, { - "secondary": "ore:phosphorite" + "secondary": { + "block":"susy:resource_block", + "variant":"phosphorite" + } }, { - "between": "ore:phosphorite" + "between": { + "block":"susy:resource_block", + "variant":"phosphorite" + } }, { "sporadic": "ore:apatite" diff --git a/config/gregtech/worldgen/vein/overworld/bog_iron.json b/config/gregtech/worldgen/vein/overworld/bog_iron.json index e413e9293..cd1485ad9 100644 --- a/config/gregtech/worldgen/vein/overworld/bog_iron.json +++ b/config/gregtech/worldgen/vein/overworld/bog_iron.json @@ -9,7 +9,7 @@ }, "biome_modifier": { "type": "biome_map", - "swamp": 300 + "swampland": 300 }, "generator": { "type": "layered", diff --git a/config/gregtech/worldgen/vein/overworld/phosphorite_vein.json b/config/gregtech/worldgen/vein/overworld/phosphorite_vein.json index 8fe39373c..4c235f83e 100644 --- a/config/gregtech/worldgen/vein/overworld/phosphorite_vein.json +++ b/config/gregtech/worldgen/vein/overworld/phosphorite_vein.json @@ -24,10 +24,10 @@ } }, { - "secondary": "fluorapatite" + "secondary": "ore:fluorapatite" }, { - "between": "hydroxyapatite" + "between": "ore:hydroxyapatite" }, { "sporadic": "ore:chlorapatite" diff --git a/config/gregtech/worldgen/vein/overworld/platinum_vein.json b/config/gregtech/worldgen/vein/overworld/platinum_vein.json index c40ec0de0..cb72e74da 100644 --- a/config/gregtech/worldgen/vein/overworld/platinum_vein.json +++ b/config/gregtech/worldgen/vein/overworld/platinum_vein.json @@ -10,7 +10,7 @@ }, "biome_modifier": { "type": "biome_map", - "mountain": 35 + "biomesoplenty:mountain": 35 }, "generator": { "type": "layered", diff --git a/config/gregtech/worldgen/vein/overworld/talc_vein.json b/config/gregtech/worldgen/vein/overworld/talc_vein.json index 3aad9369b..9d439c137 100644 --- a/config/gregtech/worldgen/vein/overworld/talc_vein.json +++ b/config/gregtech/worldgen/vein/overworld/talc_vein.json @@ -21,7 +21,7 @@ "primary": "ore:talc" }, { - "secondary": "ore:soapstone" + "secondary": "ore:asbestos" }, { "between": "ore:calcite" diff --git a/groovy/material/OreMaterials.groovy b/groovy/material/OreMaterials.groovy index 09089295a..404d06c78 100755 --- a/groovy/material/OreMaterials.groovy +++ b/groovy/material/OreMaterials.groovy @@ -289,7 +289,7 @@ public class OreMaterials{ .build(); Phosphorite = new Material.Builder(7035, SuSyUtility.susyId('phosphorite')) - .dust() + .ore() .iconSet(SHINY) .color(0x8a6e42) .build(); @@ -493,7 +493,7 @@ public class OreMaterials{ .build(); Braggite = new Material.Builder(7064, SuSyUtility.susyId('braggite')) - .dust() + .ore() .color(0x686b5f) .components(Platinum, 1, Palladium, 1, Nickel, 1, Sulfur, 1) .build() @@ -563,7 +563,7 @@ public class OreMaterials{ Carnotite.setFormula('K2(UO2)2(VO4)2 * 3H2O', true) AlluvialPGMSand = new Material.Builder(7074, SuSyUtility.susyId('alluvial_pgm_sand')) - .dust() + .ore() .color(0x948a5d) .build(); From 3015b650936a4849246fb3a17a1a2f5ee90abab7 Mon Sep 17 00:00:00 2001 From: bruberu <80226372+bruberu@users.noreply.github.com> Date: Fri, 16 Feb 2024 21:08:51 -0600 Subject: [PATCH 2/2] Remove sedimentary phosphorite from the nether --- .../vein/nether/phosphorite_vein.json | 42 ------------------- .../vein/overworld/phosphorite_vein.json | 22 +++++----- 2 files changed, 12 insertions(+), 52 deletions(-) delete mode 100644 config/gregtech/worldgen/vein/nether/phosphorite_vein.json diff --git a/config/gregtech/worldgen/vein/nether/phosphorite_vein.json b/config/gregtech/worldgen/vein/nether/phosphorite_vein.json deleted file mode 100644 index 8e074fea2..000000000 --- a/config/gregtech/worldgen/vein/nether/phosphorite_vein.json +++ /dev/null @@ -1,42 +0,0 @@ -{ - "weight": 80, - "density": 0.75, - "dimension_filter":[ - "dimension_id:-1" - ], - "max_height":120, - "min_height":0, - "generator": { - "type": "layered", - "radius": [ - 20, - 20 - ] - }, - "filler": { - "type": "layered", - "values": [ - { - "primary": { - "block":"susy:resource_block", - "variant":"phosphorite" - } - }, - { - "secondary": { - "block":"susy:resource_block", - "variant":"phosphorite" - } - }, - { - "between": { - "block":"susy:resource_block", - "variant":"phosphorite" - } - }, - { - "sporadic": "ore:apatite" - } - ] - } -} diff --git a/config/gregtech/worldgen/vein/overworld/phosphorite_vein.json b/config/gregtech/worldgen/vein/overworld/phosphorite_vein.json index 4c235f83e..1246e6c98 100644 --- a/config/gregtech/worldgen/vein/overworld/phosphorite_vein.json +++ b/config/gregtech/worldgen/vein/overworld/phosphorite_vein.json @@ -1,12 +1,8 @@ { "weight": 80, - "density": 1, - "max_height": 80, - "min_height": 0, - "vein_populator": { - "type": "surface_rock", - "material": "phosphorite" - }, + "density": 0.75, + "max_height":120, + "min_height":0, "generator": { "type": "layered", "radius": [ @@ -24,13 +20,19 @@ } }, { - "secondary": "ore:fluorapatite" + "secondary": { + "block":"susy:resource_block", + "variant":"phosphorite" + } }, { - "between": "ore:hydroxyapatite" + "between": { + "block":"susy:resource_block", + "variant":"phosphorite" + } }, { - "sporadic": "ore:chlorapatite" + "sporadic": "ore:apatite" } ] }