Organize imports

src/main/java/de/epiceric/shopchest/ShopChest.java

@@ -1,7 +1,34 @@
 package de.epiceric.shopchest;
 
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.text.SimpleDateFormat;
+import java.util.Calendar;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.UUID;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+import java.util.stream.Stream;
+
 import com.palmergames.bukkit.towny.Towny;
 import com.wasteofplastic.askyblock.ASkyBlock;
+
+import org.bstats.bukkit.Metrics;
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.plugin.Plugin;
+import org.bukkit.plugin.RegisteredServiceProvider;
+import org.bukkit.plugin.java.JavaPlugin;
+import org.bukkit.scheduler.BukkitRunnable;
+import org.codemc.worldguardwrapper.WorldGuardWrapper;
+
 import de.epiceric.shopchest.command.ShopCommand;
 import de.epiceric.shopchest.config.Config;
 import de.epiceric.shopchest.config.HologramFormat;
@@ -43,36 +70,10 @@ import fr.xephi.authme.AuthMe;
 import me.ryanhamshire.GriefPrevention.GriefPrevention;
 import me.wiefferink.areashop.AreaShop;
 import net.milkbowl.vault.economy.Economy;
-import org.bstats.bukkit.Metrics;
-import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.plugin.Plugin;
-import org.bukkit.plugin.RegisteredServiceProvider;
-import org.bukkit.plugin.java.JavaPlugin;
-import org.bukkit.scheduler.BukkitRunnable;
-import org.codemc.worldguardwrapper.WorldGuardWrapper;
-
 import pl.islandworld.IslandWorld;
 import us.talabrek.ultimateskyblock.api.uSkyBlockAPI;
 import world.bentobox.bentobox.BentoBox;
 
