Upstream/bentobox
1
0
Fork 0
mirror of https://github.com/BentoBoxWorld/BentoBox.git synced 2025-02-05 23:11:39 +01:00
Code Issues Projects Releases Wiki Activity

Renamed CHEST flag to CONTAINER

Browse Source 
#402
This commit is contained in:
Florian CUNY 2018-12-28 11:14:52 +01:00
parent 5cddfca3b7
commit d339444feb
4 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/world/bentobox/bentobox/listeners/flags/BlockInteractionListener.java
View File

@ -111,7 +111,7 @@ public class BlockInteractionListener extends FlagListener {
private void checkClickedBlock(Event e, Location loc, Material type) { private void checkClickedBlock(Event e, Location loc, Material type) {
// Handle pots // Handle pots
if (type.name().startsWith("POTTED")) { if (type.name().startsWith("POTTED")) {
checkIsland(e, loc, Flags.CHEST); checkIsland(e, loc, Flags.CONTAINER);
return; return;
} }
switch (type) { switch (type) {
@ -164,7 +164,7 @@ public class BlockInteractionListener extends FlagListener {
case YELLOW_SHULKER_BOX: case YELLOW_SHULKER_BOX:
case SHULKER_BOX: case SHULKER_BOX:
case FLOWER_POT: case FLOWER_POT:
checkIsland(e, loc, Flags.CHEST); checkIsland(e, loc, Flags.CONTAINER);
break; break;
case DISPENSER: case DISPENSER:
checkIsland(e, loc, Flags.DISPENSER); checkIsland(e, loc, Flags.DISPENSER);

2
src/main/java/world/bentobox/bentobox/listeners/flags/InventoryListener.java
View File

@ -40,7 +40,7 @@ public class InventoryListener extends FlagListener {
} }
else if (inventoryHolder instanceof Chest else if (inventoryHolder instanceof Chest
|| inventoryHolder instanceof ShulkerBox) { || inventoryHolder instanceof ShulkerBox) {
checkIsland(e, e.getInventory().getLocation(), Flags.CHEST); checkIsland(e, e.getInventory().getLocation(), Flags.CONTAINER);
} }
else if (inventoryHolder instanceof Dispenser) { else if (inventoryHolder instanceof Dispenser) {
checkIsland(e, e.getInventory().getLocation(), Flags.DISPENSER); checkIsland(e, e.getInventory().getLocation(), Flags.DISPENSER);

2
src/main/java/world/bentobox/bentobox/lists/Flags.java
View File

@ -67,7 +67,7 @@ public final class Flags {
public static final Flag BEACON = new Flag.Builder("BEACON", Material.BEACON).build(); 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 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 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 DISPENSER = new Flag.Builder("DISPENSER", Material.DISPENSER).build();
public static final Flag DROPPER = new Flag.Builder("DROPPER", Material.DROPPER).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(); public static final Flag HOPPER = new Flag.Builder("HOPPER", Material.HOPPER).build();

13
src/main/resources/locales/en-US.yml
View File

@ -439,10 +439,15 @@ protection:
description: "Toggle button use" description: "Toggle button use"
name: "Buttons" name: "Buttons"
hint: "No button use allowed" hint: "No button use allowed"
CHEST: CONTAINER:
description: "Toggle chest access" name: "Containers"
name: "Chests" description: |-
hint: "Chest access disabled" &aToggle interaction with chests,
&ashulker boxes and flower pots.
&7Other containers are handled
&7by dedicated flags.
hint: "Container access disabled"
DISPENSER: DISPENSER:
name: "Dispensers" name: "Dispensers"
description: "Toggle dispenser interaction" description: "Toggle dispenser interaction"