From aaec8afb4a10ff11223bb2be5e39deb9ab677867 Mon Sep 17 00:00:00 2001
From: SpeeeDCraft <52341158+SpeeeDCraft@users.noreply.github.com>
Date: Sun, 22 Oct 2023 18:48:06 +0700
Subject: [PATCH] unfuck dead code

---
 config/xaerominimap_entities.json             |  6 +-
 .../vein/basaltic_sands.json                  | 64 +++++++++++++++++++
 .../vein/normal_bismuthinite.json             | 20 +++---
 .../vein/surface_bismuthinite.json            | 20 +++---
 .../placed_feature/vein/basaltic_sands.json   |  5 ++
 kubejs/startup_scripts/gregtech/materials.js  |  2 +-
 6 files changed, 93 insertions(+), 24 deletions(-)
 create mode 100644 kubejs/data/tfc/worldgen/configured_feature/vein/basaltic_sands.json
 create mode 100644 kubejs/data/tfc/worldgen/placed_feature/vein/basaltic_sands.json

diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json
index 46474f8c6..7f813b6a7 100644
--- a/config/xaerominimap_entities.json
+++ b/config/xaerominimap_entities.json
@@ -10,20 +10,20 @@
   "name": "gui.xaero_entity_category_root",
   "protection": true,
   "settingOverrides": {
-    "displayHeight": 0.0,
     "displayed": true,
+    "displayHeight": 0.0,
     "heightBasedFade": true,
     "renderOrder": 0.0,
     "color": 13.0,
     "displayNameWhenIconFails": true,
     "entityNumber": 1000.0,
     "alwaysDisplayNametags": false,
-    "dotSize": 2.0,
     "startFadingAt": 0.0,
+    "dotSize": 2.0,
     "renderOverMinimapFrame": 1.0,
     "icons": 1.0,
-    "heightLimit": 20.0,
     "names": 0.0,
+    "heightLimit": 20.0,
     "iconScale": 1.0
   },
   "subCategories": [
diff --git a/kubejs/data/tfc/worldgen/configured_feature/vein/basaltic_sands.json b/kubejs/data/tfc/worldgen/configured_feature/vein/basaltic_sands.json
new file mode 100644
index 000000000..6c8dad758
--- /dev/null
+++ b/kubejs/data/tfc/worldgen/configured_feature/vein/basaltic_sands.json
@@ -0,0 +1,64 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "type": "tfc:cluster_vein",
+  "config": {
+    "rarity": 80,
+    "min_y": {
+      "absolute": 15
+    },
+    "max_y": {
+      "absolute": 60
+    },
+    "size": 24,
+    "density": 0.2,
+    "blocks": [
+      {
+        "replace": [
+          "tfc:rock/raw/granite"
+        ],
+        "with": [
+          {
+            "weight": 35,
+            "block": "gtceu:tfc_granite_basaltic_mineral_sand_ore"
+          },
+          {
+            "weight": 25,
+            "block": "gtceu:tfc_granite_granitic_mineral_sand_ore"
+          },
+          {
+            "weight": 25,
+            "block": "gtceu:tfc_granite_fullers_earth_ore"
+          },
+          {
+            "weight": 15,
+            "block": "tfc:ore/gypsum/granite"
+          }
+        ]
+      },
+      {
+        "replace": [
+          "tfc:rock/raw/basalt"
+        ],
+        "with": [
+          {
+            "weight": 35,
+            "block": "gtceu:tfc_basalt_basaltic_mineral_sand_ore"
+          },
+          {
+            "weight": 25,
+            "block": "gtceu:tfc_basalt_granitic_mineral_sand_ore"
+          },
+          {
+            "weight": 25,
+            "block": "gtceu:tfc_basalt_fullers_earth_ore"
+          },
+          {
+            "weight": 15,
+            "block": "tfc:ore/gypsum/basalt"
+          }
+        ]
+      }
+    ],
+    "random_name": "basaltic_sands"
+  }
+}
\ No newline at end of file
diff --git a/kubejs/data/tfc/worldgen/configured_feature/vein/normal_bismuthinite.json b/kubejs/data/tfc/worldgen/configured_feature/vein/normal_bismuthinite.json
index 84ea95122..a7e43bb6a 100644
--- a/kubejs/data/tfc/worldgen/configured_feature/vein/normal_bismuthinite.json
+++ b/kubejs/data/tfc/worldgen/configured_feature/vein/normal_bismuthinite.json
@@ -19,7 +19,7 @@
         "with": [
           {
             "weight": 80,
-            "block": "gtceu:tfc_granite_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/granite"
           },
           {
             "weight": 9,
@@ -38,7 +38,7 @@
         "with": [
           {
             "weight": 80,
-            "block": "gtceu:tfc_diorite_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/diorite"
           },
           {
             "weight": 9,
@@ -57,7 +57,7 @@
         "with": [
           {
             "weight": 80,
-            "block": "gtceu:tfc_gabbro_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/gabbro"
           },
           {
             "weight": 9,
@@ -76,7 +76,7 @@
         "with": [
           {
             "weight": 80,
-            "block": "gtceu:tfc_shale_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/shale"
           },
           {
             "weight": 9,
@@ -95,7 +95,7 @@
         "with": [
           {
             "weight": 80,
-            "block": "gtceu:tfc_claystone_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/claystone"
           },
           {
             "weight": 9,
@@ -114,7 +114,7 @@
         "with": [
           {
             "weight": 80,
-            "block": "gtceu:tfc_limestone_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/limestone"
           },
           {
             "weight": 9,
@@ -133,7 +133,7 @@
         "with": [
           {
             "weight": 80,
-            "block": "gtceu:tfc_conglomerate_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/conglomerate"
           },
           {
             "weight": 9,
@@ -152,7 +152,7 @@
         "with": [
           {
             "weight": 80,
-            "block": "gtceu:tfc_dolomite_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/dolomite"
           },
           {
             "weight": 9,
@@ -171,7 +171,7 @@
         "with": [
           {
             "weight": 80,
-            "block": "gtceu:tfc_chert_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/chert"
           },
           {
             "weight": 9,
@@ -190,7 +190,7 @@
         "with": [
           {
             "weight": 80,
-            "block": "gtceu:tfc_chalk_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/chalk"
           },
           {
             "weight": 9,
diff --git a/kubejs/data/tfc/worldgen/configured_feature/vein/surface_bismuthinite.json b/kubejs/data/tfc/worldgen/configured_feature/vein/surface_bismuthinite.json
index a2cd2ff6a..2485401bf 100644
--- a/kubejs/data/tfc/worldgen/configured_feature/vein/surface_bismuthinite.json
+++ b/kubejs/data/tfc/worldgen/configured_feature/vein/surface_bismuthinite.json
@@ -19,7 +19,7 @@
         "with": [
           {
             "weight": 90,
-            "block": "gtceu:tfc_granite_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/granite"
           },
           {
             "weight": 3,
@@ -38,7 +38,7 @@
         "with": [
           {
             "weight": 90,
-            "block": "gtceu:tfc_diorite_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/diorite"
           },
           {
             "weight": 3,
@@ -57,7 +57,7 @@
         "with": [
           {
             "weight": 90,
-            "block": "gtceu:tfc_gabbro_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/gabbro"
           },
           {
             "weight": 3,
@@ -76,7 +76,7 @@
         "with": [
           {
             "weight": 90,
-            "block": "gtceu:tfc_shale_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/shale"
           },
           {
             "weight": 3,
@@ -95,7 +95,7 @@
         "with": [
           {
             "weight": 90,
-            "block": "gtceu:tfc_claystone_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/claystone"
           },
           {
             "weight": 3,
@@ -114,7 +114,7 @@
         "with": [
           {
             "weight": 90,
-            "block": "gtceu:tfc_limestone_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/limestone"
           },
           {
             "weight": 3,
@@ -133,7 +133,7 @@
         "with": [
           {
             "weight": 90,
-            "block": "gtceu:tfc_conglomerate_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/conglomerate"
           },
           {
             "weight": 3,
@@ -152,7 +152,7 @@
         "with": [
           {
             "weight": 90,
-            "block": "gtceu:tfc_dolomite_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/dolomite"
           },
           {
             "weight": 3,
@@ -171,7 +171,7 @@
         "with": [
           {
             "weight": 90,
-            "block": "gtceu:tfc_chert_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/chert"
           },
           {
             "weight": 3,
@@ -190,7 +190,7 @@
         "with": [
           {
             "weight": 90,
-            "block": "gtceu:tfc_chalk_bismuth_ore"
+            "block": "tfc:ore/normal_bismuthinite/chalk"
           },
           {
             "weight": 3,
diff --git a/kubejs/data/tfc/worldgen/placed_feature/vein/basaltic_sands.json b/kubejs/data/tfc/worldgen/placed_feature/vein/basaltic_sands.json
new file mode 100644
index 000000000..2348e0b86
--- /dev/null
+++ b/kubejs/data/tfc/worldgen/placed_feature/vein/basaltic_sands.json
@@ -0,0 +1,5 @@
+{
+  "__comment__": "This file was automatically created by mcresources",
+  "feature": "tfc:vein/basaltic_sands",
+  "placement": []
+}
\ No newline at end of file
diff --git a/kubejs/startup_scripts/gregtech/materials.js b/kubejs/startup_scripts/gregtech/materials.js
index bdb36ca63..3929a146b 100644
--- a/kubejs/startup_scripts/gregtech/materials.js
+++ b/kubejs/startup_scripts/gregtech/materials.js
@@ -2,5 +2,5 @@ const $OreProperty = Java.loadClass("com.gregtechceu.gtceu.api.data.chemical.mat
 const $OrePropertyKey = Java.loadClass("com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey")
 
 GTCEuStartupEvents.registry('gtceu:material', event => {
-    GTMaterials.Bismuth.setProperty($OrePropertyKey.ORE, new $OreProperty());
+    //GTMaterials.Bismuth.setProperty($OrePropertyKey.ORE, new $OreProperty());
 })
\ No newline at end of file