-import java.io.File;
-import java.io.FileWriter;
-import java.io.IOException;
-import java.io.PrintWriter;
-import java.text.SimpleDateFormat;
-import java.util.Calendar;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.UUID;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-import java.util.stream.Stream;
-
 public class ShopChest extends JavaPlugin {
 
     private static ShopChest instance;

src/main/java/de/epiceric/shopchest/command/ShopCommand.java

@@ -1,21 +1,5 @@
 package de.epiceric.shopchest.command;
 
-import de.epiceric.shopchest.ShopChest;
-import de.epiceric.shopchest.config.Config;
-import de.epiceric.shopchest.config.Placeholder;
-import de.epiceric.shopchest.language.LanguageUtils;
-import de.epiceric.shopchest.language.Message;
-import de.epiceric.shopchest.language.Replacement;
-import de.epiceric.shopchest.utils.Permissions;
-import de.epiceric.shopchest.utils.ClickType.SelectClickType;
-
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.command.*;
-import org.bukkit.entity.Player;
-import org.bukkit.permissions.PermissionAttachmentInfo;
-import org.bukkit.plugin.Plugin;
-
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
@@ -24,6 +8,28 @@ import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandMap;
+import org.bukkit.command.CommandSender;
+import org.bukkit.command.PluginCommand;
+import org.bukkit.command.SimpleCommandMap;
+import org.bukkit.command.TabCompleter;
+import org.bukkit.entity.Player;
+import org.bukkit.permissions.PermissionAttachmentInfo;
+import org.bukkit.plugin.Plugin;
+
+import de.epiceric.shopchest.ShopChest;
+import de.epiceric.shopchest.config.Config;
+import de.epiceric.shopchest.config.Placeholder;
+import de.epiceric.shopchest.language.LanguageUtils;
+import de.epiceric.shopchest.language.Message;
+import de.epiceric.shopchest.language.Replacement;
+import de.epiceric.shopchest.utils.ClickType.SelectClickType;
+import de.epiceric.shopchest.utils.Permissions;
+
 public class ShopCommand {
 
     private static boolean commandCreated = false;

src/main/java/de/epiceric/shopchest/command/ShopCommandExecutor.java

@@ -1,5 +1,23 @@
 package de.epiceric.shopchest.command;
 
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Stream;
+
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.GameMode;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
+import org.bukkit.command.Command;
+import org.bukkit.command.CommandExecutor;
+import org.bukkit.command.CommandSender;
+import org.bukkit.enchantments.Enchantment;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+
 import de.epiceric.shopchest.ShopChest;
 import de.epiceric.shopchest.config.Config;
 import de.epiceric.shopchest.config.Placeholder;
@@ -13,35 +31,17 @@ import de.epiceric.shopchest.language.LanguageUtils;
 import de.epiceric.shopchest.language.Message;
 import de.epiceric.shopchest.language.Replacement;
 import de.epiceric.shopchest.shop.Shop;
-import de.epiceric.shopchest.shop.ShopProduct;
 import de.epiceric.shopchest.shop.Shop.ShopType;
+import de.epiceric.shopchest.shop.ShopProduct;
 import de.epiceric.shopchest.utils.Callback;
 import de.epiceric.shopchest.utils.ClickType;
+import de.epiceric.shopchest.utils.ClickType.CreateClickType;
+import de.epiceric.shopchest.utils.ClickType.SelectClickType;
 import de.epiceric.shopchest.utils.ItemUtils;
 import de.epiceric.shopchest.utils.Permissions;
 import de.epiceric.shopchest.utils.ShopUtils;
 import de.epiceric.shopchest.utils.UpdateChecker;
 import de.epiceric.shopchest.utils.Utils;
-import de.epiceric.shopchest.utils.ClickType.CreateClickType;
-import de.epiceric.shopchest.utils.ClickType.SelectClickType;
-
-import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
-import org.bukkit.GameMode;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.World;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.enchantments.Enchantment;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.List;
-import java.util.stream.Stream;
 
 class ShopCommandExecutor implements CommandExecutor {
 

src/main/java/de/epiceric/shopchest/command/ShopSubCommand.java

@@ -1,13 +1,13 @@
 package de.epiceric.shopchest.command;
 
+import java.util.ArrayList;
+import java.util.List;
+
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public abstract class ShopSubCommand {
     private String name;
     private boolean playerCommand;

src/main/java/de/epiceric/shopchest/command/ShopTabCompleter.java

@@ -1,7 +1,10 @@
 package de.epiceric.shopchest.command;
 
-import de.epiceric.shopchest.ShopChest;
+import java.util.ArrayList;
-import de.epiceric.shopchest.config.Config;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
@@ -9,11 +12,8 @@ import org.bukkit.command.CommandSender;
 import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
 
-import java.util.ArrayList;
+import de.epiceric.shopchest.ShopChest;
-import java.util.Arrays;
+import de.epiceric.shopchest.config.Config;
-import java.util.List;
-import java.util.Set;
-import java.util.stream.Collectors;
 
 class ShopTabCompleter implements TabCompleter {
 

src/main/java/de/epiceric/shopchest/config/Config.java

@@ -1,14 +1,5 @@
 package de.epiceric.shopchest.config;
 
-import de.epiceric.shopchest.ShopChest;
-import de.epiceric.shopchest.language.LanguageUtils;
-import de.epiceric.shopchest.sql.Database;
-import de.epiceric.shopchest.utils.ItemUtils;
-import de.epiceric.shopchest.utils.Utils;
-
-import org.bukkit.configuration.InvalidConfigurationException;
-import org.bukkit.inventory.ItemStack;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -19,6 +10,15 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
+import org.bukkit.configuration.InvalidConfigurationException;
+import org.bukkit.inventory.ItemStack;
+
+import de.epiceric.shopchest.ShopChest;
+import de.epiceric.shopchest.language.LanguageUtils;
+import de.epiceric.shopchest.sql.Database;
+import de.epiceric.shopchest.utils.ItemUtils;
+import de.epiceric.shopchest.utils.Utils;
+
 public class Config {
 
     /**

src/main/java/de/epiceric/shopchest/config/HologramFormat.java

@@ -1,19 +1,21 @@
 package de.epiceric.shopchest.config;
 
-import de.epiceric.shopchest.ShopChest;
-import de.epiceric.shopchest.utils.Operator;
-import org.bukkit.configuration.ConfigurationSection;
-import org.bukkit.configuration.file.YamlConfiguration;
-
-import javax.script.ScriptEngine;
-import javax.script.ScriptEngineManager;
-import javax.script.ScriptException;
 import java.io.File;
 import java.util.List;
 import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import javax.script.ScriptEngine;
+import javax.script.ScriptEngineManager;
+import javax.script.ScriptException;
+
+import org.bukkit.configuration.ConfigurationSection;
+import org.bukkit.configuration.file.YamlConfiguration;
+
+import de.epiceric.shopchest.ShopChest;
+import de.epiceric.shopchest.utils.Operator;
+
 public class HologramFormat {
 
     public enum Requirement {

src/main/java/de/epiceric/shopchest/config/LanguageConfiguration.java

@@ -1,14 +1,20 @@
 package de.epiceric.shopchest.config;
 
-import de.epiceric.shopchest.ShopChest;
+import java.io.BufferedReader;
-import org.bukkit.configuration.InvalidConfigurationException;
+import java.io.File;
-import org.bukkit.configuration.file.FileConfiguration;
+import java.io.FileInputStream;
-
+import java.io.FileWriter;
-import java.io.*;
+import java.io.IOException;
+import java.io.InputStreamReader;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.HashMap;
 
+import org.bukkit.configuration.InvalidConfigurationException;
+import org.bukkit.configuration.file.FileConfiguration;
+
+import de.epiceric.shopchest.ShopChest;
+
 public class LanguageConfiguration extends FileConfiguration {
 
     private ArrayList<String> lines = new ArrayList<>();

src/main/java/de/epiceric/shopchest/event/ShopBuySellEvent.java

@@ -1,9 +1,10 @@
 package de.epiceric.shopchest.event;
 
-import de.epiceric.shopchest.shop.Shop;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 
+import de.epiceric.shopchest.shop.Shop;
+
 /**
  * Called when a player buys or sells something from or to a shop
  */

src/main/java/de/epiceric/shopchest/event/ShopCreateEvent.java

@@ -1,9 +1,10 @@
 package de.epiceric.shopchest.event;
 
-import de.epiceric.shopchest.shop.Shop;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 
+import de.epiceric.shopchest.shop.Shop;
+
 /**
  * Called when a player creates a shop (clicks on a chest)
  */

src/main/java/de/epiceric/shopchest/event/ShopEvent.java

@@ -1,10 +1,11 @@
 package de.epiceric.shopchest.event;
 
-import de.epiceric.shopchest.shop.Shop;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
+import de.epiceric.shopchest.shop.Shop;
+
 public abstract class ShopEvent extends Event {
 
     private static final HandlerList handlers = new HandlerList();

src/main/java/de/epiceric/shopchest/event/ShopExtendEvent.java

@@ -1,11 +1,11 @@
 package de.epiceric.shopchest.event;
 
-import de.epiceric.shopchest.shop.Shop;
-
 import org.bukkit.Location;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 
+import de.epiceric.shopchest.shop.Shop;
+
 /**
  * Called when a player extends a shop (making a chest a double chest)
  */

src/main/java/de/epiceric/shopchest/event/ShopInfoEvent.java

@@ -1,9 +1,10 @@
 package de.epiceric.shopchest.event;
 
-import de.epiceric.shopchest.shop.Shop;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 
+import de.epiceric.shopchest.shop.Shop;
+
 /**
  * Called when a player retrieves information about a shop (clicks on a chest)
  */

src/main/java/de/epiceric/shopchest/event/ShopOpenEvent.java

@@ -1,9 +1,10 @@
 package de.epiceric.shopchest.event;
 
-import de.epiceric.shopchest.shop.Shop;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 
+import de.epiceric.shopchest.shop.Shop;
+
 /**
  * Called when a player opens a shop (clicks on a chest)
  */

src/main/java/de/epiceric/shopchest/event/ShopPreCreateEvent.java

@@ -1,9 +1,10 @@
 package de.epiceric.shopchest.event;
 
-import de.epiceric.shopchest.shop.Shop;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 
+import de.epiceric.shopchest.shop.Shop;
+
 /**
  * Called when a player wants to create a shop (enters the command)
  */

src/main/java/de/epiceric/shopchest/event/ShopRemoveAllEvent.java

@@ -1,13 +1,14 @@
 package de.epiceric.shopchest.event;
 
-import de.epiceric.shopchest.shop.Shop;
+import java.util.List;
+
 import org.bukkit.OfflinePlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;
 
-import java.util.List;
+import de.epiceric.shopchest.shop.Shop;
 
 public class ShopRemoveAllEvent extends Event implements Cancellable {
     private static final HandlerList handlers = new HandlerList();

src/main/java/de/epiceric/shopchest/event/ShopRemoveEvent.java

@@ -1,9 +1,10 @@
 package de.epiceric.shopchest.event;
 
-import de.epiceric.shopchest.shop.Shop;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Cancellable;
 
+import de.epiceric.shopchest.shop.Shop;
+
 /**
  * Called when a player removes a shop (clicks on a chest)
  */

src/main/java/de/epiceric/shopchest/external/PlotSquaredShopFlag.java

@@ -1,5 +1,7 @@
 package de.epiceric.shopchest.external;
 
+import java.util.Locale;
+
 import com.github.intellectualsites.plotsquared.plot.flag.Flag;
 import com.github.intellectualsites.plotsquared.plot.flag.Flags;
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
@@ -8,8 +10,6 @@ import org.bukkit.entity.Player;
 
 import de.epiceric.shopchest.ShopChest;
 
-import java.util.Locale;
-
 public class PlotSquaredShopFlag {
 
     private static boolean registered = false;

src/main/java/de/epiceric/shopchest/language/LanguageUtils.java

@@ -1,12 +1,8 @@
 package de.epiceric.shopchest.language;
 
-import de.epiceric.shopchest.ShopChest;
+import java.util.ArrayList;
-import de.epiceric.shopchest.config.Config;
+import java.util.Map;
-import de.epiceric.shopchest.config.LanguageConfiguration;
+import java.util.StringJoiner;
-import de.epiceric.shopchest.config.Placeholder;
-import de.epiceric.shopchest.nms.CustomBookMeta;
-import de.epiceric.shopchest.nms.SpawnEggMeta;
-import de.epiceric.shopchest.utils.Utils;
 
 import org.bukkit.ChatColor;
 import org.bukkit.Material;
@@ -21,9 +17,13 @@ import org.bukkit.potion.Potion;
 import org.bukkit.potion.PotionEffectType;
 import org.bukkit.potion.PotionType;
 
-import java.util.ArrayList;
+import de.epiceric.shopchest.ShopChest;
-import java.util.Map;
+import de.epiceric.shopchest.config.Config;
-import java.util.StringJoiner;
+import de.epiceric.shopchest.config.LanguageConfiguration;
+import de.epiceric.shopchest.config.Placeholder;
+import de.epiceric.shopchest.nms.CustomBookMeta;
+import de.epiceric.shopchest.nms.SpawnEggMeta;
+import de.epiceric.shopchest.utils.Utils;
 
 public class LanguageUtils {
 

src/main/java/de/epiceric/shopchest/language/PotionName.java

@@ -1,6 +1,5 @@
 package de.epiceric.shopchest.language;
 
-
 import org.bukkit.potion.PotionType;
 
 public class PotionName {

src/main/java/de/epiceric/shopchest/listeners/AreaShopListener.java

@@ -1,5 +1,10 @@
 package de.epiceric.shopchest.listeners;
 
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.Listener;
+import org.codemc.worldguardwrapper.WorldGuardWrapper;
+import org.codemc.worldguardwrapper.region.IWrappedRegion;
+
 import de.epiceric.shopchest.ShopChest;
 import de.epiceric.shopchest.config.Config;
 import de.epiceric.shopchest.shop.Shop;
@@ -8,10 +13,6 @@ import me.wiefferink.areashop.events.notify.ResoldRegionEvent;
 import me.wiefferink.areashop.events.notify.SoldRegionEvent;
 import me.wiefferink.areashop.events.notify.UnrentedRegionEvent;
 import me.wiefferink.areashop.regions.GeneralRegion;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.codemc.worldguardwrapper.WorldGuardWrapper;
-import org.codemc.worldguardwrapper.region.IWrappedRegion;
 
 public class AreaShopListener implements Listener {
 

src/main/java/de/epiceric/shopchest/listeners/BlockExplodeListener.java

@@ -1,13 +1,14 @@
 package de.epiceric.shopchest.listeners;
 
-import de.epiceric.shopchest.ShopChest;
+import java.util.ArrayList;
+
 import org.bukkit.Material;
 import org.bukkit.block.Block;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockExplodeEvent;
 
-import java.util.ArrayList;
+import de.epiceric.shopchest.ShopChest;
 
 public class BlockExplodeListener implements Listener {
 

src/main/java/de/epiceric/shopchest/listeners/ChestProtectListener.java

@@ -1,20 +1,6 @@
 package de.epiceric.shopchest.listeners;
 
-import de.epiceric.shopchest.ShopChest;
+import java.util.ArrayList;
-import de.epiceric.shopchest.config.Config;
-import de.epiceric.shopchest.config.Placeholder;
-import de.epiceric.shopchest.event.ShopExtendEvent;
-import de.epiceric.shopchest.language.LanguageUtils;
-import de.epiceric.shopchest.language.Message;
-import de.epiceric.shopchest.language.Replacement;
-import de.epiceric.shopchest.shop.Shop;
-import de.epiceric.shopchest.shop.Shop.ShopType;
-import de.epiceric.shopchest.utils.Callback;
-import de.epiceric.shopchest.utils.ItemUtils;
-import de.epiceric.shopchest.utils.Permissions;
-import de.epiceric.shopchest.utils.ShopUtils;
-import de.epiceric.shopchest.utils.Utils;
-import net.milkbowl.vault.economy.EconomyResponse;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
@@ -35,7 +21,21 @@ import org.bukkit.event.inventory.InventoryMoveItemEvent;
 import org.bukkit.event.inventory.InventoryType;
 import org.bukkit.inventory.InventoryHolder;
 
-import java.util.ArrayList;
+import de.epiceric.shopchest.ShopChest;
+import de.epiceric.shopchest.config.Config;
+import de.epiceric.shopchest.config.Placeholder;
+import de.epiceric.shopchest.event.ShopExtendEvent;
+import de.epiceric.shopchest.language.LanguageUtils;
+import de.epiceric.shopchest.language.Message;
+import de.epiceric.shopchest.language.Replacement;
+import de.epiceric.shopchest.shop.Shop;
+import de.epiceric.shopchest.shop.Shop.ShopType;
+import de.epiceric.shopchest.utils.Callback;
+import de.epiceric.shopchest.utils.ItemUtils;
+import de.epiceric.shopchest.utils.Permissions;
+import de.epiceric.shopchest.utils.ShopUtils;
+import de.epiceric.shopchest.utils.Utils;
+import net.milkbowl.vault.economy.EconomyResponse;
 
 public class ChestProtectListener implements Listener {
 

src/main/java/de/epiceric/shopchest/listeners/ShopInteractListener.java

@@ -1,34 +1,16 @@
 package de.epiceric.shopchest.listeners;
 
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Optional;
+import java.util.Set;
+import java.util.UUID;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import com.github.intellectualsites.plotsquared.plot.object.Plot;
 import com.google.gson.JsonPrimitive;
-import de.epiceric.shopchest.ShopChest;
-import de.epiceric.shopchest.config.Config;
-import de.epiceric.shopchest.config.Placeholder;
-import de.epiceric.shopchest.event.ShopBuySellEvent;
-import de.epiceric.shopchest.event.ShopCreateEvent;
-import de.epiceric.shopchest.event.ShopInfoEvent;
-import de.epiceric.shopchest.event.ShopOpenEvent;
-import de.epiceric.shopchest.event.ShopRemoveEvent;
-import de.epiceric.shopchest.external.PlotSquaredShopFlag;
-import de.epiceric.shopchest.external.PlotSquaredShopFlag.GroupFlag;
-import de.epiceric.shopchest.language.LanguageUtils;
-import de.epiceric.shopchest.language.Message;
-import de.epiceric.shopchest.language.Replacement;
-import de.epiceric.shopchest.nms.JsonBuilder;
-import de.epiceric.shopchest.shop.Shop;
-import de.epiceric.shopchest.shop.ShopProduct;
-import de.epiceric.shopchest.shop.Shop.ShopType;
-import de.epiceric.shopchest.sql.Database;
-import de.epiceric.shopchest.utils.ClickType;
-import de.epiceric.shopchest.utils.ItemUtils;
-import de.epiceric.shopchest.utils.Permissions;
-import de.epiceric.shopchest.utils.ShopUtils;
-import de.epiceric.shopchest.utils.Utils;
-import de.epiceric.shopchest.utils.ClickType.CreateClickType;
-import fr.xephi.authme.api.v3.AuthMeApi;
-import net.milkbowl.vault.economy.Economy;
-import net.milkbowl.vault.economy.EconomyResponse;
 
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -54,14 +36,33 @@ import org.codemc.worldguardwrapper.WorldGuardWrapper;
 import org.codemc.worldguardwrapper.flag.IWrappedFlag;
 import org.codemc.worldguardwrapper.flag.WrappedState;
 
-import java.util.HashMap;
+import de.epiceric.shopchest.ShopChest;
-import java.util.HashSet;
+import de.epiceric.shopchest.config.Config;
-import java.util.Map;
+import de.epiceric.shopchest.config.Placeholder;
-import java.util.Optional;
+import de.epiceric.shopchest.event.ShopBuySellEvent;
-import java.util.Set;
+import de.epiceric.shopchest.event.ShopCreateEvent;
-import java.util.UUID;
+import de.epiceric.shopchest.event.ShopInfoEvent;
-import java.util.regex.Matcher;
+import de.epiceric.shopchest.event.ShopOpenEvent;
-import java.util.regex.Pattern;
+import de.epiceric.shopchest.event.ShopRemoveEvent;
+import de.epiceric.shopchest.external.PlotSquaredShopFlag;
+import de.epiceric.shopchest.external.PlotSquaredShopFlag.GroupFlag;
+import de.epiceric.shopchest.language.LanguageUtils;
+import de.epiceric.shopchest.language.Message;
+import de.epiceric.shopchest.language.Replacement;
+import de.epiceric.shopchest.nms.JsonBuilder;
+import de.epiceric.shopchest.shop.Shop;
+import de.epiceric.shopchest.shop.Shop.ShopType;
+import de.epiceric.shopchest.shop.ShopProduct;
+import de.epiceric.shopchest.sql.Database;
+import de.epiceric.shopchest.utils.ClickType;
+import de.epiceric.shopchest.utils.ClickType.CreateClickType;
+import de.epiceric.shopchest.utils.ItemUtils;
+import de.epiceric.shopchest.utils.Permissions;
+import de.epiceric.shopchest.utils.ShopUtils;
+import de.epiceric.shopchest.utils.Utils;
+import fr.xephi.authme.api.v3.AuthMeApi;
+import net.milkbowl.vault.economy.Economy;
+import net.milkbowl.vault.economy.EconomyResponse;
 
 public class ShopInteractListener implements Listener {
     private static final Pattern COLOR_CODE_PATTERN = Pattern.compile(".*([§]([a-fA-F0-9]))");

src/main/java/de/epiceric/shopchest/listeners/ShopItemListener.java

@@ -1,8 +1,5 @@
 package de.epiceric.shopchest.listeners;
 
-import de.epiceric.shopchest.ShopChest;
-import de.epiceric.shopchest.shop.Shop;
-import de.epiceric.shopchest.utils.ShopUtils;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
 import org.bukkit.block.Block;
@@ -12,10 +9,20 @@ import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;
-import org.bukkit.event.block.*;
+import org.bukkit.event.block.BlockFromToEvent;
+import org.bukkit.event.block.BlockGrowEvent;
+import org.bukkit.event.block.BlockMultiPlaceEvent;
+import org.bukkit.event.block.BlockPistonExtendEvent;
+import org.bukkit.event.block.BlockPistonRetractEvent;
+import org.bukkit.event.block.BlockPlaceEvent;
+import org.bukkit.event.block.BlockSpreadEvent;
 import org.bukkit.event.player.PlayerBucketEmptyEvent;
 import org.bukkit.event.world.StructureGrowEvent;
 
+import de.epiceric.shopchest.ShopChest;
+import de.epiceric.shopchest.shop.Shop;
+import de.epiceric.shopchest.utils.ShopUtils;
+
 public class ShopItemListener implements Listener {
 
     private ShopUtils shopUtils;

src/main/java/de/epiceric/shopchest/listeners/ShopUpdateListener.java

@@ -1,9 +1,5 @@
 package de.epiceric.shopchest.listeners;
 
-import de.epiceric.shopchest.ShopChest;
-import de.epiceric.shopchest.shop.Shop;
-import de.epiceric.shopchest.utils.Callback;
-
 import java.util.HashSet;
 import java.util.Set;
 
@@ -22,6 +18,10 @@ import org.bukkit.event.player.PlayerTeleportEvent;
 import org.bukkit.event.world.ChunkLoadEvent;
 import org.bukkit.scheduler.BukkitRunnable;
 
+import de.epiceric.shopchest.ShopChest;
+import de.epiceric.shopchest.shop.Shop;
+import de.epiceric.shopchest.utils.Callback;
+
 public class ShopUpdateListener implements Listener {
 
     private final ShopChest plugin;

src/main/java/de/epiceric/shopchest/nms/ArmorStandWrapper.java

@@ -1,13 +1,14 @@
 package de.epiceric.shopchest.nms;
 
-import de.epiceric.shopchest.ShopChest;
+import java.lang.reflect.Field;
-import de.epiceric.shopchest.utils.Utils;
+import java.util.UUID;
+
 import org.bukkit.Location;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 
-import java.lang.reflect.Field;
+import de.epiceric.shopchest.ShopChest;
-import java.util.UUID;
+import de.epiceric.shopchest.utils.Utils;
 
 public class ArmorStandWrapper {
     

src/main/java/de/epiceric/shopchest/nms/CustomBookMeta.java

@@ -1,10 +1,11 @@
 package de.epiceric.shopchest.nms;	
 	
-import de.epiceric.shopchest.ShopChest;	
+import java.lang.reflect.InvocationTargetException;
-import de.epiceric.shopchest.utils.Utils;	
+
-import org.bukkit.inventory.ItemStack;	
+import org.bukkit.inventory.ItemStack;
-	
+
-import java.lang.reflect.InvocationTargetException;	
+import de.epiceric.shopchest.ShopChest;
+import de.epiceric.shopchest.utils.Utils;
 	
 // For versions below 1.9.4, since Bukkit's BookMeta	
 // didn't have generations in those versions	

src/main/java/de/epiceric/shopchest/nms/Hologram.java

@@ -1,19 +1,22 @@
 package de.epiceric.shopchest.nms;
 
-import de.epiceric.shopchest.ShopChest;
+import java.util.ArrayList;
-import de.epiceric.shopchest.config.Config;
+import java.util.List;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
 import org.bukkit.ChatColor;
 import org.bukkit.Location;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Player;
 
-import java.util.*;
+import de.epiceric.shopchest.ShopChest;
-import java.util.concurrent.ConcurrentHashMap;
+import de.epiceric.shopchest.config.Config;
 
 public class Hologram {
     // concurrent since update task is in async thread
-    // since this is a fake entity, hologram is hidden per default
+    private final Set<UUID> viewers = ConcurrentHashMap.newKeySet();
-    private final Set<UUID> viewers = Collections.newSetFromMap(new ConcurrentHashMap<UUID, Boolean>());
     private final List<ArmorStandWrapper> wrappers = new ArrayList<>();
     private final Location location;
     private final ShopChest plugin;

src/main/java/de/epiceric/shopchest/nms/JsonBuilder.java

@@ -1,10 +1,5 @@
 package de.epiceric.shopchest.nms;
 
-import de.epiceric.shopchest.ShopChest;
-import de.epiceric.shopchest.utils.Utils;
-import org.bukkit.ChatColor;
-import org.bukkit.entity.Player;
-
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -15,6 +10,12 @@ import java.util.StringJoiner;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.bukkit.ChatColor;
+import org.bukkit.entity.Player;
+
+import de.epiceric.shopchest.ShopChest;
+import de.epiceric.shopchest.utils.Utils;
+
 public class JsonBuilder {
 
     public static class Part {

src/main/java/de/epiceric/shopchest/nms/SpawnEggMeta.java

@@ -1,11 +1,12 @@
 package de.epiceric.shopchest.nms;	
 	
-import de.epiceric.shopchest.ShopChest;	
+import java.lang.reflect.InvocationTargetException;
-import de.epiceric.shopchest.utils.Utils;	
+
-import org.bukkit.entity.EntityType;	
+import org.bukkit.entity.EntityType;
-import org.bukkit.inventory.ItemStack;	
+import org.bukkit.inventory.ItemStack;
-	
+
-import java.lang.reflect.InvocationTargetException;	
+import de.epiceric.shopchest.ShopChest;
+import de.epiceric.shopchest.utils.Utils;
 	
 public class SpawnEggMeta {	
 	

src/main/java/de/epiceric/shopchest/shop/Shop.java

@@ -1,15 +1,10 @@
 package de.epiceric.shopchest.shop;
 
-import de.epiceric.shopchest.ShopChest;
+import java.util.ArrayList;
-import de.epiceric.shopchest.config.Config;
+import java.util.EnumMap;
-import de.epiceric.shopchest.config.HologramFormat;
+import java.util.List;
-import de.epiceric.shopchest.config.Placeholder;
+import java.util.Map;
-import de.epiceric.shopchest.exceptions.ChestNotFoundException;
+
-import de.epiceric.shopchest.exceptions.NotEnoughSpaceException;
-import de.epiceric.shopchest.language.LanguageUtils;
-import de.epiceric.shopchest.nms.Hologram;
-import de.epiceric.shopchest.utils.ItemUtils;
-import de.epiceric.shopchest.utils.Utils;
 import org.bukkit.Location;
 import org.bukkit.Material;
 import org.bukkit.OfflinePlayer;
@@ -25,7 +20,16 @@ import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;
 
-import java.util.*;
+import de.epiceric.shopchest.ShopChest;
+import de.epiceric.shopchest.config.Config;
+import de.epiceric.shopchest.config.HologramFormat;
+import de.epiceric.shopchest.config.Placeholder;
+import de.epiceric.shopchest.exceptions.ChestNotFoundException;
+import de.epiceric.shopchest.exceptions.NotEnoughSpaceException;
+import de.epiceric.shopchest.language.LanguageUtils;
+import de.epiceric.shopchest.nms.Hologram;
+import de.epiceric.shopchest.utils.ItemUtils;
+import de.epiceric.shopchest.utils.Utils;
 
 public class Shop {
 

src/main/java/de/epiceric/shopchest/shop/ShopItem.java

@@ -1,24 +1,25 @@
 package de.epiceric.shopchest.shop;
 
-import de.epiceric.shopchest.ShopChest;
+import java.lang.reflect.InvocationTargetException;
-import de.epiceric.shopchest.utils.Utils;
+import java.util.ArrayList;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.entity.EntityType;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
-import java.lang.reflect.InvocationTargetException;
+import de.epiceric.shopchest.ShopChest;
-import java.util.*;
+import de.epiceric.shopchest.utils.Utils;
-import java.util.concurrent.ConcurrentHashMap;
 
 public class ShopItem {
-
     private final ShopChest plugin;
 
     // concurrent since update task is in async thread
-    // since this is a fake entity, item is hidden per default
+    private final Set<UUID> viewers = ConcurrentHashMap.newKeySet();
-    private final Set<UUID> viewers = Collections.newSetFromMap(new ConcurrentHashMap<UUID, Boolean>());
     private final ItemStack itemStack;
     private final Location location;
     private final UUID uuid = UUID.randomUUID();

src/main/java/de/epiceric/shopchest/sql/Database.java

@@ -1,23 +1,5 @@
 package de.epiceric.shopchest.sql;
 
-import de.epiceric.shopchest.ShopChest;
-import de.epiceric.shopchest.config.Config;
-import de.epiceric.shopchest.event.ShopBuySellEvent;
-import de.epiceric.shopchest.event.ShopBuySellEvent.Type;
-import de.epiceric.shopchest.shop.Shop;
-import de.epiceric.shopchest.shop.ShopProduct;
-import de.epiceric.shopchest.shop.Shop.ShopType;
-import de.epiceric.shopchest.utils.Callback;
-import de.epiceric.shopchest.utils.Utils;
-import org.bukkit.Bukkit;
-import org.bukkit.Chunk;
-import org.bukkit.Location;
-import org.bukkit.OfflinePlayer;
-import org.bukkit.World;
-import org.bukkit.entity.Player;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.scheduler.BukkitRunnable;
-
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
@@ -37,6 +19,25 @@ import java.util.UUID;
 
 import com.zaxxer.hikari.HikariDataSource;
 
+import org.bukkit.Bukkit;
+import org.bukkit.Chunk;
+import org.bukkit.Location;
+import org.bukkit.OfflinePlayer;
+import org.bukkit.World;
+import org.bukkit.entity.Player;
+import org.bukkit.inventory.ItemStack;
+import org.bukkit.scheduler.BukkitRunnable;
+
+import de.epiceric.shopchest.ShopChest;
+import de.epiceric.shopchest.config.Config;
+import de.epiceric.shopchest.event.ShopBuySellEvent;
+import de.epiceric.shopchest.event.ShopBuySellEvent.Type;
+import de.epiceric.shopchest.shop.Shop;
+import de.epiceric.shopchest.shop.Shop.ShopType;
+import de.epiceric.shopchest.shop.ShopProduct;
+import de.epiceric.shopchest.utils.Callback;
+import de.epiceric.shopchest.utils.Utils;
+
 public abstract class Database {
     private final SimpleDateFormat dateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 

src/main/java/de/epiceric/shopchest/sql/MySQL.java

@@ -1,9 +1,5 @@
 package de.epiceric.shopchest.sql;
 
-import de.epiceric.shopchest.ShopChest;
-import de.epiceric.shopchest.config.Config;
-import org.bukkit.scheduler.BukkitRunnable;
-
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
@@ -11,6 +7,11 @@ import java.sql.Statement;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 
+import org.bukkit.scheduler.BukkitRunnable;
+
+import de.epiceric.shopchest.ShopChest;
+import de.epiceric.shopchest.config.Config;
+
 public class MySQL extends Database {
 
     public MySQL(ShopChest plugin) {

src/main/java/de/epiceric/shopchest/sql/SQLite.java

@@ -1,8 +1,5 @@
 package de.epiceric.shopchest.sql;
 
-import de.epiceric.shopchest.ShopChest;
-import org.bukkit.scheduler.BukkitRunnable;
-
 import java.io.File;
 import java.io.IOException;
 import java.sql.Connection;
@@ -12,6 +9,8 @@ import java.sql.Statement;
 import com.zaxxer.hikari.HikariConfig;
 import com.zaxxer.hikari.HikariDataSource;
 
+import de.epiceric.shopchest.ShopChest;
+
 public class SQLite extends Database {
 
     public SQLite(ShopChest plugin) {

src/main/java/de/epiceric/shopchest/utils/Callback.java

@@ -1,8 +1,9 @@
 package de.epiceric.shopchest.utils;
 
-import de.epiceric.shopchest.ShopChest;
 import org.bukkit.scheduler.BukkitRunnable;
 
+import de.epiceric.shopchest.ShopChest;
+
 public abstract class Callback<T> {
     private ShopChest plugin;
 

src/main/java/de/epiceric/shopchest/utils/ClickType.java

@@ -1,8 +1,9 @@
 package de.epiceric.shopchest.utils;
 
-import de.epiceric.shopchest.ShopChest;
+import java.util.HashMap;
-import de.epiceric.shopchest.shop.ShopProduct;
+import java.util.Map;
-import de.epiceric.shopchest.shop.Shop.ShopType;
+import java.util.Optional;
+import java.util.UUID;
 
 import org.bukkit.Bukkit;
 import org.bukkit.GameMode;
@@ -12,10 +13,9 @@ import org.bukkit.inventory.ItemStack;
 import org.bukkit.scheduler.BukkitRunnable;
 import org.bukkit.scheduler.BukkitTask;
 
-import java.util.HashMap;
+import de.epiceric.shopchest.ShopChest;
-import java.util.Map;
+import de.epiceric.shopchest.shop.Shop.ShopType;
-import java.util.Optional;
+import de.epiceric.shopchest.shop.ShopProduct;
-import java.util.UUID;
 
 public class ClickType {
     private static Map<UUID, ClickType> playerClickType = new HashMap<>();

src/main/java/de/epiceric/shopchest/utils/ItemUtils.java

@@ -1,5 +1,8 @@
 package de.epiceric.shopchest.utils;
 
+import java.util.Arrays;
+import java.util.Map;
+
 import org.bukkit.Material;
 import org.bukkit.enchantments.Enchantment;
 import org.bukkit.inventory.ItemStack;
@@ -8,9 +11,6 @@ import org.bukkit.inventory.meta.PotionMeta;
 import org.bukkit.potion.Potion;
 import org.bukkit.potion.PotionType;
 
-import java.util.Arrays;
-import java.util.Map;
-
 public class ItemUtils {
 
     public static Map<Enchantment, Integer> getEnchantments(ItemStack itemStack) {

src/main/java/de/epiceric/shopchest/utils/ShopUpdater.java

@@ -1,12 +1,13 @@
 package de.epiceric.shopchest.utils;
 
-import de.epiceric.shopchest.ShopChest;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+
 import org.bukkit.Bukkit;
 import org.bukkit.World;
 import org.bukkit.entity.Player;
 
-import java.util.concurrent.BlockingQueue;
+import de.epiceric.shopchest.ShopChest;
-import java.util.concurrent.LinkedBlockingQueue;
 
 public class ShopUpdater {
     

src/main/java/de/epiceric/shopchest/utils/ShopUtils.java

@@ -1,10 +1,15 @@
 package de.epiceric.shopchest.utils;
 
-import de.epiceric.shopchest.ShopChest;
+import java.util.ArrayList;
-import de.epiceric.shopchest.config.Config;
+import java.util.Collection;
-import de.epiceric.shopchest.event.ShopsLoadedEvent;
+import java.util.Collections;
-import de.epiceric.shopchest.shop.Shop;
+import java.util.HashMap;
-import de.epiceric.shopchest.shop.Shop.ShopType;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
 
 import org.bukkit.Bukkit;
 import org.bukkit.Chunk;
@@ -17,9 +22,11 @@ import org.bukkit.inventory.InventoryHolder;
 import org.bukkit.permissions.PermissionAttachmentInfo;
 import org.bukkit.util.Vector;
 
-import java.util.*;
+import de.epiceric.shopchest.ShopChest;
-import java.util.concurrent.ConcurrentHashMap;
+import de.epiceric.shopchest.config.Config;
-import java.util.stream.Collectors;
+import de.epiceric.shopchest.event.ShopsLoadedEvent;
+import de.epiceric.shopchest.shop.Shop;
+import de.epiceric.shopchest.shop.Shop.ShopType;
 
 public class ShopUtils {
 

src/main/java/de/epiceric/shopchest/utils/UpdateChecker.java

@@ -1,7 +1,5 @@
 package de.epiceric.shopchest.utils;
 
-import de.epiceric.shopchest.ShopChest;
-
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.net.URLConnection;
@@ -10,6 +8,8 @@ import com.google.gson.JsonElement;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 
+import de.epiceric.shopchest.ShopChest;
+
 public class UpdateChecker {
 
     private ShopChest plugin;