diff --git a/buildSrc/src/main/kotlin/com.wolfyscript.wolfyutils.spigot.java-conventions.gradle.kts b/buildSrc/src/main/kotlin/com.wolfyscript.wolfyutils.spigot.java-conventions.gradle.kts index 75ce1050..91b3bf0b 100644 --- a/buildSrc/src/main/kotlin/com.wolfyscript.wolfyutils.spigot.java-conventions.gradle.kts +++ b/buildSrc/src/main/kotlin/com.wolfyscript.wolfyutils.spigot.java-conventions.gradle.kts @@ -19,6 +19,7 @@ repositories { maven(url = "https://repo.extendedclip.com/content/repositories/placeholderapi/") maven(url = "https://libraries.minecraft.net/") maven(url="https://mvn.lumine.io/repository/maven-public/") + maven(url="https://maven.devs.beer/") maven("https://repo.auxilor.io/repository/maven-public/") } diff --git a/core/build.gradle.kts b/core/build.gradle.kts index 7de4b039..3d707db9 100644 --- a/core/build.gradle.kts +++ b/core/build.gradle.kts @@ -11,7 +11,7 @@ dependencies { compileOnly(group = "com.sk89q.worldguard", name = "worldguard-bukkit", version = "7.1.0-SNAPSHOT") compileOnly(group = "com.plotsquared", name = "PlotSquared-Core", version = "6.4.0") compileOnly(group = "com.plotsquared", name = "PlotSquared-Bukkit", version = "6.4.0") - compileOnly(group = "com.gmail.nossr50.mcMMO", name = "mcMMO", version = "2.1.139-SNAPSHOT") + compileOnly(group = "com.gmail.nossr50.mcMMO", name = "mcMMO", version = "2.2.030") compileOnly(libs.guice) compileOnly(libs.reflections) compileOnly(libs.javassist) diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/WolfyUtilsBukkit.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/WolfyUtilsBukkit.java index d306508f..25ff5169 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/WolfyUtilsBukkit.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/WolfyUtilsBukkit.java @@ -1,13 +1,13 @@ package com.wolfyscript.utilities.bukkit; +import com.wolfyscript.utilities.bukkit.chat.ChatImpl; +import com.wolfyscript.utilities.bukkit.language.LangAPISpigot; import com.wolfyscript.utilities.common.WolfyCore; import com.wolfyscript.utilities.common.WolfyUtils; import com.wolfyscript.utilities.common.chat.Chat; -import com.wolfyscript.utilities.bukkit.language.LangAPISpigot; import me.wolfyscript.utilities.api.Permissions; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.api.WolfyUtilities; -import com.wolfyscript.utilities.bukkit.chat.ChatImpl; import me.wolfyscript.utilities.api.config.ConfigAPI; import me.wolfyscript.utilities.api.console.Console; import me.wolfyscript.utilities.api.inventory.BookUtil; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/chat/ChatImpl.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/chat/ChatImpl.java index 6452c07a..ac208b66 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/chat/ChatImpl.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/chat/ChatImpl.java @@ -1,7 +1,7 @@ package com.wolfyscript.utilities.bukkit.chat; -import com.wolfyscript.utilities.common.WolfyUtils; import com.wolfyscript.utilities.bukkit.adapters.PlayerImpl; +import com.wolfyscript.utilities.common.WolfyUtils; import me.wolfyscript.utilities.api.chat.ChatImplOld; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/ChatActionCommand.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/ChatActionCommand.java index fc08ac67..f2aa9e71 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/ChatActionCommand.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/ChatActionCommand.java @@ -1,7 +1,6 @@ package com.wolfyscript.utilities.bukkit.commands; import com.wolfyscript.utilities.bukkit.chat.ChatImpl; -import java.util.UUID; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.api.chat.PlayerAction; import org.bukkit.command.Command; @@ -11,6 +10,8 @@ import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; +import java.util.UUID; + public class ChatActionCommand extends Command implements PluginIdentifiableCommand { private final WolfyUtilCore core; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/InfoCommand.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/InfoCommand.java index d775723a..f41948ba 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/InfoCommand.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/InfoCommand.java @@ -18,7 +18,6 @@ package com.wolfyscript.utilities.bukkit.commands; -import java.util.List; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.api.chat.Chat; import me.wolfyscript.utilities.util.version.ServerVersion; @@ -31,7 +30,6 @@ import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; public class InfoCommand extends Command implements PluginIdentifiableCommand { diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/InputCommand.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/InputCommand.java index 974405b4..ef065c4a 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/InputCommand.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/InputCommand.java @@ -1,7 +1,5 @@ package com.wolfyscript.utilities.bukkit.commands; -import java.util.List; -import java.util.Objects; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.api.WolfyUtilities; import me.wolfyscript.utilities.api.inventory.gui.GuiHandler; @@ -13,6 +11,9 @@ import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; +import java.util.List; +import java.util.Objects; + public final class InputCommand extends Command implements PluginIdentifiableCommand { private final WolfyUtilCore core; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/QueryDebugCommand.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/QueryDebugCommand.java index 17433eaa..4c4d857e 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/QueryDebugCommand.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/QueryDebugCommand.java @@ -3,7 +3,6 @@ import com.wolfyscript.utilities.bukkit.nbt.NBTQuery; import de.tr7zw.nbtapi.NBTCompound; import de.tr7zw.nbtapi.NBTItem; -import java.io.File; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.util.inventory.ItemUtils; import org.bukkit.command.Command; @@ -15,6 +14,8 @@ import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.NotNull; +import java.io.File; + public final class QueryDebugCommand extends Command implements PluginIdentifiableCommand { private final WolfyUtilCore core; @@ -43,7 +44,7 @@ public boolean execute(@NotNull CommandSender sender, @NotNull String commandLab NBTItem nbtItem = new NBTItem(stack); NBTCompound result = nbtQuery.run(nbtItem); - System.out.println(result.toString()); + /*System.out.println(result.toString());*/ if (args.length > 0) { if (args[0].equalsIgnoreCase("true")) { ItemStack stackToMergeIn = player.getEquipment().getItem(EquipmentSlot.OFF_HAND); diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/SpawnParticleAnimationCommand.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/SpawnParticleAnimationCommand.java index 54435f41..342c5c2a 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/SpawnParticleAnimationCommand.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/SpawnParticleAnimationCommand.java @@ -1,10 +1,5 @@ package com.wolfyscript.utilities.bukkit.commands; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; -import java.util.UUID; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.api.chat.Chat; import me.wolfyscript.utilities.util.NamespacedKey; @@ -29,6 +24,8 @@ import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; +import java.util.*; + public final class SpawnParticleAnimationCommand extends Command implements PluginIdentifiableCommand { private final List COMMANDS = Arrays.asList("spawn", "stop"); diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/SpawnParticleEffectCommand.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/SpawnParticleEffectCommand.java index 16ecfe59..bec96286 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/SpawnParticleEffectCommand.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/commands/SpawnParticleEffectCommand.java @@ -1,9 +1,5 @@ package com.wolfyscript.utilities.bukkit.commands; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.List; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.api.chat.Chat; import me.wolfyscript.utilities.util.NamespacedKey; @@ -19,6 +15,11 @@ import org.bukkit.util.StringUtil; import org.jetbrains.annotations.NotNull; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.List; + public final class SpawnParticleEffectCommand extends Command implements PluginIdentifiableCommand { private final List COMMANDS = Arrays.asList("spawn", "stop"); diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/dependency/PluginIntegrationDependencyResolverSettings.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/dependency/PluginIntegrationDependencyResolverSettings.java index 68879782..a293000a 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/dependency/PluginIntegrationDependencyResolverSettings.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/dependency/PluginIntegrationDependencyResolverSettings.java @@ -1,9 +1,11 @@ package com.wolfyscript.utilities.bukkit.dependency; -import com.wolfyscript.utilities.dependency.DependencyResolverSettings; import me.wolfyscript.utilities.compatibility.PluginIntegration; -import java.lang.annotation.*; +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; @Retention(RetentionPolicy.RUNTIME) @Target(ElementType.TYPE) diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageBreakEvent.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageBreakEvent.java index 5dcb0d86..c3120719 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageBreakEvent.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageBreakEvent.java @@ -6,7 +6,6 @@ import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import org.bukkit.event.block.BlockBreakEvent; import org.jetbrains.annotations.NotNull; public class BlockStorageBreakEvent extends Event implements BlockStorageEvent, Cancellable { diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageDropItemsEvent.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageDropItemsEvent.java index 8aef35f4..a2808ad8 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageDropItemsEvent.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageDropItemsEvent.java @@ -1,8 +1,6 @@ package com.wolfyscript.utilities.bukkit.events.persistent; import com.wolfyscript.utilities.bukkit.persistent.world.BlockStorage; -import java.util.List; -import java.util.Optional; import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.entity.Item; @@ -13,6 +11,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.List; +import java.util.Optional; + public class BlockStorageDropItemsEvent extends Event implements BlockStorageEvent, Cancellable { private static final HandlerList handlers = new HandlerList(); diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageMoveEvent.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageMoveEvent.java index 68e73bae..7979b038 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageMoveEvent.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageMoveEvent.java @@ -1,12 +1,13 @@ package com.wolfyscript.utilities.bukkit.events.persistent; import com.wolfyscript.utilities.bukkit.persistent.world.BlockStorage; -import java.util.Optional; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Optional; + public class BlockStorageMoveEvent extends Event implements BlockStorageEvent { private static final HandlerList handlers = new HandlerList(); diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageMultiPlaceEvent.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageMultiPlaceEvent.java index 035d935f..53f4d46b 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageMultiPlaceEvent.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStorageMultiPlaceEvent.java @@ -2,15 +2,15 @@ import com.google.common.collect.ImmutableList; import com.wolfyscript.utilities.bukkit.persistent.world.BlockStorage; -import java.util.List; import org.bukkit.block.Block; import org.bukkit.block.BlockState; import org.bukkit.entity.Player; -import org.bukkit.event.block.BlockMultiPlaceEvent; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; +import java.util.List; + public class BlockStorageMultiPlaceEvent extends BlockStoragePlaceEvent implements BlockStorageEvent { private final List states; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStoragePlaceEvent.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStoragePlaceEvent.java index db0ec038..4b596d79 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStoragePlaceEvent.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/events/persistent/BlockStoragePlaceEvent.java @@ -7,7 +7,6 @@ import org.bukkit.event.Cancellable; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.inventory.EquipmentSlot; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/gui/GUIInventoryHolder.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/gui/GUIInventoryHolder.java index cccfa76d..047eb71e 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/gui/GUIInventoryHolder.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/gui/GUIInventoryHolder.java @@ -1,6 +1,5 @@ package com.wolfyscript.utilities.bukkit.gui; -import com.google.common.base.Preconditions; import me.wolfyscript.utilities.api.inventory.gui.GuiHandler; import me.wolfyscript.utilities.api.inventory.gui.GuiWindow; import me.wolfyscript.utilities.api.inventory.gui.cache.CustomCache; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/items/CustomBlockSettings.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/items/CustomBlockSettings.java index b7601c85..3d633bba 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/items/CustomBlockSettings.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/items/CustomBlockSettings.java @@ -1,6 +1,7 @@ package com.wolfyscript.utilities.bukkit.items; import com.wolfyscript.utilities.Copyable; + import java.util.Objects; public class CustomBlockSettings implements Copyable { diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/items/CustomItemBlockData.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/items/CustomItemBlockData.java index bd042c3c..de067e6f 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/items/CustomItemBlockData.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/items/CustomItemBlockData.java @@ -9,8 +9,6 @@ import com.wolfyscript.utilities.bukkit.persistent.world.BlockStorage; import com.wolfyscript.utilities.bukkit.persistent.world.ChunkStorage; import com.wolfyscript.utilities.bukkit.persistent.world.CustomBlockData; -import java.util.Optional; -import java.util.UUID; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.api.inventory.custom_items.CustomItem; import me.wolfyscript.utilities.util.NamespacedKey; @@ -18,11 +16,12 @@ import me.wolfyscript.utilities.util.particles.ParticleLocation; import me.wolfyscript.utilities.util.particles.ParticleUtils; import org.bukkit.Bukkit; -import org.bukkit.event.block.BlockBreakEvent; -import org.bukkit.event.block.BlockPlaceEvent; import org.bukkit.util.Vector; import org.jetbrains.annotations.Nullable; +import java.util.Optional; +import java.util.UUID; + public class CustomItemBlockData extends CustomBlockData { public static final NamespacedKey ID = new NamespacedKey(NamespacedKey.WOLFYUTILITIES, "custom_item"); diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/language/LangAPISpigot.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/language/LangAPISpigot.java index c3db2e3c..27aae335 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/language/LangAPISpigot.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/language/LangAPISpigot.java @@ -8,17 +8,12 @@ import me.wolfyscript.utilities.api.language.LanguageAPI; import me.wolfyscript.utilities.util.NamespacedKey; import me.wolfyscript.utilities.util.chat.ChatColor; -import me.wolfyscript.utilities.util.json.jackson.JacksonUtil; import net.kyori.adventure.platform.bukkit.BukkitComponentSerializer; import org.jetbrains.annotations.NotNull; import java.io.File; import java.io.IOException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.logging.Level; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/listeners/PersistentStorageListener.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/listeners/PersistentStorageListener.java index 9eaff577..e7c0a661 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/listeners/PersistentStorageListener.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/listeners/PersistentStorageListener.java @@ -27,10 +27,12 @@ import org.bukkit.event.world.ChunkLoadEvent; import org.bukkit.event.world.ChunkUnloadEvent; import org.bukkit.event.world.WorldSaveEvent; -import org.bukkit.inventory.ItemStack; import org.bukkit.metadata.FixedMetadataValue; -import java.util.*; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Objects; public class PersistentStorageListener implements Listener { diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/listeners/custom_item/CustomItemDataListener.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/listeners/custom_item/CustomItemDataListener.java index cc572cf3..827ebbab 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/listeners/custom_item/CustomItemDataListener.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/listeners/custom_item/CustomItemDataListener.java @@ -1,7 +1,7 @@ package com.wolfyscript.utilities.bukkit.listeners.custom_item; -import com.wolfyscript.utilities.bukkit.events.persistent.BlockStorageDropItemsEvent; import com.wolfyscript.utilities.bukkit.events.persistent.BlockStorageBreakEvent; +import com.wolfyscript.utilities.bukkit.events.persistent.BlockStorageDropItemsEvent; import com.wolfyscript.utilities.bukkit.events.persistent.BlockStorageMultiPlaceEvent; import com.wolfyscript.utilities.bukkit.events.persistent.BlockStoragePlaceEvent; import com.wolfyscript.utilities.bukkit.items.CustomItemBlockData; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/listeners/custom_item/CustomItemPlayerListener.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/listeners/custom_item/CustomItemPlayerListener.java index ad017949..66870dc1 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/listeners/custom_item/CustomItemPlayerListener.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/listeners/custom_item/CustomItemPlayerListener.java @@ -20,29 +20,12 @@ import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.api.inventory.custom_items.CustomItem; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataPlayerEvent; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerConsumeItem; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerInteract; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerInteractAtEntity; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerInteractEntity; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerItemBreak; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerItemDamage; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerItemDrop; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerItemHandSwap; +import me.wolfyscript.utilities.api.inventory.custom_items.actions.*; import me.wolfyscript.utilities.registry.RegistryCustomItem; import me.wolfyscript.utilities.util.NamespacedKey; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; -import org.bukkit.event.player.PlayerDropItemEvent; -import org.bukkit.event.player.PlayerEvent; -import org.bukkit.event.player.PlayerInteractAtEntityEvent; -import org.bukkit.event.player.PlayerInteractEntityEvent; -import org.bukkit.event.player.PlayerInteractEvent; -import org.bukkit.event.player.PlayerItemBreakEvent; -import org.bukkit.event.player.PlayerItemConsumeEvent; -import org.bukkit.event.player.PlayerItemDamageEvent; -import org.bukkit.event.player.PlayerItemHeldEvent; -import org.bukkit.event.player.PlayerSwapHandItemsEvent; +import org.bukkit.event.player.*; public class CustomItemPlayerListener implements Listener { diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNode.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNode.java index 3ece9aa5..bd48eed1 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNode.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNode.java @@ -22,23 +22,18 @@ package com.wolfyscript.utilities.bukkit.nbt; -import com.fasterxml.jackson.databind.InjectableValues; -import com.fasterxml.jackson.databind.node.ObjectNode; -import de.tr7zw.nbtapi.NBTCompound; -import de.tr7zw.nbtapi.NBTList; -import de.tr7zw.nbtapi.NBTType; -import com.fasterxml.jackson.annotation.JacksonInject; -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.JsonGetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; +import com.fasterxml.jackson.databind.InjectableValues; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver; import com.fasterxml.jackson.databind.annotation.JsonTypeResolver; +import com.fasterxml.jackson.databind.node.ObjectNode; +import de.tr7zw.nbtapi.NBTCompound; +import de.tr7zw.nbtapi.NBTList; +import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.util.Keyed; import me.wolfyscript.utilities.util.NamespacedKey; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeCompound.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeCompound.java index 46bed2e7..840f1fce 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeCompound.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeCompound.java @@ -22,21 +22,13 @@ package com.wolfyscript.utilities.bukkit.nbt; -import com.fasterxml.jackson.annotation.JacksonInject; -import com.fasterxml.jackson.annotation.JsonAnySetter; -import com.fasterxml.jackson.annotation.JsonGetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.JsonNode; import de.tr7zw.nbtapi.NBTCompound; import de.tr7zw.nbtapi.NBTType; import me.wolfyscript.utilities.util.NamespacedKey; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import java.util.Optional; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; public class QueryNodeCompound extends QueryNode { diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeList.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeList.java index b84ba550..a3535dd7 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeList.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nbt/QueryNodeList.java @@ -22,12 +22,7 @@ package com.wolfyscript.utilities.bukkit.nbt; -import com.fasterxml.jackson.annotation.JacksonInject; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonGetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.*; import de.tr7zw.nbtapi.NBTCompound; import de.tr7zw.nbtapi.NBTList; import de.tr7zw.nbtapi.NBTType; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/fallback/FallbackInventoryUtilImpl.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/fallback/FallbackInventoryUtilImpl.java index 74be3636..8e70cfa7 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/fallback/FallbackInventoryUtilImpl.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/fallback/FallbackInventoryUtilImpl.java @@ -3,8 +3,6 @@ import me.wolfyscript.utilities.api.nms.InventoryUtil; import me.wolfyscript.utilities.api.nms.NMSUtil; import me.wolfyscript.utilities.util.inventory.CreativeModeTab; -import me.wolfyscript.utilities.util.version.ServerVersion; -import org.apache.commons.lang3.NotImplementedException; import org.bukkit.Material; public class FallbackInventoryUtilImpl extends InventoryUtil { diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/FunctionalRecipeBuilderCooking.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/FunctionalRecipeBuilderCooking.java index 385ce8c9..4664d02b 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/FunctionalRecipeBuilderCooking.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/FunctionalRecipeBuilderCooking.java @@ -1,9 +1,6 @@ package com.wolfyscript.utilities.bukkit.nms.item.crafting; import com.google.common.base.Preconditions; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.Optional; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.util.NamespacedKey; import me.wolfyscript.utilities.util.version.MinecraftVersion; @@ -12,6 +9,10 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.RecipeChoice; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.Optional; + public abstract class FunctionalRecipeBuilderCooking extends FunctionalRecipeBuilder { private final ItemStack result; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/FunctionalRecipeBuilderCrafting.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/FunctionalRecipeBuilderCrafting.java index b00cb5c1..aea35375 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/FunctionalRecipeBuilderCrafting.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/FunctionalRecipeBuilderCrafting.java @@ -1,10 +1,11 @@ package com.wolfyscript.utilities.bukkit.nms.item.crafting; -import java.util.Optional; import me.wolfyscript.utilities.util.NamespacedKey; import org.bukkit.inventory.CraftingInventory; import org.bukkit.inventory.ItemStack; +import java.util.Optional; + public abstract class FunctionalRecipeBuilderCrafting extends FunctionalRecipeBuilder { protected ItemStack result; diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/FunctionalRecipeBuilderShaped.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/FunctionalRecipeBuilderShaped.java index 27c82fd8..f43ab498 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/FunctionalRecipeBuilderShaped.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/FunctionalRecipeBuilderShaped.java @@ -1,9 +1,5 @@ package com.wolfyscript.utilities.bukkit.nms.item.crafting; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.util.NamespacedKey; import me.wolfyscript.utilities.util.version.MinecraftVersion; @@ -12,6 +8,11 @@ import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.RecipeChoice; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; + public class FunctionalRecipeBuilderShaped extends FunctionalRecipeBuilderCrafting { private List choices = new ArrayList<>(); diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/FunctionalRecipeBuilderShapeless.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/FunctionalRecipeBuilderShapeless.java index dfdf3fb2..06c97ea6 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/FunctionalRecipeBuilderShapeless.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/FunctionalRecipeBuilderShapeless.java @@ -1,15 +1,16 @@ package com.wolfyscript.utilities.bukkit.nms.item.crafting; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.ArrayList; -import java.util.List; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.util.NamespacedKey; import org.bukkit.inventory.CraftingInventory; import org.bukkit.inventory.ItemStack; import org.bukkit.inventory.RecipeChoice; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.ArrayList; +import java.util.List; + public class FunctionalRecipeBuilderShapeless extends FunctionalRecipeBuilderCrafting { private List choices = new ArrayList<>(); diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/RecipeAssembler.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/RecipeAssembler.java index 7e71004c..e9af0d7f 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/RecipeAssembler.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/RecipeAssembler.java @@ -1,9 +1,10 @@ package com.wolfyscript.utilities.bukkit.nms.item.crafting; -import java.util.Optional; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; +import java.util.Optional; + @FunctionalInterface public interface RecipeAssembler { diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/RecipeRemainingItemsFunction.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/RecipeRemainingItemsFunction.java index fa9480bd..66c5ac00 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/RecipeRemainingItemsFunction.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/nms/item/crafting/RecipeRemainingItemsFunction.java @@ -1,10 +1,11 @@ package com.wolfyscript.utilities.bukkit.nms.item.crafting; -import java.util.List; -import java.util.Optional; import org.bukkit.inventory.Inventory; import org.bukkit.inventory.ItemStack; +import java.util.List; +import java.util.Optional; + @FunctionalInterface public interface RecipeRemainingItemsFunction { diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/PersistentStorage.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/PersistentStorage.java index 2e533d2d..90c2bee8 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/PersistentStorage.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/PersistentStorage.java @@ -5,12 +5,12 @@ import com.wolfyscript.utilities.bukkit.persistent.world.WorldStorage; import me.wolfyscript.utilities.api.WolfyUtilCore; import org.bukkit.World; +import org.bukkit.entity.Player; +import org.jetbrains.annotations.NotNull; import java.util.HashMap; import java.util.Map; import java.util.UUID; -import org.bukkit.entity.Player; -import org.jetbrains.annotations.NotNull; /** * The PersistentStorage API allows plugins to store custom complex data into block/chunks and players.
diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/player/CustomPlayerData.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/player/CustomPlayerData.java index 80c4880e..318ba8d4 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/player/CustomPlayerData.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/player/CustomPlayerData.java @@ -6,8 +6,6 @@ import com.fasterxml.jackson.annotation.JsonTypeInfo; import com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver; import com.fasterxml.jackson.databind.annotation.JsonTypeResolver; -import java.util.Optional; -import java.util.UUID; import me.wolfyscript.utilities.registry.Registries; import me.wolfyscript.utilities.util.Keyed; import me.wolfyscript.utilities.util.NamespacedKey; @@ -16,6 +14,9 @@ import org.bukkit.Bukkit; import org.bukkit.entity.Player; +import java.util.Optional; +import java.util.UUID; + /** * Custom Data that can be applied to Players and persists across server restarts.
*
diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/player/PlayerParticleEffectData.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/player/PlayerParticleEffectData.java index 46361082..80bd66a2 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/player/PlayerParticleEffectData.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/player/PlayerParticleEffectData.java @@ -2,13 +2,14 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import com.wolfyscript.utilities.KeyedStaticId; -import java.util.EnumMap; -import java.util.Map; -import java.util.UUID; import me.wolfyscript.utilities.util.NamespacedKey; import me.wolfyscript.utilities.util.particles.ParticleUtils; import org.bukkit.inventory.EquipmentSlot; +import java.util.EnumMap; +import java.util.Map; +import java.util.UUID; + @KeyedStaticId(value = "wolfyutilities:particles/effects") public class PlayerParticleEffectData extends CustomPlayerData { diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/player/PlayerStorage.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/player/PlayerStorage.java index 4aa3f241..07d7b402 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/player/PlayerStorage.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/player/PlayerStorage.java @@ -3,11 +3,6 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.InjectableValues; import com.wolfyscript.utilities.bukkit.WolfyCoreBukkit; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; -import java.util.UUID; -import java.util.function.Function; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.registry.Registries; import me.wolfyscript.utilities.util.NamespacedKey; @@ -17,6 +12,12 @@ import org.bukkit.persistence.PersistentDataHolder; import org.bukkit.persistence.PersistentDataType; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.UUID; +import java.util.function.Function; + /** * This class stores data for player entities.
* If the player is offline, then the stored data is inaccessible.
diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/world/BlockStorage.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/world/BlockStorage.java index f0e903ee..362fa6ea 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/world/BlockStorage.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/world/BlockStorage.java @@ -2,19 +2,19 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.InjectableValues; -import java.util.Collection; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.util.NamespacedKey; -import me.wolfyscript.utilities.util.json.jackson.JacksonUtil; import org.bukkit.persistence.PersistentDataAdapterContext; import org.bukkit.persistence.PersistentDataContainer; import org.bukkit.persistence.PersistentDataType; import org.bukkit.util.Vector; import org.jetbrains.annotations.NotNull; +import java.util.Collection; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; + public class BlockStorage { private static final org.bukkit.NamespacedKey DATA_KEY = new org.bukkit.NamespacedKey("wolfyutils", "data"); diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/world/ChunkStorage.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/world/ChunkStorage.java index f2745170..46b07f15 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/world/ChunkStorage.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/world/ChunkStorage.java @@ -2,10 +2,6 @@ import com.fasterxml.jackson.annotation.JsonIncludeProperties; import com.wolfyscript.utilities.math.Vec2i; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; -import java.util.stream.Collectors; import me.wolfyscript.utilities.api.WolfyUtilCore; import org.bukkit.Chunk; import org.bukkit.Location; @@ -14,6 +10,11 @@ import org.bukkit.persistence.PersistentDataType; import org.bukkit.util.Vector; +import java.util.HashMap; +import java.util.Map; +import java.util.Optional; +import java.util.stream.Collectors; + @JsonIncludeProperties public class ChunkStorage { diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/world/WorldStorage.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/world/WorldStorage.java index 339a4cf9..026398ba 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/world/WorldStorage.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/persistent/world/WorldStorage.java @@ -7,12 +7,12 @@ import org.bukkit.World; import org.bukkit.persistence.PersistentDataContainer; import org.bukkit.persistence.PersistentDataHolder; +import org.bukkit.util.Vector; import java.util.HashMap; import java.util.Map; import java.util.Optional; import java.util.UUID; -import org.bukkit.util.Vector; public class WorldStorage { diff --git a/core/src/main/java/com/wolfyscript/utilities/bukkit/registry/RegistryStackIdentifierParsers.java b/core/src/main/java/com/wolfyscript/utilities/bukkit/registry/RegistryStackIdentifierParsers.java index 6f9466ff..ee43e7ec 100644 --- a/core/src/main/java/com/wolfyscript/utilities/bukkit/registry/RegistryStackIdentifierParsers.java +++ b/core/src/main/java/com/wolfyscript/utilities/bukkit/registry/RegistryStackIdentifierParsers.java @@ -10,7 +10,10 @@ import me.wolfyscript.utilities.util.NamespacedKey; import org.bukkit.inventory.ItemStack; -import java.util.*; +import java.util.List; +import java.util.Map; +import java.util.Objects; +import java.util.Optional; public class RegistryStackIdentifierParsers extends RegistrySimple> { diff --git a/core/src/main/java/com/wolfyscript/utilities/paper/WolfyCorePaper.java b/core/src/main/java/com/wolfyscript/utilities/paper/WolfyCorePaper.java index 26e18d2b..d3ff7f90 100644 --- a/core/src/main/java/com/wolfyscript/utilities/paper/WolfyCorePaper.java +++ b/core/src/main/java/com/wolfyscript/utilities/paper/WolfyCorePaper.java @@ -3,7 +3,6 @@ import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.compatibility.CompatibilityManager; import me.wolfyscript.utilities.compatibility.CompatibilityManagerBukkit; -import net.kyori.adventure.Adventure; import net.kyori.adventure.platform.bukkit.BukkitAudiences; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.format.NamedTextColor; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/Permissions.java b/core/src/main/java/me/wolfyscript/utilities/api/Permissions.java index 84fb511f..1aa32008 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/Permissions.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/Permissions.java @@ -23,8 +23,6 @@ import org.bukkit.command.CommandSender; import org.bukkit.permissions.Permission; -import java.util.Locale; - public class Permissions { private final WolfyUtils wolfyUtilities; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/WolfyUtilCore.java b/core/src/main/java/me/wolfyscript/utilities/api/WolfyUtilCore.java index 0709d7ca..b4713654 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/WolfyUtilCore.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/WolfyUtilCore.java @@ -5,6 +5,7 @@ import com.wolfyscript.jackson.dataformat.hocon.HoconMapper; import com.wolfyscript.utilities.bukkit.WolfyUtilsBukkit; import com.wolfyscript.utilities.bukkit.chat.ChatImpl; +import com.wolfyscript.utilities.bukkit.commands.*; import com.wolfyscript.utilities.bukkit.items.CustomItemBlockData; import com.wolfyscript.utilities.bukkit.items.CustomItemData; import com.wolfyscript.utilities.bukkit.listeners.EquipListener; @@ -15,24 +16,7 @@ import com.wolfyscript.utilities.bukkit.listeners.custom_item.CustomItemDataListener; import com.wolfyscript.utilities.bukkit.listeners.custom_item.CustomItemPlayerListener; import com.wolfyscript.utilities.bukkit.listeners.custom_item.CustomParticleListener; -import com.wolfyscript.utilities.bukkit.nbt.QueryNode; -import com.wolfyscript.utilities.bukkit.nbt.QueryNodeBoolean; -import com.wolfyscript.utilities.bukkit.nbt.QueryNodeByte; -import com.wolfyscript.utilities.bukkit.nbt.QueryNodeByteArray; -import com.wolfyscript.utilities.bukkit.nbt.QueryNodeCompound; -import com.wolfyscript.utilities.bukkit.nbt.QueryNodeDouble; -import com.wolfyscript.utilities.bukkit.nbt.QueryNodeFloat; -import com.wolfyscript.utilities.bukkit.nbt.QueryNodeInt; -import com.wolfyscript.utilities.bukkit.nbt.QueryNodeIntArray; -import com.wolfyscript.utilities.bukkit.nbt.QueryNodeListCompound; -import com.wolfyscript.utilities.bukkit.nbt.QueryNodeListDouble; -import com.wolfyscript.utilities.bukkit.nbt.QueryNodeListFloat; -import com.wolfyscript.utilities.bukkit.nbt.QueryNodeListInt; -import com.wolfyscript.utilities.bukkit.nbt.QueryNodeListLong; -import com.wolfyscript.utilities.bukkit.nbt.QueryNodeListString; -import com.wolfyscript.utilities.bukkit.nbt.QueryNodeLong; -import com.wolfyscript.utilities.bukkit.nbt.QueryNodeShort; -import com.wolfyscript.utilities.bukkit.nbt.QueryNodeString; +import com.wolfyscript.utilities.bukkit.nbt.*; import com.wolfyscript.utilities.bukkit.nms.item.crafting.FunctionalRecipeGenerator; import com.wolfyscript.utilities.bukkit.persistent.PersistentStorage; import com.wolfyscript.utilities.bukkit.persistent.player.CustomPlayerData; @@ -42,47 +26,11 @@ import com.wolfyscript.utilities.bukkit.world.items.reference.StackIdentifier; import com.wolfyscript.utilities.bukkit.world.items.reference.WolfyUtilsStackIdentifier; import com.wolfyscript.utilities.common.WolfyCore; -import com.wolfyscript.utilities.bukkit.commands.ChatActionCommand; -import com.wolfyscript.utilities.bukkit.commands.InfoCommand; -import com.wolfyscript.utilities.bukkit.commands.InputCommand; -import com.wolfyscript.utilities.bukkit.commands.QueryDebugCommand; -import com.wolfyscript.utilities.bukkit.commands.SpawnParticleAnimationCommand; -import com.wolfyscript.utilities.bukkit.commands.SpawnParticleEffectCommand; -import java.lang.reflect.Field; -import java.util.ArrayList; -import java.util.logging.Level; import me.wolfyscript.utilities.api.console.Console; import me.wolfyscript.utilities.api.inventory.custom_items.CustomData; import me.wolfyscript.utilities.api.inventory.custom_items.CustomItem; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.Action; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.ActionCommand; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.ActionParticleAnimation; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.ActionSound; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.Event; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerConsumeItem; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerInteract; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerInteractAtEntity; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerInteractEntity; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerItemBreak; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerItemDamage; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerItemDrop; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerItemHandSwap; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerItemHeld; -import me.wolfyscript.utilities.api.inventory.custom_items.meta.AttributesModifiersMeta; -import me.wolfyscript.utilities.api.inventory.custom_items.meta.CustomDamageMeta; -import me.wolfyscript.utilities.api.inventory.custom_items.meta.CustomDurabilityMeta; -import me.wolfyscript.utilities.api.inventory.custom_items.meta.CustomItemTagMeta; -import me.wolfyscript.utilities.api.inventory.custom_items.meta.CustomModelDataMeta; -import me.wolfyscript.utilities.api.inventory.custom_items.meta.DamageMeta; -import me.wolfyscript.utilities.api.inventory.custom_items.meta.EnchantMeta; -import me.wolfyscript.utilities.api.inventory.custom_items.meta.FlagsMeta; -import me.wolfyscript.utilities.api.inventory.custom_items.meta.LoreMeta; -import me.wolfyscript.utilities.api.inventory.custom_items.meta.Meta; -import me.wolfyscript.utilities.api.inventory.custom_items.meta.NameMeta; -import me.wolfyscript.utilities.api.inventory.custom_items.meta.PlayerHeadMeta; -import me.wolfyscript.utilities.api.inventory.custom_items.meta.PotionMeta; -import me.wolfyscript.utilities.api.inventory.custom_items.meta.RepairCostMeta; -import me.wolfyscript.utilities.api.inventory.custom_items.meta.UnbreakableMeta; +import me.wolfyscript.utilities.api.inventory.custom_items.actions.*; +import me.wolfyscript.utilities.api.inventory.custom_items.meta.*; import me.wolfyscript.utilities.api.inventory.custom_items.references.APIReference; import me.wolfyscript.utilities.api.inventory.custom_items.references.VanillaRef; import me.wolfyscript.utilities.api.inventory.custom_items.references.WolfyUtilitiesRef; @@ -93,25 +41,8 @@ import me.wolfyscript.utilities.messages.MessageFactory; import me.wolfyscript.utilities.messages.MessageHandler; import me.wolfyscript.utilities.registry.Registries; -import me.wolfyscript.utilities.util.eval.operators.BoolOperatorConst; -import me.wolfyscript.utilities.util.eval.operators.ComparisonOperatorEqual; -import me.wolfyscript.utilities.util.eval.operators.ComparisonOperatorGreater; -import me.wolfyscript.utilities.util.eval.operators.ComparisonOperatorGreaterEqual; -import me.wolfyscript.utilities.util.eval.operators.ComparisonOperatorLess; -import me.wolfyscript.utilities.util.eval.operators.ComparisonOperatorLessEqual; -import me.wolfyscript.utilities.util.eval.operators.ComparisonOperatorNotEqual; -import me.wolfyscript.utilities.util.eval.operators.LogicalOperatorAnd; -import me.wolfyscript.utilities.util.eval.operators.LogicalOperatorNot; -import me.wolfyscript.utilities.util.eval.operators.LogicalOperatorOr; -import me.wolfyscript.utilities.util.eval.operators.Operator; -import me.wolfyscript.utilities.util.eval.value_providers.ValueProvider; -import me.wolfyscript.utilities.util.eval.value_providers.ValueProviderConditioned; -import me.wolfyscript.utilities.util.eval.value_providers.ValueProviderFloatConst; -import me.wolfyscript.utilities.util.eval.value_providers.ValueProviderFloatVar; -import me.wolfyscript.utilities.util.eval.value_providers.ValueProviderIntegerConst; -import me.wolfyscript.utilities.util.eval.value_providers.ValueProviderIntegerVar; -import me.wolfyscript.utilities.util.eval.value_providers.ValueProviderStringConst; -import me.wolfyscript.utilities.util.eval.value_providers.ValueProviderStringVar; +import me.wolfyscript.utilities.util.eval.operators.*; +import me.wolfyscript.utilities.util.eval.value_providers.*; import me.wolfyscript.utilities.util.inventory.CreativeModeTab; import me.wolfyscript.utilities.util.json.jackson.JacksonUtil; import me.wolfyscript.utilities.util.json.jackson.KeyedTypeIdResolver; @@ -119,20 +50,8 @@ import me.wolfyscript.utilities.util.json.jackson.annotations.OptionalValueDeserializer; import me.wolfyscript.utilities.util.json.jackson.annotations.OptionalValueSerializer; import me.wolfyscript.utilities.util.json.jackson.serialization.*; -import me.wolfyscript.utilities.util.particles.animators.Animator; -import me.wolfyscript.utilities.util.particles.animators.AnimatorBasic; -import me.wolfyscript.utilities.util.particles.animators.AnimatorCircle; -import me.wolfyscript.utilities.util.particles.animators.AnimatorShape; -import me.wolfyscript.utilities.util.particles.animators.AnimatorSphere; -import me.wolfyscript.utilities.util.particles.animators.AnimatorVectorPath; -import me.wolfyscript.utilities.util.particles.shapes.Shape; -import me.wolfyscript.utilities.util.particles.shapes.ShapeCircle; -import me.wolfyscript.utilities.util.particles.shapes.ShapeComplexCompound; -import me.wolfyscript.utilities.util.particles.shapes.ShapeComplexRotation; -import me.wolfyscript.utilities.util.particles.shapes.ShapeCube; -import me.wolfyscript.utilities.util.particles.shapes.ShapeIcosahedron; -import me.wolfyscript.utilities.util.particles.shapes.ShapeSphere; -import me.wolfyscript.utilities.util.particles.shapes.ShapeSquare; +import me.wolfyscript.utilities.util.particles.animators.*; +import me.wolfyscript.utilities.util.particles.shapes.*; import me.wolfyscript.utilities.util.particles.timer.Timer; import me.wolfyscript.utilities.util.particles.timer.TimerLinear; import me.wolfyscript.utilities.util.particles.timer.TimerPi; @@ -151,9 +70,12 @@ import org.reflections.scanners.Scanners; import org.reflections.util.ConfigurationBuilder; +import java.lang.reflect.Field; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.logging.Level; /** * This abstract class is the actual core of the plugin (This class is being extended by the plugin instance).
diff --git a/core/src/main/java/me/wolfyscript/utilities/api/chat/Chat.java b/core/src/main/java/me/wolfyscript/utilities/api/chat/Chat.java index 7a8e804a..f72b5f4c 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/chat/Chat.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/chat/Chat.java @@ -19,14 +19,12 @@ package me.wolfyscript.utilities.api.chat; import com.wolfyscript.utilities.common.WolfyUtils; -import me.wolfyscript.utilities.api.WolfyUtilities; import me.wolfyscript.utilities.api.inventory.gui.GuiCluster; import me.wolfyscript.utilities.api.inventory.gui.GuiWindow; import me.wolfyscript.utilities.util.NamespacedKey; import me.wolfyscript.utilities.util.Pair; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.event.ClickEvent; -import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import net.md_5.bungee.api.chat.TextComponent; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/chat/ChatImplOld.java b/core/src/main/java/me/wolfyscript/utilities/api/chat/ChatImplOld.java index 3ff8ba52..e2406497 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/chat/ChatImplOld.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/chat/ChatImplOld.java @@ -38,12 +38,7 @@ import org.bukkit.event.player.PlayerQuitEvent; import org.jetbrains.annotations.NotNull; -import java.util.Arrays; -import java.util.HashMap; -import java.util.List; -import java.util.Locale; -import java.util.Map; -import java.util.UUID; +import java.util.*; import java.util.logging.Level; import java.util.regex.Matcher; import java.util.regex.Pattern; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/config/YamlConfiguration.java b/core/src/main/java/me/wolfyscript/utilities/api/config/YamlConfiguration.java index b35ab0b4..47066714 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/config/YamlConfiguration.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/config/YamlConfiguration.java @@ -27,11 +27,7 @@ import org.bukkit.plugin.Plugin; import javax.annotation.Nullable; -import java.io.File; -import java.io.IOException; -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; +import java.io.*; import java.nio.charset.StandardCharsets; import java.util.ArrayList; import java.util.List; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/CustomData.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/CustomData.java index 904541a5..6ad9470c 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/CustomData.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/CustomData.java @@ -24,14 +24,15 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.SerializerProvider; import com.fasterxml.jackson.databind.ser.std.StdSerializer; +import me.wolfyscript.utilities.util.Keyed; +import me.wolfyscript.utilities.util.NamespacedKey; + import java.io.IOException; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.HashMap; import java.util.Map; import java.util.Objects; -import me.wolfyscript.utilities.util.Keyed; -import me.wolfyscript.utilities.util.NamespacedKey; /** * @deprecated Replaced by {@link com.wolfyscript.utilities.bukkit.items.CustomItemData} diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/FuelSettings.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/FuelSettings.java index a7dfa978..7c51ef3b 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/FuelSettings.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/FuelSettings.java @@ -20,11 +20,11 @@ import com.fasterxml.jackson.annotation.JsonAlias; import com.fasterxml.jackson.annotation.JsonAutoDetect; -import java.util.Objects; import org.bukkit.Material; import java.util.ArrayList; import java.util.List; +import java.util.Objects; @JsonAutoDetect(fieldVisibility = JsonAutoDetect.Visibility.ANY) public class FuelSettings { diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/ParticleContent.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/ParticleContent.java index 11e2033d..1259f98e 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/ParticleContent.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/ParticleContent.java @@ -18,11 +18,7 @@ package me.wolfyscript.utilities.api.inventory.custom_items; -import com.fasterxml.jackson.annotation.JsonGetter; -import com.fasterxml.jackson.annotation.JsonIgnoreProperties; -import com.fasterxml.jackson.annotation.JsonInclude; -import com.fasterxml.jackson.annotation.JsonSetter; -import com.fasterxml.jackson.annotation.Nulls; +import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.annotation.JsonSerialize; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.util.NamespacedKey; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/ActionCommand.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/ActionCommand.java index d5b183b3..4e135cd9 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/ActionCommand.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/ActionCommand.java @@ -20,8 +20,6 @@ import com.fasterxml.jackson.annotation.JsonIgnore; import me.wolfyscript.utilities.api.WolfyUtilCore; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.Action; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataPlayer; import me.wolfyscript.utilities.compatibility.plugins.PlaceholderAPIIntegration; import me.wolfyscript.utilities.util.NamespacedKey; import org.bukkit.Bukkit; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/ActionParticleAnimation.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/ActionParticleAnimation.java index 18c0db2c..beabb0d1 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/ActionParticleAnimation.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/ActionParticleAnimation.java @@ -19,9 +19,6 @@ package me.wolfyscript.utilities.api.inventory.custom_items.actions; import me.wolfyscript.utilities.api.WolfyUtilCore; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.Action; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataLocation; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataPlayer; import me.wolfyscript.utilities.util.NamespacedKey; import me.wolfyscript.utilities.util.particles.ParticleAnimation; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/ActionSound.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/ActionSound.java index f32f8e12..8ce4ae2e 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/ActionSound.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/ActionSound.java @@ -20,9 +20,6 @@ import com.google.common.base.Preconditions; import me.wolfyscript.utilities.api.WolfyUtilCore; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.Action; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataLocation; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataPlayer; import me.wolfyscript.utilities.util.NamespacedKey; import org.bukkit.Sound; import org.bukkit.SoundCategory; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataBlock.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataBlock.java index f925d480..b33527c5 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataBlock.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataBlock.java @@ -19,7 +19,6 @@ package me.wolfyscript.utilities.api.inventory.custom_items.actions; import me.wolfyscript.utilities.api.inventory.custom_items.CustomItem; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataLocation; import org.bukkit.block.Block; public class DataBlock extends DataLocation { diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataEntity.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataEntity.java index 87255583..c3cea5e6 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataEntity.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataEntity.java @@ -19,7 +19,6 @@ package me.wolfyscript.utilities.api.inventory.custom_items.actions; import me.wolfyscript.utilities.api.inventory.custom_items.CustomItem; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataLocation; import org.bukkit.entity.Entity; public class DataEntity extends DataLocation { diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataLocation.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataLocation.java index d2804a06..de1d2383 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataLocation.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataLocation.java @@ -19,7 +19,6 @@ package me.wolfyscript.utilities.api.inventory.custom_items.actions; import me.wolfyscript.utilities.api.inventory.custom_items.CustomItem; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.Data; import org.bukkit.Location; public class DataLocation extends Data { diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataPlayer.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataPlayer.java index e6a6ce61..fd6ff33d 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataPlayer.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataPlayer.java @@ -19,7 +19,6 @@ package me.wolfyscript.utilities.api.inventory.custom_items.actions; import me.wolfyscript.utilities.api.inventory.custom_items.CustomItem; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataEntity; import org.bukkit.entity.Player; public class DataPlayer extends DataEntity { diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataPlayerEvent.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataPlayerEvent.java index e08bdd86..9ceba89d 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataPlayerEvent.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/DataPlayerEvent.java @@ -19,8 +19,6 @@ package me.wolfyscript.utilities.api.inventory.custom_items.actions; import me.wolfyscript.utilities.api.inventory.custom_items.CustomItem; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataEvent; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataPlayer; import org.bukkit.entity.Player; import org.bukkit.event.player.PlayerEvent; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayer.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayer.java index 33544f38..72fd0a11 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayer.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayer.java @@ -18,8 +18,6 @@ package me.wolfyscript.utilities.api.inventory.custom_items.actions; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataPlayer; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.Event; import me.wolfyscript.utilities.util.NamespacedKey; public abstract class EventPlayer extends Event { diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerConsumeItem.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerConsumeItem.java index 89f0c4d6..65e39e90 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerConsumeItem.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerConsumeItem.java @@ -18,8 +18,6 @@ package me.wolfyscript.utilities.api.inventory.custom_items.actions; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataPlayerEvent; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayer; import me.wolfyscript.utilities.util.NamespacedKey; import org.bukkit.event.player.PlayerItemConsumeEvent; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerInteract.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerInteract.java index 9521188d..3c5aec8c 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerInteract.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerInteract.java @@ -19,8 +19,6 @@ package me.wolfyscript.utilities.api.inventory.custom_items.actions; import me.wolfyscript.utilities.api.WolfyUtilCore; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataPlayerEvent; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayer; import me.wolfyscript.utilities.util.NamespacedKey; import org.bukkit.block.BlockFace; import org.bukkit.event.block.Action; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerInteractAtEntity.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerInteractAtEntity.java index 92850ade..81755b78 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerInteractAtEntity.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerInteractAtEntity.java @@ -18,7 +18,6 @@ package me.wolfyscript.utilities.api.inventory.custom_items.actions; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerInteractEntityAbstract; import me.wolfyscript.utilities.util.NamespacedKey; import org.bukkit.event.player.PlayerInteractAtEntityEvent; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerInteractEntity.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerInteractEntity.java index c9e0a611..cd00d5b5 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerInteractEntity.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerInteractEntity.java @@ -18,7 +18,6 @@ package me.wolfyscript.utilities.api.inventory.custom_items.actions; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayerInteractEntityAbstract; import me.wolfyscript.utilities.util.NamespacedKey; import org.bukkit.event.player.PlayerInteractAtEntityEvent; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerInteractEntityAbstract.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerInteractEntityAbstract.java index 4c0d00bc..61848aa5 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerInteractEntityAbstract.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerInteractEntityAbstract.java @@ -19,8 +19,6 @@ package me.wolfyscript.utilities.api.inventory.custom_items.actions; import me.wolfyscript.utilities.api.WolfyUtilCore; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataPlayerEvent; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayer; import me.wolfyscript.utilities.util.NamespacedKey; import org.bukkit.entity.EntityType; import org.bukkit.event.player.PlayerInteractEntityEvent; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemBreak.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemBreak.java index 02b33954..d2ecffcf 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemBreak.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemBreak.java @@ -18,8 +18,6 @@ package me.wolfyscript.utilities.api.inventory.custom_items.actions; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataPlayerEvent; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayer; import me.wolfyscript.utilities.util.NamespacedKey; import org.bukkit.event.player.PlayerItemBreakEvent; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemDamage.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemDamage.java index 5329a038..1a64678c 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemDamage.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemDamage.java @@ -18,8 +18,6 @@ package me.wolfyscript.utilities.api.inventory.custom_items.actions; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataPlayerEvent; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayer; import me.wolfyscript.utilities.util.NamespacedKey; import org.bukkit.event.player.PlayerItemDamageEvent; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemDrop.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemDrop.java index dadf4759..269a343a 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemDrop.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemDrop.java @@ -18,8 +18,6 @@ package me.wolfyscript.utilities.api.inventory.custom_items.actions; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataPlayerEvent; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayer; import me.wolfyscript.utilities.util.NamespacedKey; import org.bukkit.event.player.PlayerDropItemEvent; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemHandSwap.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemHandSwap.java index 05414de3..39d48063 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemHandSwap.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemHandSwap.java @@ -18,8 +18,6 @@ package me.wolfyscript.utilities.api.inventory.custom_items.actions; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataPlayerEvent; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayer; import me.wolfyscript.utilities.util.NamespacedKey; import org.bukkit.event.player.PlayerSwapHandItemsEvent; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemHeld.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemHeld.java index cdb21810..4715dd48 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemHeld.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/custom_items/actions/EventPlayerItemHeld.java @@ -18,8 +18,6 @@ package me.wolfyscript.utilities.api.inventory.custom_items.actions; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.DataPlayerEvent; -import me.wolfyscript.utilities.api.inventory.custom_items.actions.EventPlayer; import me.wolfyscript.utilities.util.NamespacedKey; import org.bukkit.event.player.PlayerItemHeldEvent; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/GuiCluster.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/GuiCluster.java index e5f66ecf..e90232fb 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/GuiCluster.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/GuiCluster.java @@ -19,19 +19,13 @@ package me.wolfyscript.utilities.api.inventory.gui; import me.wolfyscript.utilities.api.inventory.gui.button.Button; -import me.wolfyscript.utilities.api.inventory.gui.button.buttons.ActionButton; -import me.wolfyscript.utilities.api.inventory.gui.button.buttons.ChatInputButton; -import me.wolfyscript.utilities.api.inventory.gui.button.buttons.DummyButton; -import me.wolfyscript.utilities.api.inventory.gui.button.buttons.ItemInputButton; -import me.wolfyscript.utilities.api.inventory.gui.button.buttons.MultipleChoiceButton; -import me.wolfyscript.utilities.api.inventory.gui.button.buttons.ToggleButton; +import me.wolfyscript.utilities.api.inventory.gui.button.buttons.*; import me.wolfyscript.utilities.api.inventory.gui.cache.CustomCache; import me.wolfyscript.utilities.util.NamespacedKey; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; import java.util.HashMap; -import java.util.List; import java.util.Map; /** diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/GuiHandler.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/GuiHandler.java index 3bb6327a..f2c8e69a 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/GuiHandler.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/GuiHandler.java @@ -19,7 +19,6 @@ package me.wolfyscript.utilities.api.inventory.gui; import com.wolfyscript.utilities.bukkit.WolfyUtilsBukkit; -import com.wolfyscript.utilities.common.WolfyUtils; import me.wolfyscript.utilities.api.WolfyUtilities; import me.wolfyscript.utilities.api.inventory.gui.button.Button; import me.wolfyscript.utilities.api.inventory.gui.button.ButtonAction; @@ -37,12 +36,7 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Optional; -import java.util.UUID; +import java.util.*; /** * This object is used to store all relevant data for the Player using the GUI.
diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/GuiMenuComponent.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/GuiMenuComponent.java index 0fb0f83b..dadd6aaf 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/GuiMenuComponent.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/GuiMenuComponent.java @@ -21,12 +21,7 @@ import me.wolfyscript.utilities.api.WolfyUtilities; import me.wolfyscript.utilities.api.chat.Chat; import me.wolfyscript.utilities.api.inventory.gui.button.Button; -import me.wolfyscript.utilities.api.inventory.gui.button.buttons.ActionButton; -import me.wolfyscript.utilities.api.inventory.gui.button.buttons.ChatInputButton; -import me.wolfyscript.utilities.api.inventory.gui.button.buttons.DummyButton; -import me.wolfyscript.utilities.api.inventory.gui.button.buttons.ItemInputButton; -import me.wolfyscript.utilities.api.inventory.gui.button.buttons.MultipleChoiceButton; -import me.wolfyscript.utilities.api.inventory.gui.button.buttons.ToggleButton; +import me.wolfyscript.utilities.api.inventory.gui.button.buttons.*; import me.wolfyscript.utilities.api.inventory.gui.cache.CustomCache; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.tag.resolver.TagResolver; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/GuiWindow.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/GuiWindow.java index 00c97739..2a86d6d3 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/GuiWindow.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/GuiWindow.java @@ -24,12 +24,7 @@ import me.wolfyscript.utilities.api.chat.ClickAction; import me.wolfyscript.utilities.api.chat.ClickData; import me.wolfyscript.utilities.api.inventory.gui.button.Button; -import me.wolfyscript.utilities.api.inventory.gui.button.buttons.ActionButton; -import me.wolfyscript.utilities.api.inventory.gui.button.buttons.ChatInputButton; -import me.wolfyscript.utilities.api.inventory.gui.button.buttons.DummyButton; -import me.wolfyscript.utilities.api.inventory.gui.button.buttons.ItemInputButton; -import me.wolfyscript.utilities.api.inventory.gui.button.buttons.MultipleChoiceButton; -import me.wolfyscript.utilities.api.inventory.gui.button.buttons.ToggleButton; +import me.wolfyscript.utilities.api.inventory.gui.button.buttons.*; import me.wolfyscript.utilities.api.inventory.gui.cache.CustomCache; import me.wolfyscript.utilities.api.nms.inventory.GUIInventory; import me.wolfyscript.utilities.compatibility.plugins.PlaceholderAPIIntegration; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/button/buttons/ActionButton.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/button/buttons/ActionButton.java index b7871f4a..c67f7eb9 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/button/buttons/ActionButton.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/button/buttons/ActionButton.java @@ -22,13 +22,7 @@ import me.wolfyscript.utilities.api.inventory.gui.GuiHandler; import me.wolfyscript.utilities.api.inventory.gui.GuiUpdate; import me.wolfyscript.utilities.api.inventory.gui.GuiWindow; -import me.wolfyscript.utilities.api.inventory.gui.button.Button; -import me.wolfyscript.utilities.api.inventory.gui.button.ButtonAction; -import me.wolfyscript.utilities.api.inventory.gui.button.ButtonPostAction; -import me.wolfyscript.utilities.api.inventory.gui.button.ButtonPreRender; -import me.wolfyscript.utilities.api.inventory.gui.button.ButtonRender; -import me.wolfyscript.utilities.api.inventory.gui.button.ButtonState; -import me.wolfyscript.utilities.api.inventory.gui.button.ButtonType; +import me.wolfyscript.utilities.api.inventory.gui.button.*; import me.wolfyscript.utilities.api.inventory.gui.cache.CustomCache; import me.wolfyscript.utilities.api.nms.inventory.GUIInventory; import org.bukkit.Material; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/button/buttons/ChatInputButton.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/button/buttons/ChatInputButton.java index c5655703..c3832c47 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/button/buttons/ChatInputButton.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/button/buttons/ChatInputButton.java @@ -20,11 +20,7 @@ import me.wolfyscript.utilities.api.chat.Chat; import me.wolfyscript.utilities.api.chat.ClickData; -import me.wolfyscript.utilities.api.inventory.gui.ChatInputAction; -import me.wolfyscript.utilities.api.inventory.gui.ChatTabComplete; -import me.wolfyscript.utilities.api.inventory.gui.GuiCluster; -import me.wolfyscript.utilities.api.inventory.gui.GuiHandler; -import me.wolfyscript.utilities.api.inventory.gui.GuiWindow; +import me.wolfyscript.utilities.api.inventory.gui.*; import me.wolfyscript.utilities.api.inventory.gui.button.ButtonAction; import me.wolfyscript.utilities.api.inventory.gui.button.ButtonRender; import me.wolfyscript.utilities.api.inventory.gui.button.ButtonState; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/button/buttons/MultipleChoiceButton.java b/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/button/buttons/MultipleChoiceButton.java index 7aeb09ba..3f1242b3 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/button/buttons/MultipleChoiceButton.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/inventory/gui/button/buttons/MultipleChoiceButton.java @@ -18,7 +18,6 @@ package me.wolfyscript.utilities.api.inventory.gui.button.buttons; -import java.util.ArrayList; import me.wolfyscript.utilities.api.inventory.gui.GuiCluster; import me.wolfyscript.utilities.api.inventory.gui.GuiHandler; import me.wolfyscript.utilities.api.inventory.gui.GuiWindow; @@ -34,6 +33,7 @@ import org.jetbrains.annotations.NotNull; import java.io.IOException; +import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/network/database/sql/SQLDataBase.java b/core/src/main/java/me/wolfyscript/utilities/api/network/database/sql/SQLDataBase.java index 73c0e489..c5e823e5 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/network/database/sql/SQLDataBase.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/network/database/sql/SQLDataBase.java @@ -20,11 +20,7 @@ import me.wolfyscript.utilities.api.WolfyUtilities; -import java.sql.Connection; -import java.sql.DriverManager; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; +import java.sql.*; import java.util.Properties; public class SQLDataBase { diff --git a/core/src/main/java/me/wolfyscript/utilities/api/nms/NBTTag.java b/core/src/main/java/me/wolfyscript/utilities/api/nms/NBTTag.java index 62877b20..d660f7fd 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/nms/NBTTag.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/nms/NBTTag.java @@ -18,19 +18,7 @@ package me.wolfyscript.utilities.api.nms; -import me.wolfyscript.utilities.api.nms.nbt.NBTCompound; -import me.wolfyscript.utilities.api.nms.nbt.NBTTagByte; -import me.wolfyscript.utilities.api.nms.nbt.NBTTagByteArray; -import me.wolfyscript.utilities.api.nms.nbt.NBTTagDouble; -import me.wolfyscript.utilities.api.nms.nbt.NBTTagEnd; -import me.wolfyscript.utilities.api.nms.nbt.NBTTagFloat; -import me.wolfyscript.utilities.api.nms.nbt.NBTTagInt; -import me.wolfyscript.utilities.api.nms.nbt.NBTTagIntArray; -import me.wolfyscript.utilities.api.nms.nbt.NBTTagList; -import me.wolfyscript.utilities.api.nms.nbt.NBTTagLong; -import me.wolfyscript.utilities.api.nms.nbt.NBTTagLongArray; -import me.wolfyscript.utilities.api.nms.nbt.NBTTagShort; -import me.wolfyscript.utilities.api.nms.nbt.NBTTagString; +import me.wolfyscript.utilities.api.nms.nbt.*; @Deprecated(since = "4.16.2.0") public abstract class NBTTag { diff --git a/core/src/main/java/me/wolfyscript/utilities/api/nms/NMSUtil.java b/core/src/main/java/me/wolfyscript/utilities/api/nms/NMSUtil.java index ee13cb10..bcf910fb 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/nms/NMSUtil.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/nms/NMSUtil.java @@ -19,8 +19,6 @@ package me.wolfyscript.utilities.api.nms; import com.wolfyscript.utilities.bukkit.nms.fallback.FallbackNMSEntry; -import java.util.ArrayList; -import java.util.List; import me.wolfyscript.utilities.api.WolfyUtilities; import me.wolfyscript.utilities.util.Reflection; import me.wolfyscript.utilities.util.version.MinecraftVersion; @@ -28,7 +26,9 @@ import org.bukkit.plugin.Plugin; import java.lang.reflect.Constructor; +import java.util.ArrayList; import java.util.HashMap; +import java.util.List; public abstract class NMSUtil { diff --git a/core/src/main/java/me/wolfyscript/utilities/api/nms/RecipeUtil.java b/core/src/main/java/me/wolfyscript/utilities/api/nms/RecipeUtil.java index c6de9809..9b825e07 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/nms/RecipeUtil.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/nms/RecipeUtil.java @@ -18,7 +18,6 @@ package me.wolfyscript.utilities.api.nms; -import com.wolfyscript.utilities.bukkit.nms.inventory.NMSInventoryUtils; import me.wolfyscript.utilities.api.nms.inventory.RecipeType; import me.wolfyscript.utilities.util.NamespacedKey; import org.bukkit.inventory.Inventory; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/nms/inventory/InjectGUIInventory.java b/core/src/main/java/me/wolfyscript/utilities/api/nms/inventory/InjectGUIInventory.java index 2832ad01..98700e32 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/nms/inventory/InjectGUIInventory.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/nms/inventory/InjectGUIInventory.java @@ -1,23 +1,6 @@ package me.wolfyscript.utilities.api.nms.inventory; -import java.io.IOException; -import java.lang.reflect.Constructor; -import java.lang.reflect.InvocationTargetException; -import java.util.HashMap; -import java.util.Map; -import java.util.Objects; -import java.util.function.Function; -import javassist.CannotCompileException; -import javassist.ClassPool; -import javassist.CtClass; -import javassist.CtConstructor; -import javassist.CtField; -import javassist.CtMethod; -import javassist.CtNewConstructor; -import javassist.CtNewMethod; -import javassist.LoaderClassPath; -import javassist.Modifier; -import javassist.NotFoundException; +import javassist.*; import javassist.bytecode.SignatureAttribute; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.api.inventory.gui.GuiHandler; @@ -30,6 +13,14 @@ import org.bukkit.inventory.InventoryHolder; import org.jetbrains.annotations.Nullable; +import java.io.IOException; +import java.lang.reflect.Constructor; +import java.lang.reflect.InvocationTargetException; +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; +import java.util.function.Function; + public class InjectGUIInventory { private static final String GENERATOR_PACKAGE = "me.wolfyscript.utilities.api.nms.inventory.generated"; diff --git a/core/src/main/java/me/wolfyscript/utilities/api/nms/network/MCByteBuf.java b/core/src/main/java/me/wolfyscript/utilities/api/nms/network/MCByteBuf.java index ad82395e..3931ea87 100644 --- a/core/src/main/java/me/wolfyscript/utilities/api/nms/network/MCByteBuf.java +++ b/core/src/main/java/me/wolfyscript/utilities/api/nms/network/MCByteBuf.java @@ -38,11 +38,7 @@ import java.nio.channels.GatheringByteChannel; import java.nio.channels.ScatteringByteChannel; import java.nio.charset.Charset; -import java.util.Collection; -import java.util.Date; -import java.util.List; -import java.util.Map; -import java.util.UUID; +import java.util.*; import java.util.function.BiConsumer; import java.util.function.Consumer; import java.util.function.Function; diff --git a/core/src/main/java/me/wolfyscript/utilities/compatibility/CompatibilityManagerBukkit.java b/core/src/main/java/me/wolfyscript/utilities/compatibility/CompatibilityManagerBukkit.java index 5c6406d2..23de7927 100644 --- a/core/src/main/java/me/wolfyscript/utilities/compatibility/CompatibilityManagerBukkit.java +++ b/core/src/main/java/me/wolfyscript/utilities/compatibility/CompatibilityManagerBukkit.java @@ -19,11 +19,12 @@ package me.wolfyscript.utilities.compatibility; import com.wolfyscript.utilities.bukkit.nms.ServerProperties; -import java.util.Properties; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.util.version.MinecraftVersion; import me.wolfyscript.utilities.util.version.ServerVersion; +import java.util.Properties; + public final class CompatibilityManagerBukkit implements CompatibilityManager { private boolean has1_20Features = false; diff --git a/core/src/main/java/me/wolfyscript/utilities/compatibility/PluginsBukkit.java b/core/src/main/java/me/wolfyscript/utilities/compatibility/PluginsBukkit.java index b850664a..80dfd415 100644 --- a/core/src/main/java/me/wolfyscript/utilities/compatibility/PluginsBukkit.java +++ b/core/src/main/java/me/wolfyscript/utilities/compatibility/PluginsBukkit.java @@ -33,11 +33,7 @@ import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Map; -import java.util.Optional; +import java.util.*; import java.util.function.Consumer; import java.util.function.Function; import java.util.function.Supplier; diff --git a/core/src/main/java/me/wolfyscript/utilities/compatibility/plugins/ExecutableBlocksIntegration.java b/core/src/main/java/me/wolfyscript/utilities/compatibility/plugins/ExecutableBlocksIntegration.java index 1654e3d1..22ddb472 100644 --- a/core/src/main/java/me/wolfyscript/utilities/compatibility/plugins/ExecutableBlocksIntegration.java +++ b/core/src/main/java/me/wolfyscript/utilities/compatibility/plugins/ExecutableBlocksIntegration.java @@ -1,13 +1,13 @@ package me.wolfyscript.utilities.compatibility.plugins; -import java.util.List; -import java.util.Locale; -import java.util.Optional; - import me.wolfyscript.utilities.compatibility.PluginIntegration; import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; +import java.util.List; +import java.util.Locale; +import java.util.Optional; + public interface ExecutableBlocksIntegration extends PluginIntegration { String PLUGIN_NAME = "ExecutableBlocks"; diff --git a/core/src/main/java/me/wolfyscript/utilities/registry/AbstractRegistry.java b/core/src/main/java/me/wolfyscript/utilities/registry/AbstractRegistry.java index 92a4d451..8c6a5dd3 100644 --- a/core/src/main/java/me/wolfyscript/utilities/registry/AbstractRegistry.java +++ b/core/src/main/java/me/wolfyscript/utilities/registry/AbstractRegistry.java @@ -1,17 +1,14 @@ package me.wolfyscript.utilities.registry; import com.google.common.base.Preconditions; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.Map; -import java.util.Set; -import java.util.function.Supplier; import me.wolfyscript.utilities.util.Keyed; import me.wolfyscript.utilities.util.NamespacedKey; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.*; +import java.util.function.Supplier; + public abstract class AbstractRegistry, V extends Keyed> implements Registry { protected final NamespacedKey namespacedKey; diff --git a/core/src/main/java/me/wolfyscript/utilities/registry/AbstractTypeRegistry.java b/core/src/main/java/me/wolfyscript/utilities/registry/AbstractTypeRegistry.java index ac773bec..ae127e78 100644 --- a/core/src/main/java/me/wolfyscript/utilities/registry/AbstractTypeRegistry.java +++ b/core/src/main/java/me/wolfyscript/utilities/registry/AbstractTypeRegistry.java @@ -2,19 +2,15 @@ import com.google.common.base.Preconditions; import com.wolfyscript.utilities.KeyedStaticId; -import java.lang.reflect.InvocationTargetException; -import java.util.Collection; -import java.util.Collections; -import java.util.Iterator; -import java.util.Map; -import java.util.Objects; -import java.util.Set; -import java.util.function.Supplier; import me.wolfyscript.utilities.util.Keyed; import me.wolfyscript.utilities.util.NamespacedKey; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.lang.reflect.InvocationTargetException; +import java.util.*; +import java.util.function.Supplier; + public abstract class AbstractTypeRegistry>, V extends Keyed> implements TypeRegistry { protected final NamespacedKey key; diff --git a/core/src/main/java/me/wolfyscript/utilities/registry/Registries.java b/core/src/main/java/me/wolfyscript/utilities/registry/Registries.java index 1e549b64..00cf94cd 100644 --- a/core/src/main/java/me/wolfyscript/utilities/registry/Registries.java +++ b/core/src/main/java/me/wolfyscript/utilities/registry/Registries.java @@ -36,12 +36,12 @@ import me.wolfyscript.utilities.util.Keyed; import me.wolfyscript.utilities.util.NamespacedKey; import me.wolfyscript.utilities.util.eval.operators.Operator; +import me.wolfyscript.utilities.util.eval.value_providers.ValueProvider; import me.wolfyscript.utilities.util.particles.ParticleAnimation; import me.wolfyscript.utilities.util.particles.ParticleEffect; import me.wolfyscript.utilities.util.particles.animators.Animator; import me.wolfyscript.utilities.util.particles.shapes.Shape; import me.wolfyscript.utilities.util.particles.timer.Timer; -import me.wolfyscript.utilities.util.eval.value_providers.ValueProvider; import java.util.HashMap; import java.util.Map; diff --git a/core/src/main/java/me/wolfyscript/utilities/registry/Registry.java b/core/src/main/java/me/wolfyscript/utilities/registry/Registry.java index fa23b10a..8c581eb7 100644 --- a/core/src/main/java/me/wolfyscript/utilities/registry/Registry.java +++ b/core/src/main/java/me/wolfyscript/utilities/registry/Registry.java @@ -18,8 +18,8 @@ package me.wolfyscript.utilities.registry; -import me.wolfyscript.utilities.util.NamespacedKey; import me.wolfyscript.utilities.util.Keyed; +import me.wolfyscript.utilities.util.NamespacedKey; public interface Registry extends IRegistry { diff --git a/core/src/main/java/me/wolfyscript/utilities/registry/RegistrySimple.java b/core/src/main/java/me/wolfyscript/utilities/registry/RegistrySimple.java index d83f82dd..830641f8 100644 --- a/core/src/main/java/me/wolfyscript/utilities/registry/RegistrySimple.java +++ b/core/src/main/java/me/wolfyscript/utilities/registry/RegistrySimple.java @@ -18,18 +18,11 @@ package me.wolfyscript.utilities.registry; -import com.google.common.base.Preconditions; import me.wolfyscript.utilities.util.Keyed; import me.wolfyscript.utilities.util.NamespacedKey; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import java.util.Collection; -import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; -import java.util.Set; /** * A simple registry, used for basic use cases. diff --git a/core/src/main/java/me/wolfyscript/utilities/registry/TypeRegistry.java b/core/src/main/java/me/wolfyscript/utilities/registry/TypeRegistry.java index e49889eb..4705cfa4 100644 --- a/core/src/main/java/me/wolfyscript/utilities/registry/TypeRegistry.java +++ b/core/src/main/java/me/wolfyscript/utilities/registry/TypeRegistry.java @@ -18,8 +18,8 @@ package me.wolfyscript.utilities.registry; -import me.wolfyscript.utilities.util.NamespacedKey; import me.wolfyscript.utilities.util.Keyed; +import me.wolfyscript.utilities.util.NamespacedKey; import org.jetbrains.annotations.Nullable; /** diff --git a/core/src/main/java/me/wolfyscript/utilities/registry/TypeRegistrySimple.java b/core/src/main/java/me/wolfyscript/utilities/registry/TypeRegistrySimple.java index e8826bb8..965e177e 100644 --- a/core/src/main/java/me/wolfyscript/utilities/registry/TypeRegistrySimple.java +++ b/core/src/main/java/me/wolfyscript/utilities/registry/TypeRegistrySimple.java @@ -18,21 +18,11 @@ package me.wolfyscript.utilities.registry; -import com.google.common.base.Preconditions; -import com.wolfyscript.utilities.KeyedStaticId; import me.wolfyscript.utilities.util.Keyed; import me.wolfyscript.utilities.util.NamespacedKey; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; -import java.lang.reflect.InvocationTargetException; -import java.util.Collection; -import java.util.Collections; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; -import java.util.Objects; -import java.util.Set; public class TypeRegistrySimple extends AbstractTypeRegistry>, V> { diff --git a/core/src/main/java/me/wolfyscript/utilities/util/ClassRegistry.java b/core/src/main/java/me/wolfyscript/utilities/util/ClassRegistry.java index de13a227..83de6796 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/ClassRegistry.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/ClassRegistry.java @@ -29,14 +29,8 @@ import org.jetbrains.annotations.Nullable; import java.lang.reflect.InvocationTargetException; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; -import java.util.Objects; -import java.util.Set; import java.util.function.Supplier; /** diff --git a/core/src/main/java/me/wolfyscript/utilities/util/RandomCollection.java b/core/src/main/java/me/wolfyscript/utilities/util/RandomCollection.java index 80ede2a2..6dc58c31 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/RandomCollection.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/RandomCollection.java @@ -19,12 +19,8 @@ package me.wolfyscript.utilities.util; import me.wolfyscript.utilities.api.inventory.custom_items.CustomItem; -import org.jetbrains.annotations.Nullable; -import java.util.Map; import java.util.Random; -import java.util.TreeMap; -import java.util.concurrent.ThreadLocalRandom; import java.util.function.BiConsumer; import java.util.stream.Collector; diff --git a/core/src/main/java/me/wolfyscript/utilities/util/Registry.java b/core/src/main/java/me/wolfyscript/utilities/util/Registry.java index ff0d0379..0ccd86a0 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/Registry.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/Registry.java @@ -34,14 +34,8 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import java.util.Collection; -import java.util.Collections; -import java.util.HashMap; -import java.util.Iterator; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.Map.Entry; -import java.util.Set; import java.util.function.Supplier; /** @@ -180,7 +174,7 @@ public Set keySet() { @Override public Collection values() { - System.out.println("Get values from simple Reg: " + this); +/* System.out.println("Get values from simple Reg: " + this);*/ return Collections.unmodifiableCollection(this.map.values()); } diff --git a/core/src/main/java/me/wolfyscript/utilities/util/entity/CustomPlayerData.java b/core/src/main/java/me/wolfyscript/utilities/util/entity/CustomPlayerData.java index bb97ff27..350f988f 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/entity/CustomPlayerData.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/entity/CustomPlayerData.java @@ -22,6 +22,7 @@ import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.SerializerProvider; +import me.wolfyscript.utilities.api.inventory.custom_items.CustomData; import me.wolfyscript.utilities.util.NamespacedKey; import java.io.IOException; diff --git a/core/src/main/java/me/wolfyscript/utilities/util/entity/PlayerStore.java b/core/src/main/java/me/wolfyscript/utilities/util/entity/PlayerStore.java index fc5459e0..9736753f 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/entity/PlayerStore.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/entity/PlayerStore.java @@ -18,9 +18,10 @@ package me.wolfyscript.utilities.util.entity; +import me.wolfyscript.utilities.util.NamespacedKey; + import java.util.HashMap; import java.util.Map; -import me.wolfyscript.utilities.util.NamespacedKey; @Deprecated public class PlayerStore { diff --git a/core/src/main/java/me/wolfyscript/utilities/util/entity/PlayerUtils.java b/core/src/main/java/me/wolfyscript/utilities/util/entity/PlayerUtils.java index 2dc7fae4..791d4f3d 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/entity/PlayerUtils.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/entity/PlayerUtils.java @@ -19,16 +19,12 @@ package me.wolfyscript.utilities.util.entity; import com.wolfyscript.utilities.bukkit.persistent.player.PlayerParticleEffectData; -import java.util.HashMap; -import java.util.Optional; import me.wolfyscript.utilities.api.WolfyUtilCore; import org.bukkit.entity.Player; import org.bukkit.inventory.EquipmentSlot; import org.jetbrains.annotations.NotNull; -import java.util.EnumMap; -import java.util.Map; -import java.util.UUID; +import java.util.*; @Deprecated public class PlayerUtils { diff --git a/core/src/main/java/me/wolfyscript/utilities/util/eval/operators/BoolOperator.java b/core/src/main/java/me/wolfyscript/utilities/util/eval/operators/BoolOperator.java index daf72394..c86284a1 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/eval/operators/BoolOperator.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/eval/operators/BoolOperator.java @@ -22,14 +22,14 @@ import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.databind.DeserializationContext; import com.fasterxml.jackson.databind.JsonNode; -import com.wolfyscript.utilities.common.WolfyUtils; -import java.io.IOException; import me.wolfyscript.utilities.util.NamespacedKey; import me.wolfyscript.utilities.util.eval.context.EvalContext; import me.wolfyscript.utilities.util.json.jackson.ValueDeserializer; import me.wolfyscript.utilities.util.json.jackson.annotations.KeyedBaseType; import me.wolfyscript.utilities.util.json.jackson.annotations.OptionalValueDeserializer; +import java.io.IOException; + /** * An Operator that evaluates into a booleanish value. */ diff --git a/core/src/main/java/me/wolfyscript/utilities/util/eval/operators/BoolOperatorConst.java b/core/src/main/java/me/wolfyscript/utilities/util/eval/operators/BoolOperatorConst.java index 02fa0dbb..2f6d65c1 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/eval/operators/BoolOperatorConst.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/eval/operators/BoolOperatorConst.java @@ -22,11 +22,12 @@ import com.fasterxml.jackson.annotation.JsonProperty; import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; -import java.io.IOException; import me.wolfyscript.utilities.util.NamespacedKey; import me.wolfyscript.utilities.util.eval.context.EvalContext; import me.wolfyscript.utilities.util.json.jackson.annotations.OptionalValueSerializer; +import java.io.IOException; + @OptionalValueSerializer(serializer = BoolOperatorConst.ValueSerializer.class) public class BoolOperatorConst extends BoolOperator { diff --git a/core/src/main/java/me/wolfyscript/utilities/util/eval/value_providers/ValueProvider.java b/core/src/main/java/me/wolfyscript/utilities/util/eval/value_providers/ValueProvider.java index 61fe9845..f02ffd4e 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/eval/value_providers/ValueProvider.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/eval/value_providers/ValueProvider.java @@ -18,11 +18,7 @@ package me.wolfyscript.utilities.util.eval.value_providers; -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.JsonGetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonPropertyOrder; -import com.fasterxml.jackson.annotation.JsonTypeInfo; +import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.JsonToken; @@ -30,8 +26,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.annotation.JsonTypeIdResolver; import com.fasterxml.jackson.databind.annotation.JsonTypeResolver; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import me.wolfyscript.utilities.util.Keyed; import me.wolfyscript.utilities.util.NamespacedKey; import me.wolfyscript.utilities.util.eval.context.EvalContext; @@ -40,6 +34,8 @@ import me.wolfyscript.utilities.util.json.jackson.annotations.OptionalValueDeserializer; import java.io.IOException; +import java.util.regex.Matcher; +import java.util.regex.Pattern; @JsonTypeResolver(KeyedTypeResolver.class) @JsonTypeIdResolver(KeyedTypeIdResolver.class) diff --git a/core/src/main/java/me/wolfyscript/utilities/util/events/CustomItemBreakEvent.java b/core/src/main/java/me/wolfyscript/utilities/util/events/CustomItemBreakEvent.java index 4bfcb17c..ac2fcc0e 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/events/CustomItemBreakEvent.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/events/CustomItemBreakEvent.java @@ -24,7 +24,6 @@ import org.bukkit.entity.Player; import org.bukkit.event.Event; import org.bukkit.event.HandlerList; -import org.bukkit.event.block.BlockBreakEvent; public class CustomItemBreakEvent extends Event { diff --git a/core/src/main/java/me/wolfyscript/utilities/util/inventory/item_builder/AbstractItemBuilder.java b/core/src/main/java/me/wolfyscript/utilities/util/inventory/item_builder/AbstractItemBuilder.java index 97aa0ad0..6995fc78 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/inventory/item_builder/AbstractItemBuilder.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/inventory/item_builder/AbstractItemBuilder.java @@ -44,12 +44,10 @@ import org.bukkit.inventory.meta.SkullMeta; import org.bukkit.persistence.PersistentDataType; import org.bukkit.profile.PlayerProfile; -import org.bukkit.profile.PlayerTextures; import org.jetbrains.annotations.NotNull; import java.lang.reflect.Field; import java.net.MalformedURLException; -import java.net.URI; import java.net.URL; import java.util.*; import java.util.logging.Level; diff --git a/core/src/main/java/me/wolfyscript/utilities/util/json/jackson/KeyedTypeIdResolver.java b/core/src/main/java/me/wolfyscript/utilities/util/json/jackson/KeyedTypeIdResolver.java index e6f6b5ee..d035aabf 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/json/jackson/KeyedTypeIdResolver.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/json/jackson/KeyedTypeIdResolver.java @@ -24,11 +24,11 @@ import com.fasterxml.jackson.databind.jsontype.impl.TypeIdResolverBase; import com.fasterxml.jackson.databind.type.TypeFactory; import com.wolfyscript.utilities.json.jackson.MissingImplementationException; -import me.wolfyscript.utilities.util.NamespacedKey; import me.wolfyscript.utilities.registry.IRegistry; import me.wolfyscript.utilities.registry.Registry; import me.wolfyscript.utilities.registry.TypeRegistry; import me.wolfyscript.utilities.util.Keyed; +import me.wolfyscript.utilities.util.NamespacedKey; import me.wolfyscript.utilities.util.json.jackson.annotations.KeyedBaseType; import org.jetbrains.annotations.Nullable; diff --git a/core/src/main/java/me/wolfyscript/utilities/util/json/jackson/annotations/OptionalKeyReference.java b/core/src/main/java/me/wolfyscript/utilities/util/json/jackson/annotations/OptionalKeyReference.java index 5d0fe653..f4eb8b19 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/json/jackson/annotations/OptionalKeyReference.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/json/jackson/annotations/OptionalKeyReference.java @@ -21,15 +21,7 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.BeanDescription; -import com.fasterxml.jackson.databind.DeserializationConfig; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonMappingException; -import com.fasterxml.jackson.databind.JsonNode; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializationConfig; -import com.fasterxml.jackson.databind.SerializerProvider; +import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier; import com.fasterxml.jackson.databind.deser.ResolvableDeserializer; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; @@ -38,9 +30,9 @@ import com.fasterxml.jackson.databind.ser.std.StdSerializer; import com.google.inject.Inject; import me.wolfyscript.utilities.api.WolfyUtilCore; -import me.wolfyscript.utilities.util.NamespacedKey; import me.wolfyscript.utilities.registry.Registry; import me.wolfyscript.utilities.util.Keyed; +import me.wolfyscript.utilities.util.NamespacedKey; import java.io.IOException; import java.lang.annotation.ElementType; diff --git a/core/src/main/java/me/wolfyscript/utilities/util/json/jackson/annotations/OptionalValueDeserializer.java b/core/src/main/java/me/wolfyscript/utilities/util/json/jackson/annotations/OptionalValueDeserializer.java index 3ba5e7fb..b5003620 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/json/jackson/annotations/OptionalValueDeserializer.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/json/jackson/annotations/OptionalValueDeserializer.java @@ -20,11 +20,7 @@ import com.fasterxml.jackson.core.JsonParser; import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.BeanDescription; -import com.fasterxml.jackson.databind.DeserializationConfig; -import com.fasterxml.jackson.databind.DeserializationContext; -import com.fasterxml.jackson.databind.JsonDeserializer; -import com.fasterxml.jackson.databind.JsonMappingException; +import com.fasterxml.jackson.databind.*; import com.fasterxml.jackson.databind.deser.BeanDeserializerModifier; import com.fasterxml.jackson.databind.deser.ResolvableDeserializer; import com.fasterxml.jackson.databind.deser.std.StdDeserializer; diff --git a/core/src/main/java/me/wolfyscript/utilities/util/particles/ParticleAnimation.java b/core/src/main/java/me/wolfyscript/utilities/util/particles/ParticleAnimation.java index a63e7068..86f51a6f 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/particles/ParticleAnimation.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/particles/ParticleAnimation.java @@ -27,11 +27,7 @@ import me.wolfyscript.utilities.util.NamespacedKey; import me.wolfyscript.utilities.util.entity.PlayerUtils; import me.wolfyscript.utilities.util.json.jackson.annotations.OptionalKeyReference; -import me.wolfyscript.utilities.util.particles.pos.ParticlePos; -import me.wolfyscript.utilities.util.particles.pos.ParticlePosBlock; -import me.wolfyscript.utilities.util.particles.pos.ParticlePosEntity; -import me.wolfyscript.utilities.util.particles.pos.ParticlePosLocation; -import me.wolfyscript.utilities.util.particles.pos.ParticlePosPlayer; +import me.wolfyscript.utilities.util.particles.pos.*; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Material; @@ -43,14 +39,7 @@ import org.bukkit.util.Vector; import org.jetbrains.annotations.Nullable; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Objects; -import java.util.UUID; +import java.util.*; import java.util.stream.Collectors; /** diff --git a/core/src/main/java/me/wolfyscript/utilities/util/particles/ParticleEffect.java b/core/src/main/java/me/wolfyscript/utilities/util/particles/ParticleEffect.java index 57ccfe25..cbaaf13a 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/particles/ParticleEffect.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/particles/ParticleEffect.java @@ -18,13 +18,7 @@ package me.wolfyscript.utilities.util.particles; -import com.fasterxml.jackson.annotation.JsonAlias; -import com.fasterxml.jackson.annotation.JsonAutoDetect; -import com.fasterxml.jackson.annotation.JsonCreator; -import com.fasterxml.jackson.annotation.JsonGetter; -import com.fasterxml.jackson.annotation.JsonIgnore; -import com.fasterxml.jackson.annotation.JsonProperty; -import com.fasterxml.jackson.annotation.JsonSetter; +import com.fasterxml.jackson.annotation.*; import com.fasterxml.jackson.databind.JsonNode; import com.google.common.base.Preconditions; import me.wolfyscript.utilities.api.WolfyUtilities; diff --git a/core/src/main/java/me/wolfyscript/utilities/util/world/BlockCustomItemStore.java b/core/src/main/java/me/wolfyscript/utilities/util/world/BlockCustomItemStore.java index 3542ebc3..5fd9f50d 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/world/BlockCustomItemStore.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/world/BlockCustomItemStore.java @@ -26,11 +26,11 @@ import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.api.inventory.custom_items.CustomItem; import me.wolfyscript.utilities.util.NamespacedKey; +import org.jetbrains.annotations.NotNull; +import org.jetbrains.annotations.Nullable; import java.io.IOException; import java.util.UUID; -import org.jetbrains.annotations.NotNull; -import org.jetbrains.annotations.Nullable; /** * Replaced by {@link com.wolfyscript.utilities.bukkit.persistent.world.BlockStorage}, that is available diff --git a/core/src/main/java/me/wolfyscript/utilities/util/world/WorldCustomItemStore.java b/core/src/main/java/me/wolfyscript/utilities/util/world/WorldCustomItemStore.java index 439e9a3a..0be6b40b 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/world/WorldCustomItemStore.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/world/WorldCustomItemStore.java @@ -27,14 +27,15 @@ import com.wolfyscript.utilities.bukkit.items.CustomItemBlockData; import com.wolfyscript.utilities.bukkit.persistent.world.BlockStorage; import com.wolfyscript.utilities.bukkit.persistent.world.ChunkStorage; -import java.io.IOException; -import java.util.UUID; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.api.inventory.custom_items.CustomItem; import org.bukkit.Location; import org.bukkit.World; import org.jetbrains.annotations.Nullable; +import java.io.IOException; +import java.util.UUID; + /** * Replaced by {@link com.wolfyscript.utilities.bukkit.persistent.world.WorldStorage}, that is * available using {@link com.wolfyscript.utilities.bukkit.persistent.PersistentStorage#getOrCreateWorldStorage(World)}. diff --git a/core/src/main/java/me/wolfyscript/utilities/util/world/WorldUtils.java b/core/src/main/java/me/wolfyscript/utilities/util/world/WorldUtils.java index 20b23bcf..965cb5d5 100644 --- a/core/src/main/java/me/wolfyscript/utilities/util/world/WorldUtils.java +++ b/core/src/main/java/me/wolfyscript/utilities/util/world/WorldUtils.java @@ -18,7 +18,6 @@ package me.wolfyscript.utilities.util.world; -import java.nio.file.Files; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.api.WolfyUtilities; import me.wolfyscript.utilities.util.NamespacedKey; @@ -30,6 +29,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.IOException; +import java.nio.file.Files; import java.util.HashMap; import java.util.UUID; import java.util.zip.GZIPInputStream; diff --git a/gradle.properties b/gradle.properties index 327a561e..53b0554f 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,2 +1,2 @@ group=com.wolfyscript.wolfyutils.spigot -version=4.18.2-petu +version=4.18.3-petu diff --git a/plugin-compatibility/build.gradle.kts b/plugin-compatibility/build.gradle.kts index d15d4cb9..1527dba0 100644 --- a/plugin-compatibility/build.gradle.kts +++ b/plugin-compatibility/build.gradle.kts @@ -7,8 +7,8 @@ dependencies { compileOnly(fileTree("./libs/")) compileOnly("com.denizenscript:denizen:1.2.5-SNAPSHOT") compileOnly("me.clip:placeholderapi:2.11.1") - compileOnly("com.willfp:eco:6.74.2") - compileOnly("com.github.LoneDev6:api-itemsadder:3.1.5") + compileOnly("com.willfp:eco:6.75.1") + compileOnly("dev.lone:api-itemsadder:4.0.2-beta-release-11") compileOnly("com.elmakers.mine.bukkit:MagicAPI:10.2") /* compileOnly("com.github.AlessioGr:FancyBags:2.7.0")*/ compileOnly("com.github.oraxen:oraxen:1.152.0") diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/denizen/DenizenRefImpl.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/denizen/DenizenRefImpl.java index d403bd3d..39f51081 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/denizen/DenizenRefImpl.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/denizen/DenizenRefImpl.java @@ -4,14 +4,15 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.SerializerProvider; -import java.io.IOException; -import java.util.Objects; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.api.inventory.custom_items.references.APIReference; import me.wolfyscript.utilities.util.inventory.ItemUtils; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.Nullable; +import java.io.IOException; +import java.util.Objects; + public class DenizenRefImpl extends APIReference { private final ItemStack displayItem; diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/eco/EcoIntegrationImpl.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/eco/EcoIntegrationImpl.java index fc1f34ce..d6ba3c32 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/eco/EcoIntegrationImpl.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/eco/EcoIntegrationImpl.java @@ -18,6 +18,7 @@ package me.wolfyscript.utilities.compatibility.plugins.eco; +import com.willfp.eco.core.EcoPlugin; import com.willfp.eco.core.items.CustomItem; import com.willfp.eco.core.items.Items; import me.wolfyscript.utilities.annotations.WUPluginIntegration; @@ -47,6 +48,9 @@ public void init(Plugin plugin) { core.registerAPIReference(new EcoRefImpl.Parser()); core.getRegistries().getStackIdentifierParsers().register(new EcoStackIdentifier.Parser()); core.getRegistries().getStackIdentifierTypeRegistry().register(EcoStackIdentifier.class); + EcoPlugin pl = EcoPlugin.getPlugin("eco"); + if(pl!=null) + pl.afterLoad(this::enable); } @Override @@ -56,7 +60,7 @@ public boolean isAPIReferenceIncluded(APIReference reference) { @Override public boolean hasAsyncLoading() { - return false; + return true; } @Override diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/eco/EcoRefImpl.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/eco/EcoRefImpl.java index b69f803d..b31ca94a 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/eco/EcoRefImpl.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/eco/EcoRefImpl.java @@ -22,15 +22,14 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.SerializerProvider; import com.willfp.eco.core.items.Items; -import java.io.IOException; -import java.util.Objects; - -import com.wolfyscript.utilities.bukkit.world.items.reference.StackIdentifier; import me.wolfyscript.utilities.api.inventory.custom_items.references.APIReference; import org.bukkit.NamespacedKey; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.Nullable; +import java.io.IOException; +import java.util.Objects; + public class EcoRefImpl extends APIReference implements EcoRef { private final NamespacedKey itemKey; diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/executableblocks/ExecutableBlocksImpl.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/executableblocks/ExecutableBlocksImpl.java index ace3a463..0dada188 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/executableblocks/ExecutableBlocksImpl.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/executableblocks/ExecutableBlocksImpl.java @@ -1,8 +1,6 @@ package me.wolfyscript.utilities.compatibility.plugins.executableblocks; import com.ssomar.executableblocks.executableblocks.ExecutableBlocksManager; -import java.util.List; -import java.util.Optional; import me.wolfyscript.utilities.annotations.WUPluginIntegration; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.compatibility.PluginIntegrationAbstract; @@ -11,6 +9,9 @@ import org.bukkit.persistence.PersistentDataType; import org.bukkit.plugin.Plugin; +import java.util.List; +import java.util.Optional; + @WUPluginIntegration(pluginName = ExecutableBlocksIntegration.PLUGIN_NAME) public class ExecutableBlocksImpl extends PluginIntegrationAbstract implements ExecutableBlocksIntegration { diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/executableblocks/ExecutableBlocksRef.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/executableblocks/ExecutableBlocksRef.java index dbe6a8bc..7b53abcb 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/executableblocks/ExecutableBlocksRef.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/executableblocks/ExecutableBlocksRef.java @@ -4,10 +4,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.SerializerProvider; import com.ssomar.executableblocks.executableblocks.ExecutableBlocksManager; -import java.io.IOException; -import java.util.Locale; -import java.util.Optional; - import com.wolfyscript.utilities.bukkit.world.items.reference.StackIdentifier; import me.wolfyscript.utilities.api.inventory.custom_items.references.APIReference; import me.wolfyscript.utilities.compatibility.plugins.ExecutableBlocksIntegration; @@ -15,6 +11,10 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.Nullable; +import java.io.IOException; +import java.util.Locale; +import java.util.Optional; + public class ExecutableBlocksRef extends APIReference { private final ExecutableBlocksIntegration integration; diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/itemsadder/CustomBlockWrapper.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/itemsadder/CustomBlockWrapper.java index 71823e6d..7a876f3d 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/itemsadder/CustomBlockWrapper.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/itemsadder/CustomBlockWrapper.java @@ -1,7 +1,5 @@ package me.wolfyscript.utilities.compatibility.plugins.itemsadder; -import java.util.List; -import java.util.Optional; import org.bukkit.Location; import org.bukkit.block.Block; import org.bukkit.block.data.BlockData; @@ -9,6 +7,9 @@ import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.List; +import java.util.Optional; + public class CustomBlockWrapper implements CustomBlock { private final dev.lone.itemsadder.api.CustomBlock iaBlock; diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/itemsadder/CustomStackWrapper.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/itemsadder/CustomStackWrapper.java index 622b1d69..12eb284a 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/itemsadder/CustomStackWrapper.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/itemsadder/CustomStackWrapper.java @@ -18,11 +18,12 @@ package me.wolfyscript.utilities.compatibility.plugins.itemsadder; -import java.util.Optional; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; +import java.util.Optional; + public class CustomStackWrapper implements CustomStack { private final dev.lone.itemsadder.api.CustomStack item; diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/itemsadder/ItemsAdderImpl.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/itemsadder/ItemsAdderImpl.java index eb3ce50f..2a78c312 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/itemsadder/ItemsAdderImpl.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/itemsadder/ItemsAdderImpl.java @@ -19,7 +19,6 @@ package me.wolfyscript.utilities.compatibility.plugins.itemsadder; import dev.lone.itemsadder.api.Events.ItemsAdderLoadDataEvent; -import java.util.Optional; import me.wolfyscript.utilities.annotations.WUPluginIntegration; import me.wolfyscript.utilities.api.WolfyUtilCore; import me.wolfyscript.utilities.api.inventory.custom_items.references.APIReference; @@ -33,6 +32,8 @@ import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.Nullable; +import java.util.Optional; + @WUPluginIntegration(pluginName = ItemsAdderIntegration.KEY) public class ItemsAdderImpl extends PluginIntegrationAbstract implements ItemsAdderIntegration, Listener { diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/itemsadder/ItemsAdderRefImpl.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/itemsadder/ItemsAdderRefImpl.java index ebb89774..43ce8d7b 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/itemsadder/ItemsAdderRefImpl.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/itemsadder/ItemsAdderRefImpl.java @@ -21,15 +21,15 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.SerializerProvider; -import java.io.IOException; -import java.util.Objects; - import com.wolfyscript.utilities.bukkit.world.items.reference.StackIdentifier; +import dev.lone.itemsadder.api.CustomStack; import me.wolfyscript.utilities.api.inventory.custom_items.references.APIReference; import me.wolfyscript.utilities.util.inventory.ItemUtils; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.Nullable; -import dev.lone.itemsadder.api.CustomStack; + +import java.io.IOException; +import java.util.Objects; /** * Links to an ItemsAdder item and saves the item key accordingly. diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/magic/MagicRefImpl.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/magic/MagicRefImpl.java index 28722c04..626c6bf9 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/magic/MagicRefImpl.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/magic/MagicRefImpl.java @@ -22,9 +22,6 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.SerializerProvider; -import java.io.IOException; -import java.util.Objects; - import com.wolfyscript.utilities.bukkit.world.items.reference.StackIdentifier; import me.wolfyscript.utilities.api.inventory.custom_items.references.APIReference; import me.wolfyscript.utilities.util.inventory.ItemUtils; @@ -32,6 +29,9 @@ import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.Nullable; +import java.io.IOException; +import java.util.Objects; + /** * Links to an item from Magic. */ diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mmoitems/MMOItemsRefImpl.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mmoitems/MMOItemsRefImpl.java index 6ac80d52..40f24657 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mmoitems/MMOItemsRefImpl.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mmoitems/MMOItemsRefImpl.java @@ -22,8 +22,6 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.SerializerProvider; import io.lumine.mythic.lib.api.item.NBTItem; -import java.io.IOException; -import java.util.Objects; import me.wolfyscript.utilities.api.inventory.custom_items.references.APIReference; import net.Indyuce.mmoitems.MMOItems; import net.Indyuce.mmoitems.api.Type; @@ -31,6 +29,9 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.Nullable; +import java.io.IOException; +import java.util.Objects; + /** * Links to MMOItems and saves the specified {@link Type} and Name of the item. */ diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mythicmobs/AbstractMythicMobsRef.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mythicmobs/AbstractMythicMobsRef.java index afc83971..6fd14b07 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mythicmobs/AbstractMythicMobsRef.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/mythicmobs/AbstractMythicMobsRef.java @@ -20,8 +20,6 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.SerializerProvider; -import java.io.IOException; -import java.util.Objects; import me.wolfyscript.utilities.api.WolfyUtilities; import me.wolfyscript.utilities.api.inventory.custom_items.references.APIReference; import me.wolfyscript.utilities.api.nms.nbt.NBTItem; @@ -29,6 +27,9 @@ import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.Nullable; +import java.io.IOException; +import java.util.Objects; + public abstract class AbstractMythicMobsRef extends APIReference implements MythicMobsRef { protected static final String ITEM_KEY = "MYTHIC_TYPE"; diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/oraxen/OraxenRefImpl.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/oraxen/OraxenRefImpl.java index 3c948d49..c0e48372 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/oraxen/OraxenRefImpl.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/oraxen/OraxenRefImpl.java @@ -21,15 +21,15 @@ import com.fasterxml.jackson.core.JsonGenerator; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.SerializerProvider; -import com.wolfyscript.utilities.bukkit.world.items.reference.StackIdentifier; import io.th0rgal.oraxen.api.OraxenItems; -import java.io.IOException; -import java.util.Objects; import me.wolfyscript.utilities.api.inventory.custom_items.references.APIReference; import me.wolfyscript.utilities.util.inventory.ItemUtils; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.Nullable; +import java.io.IOException; +import java.util.Objects; + /** * Links to Oraxen and saves the specified id of the item. */ diff --git a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/oraxen/OraxenRefOldImpl.java b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/oraxen/OraxenRefOldImpl.java index 226bd3b0..ca03f31d 100644 --- a/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/oraxen/OraxenRefOldImpl.java +++ b/plugin-compatibility/src/main/java/me/wolfyscript/utilities/compatibility/plugins/oraxen/OraxenRefOldImpl.java @@ -22,13 +22,14 @@ import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.SerializerProvider; import io.th0rgal.oraxen.items.OraxenItems; -import java.io.IOException; -import java.util.Objects; import me.wolfyscript.utilities.api.inventory.custom_items.references.APIReference; import me.wolfyscript.utilities.util.inventory.ItemUtils; import org.bukkit.inventory.ItemStack; import org.jetbrains.annotations.Nullable; +import java.io.IOException; +import java.util.Objects; + /** * Links to Oraxen and saves the specified id of the item. */