Update to DRECommons 4.0

pom.xml

@@ -46,12 +46,12 @@
                             <artifactSet>
                                 <includes>
                                     <include>io.github.dre2n:caliburn</include>
-                                    <include>io.github.dre2n:commons</include>
+                                    <include>de.erethon:commons</include>
                                 </includes>
                             </artifactSet>
                             <relocations>
                                 <relocation>
-                                    <pattern>io.github.dre2n.commons</pattern>
+                                    <pattern>de.erethon.commons</pattern>
                                     <shadedPattern>io.github.dre2n.dungeonsxl.util.commons</shadedPattern>
                                 </relocation>
                             </relocations>
@@ -75,9 +75,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>io.github.dre2n</groupId>
+            <groupId>de.erethon</groupId>
             <artifactId>commons</artifactId>
-            <version>3.1.4</version>
+            <version>4.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
@@ -129,8 +129,12 @@
             <url>http://repo.inventivetalent.org/content/groups/public/</url>
         </repository>
         <repository>
-            <id>dre2n-repo</id>
+            <id>sataniel-repo</id>
             <url>http://feuerstern.bplaced.net/repo/</url>
         </repository>
+        <repository>
+            <id>dre-repo</id>
+            <url>http://erethon.de/repo/</url>
+        </repository>
     </repositories>
 </project>

src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java

@@ -16,11 +16,11 @@
  */
 package io.github.dre2n.dungeonsxl;
 
+import de.erethon.commons.compatibility.Internals;
+import de.erethon.commons.config.MessageConfig;
+import de.erethon.commons.javaplugin.DREPlugin;
+import de.erethon.commons.javaplugin.DREPluginSettings;
 import io.github.dre2n.caliburn.CaliburnAPI;
-import io.github.dre2n.commons.compatibility.Internals;
-import io.github.dre2n.commons.config.MessageConfig;
-import io.github.dre2n.commons.javaplugin.DREPlugin;
-import io.github.dre2n.commons.javaplugin.DREPluginSettings;
 import io.github.dre2n.dungeonsxl.announcer.AnnouncerCache;
 import io.github.dre2n.dungeonsxl.command.DCommandCache;
 import io.github.dre2n.dungeonsxl.config.DMessage;
@@ -44,12 +44,14 @@ import io.github.dre2n.dungeonsxl.sign.DSignTypeCache;
 import io.github.dre2n.dungeonsxl.sign.SignScriptCache;
 import io.github.dre2n.dungeonsxl.trigger.TriggerTypeCache;
 import io.github.dre2n.dungeonsxl.util.NoReload;
-import io.github.dre2n.dungeonsxl.util.PageGUICache;
 import io.github.dre2n.dungeonsxl.world.DWorldCache;
 import java.io.File;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 import org.bukkit.event.HandlerList;
+import org.bukkit.inventory.Inventory;
 
 /**
  * The main class of DungeonsXL.
@@ -76,7 +78,6 @@ public class DungeonsXL extends DREPlugin {
 
     private GlobalData globalData;
     private MainConfig mainConfig;
-    private MessageConfig messageConfig;
 
     private DCommandCache dCommands;
     private DSignTypeCache dSigns;
@@ -94,7 +95,6 @@ public class DungeonsXL extends DREPlugin {
     private DMobTypeCache dMobTypes;
     private SignScriptCache signScripts;
     private DWorldCache dWorlds;
-    private PageGUICache pageGUIs;
 
     private CopyOnWriteArrayList<Game> games = new CopyOnWriteArrayList<>();
     private CopyOnWriteArrayList<DGroup> dGroups = new CopyOnWriteArrayList<>();
@@ -243,7 +243,6 @@ public class DungeonsXL extends DREPlugin {
         loadDMobTypes(MOBS);
         loadSignScripts(SIGNS);
         loadDCommandCache();
-        loadPageGUICache();
     }
 
     // Save and load
@@ -303,13 +302,6 @@ public class DungeonsXL extends DREPlugin {
         mainConfig = new MainConfig(file);
     }
 
-    /**
-     * @return the loaded instance of MessageConfig
-     */
-    public MessageConfig getMessageConfig() {
-        return messageConfig;
-    }
-
     /**
      * load / reload a new instance of MessageConfig
      */
