From 670be6d9682f69a1c881cf62c5682f069035cf8d Mon Sep 17 00:00:00 2001 From: jojo Date: Tue, 17 Nov 2020 09:39:03 +0100 Subject: [PATCH] Remove unused Imports --- .../src/de/steamwar/bausystem/BauSystem.java | 70 ++++++++++--------- 1 file changed, 36 insertions(+), 34 deletions(-) diff --git a/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java b/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java index 5389522..7b3d50c 100644 --- a/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java +++ b/BauSystem_Main/src/de/steamwar/bausystem/BauSystem.java @@ -19,7 +19,6 @@ package de.steamwar.bausystem; -import com.sk89q.worldedit.command.WorldEditCommands; import de.steamwar.bausystem.commands.*; import de.steamwar.bausystem.commands.worldedit.*; import de.steamwar.bausystem.tracer.ShowManager; @@ -68,14 +67,14 @@ public class BauSystem extends JavaPlugin implements Listener { plugin = this; String worldName = Bukkit.getWorlds().get(0).getName(); - try{ + try { owner = UUID.fromString(worldName); sections = ArenaSection.loadFromFile(new File(Bukkit.getWorldContainer().getPath() + '/' + getOwner().toString() + "/sections.yml")); - }catch(IllegalArgumentException e){ - try{ + } catch (IllegalArgumentException e) { + try { owner = null; sections = ArenaSection.loadFromFile(new File(Bukkit.getWorldContainer().getPath() + '/' + worldName + "/sections.yml")); - }catch(IOException | InvalidConfigurationException ex){ + } catch (IOException | InvalidConfigurationException ex) { getLogger().log(Level.SEVERE, "owner is no UUID / failed to load sections.yml", e); Bukkit.shutdown(); return; @@ -141,25 +140,28 @@ public class BauSystem extends JavaPlugin implements Listener { autoShutdown = Bukkit.getScheduler().runTaskLater(this, Bukkit::shutdown, 1200); } - public static BauSystem getPlugin(){ + public static BauSystem getPlugin() { return plugin; } - public static UUID getOwner(){ + + public static UUID getOwner() { //Lazy loading to improve startup time of the server in 1.15 - if(owner == null){ - try{ + if (owner == null) { + try { owner = SteamwarUser.get(Integer.parseInt(Bukkit.getWorlds().get(0).getName())).getUUID(); - }catch(NumberFormatException e){ + } catch (NumberFormatException e) { Bukkit.shutdown(); throw new SecurityException("owner is not a UserID", e); } } return owner; } - public static List getSections(){ + + public static List getSections() { return sections; } - public static int getOwnerID(){ + + public static int getOwnerID() { return SteamwarUser.get(getOwner()).getId(); } @@ -170,7 +172,7 @@ public class BauSystem extends JavaPlugin implements Listener { @EventHandler public void onJoin(PlayerLoginEvent e) { - if(autoShutdown != null){ + if (autoShutdown != null) { autoShutdown.cancel(); autoShutdown = null; } @@ -192,37 +194,37 @@ public class BauSystem extends JavaPlugin implements Listener { Bukkit.shutdown(); } } - + @EventHandler - public void onInventoryClick(InventoryClickEvent e) { - ItemStack stack = e.getCursor(); - if (stack == null || !stack.hasItemMeta()) - return; - assert stack.getItemMeta() != null; - if (stack.getItemMeta().hasEnchants()) { - for (Enchantment en : Enchantment.values()) { - if (stack.getEnchantmentLevel(en) > en.getMaxLevel()) - stack.removeEnchantment(en); - } - } + public void onInventoryClick(InventoryClickEvent e) { + ItemStack stack = e.getCursor(); + if (stack == null || !stack.hasItemMeta()) + return; + assert stack.getItemMeta() != null; + if (stack.getItemMeta().hasEnchants()) { + for (Enchantment en : Enchantment.values()) { + if (stack.getEnchantmentLevel(en) > en.getMaxLevel()) + stack.removeEnchantment(en); + } + } Material material = stack.getType(); if (material == Material.POTION || material == Material.SPLASH_POTION || material == Material.LINGERING_POTION) { stack.setType(Material.MILK_BUCKET); } - if (Core.getVersion() < 14) { + if (Core.getVersion() < 14) { e.setCurrentItem(stack); - return; + return; } - if (stack.getItemMeta().hasAttributeModifiers()) { - ItemMeta meta = stack.getItemMeta(); - for (Attribute a : Attribute.values()) { + if (stack.getItemMeta().hasAttributeModifiers()) { + ItemMeta meta = stack.getItemMeta(); + for (Attribute a : Attribute.values()) { meta.removeAttributeModifier(a); } - stack.setItemMeta(meta); - } - e.setCurrentItem(stack); - } + stack.setItemMeta(meta); + } + e.setCurrentItem(stack); + } }