1.21.3 Bundles aren't allowed

Slimefun · Nov 30, 2024 · 25da22e · 25da22e
1 parent c8f9181
commit 25da22e
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 1 deletion.
diff --git a/...a/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/SlimefunBackpack.java b/...a/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/SlimefunBackpack.java
@@ -69,6 +69,11 @@ public boolean isItemAllowed(@Nonnull ItemStack item, @Nullable SlimefunItem ite
             return false;
         }
 
+        // Bundles aren't allowed either
+        if (SlimefunTag.BUNDLES.isTagged(item.getType())) {
+            return false;
+        }
+
         return !(itemAsSlimefunItem instanceof SlimefunBackpack);
     }
 

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
@@ -277,7 +277,9 @@ public enum SlimefunTag implements Tag<Material> {
     /**
      * All tile entities.
      */
-    TILE_ENTITIES;
+    TILE_ENTITIES,
+
+    BUNDLES;
 
     /**
      * Lookup table for tag names.

diff --git a/src/main/resources/tags/bundles.json b/src/main/resources/tags/bundles.json
@@ -0,0 +1,21 @@
+{
+  "values" : [
+    "minecraft:bundle",
+    "minecraft:white_bundle",
+    "minecraft:orange_bundle",
+    "minecraft:magenta_bundle",
+    "minecraft:light_blue_bundle",
+    "minecraft:yellow_bundle",
+    "minecraft:lime_bundle",
+    "minecraft:pink_bundle",
+    "minecraft:gray_bundle",
+    "minecraft:light_gray_bundle",
+    "minecraft:cyan_bundle",
+    "minecraft:purple_bundle",
+    "minecraft:blue_bundle",
+    "minecraft:brown_bundle",
+    "minecraft:green_bundle",
+    "minecraft:red_bundle",
+    "minecraft:black_bundle"
+  ]
+}