From e7d766e22951bc5ec9b779e2bf524fdb539bda6a Mon Sep 17 00:00:00 2001
From: Jeffrey Kosse <j3fftw@gmail.com>
Date: Mon, 17 Oct 2022 12:34:44 +0200
Subject: [PATCH] suggested changes

---
 .../slimefun4/core/networks/cargo/CargoUtils.java    |  2 +-
 .../items/autocrafters/AbstractAutoCrafter.java      |  2 +-
 .../slimefun4/utils/tags/SlimefunTag.java            |  4 ++--
 ...ocks.json => auto_crafter_supported_storage.json} |  0
 ..._blocks.json => cargo_supported_inventories.json} |  8 +++++---
 src/main/resources/tags/tile_entities.json           | 12 +++++++++++-
 6 files changed, 20 insertions(+), 8 deletions(-)
 rename src/main/resources/tags/{storage_blocks.json => auto_crafter_supported_storage.json} (100%)
 rename src/main/resources/tags/{inventory_blocks.json => cargo_supported_inventories.json} (58%)

diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java
index 91896ba1e..42ca357eb 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/core/networks/cargo/CargoUtils.java
@@ -69,7 +69,7 @@ final class CargoUtils {
         }
 
         Material type = block.getType();
-        return SlimefunTag.INVENTORY_BLOCKS.isTagged(type);
+        return SlimefunTag.CARGO_SUPPORTED_INVENTORIES.isTagged(type);
     }
 
     @Nonnull
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/AbstractAutoCrafter.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/AbstractAutoCrafter.java
index eaf420f0c..21371c4ec 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/AbstractAutoCrafter.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/autocrafters/AbstractAutoCrafter.java
@@ -202,7 +202,7 @@ public abstract class AbstractAutoCrafter extends SlimefunItem implements Energy
     protected boolean isValidInventory(@Nonnull Block block) {
         Material type = block.getType();
 
-        return SlimefunTag.STORAGE_BLOCKS.isTagged(type);
+        return SlimefunTag.AUTO_CRAFTER_SUPPORTED_STORAGE.isTagged(type);
     }
 
     /**
diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java
index e027231ec..1079844e1 100644
--- a/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java
+++ b/src/main/java/io/github/thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java
@@ -267,12 +267,12 @@ public enum SlimefunTag implements Tag<Material> {
     /**
      * All storage blocks.
      */
-    STORAGE_BLOCKS,
+    AUTO_CRAFTER_SUPPORTED_STORAGE,
 
     /**
      * All blocks with an inventory.
      */
-    INVENTORY_BLOCKS,
+    CARGO_SUPPORTED_INVENTORIES,
 
     /**
      * All tile entities.
diff --git a/src/main/resources/tags/storage_blocks.json b/src/main/resources/tags/auto_crafter_supported_storage.json
similarity index 100%
rename from src/main/resources/tags/storage_blocks.json
rename to src/main/resources/tags/auto_crafter_supported_storage.json
diff --git a/src/main/resources/tags/inventory_blocks.json b/src/main/resources/tags/cargo_supported_inventories.json
similarity index 58%
rename from src/main/resources/tags/inventory_blocks.json
rename to src/main/resources/tags/cargo_supported_inventories.json
index 4a21a42d3..eb960c5e4 100644
--- a/src/main/resources/tags/inventory_blocks.json
+++ b/src/main/resources/tags/cargo_supported_inventories.json
@@ -1,13 +1,15 @@
 {
   "values" : [
-    "#slimefun:storage_blocks",
+    "#slimefun:shulker_boxes",
+    "minecraft:chest",
+    "minecraft:trapped_chest",
+    "minecraft:barrel",
     "minecraft:furnace",
     "minecraft:dispenser",
     "minecraft:dropper",
     "minecraft:hopper",
     "minecraft:brewing_stand",
     "minecraft:blast_furnace",
-    "minecraft:smoker",
-    "minecraft:campfire"
+    "minecraft:smoker"
   ]
 }
\ No newline at end of file
diff --git a/src/main/resources/tags/tile_entities.json b/src/main/resources/tags/tile_entities.json
index b294fa159..bcbafbd5e 100644
--- a/src/main/resources/tags/tile_entities.json
+++ b/src/main/resources/tags/tile_entities.json
@@ -1,9 +1,19 @@
 {
   "values" : [
+    "#slimefun:shulker_boxes",
     "#minecraft:signs",
     "#minecraft:banners",
     "#minecraft:beds",
-    "#slimefun:inventory_blocks",
+    "minecraft:chest",
+    "minecraft:trapped_chest",
+    "minecraft:barrel",
+    "minecraft:furnace",
+    "minecraft:dispenser",
+    "minecraft:dropper",
+    "minecraft:hopper",
+    "minecraft:brewing_stand",
+    "minecraft:blast_furnace",
+    "minecraft:smoker",
     "minecraft:beacon",
     "minecraft:spawner",
     "minecraft:note_block",