From 07be933a9da8de86d6622ed7b1140d5dbd642db7 Mon Sep 17 00:00:00 2001 From: Florian CUNY Date: Sat, 15 Jun 2019 22:56:57 +0200 Subject: [PATCH] Fixed some code smells --- .../blueprints/AdminBlueprintSaveCommand.java | 4 +-- .../placeholders/PlaceholderAPIHook.java | 2 -- .../listeners/PanelListenerManager.java | 1 - .../protection/BlockInteractionListener.java | 6 ++-- .../flags/worldsettings/CreeperListener.java | 2 +- .../panels/BlueprintManagementPanel.java | 34 +++++++++---------- .../bentobox/bentobox/panels/IconChanger.java | 2 +- .../bentobox/bentobox/schems/Converter.java | 6 ++-- .../bentobox/bentobox/schems/SchemLoader.java | 2 +- 9 files changed, 27 insertions(+), 32 deletions(-) diff --git a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintSaveCommand.java b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintSaveCommand.java index a7638e230..7a7bf4031 100644 --- a/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintSaveCommand.java +++ b/src/main/java/world/bentobox/bentobox/api/commands/admin/blueprints/AdminBlueprintSaveCommand.java @@ -37,9 +37,7 @@ public class AdminBlueprintSaveCommand extends ConfirmableCommand { // Check if file exists File newFile = new File(parent.getBlueprintsFolder(), fileName + BlueprintsManager.BLUEPRINT_SUFFIX); if (newFile.exists()) { - this.askConfirmation(user, user.getTranslation("commands.admin.blueprint.file-exists"), () -> { - hideAndSave(user, parent, clipboard, fileName); - }); + this.askConfirmation(user, user.getTranslation("commands.admin.blueprint.file-exists"), () -> hideAndSave(user, parent, clipboard, fileName)); return false; } return hideAndSave(user, parent, clipboard, fileName); diff --git a/src/main/java/world/bentobox/bentobox/hooks/placeholders/PlaceholderAPIHook.java b/src/main/java/world/bentobox/bentobox/hooks/placeholders/PlaceholderAPIHook.java index c14a115c4..deb042ce1 100644 --- a/src/main/java/world/bentobox/bentobox/hooks/placeholders/PlaceholderAPIHook.java +++ b/src/main/java/world/bentobox/bentobox/hooks/placeholders/PlaceholderAPIHook.java @@ -1,12 +1,10 @@ package world.bentobox.bentobox.hooks.placeholders; import me.clip.placeholderapi.PlaceholderAPI; -import org.bukkit.Material; import org.bukkit.entity.Player; import org.eclipse.jdt.annotation.NonNull; import world.bentobox.bentobox.BentoBox; import world.bentobox.bentobox.api.addons.Addon; -import world.bentobox.bentobox.api.hooks.Hook; import world.bentobox.bentobox.api.placeholders.PlaceholderReplacer; import world.bentobox.bentobox.api.placeholders.placeholderapi.AddonPlaceholderExpansion; import world.bentobox.bentobox.api.placeholders.placeholderapi.BentoBoxPlaceholderExpansion; diff --git a/src/main/java/world/bentobox/bentobox/listeners/PanelListenerManager.java b/src/main/java/world/bentobox/bentobox/listeners/PanelListenerManager.java index 9284ee325..960ae59d0 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/PanelListenerManager.java +++ b/src/main/java/world/bentobox/bentobox/listeners/PanelListenerManager.java @@ -12,7 +12,6 @@ import org.bukkit.event.Listener; import org.bukkit.event.inventory.InventoryClickEvent; import org.bukkit.event.inventory.InventoryCloseEvent; import org.bukkit.event.inventory.InventoryType.SlotType; -import org.bukkit.event.player.PlayerKickEvent; import org.bukkit.event.player.PlayerQuitEvent; import org.bukkit.event.server.PluginDisableEvent; import org.bukkit.inventory.InventoryView; diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListener.java index 4b58dd353..1fca838d5 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/protection/BlockInteractionListener.java @@ -33,7 +33,7 @@ public class BlockInteractionListener extends FlagListener { * These cover materials in another server version. * This avoids run time errors due to unknown enum values, at the expense of a string comparison */ - Map STRING_FLAGS = ImmutableMap.builder() + private final Map stringFlags = ImmutableMap.builder() .put("CAMPFIRE", "FURNACE") .put("CARTOGRAPHY_TABLE", "CRAFTING") .put("GRINDSTONE", "CRAFTING") @@ -285,8 +285,8 @@ public class BlockInteractionListener extends FlagListener { checkIsland(e, player, loc, Flags.ITEM_FRAME); break; default: - if (STRING_FLAGS.containsKey(type.name())) { - Optional f = BentoBox.getInstance().getFlagsManager().getFlag(STRING_FLAGS.get(type.name())); + if (stringFlags.containsKey(type.name())) { + Optional f = BentoBox.getInstance().getFlagsManager().getFlag(stringFlags.get(type.name())); if (f.isPresent()) checkIsland(e, player, loc, f.get()); } } diff --git a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/CreeperListener.java b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/CreeperListener.java index 0557ea657..6b8356d09 100644 --- a/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/CreeperListener.java +++ b/src/main/java/world/bentobox/bentobox/listeners/flags/worldsettings/CreeperListener.java @@ -27,7 +27,7 @@ public class CreeperListener extends FlagListener { */ @EventHandler(priority = EventPriority.LOW, ignoreCancelled = true) public void onExplosion(final EntityExplodeEvent e) { - if (e.getEntity() == null || !e.getEntityType().equals(EntityType.CREEPER) || !getIWM().inWorld(e.getLocation())) { + if (!e.getEntityType().equals(EntityType.CREEPER) || !getIWM().inWorld(e.getLocation())) { return; } // If creeper damage is not allowed in world, remove it diff --git a/src/main/java/world/bentobox/bentobox/panels/BlueprintManagementPanel.java b/src/main/java/world/bentobox/bentobox/panels/BlueprintManagementPanel.java index 162dfd691..e8fb63204 100644 --- a/src/main/java/world/bentobox/bentobox/panels/BlueprintManagementPanel.java +++ b/src/main/java/world/bentobox/bentobox/panels/BlueprintManagementPanel.java @@ -41,11 +41,11 @@ import world.bentobox.bentobox.util.Util; public class BlueprintManagementPanel { private final BentoBox plugin; - private final Blueprint NORMAL_BP; - private final Blueprint NETHER_BP; - private final Blueprint END_BP; - private final Map SLOT_TO_ENV; - private final Map ENV_TO_BP; + private final Blueprint normalBlueprint; + private final Blueprint netherBlueprint; + private final Blueprint endBlueprint; + private final Map slotToEnvironment; + private final Map environmentToBlueprint; private static final int MAX_WORLD_SLOT = 9; private static final int MIN_WORLD_SLOT = 0; public static final int MAX_BP_SLOT = 35; @@ -58,11 +58,11 @@ public class BlueprintManagementPanel { this.plugin = plugin; this.user = user; this.addon = addon; - NORMAL_BP = new Blueprint().setIcon(Material.GREEN_STAINED_GLASS_PANE).setName(t("normal")).setDescription(t("instruction")); - NETHER_BP = new Blueprint().setIcon(Material.RED_STAINED_GLASS_PANE).setName(t("nether")).setDescription(t("instruction")); - END_BP = new Blueprint().setIcon(Material.YELLOW_STAINED_GLASS_PANE).setName(t("end")).setDescription(t("instruction")); - SLOT_TO_ENV = ImmutableMap.of(3, World.Environment.NORMAL, 5, World.Environment.NETHER, 7, World.Environment.THE_END); - ENV_TO_BP = ImmutableMap.of(World.Environment.NORMAL, NORMAL_BP, World.Environment.NETHER, NETHER_BP, World.Environment.THE_END, END_BP); + normalBlueprint = new Blueprint().setIcon(Material.GREEN_STAINED_GLASS_PANE).setName(t("normal")).setDescription(t("instruction")); + netherBlueprint = new Blueprint().setIcon(Material.RED_STAINED_GLASS_PANE).setName(t("nether")).setDescription(t("instruction")); + endBlueprint = new Blueprint().setIcon(Material.YELLOW_STAINED_GLASS_PANE).setName(t("end")).setDescription(t("instruction")); + slotToEnvironment = ImmutableMap.of(3, World.Environment.NORMAL, 5, World.Environment.NETHER, 7, World.Environment.THE_END); + environmentToBlueprint = ImmutableMap.of(World.Environment.NORMAL, normalBlueprint, World.Environment.NETHER, netherBlueprint, World.Environment.THE_END, endBlueprint); } private String t(String t) { @@ -82,7 +82,7 @@ public class BlueprintManagementPanel { // Create the panel PanelBuilder pb = new PanelBuilder().name(t("title")).user(user).size(45); // Panel has New Blueprint Bundle button - clicking in creates a new bundle - pb.item(36, getNewBundle(user, addon)); + pb.item(36, getNewBundle(addon)); // Get the bundles Comparator sortByDisplayName = (p, o) -> p.getDisplayName().compareToIgnoreCase(o.getDisplayName()); plugin.getBlueprintsManager().getBlueprintBundles(addon).values().stream().limit(36) @@ -153,10 +153,10 @@ public class BlueprintManagementPanel { PanelBuilder pb = new PanelBuilder().name(bb.getDisplayName()).user(user).size(45).listener(new IconChanger(plugin, addon, this, bb)); // Display bundle icon pb.item(0, getBundleIcon(bb)); - SLOT_TO_ENV.forEach((k,v) -> { + slotToEnvironment.forEach((k, v) -> { String bpName = bb.getBlueprint(v); pb.item(k-1, getWorldInstrTile(v)); - pb.item(k, getBlueprintItem(addon, k, bb, plugin.getBlueprintsManager().getBlueprints(addon).getOrDefault(bpName, ENV_TO_BP.get(v)))); + pb.item(k, getBlueprintItem(addon, k, bb, plugin.getBlueprintsManager().getBlueprints(addon).getOrDefault(bpName, environmentToBlueprint.get(v)))); }); for (int i = 9; i < 18; i++) { @@ -284,7 +284,7 @@ public class BlueprintManagementPanel { protected PanelItem getBlueprintItem(GameModeAddon addon, int pos, BlueprintBundle bb, Blueprint blueprint) { // Create description List desc = blueprint.getDescription() == null ? new ArrayList<>() : blueprint.getDescription(); - if ((!blueprint.equals(END_BP) && !blueprint.equals(NORMAL_BP) && !blueprint.equals(NETHER_BP))) { + if ((!blueprint.equals(endBlueprint) && !blueprint.equals(normalBlueprint) && !blueprint.equals(netherBlueprint))) { if ((pos > MIN_WORLD_SLOT && pos < MAX_WORLD_SLOT)) { desc.add(t("remove")); } else { @@ -308,7 +308,7 @@ public class BlueprintManagementPanel { if (clickType.equals(ClickType.RIGHT)) { u.getPlayer().playSound(u.getLocation(), Sound.BLOCK_GLASS_BREAK, 1F, 1F); // Remove the item and replace with the blank - bb.clearBlueprint(SLOT_TO_ENV.get(slot)); + bb.clearBlueprint(slotToEnvironment.get(slot)); // Save plugin.getBlueprintsManager().saveBlueprintBundle(addon, bb); openBB(bb); @@ -320,7 +320,7 @@ public class BlueprintManagementPanel { u.getPlayer().playSound(u.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F); Blueprint bp = selected.getValue(); // make slot the chosen one - bb.setBlueprint(SLOT_TO_ENV.get(slot), bp); + bb.setBlueprint(slotToEnvironment.get(slot), bp); // Save plugin.getBlueprintsManager().saveBlueprintBundle(addon, bb); openBB(bb); @@ -344,7 +344,7 @@ public class BlueprintManagementPanel { .build(); } - private PanelItem getNewBundle(@NonNull User user, @NonNull GameModeAddon addon) { + private PanelItem getNewBundle(@NonNull GameModeAddon addon) { return new PanelItemBuilder() .name(t("new-bundle")) .description(t("new-bundle-instructions")) diff --git a/src/main/java/world/bentobox/bentobox/panels/IconChanger.java b/src/main/java/world/bentobox/bentobox/panels/IconChanger.java index b38a76730..7b138e65a 100644 --- a/src/main/java/world/bentobox/bentobox/panels/IconChanger.java +++ b/src/main/java/world/bentobox/bentobox/panels/IconChanger.java @@ -43,7 +43,7 @@ public class IconChanger implements PanelListener { @Override public void onInventoryClick(User user, InventoryClickEvent event) { // Handle icon changing - if (event.getCurrentItem().getType() != null && !event.getCurrentItem().getType().equals(Material.AIR) && event.getRawSlot() > 44) { + if (event.getCurrentItem() != null && !event.getCurrentItem().getType().equals(Material.AIR) && event.getRawSlot() > 44) { Material icon = event.getCurrentItem().getType(); Entry selected = blueprintManagementPanel.getSelected(); user.getPlayer().playSound(user.getLocation(), Sound.BLOCK_METAL_HIT, 1F, 1F); diff --git a/src/main/java/world/bentobox/bentobox/schems/Converter.java b/src/main/java/world/bentobox/bentobox/schems/Converter.java index 0c5e72389..94bd6c9a1 100644 --- a/src/main/java/world/bentobox/bentobox/schems/Converter.java +++ b/src/main/java/world/bentobox/bentobox/schems/Converter.java @@ -205,9 +205,9 @@ public class Converter { private Vector getVector(String name) { String[] pos = name.split(","); - int x = Integer.valueOf(pos[0]); - int y = Integer.valueOf(pos[1]); - int z = Integer.valueOf(pos[2]); + int x = Integer.parseInt(pos[0]); + int y = Integer.parseInt(pos[1]); + int z = Integer.parseInt(pos[2]); return new Vector(x,y,z); } diff --git a/src/main/java/world/bentobox/bentobox/schems/SchemLoader.java b/src/main/java/world/bentobox/bentobox/schems/SchemLoader.java index 0f8f86595..3044eb06d 100644 --- a/src/main/java/world/bentobox/bentobox/schems/SchemLoader.java +++ b/src/main/java/world/bentobox/bentobox/schems/SchemLoader.java @@ -52,7 +52,7 @@ public class SchemLoader { * @throws IOException - if there's a load error with unziping or name * @throws InvalidConfigurationException - the YAML of the schem is at fault */ - public void load(String fileName) throws FileNotFoundException, IOException, InvalidConfigurationException { + public void load(String fileName) throws IOException, InvalidConfigurationException { File zipFile = new File(schemFolder, fileName + ".schem"); if (!zipFile.exists()) { plugin.logError(LOAD_ERROR + zipFile.getName());