From 6cce75cccba5dd55d939718f2d70eef8a40798c3 Mon Sep 17 00:00:00 2001
From: ticccco <23436953+LucasPlacentino@users.noreply.github.com>
Date: Tue, 3 Jan 2023 00:01:37 +0100
Subject: [PATCH] fix ore gen

---
 .../biome_modifier/add_phosphate_ore.json     |  6 +++++
 .../configured_feature/ore_borax.json         |  0
 .../configured_feature/ore_phosphate.json     |  0
 .../placed_feature/ore_borax_placed.json}     |  2 +-
 .../placed_feature/ore_phosphate_placed.json} |  2 +-
 .../placed_feature/ore_phosphate.json         | 27 -------------------
 6 files changed, 8 insertions(+), 29 deletions(-)
 create mode 100644 src/main/resources/data/mcsc/forge/biome_modifier/add_phosphate_ore.json
 rename src/main/resources/data/{minecraft => mcsc}/worldgen/configured_feature/ore_borax.json (100%)
 rename src/main/resources/data/{minecraft => mcsc}/worldgen/configured_feature/ore_phosphate.json (100%)
 rename src/main/resources/data/{minecraft/worldgen/placed_feature/borax_ore.json => mcsc/worldgen/placed_feature/ore_borax_placed.json} (91%)
 rename src/main/resources/data/{minecraft/worldgen/placed_feature/ore_borax.json => mcsc/worldgen/placed_feature/ore_phosphate_placed.json} (90%)
 delete mode 100644 src/main/resources/data/minecraft/worldgen/placed_feature/ore_phosphate.json

diff --git a/src/main/resources/data/mcsc/forge/biome_modifier/add_phosphate_ore.json b/src/main/resources/data/mcsc/forge/biome_modifier/add_phosphate_ore.json
new file mode 100644
index 0000000..390660c
--- /dev/null
+++ b/src/main/resources/data/mcsc/forge/biome_modifier/add_phosphate_ore.json
@@ -0,0 +1,6 @@
+{
+  "type": "forge:add_features",
+  "biomes": "#minecraft:is_overworld",
+  "features": "mcsc:phosphate_ore_placed",
+  "step": "underground_ores"
+}
\ No newline at end of file
diff --git a/src/main/resources/data/minecraft/worldgen/configured_feature/ore_borax.json b/src/main/resources/data/mcsc/worldgen/configured_feature/ore_borax.json
similarity index 100%
rename from src/main/resources/data/minecraft/worldgen/configured_feature/ore_borax.json
rename to src/main/resources/data/mcsc/worldgen/configured_feature/ore_borax.json
diff --git a/src/main/resources/data/minecraft/worldgen/configured_feature/ore_phosphate.json b/src/main/resources/data/mcsc/worldgen/configured_feature/ore_phosphate.json
similarity index 100%
rename from src/main/resources/data/minecraft/worldgen/configured_feature/ore_phosphate.json
rename to src/main/resources/data/mcsc/worldgen/configured_feature/ore_phosphate.json
diff --git a/src/main/resources/data/minecraft/worldgen/placed_feature/borax_ore.json b/src/main/resources/data/mcsc/worldgen/placed_feature/ore_borax_placed.json
similarity index 91%
rename from src/main/resources/data/minecraft/worldgen/placed_feature/borax_ore.json
rename to src/main/resources/data/mcsc/worldgen/placed_feature/ore_borax_placed.json
index c144fa8..9d53321 100644
--- a/src/main/resources/data/minecraft/worldgen/placed_feature/borax_ore.json
+++ b/src/main/resources/data/mcsc/worldgen/placed_feature/ore_borax_placed.json
@@ -1,5 +1,5 @@
 {
-  "feature": "minecraft:borax_ore",
+  "feature": "mcsc:ore_borax_placed",
   "placement": [
     {
       "type": "minecraft:count",
diff --git a/src/main/resources/data/minecraft/worldgen/placed_feature/ore_borax.json b/src/main/resources/data/mcsc/worldgen/placed_feature/ore_phosphate_placed.json
similarity index 90%
rename from src/main/resources/data/minecraft/worldgen/placed_feature/ore_borax.json
rename to src/main/resources/data/mcsc/worldgen/placed_feature/ore_phosphate_placed.json
index d465d22..ea70172 100644
--- a/src/main/resources/data/minecraft/worldgen/placed_feature/ore_borax.json
+++ b/src/main/resources/data/mcsc/worldgen/placed_feature/ore_phosphate_placed.json
@@ -1,5 +1,5 @@
 {
-  "feature": "minecraft:ore_borax",
+  "feature": "mcsc:ore_phosphate_placed",
   "placement": [
     {
       "type": "minecraft:count",
diff --git a/src/main/resources/data/minecraft/worldgen/placed_feature/ore_phosphate.json b/src/main/resources/data/minecraft/worldgen/placed_feature/ore_phosphate.json
deleted file mode 100644
index 618e3af..0000000
--- a/src/main/resources/data/minecraft/worldgen/placed_feature/ore_phosphate.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "feature": "minecraft:ore_phosphate",
-  "placement": [
-    {
-      "type": "minecraft:count",
-      "count": 30
-    },
-    {
-      "type": "minecraft:in_square"
-    },
-    {
-      "type": "minecraft:height_range",
-      "height": {
-        "type": "minecraft:uniform",
-        "max_inclusive": {
-          "below_top": 0
-        },
-        "min_inclusive": {
-          "absolute": 160
-        }
-      }
-    },
-    {
-      "type": "minecraft:biome"
-    }
-  ]
-}
\ No newline at end of file