From b076d626024ad3b71cc75932ca1fd29fe468ef62 Mon Sep 17 00:00:00 2001
From: Dmitry <ondyshev.dmitry@gmail.com>
Date: Sun, 24 Dec 2023 18:36:24 +0700
Subject: [PATCH] =?UTF-8?q?=D1=84=D0=B8=D0=BA=D1=81=20=D1=81=D0=BF=D0=B0?=
 =?UTF-8?q?=D0=B2=D0=BD=D0=B0=20=D0=B3=D0=B5=D0=BC=D0=BE=D0=B2=20=D0=B8?=
 =?UTF-8?q?=D0=B7=20=D1=82=D1=84=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../diamond_volcano_fissure.json              | 147 ++++++++++++++++++
 .../emerald_empty_hot_spring.json             | 145 +++++++++++++++++
 .../emerald_hot_spring.json                   | 145 +++++++++++++++++
 .../sapphire_empty_hot_spring.json            | 145 +++++++++++++++++
 .../sapphire_hot_spring.json                  | 145 +++++++++++++++++
 .../topaz_volcano_fissure.json                | 147 ++++++++++++++++++
 kubejs/server_scripts/tfc/tags.js             |   5 -
 7 files changed, 874 insertions(+), 5 deletions(-)
 create mode 100644 kubejs/data/tfc/worldgen/configured_feature/diamond_volcano_fissure.json
 create mode 100644 kubejs/data/tfc/worldgen/configured_feature/emerald_empty_hot_spring.json
 create mode 100644 kubejs/data/tfc/worldgen/configured_feature/emerald_hot_spring.json
 create mode 100644 kubejs/data/tfc/worldgen/configured_feature/sapphire_empty_hot_spring.json
 create mode 100644 kubejs/data/tfc/worldgen/configured_feature/sapphire_hot_spring.json
 create mode 100644 kubejs/data/tfc/worldgen/configured_feature/topaz_volcano_fissure.json

