Re-prioritize tags

nekosmp · Apr 16, 2023 · e315a68 · e315a68
1 parent 8765f54
commit e315a68
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 9 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -1,6 +1,6 @@
 version_major=0
 version_minor=0
-version_patch=1
+version_patch=2
 
 artifact_group=appeng
 artifact_basename=nsmp-ae2

diff --git a/src/main/java/appeng/api/util/AEColor.java b/src/main/java/appeng/api/util/AEColor.java
@@ -35,6 +35,7 @@
  * Should be the same order as Dyes, excluding Transparent.
  */
 public enum AEColor {
+    TRANSPARENT("Fluix", "gui.ae2.Fluix", "fluix", null, 0x1B2344, 0x895CA8, 0xD7BBEC, 0x000000),
 
     WHITE("White", "gui.ae2.White", "white", DyeColor.WHITE, 0xBEBEBE, 0xDBDBDB, 0xFAFAFA, 0x000000),
     ORANGE("Orange", "gui.ae2.Orange", "orange", DyeColor.ORANGE, 0xF99739, 0xFAAE44, 0xF4DEC3, 0x000000),
@@ -53,8 +54,7 @@ public enum AEColor {
     BROWN("Brown", "gui.ae2.Brown", "brown", DyeColor.BROWN, 0x724E35, 0xB7967F, 0xE0D2C8, 0x000000),
     GREEN("Green", "gui.ae2.Green", "green", DyeColor.GREEN, 0x45A021, 0x60E32E, 0xE3F2E3, 0x000000),
     RED("Red", "gui.ae2.Red", "red", DyeColor.RED, 0xA50029, 0xFF003C, 0xFFE6ED, 0x000000),
-    BLACK("Black", "gui.ae2.Black", "black", DyeColor.BLACK, 0x2B2B2B, 0x565656, 0x848484, 0xFFFFFF),
-    TRANSPARENT("Fluix", "gui.ae2.Fluix", "fluix", null, 0x1B2344, 0x895CA8, 0xD7BBEC, 0x000000);
+    BLACK("Black", "gui.ae2.Black", "black", DyeColor.BLACK, 0x2B2B2B, 0x565656, 0x848484, 0xFFFFFF);
 
     public static final List<AEColor> VALID_COLORS = Arrays.asList(WHITE, ORANGE, MAGENTA, LIGHT_BLUE, YELLOW, LIME,
             PINK, GRAY, LIGHT_GRAY, CYAN, PURPLE, BLUE, BROWN, GREEN, RED, BLACK);

diff --git a/src/nsmp/res/data/ae2/tags/items/metal_ingots.json b/src/nsmp/res/data/ae2/tags/items/metal_ingots.json
@@ -4,8 +4,8 @@
     "minecraft:iron_ingot",
     "minecraft:copper_ingot",
     "minecraft:gold_ingot",
+    "create:brass_ingot",
     "minecraft:netherite_ingot",
-    "create:zinc_ingot",
-    "create:brass_ingot"
+    "create:zinc_ingot"
   ]
 }
diff --git a/src/nsmp/res/data/ae2/tags/items/metal_sheets.json b/src/nsmp/res/data/ae2/tags/items/metal_sheets.json
@@ -1,10 +1,10 @@
 {
   "replace": false,
   "values": [
-    "create:sturdy_sheet",
+    "create:iron_sheet",
     "create:copper_sheet",
+    "create:golden_sheet",
     "create:brass_sheet",
-    "create:iron_sheet",
-    "create:golden_sheet"
+    "create:sturdy_sheet"
   ]
 }
diff --git a/src/nsmp/res/data/c/tags/items/quartz.json b/src/nsmp/res/data/c/tags/items/quartz.json
@@ -1,6 +1,7 @@
 {
   "replace": false,
   "values": [
-    "minecraft:quartz"
+    "minecraft:quartz",
+    "create:rose_quartz"
   ]
 }