From 396f04a15f5a1a479af02f84996e6d32d42beeb5 Mon Sep 17 00:00:00 2001
From: SpeeeDCraft <52341158+SpeeeDCraft@users.noreply.github.com>
Date: Mon, 23 Oct 2023 21:45:56 +0700
Subject: [PATCH] fix crash + vein done

---
 config/xaerominimap_entities.json             |  2 +-
 emi.json                                      | 14 +++++++
 kubejs/server_scripts/tfc/veinGenerator.js    |  2 +-
 kubejs/startup_scripts/constants.js           | 40 +++++++++----------
 .../gregtech/customMaterials.js               | 11 +++--
 5 files changed, 44 insertions(+), 25 deletions(-)
 create mode 100644 emi.json

diff --git a/config/xaerominimap_entities.json b/config/xaerominimap_entities.json
index f7ab2ff22..93efd9076 100644
--- a/config/xaerominimap_entities.json
+++ b/config/xaerominimap_entities.json
@@ -10,8 +10,8 @@
   "name": "gui.xaero_entity_category_root",
   "protection": true,
   "settingOverrides": {
-    "displayed": true,
     "displayHeight": 0.0,
+    "displayed": true,
     "heightBasedFade": true,
     "renderOrder": 0.0,
     "color": 13.0,
diff --git a/emi.json b/emi.json
new file mode 100644
index 000000000..7b247ef09
--- /dev/null
+++ b/emi.json
@@ -0,0 +1,14 @@
+{
+  "favorites": [],
+  "lookup_history": [
+    "item:gtceu:tfc_chert_sylvite_ore"
+  ],
+  "craft_history": [],
+  "recipe_defaults": {
+    "added": [],
+    "tags": {},
+    "resolutions": {},
+    "disabled": []
+  },
+  "hidden_stacks": []
+}
\ No newline at end of file
diff --git a/kubejs/server_scripts/tfc/veinGenerator.js b/kubejs/server_scripts/tfc/veinGenerator.js
index 4e92cce8b..9f9120609 100644
--- a/kubejs/server_scripts/tfc/veinGenerator.js
+++ b/kubejs/server_scripts/tfc/veinGenerator.js
@@ -63,7 +63,7 @@ const addOreVeins = (event) => {
         })
 
         veinsJson.values.push(`tfc:vein/${vein.random_name}`)
-        console.log(configuredFeatureVeinJson)
+
         event.addJson(`tfc:worldgen/configured_feature/vein/${vein.random_name}`, configuredFeatureVeinJson)
         event.addJson(`tfc:worldgen/placed_feature/vein/${vein.random_name}`, placedFeatureVeinJson)
     })