diff --git a/kubejs/data/tfc/worldgen/configured_feature/diamond_volcano_fissure.json b/kubejs/data/tfc/worldgen/configured_feature/diamond_volcano_fissure.json
new file mode 100644
index 000000000..e03726012
--- /dev/null
+++ b/kubejs/data/tfc/worldgen/configured_feature/diamond_volcano_fissure.json
@@ -0,0 +1,147 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "type": "tfc:fissure",
+  "config": {
+    "wall_state": "tfc:rock/raw/basalt",
+    "fluid_state": "minecraft:lava",
+    "count": 3,
+    "radius": 6,
+    "decoration": {
+      "blocks": [
+        {
+          "replace": [
+            "tfc:rock/raw/rhyolite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:rhyolite_diamond_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/basalt"
+          ],
+          "with": [
+            {
+              "block": "gtceu:basalt_diamond_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/andesite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:andesite_diamond_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/dacite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:dacite_diamond_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/granite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:granite_diamond_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/diorite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:diorite_diamond_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/gabbro"
+          ],
+          "with": [
+            {
+              "block": "gtceu:gabbro_diamond_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/quartzite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:quartzite_diamond_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/slate"
+          ],
+          "with": [
+            {
+              "block": "gtceu:slate_diamond_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/phyllite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:phyllite_diamond_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/schist"
+          ],
+          "with": [
+            {
+              "block": "gtceu:schist_diamond_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/gneiss"
+          ],
+          "with": [
+            {
+              "block": "gtceu:gneiss_diamond_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/marble"
+          ],
+          "with": [
+            {
+              "block": "gtceu:marble_diamond_ore"
+            }
+          ]
+        }
+      ],
+      "radius": 3,
+      "count": 6,
+      "rarity": 3
+    }
+  }
+}
\ No newline at end of file
diff --git a/kubejs/data/tfc/worldgen/configured_feature/emerald_empty_hot_spring.json b/kubejs/data/tfc/worldgen/configured_feature/emerald_empty_hot_spring.json
new file mode 100644
index 000000000..2a167edae
--- /dev/null
+++ b/kubejs/data/tfc/worldgen/configured_feature/emerald_empty_hot_spring.json
@@ -0,0 +1,145 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "type": "tfc:hot_spring",
+  "config": {
+    "fluid_state": "minecraft:air",
+    "radius": 14,
+    "decoration": {
+      "blocks": [
+        {
+          "replace": [
+            "tfc:rock/raw/rhyolite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:rhyolite_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/basalt"
+          ],
+          "with": [
+            {
+              "block": "gtceu:basalt_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/andesite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:andesite_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/dacite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:dacite_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/granite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:granite_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/diorite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:diorite_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/gabbro"
+          ],
+          "with": [
+            {
+              "block": "gtceu:gabbro_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/quartzite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:quartzite_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/slate"
+          ],
+          "with": [
+            {
+              "block": "gtceu:slate_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/phyllite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:phyllite_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/schist"
+          ],
+          "with": [
+            {
+              "block": "gtceu:schist_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/gneiss"
+          ],
+          "with": [
+            {
+              "block": "gtceu:gneiss_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/marble"
+          ],
+          "with": [
+            {
+              "block": "gtceu:marble_emerald_ore"
+            }
+          ]
+        }
+      ],
+      "radius": 5,
+      "count": 2,
+      "rarity": 3
+    }
+  }
+}
\ No newline at end of file
diff --git a/kubejs/data/tfc/worldgen/configured_feature/emerald_hot_spring.json b/kubejs/data/tfc/worldgen/configured_feature/emerald_hot_spring.json
new file mode 100644
index 000000000..64a8ace3d
--- /dev/null
+++ b/kubejs/data/tfc/worldgen/configured_feature/emerald_hot_spring.json
@@ -0,0 +1,145 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "type": "tfc:hot_spring",
+  "config": {
+    "fluid_state": "tfc:fluid/spring_water",
+    "radius": 14,
+    "decoration": {
+      "blocks": [
+        {
+          "replace": [
+            "tfc:rock/raw/rhyolite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:rhyolite_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/basalt"
+          ],
+          "with": [
+            {
+              "block": "gtceu:basalt_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/andesite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:andesite_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/dacite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:dacite_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/granite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:granite_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/diorite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:diorite_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/gabbro"
+          ],
+          "with": [
+            {
+              "block": "gtceu:gabbro_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/quartzite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:quartzite_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/slate"
+          ],
+          "with": [
+            {
+              "block": "gtceu:slate_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/phyllite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:phyllite_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/schist"
+          ],
+          "with": [
+            {
+              "block": "gtceu:schist_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/gneiss"
+          ],
+          "with": [
+            {
+              "block": "gtceu:gneiss_emerald_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/marble"
+          ],
+          "with": [
+            {
+              "block": "gtceu:marble_emerald_ore"
+            }
+          ]
+        }
+      ],
+      "radius": 5,
+      "count": 5,
+      "rarity": 3
+    }
+  }
+}
\ No newline at end of file
diff --git a/kubejs/data/tfc/worldgen/configured_feature/sapphire_empty_hot_spring.json b/kubejs/data/tfc/worldgen/configured_feature/sapphire_empty_hot_spring.json
new file mode 100644
index 000000000..a8866932e
--- /dev/null
+++ b/kubejs/data/tfc/worldgen/configured_feature/sapphire_empty_hot_spring.json
@@ -0,0 +1,145 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "type": "tfc:hot_spring",
+  "config": {
+    "fluid_state": "minecraft:air",
+    "radius": 14,
+    "decoration": {
+      "blocks": [
+        {
+          "replace": [
+            "tfc:rock/raw/rhyolite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:rhyolite_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/basalt"
+          ],
+          "with": [
+            {
+              "block": "gtceu:basalt_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/andesite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:andesite_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/dacite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:dacite_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/granite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:granite_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/diorite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:diorite_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/gabbro"
+          ],
+          "with": [
+            {
+              "block": "gtceu:gabbro_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/quartzite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:quartzite_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/slate"
+          ],
+          "with": [
+            {
+              "block": "gtceu:slate_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/phyllite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:phyllite_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/schist"
+          ],
+          "with": [
+            {
+              "block": "gtceu:schist_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/gneiss"
+          ],
+          "with": [
+            {
+              "block": "gtceu:gneiss_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/marble"
+          ],
+          "with": [
+            {
+              "block": "gtceu:marble_sapphire_ore"
+            }
+          ]
+        }
+      ],
+      "radius": 5,
+      "count": 2,
+      "rarity": 3
+    }
+  }
+}
\ No newline at end of file
diff --git a/kubejs/data/tfc/worldgen/configured_feature/sapphire_hot_spring.json b/kubejs/data/tfc/worldgen/configured_feature/sapphire_hot_spring.json
new file mode 100644
index 000000000..6719a85a7
--- /dev/null
+++ b/kubejs/data/tfc/worldgen/configured_feature/sapphire_hot_spring.json
@@ -0,0 +1,145 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "type": "tfc:hot_spring",
+  "config": {
+    "fluid_state": "tfc:fluid/spring_water",
+    "radius": 14,
+    "decoration": {
+      "blocks": [
+        {
+          "replace": [
+            "tfc:rock/raw/rhyolite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:rhyolite_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/basalt"
+          ],
+          "with": [
+            {
+              "block": "gtceu:basalt_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/andesite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:andesite_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/dacite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:dacite_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/granite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:granite_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/diorite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:diorite_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/gabbro"
+          ],
+          "with": [
+            {
+              "block": "gtceu:gabbro_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/quartzite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:quartzite_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/slate"
+          ],
+          "with": [
+            {
+              "block": "gtceu:slate_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/phyllite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:phyllite_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/schist"
+          ],
+          "with": [
+            {
+              "block": "gtceu:schist_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/gneiss"
+          ],
+          "with": [
+            {
+              "block": "gtceu:gneiss_sapphire_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/marble"
+          ],
+          "with": [
+            {
+              "block": "gtceu:marble_sapphire_ore"
+            }
+          ]
+        }
+      ],
+      "radius": 5,
+      "count": 5,
+      "rarity": 3
+    }
+  }
+}
\ No newline at end of file
diff --git a/kubejs/data/tfc/worldgen/configured_feature/topaz_volcano_fissure.json b/kubejs/data/tfc/worldgen/configured_feature/topaz_volcano_fissure.json
new file mode 100644
index 000000000..1c28cd24e
--- /dev/null
+++ b/kubejs/data/tfc/worldgen/configured_feature/topaz_volcano_fissure.json
@@ -0,0 +1,147 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "type": "tfc:fissure",
+  "config": {
+    "wall_state": "tfc:rock/raw/basalt",
+    "fluid_state": "minecraft:lava",
+    "count": 3,
+    "radius": 6,
+    "decoration": {
+      "blocks": [
+        {
+          "replace": [
+            "tfc:rock/raw/rhyolite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:rhyolite_topaz_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/basalt"
+          ],
+          "with": [
+            {
+              "block": "gtceu:basalt_topaz_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/andesite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:andesite_topaz_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/dacite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:dacite_topaz_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/granite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:granite_topaz_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/diorite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:diorite_topaz_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/gabbro"
+          ],
+          "with": [
+            {
+              "block": "gtceu:gabbro_topaz_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/quartzite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:quartzite_topaz_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/slate"
+          ],
+          "with": [
+            {
+              "block": "gtceu:slate_topaz_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/phyllite"
+          ],
+          "with": [
+            {
+              "block": "gtceu:phyllite_topaz_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/schist"
+          ],
+          "with": [
+            {
+              "block": "gtceu:schist_topaz_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/gneiss"
+          ],
+          "with": [
+            {
+              "block": "gtceu:gneiss_topaz_ore"
+            }
+          ]
+        },
+        {
+          "replace": [
+            "tfc:rock/raw/marble"
+          ],
+          "with": [
+            {
+              "block": "gtceu:marble_topaz_ore"
+            }
+          ]
+        }
+      ],
+      "radius": 3,
+      "count": 6,
+      "rarity": 3
+    }
+  }
+}
\ No newline at end of file
diff --git a/kubejs/server_scripts/tfc/tags.js b/kubejs/server_scripts/tfc/tags.js
index 1348e1ec6..ea35be951 100644
--- a/kubejs/server_scripts/tfc/tags.js
+++ b/kubejs/server_scripts/tfc/tags.js
@@ -202,11 +202,6 @@ const registerTFCFluidTags = (event) => {
 
 const registerTFCPlacedFeatures = (event) => {
     
-    // Удаление гена гемов из биомов
-    event.remove('tfc:in_biome/large_features/highlands', 'tfc:random_empty_hot_spring')
-    event.remove('tfc:in_biome/large_features/low_canyons', 'tfc:random_empty_hot_spring')
-    event.remove('tfc:in_biome/large_features/plateau', 'tfc:random_empty_hot_spring')
-
     // Удаление
     event.remove('tfc:in_biome/veins', 'tfc:vein/surface_native_copper')
     event.remove('tfc:in_biome/veins', 'tfc:vein/surface_malachite')