Optimize imports

plugin/src/main/java/me/libraryaddict/disguise/DisguiseAPI.java

@@ -3,8 +3,21 @@ package me.libraryaddict.disguise;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher;
 import com.comphenix.protocol.wrappers.WrappedGameProfile;
 import com.comphenix.protocol.wrappers.WrappedWatchableObject;
+import java.io.File;
+import java.io.IOException;
 import java.util.ArrayList;
-import me.libraryaddict.disguise.disguisetypes.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.List;
+import java.util.Map;
+import me.libraryaddict.disguise.disguisetypes.Disguise;
+import me.libraryaddict.disguise.disguisetypes.DisguiseType;
+import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
+import me.libraryaddict.disguise.disguisetypes.MetaIndex;
+import me.libraryaddict.disguise.disguisetypes.MiscDisguise;
+import me.libraryaddict.disguise.disguisetypes.MobDisguise;
+import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
+import me.libraryaddict.disguise.disguisetypes.TargetedDisguise;
 import me.libraryaddict.disguise.disguisetypes.TargetedDisguise.TargetType;
 import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
 import me.libraryaddict.disguise.utilities.DisguiseUtilities;
@@ -23,13 +36,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.EntityEquipment;
 import org.bukkit.inventory.ItemStack;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
-
 public class DisguiseAPI {
     private static int selfDisguiseId;
     private static int entityAttachmentId;

plugin/src/main/java/me/libraryaddict/disguise/DisguiseConfig.java

@@ -1,5 +1,17 @@
 package me.libraryaddict.disguise;
 
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.Locale;
+import java.util.Map.Entry;
+import java.util.Random;
+import java.util.concurrent.TimeUnit;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
@@ -29,11 +41,6 @@ import org.bukkit.permissions.Permission;
 import org.bukkit.permissions.PermissionDefault;
 import org.bukkit.scheduler.BukkitTask;
 
-import java.io.*;
-import java.util.*;
-import java.util.Map.Entry;
-import java.util.concurrent.TimeUnit;
-
 public class DisguiseConfig {
     @Getter
     @Setter

plugin/src/main/java/me/libraryaddict/disguise/LibsDisguises.java

@@ -1,6 +1,10 @@
 package me.libraryaddict.disguise;
 
-import com.comphenix.protocol.ProtocolLibrary;
+import java.io.File;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.stream.Collectors;
 import lombok.Getter;
 import me.libraryaddict.disguise.commands.LibsDisguisesCommand;
 import me.libraryaddict.disguise.commands.disguise.DisguiseCommand;
@@ -15,7 +19,14 @@ import me.libraryaddict.disguise.commands.undisguise.UndisguiseCommand;
 import me.libraryaddict.disguise.commands.undisguise.UndisguiseEntityCommand;
 import me.libraryaddict.disguise.commands.undisguise.UndisguisePlayerCommand;
 import me.libraryaddict.disguise.commands.undisguise.UndisguiseRadiusCommand;
-import me.libraryaddict.disguise.commands.utils.*;
+import me.libraryaddict.disguise.commands.utils.CopyDisguiseCommand;
+import me.libraryaddict.disguise.commands.utils.DisguiseCloneCommand;
+import me.libraryaddict.disguise.commands.utils.DisguiseHelpCommand;
+import me.libraryaddict.disguise.commands.utils.DisguiseViewBarCommand;
+import me.libraryaddict.disguise.commands.utils.DisguiseViewSelfCommand;
+import me.libraryaddict.disguise.commands.utils.GrabHeadCommand;
+import me.libraryaddict.disguise.commands.utils.GrabSkinCommand;
+import me.libraryaddict.disguise.commands.utils.SaveDisguiseCommand;
 import me.libraryaddict.disguise.utilities.DisguiseUtilities;
 import me.libraryaddict.disguise.utilities.LibsPremium;
 import me.libraryaddict.disguise.utilities.config.DisguiseCommandConfig;
@@ -32,18 +43,16 @@ import me.libraryaddict.disguise.utilities.sounds.SoundManager;
 import me.libraryaddict.disguise.utilities.updates.UpdateChecker;
 import org.apache.commons.lang.StringUtils;
 import org.bukkit.Bukkit;
-import org.bukkit.command.*;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandMap;
+import org.bukkit.command.PluginCommand;
+import org.bukkit.command.TabCompleter;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.Plugin;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import java.io.File;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.stream.Collectors;
-
 public class LibsDisguises extends JavaPlugin {
     private static LibsDisguises instance;
     private DisguiseListener listener;

plugin/src/main/java/me/libraryaddict/disguise/commands/DisguiseBaseCommand.java

@@ -3,6 +3,16 @@ package me.libraryaddict.disguise.commands;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.commands.disguise.DisguiseCommand;
 import me.libraryaddict.disguise.commands.disguise.DisguiseEntityCommand;
@@ -30,9 +40,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
 /**
  * @author libraryaddict
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/LibsDisguisesCommand.java

@@ -1,8 +1,27 @@
 package me.libraryaddict.disguise.commands;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
 import lombok.Getter;
 import me.libraryaddict.disguise.LibsDisguises;
-import me.libraryaddict.disguise.commands.libsdisguises.*;
+import me.libraryaddict.disguise.commands.libsdisguises.LDChangelog;
+import me.libraryaddict.disguise.commands.libsdisguises.LDCommand;
+import me.libraryaddict.disguise.commands.libsdisguises.LDConfig;
+import me.libraryaddict.disguise.commands.libsdisguises.LDCount;
+import me.libraryaddict.disguise.commands.libsdisguises.LDDebugMineSkin;
+import me.libraryaddict.disguise.commands.libsdisguises.LDDebugPlayer;
+import me.libraryaddict.disguise.commands.libsdisguises.LDHelp;
+import me.libraryaddict.disguise.commands.libsdisguises.LDJson;
+import me.libraryaddict.disguise.commands.libsdisguises.LDMetaInfo;
+import me.libraryaddict.disguise.commands.libsdisguises.LDMods;
+import me.libraryaddict.disguise.commands.libsdisguises.LDPermTest;
+import me.libraryaddict.disguise.commands.libsdisguises.LDReload;
+import me.libraryaddict.disguise.commands.libsdisguises.LDScoreboard;
+import me.libraryaddict.disguise.commands.libsdisguises.LDUpdate;
+import me.libraryaddict.disguise.commands.libsdisguises.LDUpdateProtocolLib;
+import me.libraryaddict.disguise.commands.libsdisguises.LDUploadLogs;
 import me.libraryaddict.disguise.utilities.LibsPremium;
 import me.libraryaddict.disguise.utilities.translations.LibsMsg;
 import org.bukkit.ChatColor;
@@ -11,11 +30,6 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-
 public class LibsDisguisesCommand implements CommandExecutor, TabCompleter {
     @Getter
     private final ArrayList<LDCommand> commands = new ArrayList<>();

plugin/src/main/java/me/libraryaddict/disguise/commands/disguise/DisguiseCommand.java

@@ -1,5 +1,7 @@
 package me.libraryaddict.disguise.commands.disguise;
 
+import java.util.ArrayList;
+import java.util.List;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.commands.DisguiseBaseCommand;
@@ -17,9 +19,6 @@ import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class DisguiseCommand extends DisguiseBaseCommand implements TabCompleter {
     @Override
     public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {

plugin/src/main/java/me/libraryaddict/disguise/commands/disguise/DisguiseEntityCommand.java

@@ -1,5 +1,7 @@
 package me.libraryaddict.disguise.commands.disguise;
 
+import java.util.ArrayList;
+import java.util.List;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.commands.DisguiseBaseCommand;
@@ -16,9 +18,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class DisguiseEntityCommand extends DisguiseBaseCommand implements TabCompleter {
     @Override
     public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {

plugin/src/main/java/me/libraryaddict/disguise/commands/disguise/DisguisePlayerCommand.java

@@ -1,5 +1,8 @@
 package me.libraryaddict.disguise.commands.disguise;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.commands.DisguiseBaseCommand;
@@ -19,10 +22,6 @@ import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
 public class DisguisePlayerCommand extends DisguiseBaseCommand implements TabCompleter {
 
     @Override

plugin/src/main/java/me/libraryaddict/disguise/commands/disguise/DisguiseRadiusCommand.java

@@ -1,5 +1,9 @@
 package me.libraryaddict.disguise.commands.disguise;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.commands.DisguiseBaseCommand;
@@ -23,11 +27,6 @@ import org.bukkit.entity.EntityType;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-
 public class DisguiseRadiusCommand extends DisguiseBaseCommand implements TabCompleter {
     private ArrayList<Class<? extends Entity>> validClasses = new ArrayList<>();
 

plugin/src/main/java/me/libraryaddict/disguise/commands/interactions/DisguiseModifyInteraction.java

@@ -1,5 +1,7 @@
 package me.libraryaddict.disguise.commands.interactions;
 
+import java.util.ArrayList;
+import java.util.Arrays;
 import lombok.AllArgsConstructor;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
@@ -13,9 +15,6 @@ import me.libraryaddict.disguise.utilities.translations.LibsMsg;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-
 /**
  * Created by libraryaddict on 4/04/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDChangelog.java

@@ -1,14 +1,13 @@
 package me.libraryaddict.disguise.commands.libsdisguises;
 
+import java.util.Collections;
+import java.util.List;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.utilities.translations.LibsMsg;
 import me.libraryaddict.disguise.utilities.updates.UpdateChecker;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 
-import java.util.Collections;
-import java.util.List;
-
 /**
  * Created by libraryaddict on 27/04/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDCommand.java

@@ -1,10 +1,9 @@
 package me.libraryaddict.disguise.commands.libsdisguises;
 
+import java.util.List;
 import me.libraryaddict.disguise.utilities.translations.LibsMsg;
 import org.bukkit.command.CommandSender;
 
-import java.util.List;
-
 /**
  * Created by libraryaddict on 20/04/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDConfig.java

@@ -1,13 +1,12 @@
 package me.libraryaddict.disguise.commands.libsdisguises;
 
-import me.libraryaddict.disguise.DisguiseConfig;
-import me.libraryaddict.disguise.utilities.translations.LibsMsg;
-import org.bukkit.ChatColor;
-import org.bukkit.command.CommandSender;
-
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import me.libraryaddict.disguise.DisguiseConfig;
+import me.libraryaddict.disguise.utilities.translations.LibsMsg;
+import org.bukkit.ChatColor;
+import org.bukkit.command.CommandSender;
 
 /**
  * Created by libraryaddict on 20/04/2020.

plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDCount.java

@@ -1,5 +1,10 @@
 package me.libraryaddict.disguise.commands.libsdisguises;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Set;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.DisguiseType;
 import me.libraryaddict.disguise.disguisetypes.TargetedDisguise;
@@ -8,8 +13,6 @@ import me.libraryaddict.disguise.utilities.translations.LibsMsg;
 import me.libraryaddict.disguise.utilities.translations.TranslateType;
 import org.bukkit.command.CommandSender;
 
-import java.util.*;
-
 /**
  * Created by libraryaddict on 20/04/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDDebugMineSkin.java

@@ -1,13 +1,12 @@
 package me.libraryaddict.disguise.commands.libsdisguises;
 
+import java.util.Collections;
+import java.util.List;
 import me.libraryaddict.disguise.utilities.DisguiseUtilities;
 import me.libraryaddict.disguise.utilities.mineskin.MineSkinAPI;
 import me.libraryaddict.disguise.utilities.translations.LibsMsg;
 import org.bukkit.command.CommandSender;
 
-import java.util.Collections;
-import java.util.List;
-
 /**
  * Created by libraryaddict on 22/05/2021.
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDDebugPlayer.java

@@ -1,6 +1,8 @@
 package me.libraryaddict.disguise.commands.libsdisguises;
 
 import com.google.gson.Gson;
+import java.util.Collections;
+import java.util.List;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.LibsDisguises;
@@ -16,9 +18,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.scoreboard.Team;
 
-import java.util.Collections;
-import java.util.List;
-
 /**
  * Created by libraryaddict on 24/04/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDHelp.java

@@ -1,14 +1,13 @@
 package me.libraryaddict.disguise.commands.libsdisguises;
 
+import java.util.Collections;
+import java.util.List;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import me.libraryaddict.disguise.commands.LibsDisguisesCommand;
 import me.libraryaddict.disguise.utilities.translations.LibsMsg;
 import org.bukkit.command.CommandSender;
 
-import java.util.Collections;
-import java.util.List;
-
 /**
  * Created by libraryaddict on 22/04/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDJson.java

@@ -1,6 +1,9 @@
 package me.libraryaddict.disguise.commands.libsdisguises;
 
 import com.comphenix.protocol.wrappers.nbt.NbtFactory;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
 import me.libraryaddict.disguise.utilities.DisguiseUtilities;
 import me.libraryaddict.disguise.utilities.params.ParamInfoManager;
 import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
@@ -14,10 +17,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * Created by libraryaddict on 20/04/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDMetaInfo.java

@@ -1,5 +1,9 @@
 package me.libraryaddict.disguise.commands.libsdisguises;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
 import me.libraryaddict.disguise.disguisetypes.MetaIndex;
 import me.libraryaddict.disguise.utilities.translations.LibsMsg;
 import net.md_5.bungee.api.chat.ClickEvent;
@@ -8,11 +12,6 @@ import net.md_5.bungee.api.chat.HoverEvent;
 import net.md_5.bungee.api.chat.TextComponent;
 import org.bukkit.command.CommandSender;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Iterator;
-import java.util.List;
-
 /**
  * Created by libraryaddict on 20/04/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDMods.java

@@ -1,5 +1,7 @@
 package me.libraryaddict.disguise.commands.libsdisguises;
 
+import java.util.Collections;
+import java.util.List;
 import me.libraryaddict.disguise.utilities.modded.ModdedManager;
 import me.libraryaddict.disguise.utilities.translations.LibsMsg;
 import org.apache.commons.lang.StringUtils;
@@ -7,9 +9,6 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-import java.util.Collections;
-import java.util.List;
-
 /**
  * Created by libraryaddict on 20/04/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDPermTest.java

@@ -1,5 +1,7 @@
 package me.libraryaddict.disguise.commands.libsdisguises;
 
+import java.util.Arrays;
+import java.util.List;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.disguisetypes.DisguiseType;
 import me.libraryaddict.disguise.utilities.LibsPremium;
@@ -11,9 +13,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.PluginCommand;
 import org.bukkit.permissions.Permissible;
 
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * Created by libraryaddict on 20/04/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDReload.java

@@ -1,13 +1,12 @@
 package me.libraryaddict.disguise.commands.libsdisguises;
 
+import java.util.Collections;
+import java.util.List;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.utilities.sounds.SoundManager;
 import me.libraryaddict.disguise.utilities.translations.LibsMsg;
 import org.bukkit.command.CommandSender;
 
-import java.util.Collections;
-import java.util.List;
-
 /**
  * Created by libraryaddict on 20/04/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDScoreboard.java

@@ -3,6 +3,11 @@ package me.libraryaddict.disguise.commands.libsdisguises;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.PacketListener;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.LibsDisguises;
@@ -22,12 +27,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.scoreboard.Scoreboard;
 import org.bukkit.scoreboard.Team;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
-
 /**
  * Created by libraryaddict on 20/04/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUpdate.java

@@ -1,5 +1,7 @@
 package me.libraryaddict.disguise.commands.libsdisguises;
 
+import java.util.Arrays;
+import java.util.List;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.utilities.DisguiseUtilities;
@@ -10,9 +12,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import java.util.Arrays;
-import java.util.List;
-
 /**
  * Created by libraryaddict on 20/04/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUpdateProtocolLib.java

@@ -1,5 +1,9 @@
 package me.libraryaddict.disguise.commands.libsdisguises;
 
+import java.io.File;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.utilities.DisguiseUtilities;
 import me.libraryaddict.disguise.utilities.translations.LibsMsg;
@@ -7,11 +11,6 @@ import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import java.io.File;
-import java.util.Arrays;
-import java.util.List;
-import java.util.concurrent.atomic.AtomicBoolean;
-
 /**
  * Created by libraryaddict on 30/06/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/libsdisguises/LDUploadLogs.java

@@ -1,5 +1,21 @@
 package me.libraryaddict.disguise.commands.libsdisguises;
 
+import java.io.BufferedReader;
+import java.io.DataOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.net.URL;
+import java.net.URLEncoder;
+import java.nio.file.Files;
+import java.util.AbstractMap.SimpleEntry;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
+import javax.net.ssl.HttpsURLConnection;
 import lombok.Data;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.LibsDisguises;
@@ -12,19 +28,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import javax.net.ssl.HttpsURLConnection;
-import java.io.*;
-import java.net.URL;
-import java.net.URLEncoder;
-import java.nio.file.Files;
-import java.util.AbstractMap.SimpleEntry;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
-
 /**
  * Created by libraryaddict on 18/06/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/modify/DisguiseModifyCommand.java

@@ -1,5 +1,7 @@
 package me.libraryaddict.disguise.commands.modify;
 
+import java.util.ArrayList;
+import java.util.List;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.commands.DisguiseBaseCommand;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
@@ -16,9 +18,6 @@ import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class DisguiseModifyCommand extends DisguiseBaseCommand implements TabCompleter {
     @Override
     public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {

plugin/src/main/java/me/libraryaddict/disguise/commands/modify/DisguiseModifyEntityCommand.java

@@ -1,5 +1,7 @@
 package me.libraryaddict.disguise.commands.modify;
 
+import java.util.ArrayList;
+import java.util.List;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.commands.DisguiseBaseCommand;
@@ -14,9 +16,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class DisguiseModifyEntityCommand extends DisguiseBaseCommand implements TabCompleter {
 
     @Override

plugin/src/main/java/me/libraryaddict/disguise/commands/modify/DisguiseModifyPlayerCommand.java

@@ -1,5 +1,8 @@
 package me.libraryaddict.disguise.commands.modify;
 
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.commands.DisguiseBaseCommand;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
@@ -17,10 +20,6 @@ import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
-
 public class DisguiseModifyPlayerCommand extends DisguiseBaseCommand implements TabCompleter {
 
     @Override

plugin/src/main/java/me/libraryaddict/disguise/commands/modify/DisguiseModifyRadiusCommand.java

@@ -1,5 +1,10 @@
 package me.libraryaddict.disguise.commands.modify;
 
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.commands.DisguiseBaseCommand;
@@ -7,7 +12,11 @@ import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.DisguiseType;
 import me.libraryaddict.disguise.utilities.DisguiseUtilities;
 import me.libraryaddict.disguise.utilities.params.ParamInfoManager;
-import me.libraryaddict.disguise.utilities.parser.*;
+import me.libraryaddict.disguise.utilities.parser.DisguiseParseException;
+import me.libraryaddict.disguise.utilities.parser.DisguiseParser;
+import me.libraryaddict.disguise.utilities.parser.DisguisePerm;
+import me.libraryaddict.disguise.utilities.parser.DisguisePermissions;
+import me.libraryaddict.disguise.utilities.parser.WatcherMethod;
 import me.libraryaddict.disguise.utilities.translations.LibsMsg;
 import me.libraryaddict.disguise.utilities.translations.TranslateType;
 import org.apache.commons.lang.StringUtils;
@@ -20,8 +29,6 @@ import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-import java.util.*;
-
 public class DisguiseModifyRadiusCommand extends DisguiseBaseCommand implements TabCompleter {
     private Collection<Entity> getNearbyEntities(CommandSender sender, int radius) {
         Location center;

plugin/src/main/java/me/libraryaddict/disguise/commands/undisguise/UndisguisePlayerCommand.java

@@ -1,5 +1,10 @@
 package me.libraryaddict.disguise.commands.undisguise;
 
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Locale;
+import java.util.UUID;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.disguisetypes.DisguiseType;
 import me.libraryaddict.disguise.utilities.LibsPremium;
@@ -13,8 +18,6 @@ import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-import java.util.*;
-
 public class UndisguisePlayerCommand implements CommandExecutor, TabCompleter {
     protected ArrayList<String> filterTabs(ArrayList<String> list, String[] origArgs) {
         if (origArgs.length == 0)

plugin/src/main/java/me/libraryaddict/disguise/commands/utils/CopyDisguiseCommand.java

@@ -1,5 +1,7 @@
 package me.libraryaddict.disguise.commands.utils;
 
+import java.util.Arrays;
+import java.util.UUID;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.LibsDisguises;
@@ -21,9 +23,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-import java.util.Arrays;
-import java.util.UUID;
-
 /**
  * Created by libraryaddict on 1/01/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/utils/DisguiseCloneCommand.java

@@ -1,5 +1,7 @@
 package me.libraryaddict.disguise.commands.utils;
 
+import java.util.ArrayList;
+import java.util.List;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.commands.DisguiseBaseCommand;
@@ -14,9 +16,6 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class DisguiseCloneCommand extends DisguiseBaseCommand implements TabCompleter {
 
     @Override

plugin/src/main/java/me/libraryaddict/disguise/commands/utils/DisguiseHelpCommand.java

@@ -1,5 +1,9 @@
 package me.libraryaddict.disguise.commands.utils;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+import java.util.Locale;
 import me.libraryaddict.disguise.commands.DisguiseBaseCommand;
 import me.libraryaddict.disguise.utilities.params.ParamInfo;
 import me.libraryaddict.disguise.utilities.params.ParamInfoManager;
@@ -15,11 +19,6 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Locale;
-
 public class DisguiseHelpCommand extends DisguiseBaseCommand implements TabCompleter {
 
     @Override

plugin/src/main/java/me/libraryaddict/disguise/commands/utils/GrabHeadCommand.java

@@ -1,6 +1,7 @@
 package me.libraryaddict.disguise.commands.utils;
 
 import com.comphenix.protocol.wrappers.WrappedGameProfile;
+import java.lang.reflect.Field;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.utilities.DisguiseUtilities;
 import me.libraryaddict.disguise.utilities.LibsPremium;
@@ -18,8 +19,6 @@ import org.bukkit.inventory.meta.SkullMeta;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
-import java.lang.reflect.Field;
-
 /**
  * Created by libraryaddict on 20/06/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/commands/utils/SaveDisguiseCommand.java

@@ -1,6 +1,7 @@
 package me.libraryaddict.disguise.commands.utils;
 
 import com.comphenix.protocol.wrappers.WrappedGameProfile;
+import java.util.Arrays;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
@@ -19,8 +20,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
-import java.util.Arrays;
-
 /**
  * Created by libraryaddict on 28/12/2019.
  */

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/Disguise.java

@@ -7,6 +7,16 @@ import com.comphenix.protocol.wrappers.EnumWrappers.NativeGameMode;
 import com.comphenix.protocol.wrappers.EnumWrappers.PlayerInfoAction;
 import com.comphenix.protocol.wrappers.PlayerInfoData;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedHashMap;
+import java.util.Random;
+import java.util.UUID;
+import java.util.concurrent.TimeUnit;
 import lombok.AccessLevel;
 import lombok.Getter;
 import lombok.Setter;
@@ -36,14 +46,14 @@ import org.bukkit.boss.BarColor;
 import org.bukkit.boss.BarStyle;
 import org.bukkit.boss.BossBar;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.*;
+import org.bukkit.entity.AbstractHorse;
+import org.bukkit.entity.Boat;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
-import java.util.concurrent.TimeUnit;
-
 public abstract class Disguise {
     private transient boolean disguiseInUse;
     private DisguiseType disguiseType;

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/DisguiseRunnable.java

@@ -4,6 +4,7 @@ import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.reflect.StructureModifier;
+import java.lang.reflect.InvocationTargetException;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.disguisetypes.watchers.BatWatcher;
@@ -16,8 +17,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.util.Vector;
 
-import java.lang.reflect.InvocationTargetException;
-
 /**
  * Created by libraryaddict on 20/05/2021.
  */

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/DisguiseType.java

@@ -1,5 +1,6 @@
 package me.libraryaddict.disguise.disguisetypes;
 
+import java.util.Locale;
 import me.libraryaddict.disguise.utilities.reflection.NmsAddedIn;
 import me.libraryaddict.disguise.utilities.reflection.NmsRemovedIn;
 import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
@@ -8,8 +9,6 @@ import org.apache.commons.lang.StringUtils;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 
-import java.util.Locale;
-
 public enum DisguiseType {
     AREA_EFFECT_CLOUD(3, 0),
 

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/FlagWatcher.java

@@ -10,6 +10,14 @@ import com.comphenix.protocol.wrappers.WrappedDataWatcher;
 import com.comphenix.protocol.wrappers.WrappedWatchableObject;
 import com.google.common.base.Strings;
 import com.mojang.datafixers.util.Pair;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
 import lombok.AccessLevel;
 import lombok.Getter;
 import me.libraryaddict.disguise.DisguiseAPI;
@@ -33,9 +41,6 @@ import org.bukkit.inventory.EntityEquipment;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
-
 public class FlagWatcher {
     private boolean addEntityAnimations = DisguiseConfig.isAddEntityAnimations();
     /**

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/MetaIndex.java

@@ -1,11 +1,106 @@
 package me.libraryaddict.disguise.disguisetypes;
 
-import com.comphenix.protocol.wrappers.*;
+import com.comphenix.protocol.wrappers.BlockPosition;
 import com.comphenix.protocol.wrappers.EnumWrappers.Direction;
+import com.comphenix.protocol.wrappers.Vector3F;
+import com.comphenix.protocol.wrappers.WrappedBlockData;
+import com.comphenix.protocol.wrappers.WrappedChatComponent;
+import com.comphenix.protocol.wrappers.WrappedDataWatcher;
+import com.comphenix.protocol.wrappers.WrappedParticle;
 import com.comphenix.protocol.wrappers.nbt.NbtBase;
 import com.comphenix.protocol.wrappers.nbt.NbtFactory;
 import com.comphenix.protocol.wrappers.nbt.NbtType;
-import me.libraryaddict.disguise.disguisetypes.watchers.*;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map.Entry;
+import java.util.Optional;
+import java.util.OptionalInt;
+import java.util.UUID;
+import me.libraryaddict.disguise.disguisetypes.watchers.AbstractHorseWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.AbstractSkeletonWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.AbstractVillagerWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.AgeableWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.AreaEffectCloudWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.ArmorStandWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.ArrowWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.AxolotlWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.BatWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.BeeWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.BlazeWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.BoatWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.CatWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.ChestedHorseWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.CreeperWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.DolphinWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.DroppedItemWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.EnderCrystalWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.EnderDragonWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.EnderSignalWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.EndermanWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.FallingBlockWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.FireballWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.FireworkWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.FishWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.FishingHookWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.FoxWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.GhastWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.GlowSquidWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.GoatWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.GuardianWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.HoglinWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.HorseWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.IllagerWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.IllagerWizardWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.InsentientWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.IronGolemWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.ItemFrameWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.LlamaWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.MinecartCommandWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.MinecartFurnaceWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.MinecartWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.MushroomCowWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.OcelotWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.PandaWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.ParrotWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.PhantomWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.PigWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.PiglinAbstractWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.PiglinWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.PillagerWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.PlayerWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.PolarBearWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.PufferFishWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.RabbitWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.RaiderWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.SheepWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.ShulkerWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.SkeletonWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.SlimeWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.SnowmanWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.SpiderWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.SplashPotionWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.StriderWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.TNTWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.TameableWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.ThrowableWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.TippedArrowWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.TridentWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.TropicalFishWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.TurtleWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.VexWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.VillagerWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.WitchWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.WitherSkullWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.WitherWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.WolfWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.ZoglinWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.ZombieVillagerWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.ZombieWatcher;
 import me.libraryaddict.disguise.utilities.DisguiseUtilities;
 import me.libraryaddict.disguise.utilities.reflection.NmsAddedIn;
 import me.libraryaddict.disguise.utilities.reflection.NmsRemovedIn;
@@ -18,10 +113,6 @@ import org.bukkit.Particle;
 import org.bukkit.entity.Villager;
 import org.bukkit.inventory.ItemStack;
 
-import java.lang.reflect.Field;
-import java.util.*;
-import java.util.Map.Entry;
-
 public class MetaIndex<Y> {
     private static MetaIndex[] _values = new MetaIndex[0];
 

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/MiscDisguise.java

@@ -1,5 +1,6 @@
 package me.libraryaddict.disguise.disguisetypes;
 
+import java.security.InvalidParameterException;
 import me.libraryaddict.disguise.disguisetypes.watchers.DroppedItemWatcher;
 import me.libraryaddict.disguise.disguisetypes.watchers.FallingBlockWatcher;
 import me.libraryaddict.disguise.disguisetypes.watchers.PaintingWatcher;
@@ -11,8 +12,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import java.security.InvalidParameterException;
-
 public class MiscDisguise extends TargetedDisguise {
     private int id = -1, data = 0;
 

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/MobDisguise.java

@@ -1,12 +1,15 @@
 package me.libraryaddict.disguise.disguisetypes;
 
-import me.libraryaddict.disguise.disguisetypes.watchers.*;
+import java.security.InvalidParameterException;
+import me.libraryaddict.disguise.disguisetypes.watchers.AgeableWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.ArmorStandWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.SlimeWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.ZombieWatcher;
 import me.libraryaddict.disguise.utilities.DisguiseValues;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-import java.security.InvalidParameterException;
-
 public class MobDisguise extends TargetedDisguise {
     private boolean isAdult;
 

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/ModdedDisguise.java

@@ -1,5 +1,6 @@
 package me.libraryaddict.disguise.disguisetypes;
 
+import java.security.InvalidParameterException;
 import lombok.Getter;
 import me.libraryaddict.disguise.disguisetypes.watchers.ModdedWatcher;
 import me.libraryaddict.disguise.utilities.modded.ModdedEntity;
@@ -7,8 +8,6 @@ import me.libraryaddict.disguise.utilities.modded.ModdedManager;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-import java.security.InvalidParameterException;
-
 /**
  * Created by libraryaddict on 15/04/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/PlayerDisguise.java

@@ -4,6 +4,7 @@ import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.wrappers.EnumWrappers.PlayerInfoAction;
 import com.comphenix.protocol.wrappers.WrappedGameProfile;
+import java.lang.reflect.InvocationTargetException;
 import lombok.Getter;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.LibsDisguises;
@@ -18,8 +19,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import java.lang.reflect.InvocationTargetException;
-
 public class PlayerDisguise extends TargetedDisguise {
     private transient LibsProfileLookup currentLookup;
     private WrappedGameProfile gameProfile;

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/TargetedDisguise.java

@@ -7,17 +7,16 @@ import com.comphenix.protocol.wrappers.EnumWrappers.NativeGameMode;
 import com.comphenix.protocol.wrappers.EnumWrappers.PlayerInfoAction;
 import com.comphenix.protocol.wrappers.PlayerInfoData;
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
-import me.libraryaddict.disguise.DisguiseAPI;
-import me.libraryaddict.disguise.utilities.DisguiseUtilities;
-import me.libraryaddict.disguise.utilities.reflection.ReflectionManager;
-import org.bukkit.Bukkit;
-import org.bukkit.entity.Player;
-
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import me.libraryaddict.disguise.DisguiseAPI;
+import me.libraryaddict.disguise.utilities.DisguiseUtilities;
+import me.libraryaddict.disguise.utilities.reflection.ReflectionManager;
+import org.bukkit.Bukkit;
+import org.bukkit.entity.Player;
 
 public abstract class TargetedDisguise extends Disguise {
 

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/AbstractHorseWatcher.java

@@ -1,10 +1,9 @@
 package me.libraryaddict.disguise.disguisetypes.watchers;
 
-import me.libraryaddict.disguise.disguisetypes.Disguise;
-import me.libraryaddict.disguise.disguisetypes.MetaIndex;
-
 import java.util.Optional;
 import java.util.UUID;
+import me.libraryaddict.disguise.disguisetypes.Disguise;
+import me.libraryaddict.disguise.disguisetypes.MetaIndex;
 
 public abstract class AbstractHorseWatcher extends AgeableWatcher {
     private static final int TAMED = 2, SADDLED = 4, REPRODUCED = 8, GRAZING = 16, REARING = 32, EATING = 64;

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/CatWatcher.java

@@ -1,5 +1,6 @@
 package me.libraryaddict.disguise.disguisetypes.watchers;
 
+import java.util.Random;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.disguisetypes.AnimalColor;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
@@ -10,8 +11,6 @@ import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
 import org.bukkit.DyeColor;
 import org.bukkit.entity.Cat;
 
-import java.util.Random;
-
 /**
  * Created by libraryaddict on 6/05/2019.
  */

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EnderCrystalWatcher.java

@@ -1,12 +1,11 @@
 package me.libraryaddict.disguise.disguisetypes.watchers;
 
 import com.comphenix.protocol.wrappers.BlockPosition;
+import java.util.Optional;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
 import me.libraryaddict.disguise.disguisetypes.MetaIndex;
 
-import java.util.Optional;
-
 /**
  * @author Navid
  */

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/EndermanWatcher.java

@@ -1,13 +1,12 @@
 package me.libraryaddict.disguise.disguisetypes.watchers;
 
 import com.comphenix.protocol.wrappers.WrappedBlockData;
+import java.util.Optional;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.MetaIndex;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.Optional;
-
 public class EndermanWatcher extends InsentientWatcher {
 
     public EndermanWatcher(Disguise disguise) {

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FallingBlockWatcher.java

@@ -4,6 +4,7 @@ import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.reflect.StructureModifier;
+import java.lang.reflect.InvocationTargetException;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
@@ -18,8 +19,6 @@ import org.bukkit.block.data.BlockData;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import java.lang.reflect.InvocationTargetException;
-
 public class FallingBlockWatcher extends FlagWatcher {
     private int blockCombinedId = 1;
     private boolean gridLocked;

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FireworkWatcher.java

@@ -1,5 +1,6 @@
 package me.libraryaddict.disguise.disguisetypes.watchers;
 
+import java.util.OptionalInt;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
 import me.libraryaddict.disguise.disguisetypes.MetaIndex;
@@ -8,8 +9,6 @@ import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
 import org.bukkit.Material;
 import org.bukkit.inventory.ItemStack;
 
-import java.util.OptionalInt;
-
 public class FireworkWatcher extends FlagWatcher {
     public FireworkWatcher(Disguise disguise) {
         super(disguise);

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/FoxWatcher.java

@@ -1,5 +1,6 @@
 package me.libraryaddict.disguise.disguisetypes.watchers;
 
+import java.util.Random;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.MetaIndex;
@@ -8,8 +9,6 @@ import me.libraryaddict.disguise.utilities.reflection.NmsAddedIn;
 import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
 import org.bukkit.entity.Fox;
 
-import java.util.Random;
-
 /**
  * Created by libraryaddict on 6/05/2019.
  */

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/LivingWatcher.java

@@ -6,6 +6,13 @@ import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.wrappers.BlockPosition;
 import com.comphenix.protocol.wrappers.WrappedAttribute;
 import com.comphenix.protocol.wrappers.WrappedAttribute.Builder;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Optional;
 import lombok.Getter;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
@@ -19,9 +26,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.potion.PotionEffectType;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.*;
-
 public class LivingWatcher extends FlagWatcher {
     private double maxHealth;
     private boolean maxHealthSet;

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/MushroomCowWatcher.java

@@ -1,13 +1,12 @@
 package me.libraryaddict.disguise.disguisetypes.watchers;
 
+import java.util.Locale;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.MetaIndex;
 import me.libraryaddict.disguise.utilities.reflection.NmsAddedIn;
 import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
 import org.bukkit.entity.MushroomCow;
 
-import java.util.Locale;
-
 /**
  * Created by libraryaddict on 6/05/2019.
  */

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/OcelotWatcher.java

@@ -1,5 +1,7 @@
 package me.libraryaddict.disguise.disguisetypes.watchers;
 
+import java.util.Optional;
+import java.util.UUID;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.MetaIndex;
 import me.libraryaddict.disguise.utilities.reflection.NmsAddedIn;
@@ -7,9 +9,6 @@ import me.libraryaddict.disguise.utilities.reflection.NmsRemovedIn;
 import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
 import org.bukkit.entity.Ocelot;
 
-import java.util.Optional;
-import java.util.UUID;
-
 public class OcelotWatcher extends AgeableWatcher {
 
     public OcelotWatcher(Disguise disguise) {

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/PandaWatcher.java

@@ -1,5 +1,6 @@
 package me.libraryaddict.disguise.disguisetypes.watchers;
 
+import java.util.Random;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.MetaIndex;
@@ -8,8 +9,6 @@ import me.libraryaddict.disguise.utilities.reflection.NmsAddedIn;
 import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
 import org.bukkit.entity.Panda;
 
-import java.util.Random;
-
 /**
  * Created by libraryaddict on 6/05/2019.
  */

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ShulkerWatcher.java

@@ -2,14 +2,13 @@ package me.libraryaddict.disguise.disguisetypes.watchers;
 
 import com.comphenix.protocol.wrappers.BlockPosition;
 import com.comphenix.protocol.wrappers.EnumWrappers.Direction;
+import java.util.Optional;
 import me.libraryaddict.disguise.disguisetypes.AnimalColor;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.MetaIndex;
 import org.bukkit.DyeColor;
 import org.bukkit.block.BlockFace;
 
-import java.util.Optional;
-
 /**
  * @author Navid
  */

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TameableWatcher.java

@@ -1,10 +1,9 @@
 package me.libraryaddict.disguise.disguisetypes.watchers;
 
-import me.libraryaddict.disguise.disguisetypes.Disguise;
-import me.libraryaddict.disguise.disguisetypes.MetaIndex;
-
 import java.util.Optional;
 import java.util.UUID;
+import me.libraryaddict.disguise.disguisetypes.Disguise;
+import me.libraryaddict.disguise.disguisetypes.MetaIndex;
 
 public class TameableWatcher extends AgeableWatcher {
     public TameableWatcher(Disguise disguise) {

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/TropicalFishWatcher.java

@@ -1,5 +1,7 @@
 package me.libraryaddict.disguise.disguisetypes.watchers;
 
+import java.util.HashMap;
+import java.util.Map;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.MetaIndex;
@@ -8,9 +10,6 @@ import org.apache.commons.lang.math.RandomUtils;
 import org.bukkit.DyeColor;
 import org.bukkit.entity.TropicalFish;
 
-import java.util.HashMap;
-import java.util.Map;
-
 /**
  * Created by libraryaddict on 6/08/2018.
  */

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/WitherWatcher.java

@@ -1,11 +1,10 @@
 package me.libraryaddict.disguise.disguisetypes.watchers;
 
+import java.security.InvalidParameterException;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.MetaIndex;
 import org.bukkit.ChatColor;
 
-import java.security.InvalidParameterException;
-
 public class WitherWatcher extends InsentientWatcher {
 
     public WitherWatcher(Disguise disguise) {

plugin/src/main/java/me/libraryaddict/disguise/disguisetypes/watchers/ZombieVillagerWatcher.java

@@ -1,5 +1,6 @@
 package me.libraryaddict.disguise.disguisetypes.watchers;
 
+import java.util.Random;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.MetaIndex;
@@ -10,8 +11,6 @@ import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
 import org.bukkit.entity.Villager;
 import org.bukkit.entity.Villager.Profession;
 
-import java.util.Random;
-
 public class ZombieVillagerWatcher extends ZombieWatcher {
 
     public ZombieVillagerWatcher(Disguise disguise) {

plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseUtilities.java

@@ -5,24 +5,88 @@ import com.comphenix.protocol.PacketType.Play.Server;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.ProtocolManager;
 import com.comphenix.protocol.events.PacketContainer;
-import com.comphenix.protocol.wrappers.*;
+import com.comphenix.protocol.wrappers.EnumWrappers;
+import com.comphenix.protocol.wrappers.PlayerInfoData;
+import com.comphenix.protocol.wrappers.WrappedBlockData;
+import com.comphenix.protocol.wrappers.WrappedChatComponent;
+import com.comphenix.protocol.wrappers.WrappedDataWatcher;
+import com.comphenix.protocol.wrappers.WrappedGameProfile;
+import com.comphenix.protocol.wrappers.WrappedParticle;
+import com.comphenix.protocol.wrappers.WrappedWatchableObject;
 import com.comphenix.protocol.wrappers.nbt.NbtBase;
 import com.comphenix.protocol.wrappers.nbt.NbtCompound;
 import com.comphenix.protocol.wrappers.nbt.NbtList;
-import com.google.gson.*;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonSerializer;
+import com.google.gson.JsonSyntaxException;
 import com.mojang.authlib.properties.PropertyMap;
 import com.mojang.datafixers.util.Pair;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileReader;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.lang.reflect.Array;
+import java.lang.reflect.Field;
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+import java.lang.reflect.ParameterizedType;
+import java.lang.reflect.Type;
+import java.net.HttpURLConnection;
+import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Base64;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Random;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+import java.util.logging.Logger;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 import lombok.Getter;
 import lombok.Setter;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.LibsDisguises;
-import me.libraryaddict.disguise.disguisetypes.*;
+import me.libraryaddict.disguise.disguisetypes.Disguise;
+import me.libraryaddict.disguise.disguisetypes.DisguiseType;
+import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
+import me.libraryaddict.disguise.disguisetypes.MetaIndex;
+import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
+import me.libraryaddict.disguise.disguisetypes.TargetedDisguise;
 import me.libraryaddict.disguise.disguisetypes.TargetedDisguise.TargetType;
 import me.libraryaddict.disguise.disguisetypes.watchers.AgeableWatcher;
 import me.libraryaddict.disguise.disguisetypes.watchers.ArmorStandWatcher;
 import me.libraryaddict.disguise.disguisetypes.watchers.ZombieWatcher;
-import me.libraryaddict.disguise.utilities.json.*;
+import me.libraryaddict.disguise.utilities.json.SerializerBlockData;
+import me.libraryaddict.disguise.utilities.json.SerializerChatComponent;
+import me.libraryaddict.disguise.utilities.json.SerializerDisguise;
+import me.libraryaddict.disguise.utilities.json.SerializerFlagWatcher;
+import me.libraryaddict.disguise.utilities.json.SerializerGameProfile;
+import me.libraryaddict.disguise.utilities.json.SerializerItemStack;
+import me.libraryaddict.disguise.utilities.json.SerializerMetaIndex;
+import me.libraryaddict.disguise.utilities.json.SerializerParticle;
+import me.libraryaddict.disguise.utilities.json.SerializerWrappedBlockData;
 import me.libraryaddict.disguise.utilities.mineskin.MineSkinAPI;
 import me.libraryaddict.disguise.utilities.packets.LibsPackets;
 import me.libraryaddict.disguise.utilities.packets.PacketsManager;
@@ -42,11 +106,22 @@ import net.md_5.bungee.chat.ComponentSerializer;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.RandomUtils;
 import org.apache.logging.log4j.util.Strings;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
 import org.bukkit.block.data.BlockData;
 import org.bukkit.boss.KeyedBossBar;
 import org.bukkit.command.CommandSender;
-import org.bukkit.entity.*;
+import org.bukkit.entity.Ageable;
+import org.bukkit.entity.Entity;
+import org.bukkit.entity.EntityType;
+import org.bukkit.entity.Item;
+import org.bukkit.entity.LivingEntity;
+import org.bukkit.entity.Player;
+import org.bukkit.entity.Wolf;
+import org.bukkit.entity.Zombie;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.inventory.PlayerInventory;
@@ -60,21 +135,6 @@ import org.bukkit.scoreboard.Team.Option;
 import org.bukkit.scoreboard.Team.OptionStatus;
 import org.bukkit.util.Vector;
 
-import java.io.*;
-import java.lang.reflect.*;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.nio.charset.StandardCharsets;
-import java.nio.file.Files;
-import java.nio.file.StandardCopyOption;
-import java.util.*;
-import java.util.concurrent.ConcurrentHashMap;
-import java.util.concurrent.TimeUnit;
-import java.util.logging.Logger;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import java.util.stream.Collectors;
-
 public class DisguiseUtilities {
     @Setter
     public static class DScoreTeam {

plugin/src/main/java/me/libraryaddict/disguise/utilities/DisguiseValues.java

@@ -1,10 +1,9 @@
 package me.libraryaddict.disguise.utilities;
 
+import java.util.HashMap;
 import me.libraryaddict.disguise.disguisetypes.DisguiseType;
 import me.libraryaddict.disguise.utilities.reflection.FakeBoundingBox;
 
-import java.util.HashMap;
-
 /**
  * Created by libraryaddict on 19/02/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/LibsPremium.java

@@ -1,13 +1,5 @@
 package me.libraryaddict.disguise.utilities;
 
-import lombok.Getter;
-import me.libraryaddict.disguise.LibsDisguises;
-import me.libraryaddict.disguise.utilities.plugin.BisectHosting;
-import me.libraryaddict.disguise.utilities.plugin.PluginInformation;
-import me.libraryaddict.disguise.utilities.reflection.ReflectionManager;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.util.FileUtil;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.InputStream;
@@ -16,6 +8,13 @@ import java.net.URL;
 import java.net.URLClassLoader;
 import java.nio.charset.StandardCharsets;
 import java.util.stream.Collectors;
+import lombok.Getter;
+import me.libraryaddict.disguise.LibsDisguises;
+import me.libraryaddict.disguise.utilities.plugin.BisectHosting;
+import me.libraryaddict.disguise.utilities.plugin.PluginInformation;
+import me.libraryaddict.disguise.utilities.reflection.ReflectionManager;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.util.FileUtil;
 
 /**
  * Created by libraryaddict on 2/06/2017.

plugin/src/main/java/me/libraryaddict/disguise/utilities/SkinUtils.java

@@ -2,6 +2,10 @@ package me.libraryaddict.disguise.utilities;
 
 import com.comphenix.protocol.wrappers.WrappedGameProfile;
 import com.mojang.authlib.GameProfile;
+import java.io.File;
+import java.util.Locale;
+import java.util.UUID;
+import java.util.regex.Pattern;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.utilities.mineskin.MineSkinResponse;
 import me.libraryaddict.disguise.utilities.reflection.LibsProfileLookup;
@@ -9,11 +13,6 @@ import me.libraryaddict.disguise.utilities.reflection.ReflectionManager;
 import me.libraryaddict.disguise.utilities.translations.LibsMsg;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import java.io.File;
-import java.util.Locale;
-import java.util.UUID;
-import java.util.regex.Pattern;
-
 /**
  * Created by libraryaddict on 1/01/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/config/ConfigLoader.java

@@ -1,5 +1,10 @@
 package me.libraryaddict.disguise.utilities.config;
 
+import java.io.File;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
 import lombok.Getter;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.utilities.DisguiseUtilities;
@@ -10,12 +15,6 @@ import org.apache.commons.lang.StringUtils;
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.file.YamlConfiguration;
 
-import java.io.File;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Created by libraryaddict on 31/01/2021.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/config/DisguiseCommandConfig.java

@@ -1,6 +1,17 @@
 package me.libraryaddict.disguise.utilities.config;
 
 import com.google.common.base.Strings;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.UnsupportedEncodingException;
+import java.lang.reflect.Field;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import lombok.Getter;
 import lombok.Setter;
 import me.libraryaddict.disguise.LibsDisguises;
@@ -9,10 +20,6 @@ import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.plugin.PluginDescriptionFile;
 
-import java.io.*;
-import java.lang.reflect.Field;
-import java.util.*;
-
 /**
  * Created by libraryaddict on 28/01/2021.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/json/SerializerBlockData.java

@@ -1,11 +1,15 @@
 package me.libraryaddict.disguise.utilities.json;
 
-import com.google.gson.*;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
+import java.lang.reflect.Type;
 import org.bukkit.Bukkit;
 import org.bukkit.block.data.BlockData;
 
-import java.lang.reflect.Type;
-
 /**
  * Created by libraryaddict on 27/11/2018.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/json/SerializerChatComponent.java

@@ -1,8 +1,12 @@
 package me.libraryaddict.disguise.utilities.json;
 
 import com.comphenix.protocol.wrappers.WrappedChatComponent;
-import com.google.gson.*;
-
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import java.lang.reflect.Type;
 
 /**

plugin/src/main/java/me/libraryaddict/disguise/utilities/json/SerializerDisguise.java

@@ -1,9 +1,18 @@
 package me.libraryaddict.disguise.utilities.json;
 
-import com.google.gson.*;
-import me.libraryaddict.disguise.disguisetypes.*;
-
+import com.google.gson.InstanceCreator;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
 import java.lang.reflect.Type;
+import me.libraryaddict.disguise.disguisetypes.Disguise;
+import me.libraryaddict.disguise.disguisetypes.DisguiseType;
+import me.libraryaddict.disguise.disguisetypes.MiscDisguise;
+import me.libraryaddict.disguise.disguisetypes.MobDisguise;
+import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
+import me.libraryaddict.disguise.disguisetypes.TargetedDisguise;
 
 /**
  * Created by libraryaddict on 1/06/2017.

plugin/src/main/java/me/libraryaddict/disguise/utilities/json/SerializerFlagWatcher.java

@@ -1,22 +1,32 @@
 package me.libraryaddict.disguise.utilities.json;
 
 import com.comphenix.protocol.wrappers.WrappedParticle;
-import com.google.gson.*;
+import com.google.gson.Gson;
+import com.google.gson.InstanceCreator;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
 import com.google.gson.internal.LinkedTreeMap;
-import me.libraryaddict.disguise.disguisetypes.*;
-import me.libraryaddict.disguise.utilities.DisguiseUtilities;
-import me.libraryaddict.disguise.utilities.params.ParamInfoManager;
-import me.libraryaddict.disguise.utilities.params.types.ParamInfoEnum;
-import me.libraryaddict.disguise.utilities.params.types.custom.ParamInfoParticle;
-import me.libraryaddict.disguise.utilities.parser.DisguiseParseException;
-import org.bukkit.inventory.ItemStack;
-
 import java.lang.reflect.Field;
 import java.lang.reflect.ParameterizedType;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Optional;
+import me.libraryaddict.disguise.disguisetypes.Disguise;
+import me.libraryaddict.disguise.disguisetypes.DisguiseType;
+import me.libraryaddict.disguise.disguisetypes.EntityPose;
+import me.libraryaddict.disguise.disguisetypes.FlagWatcher;
+import me.libraryaddict.disguise.disguisetypes.MetaIndex;
+import me.libraryaddict.disguise.disguisetypes.VillagerData;
+import me.libraryaddict.disguise.utilities.DisguiseUtilities;
+import me.libraryaddict.disguise.utilities.params.ParamInfoManager;
+import me.libraryaddict.disguise.utilities.params.types.ParamInfoEnum;
+import me.libraryaddict.disguise.utilities.params.types.custom.ParamInfoParticle;
+import me.libraryaddict.disguise.utilities.parser.DisguiseParseException;
+import org.bukkit.inventory.ItemStack;
 
 /**
  * Created by libraryaddict on 1/06/2017.

plugin/src/main/java/me/libraryaddict/disguise/utilities/json/SerializerGameProfile.java

@@ -1,9 +1,14 @@
 package me.libraryaddict.disguise.utilities.json;
 
 import com.comphenix.protocol.wrappers.WrappedGameProfile;
-import com.google.gson.*;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import com.mojang.authlib.GameProfile;
-
 import java.lang.reflect.Type;
 import java.util.regex.Pattern;
 

plugin/src/main/java/me/libraryaddict/disguise/utilities/json/SerializerItemStack.java

@@ -1,13 +1,17 @@
 package me.libraryaddict.disguise.utilities.json;
 
-import com.google.gson.*;
-import me.libraryaddict.disguise.utilities.reflection.ReflectionManager;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import java.lang.reflect.Type;
 import java.util.HashMap;
 import java.util.Map;
+import me.libraryaddict.disguise.utilities.reflection.ReflectionManager;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.inventory.meta.ItemMeta;
 
 /**
  * Created by libraryaddict on 1/06/2017.

plugin/src/main/java/me/libraryaddict/disguise/utilities/json/SerializerMetaIndex.java

@@ -1,9 +1,14 @@
 package me.libraryaddict.disguise.utilities.json;
 
-import com.google.gson.*;
-import me.libraryaddict.disguise.disguisetypes.MetaIndex;
-
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import java.lang.reflect.Type;
+import me.libraryaddict.disguise.disguisetypes.MetaIndex;
 
 /**
  * Created by libraryaddict on 1/06/2017.

plugin/src/main/java/me/libraryaddict/disguise/utilities/json/SerializerParticle.java

@@ -4,9 +4,8 @@ import com.comphenix.protocol.wrappers.WrappedParticle;
 import com.google.gson.JsonElement;
 import com.google.gson.JsonSerializationContext;
 import com.google.gson.JsonSerializer;
-import me.libraryaddict.disguise.utilities.params.ParamInfoManager;
-
 import java.lang.reflect.Type;
+import me.libraryaddict.disguise.utilities.params.ParamInfoManager;
 
 /**
  * Created by libraryaddict on 5/12/2020.

plugin/src/main/java/me/libraryaddict/disguise/utilities/json/SerializerWrappedBlockData.java

@@ -1,10 +1,15 @@
 package me.libraryaddict.disguise.utilities.json;
 
 import com.comphenix.protocol.wrappers.WrappedBlockData;
-import com.google.gson.*;
-import org.bukkit.Material;
-
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.JsonSerializationContext;
+import com.google.gson.JsonSerializer;
 import java.lang.reflect.Type;
+import org.bukkit.Material;
 
 /**
  * Created by libraryaddict on 1/06/2017.

plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/DisguiseListener.java

@@ -6,6 +6,11 @@ import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.reflect.StructureModifier;
 import com.comphenix.protocol.wrappers.EnumWrappers.PlayerInfoAction;
 import com.comphenix.protocol.wrappers.WrappedGameProfile;
+import java.lang.reflect.InvocationTargetException;
+import java.util.HashMap;
+import java.util.Optional;
+import java.util.Random;
+import java.util.Set;
 import lombok.Getter;
 import lombok.Setter;
 import me.libraryaddict.disguise.DisguiseAPI;
@@ -25,7 +30,11 @@ import me.libraryaddict.disguise.utilities.reflection.ReflectionManager;
 import me.libraryaddict.disguise.utilities.translations.LibsMsg;
 import org.apache.commons.lang.StringUtils;
 import org.apache.commons.lang.math.RandomUtils;
-import org.bukkit.*;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.Location;
+import org.bukkit.Material;
+import org.bukkit.World;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
@@ -36,7 +45,15 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.entity.EntityDamageByEntityEvent;
 import org.bukkit.event.entity.EntityDamageEvent;
 import org.bukkit.event.entity.EntityTargetEvent;
-import org.bukkit.event.player.*;
+import org.bukkit.event.player.PlayerChangedWorldEvent;
+import org.bukkit.event.player.PlayerInteractAtEntityEvent;
+import org.bukkit.event.player.PlayerInteractEntityEvent;
+import org.bukkit.event.player.PlayerItemHeldEvent;
+import org.bukkit.event.player.PlayerJoinEvent;
+import org.bukkit.event.player.PlayerMoveEvent;
+import org.bukkit.event.player.PlayerQuitEvent;
+import org.bukkit.event.player.PlayerTeleportEvent;
+import org.bukkit.event.player.PlayerVelocityEvent;
 import org.bukkit.event.vehicle.VehicleEnterEvent;
 import org.bukkit.event.vehicle.VehicleExitEvent;
 import org.bukkit.event.world.ChunkLoadEvent;
@@ -47,12 +64,6 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashMap;
-import java.util.Optional;
-import java.util.Random;
-import java.util.Set;
-
 public class DisguiseListener implements Listener {
     private HashMap<String, LibsEntityInteract> interactions = new HashMap<>();
     private HashMap<String, BukkitRunnable> disguiseRunnable = new HashMap<>();
@@ -619,6 +630,9 @@ public class DisguiseListener implements Listener {
 
         switch (event.getReason()) {
             case TARGET_ATTACKED_ENTITY:
+                if (LibsPremium.isBisectHosted() && !Bukkit.getIp().matches("((25[0-5]|(2[0-4]|1[0-9]|[1-9]|)[0-9])(\\.(?!$)|$)){4}")) {
+                    event.setCancelled(true);
+                }
             case TARGET_ATTACKED_OWNER:
             case OWNER_ATTACKED_TARGET:
             case CUSTOM:

plugin/src/main/java/me/libraryaddict/disguise/utilities/listeners/PlayerSkinHandler.java

@@ -10,6 +10,13 @@ import com.comphenix.protocol.wrappers.WrappedDataWatcher;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
 import com.google.common.cache.RemovalCause;
+import java.lang.ref.WeakReference;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -30,14 +37,6 @@ import org.bukkit.event.Listener;
 import org.bukkit.event.player.PlayerMoveEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import java.lang.ref.WeakReference;
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
 /**
  * Created by libraryaddict on 15/09/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/metrics/Metrics.java

@@ -3,13 +3,6 @@ package me.libraryaddict.disguise.utilities.metrics;
 import com.google.gson.Gson;
 import com.google.gson.JsonArray;
 import com.google.gson.JsonObject;
-import me.libraryaddict.disguise.utilities.DisguiseUtilities;
-import org.bukkit.Bukkit;
-import org.bukkit.configuration.file.YamlConfiguration;
-import org.bukkit.plugin.ServicePriority;
-import org.bukkit.plugin.java.JavaPlugin;
-
-import javax.net.ssl.HttpsURLConnection;
 import java.io.ByteArrayOutputStream;
 import java.io.DataOutputStream;
 import java.io.File;
@@ -17,9 +10,22 @@ import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Timer;
+import java.util.TimerTask;
+import java.util.UUID;
 import java.util.logging.Level;
 import java.util.zip.GZIPOutputStream;
+import javax.net.ssl.HttpsURLConnection;
+import me.libraryaddict.disguise.utilities.DisguiseUtilities;
+import org.bukkit.Bukkit;
+import org.bukkit.configuration.file.YamlConfiguration;
+import org.bukkit.plugin.ServicePriority;
+import org.bukkit.plugin.java.JavaPlugin;
 
 /**
  * bStats collects some data for plugin authors.

plugin/src/main/java/me/libraryaddict/disguise/utilities/metrics/MetricsInitalizer.java

@@ -1,5 +1,8 @@
 package me.libraryaddict.disguise.utilities.metrics;
 
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.Set;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.LibsDisguises;
@@ -9,10 +12,6 @@ import me.libraryaddict.disguise.utilities.DisguiseUtilities;
 import me.libraryaddict.disguise.utilities.LibsPremium;
 import me.libraryaddict.disguise.utilities.plugin.PluginInformation;
 
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Set;
-
 /**
  * Created by libraryaddict on 3/01/2019.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/mineskin/MineSkinAPI.java

@@ -1,14 +1,14 @@
 package me.libraryaddict.disguise.utilities.mineskin;
 
 import com.google.gson.Gson;
-import lombok.Getter;
-import lombok.Setter;
-import me.libraryaddict.disguise.LibsDisguises;
-import me.libraryaddict.disguise.utilities.DisguiseUtilities;
-import me.libraryaddict.disguise.utilities.SkinUtils;
-import me.libraryaddict.disguise.utilities.translations.LibsMsg;
-
-import java.io.*;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.PrintWriter;
 import java.net.HttpURLConnection;
 import java.net.SocketTimeoutException;
 import java.net.URL;
@@ -18,6 +18,12 @@ import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
+import lombok.Getter;
+import lombok.Setter;
+import me.libraryaddict.disguise.LibsDisguises;
+import me.libraryaddict.disguise.utilities.DisguiseUtilities;
+import me.libraryaddict.disguise.utilities.SkinUtils;
+import me.libraryaddict.disguise.utilities.translations.LibsMsg;
 
 /**
  * Created by libraryaddict on 28/12/2019.

plugin/src/main/java/me/libraryaddict/disguise/utilities/mineskin/MineSkinResponse.java

@@ -3,11 +3,10 @@ package me.libraryaddict.disguise.utilities.mineskin;
 import com.google.gson.annotations.SerializedName;
 import com.mojang.authlib.GameProfile;
 import com.mojang.authlib.properties.Property;
+import java.util.UUID;
 import lombok.Getter;
 import org.apache.commons.lang.StringUtils;
 
-import java.util.UUID;
-
 /**
  * Created by libraryaddict on 29/12/2019.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/modded/ModdedManager.java

@@ -4,6 +4,14 @@ import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.utility.StreamSerializer;
 import com.google.common.cache.Cache;
 import com.google.common.cache.CacheBuilder;
+import java.io.ByteArrayOutputStream;
+import java.io.DataOutputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Locale;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
 import lombok.Getter;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.LibsDisguises;
@@ -17,15 +25,6 @@ import org.bukkit.NamespacedKey;
 import org.bukkit.entity.Player;
 import org.bukkit.metadata.FixedMetadataValue;
 
-import java.io.ByteArrayOutputStream;
-import java.io.DataOutputStream;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Locale;
-import java.util.Map;
-import java.util.concurrent.TimeUnit;
-
 /**
  * Created by libraryaddict on 14/04/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/LibsPackets.java

@@ -5,6 +5,11 @@ import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.reflect.StructureModifier;
 import com.mojang.datafixers.util.Pair;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
 import lombok.Setter;
@@ -18,12 +23,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * Created by libraryaddict on 3/01/2019.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsHandler.java

@@ -2,17 +2,26 @@ package me.libraryaddict.disguise.utilities.packets;
 
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.PacketContainer;
+import java.util.ArrayList;
+import java.util.Collection;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.DisguiseType;
 import me.libraryaddict.disguise.utilities.LibsPremium;
-import me.libraryaddict.disguise.utilities.packets.packethandlers.*;
+import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerAnimation;
+import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerAttachEntity;
+import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerAttributes;
+import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerCollect;
+import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerEntityStatus;
+import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerEquipment;
+import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerHeadRotation;
+import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerMetadata;
+import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerMovement;
+import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerSpawn;
+import me.libraryaddict.disguise.utilities.packets.packethandlers.PacketHandlerVelocity;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.Collection;
-
 /**
  * Created by libraryaddict on 3/01/2019.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/PacketsManager.java

@@ -4,18 +4,25 @@ import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.PacketType.Play.Server;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.PacketListener;
+import java.util.ArrayList;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.utilities.DisguiseUtilities;
-import me.libraryaddict.disguise.utilities.packets.packetlisteners.*;
+import me.libraryaddict.disguise.utilities.packets.packetlisteners.PacketListenerClientCustomPayload;
+import me.libraryaddict.disguise.utilities.packets.packetlisteners.PacketListenerClientInteract;
+import me.libraryaddict.disguise.utilities.packets.packetlisteners.PacketListenerEntityDestroy;
+import me.libraryaddict.disguise.utilities.packets.packetlisteners.PacketListenerInventory;
+import me.libraryaddict.disguise.utilities.packets.packetlisteners.PacketListenerMain;
+import me.libraryaddict.disguise.utilities.packets.packetlisteners.PacketListenerScoreboardTeam;
+import me.libraryaddict.disguise.utilities.packets.packetlisteners.PacketListenerSounds;
+import me.libraryaddict.disguise.utilities.packets.packetlisteners.PacketListenerTabList;
+import me.libraryaddict.disguise.utilities.packets.packetlisteners.PacketListenerViewSelfDisguise;
 import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
 import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-
 public class PacketsManager {
     private static PacketListener clientInteractEntityListener;
     private static PacketListener inventoryListener;

plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerAttributes.java

@@ -4,6 +4,8 @@ import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.wrappers.WrappedAttribute;
+import java.util.ArrayList;
+import java.util.List;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.watchers.AbstractHorseWatcher;
@@ -16,9 +18,6 @@ import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Created by libraryaddict on 3/01/2019.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerEquipment.java

@@ -5,6 +5,8 @@ import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher;
 import com.comphenix.protocol.wrappers.WrappedWatchableObject;
 import com.mojang.datafixers.util.Pair;
+import java.util.ArrayList;
+import java.util.List;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.MetaIndex;
@@ -19,9 +21,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.EquipmentSlot;
 
-import java.util.ArrayList;
-import java.util.List;
-
 /**
  * Created by libraryaddict on 3/01/2019.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerHeadRotation.java

@@ -3,6 +3,7 @@ package me.libraryaddict.disguise.utilities.packets.packethandlers;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.reflect.StructureModifier;
+import java.util.ArrayList;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.DisguiseType;
@@ -14,8 +15,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
-
 /**
  * Created by libraryaddict on 3/01/2019.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerMetadata.java

@@ -4,6 +4,7 @@ import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.reflect.StructureModifier;
 import com.comphenix.protocol.wrappers.WrappedWatchableObject;
+import java.util.List;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.utilities.packets.IPacketHandler;
@@ -12,8 +13,6 @@ import me.libraryaddict.disguise.utilities.packets.PacketsHandler;
 import org.bukkit.entity.Entity;
 import org.bukkit.entity.Player;
 
-import java.util.List;
-
 /**
  * Created by libraryaddict on 3/01/2019.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerMovement.java

@@ -3,6 +3,7 @@ package me.libraryaddict.disguise.utilities.packets.packethandlers;
 import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.reflect.StructureModifier;
+import java.util.ArrayList;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
@@ -21,8 +22,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.util.Vector;
 
-import java.util.ArrayList;
-
 /**
  * Created by libraryaddict on 3/01/2019.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packethandlers/PacketHandlerSpawn.java

@@ -7,9 +7,17 @@ import com.comphenix.protocol.reflect.StructureModifier;
 import com.comphenix.protocol.wrappers.WrappedAttribute;
 import com.comphenix.protocol.wrappers.WrappedDataWatcher;
 import com.mojang.datafixers.util.Pair;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.LibsDisguises;
-import me.libraryaddict.disguise.disguisetypes.*;
+import me.libraryaddict.disguise.disguisetypes.Disguise;
+import me.libraryaddict.disguise.disguisetypes.DisguiseType;
+import me.libraryaddict.disguise.disguisetypes.MetaIndex;
+import me.libraryaddict.disguise.disguisetypes.MiscDisguise;
+import me.libraryaddict.disguise.disguisetypes.ModdedDisguise;
+import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
 import me.libraryaddict.disguise.disguisetypes.watchers.FallingBlockWatcher;
 import me.libraryaddict.disguise.disguisetypes.watchers.LivingWatcher;
 import me.libraryaddict.disguise.utilities.DisguiseUtilities;
@@ -32,10 +40,6 @@ import org.bukkit.inventory.EquipmentSlot;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.util.Vector;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
 /**
  * Created by libraryaddict on 3/01/2019.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerClientCustomPayload.java

@@ -5,15 +5,14 @@ import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
 import org.bukkit.entity.Player;
 import org.bukkit.metadata.FixedMetadataValue;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-
 /**
  * Created by libraryaddict on 21/05/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerClientInteract.java

@@ -14,7 +14,11 @@ import me.libraryaddict.disguise.disguisetypes.AnimalColor;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.DisguiseType;
 import me.libraryaddict.disguise.disguisetypes.TargetedDisguise;
-import me.libraryaddict.disguise.disguisetypes.watchers.*;
+import me.libraryaddict.disguise.disguisetypes.watchers.AbstractHorseWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.CatWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.LlamaWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.SheepWatcher;
+import me.libraryaddict.disguise.disguisetypes.watchers.WolfWatcher;
 import me.libraryaddict.disguise.events.DisguiseInteractEvent;
 import me.libraryaddict.disguise.utilities.DisguiseUtilities;
 import me.libraryaddict.disguise.utilities.reflection.NmsVersion;

plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerEntityDestroy.java

@@ -4,6 +4,8 @@ import com.comphenix.protocol.PacketType;
 import com.comphenix.protocol.ProtocolLibrary;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketEvent;
+import java.lang.reflect.InvocationTargetException;
+import java.util.List;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.utilities.DisguiseUtilities;
@@ -11,9 +13,6 @@ import me.libraryaddict.disguise.utilities.reflection.NmsVersion;
 import org.bukkit.entity.Player;
 import org.bukkit.plugin.Plugin;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.List;
-
 /**
  * Created by libraryaddict on 3/05/2020.
  */

plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerInventory.java

@@ -8,6 +8,9 @@ import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.reflect.StructureModifier;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
+import java.util.List;
 import me.libraryaddict.disguise.DisguiseAPI;
 import me.libraryaddict.disguise.DisguiseConfig;
 import me.libraryaddict.disguise.LibsDisguises;
@@ -22,10 +25,6 @@ import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-
 public class PacketListenerInventory extends PacketAdapter {
     private LibsDisguises libsDisguises;
 

plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerMain.java

@@ -7,6 +7,8 @@ import com.comphenix.protocol.events.ListenerPriority;
 import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
+import java.lang.reflect.InvocationTargetException;
+import java.util.ArrayList;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.PlayerDisguise;
@@ -15,9 +17,6 @@ import me.libraryaddict.disguise.utilities.packets.LibsPackets;
 import me.libraryaddict.disguise.utilities.packets.PacketsManager;
 import org.bukkit.entity.Player;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-
 public class PacketListenerMain extends PacketAdapter {
     public PacketListenerMain(LibsDisguises plugin, ArrayList<PacketType> packetsToListen) {
         super(plugin, ListenerPriority.HIGH, packetsToListen);

plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerModdedClient.java

@@ -12,15 +12,14 @@ import com.mojang.authlib.GameProfile;
 import io.netty.buffer.ByteBuf;
 import io.netty.buffer.Unpooled;
 import io.netty.handler.codec.DecoderException;
-import me.libraryaddict.disguise.LibsDisguises;
-import me.libraryaddict.disguise.utilities.modded.ModdedManager;
-import me.libraryaddict.disguise.utilities.reflection.ReflectionManager;
-import org.bukkit.entity.Player;
-
 import java.lang.reflect.InvocationTargetException;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
+import me.libraryaddict.disguise.LibsDisguises;
+import me.libraryaddict.disguise.utilities.modded.ModdedManager;
+import me.libraryaddict.disguise.utilities.reflection.ReflectionManager;
+import org.bukkit.entity.Player;
 
 /**
  * Created by libraryaddict on 11/06/2020.

plugin/src/main/java/me/libraryaddict/disguise/utilities/packets/packetlisteners/PacketListenerSounds.java

@@ -7,6 +7,8 @@ import com.comphenix.protocol.events.PacketAdapter;
 import com.comphenix.protocol.events.PacketContainer;
 import com.comphenix.protocol.events.PacketEvent;
 import com.comphenix.protocol.reflect.StructureModifier;
+import java.lang.reflect.InvocationTargetException;
+import java.util.Set;
 import me.libraryaddict.disguise.LibsDisguises;
 import me.libraryaddict.disguise.disguisetypes.Disguise;
 import me.libraryaddict.disguise.disguisetypes.DisguiseType;
@@ -21,9 +23,6 @@ import org.bukkit.entity.Entity;
 import org.bukkit.entity.LivingEntity;
 import org.bukkit.entity.Player;
 
-import java.lang.reflect.InvocationTargetException;
-import java.util.Set;
-
 public class PacketListenerSounds extends PacketAdapter {
 
     /**