From 24a88e09ace2473aa5e31a5e362e076ce5491a8b Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sun, 17 Jun 2018 11:36:17 +0200 Subject: [PATCH] Added ENDER_CHEST flag and splited LEVER_BUTTON into LEVER and BUTTON --- .../listeners/flags/BlockInteractionListener.java | 5 ++++- src/main/java/us/tastybento/bskyblock/lists/Flags.java | 10 ++++++---- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/src/main/java/us/tastybento/bskyblock/listeners/flags/BlockInteractionListener.java b/src/main/java/us/tastybento/bskyblock/listeners/flags/BlockInteractionListener.java index 869e5ef62..499af61c8 100644 --- a/src/main/java/us/tastybento/bskyblock/listeners/flags/BlockInteractionListener.java +++ b/src/main/java/us/tastybento/bskyblock/listeners/flags/BlockInteractionListener.java @@ -95,6 +95,7 @@ public class BlockInteractionListener extends AbstractFlagListener { checkIsland(e, e.getClickedBlock().getLocation(), Flags.ENCHANTING); break; case ENDER_CHEST: + checkIsland(e, e.getClickedBlock().getLocation(), Flags.ENDER_CHEST); break; case JUKEBOX: checkIsland(e, e.getClickedBlock().getLocation(), Flags.JUKEBOX); @@ -107,8 +108,10 @@ public class BlockInteractionListener extends AbstractFlagListener { break; case STONE_BUTTON: case WOOD_BUTTON: + checkIsland(e, e.getClickedBlock().getLocation(), Flags.BUTTON); + break; case LEVER: - checkIsland(e, e.getClickedBlock().getLocation(), Flags.LEVER_BUTTON); + checkIsland(e, e.getClickedBlock().getLocation(), Flags.LEVER); break; case DIODE: case DIODE_BLOCK_OFF: diff --git a/src/main/java/us/tastybento/bskyblock/lists/Flags.java b/src/main/java/us/tastybento/bskyblock/lists/Flags.java index 3baff3a32..6905440a8 100644 --- a/src/main/java/us/tastybento/bskyblock/lists/Flags.java +++ b/src/main/java/us/tastybento/bskyblock/lists/Flags.java @@ -7,6 +7,7 @@ import java.util.stream.Collectors; import org.bukkit.Bukkit; import org.bukkit.Material; +import org.bukkit.inventory.ItemStack; import us.tastybento.bskyblock.api.flags.Flag; import us.tastybento.bskyblock.api.flags.Flag.Type; import us.tastybento.bskyblock.api.flags.FlagBuilder; @@ -40,11 +41,8 @@ public class Flags { // Disabled setting 'rank' private static final int DISABLED = -1; - // TODO: add DYEING sheeps // TODO: add ELYTRA // TODO: add FISHING - // TODO: add INTERACT_TAMED - // TODO: split LEVER_BUTTON into BUTTON and LEVER // TODO: add KEEP_INVENTORY - is it needed? public static final Flag BREAK_BLOCKS = new FlagBuilder().id("BREAK_BLOCKS").icon(Material.STONE).listener(new BreakBlocksListener()).build(); @@ -56,6 +54,7 @@ public class Flags { public static final Flag BED = new FlagBuilder().id("BED").icon(Material.BED).build(); public static final Flag BREWING = new FlagBuilder().id("BREWING").icon(Material.BREWING_STAND_ITEM).build(); public static final Flag CHEST = new FlagBuilder().id("CHEST").icon(Material.CHEST).build(); + public static final Flag ENDER_CHEST = new FlagBuilder().id("ENDER_CHEST").icon(Material.ENDER_CHEST).build(); public static final Flag DOOR = new FlagBuilder().id("DOOR").allowedByDefault(true).icon(Material.WOOD_DOOR).build(); public static final Flag TRAPDOOR = new FlagBuilder().id("TRAPDOOR").allowedByDefault(true).icon(Material.TRAP_DOOR).build(); public static final Flag CRAFTING = new FlagBuilder().id("CRAFTING").allowedByDefault(true).icon(Material.WORKBENCH).build(); @@ -64,7 +63,8 @@ public class Flags { public static final Flag GATE = new FlagBuilder().id("GATE").allowedByDefault(true).icon(Material.FENCE_GATE).build(); public static final Flag NOTE_BLOCK = new FlagBuilder().id("NOTE_BLOCK").icon(Material.NOTE_BLOCK).build(); public static final Flag JUKEBOX = new FlagBuilder().id("JUKEBOX").icon(Material.JUKEBOX).build(); - public static final Flag LEVER_BUTTON = new FlagBuilder().id("LEVER_BUTTON").icon(Material.LEVER).build(); + public static final Flag LEVER = new FlagBuilder().id("LEVER").icon(Material.LEVER).build(); + public static final Flag BUTTON = new FlagBuilder().id("BUTTON").icon(Material.WOOD_BUTTON).build(); public static final Flag REDSTONE = new FlagBuilder().id("REDSTONE").icon(Material.REDSTONE).build(); public static final Flag SPAWN_EGGS = new FlagBuilder().id("SPAWN_EGGS").icon(Material.MONSTER_EGG).build(); @@ -143,10 +143,12 @@ public class Flags { .defaultRank(DISABLED).onClick(new IslandToggleClickListener("PVP_NETHER")).build(); public static final Flag PVP_END = new FlagBuilder().id("PVP_END").icon(Material.END_CRYSTAL).type(Type.SETTING) .defaultRank(DISABLED).onClick(new IslandToggleClickListener("PVP_END")).build(); + // Others public static final Flag ANIMAL_SPAWN = new FlagBuilder().id("ANIMAL_SPAWN").icon(Material.APPLE).allowedByDefault(true).type(Type.SETTING).build(); public static final Flag MONSTER_SPAWN = new FlagBuilder().id("MONSTER_SPAWN").icon(Material.MOB_SPAWNER).allowedByDefault(true).type(Type.SETTING).build(); public static final Flag FIRE_SPREAD = new FlagBuilder().id("FIRE_SPREAD").icon(Material.FIREWORK_CHARGE).type(Type.SETTING).build(); + // Global flags (apply to every island) public static final Flag ENTER_EXIT_MESSAGES = new FlagBuilder().id("ENTER_EXIT_MESSAGES").icon(Material.DIRT).allowedByDefault(true).type(Type.WORLD_SETTING) .listener(new EnterExitListener())