mirror of
https://github.com/BentoBoxWorld/BentoBox.git
synced 2025-02-05 15:02:06 +01:00
Merge pull request #409 from BentoBoxWorld/flag-builder-v2
Nesting Flag builder in Flag
This commit is contained in:
Florian CUNY
GitHub
commit
d24d61480b
@ -9,6 +9,9 @@ import org.bukkit.inventory.ItemStack;
|
||||
|
||||
import world.bentobox.bentobox.BentoBox;
|
||||
import world.bentobox.bentobox.api.configuration.WorldSettings;
|
||||
import world.bentobox.bentobox.api.flags.clicklisteners.CycleClick;
|
||||
import world.bentobox.bentobox.api.flags.clicklisteners.IslandToggleClick;
|
||||
import world.bentobox.bentobox.api.flags.clicklisteners.WorldToggleClick;
|
||||
import world.bentobox.bentobox.api.localization.TextVariables;
|
||||
import world.bentobox.bentobox.api.panels.PanelItem;
|
||||
import world.bentobox.bentobox.api.panels.builders.PanelItemBuilder;
|
||||
@ -45,6 +48,9 @@ public class Flag implements Comparable<Flag> {
|
||||
private final PanelItem.ClickHandler clickHandler;
|
||||
private final boolean subPanel;
|
||||
|
||||
/**
|
||||
* {@link Flag.Builder} should be used instead. This is only used for testing.
|
||||
*/
|
||||
Flag(String id, Material icon, Listener listener, Type type, int defaultRank, PanelItem.ClickHandler clickListener, boolean subPanel) {
|
||||
this.id = id;
|
||||
this.icon = icon;
|
||||
@ -55,6 +61,17 @@ public class Flag implements Comparable<Flag> {
|
||||
this.subPanel = subPanel;
|
||||
}
|
||||
|
||||
private Flag(Builder builder) {
|
||||
this.id = builder.id;
|
||||
this.icon = builder.icon;
|
||||
this.listener = builder.listener;
|
||||
this.type = builder.type;
|
||||
this.setting = builder.defaultSetting;
|
||||
this.defaultRank = builder.defaultRank;
|
||||
this.clickHandler = builder.clickHandler;
|
||||
this.subPanel = builder.usePanel;
|
||||
}
|
||||
|
||||
public String getID() {
|
||||
return id;
|
||||
}
|
||||
@ -247,4 +264,86 @@ public class Flag implements Comparable<Flag> {
|
||||
public int compareTo(Flag o) {
|
||||
return getID().compareTo(o.getID());
|
||||
}
|
||||
|
||||
/**
|
||||
* @author tastybento, Poslovitch
|
||||
*/
|
||||
public static class Builder {
|
||||
// Mandatory fields
|
||||
private String id;
|
||||
private Material icon;
|
||||
|
||||
// Listener
|
||||
private Listener listener;
|
||||
|
||||
// Type - is defaulted to PROTECTION
|
||||
private Type type = Type.PROTECTION;
|
||||
|
||||
// Default settings
|
||||
private boolean defaultSetting;
|
||||
private int defaultRank = RanksManager.MEMBER_RANK;
|
||||
|
||||
// ClickHandler - default depends on the type
|
||||
private PanelItem.ClickHandler clickHandler;
|
||||
|
||||
// Whether there is a sub-panel or not
|
||||
private boolean usePanel = false;
|
||||
|
||||
public Builder(String id, Material icon) {
|
||||
this.id = id;
|
||||
this.icon = icon;
|
||||
}
|
||||
|
||||
public Builder listener(Listener listener) {
|
||||
this.listener = listener;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder type(Type type) {
|
||||
this.type = type;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder clickHandler(PanelItem.ClickHandler clickHandler) {
|
||||
this.clickHandler = clickHandler;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder defaultSetting(boolean defaultSetting) {
|
||||
this.defaultSetting = defaultSetting;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder defaultRank(int defaultRank) {
|
||||
this.defaultRank = defaultRank;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Builder usePanel(boolean usePanel) {
|
||||
this.usePanel = usePanel;
|
||||
return this;
|
||||
}
|
||||
|
||||
public Flag build() {
|
||||
// If no clickHandler has been set, then apply default ones
|
||||
if (clickHandler == null) {
|
||||
switch (type){
|
||||
case PROTECTION:
|
||||
clickHandler = new CycleClick(id);
|
||||
break;
|
||||
case SETTING:
|
||||
clickHandler = new IslandToggleClick(id);
|
||||
break;
|
||||
case WORLD_SETTING:
|
||||
clickHandler = new WorldToggleClick(id);
|
||||
break;
|
||||
default:
|
||||
clickHandler = new CycleClick(id);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
return new Flag(this);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -10,6 +10,10 @@ import world.bentobox.bentobox.api.flags.clicklisteners.WorldToggleClick;
|
||||
import world.bentobox.bentobox.api.panels.PanelItem;
|
||||
import world.bentobox.bentobox.managers.RanksManager;
|
||||
|
||||
/**
|
||||
* @deprecated Replaced by {@link Flag.Builder}.
|
||||
*/
|
||||
@Deprecated
|
||||
public class FlagBuilder {
|
||||
|
||||
private String id;
|
||||
|
||||
@ -9,72 +9,105 @@ import org.bukkit.Material;
|
||||
|
||||
import world.bentobox.bentobox.api.flags.Flag;
|
||||
import world.bentobox.bentobox.api.flags.Flag.Type;
|
||||
import world.bentobox.bentobox.api.flags.FlagBuilder;
|
||||
import world.bentobox.bentobox.api.flags.clicklisteners.CycleClick;
|
||||
import world.bentobox.bentobox.listeners.flags.*;
|
||||
import world.bentobox.bentobox.listeners.flags.BlockInteractionListener;
|
||||
import world.bentobox.bentobox.listeners.flags.BreakBlocksListener;
|
||||
import world.bentobox.bentobox.listeners.flags.BreedingListener;
|
||||
import world.bentobox.bentobox.listeners.flags.BucketListener;
|
||||
import world.bentobox.bentobox.listeners.flags.ChestDamageListener;
|
||||
import world.bentobox.bentobox.listeners.flags.CleanSuperFlatListener;
|
||||
import world.bentobox.bentobox.listeners.flags.CoarseDirtTillingListener;
|
||||
import world.bentobox.bentobox.listeners.flags.CreeperListener;
|
||||
import world.bentobox.bentobox.listeners.flags.EggListener;
|
||||
import world.bentobox.bentobox.listeners.flags.EnderChestListener;
|
||||
import world.bentobox.bentobox.listeners.flags.EndermanListener;
|
||||
import world.bentobox.bentobox.listeners.flags.EnterExitListener;
|
||||
import world.bentobox.bentobox.listeners.flags.EntityInteractListener;
|
||||
import world.bentobox.bentobox.listeners.flags.ExperiencePickupListener;
|
||||
import world.bentobox.bentobox.listeners.flags.FireListener;
|
||||
import world.bentobox.bentobox.listeners.flags.GeoLimitMobsListener;
|
||||
import world.bentobox.bentobox.listeners.flags.HurtingListener;
|
||||
import world.bentobox.bentobox.listeners.flags.InventoryListener;
|
||||
import world.bentobox.bentobox.listeners.flags.InvincibleVisitorsListener;
|
||||
import world.bentobox.bentobox.listeners.flags.IslandRespawnListener;
|
||||
import world.bentobox.bentobox.listeners.flags.ItemDropPickUpListener;
|
||||
import world.bentobox.bentobox.listeners.flags.ItemFrameListener;
|
||||
import world.bentobox.bentobox.listeners.flags.LeashListener;
|
||||
import world.bentobox.bentobox.listeners.flags.LockAndBanListener;
|
||||
import world.bentobox.bentobox.listeners.flags.MobSpawnListener;
|
||||
import world.bentobox.bentobox.listeners.flags.OfflineRedstoneListener;
|
||||
import world.bentobox.bentobox.listeners.flags.PVPListener;
|
||||
import world.bentobox.bentobox.listeners.flags.PhysicalInteractionListener;
|
||||
import world.bentobox.bentobox.listeners.flags.PistonPushListener;
|
||||
import world.bentobox.bentobox.listeners.flags.PlaceBlocksListener;
|
||||
import world.bentobox.bentobox.listeners.flags.PortalListener;
|
||||
import world.bentobox.bentobox.listeners.flags.RemoveMobsListener;
|
||||
import world.bentobox.bentobox.listeners.flags.ShearingListener;
|
||||
import world.bentobox.bentobox.listeners.flags.TNTListener;
|
||||
import world.bentobox.bentobox.listeners.flags.TeleportationListener;
|
||||
import world.bentobox.bentobox.listeners.flags.clicklisteners.CommandRankClickListener;
|
||||
import world.bentobox.bentobox.listeners.flags.clicklisteners.GeoLimitClickListener;
|
||||
import world.bentobox.bentobox.managers.RanksManager;
|
||||
|
||||
public class Flags {
|
||||
public final class Flags {
|
||||
|
||||
private Flags() {}
|
||||
|
||||
// Disabled setting 'rank'
|
||||
private static final int DISABLED = -1;
|
||||
|
||||
public static final Flag BREAK_BLOCKS = new FlagBuilder().id("BREAK_BLOCKS").icon(Material.STONE).listener(new BreakBlocksListener()).build();
|
||||
public static final Flag PLACE_BLOCKS = new FlagBuilder().id("PLACE_BLOCKS").icon(Material.GRASS).listener(new PlaceBlocksListener()).build();
|
||||
public static final Flag BREAK_BLOCKS = new Flag.Builder("BREAK_BLOCKS", Material.STONE).listener(new BreakBlocksListener()).build();
|
||||
public static final Flag PLACE_BLOCKS = new Flag.Builder("PLACE_BLOCKS", Material.GRASS).listener(new PlaceBlocksListener()).build();
|
||||
|
||||
// Frost walker - uses the place block listener
|
||||
public static final Flag FROST_WALKER = new FlagBuilder().id("FROST_WALKER").icon(Material.ICE).build();
|
||||
public static final Flag FROST_WALKER = new Flag.Builder("FROST_WALKER", Material.ICE).build();
|
||||
|
||||
// Block interactions - all use BlockInteractionListener()
|
||||
public static final Flag ANVIL = new FlagBuilder().id("ANVIL").icon(Material.ANVIL).listener(new BlockInteractionListener()).build();
|
||||
public static final Flag BEACON = new FlagBuilder().id("BEACON").icon(Material.BEACON).build();
|
||||
public static final Flag BED = new FlagBuilder().id("BED").icon(Material.RED_BED).build();
|
||||
public static final Flag BREWING = new FlagBuilder().id("BREWING").icon(Material.BREWING_STAND).build();
|
||||
public static final Flag CHEST = new FlagBuilder().id("CHEST").icon(Material.CHEST).build();
|
||||
public static final Flag DOOR = new FlagBuilder().id("DOOR").allowedByDefault(true).icon(Material.OAK_DOOR).build();
|
||||
public static final Flag TRAPDOOR = new FlagBuilder().id("TRAPDOOR").allowedByDefault(true).icon(Material.OAK_TRAPDOOR).build();
|
||||
public static final Flag CRAFTING = new FlagBuilder().id("CRAFTING").allowedByDefault(true).icon(Material.CRAFTING_TABLE).build();
|
||||
public static final Flag ENCHANTING = new FlagBuilder().id("ENCHANTING").allowedByDefault(true).icon(Material.ENCHANTING_TABLE).build();
|
||||
public static final Flag FURNACE = new FlagBuilder().id("FURNACE").icon(Material.FURNACE).build();
|
||||
public static final Flag GATE = new FlagBuilder().id("GATE").allowedByDefault(true).icon(Material.OAK_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 = new FlagBuilder().id("LEVER").icon(Material.LEVER).build();
|
||||
public static final Flag BUTTON = new FlagBuilder().id("BUTTON").icon(Material.OAK_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.COW_SPAWN_EGG).build();
|
||||
public static final Flag ANVIL = new Flag.Builder("ANVIL", Material.ANVIL).listener(new BlockInteractionListener()).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 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 DOOR = new Flag.Builder("DOOR", Material.OAK_DOOR).defaultSetting(true).build();
|
||||
public static final Flag TRAPDOOR = new Flag.Builder("TRAPDOOR", Material.OAK_TRAPDOOR).defaultSetting(true).build();
|
||||
public static final Flag CRAFTING = new Flag.Builder("CRAFTING", Material.CRAFTING_TABLE).defaultSetting(true).build();
|
||||
public static final Flag ENCHANTING = new Flag.Builder("ENCHANTING", Material.ENCHANTING_TABLE).defaultSetting(true).build();
|
||||
public static final Flag FURNACE = new Flag.Builder("FURNACE", Material.FURNACE).build();
|
||||
public static final Flag GATE = new Flag.Builder("GATE", Material.OAK_FENCE_GATE).defaultSetting(true).build();
|
||||
public static final Flag NOTE_BLOCK = new Flag.Builder("NOTE_BLOCK", Material.NOTE_BLOCK).build();
|
||||
public static final Flag JUKEBOX = new Flag.Builder("JUKEBOX", Material.JUKEBOX).build();
|
||||
public static final Flag LEVER = new Flag.Builder("LEVER", Material.LEVER).build();
|
||||
public static final Flag BUTTON = new Flag.Builder("BUTTON", Material.OAK_BUTTON).build();
|
||||
public static final Flag REDSTONE = new Flag.Builder("REDSTONE", Material.REDSTONE).build();
|
||||
public static final Flag SPAWN_EGGS = new Flag.Builder("SPAWN_EGGS", Material.COW_SPAWN_EGG).build();
|
||||
|
||||
// Entity interactions
|
||||
public static final Flag ARMOR_STAND = new FlagBuilder().id("ARMOR_STAND").icon(Material.ARMOR_STAND).listener(new EntityInteractListener()).build();
|
||||
public static final Flag RIDING = new FlagBuilder().id("RIDING").icon(Material.GOLDEN_HORSE_ARMOR).build();
|
||||
public static final Flag TRADING = new FlagBuilder().id("TRADING").allowedByDefault(true).icon(Material.EMERALD).build();
|
||||
public static final Flag NAME_TAG = new FlagBuilder().id("NAME_TAG").icon(Material.NAME_TAG).build();
|
||||
public static final Flag ARMOR_STAND = new Flag.Builder("ARMOR_STAND", Material.ARMOR_STAND).listener(new EntityInteractListener()).build();
|
||||
public static final Flag RIDING = new Flag.Builder("RIDING", Material.GOLDEN_HORSE_ARMOR).build();
|
||||
public static final Flag TRADING = new Flag.Builder("TRADING", Material.EMERALD).defaultSetting(true).build();
|
||||
public static final Flag NAME_TAG = new Flag.Builder("NAME_TAG", Material.NAME_TAG).build();
|
||||
|
||||
// Breeding
|
||||
public static final Flag BREEDING = new FlagBuilder().id("BREEDING").icon(Material.CARROT).listener(new BreedingListener()).build();
|
||||
public static final Flag BREEDING = new Flag.Builder("BREEDING", Material.CARROT).listener(new BreedingListener()).build();
|
||||
|
||||
// Buckets. All bucket use is covered by one listener
|
||||
public static final Flag BUCKET = new FlagBuilder().id("BUCKET").icon(Material.BUCKET).listener(new BucketListener()).build();
|
||||
public static final Flag COLLECT_LAVA = new FlagBuilder().id("COLLECT_LAVA").icon(Material.LAVA_BUCKET).build();
|
||||
public static final Flag COLLECT_WATER = new FlagBuilder().id("COLLECT_WATER").icon(Material.WATER_BUCKET).build();
|
||||
public static final Flag MILKING = new FlagBuilder().id("MILKING").icon(Material.MILK_BUCKET).build();
|
||||
public static final Flag FISH_SCOOPING = new FlagBuilder().id("FISH_SCOOPING").allowedByDefault(false).icon(Material.TROPICAL_FISH_BUCKET).build();
|
||||
public static final Flag BUCKET = new Flag.Builder("BUCKET", Material.BUCKET).listener(new BucketListener()).build();
|
||||
public static final Flag COLLECT_LAVA = new Flag.Builder("COLLECT_LAVA", Material.LAVA_BUCKET).build();
|
||||
public static final Flag COLLECT_WATER = new Flag.Builder("COLLECT_WATER", Material.WATER_BUCKET).build();
|
||||
public static final Flag MILKING = new Flag.Builder("MILKING", Material.MILK_BUCKET).build();
|
||||
public static final Flag FISH_SCOOPING = new Flag.Builder("FISH_SCOOPING", Material.TROPICAL_FISH_BUCKET).defaultSetting(false).build();
|
||||
|
||||
// Chorus Fruit and Enderpearls
|
||||
public static final Flag CHORUS_FRUIT = new FlagBuilder().id("CHORUS_FRUIT").icon(Material.CHORUS_FRUIT).listener(new TeleportationListener()).build();
|
||||
public static final Flag ENDER_PEARL = new FlagBuilder().id("ENDER_PEARL").icon(Material.ENDER_PEARL).build();
|
||||
public static final Flag CHORUS_FRUIT = new Flag.Builder("CHORUS_FRUIT", Material.CHORUS_FRUIT).listener(new TeleportationListener()).build();
|
||||
public static final Flag ENDER_PEARL = new Flag.Builder("ENDER_PEARL", Material.ENDER_PEARL).build();
|
||||
|
||||
// Physical interactions
|
||||
public static final Flag CROP_TRAMPLE = new FlagBuilder().id("CROP_TRAMPLE").icon(Material.WHEAT).listener(new PhysicalInteractionListener()).build();
|
||||
public static final Flag PRESSURE_PLATE = new FlagBuilder().id("PRESSURE_PLATE").icon(Material.STONE_PRESSURE_PLATE).build();
|
||||
public static final Flag TURTLE_EGGS = new FlagBuilder().id("TURTLE_EGGS").icon(Material.TURTLE_EGG).build();
|
||||
public static final Flag CROP_TRAMPLE = new Flag.Builder("CROP_TRAMPLE", Material.WHEAT).listener(new PhysicalInteractionListener()).build();
|
||||
public static final Flag PRESSURE_PLATE = new Flag.Builder("PRESSURE_PLATE", Material.STONE_PRESSURE_PLATE).build();
|
||||
public static final Flag TURTLE_EGGS = new Flag.Builder("TURTLE_EGGS", Material.TURTLE_EGG).build();
|
||||
|
||||
// Egg throwing
|
||||
public static final Flag EGGS = new FlagBuilder().id("EGGS").icon(Material.EGG).listener(new EggListener()).build();
|
||||
public static final Flag EGGS = new Flag.Builder("EGGS", Material.EGG).listener(new EggListener()).build();
|
||||
|
||||
/*
|
||||
* Fire
|
||||
@ -86,120 +119,119 @@ public class Flags {
|
||||
* I'll take you to burn
|
||||
* - The Crazy World of Arthur Brown
|
||||
*/
|
||||
public static final Flag FIRE = new FlagBuilder().id("FIRE").icon(Material.FLINT_AND_STEEL).listener(new FireListener()).build();
|
||||
public static final Flag FIRE_EXTINGUISH = new FlagBuilder().id("FIRE_EXTINGUISH").icon(Material.POTION).build();
|
||||
public static final Flag FIRE = new Flag.Builder("FIRE", Material.FLINT_AND_STEEL).listener(new FireListener()).build();
|
||||
public static final Flag FIRE_EXTINGUISH = new Flag.Builder("FIRE_EXTINGUISH", Material.POTION).build();
|
||||
|
||||
// Inventories
|
||||
public static final Flag MOUNT_INVENTORY = new FlagBuilder().id("MOUNT_INVENTORY").icon(Material.IRON_HORSE_ARMOR).listener(new InventoryListener()).build();
|
||||
public static final Flag MOUNT_INVENTORY = new Flag.Builder("MOUNT_INVENTORY", Material.IRON_HORSE_ARMOR).listener(new InventoryListener()).build();
|
||||
|
||||
// Hurting things
|
||||
public static final Flag HURT_ANIMALS = new FlagBuilder().id("HURT_ANIMALS").icon(Material.STONE_SWORD).listener(new HurtingListener()).build();
|
||||
public static final Flag HURT_MONSTERS = new FlagBuilder().id("HURT_MONSTERS").icon(Material.WOODEN_SWORD).build();
|
||||
public static final Flag HURT_VILLAGERS = new FlagBuilder().id("HURT_VILLAGERS").icon(Material.GOLDEN_SWORD).build();
|
||||
public static final Flag HURT_ANIMALS = new Flag.Builder("HURT_ANIMALS", Material.STONE_SWORD).listener(new HurtingListener()).build();
|
||||
public static final Flag HURT_MONSTERS = new Flag.Builder("HURT_MONSTERS", Material.WOODEN_SWORD).build();
|
||||
public static final Flag HURT_VILLAGERS = new Flag.Builder("HURT_VILLAGERS", Material.GOLDEN_SWORD).build();
|
||||
|
||||
// Leashes
|
||||
public static final Flag LEASH = new FlagBuilder().id("LEASH").icon(Material.LEAD).listener(new LeashListener()).build();
|
||||
public static final Flag LEASH = new Flag.Builder("LEASH", Material.LEAD).listener(new LeashListener()).build();
|
||||
|
||||
// Portal use protection
|
||||
public static final Flag NETHER_PORTAL = new FlagBuilder().id("NETHER_PORTAL").icon(Material.OBSIDIAN).listener(new PortalListener()).build();
|
||||
public static final Flag END_PORTAL = new FlagBuilder().id("END_PORTAL").icon(Material.END_PORTAL_FRAME).listener(new PortalListener()).build();
|
||||
public static final Flag NETHER_PORTAL = new Flag.Builder("NETHER_PORTAL", Material.OBSIDIAN).listener(new PortalListener()).build();
|
||||
public static final Flag END_PORTAL = new Flag.Builder("END_PORTAL", Material.END_PORTAL_FRAME).listener(new PortalListener()).build();
|
||||
|
||||
// Shearing
|
||||
public static final Flag SHEARING = new FlagBuilder().id("SHEARING").icon(Material.SHEARS).listener(new ShearingListener()).build();
|
||||
public static final Flag SHEARING = new Flag.Builder("SHEARING", Material.SHEARS).listener(new ShearingListener()).build();
|
||||
|
||||
// Item pickup or drop
|
||||
public static final Flag ITEM_DROP = new FlagBuilder().id("ITEM_DROP").icon(Material.BEETROOT_SOUP).allowedByDefault(true).listener(new ItemDropPickUpListener()).build();
|
||||
public static final Flag ITEM_PICKUP = new FlagBuilder().id("ITEM_PICKUP").icon(Material.BEETROOT_SEEDS).build();
|
||||
public static final Flag ITEM_DROP = new Flag.Builder("ITEM_DROP", Material.BEETROOT_SOUP).defaultSetting(true).listener(new ItemDropPickUpListener()).build();
|
||||
public static final Flag ITEM_PICKUP = new Flag.Builder("ITEM_PICKUP", Material.BEETROOT_SEEDS).build();
|
||||
|
||||
// Experience
|
||||
public static final Flag EXPERIENCE_PICKUP = new FlagBuilder().id("EXPERIENCE_PICKUP").icon(Material.EXPERIENCE_BOTTLE).listener(new ExperiencePickupListener()).build();
|
||||
public static final Flag EXPERIENCE_PICKUP = new Flag.Builder("EXPERIENCE_PICKUP", Material.EXPERIENCE_BOTTLE).listener(new ExperiencePickupListener()).build();
|
||||
|
||||
// TNT
|
||||
public static final Flag TNT = new FlagBuilder().id("TNT").icon(Material.TNT).listener(new TNTListener()).allowedByDefault(false).build();
|
||||
public static final Flag TNT = new Flag.Builder("TNT", Material.TNT).listener(new TNTListener()).defaultSetting(false).build();
|
||||
|
||||
// Island lock
|
||||
public static final Flag LOCK = new FlagBuilder().id("LOCK")
|
||||
.icon(Material.TRIPWIRE_HOOK).type(Type.PROTECTION).allowedByDefault(true)
|
||||
public static final Flag LOCK = new Flag.Builder("LOCK", Material.TRIPWIRE_HOOK).defaultSetting(true)
|
||||
.defaultRank(RanksManager.VISITOR_RANK).listener(new LockAndBanListener())
|
||||
.onClick(new CycleClick("LOCK", RanksManager.VISITOR_RANK, RanksManager.MEMBER_RANK))
|
||||
.clickHandler(new CycleClick("LOCK", RanksManager.VISITOR_RANK, RanksManager.MEMBER_RANK))
|
||||
.build();
|
||||
|
||||
/*
|
||||
* Settings flags (not protection flags)
|
||||
*/
|
||||
// PVP
|
||||
public static final Flag PVP_OVERWORLD = new FlagBuilder().id("PVP_OVERWORLD").icon(Material.ARROW).type(Type.SETTING)
|
||||
public static final Flag PVP_OVERWORLD = new Flag.Builder("PVP_OVERWORLD", Material.ARROW).type(Type.SETTING)
|
||||
.defaultRank(DISABLED).listener(new PVPListener()).build();
|
||||
public static final Flag PVP_NETHER = new FlagBuilder().id("PVP_NETHER").icon(Material.IRON_AXE).type(Type.SETTING)
|
||||
public static final Flag PVP_NETHER = new Flag.Builder("PVP_NETHER", Material.IRON_AXE).type(Type.SETTING)
|
||||
.defaultRank(DISABLED).build();
|
||||
public static final Flag PVP_END = new FlagBuilder().id("PVP_END").icon(Material.END_CRYSTAL).type(Type.SETTING)
|
||||
public static final Flag PVP_END = new Flag.Builder("PVP_END", Material.END_CRYSTAL).type(Type.SETTING)
|
||||
.defaultRank(DISABLED).build();
|
||||
|
||||
// Others
|
||||
public static final Flag ANIMAL_SPAWN = new FlagBuilder().id("ANIMAL_SPAWN").icon(Material.APPLE).allowedByDefault(true).type(Type.SETTING)
|
||||
public static final Flag ANIMAL_SPAWN = new Flag.Builder("ANIMAL_SPAWN", Material.APPLE).defaultSetting(true).type(Type.SETTING)
|
||||
.listener(new MobSpawnListener()).build();
|
||||
public static final Flag MONSTER_SPAWN = new FlagBuilder().id("MONSTER_SPAWN").icon(Material.SPAWNER).allowedByDefault(true).type(Type.SETTING).build();
|
||||
public static final Flag FIRE_SPREAD = new FlagBuilder().id("FIRE_SPREAD").icon(Material.FIREWORK_STAR).allowedByDefault(true).type(Type.SETTING).build();
|
||||
public static final Flag MONSTER_SPAWN = new Flag.Builder("MONSTER_SPAWN", Material.SPAWNER).defaultSetting(true).type(Type.SETTING).build();
|
||||
public static final Flag FIRE_SPREAD = new Flag.Builder("FIRE_SPREAD", Material.FIREWORK_STAR).defaultSetting(true).type(Type.SETTING).build();
|
||||
|
||||
/*
|
||||
* World Settings - they apply to every island in the game worlds.
|
||||
*/
|
||||
|
||||
// World Settings - apply to every island in the game worlds
|
||||
public static final Flag ENDER_CHEST = new FlagBuilder().id("ENDER_CHEST").icon(Material.ENDER_CHEST)
|
||||
.allowedByDefault(false).type(Type.WORLD_SETTING)
|
||||
public static final Flag ENDER_CHEST = new Flag.Builder("ENDER_CHEST", Material.ENDER_CHEST)
|
||||
.defaultSetting(false).type(Type.WORLD_SETTING)
|
||||
.listener(new EnderChestListener())
|
||||
.build();
|
||||
|
||||
public static final Flag ENDERMAN_GRIEFING = new FlagBuilder().id("ENDERMAN_GRIEFING").icon(Material.END_STONE_BRICKS)
|
||||
.allowedByDefault(true).type(Type.WORLD_SETTING)
|
||||
public static final Flag ENDERMAN_GRIEFING = new Flag.Builder("ENDERMAN_GRIEFING", Material.END_STONE_BRICKS)
|
||||
.defaultSetting(true).type(Type.WORLD_SETTING)
|
||||
.listener(new EndermanListener())
|
||||
.build();
|
||||
|
||||
public static final Flag ENTER_EXIT_MESSAGES = new FlagBuilder().id("ENTER_EXIT_MESSAGES").icon(Material.DIRT).allowedByDefault(true).type(Type.WORLD_SETTING)
|
||||
public static final Flag ENTER_EXIT_MESSAGES = new Flag.Builder("ENTER_EXIT_MESSAGES", Material.DIRT).defaultSetting(true).type(Type.WORLD_SETTING)
|
||||
.listener(new EnterExitListener())
|
||||
.build();
|
||||
|
||||
public static final Flag PISTON_PUSH = new FlagBuilder().id("PISTON_PUSH").icon(Material.PISTON).allowedByDefault(true).type(Type.WORLD_SETTING)
|
||||
public static final Flag PISTON_PUSH = new Flag.Builder("PISTON_PUSH", Material.PISTON).defaultSetting(true).type(Type.WORLD_SETTING)
|
||||
.listener(new PistonPushListener())
|
||||
.build();
|
||||
|
||||
private static InvincibleVisitorsListener ilv = new InvincibleVisitorsListener();
|
||||
public static final Flag INVINCIBLE_VISITORS = new FlagBuilder().id("INVINCIBLE_VISITORS").icon(Material.DIAMOND_CHESTPLATE).type(Type.WORLD_SETTING)
|
||||
.listener(ilv).onClick(ilv).subPanel(true).build();
|
||||
public static final Flag INVINCIBLE_VISITORS = new Flag.Builder("INVINCIBLE_VISITORS", Material.DIAMOND_CHESTPLATE).type(Type.WORLD_SETTING)
|
||||
.listener(ilv).clickHandler(ilv).usePanel(true).build();
|
||||
|
||||
public static final Flag GEO_LIMIT_MOBS = new FlagBuilder().id("GEO_LIMIT_MOBS").icon(Material.CHAINMAIL_CHESTPLATE).type(Type.WORLD_SETTING)
|
||||
.listener(new GeoLimitMobsListener()).onClick(new GeoLimitClickListener()).subPanel(true).build();
|
||||
public static final Flag GEO_LIMIT_MOBS = new Flag.Builder("GEO_LIMIT_MOBS", Material.CHAINMAIL_CHESTPLATE).type(Type.WORLD_SETTING)
|
||||
.listener(new GeoLimitMobsListener()).clickHandler(new GeoLimitClickListener()).usePanel(true).build();
|
||||
|
||||
public static final Flag REMOVE_MOBS = new FlagBuilder().id("REMOVE_MOBS").icon(Material.GLOWSTONE_DUST).type(Type.WORLD_SETTING)
|
||||
.listener(new RemoveMobsListener()).allowedByDefault(true).build();
|
||||
public static final Flag REMOVE_MOBS = new Flag.Builder("REMOVE_MOBS", Material.GLOWSTONE_DUST).type(Type.WORLD_SETTING)
|
||||
.listener(new RemoveMobsListener()).defaultSetting(true).build();
|
||||
|
||||
public static final Flag ITEM_FRAME_DAMAGE = new FlagBuilder().id("ITEM_FRAME_DAMAGE").icon(Material.ITEM_FRAME).type(Type.WORLD_SETTING)
|
||||
.listener(new ItemFrameListener()).allowedByDefault(false).build();
|
||||
public static final Flag ITEM_FRAME_DAMAGE = new Flag.Builder("ITEM_FRAME_DAMAGE", Material.ITEM_FRAME).type(Type.WORLD_SETTING)
|
||||
.listener(new ItemFrameListener()).defaultSetting(false).build();
|
||||
|
||||
public static final Flag ISLAND_RESPAWN = new FlagBuilder().id("ISLAND_RESPAWN").icon(Material.TORCH).type(Type.WORLD_SETTING)
|
||||
.listener(new IslandRespawnListener()).allowedByDefault(true).build();
|
||||
public static final Flag ISLAND_RESPAWN = new Flag.Builder("ISLAND_RESPAWN", Material.TORCH).type(Type.WORLD_SETTING)
|
||||
.listener(new IslandRespawnListener()).defaultSetting(true).build();
|
||||
|
||||
public static final Flag OFFLINE_REDSTONE = new FlagBuilder().id("OFFLINE_REDSTONE").icon(Material.COMPARATOR).type(Type.WORLD_SETTING)
|
||||
.listener(new OfflineRedstoneListener()).allowedByDefault(true).build();
|
||||
public static final Flag OFFLINE_REDSTONE = new Flag.Builder("OFFLINE_REDSTONE", Material.COMPARATOR).type(Type.WORLD_SETTING)
|
||||
.listener(new OfflineRedstoneListener()).defaultSetting(true).build();
|
||||
|
||||
public static final Flag CLEAN_SUPER_FLAT = new FlagBuilder().id("CLEAN_SUPER_FLAT").icon(Material.BEDROCK).type(Type.WORLD_SETTING)
|
||||
.listener(new CleanSuperFlatListener()).allowedByDefault(false).build();
|
||||
public static final Flag CLEAN_SUPER_FLAT = new Flag.Builder("CLEAN_SUPER_FLAT", Material.BEDROCK).type(Type.WORLD_SETTING)
|
||||
.listener(new CleanSuperFlatListener()).defaultSetting(false).build();
|
||||
|
||||
public static final Flag CHEST_DAMAGE = new FlagBuilder().id("CHEST_DAMAGE").icon(Material.TRAPPED_CHEST).type(Type.WORLD_SETTING)
|
||||
.listener(new ChestDamageListener()).allowedByDefault(false).build();
|
||||
public static final Flag CREEPER_DAMAGE = new FlagBuilder().id("CREEPER_DAMAGE").listener(new CreeperListener()).icon(Material.GREEN_SHULKER_BOX).type(Type.WORLD_SETTING)
|
||||
.allowedByDefault(true).build();
|
||||
public static final Flag CHEST_DAMAGE = new Flag.Builder("CHEST_DAMAGE", Material.TRAPPED_CHEST).type(Type.WORLD_SETTING)
|
||||
.listener(new ChestDamageListener()).defaultSetting(false).build();
|
||||
public static final Flag CREEPER_DAMAGE = new Flag.Builder("CREEPER_DAMAGE", Material.GREEN_SHULKER_BOX).listener(new CreeperListener()).type(Type.WORLD_SETTING)
|
||||
.defaultSetting(true).build();
|
||||
/**
|
||||
* Prevents creeper griefing. This is where a visitor will trigger a creeper to blow up an island.
|
||||
*/
|
||||
public static final Flag CREEPER_GRIEFING = new FlagBuilder().id("CREEPER_GRIEFING").icon(Material.CREEPER_HEAD).type(Type.WORLD_SETTING)
|
||||
.allowedByDefault(false).build();
|
||||
public static final Flag CREEPER_GRIEFING = new Flag.Builder("CREEPER_GRIEFING", Material.CREEPER_HEAD).type(Type.WORLD_SETTING)
|
||||
.defaultSetting(false).build();
|
||||
|
||||
public static final Flag COMMAND_RANKS = new FlagBuilder().id("COMMAND_RANKS").icon(Material.PLAYER_HEAD).type(Type.WORLD_SETTING)
|
||||
.onClick(new CommandRankClickListener()).subPanel(true).build();
|
||||
public static final Flag COMMAND_RANKS = new Flag.Builder("COMMAND_RANKS", Material.PLAYER_HEAD).type(Type.WORLD_SETTING)
|
||||
.clickHandler(new CommandRankClickListener()).usePanel(true).build();
|
||||
|
||||
public static final Flag COARSE_DIRT_TILLING = new FlagBuilder().id("COARSE_DIRT_TILLING").icon(Material.COARSE_DIRT).type(Type.WORLD_SETTING).allowedByDefault(true).listener(new CoarseDirtTillingListener()).build();
|
||||
public static final Flag COARSE_DIRT_TILLING = new Flag.Builder("COARSE_DIRT_TILLING", Material.COARSE_DIRT).type(Type.WORLD_SETTING).defaultSetting(true).listener(new CoarseDirtTillingListener()).build();
|
||||
|
||||
/**
|
||||
* @return List of all the flags in this class
|
||||
|
||||
@ -52,7 +52,6 @@ import world.bentobox.bentobox.api.commands.CompositeCommand;
|
||||
import world.bentobox.bentobox.api.events.IslandBaseEvent;
|
||||
import world.bentobox.bentobox.api.events.team.TeamEvent;
|
||||
import world.bentobox.bentobox.api.flags.Flag;
|
||||
import world.bentobox.bentobox.api.flags.FlagBuilder;
|
||||
import world.bentobox.bentobox.api.flags.FlagListener;
|
||||
import world.bentobox.bentobox.api.user.User;
|
||||
import world.bentobox.bentobox.database.objects.Island;
|
||||
@ -500,7 +499,7 @@ public class TestBentoBox {
|
||||
public void testCustomFlags() {
|
||||
// Custom
|
||||
TestFlagListener fl = new TestFlagListener(plugin);
|
||||
Flag customFlag = new FlagBuilder().id("CUSTOM_FLAG").icon(Material.DIAMOND).listener(fl).build();
|
||||
Flag customFlag = new Flag.Builder("CUSTOM_FLAG", Material.DIAMOND).listener(fl).build();
|
||||
assertEquals("CUSTOM_FLAG", customFlag.getID());
|
||||
assertEquals(Material.DIAMOND, customFlag.getIcon());
|
||||
assertEquals(fl, customFlag.getListener().get());
|
||||
|
||||
@ -33,7 +33,6 @@ import org.powermock.reflect.Whitebox;
|
||||
|
||||
import world.bentobox.bentobox.BentoBox;
|
||||
import world.bentobox.bentobox.api.flags.Flag;
|
||||
import world.bentobox.bentobox.api.flags.FlagBuilder;
|
||||
import world.bentobox.bentobox.listeners.flags.BreakBlocksListener;
|
||||
import world.bentobox.bentobox.lists.Flags;
|
||||
|
||||
@ -97,11 +96,9 @@ public class FlagsManagerTest {
|
||||
public void testRegisterDuplicateFlagIcons() {
|
||||
FlagsManager fm = new FlagsManager(plugin);
|
||||
// Change the ID to something random, but use every icon that is already used
|
||||
Flags.values().forEach(dupe -> assertFalse(fm.registerFlag(new FlagBuilder()
|
||||
.id(UUID.randomUUID().toString())
|
||||
.icon(dupe.getIcon())
|
||||
.listener(new BreakBlocksListener())
|
||||
.build())));
|
||||
Flags.values().forEach(dupe -> assertFalse(fm.registerFlag(
|
||||
new Flag.Builder(UUID.randomUUID().toString(), dupe.getIcon()).listener(new BreakBlocksListener()).build()
|
||||
)));
|
||||
}
|
||||
|
||||
|
||||
@ -111,12 +108,12 @@ public class FlagsManagerTest {
|
||||
FlagsManager fm = new FlagsManager(plugin);
|
||||
// This should pass
|
||||
OriginalListener ol = new OriginalListener();
|
||||
Flag originalFlag = new FlagBuilder().id("ORIGINAL").icon(Material.EMERALD_BLOCK).listener(ol).build();
|
||||
Flag originalFlag = new Flag.Builder("ORIGINAL", Material.EMERALD_BLOCK).listener(ol).build();
|
||||
assertTrue(fm.registerFlag(originalFlag));
|
||||
// Verify registered
|
||||
Mockito.verify(server).getPluginManager();
|
||||
// Register another flag with same listener
|
||||
Flag originalFlag2 = new FlagBuilder().id("ORIGINAL2").icon(Material.COAL_ORE).listener(ol).build();
|
||||
Flag originalFlag2 = new Flag.Builder("ORIGINAL2", Material.COAL_ORE).listener(ol).build();
|
||||
assertTrue(fm.registerFlag(originalFlag2));
|
||||
// Verify registered only once
|
||||
Mockito.verify(server).getPluginManager();
|
||||
|
||||
Loading…
Reference in New Issue
Block a user