From bea49ad2e716f98b9dcce8ac0e32afad50ea061a Mon Sep 17 00:00:00 2001 From: Auxilor Date: Mon, 21 Sep 2020 21:02:07 +0100 Subject: [PATCH] Fixed many bugs --- .../ecoenchants/command/AbstractCommand.java | 6 +- .../command/commands/CommandEcodebug.java | 10 ++- .../command/commands/CommandEcoreload.java | 10 ++- .../command/commands/CommandEcoskip.java | 9 ++- .../command/commands/CommandEnchantinfo.java | 8 +- .../{YamlConfig.java => AbstractConfig.java} | 75 ++++++++++++++----- .../willfp/ecoenchants/config/RootConfig.java | 52 +++++++++++++ .../ecoenchants/config/configs/Config.java | 47 +----------- .../ecoenchants/config/configs/Lang.java | 14 +--- .../ecoenchants/config/configs/Rarity.java | 41 +--------- .../ecoenchants/config/configs/Target.java | 4 +- .../display/AbstractPacketAdapter.java | 6 +- .../ecoenchants/display/EnchantDisplay.java | 6 +- .../packets/PacketOpenWindowMerchant.java | 7 ++ .../packets/PacketSetCreativeSlot.java | 7 ++ .../display/packets/PacketSetSlot.java | 7 ++ .../display/packets/PacketWindowItems.java | 7 ++ .../ecoenchants/enchantments/EcoEnchant.java | 2 - .../ecoenchants/normal/Fetching.java | 7 +- .../grindstone/GrindstoneListeners.java | 3 - .../willfp/ecoenchants/util/NumberUtils.java | 2 - 21 files changed, 178 insertions(+), 152 deletions(-) rename Plugin/src/main/java/com/willfp/ecoenchants/config/{YamlConfig.java => AbstractConfig.java} (52%) create mode 100644 Plugin/src/main/java/com/willfp/ecoenchants/config/RootConfig.java diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/command/AbstractCommand.java b/Plugin/src/main/java/com/willfp/ecoenchants/command/AbstractCommand.java index 45cb568d..bbdb49db 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/command/AbstractCommand.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/command/AbstractCommand.java @@ -10,7 +10,7 @@ import java.util.Arrays; import java.util.List; public abstract class AbstractCommand implements CommandExecutor { - private static AbstractCommand instance; + protected static AbstractCommand instance; private final String name; private final String permission; @@ -43,8 +43,4 @@ public abstract class AbstractCommand implements CommandExecutor { } public abstract void onExecute(CommandSender sender, List args); - - public static AbstractCommand getInstance() { - return instance; - } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java b/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java index a3b51669..f0d52e5e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcodebug.java @@ -2,11 +2,8 @@ package com.willfp.ecoenchants.command.commands; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.command.AbstractCommand; -import com.willfp.ecoenchants.config.ConfigManager; import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.bukkit.Bukkit; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.enchantments.Enchantment; import org.bukkit.entity.Player; @@ -40,4 +37,11 @@ public final class CommandEcodebug extends AbstractCommand { Bukkit.getLogger().info("--------------- END DEBUG ----------------"); } + + public static AbstractCommand getInstance() { + if(instance == null) { + instance = new CommandEcodebug(); + } + return instance; + } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcoreload.java b/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcoreload.java index 2abb4e35..a317c413 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcoreload.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcoreload.java @@ -8,10 +8,7 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.EnchantmentRarity; import com.willfp.ecoenchants.enchantments.EnchantmentTarget; import org.bukkit.Bukkit; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; -import org.bukkit.entity.Player; import org.bukkit.event.HandlerList; import java.util.List; @@ -44,4 +41,11 @@ public final class CommandEcoreload extends AbstractCommand { }, 1); })); } + + public static AbstractCommand getInstance() { + if(instance == null) { + instance = new CommandEcoreload(); + } + return instance; + } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcoskip.java b/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcoskip.java index ec9e824c..41f10c20 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcoskip.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEcoskip.java @@ -3,8 +3,6 @@ package com.willfp.ecoenchants.command.commands; import com.willfp.ecoenchants.command.AbstractCommand; import com.willfp.ecoenchants.config.ConfigManager; import com.willfp.ecoenchants.display.EnchantDisplay; -import org.bukkit.command.Command; -import org.bukkit.command.CommandExecutor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; @@ -35,4 +33,11 @@ public final class CommandEcoskip extends AbstractCommand { } item.setItemMeta(meta); } + + public static AbstractCommand getInstance() { + if(instance == null) { + instance = new CommandEcoskip(); + } + return instance; + } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEnchantinfo.java b/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEnchantinfo.java index a82ef07b..60b697ca 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEnchantinfo.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/command/commands/CommandEnchantinfo.java @@ -7,7 +7,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchants; import org.apache.commons.lang.WordUtils; import org.bukkit.ChatColor; import org.bukkit.Material; -import org.bukkit.command.Command; import org.bukkit.command.CommandSender; import org.bukkit.enchantments.Enchantment; @@ -137,4 +136,11 @@ public final class CommandEnchantinfo extends AbstractCommand { sender.sendMessage(string); })); } + + public static AbstractCommand getInstance() { + if(instance == null) { + instance = new CommandEnchantinfo(); + } + return instance; + } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/config/YamlConfig.java b/Plugin/src/main/java/com/willfp/ecoenchants/config/AbstractConfig.java similarity index 52% rename from Plugin/src/main/java/com/willfp/ecoenchants/config/YamlConfig.java rename to Plugin/src/main/java/com/willfp/ecoenchants/config/AbstractConfig.java index 850e1113..31ac032c 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/config/YamlConfig.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/config/AbstractConfig.java @@ -5,41 +5,75 @@ import org.bukkit.Bukkit; import org.bukkit.configuration.InvalidConfigurationException; import org.bukkit.configuration.file.YamlConfiguration; -import java.io.File; -import java.io.FileInputStream; -import java.io.FileOutputStream; -import java.io.IOException; +import java.io.*; import java.time.LocalDateTime; import java.time.format.DateTimeFormatter; -public abstract class YamlConfig { +public abstract class AbstractConfig { + private static AbstractConfig instance; + private final String name; - public YamlConfiguration config; - private File configFile; + private final File directory; + private final double latestVersion; + private final EcoEnchantsPlugin PLUGIN = EcoEnchantsPlugin.getInstance(); + private final Class sourceClass; - public YamlConfig(String name) { + protected final File configFile; + protected final YamlConfiguration config; + + protected AbstractConfig(String name, File directory, Class sourceClass, double latestVersion) { this.name = name; + this.directory = directory; + this.sourceClass = sourceClass; + this.latestVersion = latestVersion; - init(); - } + if(!directory.exists()) directory.mkdirs(); - private void init() { - if (!new File(EcoEnchantsPlugin.getInstance().getDataFolder(), name + ".yml").exists()) { + this.configFile = new File(directory, name + ".yml"); + + if(!this.configFile.exists()) { createFile(); } - this.configFile = new File(EcoEnchantsPlugin.getInstance().getDataFolder(), name + ".yml"); this.config = YamlConfiguration.loadConfiguration(configFile); + instance = this; + checkVersion(); } - private void createFile() { - EcoEnchantsPlugin.getInstance().saveResource(name + ".yml", false); + private void saveResource(boolean replace) { + String resourcePath = configFile.getPath().replace(PLUGIN.getDataFolder().getPath(), ""); + + InputStream in = sourceClass.getResourceAsStream(resourcePath); + + File outFile = new File(PLUGIN.getDataFolder(), resourcePath); + int lastIndex = resourcePath.lastIndexOf('/'); + File outDir = new File(PLUGIN.getDataFolder(), resourcePath.substring(0, Math.max(lastIndex, 0))); + + if (!outDir.exists()) { + outDir.mkdirs(); + } + + try { + if (!outFile.exists() || replace) { + OutputStream out = new FileOutputStream(outFile); + byte[] buf = new byte[1024]; + int len; + while ((len = in.read(buf)) > 0) { + out.write(buf, 0, len); + } + out.close(); + in.close(); + } + } catch (IOException ignored) {} } + private void createFile() { + saveResource(false); + } private void replaceFile() { - EcoEnchantsPlugin.getInstance().saveResource(name + ".yml", true); + saveResource(true); } public void reload() { @@ -52,7 +86,6 @@ public abstract class YamlConfig { } private void checkVersion() { - double latestVersion = ConfigManager.configVersions.get(this.name); if (latestVersion != config.getDouble("config-version")) { Bukkit.getLogger().warning("EcoEnchants detected an older or invalid " + name + ".yml. Replacing it with the default config..."); Bukkit.getLogger().warning("If you've edited the config, copy over your changes!"); @@ -66,11 +99,11 @@ public abstract class YamlConfig { LocalDateTime now = LocalDateTime.now(); String dateTime = dtf.format(now); try { - File backupDir = new File(EcoEnchantsPlugin.getInstance().getDataFolder(), "backup/"); + File backupDir = new File(PLUGIN.getDataFolder(), "backup/"); if(!backupDir.exists()) backupDir.mkdirs(); File oldConf = new File(backupDir, name + "_" + dateTime + ".yml"); oldConf.createNewFile(); - FileInputStream fis = new FileInputStream(EcoEnchantsPlugin.getInstance().getDataFolder() + "/" + name + ".yml"); + FileInputStream fis = new FileInputStream(directory + "/" + name + ".yml"); FileOutputStream fos = new FileOutputStream(oldConf); byte[] buffer = new byte[1024]; int length; @@ -85,4 +118,8 @@ public abstract class YamlConfig { Bukkit.getLogger().severe("§cCould not update config. Try reinstalling EcoEnchants"); } } + + public static AbstractConfig getInstance() { + return instance; + } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/config/RootConfig.java b/Plugin/src/main/java/com/willfp/ecoenchants/config/RootConfig.java new file mode 100644 index 00000000..73086a75 --- /dev/null +++ b/Plugin/src/main/java/com/willfp/ecoenchants/config/RootConfig.java @@ -0,0 +1,52 @@ +package com.willfp.ecoenchants.config; + +import com.willfp.ecoenchants.EcoEnchantsPlugin; +import org.bukkit.inventory.ItemStack; + +import java.util.List; + +public abstract class RootConfig extends AbstractConfig { + protected RootConfig(String name) { + super(name, EcoEnchantsPlugin.getInstance().getDataFolder(), EcoEnchantsPlugin.class, ConfigManager.configVersions.get(name)); + } + + public int getInt(String path) { + return config.getInt(path); + } + + public int getInt(String path, int def) { + return config.getInt(path, def); + } + + public List getInts(String path) { + return config.getIntegerList(path); + } + + public boolean getBool(String path) { + return config.getBoolean(path); + } + + public List getBools(String path) { + return config.getBooleanList(path); + } + + public String getString(String path) { + return config.getString(path); + } + + public List getStrings(String path) { + return config.getStringList(path); + } + + public double getDouble(String path) { + return config.getDouble(path); + } + + public List getDoubles(String path) { + return config.getDoubleList(path); + } + + public ItemStack getItemStack(String path) { + return config.getItemStack(path); + } +} diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Config.java b/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Config.java index 60f6e99b..387597b6 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Config.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Config.java @@ -1,55 +1,12 @@ package com.willfp.ecoenchants.config.configs; -import com.willfp.ecoenchants.config.YamlConfig; -import org.bukkit.inventory.ItemStack; - -import java.util.List; +import com.willfp.ecoenchants.config.RootConfig; /** * Wrapper for config.yml */ -public class Config extends YamlConfig { +public class Config extends RootConfig { public Config() { super("config"); } - - public int getInt(String path) { - return config.getInt(path); - } - - public int getInt(String path, int def) { - return config.getInt(path, def); - } - - public List getInts(String path) { - return config.getIntegerList(path); - } - - public boolean getBool(String path) { - return config.getBoolean(path); - } - - public List getBools(String path) { - return config.getBooleanList(path); - } - - public String getString(String path) { - return config.getString(path); - } - - public List getStrings(String path) { - return config.getStringList(path); - } - - public double getDouble(String path) { - return config.getDouble(path); - } - - public List getDoubles(String path) { - return config.getDoubleList(path); - } - - public ItemStack getItemStack(String path) { - return config.getItemStack(path); - } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Lang.java b/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Lang.java index 64714e5a..a730e3cf 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Lang.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Lang.java @@ -1,26 +1,16 @@ package com.willfp.ecoenchants.config.configs; -import com.willfp.ecoenchants.config.YamlConfig; +import com.willfp.ecoenchants.config.RootConfig; import org.bukkit.ChatColor; -import java.util.List; - /** * Wrapper for lang.yml */ -public class Lang extends YamlConfig { +public class Lang extends RootConfig { public Lang() { super("lang"); } - public String getString(String path) { - return config.getString(path); - } - - public List getStrings(String path) { - return config.getStringList(path); - } - public String getPrefix() { return ChatColor.translateAlternateColorCodes('&', config.getString("messages.prefix")); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Rarity.java b/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Rarity.java index bc2e7f44..239105ba 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Rarity.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Rarity.java @@ -1,14 +1,13 @@ package com.willfp.ecoenchants.config.configs; -import com.willfp.ecoenchants.config.YamlConfig; +import com.willfp.ecoenchants.config.RootConfig; -import java.util.List; import java.util.Set; /** * Wrapper for config.yml */ -public class Rarity extends YamlConfig { +public class Rarity extends RootConfig { public Rarity() { super("rarity"); } @@ -16,40 +15,4 @@ public class Rarity extends YamlConfig { public Set getRarities() { return config.getConfigurationSection("rarities").getKeys(false); } - - public int getInt(String path) { - return config.getInt(path); - } - - public int getInt(String path, int def) { - return config.getInt(path, def); - } - - public List getInts(String path) { - return config.getIntegerList(path); - } - - public boolean getBool(String path) { - return config.getBoolean(path); - } - - public List getBools(String path) { - return config.getBooleanList(path); - } - - public String getString(String path) { - return config.getString(path); - } - - public List getStrings(String path) { - return config.getStringList(path); - } - - public double getDouble(String path) { - return config.getDouble(path); - } - - public List getDoubles(String path) { - return config.getDoubleList(path); - } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Target.java b/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Target.java index d0bc3fad..d2e7a6ce 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Target.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/config/configs/Target.java @@ -1,6 +1,6 @@ package com.willfp.ecoenchants.config.configs; -import com.willfp.ecoenchants.config.YamlConfig; +import com.willfp.ecoenchants.config.RootConfig; import org.bukkit.Material; import java.util.HashSet; @@ -9,7 +9,7 @@ import java.util.Set; /** * Wrapper for config.yml */ -public class Target extends YamlConfig { +public class Target extends RootConfig { public Target() { super("target"); } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/display/AbstractPacketAdapter.java b/Plugin/src/main/java/com/willfp/ecoenchants/display/AbstractPacketAdapter.java index a32ab920..9c3b65e8 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/display/AbstractPacketAdapter.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/display/AbstractPacketAdapter.java @@ -9,7 +9,7 @@ import com.willfp.ecoenchants.EcoEnchantsPlugin; import java.util.Collections; public abstract class AbstractPacketAdapter extends PacketAdapter { - private static AbstractPacketAdapter instance; + protected static AbstractPacketAdapter instance; private final PacketType type; @@ -46,10 +46,6 @@ public abstract class AbstractPacketAdapter extends PacketAdapter { onSend(event.getPacket()); } - public static AbstractPacketAdapter getInstance() { - return instance; - } - public final void register() { if(!EcoEnchantsPlugin.getInstance().protocolManager.getPacketListeners().contains(this)) { EcoEnchantsPlugin.getInstance().protocolManager.addPacketListener(this); diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java b/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java index 5eb0f588..4793a433 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/display/EnchantDisplay.java @@ -18,11 +18,7 @@ import org.bukkit.inventory.meta.EnchantmentStorageMeta; import org.bukkit.inventory.meta.ItemMeta; import org.bukkit.persistence.PersistentDataType; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; /** * All methods and fields pertaining to showing players the enchantments on their items. diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java b/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java index 1be91492..cc0004e7 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketOpenWindowMerchant.java @@ -38,4 +38,11 @@ public final class PacketOpenWindowMerchant extends AbstractPacketAdapter { packet.getMerchantRecipeLists().writeSafely(0, newList); } + + public static AbstractPacketAdapter getInstance() { + if(instance == null) { + instance = new PacketOpenWindowMerchant(); + } + return instance; + } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetCreativeSlot.java b/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetCreativeSlot.java index f029a80c..33d3e48f 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetCreativeSlot.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetCreativeSlot.java @@ -17,4 +17,11 @@ public final class PacketSetCreativeSlot extends AbstractPacketAdapter { return item; }); } + + public static AbstractPacketAdapter getInstance() { + if(instance == null) { + instance = new PacketSetCreativeSlot(); + } + return instance; + } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetSlot.java b/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetSlot.java index 79e89a81..93a420b3 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetSlot.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketSetSlot.java @@ -17,4 +17,11 @@ public final class PacketSetSlot extends AbstractPacketAdapter { return item; }); } + + public static AbstractPacketAdapter getInstance() { + if(instance == null) { + instance = new PacketSetSlot(); + } + return instance; + } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketWindowItems.java b/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketWindowItems.java index 0cc36b5d..e615845e 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketWindowItems.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/display/packets/PacketWindowItems.java @@ -17,4 +17,11 @@ public final class PacketWindowItems extends AbstractPacketAdapter { return itemStacks; }); } + + public static AbstractPacketAdapter getInstance() { + if(instance == null) { + instance = new PacketWindowItems(); + } + return instance; + } } diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java index e049775c..a3dd65d2 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/EcoEnchant.java @@ -2,8 +2,6 @@ package com.willfp.ecoenchants.enchantments; import com.willfp.ecoenchants.config.ConfigManager; import com.willfp.ecoenchants.config.configs.EnchantmentConfig; -import com.willfp.ecoenchants.display.EnchantDisplay; -import com.willfp.ecoenchants.util.NumberUtils; import net.md_5.bungee.api.ChatColor; import org.apache.commons.lang.WordUtils; import org.bukkit.Material; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fetching.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fetching.java index 0f5e515d..94a546ce 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fetching.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Fetching.java @@ -5,13 +5,12 @@ import com.willfp.ecoenchants.enchantments.EcoEnchantBuilder; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.checks.EnchantChecks; import com.willfp.ecoenchants.events.entitydeathbyentity.EntityDeathByEntityEvent; -import com.willfp.ecoenchants.nms.TridentStack; import com.willfp.ecoenchants.queue.DropQueue; -import org.bukkit.Bukkit; -import org.bukkit.entity.*; +import org.bukkit.entity.LivingEntity; +import org.bukkit.entity.Player; +import org.bukkit.entity.Wolf; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; -import org.bukkit.event.entity.EntityDamageByEntityEvent; import org.bukkit.inventory.ItemStack; import java.util.Collection; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/grindstone/GrindstoneListeners.java b/Plugin/src/main/java/com/willfp/ecoenchants/grindstone/GrindstoneListeners.java index 910afb43..a0309ba8 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/grindstone/GrindstoneListeners.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/grindstone/GrindstoneListeners.java @@ -3,9 +3,6 @@ package com.willfp.ecoenchants.grindstone; import com.willfp.ecoenchants.EcoEnchantsPlugin; import org.bukkit.Bukkit; import org.bukkit.enchantments.Enchantment; -import org.bukkit.entity.Entity; -import org.bukkit.entity.EntityType; -import org.bukkit.entity.ExperienceOrb; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/util/NumberUtils.java b/Plugin/src/main/java/com/willfp/ecoenchants/util/NumberUtils.java index bf8beb0b..1696f795 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/util/NumberUtils.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/util/NumberUtils.java @@ -1,7 +1,5 @@ package com.willfp.ecoenchants.util; -import java.util.LinkedHashMap; -import java.util.Map; import java.util.TreeMap; public class NumberUtils {