From 8b636a8ee317134ec13f9fa80c623d1a65725433 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 27 Jan 2018 16:39:02 +0100 Subject: [PATCH 1/4] Minor code quality fixes --- src/main/java/us/tastybento/bskyblock/Constants.java | 6 +----- .../bskyblock/island/builders/IslandBuilder.java | 3 +-- .../tastybento/bskyblock/managers/AddonsManager.java | 11 ++--------- .../bskyblock/managers/CommandsManager.java | 2 -- .../util/placeholders/PlaceholderHandler.java | 3 +-- 5 files changed, 5 insertions(+), 20 deletions(-) diff --git a/src/main/java/us/tastybento/bskyblock/Constants.java b/src/main/java/us/tastybento/bskyblock/Constants.java index e278f0dd0..cb41fd8b4 100644 --- a/src/main/java/us/tastybento/bskyblock/Constants.java +++ b/src/main/java/us/tastybento/bskyblock/Constants.java @@ -1,7 +1,7 @@ package us.tastybento.bskyblock; /** - * All the plugin settings are here + * All the plugin constants are here * @author Tastybento */ public class Constants { @@ -18,8 +18,6 @@ public class Constants { public final static String PERMPREFIX = "acidisland."; // The island command public final static String ISLANDCOMMAND = "ai"; - // The challenge command - public static final String CHALLENGECOMMAND = "aic"; // Admin command public static final String ADMINCOMMAND = "acid"; */ @@ -28,8 +26,6 @@ public class Constants { public final static String PERMPREFIX = "bskyblock."; // The island command public final static String ISLANDCOMMAND = "island"; - // The challenge command - public static final String CHALLENGECOMMAND = "bsc"; // The spawn command (Essentials spawn for example) public final static String SPAWNCOMMAND = "spawn"; // Admin command diff --git a/src/main/java/us/tastybento/bskyblock/island/builders/IslandBuilder.java b/src/main/java/us/tastybento/bskyblock/island/builders/IslandBuilder.java index afea8f1f8..bb70d3e04 100644 --- a/src/main/java/us/tastybento/bskyblock/island/builders/IslandBuilder.java +++ b/src/main/java/us/tastybento/bskyblock/island/builders/IslandBuilder.java @@ -35,7 +35,7 @@ public class IslandBuilder { ISLAND, NETHER, END - }; + } private Island island; private World world; @@ -48,7 +48,6 @@ public class IslandBuilder { private BSkyBlock plugin; public IslandBuilder(BSkyBlock plugin, Island island) { - super(); this.plugin = plugin; this.island = island; this.world = island.getWorld(); diff --git a/src/main/java/us/tastybento/bskyblock/managers/AddonsManager.java b/src/main/java/us/tastybento/bskyblock/managers/AddonsManager.java index 026d1d8c7..898db2123 100644 --- a/src/main/java/us/tastybento/bskyblock/managers/AddonsManager.java +++ b/src/main/java/us/tastybento/bskyblock/managers/AddonsManager.java @@ -37,8 +37,6 @@ public final class AddonsManager { private final Map> classes = new HashMap>(); private BSkyBlock plugin; - - public AddonsManager(BSkyBlock plugin) { this.plugin = plugin; this.addons = new ArrayList<>(); @@ -47,7 +45,6 @@ public final class AddonsManager { /** * Loads all the addons from the addons folder - * @throws InvalidDescriptionException */ public void enableAddons() { File f = new File(plugin.getDataFolder(), "addons"); @@ -57,11 +54,7 @@ public final class AddonsManager { if (!file.isDirectory()) { try { this.loadAddon(file); - } catch (InvalidAddonFormatException e) { - e.printStackTrace(); - } catch (InvalidAddonInheritException e) { - e.printStackTrace(); - } catch (InvalidDescriptionException e) { + } catch (InvalidAddonFormatException | InvalidAddonInheritException | InvalidDescriptionException e) { e.printStackTrace(); } } @@ -78,7 +71,7 @@ public final class AddonsManager { } } - this.addons.stream().forEach(addon -> { + this.addons.forEach(addon -> { addon.onEnable(); Bukkit.getPluginManager().callEvent(AddonEvent.builder().addon(addon).reason(AddonEvent.Reason.ENABLE).build()); addon.setEnabled(true); diff --git a/src/main/java/us/tastybento/bskyblock/managers/CommandsManager.java b/src/main/java/us/tastybento/bskyblock/managers/CommandsManager.java index cf0a60f70..546264e11 100644 --- a/src/main/java/us/tastybento/bskyblock/managers/CommandsManager.java +++ b/src/main/java/us/tastybento/bskyblock/managers/CommandsManager.java @@ -32,6 +32,4 @@ public final class CommandsManager { return commands.get(command); } - - } diff --git a/src/main/java/us/tastybento/bskyblock/util/placeholders/PlaceholderHandler.java b/src/main/java/us/tastybento/bskyblock/util/placeholders/PlaceholderHandler.java index 99918094a..1578ccb3c 100644 --- a/src/main/java/us/tastybento/bskyblock/util/placeholders/PlaceholderHandler.java +++ b/src/main/java/us/tastybento/bskyblock/util/placeholders/PlaceholderHandler.java @@ -11,8 +11,7 @@ import us.tastybento.bskyblock.BSkyBlock; /** * Handles hooks with other Placeholder APIs. * - * @author Poslovitch - * @author Tastybento + * @author Poslovitch, Tastybento */ public class PlaceholderHandler { private static final String PACKAGE = "us.tastybento.bskyblock.util.placeholders.hooks."; From 9cc9518bc3b1b12a4921d00e9842481e95cab2ef Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 27 Jan 2018 16:47:30 +0100 Subject: [PATCH 2/4] Fixed new-island.signs.line* locale entries --- locales/en-US.yml | 8 ++++---- .../bskyblock/island/builders/IslandBuilder.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/locales/en-US.yml b/locales/en-US.yml index 3bcd12169..067e6ca17 100644 --- a/locales/en-US.yml +++ b/locales/en-US.yml @@ -213,7 +213,7 @@ protection: new-island: sign: - line1: "&1%bsb_plugin_name%" - line2: "[player]" - line3: "Don't fall!" - line4: "Have fun! &c<3" \ No newline at end of file + line0: "&1%bsb_plugin_name%" + line1: "[player]" + line2: "Don't fall!" + line3: "Have fun! &c<3" \ No newline at end of file diff --git a/src/main/java/us/tastybento/bskyblock/island/builders/IslandBuilder.java b/src/main/java/us/tastybento/bskyblock/island/builders/IslandBuilder.java index bb70d3e04..a52ccf090 100644 --- a/src/main/java/us/tastybento/bskyblock/island/builders/IslandBuilder.java +++ b/src/main/java/us/tastybento/bskyblock/island/builders/IslandBuilder.java @@ -481,7 +481,7 @@ public class IslandBuilder { Sign sign = (Sign) blockToChange.getState(); User user = User.getInstance(playerUUID); for (int i = 0; i < 4; i++) { - sign.setLine(i, user.getTranslation("new-island.sign.line" + (i+1), "[player]", playerName)); + sign.setLine(i, user.getTranslation("new-island.sign.line" + i, "[player]", playerName)); } ((org.bukkit.material.Sign) sign.getData()).setFacingDirection(BlockFace.NORTH); sign.update(); From 6c08763cbb0ddc50a63c001b3cfedb8b69dddc5a Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 27 Jan 2018 17:03:30 +0100 Subject: [PATCH 3/4] Made PanelItemBuilder methods' name suit the Builder style --- .../api/panels/builders/PanelItemBuilder.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/us/tastybento/bskyblock/api/panels/builders/PanelItemBuilder.java b/src/main/java/us/tastybento/bskyblock/api/panels/builders/PanelItemBuilder.java index 8125699a6..19e84c95c 100644 --- a/src/main/java/us/tastybento/bskyblock/api/panels/builders/PanelItemBuilder.java +++ b/src/main/java/us/tastybento/bskyblock/api/panels/builders/PanelItemBuilder.java @@ -15,27 +15,27 @@ public class PanelItemBuilder { private boolean glow; private Optional clickHandler = Optional.empty(); - public PanelItemBuilder setIcon(ItemStack icon) { + public PanelItemBuilder icon(ItemStack icon) { this.icon = icon; return this; } - public PanelItemBuilder setName(String name) { + public PanelItemBuilder name(String name) { this.name = name; return this; } - public PanelItemBuilder setDescription(List list) { + public PanelItemBuilder description(List list) { this.description = list; return this; } - public PanelItemBuilder setGlow(boolean glow) { + public PanelItemBuilder glow(boolean glow) { this.glow = glow; return this; } - public PanelItemBuilder setClickHandler(ClickHandler clickHandler) { + public PanelItemBuilder clickHandler(ClickHandler clickHandler) { this.clickHandler = Optional.of(clickHandler); return this; } From 72c862c0d58383c0e8b70fd31f0ac614a317274d Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 27 Jan 2018 17:04:08 +0100 Subject: [PATCH 4/4] Starting to implement some Flags to test the API --- .../bskyblock/api/flags/FlagBuilder.java | 15 +++++++++++++-- .../listeners/flags/BreakBlocksListener.java | 6 ++++++ .../listeners/flags/PlaceBlocksListener.java | 6 ++++++ .../java/us/tastybento/bskyblock/lists/Flags.java | 12 ++++++++++++ 4 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 src/main/java/us/tastybento/bskyblock/listeners/flags/BreakBlocksListener.java create mode 100644 src/main/java/us/tastybento/bskyblock/listeners/flags/PlaceBlocksListener.java create mode 100644 src/main/java/us/tastybento/bskyblock/lists/Flags.java diff --git a/src/main/java/us/tastybento/bskyblock/api/flags/FlagBuilder.java b/src/main/java/us/tastybento/bskyblock/api/flags/FlagBuilder.java index cc304a344..a49c5644e 100644 --- a/src/main/java/us/tastybento/bskyblock/api/flags/FlagBuilder.java +++ b/src/main/java/us/tastybento/bskyblock/api/flags/FlagBuilder.java @@ -2,9 +2,12 @@ package us.tastybento.bskyblock.api.flags; import java.util.Optional; +import org.bukkit.Material; import org.bukkit.event.Listener; +import org.bukkit.inventory.ItemStack; import us.tastybento.bskyblock.api.panels.PanelItem; +import us.tastybento.bskyblock.api.panels.builders.PanelItemBuilder; public class FlagBuilder { @@ -17,8 +20,16 @@ public class FlagBuilder { return this; } + public FlagBuilder icon(Material icon) { + icon(new PanelItemBuilder().icon(new ItemStack(icon)).build()); + return this; + } + public FlagBuilder icon(PanelItem icon) { this.icon = icon; + //TODO: if icon don't have a clickhandler, add the default one + //TODO: if icon don't have a display name, set it to the default reference + //TODO: if icon don't have a lore, set it to the default one return this; } @@ -27,7 +38,7 @@ public class FlagBuilder { return this; } - public void build() { - new Flag(id, icon, listener); + public Flag build() { + return new Flag(id, icon, listener); } } diff --git a/src/main/java/us/tastybento/bskyblock/listeners/flags/BreakBlocksListener.java b/src/main/java/us/tastybento/bskyblock/listeners/flags/BreakBlocksListener.java new file mode 100644 index 000000000..fac279a06 --- /dev/null +++ b/src/main/java/us/tastybento/bskyblock/listeners/flags/BreakBlocksListener.java @@ -0,0 +1,6 @@ +package us.tastybento.bskyblock.listeners.flags; + +import org.bukkit.event.Listener; + +public class BreakBlocksListener implements Listener { +} diff --git a/src/main/java/us/tastybento/bskyblock/listeners/flags/PlaceBlocksListener.java b/src/main/java/us/tastybento/bskyblock/listeners/flags/PlaceBlocksListener.java new file mode 100644 index 000000000..fcbd359be --- /dev/null +++ b/src/main/java/us/tastybento/bskyblock/listeners/flags/PlaceBlocksListener.java @@ -0,0 +1,6 @@ +package us.tastybento.bskyblock.listeners.flags; + +import org.bukkit.event.Listener; + +public class PlaceBlocksListener implements Listener { +} diff --git a/src/main/java/us/tastybento/bskyblock/lists/Flags.java b/src/main/java/us/tastybento/bskyblock/lists/Flags.java new file mode 100644 index 000000000..58b551020 --- /dev/null +++ b/src/main/java/us/tastybento/bskyblock/lists/Flags.java @@ -0,0 +1,12 @@ +package us.tastybento.bskyblock.lists; + +import org.bukkit.Material; +import us.tastybento.bskyblock.api.flags.Flag; +import us.tastybento.bskyblock.api.flags.FlagBuilder; +import us.tastybento.bskyblock.listeners.flags.*; + +public class Flags { + + 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.DIRT).listener(new PlaceBlocksListener()).build(); +}