From f2f86a1bf636e32e79fb66c93afb87399a0f5a72 Mon Sep 17 00:00:00 2001
From: Pyritie <pyritie@gmail.com>
Date: Mon, 13 Jan 2025 15:24:02 +0000
Subject: [PATCH] copied from 0.8.1

Signed-off-by: Pyritie <pyritie@gmail.com>
---
 .../data/minecraft/trim_material/amethyst.json  | 16 ++++++++--------
 .../data/minecraft/trim_material/bismuth.json   |  9 +++++++++
 .../data/minecraft/trim_material/diamond.json   | 17 +++++++----------
 .../data/minecraft/trim_material/emerald.json   | 14 +++++++-------
 kubejs/data/minecraft/trim_material/gold.json   | 17 +++++++----------
 .../minecraft/trim_material/lapis_lazuli.json   |  9 +++++++++
 kubejs/data/minecraft/trim_material/opal.json   |  9 +++++++++
 kubejs/data/minecraft/trim_material/pyrite.json |  9 +++++++++
 .../data/minecraft/trim_material/rose_gold.json |  9 +++++++++
 kubejs/data/minecraft/trim_material/ruby.json   |  9 +++++++++
 .../data/minecraft/trim_material/sapphire.json  |  9 +++++++++
 kubejs/data/minecraft/trim_material/silver.json |  9 +++++++++
 .../trim_material/sterling_silver.json          |  9 +++++++++
 kubejs/data/minecraft/trim_material/topaz.json  |  9 +++++++++
 14 files changed, 119 insertions(+), 35 deletions(-)
 create mode 100644 kubejs/data/minecraft/trim_material/bismuth.json
 create mode 100644 kubejs/data/minecraft/trim_material/lapis_lazuli.json
 create mode 100644 kubejs/data/minecraft/trim_material/opal.json
 create mode 100644 kubejs/data/minecraft/trim_material/pyrite.json
 create mode 100644 kubejs/data/minecraft/trim_material/rose_gold.json
 create mode 100644 kubejs/data/minecraft/trim_material/ruby.json
 create mode 100644 kubejs/data/minecraft/trim_material/sapphire.json
 create mode 100644 kubejs/data/minecraft/trim_material/silver.json
 create mode 100644 kubejs/data/minecraft/trim_material/sterling_silver.json
 create mode 100644 kubejs/data/minecraft/trim_material/topaz.json

diff --git a/kubejs/data/minecraft/trim_material/amethyst.json b/kubejs/data/minecraft/trim_material/amethyst.json
index 1577d4d53..85226bf80 100644
--- a/kubejs/data/minecraft/trim_material/amethyst.json
+++ b/kubejs/data/minecraft/trim_material/amethyst.json
@@ -1,9 +1,9 @@
 {
-  "asset_name": "amethyst",
-  "description": {
-    "translate": "trim_material.minecraft.amethyst",
-    "color": "#9A5CC6"
-  },
-  "ingredient": "tfc:gem/amethyst",
-  "item_model_index": 1
-}
+    "asset_name": "amethyst_tfc",
+    "description": {
+        "color": "#9A5CC6",
+        "translate": "trim_material.tfc.amethyst"
+    },
+    "ingredient": "minecraft:amethyst_shard",
+    "item_model_index": 0
+}
\ No newline at end of file
diff --git a/kubejs/data/minecraft/trim_material/bismuth.json b/kubejs/data/minecraft/trim_material/bismuth.json
new file mode 100644
index 000000000..3bda00884
--- /dev/null
+++ b/kubejs/data/minecraft/trim_material/bismuth.json
@@ -0,0 +1,9 @@
+{
+    "asset_name": "bismuth_tfc",
+    "description": {
+        "color": "#8bbbc4",
+        "translate": "trim_material.tfc.bismuth"
+    },
+    "ingredient": "gtceu:bismuth_ingot",
+    "item_model_index": 1
+}
\ No newline at end of file
diff --git a/kubejs/data/minecraft/trim_material/diamond.json b/kubejs/data/minecraft/trim_material/diamond.json
index 4ed98f565..c2b9a7a78 100644
--- a/kubejs/data/minecraft/trim_material/diamond.json
+++ b/kubejs/data/minecraft/trim_material/diamond.json
@@ -1,12 +1,9 @@
 {
-  "asset_name": "diamond",
-  "description": {
-    "color": "#6EECD2",
-    "translate": "trim_material.minecraft.diamond"
-  },
-  "ingredient": "tfc:gem/diamond",
-  "item_model_index": 0.8,
-  "override_armor_materials": {
-    "diamond": "diamond_darker"
-  }
+    "asset_name": "diamond_tfc",
+    "description": {
+        "color": "#6EECD2",
+        "translate": "trim_material.tfc.diamond"
+    },
+    "ingredient": "minecraft:diamond",
+    "item_model_index": 0.1
 }