diff --git a/kubejs/startup_scripts/constants.js b/kubejs/startup_scripts/constants.js
index f5971c26d..11c4beb54 100644
--- a/kubejs/startup_scripts/constants.js
+++ b/kubejs/startup_scripts/constants.js
@@ -1253,8 +1253,8 @@ global.veins = [
         }
     },
     {
-        random_name: "tfc:cluster_vein",
-        veinType: "sulfur",
+        random_name: "sulfur",
+        veinType: "tfc:cluster_vein",
         rarity: 90,
         maxY: 210,
         minY: 0,
@@ -1277,8 +1277,8 @@ global.veins = [
         ]
     },
     {
-        random_name: "tfc:cluster_vein",
-        veinType: "topaz",
+        random_name: "topaz",
+        veinType: "tfc:cluster_vein",
         rarity: 30,
         maxY: -30,
         minY: -50,
@@ -1305,8 +1305,8 @@ global.veins = [
         ]
     },
     {
-        random_name: "tfc:cluster_vein",
-        veinType: "apatite",
+        random_name: "apatite",
+        veinType: "tfc:cluster_vein",
         rarity: 90,
         maxY: 20,
         minY: -40,
@@ -1320,7 +1320,7 @@ global.veins = [
             },
             {
                 weight: 35,
-                material: "tricalcium_phospate"
+                material: "tricalcium_phosphate"
             },
             {
                 weight: 15,
@@ -1329,14 +1329,14 @@ global.veins = [
         ]
     },
     {
-        random_name: "tfc:cluster_vein",
-        veinType: "garnet_tin",
+        random_name: "garnet_tin",
+        veinType: "tfc:cluster_vein",
         rarity: 300,
         maxY: 65,
         minY: -20,
         size: 36,
         density: 0.1,
-        stoneTypes: ["rhyolite", "basalt", "andesite", "daceite", "granite", "diorite", "gabbro", "quartzite", "slate", 
+        stoneTypes: ["rhyolite", "basalt", "andesite", "dacite", "granite", "diorite", "gabbro", "quartzite", "slate", 
                         "phyllite", "schist", "gneiss", "marble", "shale", "claystone", 
                         "limestone", "conglomerate", "dolomite", "chert", "chalk"],
         ores: [
@@ -1359,8 +1359,8 @@ global.veins = [
         ]
     },
     {
-        random_name: "tfc:cluster_vein",
-        veinType: "lubricant",
+        random_name: "lubricant",
+        veinType: "tfc:cluster_vein",
         rarity: 90,
         maxY: 50,
         minY: -40,
@@ -1387,8 +1387,8 @@ global.veins = [
         ]
     },
     {
-        random_name: "tfc:cluster_vein",
-        veinType: "mica",
+        random_name: "mica",
+        veinType: "tfc:cluster_vein",
         rarity: 90,
         maxY: 210,
         minY: 0,
@@ -1415,8 +1415,8 @@ global.veins = [
         ]
     },
     {
-        random_name: "tfc:cluster_vein",
-        veinType: "sylvite",
+        random_name: "sylvite",
+        veinType: "tfc:cluster_vein",
         rarity: 90,
         maxY: 210,
         minY: 0,
@@ -1431,8 +1431,8 @@ global.veins = [
         ]
     },
     {
-        random_name: "tfc:cluster_vein",
-        veinType: "olivine",
+        random_name: "olivine",
+        veinType: "tfc:cluster_vein",
         rarity: 70,
         maxY: 10,
         minY: -20,
@@ -1459,8 +1459,8 @@ global.veins = [
         ]
     },
     {
-        random_name: "tfc:cluster_vein",
-        veinType: "sapphire",
+        random_name: "sapphire",
+        veinType: "tfc:cluster_vein",
         rarity: 20,
         maxY: 40,
         minY: 0,
diff --git a/kubejs/startup_scripts/gregtech/customMaterials.js b/kubejs/startup_scripts/gregtech/customMaterials.js
index 62b6d0da6..53e5ecd93 100644
--- a/kubejs/startup_scripts/gregtech/customMaterials.js
+++ b/kubejs/startup_scripts/gregtech/customMaterials.js
@@ -2,8 +2,13 @@ const $OreProperty = Java.loadClass("com.gregtechceu.gtceu.api.data.chemical.mat
 const $OrePropertyKey = Java.loadClass("com.gregtechceu.gtceu.api.data.chemical.material.properties.PropertyKey")
 
 const registerMaterials = (event) => {
-    //GTMaterials.Bismuth.setProperty($OrePropertyKey.ORE, new $OreProperty());
+    GTMaterials.Bismuth.setProperty($OrePropertyKey.ORE, new $OreProperty());
     //GTMaterials.Gypsum.setProperty($OrePropertyKey.ORE, new $OreProperty());
-    //GTMaterials.Borax.setProperty($OrePropertyKey.ORE, new $OreProperty());
-    //GTMaterials.Sylvite.setProperty($OrePropertyKey.ORE, new $OreProperty());
+    GTMaterials.Borax.setProperty($OrePropertyKey.ORE, new $OreProperty());
+
+    event.create('sylvite')
+        .dust()
+        .ore()
+        .color(0x839689)
+        .iconSet(GTMaterialIconSet.DULL)
 }
\ No newline at end of file