From 2754ef8439c48da9ee74c677065dc7ccee7a0486 Mon Sep 17 00:00:00 2001
From: Arthur Lu <root@tronnet.net>
Date: Tue, 11 Feb 2025 20:46:05 +0000
Subject: [PATCH] disable using lapis/ink sac/cocoa/bonemeal as dye substitute

---
 .../data/universal_dyeing/recipe/black_candle.json          | 2 +-
 .../data/universal_dyeing/recipe/black_concrete_powder.json | 2 +-
 .../universal_dyeing/recipe/black_glazed_terracotta.json    | 2 +-
 .../data/universal_dyeing/recipe/black_stained_glass.json   | 2 +-
 .../universal_dyeing/recipe/black_stained_glass_pane.json   | 2 +-
 .../data/universal_dyeing/recipe/black_terracotta.json      | 2 +-
 .../data/universal_dyeing/recipe/blue_candle.json           | 2 +-
 .../data/universal_dyeing/recipe/blue_concrete_powder.json  | 2 +-
 .../universal_dyeing/recipe/blue_glazed_terracotta.json     | 2 +-
 .../data/universal_dyeing/recipe/blue_stained_glass.json    | 2 +-
 .../universal_dyeing/recipe/blue_stained_glass_pane.json    | 2 +-
 .../data/universal_dyeing/recipe/blue_terracotta.json       | 2 +-
 .../data/universal_dyeing/recipe/brown_candle.json          | 2 +-
 .../data/universal_dyeing/recipe/brown_concrete_powder.json | 2 +-
 .../universal_dyeing/recipe/brown_glazed_terracotta.json    | 2 +-
 .../data/universal_dyeing/recipe/brown_stained_glass.json   | 2 +-
 .../universal_dyeing/recipe/brown_stained_glass_pane.json   | 2 +-
 .../data/universal_dyeing/recipe/brown_terracotta.json      | 2 +-
 .../data/universal_dyeing/recipe/white_candle.json          | 2 +-
 .../data/universal_dyeing/recipe/white_concrete_powder.json | 2 +-
 .../universal_dyeing/recipe/white_glazed_terracotta.json    | 2 +-
 .../data/universal_dyeing/recipe/white_stained_glass.json   | 2 +-
 .../universal_dyeing/recipe/white_stained_glass_pane.json   | 2 +-
 .../data/universal_dyeing/recipe/white_terracotta.json      | 2 +-
 .../data/universal_dyeing/tags/item/dyes/black_dye.json     | 6 ------
 .../data/universal_dyeing/tags/item/dyes/blue_dye.json      | 6 ------
 .../data/universal_dyeing/tags/item/dyes/brown_dye.json     | 6 ------
 .../data/universal_dyeing/tags/item/dyes/white_dye.json     | 6 ------
 28 files changed, 24 insertions(+), 48 deletions(-)
 delete mode 100644 src/universal_dyeing/data/universal_dyeing/tags/item/dyes/black_dye.json
 delete mode 100644 src/universal_dyeing/data/universal_dyeing/tags/item/dyes/blue_dye.json
 delete mode 100644 src/universal_dyeing/data/universal_dyeing/tags/item/dyes/brown_dye.json
 delete mode 100644 src/universal_dyeing/data/universal_dyeing/tags/item/dyes/white_dye.json

diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/black_candle.json b/src/universal_dyeing/data/universal_dyeing/recipe/black_candle.json
index c960b1f..845259d 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/black_candle.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/black_candle.json
@@ -23,7 +23,7 @@
                 "minecraft:green_candle",
                 "minecraft:red_candle"
             ],
-        "O": "#universal_dyeing:dyes/black_dye"
+        "O": "minecraft:black_dye"
     },
     "result": {
         "id": "minecraft:black_candle",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/black_concrete_powder.json b/src/universal_dyeing/data/universal_dyeing/recipe/black_concrete_powder.json
index c5539a6..3b847c8 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/black_concrete_powder.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/black_concrete_powder.json
@@ -23,7 +23,7 @@
                 "minecraft:green_concrete_powder",
                 "minecraft:red_concrete_powder"
             ],
-        "O": "#universal_dyeing:dyes/black_dye"
+        "O": "minecraft:black_dye"
     },
     "result": {
         "id": "minecraft:black_concrete_powder",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/black_glazed_terracotta.json b/src/universal_dyeing/data/universal_dyeing/recipe/black_glazed_terracotta.json
index 707f11a..d8f5ae3 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/black_glazed_terracotta.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/black_glazed_terracotta.json
@@ -23,7 +23,7 @@
                 "minecraft:green_glazed_terracotta",
                 "minecraft:red_glazed_terracotta"
             ],