\ No newline at end of file
diff --git a/kubejs/data/minecraft/trim_material/emerald.json b/kubejs/data/minecraft/trim_material/emerald.json
index c3b4ef25b..f068f749c 100644
--- a/kubejs/data/minecraft/trim_material/emerald.json
+++ b/kubejs/data/minecraft/trim_material/emerald.json
@@ -1,9 +1,9 @@
 {
-  "asset_name": "emerald",
-  "description": {
-    "color": "#11A036",
-    "translate": "trim_material.minecraft.emerald"
-  },
-  "ingredient": "tfc:gem/emerald",
-  "item_model_index": 0.7
+    "asset_name": "emerald_tfc",
+    "description": {
+        "color": "#11A036",
+        "translate": "trim_material.tfc.emerald"
+    },
+    "ingredient": "minecraft:emerald",
+    "item_model_index": 0.2
 }
\ No newline at end of file
diff --git a/kubejs/data/minecraft/trim_material/gold.json b/kubejs/data/minecraft/trim_material/gold.json
index 001066b92..61d5d90e4 100644
--- a/kubejs/data/minecraft/trim_material/gold.json
+++ b/kubejs/data/minecraft/trim_material/gold.json
@@ -1,12 +1,9 @@
 {
-  "asset_name": "gold",
-  "description": {
-    "color": "#DEB12D",
-    "translate": "trim_material.minecraft.gold"
-  },
-  "ingredient": "tfc:gem/diamond",
-  "item_model_index": 0.6,
-  "override_armor_materials": {
-    "gold": "gold_darker"
-  }
+    "asset_name": "gold_tfc",
+    "description": {
+        "color": "#DEB12D",
+        "translate": "trim_material.tfc.gold"
+    },
+    "ingredient": "minecraft:gold_ingot",
+    "item_model_index": 0.9
 }
