Skip to content

Commit

Permalink
Merge pull request #754 from SymmetricDevs/ore-vein-fixes
Browse files Browse the repository at this point in the history
Fix ore vein errors
  • Loading branch information
planetme authored Feb 22, 2024
2 parents f6109e8 + 3015b65 commit 16115bb
Show file tree
Hide file tree
Showing 6 changed files with 18 additions and 49 deletions.
33 changes: 0 additions & 33 deletions config/gregtech/worldgen/vein/nether/phosphorite_vein.json

This file was deleted.

2 changes: 1 addition & 1 deletion config/gregtech/worldgen/vein/overworld/bog_iron.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
},
"biome_modifier": {
"type": "biome_map",
"swamp": 300
"swampland": 300
},
"generator": {
"type": "layered",
Expand Down
22 changes: 12 additions & 10 deletions config/gregtech/worldgen/vein/overworld/phosphorite_vein.json
Original file line number Diff line number Diff line change
@@ -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": [
Expand All @@ -24,13 +20,19 @@
}
},
{
"secondary": "fluorapatite"
"secondary": {
"block":"susy:resource_block",
"variant":"phosphorite"
}
},
{
"between": "hydroxyapatite"
"between": {
"block":"susy:resource_block",
"variant":"phosphorite"
}
},
{
"sporadic": "ore:chlorapatite"
"sporadic": "ore:apatite"
}
]
}
Expand Down
2 changes: 1 addition & 1 deletion config/gregtech/worldgen/vein/overworld/platinum_vein.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
},
"biome_modifier": {
"type": "biome_map",
"mountain": 35
"biomesoplenty:mountain": 35
},
"generator": {
"type": "layered",
Expand Down
2 changes: 1 addition & 1 deletion config/gregtech/worldgen/vein/overworld/talc_vein.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
"primary": "ore:talc"
},
{
"secondary": "ore:soapstone"
"secondary": "ore:asbestos"
},
{
"between": "ore:calcite"
Expand Down
6 changes: 3 additions & 3 deletions groovy/material/OreMaterials.groovy
Original file line number Diff line number Diff line change
Expand Up @@ -289,7 +289,7 @@ public class OreMaterials{
.build();

Phosphorite = new Material.Builder(7035, SuSyUtility.susyId('phosphorite'))
.dust()
.ore()
.iconSet(SHINY)
.color(0x8a6e42)
.build();
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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();

Expand Down

0 comments on commit 16115bb

Please sign in to comment.