From 31f0ba206d5cf075d7f28adf36e97cc5f86e86c4 Mon Sep 17 00:00:00 2001 From: filoghost Date: Sun, 20 Jun 2021 12:41:52 +0200 Subject: [PATCH] Format imports --- .../holographicdisplays/api/HologramsAPI.java | 2 +- .../plugin/HolographicDisplays.java | 18 +++++++++--------- .../bridge/bungeecord/BungeeServerTracker.java | 2 +- .../bridge/protocollib/PacketListener.java | 12 ++++++------ .../bridge/protocollib/PacketSender.java | 16 ++++++++-------- .../commands/HologramCommandManager.java | 18 +++++++++--------- .../plugin/commands/subs/DebugCommand.java | 6 +++--- .../plugin/commands/subs/DeleteCommand.java | 2 +- .../plugin/commands/subs/EditCommand.java | 2 +- .../plugin/commands/subs/InfoCommand.java | 2 +- .../commands/subs/InsertlineCommand.java | 2 +- .../plugin/commands/subs/ReadimageCommand.java | 8 ++++---- .../plugin/disk/ConfigurationFileModel.java | 2 +- .../plugin/disk/HologramLineParser.java | 4 ++-- .../plugin/hologram/api/APIHologram.java | 4 ++-- .../hologram/api/APIHologramManager.java | 2 +- .../api/DefaultVisibilitySettings.java | 2 +- .../plugin/hologram/base/BaseHologram.java | 2 +- .../hologram/internal/InternalHologram.java | 2 +- .../plugin/image/ImageMessage.java | 4 +--- .../plugin/lib/nbt/parser/MojangsonParser.java | 4 ++-- .../plugin/listener/InteractListener.java | 4 ++-- .../internal/AnimationRegistry.java | 4 ++-- .../internal/DefaultPlaceholders.java | 2 +- .../registry/PlaceholderExpansion.java | 4 ++-- .../registry/PlaceholderRegistry.java | 4 ++-- .../placeholder/tracking/TrackedLine.java | 2 +- .../parsing/StringWithPlaceholdersTest.java | 2 -- 28 files changed, 67 insertions(+), 71 deletions(-) diff --git a/legacy-api/v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/HologramsAPI.java b/legacy-api/v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/HologramsAPI.java index 10e83327..84dde9b8 100644 --- a/legacy-api/v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/HologramsAPI.java +++ b/legacy-api/v2/src/main/java/com/gmail/filoghost/holographicdisplays/api/HologramsAPI.java @@ -5,8 +5,8 @@ */ package com.gmail.filoghost.holographicdisplays.api; -import com.gmail.filoghost.holographicdisplays.api.placeholder.PlaceholderReplacer; import com.gmail.filoghost.holographicdisplays.api.internal.HologramsAPIProvider; +import com.gmail.filoghost.holographicdisplays.api.placeholder.PlaceholderReplacer; import org.bukkit.Location; import org.bukkit.entity.Entity; import org.bukkit.plugin.Plugin; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/HolographicDisplays.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/HolographicDisplays.java index 217f3339..6f1b8a4b 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/HolographicDisplays.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/HolographicDisplays.java @@ -11,34 +11,34 @@ import me.filoghost.fcommons.FeatureSupport; import me.filoghost.fcommons.config.exception.ConfigException; import me.filoghost.fcommons.logging.ErrorCollector; import me.filoghost.holographicdisplays.api.internal.HolographicDisplaysAPIProvider; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; import me.filoghost.holographicdisplays.plugin.api.current.DefaultHolographicDisplaysAPIProvider; +import me.filoghost.holographicdisplays.plugin.api.v2.V2HologramsAPIProvider; import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.BungeeServerTracker; import me.filoghost.holographicdisplays.plugin.bridge.placeholderapi.PlaceholderAPIHook; import me.filoghost.holographicdisplays.plugin.bridge.protocollib.ProtocolLibHook; import me.filoghost.holographicdisplays.plugin.commands.HologramCommandManager; -import me.filoghost.holographicdisplays.common.nms.NMSManager; -import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; import me.filoghost.holographicdisplays.plugin.disk.ConfigManager; import me.filoghost.holographicdisplays.plugin.disk.Configuration; import me.filoghost.holographicdisplays.plugin.disk.HologramDatabase; import me.filoghost.holographicdisplays.plugin.disk.upgrade.LegacySymbolsUpgrade; -import me.filoghost.holographicdisplays.plugin.api.v2.V2HologramsAPIProvider; +import me.filoghost.holographicdisplays.plugin.hologram.api.APIHologram; +import me.filoghost.holographicdisplays.plugin.hologram.api.APIHologramManager; +import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologram; +import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologramManager; import me.filoghost.holographicdisplays.plugin.listener.ChunkListener; import me.filoghost.holographicdisplays.plugin.listener.InteractListener; import me.filoghost.holographicdisplays.plugin.listener.SpawnListener; import me.filoghost.holographicdisplays.plugin.listener.UpdateNotificationListener; import me.filoghost.holographicdisplays.plugin.log.PrintableErrorCollector; -import me.filoghost.holographicdisplays.plugin.hologram.api.APIHologram; -import me.filoghost.holographicdisplays.plugin.hologram.api.APIHologramManager; -import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologram; -import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologramManager; -import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; -import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderTracker; import me.filoghost.holographicdisplays.plugin.placeholder.TickClock; import me.filoghost.holographicdisplays.plugin.placeholder.TickingTask; import me.filoghost.holographicdisplays.plugin.placeholder.internal.AnimationRegistry; import me.filoghost.holographicdisplays.plugin.placeholder.internal.DefaultPlaceholders; import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderRegistry; +import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; +import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderTracker; import me.filoghost.holographicdisplays.plugin.util.NMSVersion; import org.bstats.bukkit.MetricsLite; import org.bukkit.Bukkit; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/BungeeServerTracker.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/BungeeServerTracker.java index d4840b72..e577ff73 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/BungeeServerTracker.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/bungeecord/BungeeServerTracker.java @@ -6,10 +6,10 @@ package me.filoghost.holographicdisplays.plugin.bridge.bungeecord; import me.filoghost.fcommons.logging.Log; +import me.filoghost.holographicdisplays.common.DebugLogger; import me.filoghost.holographicdisplays.plugin.HolographicDisplays; import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.pinger.PingResponse; import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.pinger.ServerPinger; -import me.filoghost.holographicdisplays.common.DebugLogger; import me.filoghost.holographicdisplays.plugin.disk.Configuration; import me.filoghost.holographicdisplays.plugin.disk.ServerAddress; import org.bukkit.Bukkit; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketListener.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketListener.java index 62d0d4fe..e171b620 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketListener.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketListener.java @@ -12,18 +12,18 @@ import com.comphenix.protocol.events.PacketAdapter; import com.comphenix.protocol.events.PacketContainer; import com.comphenix.protocol.events.PacketEvent; import com.comphenix.protocol.wrappers.WrappedWatchableObject; -import me.filoghost.holographicdisplays.plugin.bridge.placeholderapi.PlaceholderAPIHook; -import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.AbstractPacket; -import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerEntityMetadata; -import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerSpawnEntityLiving; -import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; -import me.filoghost.holographicdisplays.plugin.placeholder.tracking.TrackedLine; import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; import me.filoghost.holographicdisplays.common.hologram.StandardTextLine; import me.filoghost.holographicdisplays.common.nms.NMSManager; import me.filoghost.holographicdisplays.common.nms.ProtocolPacketSettings; import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; +import me.filoghost.holographicdisplays.plugin.bridge.placeholderapi.PlaceholderAPIHook; +import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.AbstractPacket; +import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerEntityMetadata; +import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerSpawnEntityLiving; +import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; +import me.filoghost.holographicdisplays.plugin.placeholder.tracking.TrackedLine; import me.filoghost.holographicdisplays.plugin.util.NMSVersion; import org.bukkit.entity.Player; import org.bukkit.plugin.Plugin; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketSender.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketSender.java index 4d5951fb..3181f63b 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketSender.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/bridge/protocollib/PacketSender.java @@ -6,14 +6,6 @@ package me.filoghost.holographicdisplays.plugin.bridge.protocollib; import com.comphenix.protocol.wrappers.WrappedDataWatcher; -import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.AbstractPacket; -import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerAttachEntity; -import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerEntityDestroy; -import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerEntityMetadata; -import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerMount; -import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerSpawnEntity; -import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerSpawnEntity.ObjectTypes; -import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerSpawnEntityLiving; import me.filoghost.holographicdisplays.common.hologram.StandardHologram; import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; import me.filoghost.holographicdisplays.common.hologram.StandardItemLine; @@ -23,6 +15,14 @@ import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import me.filoghost.holographicdisplays.common.nms.entity.NMSItem; import me.filoghost.holographicdisplays.common.nms.entity.NMSSlime; +import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.AbstractPacket; +import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerAttachEntity; +import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerEntityDestroy; +import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerEntityMetadata; +import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerMount; +import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerSpawnEntity; +import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerSpawnEntity.ObjectTypes; +import me.filoghost.holographicdisplays.plugin.lib.packetwrapper.WrapperPlayServerSpawnEntityLiving; import me.filoghost.holographicdisplays.plugin.util.NMSVersion; import org.bukkit.entity.Player; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramCommandManager.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramCommandManager.java index fdf2b751..20fbb40c 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramCommandManager.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/HologramCommandManager.java @@ -9,12 +9,21 @@ import me.filoghost.fcommons.command.CommandContext; import me.filoghost.fcommons.command.sub.SubCommand; import me.filoghost.fcommons.command.sub.SubCommandContext; import me.filoghost.fcommons.command.sub.SubCommandManager; +import me.filoghost.holographicdisplays.common.Utils; +import me.filoghost.holographicdisplays.common.nms.NMSManager; import me.filoghost.holographicdisplays.plugin.Colors; import me.filoghost.holographicdisplays.plugin.HolographicDisplays; import me.filoghost.holographicdisplays.plugin.commands.subs.AddlineCommand; import me.filoghost.holographicdisplays.plugin.commands.subs.AlignCommand; import me.filoghost.holographicdisplays.plugin.commands.subs.CopyCommand; import me.filoghost.holographicdisplays.plugin.commands.subs.CreateCommand; +import me.filoghost.holographicdisplays.plugin.commands.subs.DebugCommand; +import me.filoghost.holographicdisplays.plugin.commands.subs.DeleteCommand; +import me.filoghost.holographicdisplays.plugin.commands.subs.EditCommand; +import me.filoghost.holographicdisplays.plugin.commands.subs.HelpCommand; +import me.filoghost.holographicdisplays.plugin.commands.subs.InfoCommand; +import me.filoghost.holographicdisplays.plugin.commands.subs.InsertlineCommand; +import me.filoghost.holographicdisplays.plugin.commands.subs.ListCommand; import me.filoghost.holographicdisplays.plugin.commands.subs.MovehereCommand; import me.filoghost.holographicdisplays.plugin.commands.subs.NearCommand; import me.filoghost.holographicdisplays.plugin.commands.subs.QuickEditCommand; @@ -24,15 +33,6 @@ import me.filoghost.holographicdisplays.plugin.commands.subs.ReloadCommand; import me.filoghost.holographicdisplays.plugin.commands.subs.RemovelineCommand; import me.filoghost.holographicdisplays.plugin.commands.subs.SetlineCommand; import me.filoghost.holographicdisplays.plugin.commands.subs.TeleportCommand; -import me.filoghost.holographicdisplays.plugin.commands.subs.DebugCommand; -import me.filoghost.holographicdisplays.plugin.commands.subs.DeleteCommand; -import me.filoghost.holographicdisplays.plugin.commands.subs.EditCommand; -import me.filoghost.holographicdisplays.plugin.commands.subs.HelpCommand; -import me.filoghost.holographicdisplays.plugin.commands.subs.InfoCommand; -import me.filoghost.holographicdisplays.plugin.commands.subs.InsertlineCommand; -import me.filoghost.holographicdisplays.plugin.commands.subs.ListCommand; -import me.filoghost.holographicdisplays.common.Utils; -import me.filoghost.holographicdisplays.common.nms.NMSManager; import me.filoghost.holographicdisplays.plugin.disk.ConfigManager; import me.filoghost.holographicdisplays.plugin.disk.Configuration; import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologram; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/DebugCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/DebugCommand.java index 3f6cf88d..216a9074 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/DebugCommand.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/DebugCommand.java @@ -6,11 +6,11 @@ package me.filoghost.holographicdisplays.plugin.commands.subs; import me.filoghost.fcommons.command.sub.SubCommandContext; -import me.filoghost.holographicdisplays.plugin.Colors; -import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand; +import me.filoghost.holographicdisplays.common.hologram.StandardHologram; import me.filoghost.holographicdisplays.common.nms.NMSManager; import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; -import me.filoghost.holographicdisplays.common.hologram.StandardHologram; +import me.filoghost.holographicdisplays.plugin.Colors; +import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand; import org.bukkit.Bukkit; import org.bukkit.Chunk; import org.bukkit.World; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/DeleteCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/DeleteCommand.java index 37ae06b2..e8ec4c82 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/DeleteCommand.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/DeleteCommand.java @@ -8,8 +8,8 @@ package me.filoghost.holographicdisplays.plugin.commands.subs; import me.filoghost.fcommons.command.sub.SubCommandContext; import me.filoghost.fcommons.command.validation.CommandException; import me.filoghost.holographicdisplays.plugin.Colors; -import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand; import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate; +import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand; import me.filoghost.holographicdisplays.plugin.disk.ConfigManager; import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologram; import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologramManager; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/EditCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/EditCommand.java index 0d98762b..9b92c3b0 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/EditCommand.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/EditCommand.java @@ -9,9 +9,9 @@ import me.filoghost.fcommons.command.sub.SubCommandContext; import me.filoghost.fcommons.command.validation.CommandException; import me.filoghost.holographicdisplays.plugin.Colors; import me.filoghost.holographicdisplays.plugin.commands.HologramCommandManager; +import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate; import me.filoghost.holographicdisplays.plugin.commands.HologramSubCommand; import me.filoghost.holographicdisplays.plugin.commands.Messages; -import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate; import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologram; import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologramManager; import net.md_5.bungee.api.ChatColor; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/InfoCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/InfoCommand.java index de586606..b066b49a 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/InfoCommand.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/InfoCommand.java @@ -9,8 +9,8 @@ import me.filoghost.fcommons.command.sub.SubCommandContext; import me.filoghost.fcommons.command.validation.CommandException; import me.filoghost.holographicdisplays.plugin.Colors; import me.filoghost.holographicdisplays.plugin.commands.HologramCommandManager; -import me.filoghost.holographicdisplays.plugin.commands.Messages; import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate; +import me.filoghost.holographicdisplays.plugin.commands.Messages; import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologram; import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologramLine; import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologramManager; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/InsertlineCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/InsertlineCommand.java index 4242b504..8cb64881 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/InsertlineCommand.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/InsertlineCommand.java @@ -11,8 +11,8 @@ import me.filoghost.fcommons.command.validation.CommandException; import me.filoghost.fcommons.command.validation.CommandValidate; import me.filoghost.holographicdisplays.plugin.Colors; import me.filoghost.holographicdisplays.plugin.commands.HologramCommandManager; -import me.filoghost.holographicdisplays.plugin.commands.Messages; import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate; +import me.filoghost.holographicdisplays.plugin.commands.Messages; import me.filoghost.holographicdisplays.plugin.disk.ConfigManager; import me.filoghost.holographicdisplays.plugin.event.InternalHologramEditEvent; import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologram; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/ReadimageCommand.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/ReadimageCommand.java index 1420f8c0..2815f6a8 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/ReadimageCommand.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/commands/subs/ReadimageCommand.java @@ -11,10 +11,6 @@ import me.filoghost.fcommons.command.validation.CommandException; import me.filoghost.fcommons.command.validation.CommandValidate; import me.filoghost.fcommons.logging.Log; import me.filoghost.holographicdisplays.plugin.Colors; -import me.filoghost.holographicdisplays.plugin.image.ImageMessage; -import me.filoghost.holographicdisplays.plugin.image.ImageReadException; -import me.filoghost.holographicdisplays.plugin.image.ImageReader; -import me.filoghost.holographicdisplays.plugin.image.ImageTooWideException; import me.filoghost.holographicdisplays.plugin.commands.HologramCommandValidate; import me.filoghost.holographicdisplays.plugin.commands.Messages; import me.filoghost.holographicdisplays.plugin.disk.ConfigManager; @@ -22,6 +18,10 @@ import me.filoghost.holographicdisplays.plugin.event.InternalHologramEditEvent; import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologram; import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologramManager; import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalTextLine; +import me.filoghost.holographicdisplays.plugin.image.ImageMessage; +import me.filoghost.holographicdisplays.plugin.image.ImageReadException; +import me.filoghost.holographicdisplays.plugin.image.ImageReader; +import me.filoghost.holographicdisplays.plugin.image.ImageTooWideException; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/ConfigurationFileModel.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/ConfigurationFileModel.java index 94bfe549..c08cef6f 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/ConfigurationFileModel.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/ConfigurationFileModel.java @@ -6,8 +6,8 @@ package me.filoghost.holographicdisplays.plugin.disk; import me.filoghost.fcommons.config.Config; -import me.filoghost.fcommons.config.mapped.Path; import me.filoghost.fcommons.config.mapped.MappedConfig; +import me.filoghost.fcommons.config.mapped.Path; import java.util.Arrays; import java.util.List; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramLineParser.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramLineParser.java index 15653b3f..46e5082e 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramLineParser.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/disk/HologramLineParser.java @@ -7,10 +7,10 @@ package me.filoghost.holographicdisplays.plugin.disk; import me.filoghost.fcommons.MaterialsHelper; import me.filoghost.fcommons.Strings; -import me.filoghost.holographicdisplays.plugin.lib.nbt.parser.MojangsonParseException; -import me.filoghost.holographicdisplays.plugin.lib.nbt.parser.MojangsonParser; import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologram; import me.filoghost.holographicdisplays.plugin.hologram.internal.InternalHologramLine; +import me.filoghost.holographicdisplays.plugin.lib.nbt.parser.MojangsonParseException; +import me.filoghost.holographicdisplays.plugin.lib.nbt.parser.MojangsonParser; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologram.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologram.java index 8bd88c83..59a0276c 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologram.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologram.java @@ -8,10 +8,10 @@ package me.filoghost.holographicdisplays.plugin.hologram.api; import me.filoghost.fcommons.Preconditions; import me.filoghost.holographicdisplays.api.Hologram; import me.filoghost.holographicdisplays.common.nms.NMSManager; -import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; -import me.filoghost.holographicdisplays.plugin.disk.Configuration; import me.filoghost.holographicdisplays.plugin.api.v2.V2HologramAdapter; +import me.filoghost.holographicdisplays.plugin.disk.Configuration; import me.filoghost.holographicdisplays.plugin.hologram.base.BaseHologram; +import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologramManager.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologramManager.java index b402eeef..f6ff2668 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologramManager.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/APIHologramManager.java @@ -7,8 +7,8 @@ package me.filoghost.holographicdisplays.plugin.hologram.api; import me.filoghost.holographicdisplays.api.Hologram; import me.filoghost.holographicdisplays.common.nms.NMSManager; -import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; import me.filoghost.holographicdisplays.plugin.hologram.base.BaseHologramManager; +import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; import org.bukkit.Location; import org.bukkit.plugin.Plugin; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/DefaultVisibilitySettings.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/DefaultVisibilitySettings.java index b54c4368..e78c5b08 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/DefaultVisibilitySettings.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/api/DefaultVisibilitySettings.java @@ -7,9 +7,9 @@ package me.filoghost.holographicdisplays.plugin.hologram.api; import me.filoghost.fcommons.Preconditions; import me.filoghost.holographicdisplays.api.VisibilitySettings; -import me.filoghost.holographicdisplays.plugin.bridge.protocollib.ProtocolLibHook; import me.filoghost.holographicdisplays.common.hologram.StandardHologram; import me.filoghost.holographicdisplays.plugin.api.v2.V2VisibilityManagerAdapter; +import me.filoghost.holographicdisplays.plugin.bridge.protocollib.ProtocolLibHook; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.jetbrains.annotations.NotNull; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseHologram.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseHologram.java index f7690f76..f6c9566e 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseHologram.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/base/BaseHologram.java @@ -9,8 +9,8 @@ import me.filoghost.fcommons.Preconditions; import me.filoghost.holographicdisplays.common.hologram.StandardHologram; import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; import me.filoghost.holographicdisplays.common.nms.NMSManager; -import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; import me.filoghost.holographicdisplays.plugin.disk.Configuration; +import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; import org.bukkit.Location; import org.bukkit.World; import org.jetbrains.annotations.NotNull; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/internal/InternalHologram.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/internal/InternalHologram.java index c877b46c..51b64f23 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/internal/InternalHologram.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/hologram/internal/InternalHologram.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.plugin.hologram.internal; +import me.filoghost.holographicdisplays.common.nms.NMSManager; import me.filoghost.holographicdisplays.plugin.HolographicDisplays; import me.filoghost.holographicdisplays.plugin.hologram.base.BaseHologram; import me.filoghost.holographicdisplays.plugin.placeholder.tracking.PlaceholderLineTracker; -import me.filoghost.holographicdisplays.common.nms.NMSManager; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.inventory.ItemStack; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/image/ImageMessage.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/image/ImageMessage.java index d02a7ddd..6e5e02c6 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/image/ImageMessage.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/image/ImageMessage.java @@ -8,9 +8,7 @@ package me.filoghost.holographicdisplays.plugin.image; import me.filoghost.holographicdisplays.plugin.disk.Configuration; import org.bukkit.ChatColor; -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.Image; +import java.awt.*; import java.awt.image.BufferedImage; import java.util.HashMap; import java.util.Map; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/parser/MojangsonParser.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/parser/MojangsonParser.java index 47521514..5e9a8632 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/parser/MojangsonParser.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/lib/nbt/parser/MojangsonParser.java @@ -15,10 +15,10 @@ import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTIntArray; import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTList; import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTLong; import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTLongArray; +import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTShort; +import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTString; import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTTag; import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTType; -import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTString; -import me.filoghost.holographicdisplays.plugin.lib.nbt.NBTShort; import java.util.ArrayList; import java.util.List; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/InteractListener.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/InteractListener.java index 3a0e68ea..7ec07430 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/InteractListener.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/listener/InteractListener.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.plugin.listener; -import me.filoghost.holographicdisplays.common.nms.NMSManager; -import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import me.filoghost.holographicdisplays.common.hologram.StandardHologramLine; import me.filoghost.holographicdisplays.common.hologram.StandardTouchableLine; +import me.filoghost.holographicdisplays.common.nms.NMSManager; +import me.filoghost.holographicdisplays.common.nms.entity.NMSEntity; import org.bukkit.GameMode; import org.bukkit.entity.EntityType; import org.bukkit.entity.Player; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/AnimationRegistry.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/AnimationRegistry.java index 5d1ecba2..f04ac2d3 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/AnimationRegistry.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/AnimationRegistry.java @@ -7,11 +7,11 @@ package me.filoghost.holographicdisplays.plugin.placeholder.internal; import me.filoghost.fcommons.config.exception.ConfigSaveException; import me.filoghost.fcommons.logging.ErrorCollector; +import me.filoghost.holographicdisplays.api.placeholder.Placeholder; +import me.filoghost.holographicdisplays.api.placeholder.PlaceholderFactory; import me.filoghost.holographicdisplays.common.DebugLogger; import me.filoghost.holographicdisplays.plugin.disk.ConfigManager; import me.filoghost.holographicdisplays.plugin.disk.TextFormatter; -import me.filoghost.holographicdisplays.api.placeholder.Placeholder; -import me.filoghost.holographicdisplays.api.placeholder.PlaceholderFactory; import java.io.IOException; import java.nio.file.Files; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/DefaultPlaceholders.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/DefaultPlaceholders.java index 7edc9a41..9ba0d059 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/DefaultPlaceholders.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/internal/DefaultPlaceholders.java @@ -7,10 +7,10 @@ package me.filoghost.holographicdisplays.plugin.placeholder.internal; import me.filoghost.fcommons.collection.CollectionUtils; import me.filoghost.holographicdisplays.plugin.HolographicDisplays; -import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderRegistry; import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.BungeeServerTracker; import me.filoghost.holographicdisplays.plugin.bridge.bungeecord.ServerInfo; import me.filoghost.holographicdisplays.plugin.disk.Configuration; +import me.filoghost.holographicdisplays.plugin.placeholder.registry.PlaceholderRegistry; import org.bukkit.Bukkit; import org.bukkit.ChatColor; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderExpansion.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderExpansion.java index 4dd3af23..8c78296a 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderExpansion.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderExpansion.java @@ -5,10 +5,10 @@ */ package me.filoghost.holographicdisplays.plugin.placeholder.registry; -import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PluginName; +import me.filoghost.holographicdisplays.plugin.placeholder.PlaceholderException; import me.filoghost.holographicdisplays.plugin.placeholder.StandardPlaceholder; import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderIdentifier; -import me.filoghost.holographicdisplays.plugin.placeholder.PlaceholderException; +import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PluginName; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.Nullable; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderRegistry.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderRegistry.java index 36910905..c1a7d574 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderRegistry.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/registry/PlaceholderRegistry.java @@ -8,15 +8,15 @@ package me.filoghost.holographicdisplays.plugin.placeholder.registry; import com.google.common.collect.HashBasedTable; import com.google.common.collect.Iterables; import com.google.common.collect.Table; +import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholder; import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderFactory; import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholderReplacer; import me.filoghost.holographicdisplays.api.placeholder.Placeholder; import me.filoghost.holographicdisplays.api.placeholder.PlaceholderFactory; import me.filoghost.holographicdisplays.api.placeholder.PlaceholderReplacer; -import me.filoghost.holographicdisplays.api.placeholder.IndividualPlaceholder; -import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PluginName; import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderIdentifier; import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderOccurrence; +import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PluginName; import org.bukkit.plugin.Plugin; import org.jetbrains.annotations.Nullable; diff --git a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedLine.java b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedLine.java index e13b74e1..3b85de26 100644 --- a/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedLine.java +++ b/plugin/src/main/java/me/filoghost/holographicdisplays/plugin/placeholder/tracking/TrackedLine.java @@ -7,8 +7,8 @@ package me.filoghost.holographicdisplays.plugin.placeholder.tracking; import me.filoghost.holographicdisplays.common.hologram.StandardTextLine; import me.filoghost.holographicdisplays.common.nms.entity.NMSArmorStand; -import me.filoghost.holographicdisplays.plugin.placeholder.parsing.StringWithPlaceholders; import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderReplaceFunction; +import me.filoghost.holographicdisplays.plugin.placeholder.parsing.StringWithPlaceholders; import org.bukkit.entity.Player; public class TrackedLine { diff --git a/plugin/src/test/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/StringWithPlaceholdersTest.java b/plugin/src/test/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/StringWithPlaceholdersTest.java index 58ed2732..de0d50fa 100644 --- a/plugin/src/test/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/StringWithPlaceholdersTest.java +++ b/plugin/src/test/java/me/filoghost/holographicdisplays/plugin/placeholder/parsing/StringWithPlaceholdersTest.java @@ -5,8 +5,6 @@ */ package me.filoghost.holographicdisplays.plugin.placeholder.parsing; -import me.filoghost.holographicdisplays.plugin.placeholder.parsing.PlaceholderOccurrence; -import me.filoghost.holographicdisplays.plugin.placeholder.parsing.StringWithPlaceholders; import org.junit.jupiter.api.Test; import org.junit.jupiter.params.ParameterizedTest; import org.junit.jupiter.params.provider.Arguments;