-        "O": "#universal_dyeing:dyes/black_dye"
+        "O": "minecraft:black_dye"
     },
     "result": {
         "id": "minecraft:black_glazed_terracotta",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/black_stained_glass.json b/src/universal_dyeing/data/universal_dyeing/recipe/black_stained_glass.json
index 4172c3c..e486350 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/black_stained_glass.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/black_stained_glass.json
@@ -23,7 +23,7 @@
                 "minecraft:green_stained_glass",
                 "minecraft:red_stained_glass"
             ],
-        "O": "#universal_dyeing:dyes/black_dye"
+        "O": "minecraft:black_dye"
     },
     "result": {
         "id": "minecraft:black_stained_glass",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/black_stained_glass_pane.json b/src/universal_dyeing/data/universal_dyeing/recipe/black_stained_glass_pane.json
index 1b11a13..8a0da07 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/black_stained_glass_pane.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/black_stained_glass_pane.json
@@ -23,7 +23,7 @@
                 "minecraft:green_stained_glass_pane",
                 "minecraft:red_stained_glass_pane"
             ],
-        "O": "#universal_dyeing:dyes/black_dye"
+        "O": "minecraft:black_dye"
     },
     "result": {
         "id": "minecraft:black_stained_glass_pane",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/black_terracotta.json b/src/universal_dyeing/data/universal_dyeing/recipe/black_terracotta.json
index afa4ebd..536e0aa 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/black_terracotta.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/black_terracotta.json
@@ -23,7 +23,7 @@
                 "minecraft:green_terracotta",
                 "minecraft:red_terracotta"
             ],
-        "O": "#universal_dyeing:dyes/black_dye"
+        "O": "minecraft:black_dye"
     },
     "result": {
         "id": "minecraft:black_terracotta",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/blue_candle.json b/src/universal_dyeing/data/universal_dyeing/recipe/blue_candle.json
index f1e07e1..a2285f5 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/blue_candle.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/blue_candle.json
@@ -23,7 +23,7 @@
                 "minecraft:red_candle",
                 "minecraft:black_candle"
             ],
-        "O": "#universal_dyeing:dyes/blue_dye"
+        "O": "minecraft:blue_dye"
     },
     "result": {
         "id": "minecraft:blue_candle",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/blue_concrete_powder.json b/src/universal_dyeing/data/universal_dyeing/recipe/blue_concrete_powder.json
index 89953cf..5853898 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/blue_concrete_powder.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/blue_concrete_powder.json
@@ -23,7 +23,7 @@
                 "minecraft:red_concrete_powder",
                 "minecraft:black_concrete_powder"
             ],
-        "O": "#universal_dyeing:dyes/blue_dye"
+        "O": "minecraft:blue_dye"
     },
     "result": {
         "id": "minecraft:blue_concrete_powder",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/blue_glazed_terracotta.json b/src/universal_dyeing/data/universal_dyeing/recipe/blue_glazed_terracotta.json
index 80005d2..be23557 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/blue_glazed_terracotta.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/blue_glazed_terracotta.json
@@ -23,7 +23,7 @@
                 "minecraft:red_glazed_terracotta",
                 "minecraft:black_glazed_terracotta"
             ],
-        "O": "#universal_dyeing:dyes/blue_dye"
+        "O": "minecraft:blue_dye"
     },
     "result": {
         "id": "minecraft:blue_glazed_terracotta",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/blue_stained_glass.json b/src/universal_dyeing/data/universal_dyeing/recipe/blue_stained_glass.json
index d39100a..b08124d 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/blue_stained_glass.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/blue_stained_glass.json
@@ -23,7 +23,7 @@
                 "minecraft:red_stained_glass",
                 "minecraft:black_stained_glass"
             ],
-        "O": "#universal_dyeing:dyes/blue_dye"
+        "O": "minecraft:blue_dye"
     },
     "result": {
         "id": "minecraft:blue_stained_glass",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/blue_stained_glass_pane.json b/src/universal_dyeing/data/universal_dyeing/recipe/blue_stained_glass_pane.json
index dd597ca..b3e18ac 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/blue_stained_glass_pane.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/blue_stained_glass_pane.json
@@ -23,7 +23,7 @@
                 "minecraft:red_stained_glass_pane",
                 "minecraft:black_stained_glass_pane"
             ],
