From d339444feba80b97227470a236c78e1fd87584f6 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Fri, 28 Dec 2018 11:14:52 +0100 Subject: [PATCH] Renamed CHEST flag to CONTAINER #402 --- .../listeners/flags/BlockInteractionListener.java | 4 ++-- .../bentobox/listeners/flags/InventoryListener.java | 2 +- .../java/world/bentobox/bentobox/lists/Flags.java | 2 +- src/main/resources/locales/en-US.yml | 13 +++++++++---- 4 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/BlockInteractionListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/BlockInteractionListener.java index e5fb1b5e3..35a678ac3 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/BlockInteractionListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/BlockInteractionListener.java @@ -111,7 +111,7 @@ public class BlockInteractionListener extends FlagListener { private void checkClickedBlock(Event e, Location loc, Material type) { // Handle pots if (type.name().startsWith("POTTED")) { - checkIsland(e, loc, Flags.CHEST); + checkIsland(e, loc, Flags.CONTAINER); return; } switch (type) { @@ -164,7 +164,7 @@ public class BlockInteractionListener extends FlagListener { case YELLOW_SHULKER_BOX: case SHULKER_BOX: case FLOWER_POT: - checkIsland(e, loc, Flags.CHEST); + checkIsland(e, loc, Flags.CONTAINER); break; case DISPENSER: checkIsland(e, loc, Flags.DISPENSER); diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/InventoryListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/InventoryListener.java index ca8ff99a6..79f31ac0f 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/InventoryListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/InventoryListener.java @@ -40,7 +40,7 @@ public class InventoryListener extends FlagListener { } else if (inventoryHolder instanceof Chest || inventoryHolder instanceof ShulkerBox) { - checkIsland(e, e.getInventory().getLocation(), Flags.CHEST); + checkIsland(e, e.getInventory().getLocation(), Flags.CONTAINER); } else if (inventoryHolder instanceof Dispenser) { checkIsland(e, e.getInventory().getLocation(), Flags.DISPENSER); diff --git a/src/main/java/world/bentobox/bentobox/lists/Flags.java b/src/main/java/world/bentobox/bentobox/lists/Flags.java index 347f38289..61476c31b 100644 --- a/src/main/java/world/bentobox/bentobox/lists/Flags.java +++ b/src/main/java/world/bentobox/bentobox/lists/Flags.java @@ -67,7 +67,7 @@ public final class Flags { public static final Flag BEACON = new Flag.Builder("BEACON", Material.BEACON).build(); public static final Flag BED = new Flag.Builder("BED", Material.RED_BED).build(); public static final Flag BREWING = new Flag.Builder("BREWING", Material.BREWING_STAND).build(); - public static final Flag CHEST = new Flag.Builder("CHEST", Material.CHEST).build(); + public static final Flag CONTAINER = new Flag.Builder("CONTAINER", Material.CHEST).build(); public static final Flag DISPENSER = new Flag.Builder("DISPENSER", Material.DISPENSER).build(); public static final Flag DROPPER = new Flag.Builder("DROPPER", Material.DROPPER).build(); public static final Flag HOPPER = new Flag.Builder("HOPPER", Material.HOPPER).build(); diff --git a/src/main/resources/locales/en-US.yml b/src/main/resources/locales/en-US.yml index 4d8da172b..3e48d1720 100644 --- a/src/main/resources/locales/en-US.yml +++ b/src/main/resources/locales/en-US.yml @@ -439,10 +439,15 @@ protection: description: "Toggle button use" name: "Buttons" hint: "No button use allowed" - CHEST: - description: "Toggle chest access" - name: "Chests" - hint: "Chest access disabled" + CONTAINER: + name: "Containers" + description: |- + &aToggle interaction with chests, + &ashulker boxes and flower pots. + + &7Other containers are handled + &7by dedicated flags. + hint: "Container access disabled" DISPENSER: name: "Dispensers" description: "Toggle dispenser interaction"