@@ -543,21 +535,6 @@ public class DungeonsXL extends DREPlugin {
         dWorlds = new DWorldCache(MAPS);
     }
 
-    public PageGUICache getPageGUICache() {
-        return pageGUIs;
-    }
-
-    /**
-     * load / reload a new instance of PageGUICache
-     */
-    public void loadPageGUICache() {
-        if (pageGUIs != null) {
-            HandlerList.unregisterAll(pageGUIs);
-        }
-        pageGUIs = new PageGUICache();
-        manager.registerEvents(pageGUIs, this);
-    }
-
     /**
      * @return the games
      */
@@ -572,4 +549,12 @@ public class DungeonsXL extends DREPlugin {
         return dGroups;
     }
 
+    @Deprecated
+    private Set<Inventory> guis = new HashSet<>();
+
+    @Deprecated
+    public Set<Inventory> getGUIs() {
+        return guis;
+    }
+
 }

src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcer.java

@@ -16,9 +16,9 @@
  */
 package io.github.dre2n.dungeonsxl.announcer;
 
-import io.github.dre2n.commons.chat.DefaultFontInfo;
+import de.erethon.commons.chat.DefaultFontInfo;
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.compatibility.CompatibilityHandler;
+import de.erethon.commons.compatibility.CompatibilityHandler;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.dungeon.Dungeon;
@@ -357,7 +357,7 @@ public class Announcer {
     public void showGUI(Player player) {
         updateButtons();
         Inventory gui = GUIUtil.createGUI(plugin, ChatColor.DARK_RED + name, buttons);
-        plugin.addGUI(gui);
+        plugin.getGUIs().add(gui);
         player.openInventory(gui);
     }
 

src/main/java/io/github/dre2n/dungeonsxl/announcer/AnnouncerCache.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.announcer;
 
-import io.github.dre2n.commons.misc.FileUtil;
+import de.erethon.commons.misc.FileUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import java.io.File;
 import java.util.ArrayList;

src/main/java/io/github/dre2n/dungeonsxl/command/BreakCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DGlobalPlayer;

src/main/java/io/github/dre2n/dungeonsxl/command/ChatCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DGlobalPlayer;

src/main/java/io/github/dre2n/dungeonsxl/command/ChatSpyCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DGlobalPlayer;

src/main/java/io/github/dre2n/dungeonsxl/command/CreateCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DEditPlayer;

src/main/java/io/github/dre2n/dungeonsxl/command/DCommandCache.java

@@ -16,10 +16,10 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
-import io.github.dre2n.commons.command.DRECommandCache;
+import de.erethon.commons.command.DRECommandCache;
-import io.github.dre2n.commons.compatibility.CompatibilityHandler;
+import de.erethon.commons.compatibility.CompatibilityHandler;
-import io.github.dre2n.commons.javaplugin.DREPlugin;
+import de.erethon.commons.javaplugin.DREPlugin;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 
 /**

src/main/java/io/github/dre2n/dungeonsxl/command/DeleteCommand.java

@@ -16,10 +16,10 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
-import io.github.dre2n.commons.compatibility.CompatibilityHandler;
+import de.erethon.commons.compatibility.CompatibilityHandler;
-import io.github.dre2n.commons.misc.FileUtil;
+import de.erethon.commons.misc.FileUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DPermission;
@@ -78,12 +78,12 @@ public class DeleteCommand extends DRECommand {
             }
         }
         dWorlds.removeResource(resource);
-        FileUtil.removeDirectory(resource.getFolder());
+        FileUtil.removeDir(resource.getFolder());
 
         if (args[2].equalsIgnoreCase("true")) {
             for (File file : DungeonsXL.BACKUPS.listFiles()) {
                 if (file.getName().startsWith(resource.getName() + "-")) {
-                    FileUtil.removeDirectory(file);
+                    FileUtil.removeDir(file);
                 }
             }
         }

src/main/java/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.global.DPortal;
 import java.util.Set;

src/main/java/io/github/dre2n/dungeonsxl/command/EditCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DEditPlayer;

src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.game.Game;
 import io.github.dre2n.dungeonsxl.player.DGamePlayer;

src/main/java/io/github/dre2n/dungeonsxl/command/EscapeCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DEditPlayer;
 import io.github.dre2n.dungeonsxl.player.DGamePlayer;

src/main/java/io/github/dre2n/dungeonsxl/command/GameCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.game.Game;
 import io.github.dre2n.dungeonsxl.player.DGroup;

src/main/java/io/github/dre2n/dungeonsxl/command/GroupCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.event.dgroup.DGroupCreateEvent;

src/main/java/io/github/dre2n/dungeonsxl/command/HelpCommand.java

@@ -16,9 +16,9 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DPermission;

src/main/java/io/github/dre2n/dungeonsxl/command/ImportCommand.java

@@ -16,9 +16,9 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
-import io.github.dre2n.commons.misc.FileUtil;
+import de.erethon.commons.misc.FileUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DPermission;
@@ -70,13 +70,13 @@ public class ImportCommand extends DRECommand {
         MessageUtil.log(plugin, DMessage.LOG_IMPORT_WORLD.getMessage());
 
         if (!plugin.getMainConfig().areTweaksEnabled()) {
-            FileUtil.copyDirectory(source, target, new String[]{"playerdata", "stats"});
+            FileUtil.copyDir(source, target, "playerdata", "stats");
 
         } else {
             new BukkitRunnable() {
                 @Override
                 public void run() {
-                    FileUtil.copyDirectory(source, target, new String[]{"playerdata", "stats"});
+                    FileUtil.copyDir(source, target, "playerdata", "stats");
                 }
             }.runTaskAsynchronously(plugin);
         }

src/main/java/io/github/dre2n/dungeonsxl/command/InviteCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DPermission;

src/main/java/io/github/dre2n/dungeonsxl/command/JoinCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.announcer.Announcer;
 import io.github.dre2n.dungeonsxl.config.DMessage;

src/main/java/io/github/dre2n/dungeonsxl/command/KickCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import static io.github.dre2n.dungeonsxl.command.DCommandCache.LEAVE;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DPermission;

src/main/java/io/github/dre2n/dungeonsxl/command/LeaveCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerLeaveDGroupEvent;

src/main/java/io/github/dre2n/dungeonsxl/command/ListCommand.java

@@ -16,9 +16,9 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.dungeon.Dungeon;

src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.player.DGroup;

src/main/java/io/github/dre2n/dungeonsxl/command/MainCommand.java

@@ -16,11 +16,11 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import static io.github.dre2n.commons.chat.FatLetter.*;
+import static de.erethon.commons.chat.FatLetter.*;
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
-import io.github.dre2n.commons.compatibility.CompatibilityHandler;
+import de.erethon.commons.compatibility.CompatibilityHandler;
-import io.github.dre2n.commons.compatibility.Internals;
+import de.erethon.commons.compatibility.Internals;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DPermission;

src/main/java/io/github/dre2n/dungeonsxl/command/MsgCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DPermission;
 import io.github.dre2n.dungeonsxl.world.DEditWorld;

src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.dungeon.Dungeon;

src/main/java/io/github/dre2n/dungeonsxl/command/PortalCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.global.DPortal;

src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java

@@ -16,11 +16,11 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.DefaultFontInfo;
+import de.erethon.commons.chat.DefaultFontInfo;
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
-import io.github.dre2n.commons.compatibility.CompatibilityHandler;
+import de.erethon.commons.compatibility.CompatibilityHandler;
-import io.github.dre2n.commons.compatibility.Internals;
+import de.erethon.commons.compatibility.Internals;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.event.DataReloadEvent;

src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommandNoSpigot.java

@@ -16,10 +16,10 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
-import io.github.dre2n.commons.compatibility.CompatibilityHandler;
+import de.erethon.commons.compatibility.CompatibilityHandler;
-import io.github.dre2n.commons.compatibility.Internals;
+import de.erethon.commons.compatibility.Internals;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.event.DataReloadEvent;

src/main/java/io/github/dre2n/dungeonsxl/command/RenameCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.dungeon.Dungeon;

src/main/java/io/github/dre2n/dungeonsxl/command/ResourcePackCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DPermission;

src/main/java/io/github/dre2n/dungeonsxl/command/SaveCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.config.MainConfig;

src/main/java/io/github/dre2n/dungeonsxl/command/StatusCommand.java

@@ -16,9 +16,9 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
-import io.github.dre2n.commons.compatibility.CompatibilityHandler;
+import de.erethon.commons.compatibility.CompatibilityHandler;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DPermission;

src/main/java/io/github/dre2n/dungeonsxl/command/TestCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.dungeon.Dungeon;

src/main/java/io/github/dre2n/dungeonsxl/command/UninviteCommand.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.command;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.command.DRECommand;
+import de.erethon.commons.command.DRECommand;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DPermission;

src/main/java/io/github/dre2n/dungeonsxl/config/DMessage.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.config;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.config.Message;
+import de.erethon.commons.config.Message;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.file.FileConfiguration;

src/main/java/io/github/dre2n/dungeonsxl/config/GlobalData.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.config;
 
-import io.github.dre2n.commons.config.DREConfig;
+import de.erethon.commons.config.DREConfig;
 import java.io.File;
 
 /**

src/main/java/io/github/dre2n/dungeonsxl/config/MainConfig.java

@@ -16,11 +16,11 @@
  */
 package io.github.dre2n.dungeonsxl.config;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.compatibility.CompatibilityHandler;
+import de.erethon.commons.compatibility.CompatibilityHandler;
-import io.github.dre2n.commons.compatibility.Internals;
+import de.erethon.commons.compatibility.Internals;
-import io.github.dre2n.commons.config.DREConfig;
+import de.erethon.commons.config.DREConfig;
-import io.github.dre2n.commons.misc.EnumUtil;
+import de.erethon.commons.misc.EnumUtil;
 import io.github.dre2n.dungeonsxl.util.DColor;
 import static io.github.dre2n.dungeonsxl.util.DColor.*;
 import io.github.dre2n.dungeonsxl.world.WorldConfig;

src/main/java/io/github/dre2n/dungeonsxl/dungeon/DungeonCache.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.dungeon;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import java.io.File;
 import java.util.ArrayList;

src/main/java/io/github/dre2n/dungeonsxl/dungeon/DungeonConfig.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.dungeon;
 
-import io.github.dre2n.commons.config.DREConfig;
+import de.erethon.commons.config.DREConfig;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.world.DResourceWorld;
 import io.github.dre2n.dungeonsxl.world.DWorldCache;

src/main/java/io/github/dre2n/dungeonsxl/game/Game.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.game;
 
-import io.github.dre2n.commons.player.PlayerUtil;
+import de.erethon.commons.player.PlayerUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.dungeon.Dungeon;

src/main/java/io/github/dre2n/dungeonsxl/game/GameTypeCache.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.game;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
 import io.github.dre2n.dungeonsxl.sign.DSign;
 import java.util.ArrayList;
 import java.util.List;

src/main/java/io/github/dre2n/dungeonsxl/global/DPortal.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.global;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.misc.BlockUtil;
+import de.erethon.commons.misc.BlockUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.game.Game;

src/main/java/io/github/dre2n/dungeonsxl/global/GameSign.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.global;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.misc.BlockUtil;
+import de.erethon.commons.misc.BlockUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.dungeon.Dungeon;

src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtection.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.global;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DGlobalPlayer;

src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtectionListener.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.global;
 
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DGlobalPlayer;

src/main/java/io/github/dre2n/dungeonsxl/global/GroupSign.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.global;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.misc.BlockUtil;
+import de.erethon.commons.misc.BlockUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.dungeon.Dungeon;

src/main/java/io/github/dre2n/dungeonsxl/global/LeaveSign.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.global;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.misc.BlockUtil;
+import de.erethon.commons.misc.BlockUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DGamePlayer;

src/main/java/io/github/dre2n/dungeonsxl/loottable/DLootTable.java

@@ -17,10 +17,10 @@
 package io.github.dre2n.dungeonsxl.loottable;
 
 import io.github.dre2n.caliburn.item.UniversalItemStack;
-import io.github.dre2n.commons.misc.NumberUtil;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Random;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.configuration.file.YamlConfiguration;
 import org.bukkit.inventory.ItemStack;
@@ -168,7 +168,7 @@ public class DLootTable {
     public List<ItemStack> generateLootList() {
         List<ItemStack> lootList = new ArrayList<>();
         for (Entry entry : entries) {
-            if (NumberUtil.generateRandomInt(0, 100) < entry.getLootChance()) {
+            if (new Random().nextInt(100) < entry.getLootChance()) {
                 lootList.add(entry.getLootItem());
             }
         }

src/main/java/io/github/dre2n/dungeonsxl/loottable/DLootTableCache.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.loottable;
 
-import io.github.dre2n.commons.misc.FileUtil;
+import de.erethon.commons.misc.FileUtil;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;

src/main/java/io/github/dre2n/dungeonsxl/mob/CitizensMobProvider.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.mob;
 
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;
 import java.util.HashSet;
 import java.util.Set;

src/main/java/io/github/dre2n/dungeonsxl/mob/DMobType.java

@@ -16,9 +16,9 @@
  */
 package io.github.dre2n.dungeonsxl.mob;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.misc.EnumUtil;
+import de.erethon.commons.misc.EnumUtil;
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.util.LegacyUtil;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;

src/main/java/io/github/dre2n/dungeonsxl/mob/DMobTypeCache.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.mob;
 
-import io.github.dre2n.commons.misc.FileUtil;
+import de.erethon.commons.misc.FileUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import java.io.File;
 import java.util.ArrayList;

src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProviderCache.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.mob;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import java.util.Arrays;
 import java.util.HashSet;

src/main/java/io/github/dre2n/dungeonsxl/player/CreateDInstancePlayerTask.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.player;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
 import io.github.dre2n.dungeonsxl.game.GameType;
 import io.github.dre2n.dungeonsxl.world.DEditWorld;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;

src/main/java/io/github/dre2n/dungeonsxl/player/DClass.java

@@ -16,9 +16,9 @@
  */
 package io.github.dre2n.dungeonsxl.player;
 
+import de.erethon.commons.compatibility.CompatibilityHandler;
+import de.erethon.commons.compatibility.Version;
 import io.github.dre2n.caliburn.item.UniversalItemStack;
-import io.github.dre2n.commons.compatibility.CompatibilityHandler;
-import io.github.dre2n.commons.compatibility.Version;
 import io.github.dre2n.dungeonsxl.util.DeserializationUtil;
 import java.io.File;
 import java.util.ArrayList;

src/main/java/io/github/dre2n/dungeonsxl/player/DClassCache.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.player;
 
-import io.github.dre2n.commons.misc.FileUtil;
+import de.erethon.commons.misc.FileUtil;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;

src/main/java/io/github/dre2n/dungeonsxl/player/DEditPlayer.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.player;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.player.PlayerUtil;
+import de.erethon.commons.player.PlayerUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.event.dplayer.instance.DInstancePlayerUpdateEvent;

src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.player;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.player.PlayerUtil;
+import de.erethon.commons.player.PlayerUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerKickEvent;

src/main/java/io/github/dre2n/dungeonsxl/player/DGlobalPlayer.java

@@ -16,11 +16,11 @@
  */
 package io.github.dre2n.dungeonsxl.player;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.compatibility.CompatibilityHandler;
+import de.erethon.commons.compatibility.CompatibilityHandler;
-import io.github.dre2n.commons.compatibility.Version;
+import de.erethon.commons.compatibility.Version;
-import io.github.dre2n.commons.player.PlayerUtil;
+import de.erethon.commons.player.PlayerUtil;
-import io.github.dre2n.commons.player.PlayerWrapper;
+import de.erethon.commons.player.PlayerWrapper;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.event.dgroup.DGroupCreateEvent;

src/main/java/io/github/dre2n/dungeonsxl/player/DGroup.java

@@ -16,9 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.player;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.player.PlayerCollection;
-import io.github.dre2n.commons.player.PlayerCollection;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.dungeon.Dungeon;
@@ -43,6 +42,7 @@ import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashSet;
 import java.util.List;
+import java.util.Random;
 import java.util.Set;
 import java.util.UUID;
 import org.bukkit.Bukkit;
@@ -710,7 +710,7 @@ public class DGroup {
             newFloor = specifiedFloor;
             type = DGameWorld.Type.DEFAULT;
         } else if (floorsLeft > 0) {
-            int random = NumberUtil.generateRandomInt(0, floorsLeft);
+            int random = new Random().nextInt(floorsLeft);
             newFloor = getUnplayedFloors().get(random);
             type = DGameWorld.Type.DEFAULT;
         } else {

src/main/java/io/github/dre2n/dungeonsxl/player/DPermission.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.player;
 
-import io.github.dre2n.commons.misc.EnumUtil;
+import de.erethon.commons.misc.EnumUtil;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;

src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerData.java

@@ -16,11 +16,11 @@
  */
 package io.github.dre2n.dungeonsxl.player;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.compatibility.CompatibilityHandler;
+import de.erethon.commons.compatibility.CompatibilityHandler;
-import io.github.dre2n.commons.compatibility.Internals;
+import de.erethon.commons.compatibility.Internals;
-import io.github.dre2n.commons.config.DREConfig;
+import de.erethon.commons.config.DREConfig;
-import io.github.dre2n.commons.misc.EnumUtil;
+import de.erethon.commons.misc.EnumUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import java.io.File;

src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerListener.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.player;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.config.MainConfig;

src/main/java/io/github/dre2n/dungeonsxl/player/RespawnTask.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.player;
 
-import io.github.dre2n.commons.player.PlayerUtil;
+import de.erethon.commons.player.PlayerUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import org.bukkit.Location;
 import org.bukkit.entity.Player;

src/main/java/io/github/dre2n/dungeonsxl/player/TimeIsRunningTask.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.player;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.config.MessageConfig;
+import de.erethon.commons.config.MessageConfig;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerKickEvent;

src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeLevelRequirement.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.requirement;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.player.DPlayerData;

src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeMoneyRequirement.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.requirement;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import org.bukkit.configuration.ConfigurationSection;

src/main/java/io/github/dre2n/dungeonsxl/requirement/Requirement.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.requirement;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
 import io.github.dre2n.dungeonsxl.event.requirement.RequirementRegistrationEvent;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;

src/main/java/io/github/dre2n/dungeonsxl/reward/LevelReward.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.reward;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import org.bukkit.entity.Player;
 

src/main/java/io/github/dre2n/dungeonsxl/reward/MoneyReward.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.reward;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import org.bukkit.entity.Player;
 

src/main/java/io/github/dre2n/dungeonsxl/reward/Reward.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.reward;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.event.reward.RewardRegistrationEvent;
 import java.lang.reflect.Constructor;

src/main/java/io/github/dre2n/dungeonsxl/reward/RewardListener.java

@@ -16,11 +16,11 @@
  */
 package io.github.dre2n.dungeonsxl.reward;
 
+import de.erethon.commons.gui.PageGUI;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DGlobalPlayer;
 import io.github.dre2n.dungeonsxl.player.DPermission;
-import io.github.dre2n.dungeonsxl.util.PageGUI;
 import io.github.dre2n.dungeonsxl.world.DEditWorld;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;
 import io.github.dre2n.dungeonsxl.world.block.RewardChest;

src/main/java/io/github/dre2n/dungeonsxl/sign/BedSign.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.misc.BlockUtil;
+import de.erethon.commons.misc.BlockUtil;
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.util.LegacyUtil;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;
 import io.github.dre2n.dungeonsxl.world.block.TeamBed;

src/main/java/io/github/dre2n/dungeonsxl/sign/BlockSign.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;
 import org.bukkit.Material;
 import org.bukkit.block.Sign;

src/main/java/io/github/dre2n/dungeonsxl/sign/BossShopSign.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.trigger.InteractTrigger;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;

src/main/java/io/github/dre2n/dungeonsxl/sign/CheckpointSign.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;

src/main/java/io/github/dre2n/dungeonsxl/sign/ChestSign.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.loottable.DLootTable;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;
 import io.github.dre2n.dungeonsxl.world.block.RewardChest;

src/main/java/io/github/dre2n/dungeonsxl/sign/ChunkUpdaterSign.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;
 import org.bukkit.Chunk;
 import org.bukkit.Material;

src/main/java/io/github/dre2n/dungeonsxl/sign/CommandSign.java

@@ -16,10 +16,10 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.commandsxl.CommandsXL;
 import io.github.dre2n.commandsxl.command.CCommand;
 import io.github.dre2n.commandsxl.command.CCommandExecutorTask;
-import io.github.dre2n.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.trigger.InteractTrigger;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;
 import org.bukkit.Bukkit;

src/main/java/io/github/dre2n/dungeonsxl/sign/DSign.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.event.dsign.DSignRegistrationEvent;

src/main/java/io/github/dre2n/dungeonsxl/sign/DSignListener.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.player.DGamePlayer;
 import io.github.dre2n.dungeonsxl.player.DPermission;

src/main/java/io/github/dre2n/dungeonsxl/sign/DropSign.java

@@ -16,9 +16,9 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.caliburn.CaliburnAPI;
 import io.github.dre2n.caliburn.item.UniversalItem;
-import io.github.dre2n.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;
 import org.bukkit.Location;
 import org.bukkit.Material;

src/main/java/io/github/dre2n/dungeonsxl/sign/FlagSign.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;
 import io.github.dre2n.dungeonsxl.world.block.TeamFlag;
 import org.bukkit.block.Sign;

src/main/java/io/github/dre2n/dungeonsxl/sign/InteractSign.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.trigger.InteractTrigger;
 import io.github.dre2n.dungeonsxl.world.DEditWorld;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;

src/main/java/io/github/dre2n/dungeonsxl/sign/LivesModifierSign.java

@@ -16,9 +16,9 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.misc.EnumUtil;
+import de.erethon.commons.misc.EnumUtil;
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.game.Game;
 import io.github.dre2n.dungeonsxl.player.DGamePlayer;

src/main/java/io/github/dre2n/dungeonsxl/sign/OpenDoorSign.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.misc.BlockUtil;
+import de.erethon.commons.misc.BlockUtil;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;
 import io.github.dre2n.dungeonsxl.world.block.LockedDoor;
 import org.bukkit.Material;

src/main/java/io/github/dre2n/dungeonsxl/sign/ProtectionSign.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.misc.BlockUtil;
+import de.erethon.commons.misc.BlockUtil;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;
 import io.github.dre2n.dungeonsxl.world.block.ProtectedBlock;
 import org.bukkit.Material;

src/main/java/io/github/dre2n/dungeonsxl/sign/RedstoneSign.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

src/main/java/io/github/dre2n/dungeonsxl/sign/SignScript.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;

src/main/java/io/github/dre2n/dungeonsxl/sign/SignScriptCache.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.misc.FileUtil;
+import de.erethon.commons.misc.FileUtil;
 import java.io.File;
 import java.util.ArrayList;
 import java.util.List;

src/main/java/io/github/dre2n/dungeonsxl/sign/TeleportSign.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;
 import org.bukkit.Location;
 import org.bukkit.Material;

src/main/java/io/github/dre2n/dungeonsxl/sign/TriggerSign.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.trigger.SignTrigger;
 import io.github.dre2n.dungeonsxl.world.DEditWorld;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;

src/main/java/io/github/dre2n/dungeonsxl/sign/WaveSign.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.trigger.InteractTrigger;
 import io.github.dre2n.dungeonsxl.world.DGameWorld;
 import org.bukkit.ChatColor;

src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/ReadySign.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.sign.lobby;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.config.DMessage;
 import io.github.dre2n.dungeonsxl.game.GameType;
 import io.github.dre2n.dungeonsxl.game.GameTypeDefault;
@@ -167,7 +167,7 @@ public class ReadySign extends DSign {
         }
 
         if (dPlayer.isReady()) {
-            MessageUtil.sendMessage(dPlayer.getPlayer(), plugin.getMessageConfig().getMessage(dPlayer.isReady() ? DMessage.PLAYER_READY : DMessage.ERROR_READY));
+            MessageUtil.sendMessage(dPlayer.getPlayer(), (dPlayer.isReady() ? DMessage.PLAYER_READY : DMessage.ERROR_READY).getMessage());
         }
     }
 

src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/StartSign.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign.lobby;
 
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.sign.DSign;
 import io.github.dre2n.dungeonsxl.sign.DSignType;
 import io.github.dre2n.dungeonsxl.sign.DSignTypeDefault;

src/main/java/io/github/dre2n/dungeonsxl/sign/message/ActionBarSign.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign.message;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
 import io.github.dre2n.dungeonsxl.sign.DSignType;
 import io.github.dre2n.dungeonsxl.sign.DSignTypeDefault;
 import io.github.dre2n.dungeonsxl.sign.PerPlayerSign;

src/main/java/io/github/dre2n/dungeonsxl/sign/message/HologramSign.java

@@ -18,12 +18,12 @@ package io.github.dre2n.dungeonsxl.sign.message;
 
 import com.gmail.filoghost.holographicdisplays.api.Hologram;
 import com.gmail.filoghost.holographicdisplays.api.HologramsAPI;
+import de.erethon.commons.compatibility.CompatibilityHandler;
+import de.erethon.commons.compatibility.Version;
+import de.erethon.commons.misc.EnumUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.caliburn.CaliburnAPI;
 import io.github.dre2n.caliburn.item.UniversalItem;
-import io.github.dre2n.commons.compatibility.CompatibilityHandler;
-import io.github.dre2n.commons.compatibility.Version;
-import io.github.dre2n.commons.misc.EnumUtil;
-import io.github.dre2n.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.sign.DSign;
 import io.github.dre2n.dungeonsxl.sign.DSignType;
 import io.github.dre2n.dungeonsxl.sign.DSignTypeDefault;

src/main/java/io/github/dre2n/dungeonsxl/sign/message/MessageSign.java

@@ -16,8 +16,8 @@
  */
 package io.github.dre2n.dungeonsxl.sign.message;
 
-import io.github.dre2n.commons.chat.MessageUtil;
+import de.erethon.commons.chat.MessageUtil;
-import io.github.dre2n.commons.misc.NumberUtil;
+import de.erethon.commons.misc.NumberUtil;
 import io.github.dre2n.dungeonsxl.sign.DSign;
 import io.github.dre2n.dungeonsxl.sign.DSignType;
 import io.github.dre2n.dungeonsxl.sign.DSignTypeDefault;