-        "O": "#universal_dyeing:dyes/blue_dye"
+        "O": "minecraft:blue_dye"
     },
     "result": {
         "id": "minecraft:blue_stained_glass_pane",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/blue_terracotta.json b/src/universal_dyeing/data/universal_dyeing/recipe/blue_terracotta.json
index 50052cb..333bea4 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/blue_terracotta.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/blue_terracotta.json
@@ -23,7 +23,7 @@
                 "minecraft:red_terracotta",
                 "minecraft:black_terracotta"
             ],
-        "O": "#universal_dyeing:dyes/blue_dye"
+        "O": "minecraft:blue_dye"
     },
     "result": {
         "id": "minecraft:blue_terracotta",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/brown_candle.json b/src/universal_dyeing/data/universal_dyeing/recipe/brown_candle.json
index f0ad315..897ce4c 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/brown_candle.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/brown_candle.json
@@ -23,7 +23,7 @@
                 "minecraft:red_candle",
                 "minecraft:black_candle"
             ],
-        "O": "#universal_dyeing:dyes/brown_dye"
+        "O": "minecraft:brown_dye"
     },
     "result": {
         "id": "minecraft:brown_candle",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/brown_concrete_powder.json b/src/universal_dyeing/data/universal_dyeing/recipe/brown_concrete_powder.json
index 59169d5..84ecc66 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/brown_concrete_powder.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/brown_concrete_powder.json
@@ -23,7 +23,7 @@
                 "minecraft:red_concrete_powder",
                 "minecraft:black_concrete_powder"
             ],
-        "O": "#universal_dyeing:dyes/brown_dye"
+        "O": "minecraft:brown_dye"
     },
     "result": {
         "id": "minecraft:brown_concrete_powder",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/brown_glazed_terracotta.json b/src/universal_dyeing/data/universal_dyeing/recipe/brown_glazed_terracotta.json
index f196301..9b47a61 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/brown_glazed_terracotta.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/brown_glazed_terracotta.json
@@ -23,7 +23,7 @@
                 "minecraft:red_glazed_terracotta",
                 "minecraft:black_glazed_terracotta"
             ],
-        "O": "#universal_dyeing:dyes/brown_dye"
+        "O": "minecraft:brown_dye"
     },
     "result": {
         "id": "minecraft:brown_glazed_terracotta",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/brown_stained_glass.json b/src/universal_dyeing/data/universal_dyeing/recipe/brown_stained_glass.json
index c36a989..5557afe 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/brown_stained_glass.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/brown_stained_glass.json
@@ -23,7 +23,7 @@
                 "minecraft:red_stained_glass",
                 "minecraft:black_stained_glass"
             ],
-        "O": "#universal_dyeing:dyes/brown_dye"
+        "O": "minecraft:brown_dye"
     },
     "result": {
         "id": "minecraft:brown_stained_glass",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/brown_stained_glass_pane.json b/src/universal_dyeing/data/universal_dyeing/recipe/brown_stained_glass_pane.json
index 408e8de..7a55b68 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/brown_stained_glass_pane.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/brown_stained_glass_pane.json
@@ -23,7 +23,7 @@
                 "minecraft:red_stained_glass_pane",
                 "minecraft:black_stained_glass_pane"
             ],
-        "O": "#universal_dyeing:dyes/brown_dye"
+        "O": "minecraft:brown_dye"
     },
     "result": {
         "id": "minecraft:brown_stained_glass_pane",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/brown_terracotta.json b/src/universal_dyeing/data/universal_dyeing/recipe/brown_terracotta.json
index bd9fefb..2de848a 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/brown_terracotta.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/brown_terracotta.json
@@ -23,7 +23,7 @@
                 "minecraft:red_terracotta",
                 "minecraft:black_terracotta"
             ],
-        "O": "#universal_dyeing:dyes/brown_dye"
+        "O": "minecraft:brown_dye"
     },
     "result": {
         "id": "minecraft:brown_terracotta",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/white_candle.json b/src/universal_dyeing/data/universal_dyeing/recipe/white_candle.json
index 1ca0b70..0a061a3 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/white_candle.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/white_candle.json
@@ -23,7 +23,7 @@
                 "minecraft:red_candle",
                 "minecraft:black_candle"
             ],
-        "O": "#universal_dyeing:dyes/white_dye"
+        "O": "minecraft:white_dye"
     },
     "result": {
         "id": "minecraft:white_candle",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/white_concrete_powder.json b/src/universal_dyeing/data/universal_dyeing/recipe/white_concrete_powder.json
index 0b559f7..816a9d7 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/white_concrete_powder.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/white_concrete_powder.json
@@ -23,7 +23,7 @@
                 "minecraft:red_concrete_powder",
                 "minecraft:black_concrete_powder"
             ],
