fix: Some tag inconsistencies

Closes: GH-846
Team-EnderIO · Oct 12, 2024 · 61535c3 · 61535c3
1 parent 960a6f9
commit 61535c3
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/enderio-base/src/generated/resources/data/c/tags/item/storage_blocks.json b/enderio-base/src/generated/resources/data/c/tags/item/storage_blocks.json
@@ -5,7 +5,7 @@
     "#c:storage_blocks/conductive_alloy",
     "#c:storage_blocks/copper_alloy",
     "#c:storage_blocks/dark_steel",
-    "#c:storage_blocks/energetic_alloy",
+    "#c:storage_blocks/end_steel",
     "#c:storage_blocks/energetic_alloy",
     "#c:storage_blocks/pulsating_alloy",
     "#c:storage_blocks/redstone_alloy",

diff --git a/enderio-base/src/generated/resources/data/c/tags/item/storage_blocks/end_steel.json b/enderio-base/src/generated/resources/data/c/tags/item/storage_blocks/end_steel.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "enderio:end_steel_block"
+  ]
+}
diff --git a/enderio-base/src/generated/resources/data/c/tags/item/storage_blocks/energetic_alloy.json b/enderio-base/src/generated/resources/data/c/tags/item/storage_blocks/energetic_alloy.json
@@ -1,6 +1,5 @@
 {
   "values": [
-    "enderio:energetic_alloy_block",
-    "enderio:end_steel_block"
+    "enderio:energetic_alloy_block"
   ]
 }
diff --git a/...a/c/tags/item/enderio/entity_storage.json → ...ata/enderio/tags/item/entity_storage.json b/...a/c/tags/item/enderio/entity_storage.json → ...ata/enderio/tags/item/entity_storage.json
diff --git a/...a/c/tags/item/enderio/grinding_balls.json → ...ata/enderio/tags/item/grinding_balls.json b/...a/c/tags/item/enderio/grinding_balls.json → ...ata/enderio/tags/item/grinding_balls.json
diff --git a/enderio-base/src/main/java/com/enderio/base/common/tag/EIOTags.java b/enderio-base/src/main/java/com/enderio/base/common/tag/EIOTags.java
@@ -34,8 +34,8 @@ public static class Items {
         private static void init() {}
 
         // TODO: use these for slot filtering again.
-        public static final TagKey<Item> ENTITY_STORAGE = commonTag("enderio/entity_storage");
-        public static final TagKey<Item> GRINDING_BALLS = commonTag("enderio/grinding_balls");
+        public static final TagKey<Item> ENTITY_STORAGE = tag("entity_storage");
+        public static final TagKey<Item> GRINDING_BALLS = tag("grinding_balls");
 
         public static final TagKey<Item> WRENCH = commonTag("tools/wrench");
         public static final TagKey<Item> GLIDER = tag("tools/glider");
@@ -108,7 +108,7 @@ private static void init() {}
         public static final TagKey<Item> BLOCKS_CONDUCTIVE_ALLOY = commonTag("storage_blocks/conductive_alloy");
         public static final TagKey<Item> BLOCKS_COPPER_ALLOY = commonTag("storage_blocks/copper_alloy");
         public static final TagKey<Item> BLOCKS_DARK_STEEL = commonTag("storage_blocks/dark_steel");
-        public static final TagKey<Item> BLOCKS_END_STEEL = commonTag("storage_blocks/energetic_alloy");
+        public static final TagKey<Item> BLOCKS_END_STEEL = commonTag("storage_blocks/end_steel");
         public static final TagKey<Item> BLOCKS_ENERGETIC_ALLOY = commonTag("storage_blocks/energetic_alloy");
         public static final TagKey<Item> BLOCKS_PULSATING_ALLOY = commonTag("storage_blocks/pulsating_alloy");
         public static final TagKey<Item> BLOCKS_REDSTONE_ALLOY = commonTag("storage_blocks/redstone_alloy");

diff --git a/...a/c/tags/item/enderio/entity_storage.json → ...ata/enderio/tags/item/entity_storage.json b/...a/c/tags/item/enderio/entity_storage.json → ...ata/enderio/tags/item/entity_storage.json