\ No newline at end of file
diff --git a/kubejs/data/minecraft/trim_material/lapis_lazuli.json b/kubejs/data/minecraft/trim_material/lapis_lazuli.json
new file mode 100644
index 000000000..e44b3674e
--- /dev/null
+++ b/kubejs/data/minecraft/trim_material/lapis_lazuli.json
@@ -0,0 +1,9 @@
+{
+    "asset_name": "lapis_lazuli_tfc",
+    "description": {
+        "color": "#416E97",
+        "translate": "trim_material.tfc.lapis_lazuli"
+    },
+    "ingredient": "minecraft:lapis_lazuli",
+    "item_model_index": 0.3
+}
\ No newline at end of file
diff --git a/kubejs/data/minecraft/trim_material/opal.json b/kubejs/data/minecraft/trim_material/opal.json
new file mode 100644
index 000000000..86c8e32cc
--- /dev/null
+++ b/kubejs/data/minecraft/trim_material/opal.json
@@ -0,0 +1,9 @@
+{
+    "asset_name": "opal_tfc",
+    "description": {
+        "color": "#75e7eb",
+        "translate": "trim_material.tfc.opal"
+    },
+    "ingredient": "gtceu:opal_gem",
+    "item_model_index": 0.4
+}
\ No newline at end of file
diff --git a/kubejs/data/minecraft/trim_material/pyrite.json b/kubejs/data/minecraft/trim_material/pyrite.json
new file mode 100644
index 000000000..c1b699a37
--- /dev/null
+++ b/kubejs/data/minecraft/trim_material/pyrite.json
@@ -0,0 +1,9 @@
+{
+    "asset_name": "pyrite_tfc",
+    "description": {
+        "color": "#e6c44c",
+        "translate": "trim_material.tfc.pyrite"
+    },
+    "ingredient": "gtceu:raw_pyrite",
+    "item_model_index": 0.4
+}
\ No newline at end of file
diff --git a/kubejs/data/minecraft/trim_material/rose_gold.json b/kubejs/data/minecraft/trim_material/rose_gold.json
new file mode 100644
index 000000000..a00816ab4
--- /dev/null
+++ b/kubejs/data/minecraft/trim_material/rose_gold.json
@@ -0,0 +1,9 @@
+{
+    "asset_name": "rose_gold_tfc",
+    "description": {
+        "color": "#fcdd86",
+        "translate": "trim_material.tfc.rose_gold"
+    },
+    "ingredient": "gtceu:rose_gold_ingot",
+    "item_model_index": 0.95
+}
\ No newline at end of file
diff --git a/kubejs/data/minecraft/trim_material/ruby.json b/kubejs/data/minecraft/trim_material/ruby.json
new file mode 100644
index 000000000..02729ff7d
--- /dev/null
+++ b/kubejs/data/minecraft/trim_material/ruby.json
@@ -0,0 +1,9 @@
+{
+    "asset_name": "ruby_tfc",
+    "description": {
+        "color": "#971607",
+        "translate": "trim_material.tfc.ruby"
+    },
+    "ingredient": "gtceu:ruby_gem",
+    "item_model_index": 0.5
+}
\ No newline at end of file
diff --git a/kubejs/data/minecraft/trim_material/sapphire.json b/kubejs/data/minecraft/trim_material/sapphire.json
new file mode 100644
index 000000000..4d7661b8a
--- /dev/null
+++ b/kubejs/data/minecraft/trim_material/sapphire.json
@@ -0,0 +1,9 @@
+{
+    "asset_name": "sapphire_tfc",
+    "description": {
+        "color": "#183dde",
+        "translate": "trim_material.tfc.sapphire"
+    },
+    "ingredient": "gtceu:sapphire_gem",
+    "item_model_index": 0.6
+}
\ No newline at end of file
diff --git a/kubejs/data/minecraft/trim_material/silver.json b/kubejs/data/minecraft/trim_material/silver.json
new file mode 100644
index 000000000..bea687bed
--- /dev/null
+++ b/kubejs/data/minecraft/trim_material/silver.json
@@ -0,0 +1,9 @@
+{
+    "asset_name": "silver_tfc",
+    "description": {
+        "color": "#edeadf",
+        "translate": "trim_material.tfc.silver"
+    },
+    "ingredient": "gtceu:silver_ingot",
+    "item_model_index": 0.8
+}
\ No newline at end of file
diff --git a/kubejs/data/minecraft/trim_material/sterling_silver.json b/kubejs/data/minecraft/trim_material/sterling_silver.json
new file mode 100644
index 000000000..de8d2dd4d
--- /dev/null
+++ b/kubejs/data/minecraft/trim_material/sterling_silver.json
@@ -0,0 +1,9 @@
+{
+    "asset_name": "sterling_silver_tfc",
+    "description": {
+        "color": "#ccc7b6",
+        "translate": "trim_material.tfc.sterling_silver"
+    },
+    "ingredient": "gtceu:sterling_silver_ingot",
+    "item_model_index": 0.85
+}
\ No newline at end of file
diff --git a/kubejs/data/minecraft/trim_material/topaz.json b/kubejs/data/minecraft/trim_material/topaz.json
new file mode 100644
index 000000000..5438319e3
--- /dev/null
+++ b/kubejs/data/minecraft/trim_material/topaz.json
@@ -0,0 +1,9 @@
+{
+    "asset_name": "topaz_tfc",
+    "description": {
+        "color": "#c27a0e",
+        "translate": "trim_material.tfc.topaz"
+    },
+    "ingredient": "gtceu:topaz_gem",
+    "item_model_index": 0.7
+}
\ No newline at end of file