-        "O": "#universal_dyeing:dyes/white_dye"
+        "O": "minecraft:white_dye"
     },
     "result": {
         "id": "minecraft:white_concrete_powder",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/white_glazed_terracotta.json b/src/universal_dyeing/data/universal_dyeing/recipe/white_glazed_terracotta.json
index 6a722f4..dd9e6d6 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/white_glazed_terracotta.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/white_glazed_terracotta.json
@@ -23,7 +23,7 @@
                 "minecraft:red_glazed_terracotta",
                 "minecraft:black_glazed_terracotta"
             ],
-        "O": "#universal_dyeing:dyes/white_dye"
+        "O": "minecraft:white_dye"
     },
     "result": {
         "id": "minecraft:white_glazed_terracotta",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/white_stained_glass.json b/src/universal_dyeing/data/universal_dyeing/recipe/white_stained_glass.json
index dfc12e9..5a78d80 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/white_stained_glass.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/white_stained_glass.json
@@ -23,7 +23,7 @@
                 "minecraft:red_stained_glass",
                 "minecraft:black_stained_glass"
             ],
-        "O": "#universal_dyeing:dyes/white_dye"
+        "O": "minecraft:white_dye"
     },
     "result": {
         "id": "minecraft:white_stained_glass",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/white_stained_glass_pane.json b/src/universal_dyeing/data/universal_dyeing/recipe/white_stained_glass_pane.json
index 166f9b2..b8c2f90 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/white_stained_glass_pane.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/white_stained_glass_pane.json
@@ -23,7 +23,7 @@
                 "minecraft:red_stained_glass_pane",
                 "minecraft:black_stained_glass_pane"
             ],
-        "O": "#universal_dyeing:dyes/white_dye"
+        "O": "minecraft:white_dye"
     },
     "result": {
         "id": "minecraft:white_stained_glass_pane",
diff --git a/src/universal_dyeing/data/universal_dyeing/recipe/white_terracotta.json b/src/universal_dyeing/data/universal_dyeing/recipe/white_terracotta.json
index eb76f13..eabf7c0 100644
--- a/src/universal_dyeing/data/universal_dyeing/recipe/white_terracotta.json
+++ b/src/universal_dyeing/data/universal_dyeing/recipe/white_terracotta.json
@@ -23,7 +23,7 @@
                 "minecraft:red_terracotta",
                 "minecraft:black_terracotta"
             ],
-        "O": "#universal_dyeing:dyes/white_dye"
+        "O": "minecraft:white_dye"
     },
     "result": {
         "id": "minecraft:white_terracotta",
diff --git a/src/universal_dyeing/data/universal_dyeing/tags/item/dyes/black_dye.json b/src/universal_dyeing/data/universal_dyeing/tags/item/dyes/black_dye.json
deleted file mode 100644
index dc16bc2..0000000
--- a/src/universal_dyeing/data/universal_dyeing/tags/item/dyes/black_dye.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "values": [
-		"minecraft:ink_sac",
-		"minecraft:black_dye"
-    ]
-}
\ No newline at end of file
diff --git a/src/universal_dyeing/data/universal_dyeing/tags/item/dyes/blue_dye.json b/src/universal_dyeing/data/universal_dyeing/tags/item/dyes/blue_dye.json
deleted file mode 100644
index 3f460d6..0000000
--- a/src/universal_dyeing/data/universal_dyeing/tags/item/dyes/blue_dye.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "values": [
-		"minecraft:lapis_lazuli",
-		"minecraft:blue_dye"
-    ]
-}
\ No newline at end of file
diff --git a/src/universal_dyeing/data/universal_dyeing/tags/item/dyes/brown_dye.json b/src/universal_dyeing/data/universal_dyeing/tags/item/dyes/brown_dye.json
deleted file mode 100644
index 9f47ca1..0000000
--- a/src/universal_dyeing/data/universal_dyeing/tags/item/dyes/brown_dye.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "values": [
-		"minecraft:cocoa_beans",
-		"minecraft:brown_dye"
-    ]
-}
\ No newline at end of file
diff --git a/src/universal_dyeing/data/universal_dyeing/tags/item/dyes/white_dye.json b/src/universal_dyeing/data/universal_dyeing/tags/item/dyes/white_dye.json
deleted file mode 100644
index 0f1ea07..0000000
--- a/src/universal_dyeing/data/universal_dyeing/tags/item/dyes/white_dye.json
+++ /dev/null
@@ -1,6 +0,0 @@
-{
-    "values": [
-		"minecraft:bone_meal",
-		"minecraft:white_dye"
-    ]
-}
\ No newline at end of file