From 78992ffac22d3f5444431770478cc5c9c52edfed Mon Sep 17 00:00:00 2001 From: Intybyte Date: Thu, 9 Jan 2025 14:45:49 +0100 Subject: [PATCH 1/3] bundles.json file --- src/main/resources/tags/bundles.json | 72 ++++++++++++++++++++++++++++ 1 file changed, 72 insertions(+) create mode 100644 src/main/resources/tags/bundles.json diff --git a/src/main/resources/tags/bundles.json b/src/main/resources/tags/bundles.json new file mode 100644 index 0000000000..b9462ba759 --- /dev/null +++ b/src/main/resources/tags/bundles.json @@ -0,0 +1,72 @@ +{ + "values" : [ + { + "id" : "minecraft:bundle", + "required" : false + }, + { + "id" : "minecraft:white_bundle", + "required" : false + }, + { + "id" : "minecraft:orange_bundle", + "required" : false + }, + { + "id" : "minecraft:magenta_bundle", + "required" : false + }, + { + "id" : "minecraft:light_blue_bundle", + "required" : false + }, + { + "id" : "minecraft:yellow_bundle", + "required" : false + }, + { + "id" : "minecraft:lime_bundle", + "required" : false + }, + { + "id" : "minecraft:pink_bundle", + "required" : false + }, + { + "id" : "minecraft:gray_bundle", + "required" : false + }, + { + "id" : "minecraft:light_gray_bundle", + "required" : false + }, + { + "id" : "minecraft:cyan_bundle", + "required" : false + }, + { + "id" : "minecraft:purple_bundle", + "required" : false + }, + { + "id" : "minecraft:blue_bundle", + "required" : false + }, + { + "id" : "minecraft:brown_bundle", + "required" : false + }, + { + "id" : "minecraft:green_bundle", + "required" : false + }, + { + "id" : "minecraft:red_bundle", + "required" : false + }, + { + "id" : "minecraft:black_bundle", + "required" : false + } + ] +} \ No newline at end of file From f4e3c9c7a6531eda4c7e30434d88496598f80a68 Mon Sep 17 00:00:00 2001 From: Intybyte Date: Thu, 9 Jan 2025 14:48:05 +0100 Subject: [PATCH 2/3] Add Bundle tag to enum --- .../thebusybiscuit/slimefun4/utils/tags/SlimefunTag.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) 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 7eab9b680f..2ea5cc5299 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 @@ -277,7 +277,9 @@ public enum SlimefunTag implements Tag { /** * All tile entities. */ - TILE_ENTITIES; + TILE_ENTITIES, + + BUNDLES; /** * Lookup table for tag names. From d74b812dbdeca6b7c855f0ba4de3660cb74f39df Mon Sep 17 00:00:00 2001 From: Intybyte Date: Thu, 9 Jan 2025 14:48:19 +0100 Subject: [PATCH 3/3] Add backpack check --- .../implementation/items/backpacks/SlimefunBackpack.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/SlimefunBackpack.java b/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/SlimefunBackpack.java index 4f2a0e3500..61bbdb8e83 100644 --- a/src/main/java/io/github/thebusybiscuit/slimefun4/implementation/items/backpacks/SlimefunBackpack.java +++ b/src/main/java/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); }