From b6a3f0faf7621c5224fab1394e9443ff1b80aecc Mon Sep 17 00:00:00 2001 From: Auxilor Date: Sat, 21 Nov 2020 11:50:16 +0000 Subject: [PATCH] Optimised imports --- .../com/willfp/ecoenchants/firewand/Firewand.java | 2 -- .../command/commands/CommandEcodebug.java | 1 - .../display/packets/PacketWindowItems.java | 1 - .../enchantments/ecoenchants/normal/Arcanic.java | 2 +- .../ecoenchants/enchantments/itemtypes/Spell.java | 1 - .../com/willfp/ecoenchants/loader/Loader.java | 15 +++++++++++---- .../com/willfp/ecoenchants/nms/OpenInventory.java | 2 -- Plugin/src/main/resources/target.yml | 6 +++--- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/Firewand.java b/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/Firewand.java index 4e8f2ce1..ebbe0b6e 100644 --- a/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/Firewand.java +++ b/Extensions/Firewand/src/main/java/com/willfp/ecoenchants/firewand/Firewand.java @@ -3,10 +3,8 @@ package com.willfp.ecoenchants.firewand; import com.willfp.ecoenchants.EcoEnchantsPlugin; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.itemtypes.Spell; -import com.willfp.ecoenchants.util.Logger; import org.bukkit.entity.Fireball; import org.bukkit.entity.Player; -import org.bukkit.entity.WitherSkull; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.entity.EntityDamageByEntityEvent; 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 8b4ebc0a..76f6919c 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 @@ -5,7 +5,6 @@ import com.willfp.ecoenchants.command.AbstractCommand; import com.willfp.ecoenchants.display.EnchantmentCache; import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; -import com.willfp.ecoenchants.integrations.placeholder.PlaceholderManager; import com.willfp.ecoenchants.util.Logger; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; 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 8164d3ba..2dbd283c 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 @@ -6,7 +6,6 @@ import com.willfp.ecoenchants.display.AbstractPacketAdapter; import com.willfp.ecoenchants.display.EnchantDisplay; import org.bukkit.inventory.ItemFlag; import org.bukkit.persistence.PersistentDataType; -import org.kingdoms.utils.caffeine.checkerframework.checker.units.qual.Speed; @SuppressWarnings("deprecation") public final class PacketWindowItems extends AbstractPacketAdapter { diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Arcanic.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Arcanic.java index ac4ea6d4..0a00df9d 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Arcanic.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/ecoenchants/normal/Arcanic.java @@ -12,7 +12,7 @@ public final class Arcanic extends EcoEnchant { } // START OF LISTENERS - + @Override public void onDamageWearingArmor(LivingEntity victim, int level, EntityDamageEvent event) { if (!(event.getCause().equals(EntityDamageEvent.DamageCause.POISON) || event.getCause().equals(EntityDamageEvent.DamageCause.WITHER))) diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java index 980102ac..97255de5 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/enchantments/itemtypes/Spell.java @@ -7,7 +7,6 @@ import com.willfp.ecoenchants.enchantments.EcoEnchant; import com.willfp.ecoenchants.enchantments.EcoEnchants; import com.willfp.ecoenchants.enchantments.util.EnchantChecks; import com.willfp.ecoenchants.enchantments.util.SpellRunnable; -import com.willfp.ecoenchants.util.Logger; import com.willfp.ecoenchants.util.optional.Prerequisite; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java b/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java index f2842c61..ad262b7c 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/loader/Loader.java @@ -50,7 +50,11 @@ import com.willfp.ecoenchants.integrations.placeholder.PlaceholderManager; import com.willfp.ecoenchants.integrations.placeholder.plugins.PlaceholderIntegrationPAPI; import com.willfp.ecoenchants.listeners.ArrowListeners; import com.willfp.ecoenchants.listeners.PlayerJoinListener; -import com.willfp.ecoenchants.nms.*; +import com.willfp.ecoenchants.nms.BlockBreak; +import com.willfp.ecoenchants.nms.Cooldown; +import com.willfp.ecoenchants.nms.OpenInventory; +import com.willfp.ecoenchants.nms.RepairCost; +import com.willfp.ecoenchants.nms.TridentStack; import com.willfp.ecoenchants.util.ClassUtils; import com.willfp.ecoenchants.util.Logger; import com.willfp.ecoenchants.util.StringUtils; @@ -64,9 +68,12 @@ import org.bukkit.Bukkit; import org.bukkit.event.HandlerList; import org.bukkit.generator.BlockPopulator; import org.bukkit.plugin.Plugin; -import org.checkerframework.checker.units.qual.A; -import java.util.*; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.HashMap; +import java.util.List; +import java.util.Set; import java.util.stream.Collectors; /** @@ -153,7 +160,7 @@ public class Loader { Logger.error("&cAborting..."); Bukkit.getPluginManager().disablePlugin(EcoEnchantsPlugin.getInstance()); } - + Logger.info(""); /* diff --git a/Plugin/src/main/java/com/willfp/ecoenchants/nms/OpenInventory.java b/Plugin/src/main/java/com/willfp/ecoenchants/nms/OpenInventory.java index aa5f6244..75d43a99 100644 --- a/Plugin/src/main/java/com/willfp/ecoenchants/nms/OpenInventory.java +++ b/Plugin/src/main/java/com/willfp/ecoenchants/nms/OpenInventory.java @@ -1,9 +1,7 @@ package com.willfp.ecoenchants.nms; import com.willfp.ecoenchants.EcoEnchantsPlugin; -import com.willfp.ecoenchants.nms.API.BlockBreakWrapper; import com.willfp.ecoenchants.nms.API.OpenInventoryWrapper; -import org.bukkit.block.Block; import org.bukkit.entity.Player; public class OpenInventory { diff --git a/Plugin/src/main/resources/target.yml b/Plugin/src/main/resources/target.yml index df278306..ed69f575 100644 --- a/Plugin/src/main/resources/target.yml +++ b/Plugin/src/main/resources/target.yml @@ -8,11 +8,11 @@ targets: - golden_axe - diamond_axe - netherite_axe - + book: - book - enchanted_book - + pickaxe: - wooden_pickaxe - stone_pickaxe @@ -20,7 +20,7 @@ targets: - golden_pickaxe - diamond_pickaxe - netherite_pickaxe - + hoe: - wooden_hoe - stone_hoe