From 5f8cfcd51cb7f9b942343966f1bc339c17f72210 Mon Sep 17 00:00:00 2001 From: Daniel Saukel Date: Wed, 14 Feb 2018 16:31:41 +0100 Subject: [PATCH] Update to DRECommons 4.0 --- pom.xml | 14 +- .../github/dre2n/dungeonsxl/DungeonsXL.java | 45 ++---- .../dre2n/dungeonsxl/announcer/Announcer.java | 8 +- .../dungeonsxl/announcer/AnnouncerCache.java | 2 +- .../dungeonsxl/command/BreakCommand.java | 4 +- .../dre2n/dungeonsxl/command/ChatCommand.java | 4 +- .../dungeonsxl/command/ChatSpyCommand.java | 4 +- .../dungeonsxl/command/CreateCommand.java | 4 +- .../dungeonsxl/command/DCommandCache.java | 8 +- .../dungeonsxl/command/DeleteCommand.java | 12 +- .../command/DeletePortalCommand.java | 4 +- .../dre2n/dungeonsxl/command/EditCommand.java | 4 +- .../dungeonsxl/command/EnterCommand.java | 4 +- .../dungeonsxl/command/EscapeCommand.java | 4 +- .../dre2n/dungeonsxl/command/GameCommand.java | 4 +- .../dungeonsxl/command/GroupCommand.java | 4 +- .../dre2n/dungeonsxl/command/HelpCommand.java | 6 +- .../dungeonsxl/command/ImportCommand.java | 10 +- .../dungeonsxl/command/InviteCommand.java | 4 +- .../dre2n/dungeonsxl/command/JoinCommand.java | 4 +- .../dre2n/dungeonsxl/command/KickCommand.java | 4 +- .../dungeonsxl/command/LeaveCommand.java | 4 +- .../dre2n/dungeonsxl/command/ListCommand.java | 6 +- .../dungeonsxl/command/LivesCommand.java | 4 +- .../dre2n/dungeonsxl/command/MainCommand.java | 10 +- .../dre2n/dungeonsxl/command/MsgCommand.java | 4 +- .../dre2n/dungeonsxl/command/PlayCommand.java | 4 +- .../dungeonsxl/command/PortalCommand.java | 4 +- .../dungeonsxl/command/ReloadCommand.java | 10 +- .../command/ReloadCommandNoSpigot.java | 8 +- .../dungeonsxl/command/RenameCommand.java | 4 +- .../command/ResourcePackCommand.java | 4 +- .../dre2n/dungeonsxl/command/SaveCommand.java | 4 +- .../dungeonsxl/command/StatusCommand.java | 6 +- .../dre2n/dungeonsxl/command/TestCommand.java | 4 +- .../dungeonsxl/command/UninviteCommand.java | 4 +- .../dre2n/dungeonsxl/config/DMessage.java | 4 +- .../dre2n/dungeonsxl/config/GlobalData.java | 2 +- .../dre2n/dungeonsxl/config/MainConfig.java | 10 +- .../dungeonsxl/dungeon/DungeonCache.java | 2 +- .../dungeonsxl/dungeon/DungeonConfig.java | 2 +- .../io/github/dre2n/dungeonsxl/game/Game.java | 2 +- .../dre2n/dungeonsxl/game/GameTypeCache.java | 2 +- .../dre2n/dungeonsxl/global/DPortal.java | 4 +- .../dre2n/dungeonsxl/global/GameSign.java | 4 +- .../dungeonsxl/global/GlobalProtection.java | 2 +- .../global/GlobalProtectionListener.java | 2 +- .../dre2n/dungeonsxl/global/GroupSign.java | 4 +- .../dre2n/dungeonsxl/global/LeaveSign.java | 4 +- .../dungeonsxl/loottable/DLootTable.java | 4 +- .../dungeonsxl/loottable/DLootTableCache.java | 2 +- .../dungeonsxl/mob/CitizensMobProvider.java | 2 +- .../github/dre2n/dungeonsxl/mob/DMobType.java | 6 +- .../dre2n/dungeonsxl/mob/DMobTypeCache.java | 2 +- .../mob/ExternalMobProviderCache.java | 2 +- .../player/CreateDInstancePlayerTask.java | 2 +- .../dre2n/dungeonsxl/player/DClass.java | 4 +- .../dre2n/dungeonsxl/player/DClassCache.java | 2 +- .../dre2n/dungeonsxl/player/DEditPlayer.java | 4 +- .../dre2n/dungeonsxl/player/DGamePlayer.java | 4 +- .../dungeonsxl/player/DGlobalPlayer.java | 10 +- .../dre2n/dungeonsxl/player/DGroup.java | 8 +- .../dre2n/dungeonsxl/player/DPermission.java | 2 +- .../dre2n/dungeonsxl/player/DPlayerData.java | 10 +- .../dungeonsxl/player/DPlayerListener.java | 2 +- .../dre2n/dungeonsxl/player/RespawnTask.java | 2 +- .../dungeonsxl/player/TimeIsRunningTask.java | 4 +- .../requirement/FeeLevelRequirement.java | 2 +- .../requirement/FeeMoneyRequirement.java | 2 +- .../dungeonsxl/requirement/Requirement.java | 2 +- .../dre2n/dungeonsxl/reward/LevelReward.java | 2 +- .../dre2n/dungeonsxl/reward/MoneyReward.java | 2 +- .../dre2n/dungeonsxl/reward/Reward.java | 2 +- .../dungeonsxl/reward/RewardListener.java | 2 +- .../github/dre2n/dungeonsxl/sign/BedSign.java | 4 +- .../dre2n/dungeonsxl/sign/BlockSign.java | 2 +- .../dre2n/dungeonsxl/sign/BossShopSign.java | 2 +- .../dre2n/dungeonsxl/sign/CheckpointSign.java | 2 +- .../dre2n/dungeonsxl/sign/ChestSign.java | 2 +- .../dungeonsxl/sign/ChunkUpdaterSign.java | 2 +- .../dre2n/dungeonsxl/sign/CommandSign.java | 2 +- .../github/dre2n/dungeonsxl/sign/DSign.java | 2 +- .../dre2n/dungeonsxl/sign/DSignListener.java | 2 +- .../dre2n/dungeonsxl/sign/DropSign.java | 2 +- .../dre2n/dungeonsxl/sign/FlagSign.java | 2 +- .../dre2n/dungeonsxl/sign/InteractSign.java | 2 +- .../dungeonsxl/sign/LivesModifierSign.java | 6 +- .../dre2n/dungeonsxl/sign/OpenDoorSign.java | 2 +- .../dre2n/dungeonsxl/sign/ProtectionSign.java | 2 +- .../dre2n/dungeonsxl/sign/RedstoneSign.java | 2 +- .../dre2n/dungeonsxl/sign/SignScript.java | 2 +- .../dungeonsxl/sign/SignScriptCache.java | 2 +- .../dre2n/dungeonsxl/sign/TeleportSign.java | 2 +- .../dre2n/dungeonsxl/sign/TriggerSign.java | 2 +- .../dre2n/dungeonsxl/sign/WaveSign.java | 2 +- .../dungeonsxl/sign/lobby/ReadySign.java | 6 +- .../dungeonsxl/sign/lobby/StartSign.java | 2 +- .../sign/message/ActionBarSign.java | 2 +- .../dungeonsxl/sign/message/HologramSign.java | 8 +- .../dungeonsxl/sign/message/MessageSign.java | 4 +- .../sign/message/SoundMessageSign.java | 2 +- .../dungeonsxl/sign/message/TitleSign.java | 2 +- .../dre2n/dungeonsxl/sign/mob/DMobSign.java | 2 +- .../dungeonsxl/sign/mob/ExternalMobSign.java | 2 +- .../dungeonsxl/trigger/FortuneTrigger.java | 5 +- .../dre2n/dungeonsxl/trigger/Trigger.java | 4 +- .../github/dre2n/dungeonsxl/util/DColor.java | 2 +- .../dungeonsxl/util/DeserializationUtil.java | 3 +- .../dre2n/dungeonsxl/util/GUIButton.java | 2 +- .../github/dre2n/dungeonsxl/util/GUIUtil.java | 8 +- .../dre2n/dungeonsxl/util/LegacyUtil.java | 4 +- .../github/dre2n/dungeonsxl/util/PageGUI.java | 152 ------------------ .../dre2n/dungeonsxl/util/PageGUICache.java | 67 -------- .../dre2n/dungeonsxl/util/ProgressBar.java | 2 +- .../dungeonsxl/world/BackupResourceTask.java | 4 +- .../dre2n/dungeonsxl/world/DEditWorld.java | 22 +-- .../dre2n/dungeonsxl/world/DGameWorld.java | 8 +- .../dungeonsxl/world/DInstanceWorld.java | 2 +- .../dungeonsxl/world/DResourceWorld.java | 10 +- .../dre2n/dungeonsxl/world/DWorldCache.java | 32 +++- .../dre2n/dungeonsxl/world/WorldConfig.java | 8 +- .../world/block/PlaceableBlock.java | 2 +- .../dungeonsxl/world/block/RewardChest.java | 2 +- .../dre2n/dungeonsxl/world/block/TeamBed.java | 2 +- .../dungeonsxl/world/block/TeamFlag.java | 2 +- 125 files changed, 287 insertions(+), 501 deletions(-) delete mode 100644 src/main/java/io/github/dre2n/dungeonsxl/util/PageGUI.java delete mode 100644 src/main/java/io/github/dre2n/dungeonsxl/util/PageGUICache.java diff --git a/pom.xml b/pom.xml index c0275cb6..da4f4839 100644 --- a/pom.xml +++ b/pom.xml @@ -46,12 +46,12 @@ io.github.dre2n:caliburn - io.github.dre2n:commons + de.erethon:commons - io.github.dre2n.commons + de.erethon.commons io.github.dre2n.dungeonsxl.util.commons @@ -75,9 +75,9 @@ provided - io.github.dre2n + de.erethon commons - 3.1.4 + 4.0 compile @@ -129,8 +129,12 @@ http://repo.inventivetalent.org/content/groups/public/ - dre2n-repo + sataniel-repo http://feuerstern.bplaced.net/repo/ + + dre-repo + http://erethon.de/repo/ + diff --git a/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java b/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java index feae363e..33841f60 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java +++ b/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 games = new CopyOnWriteArrayList<>(); private CopyOnWriteArrayList 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 guis = new HashSet<>(); + + @Deprecated + public Set getGUIs() { + return guis; + } + } diff --git a/src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcer.java b/src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcer.java index 7cf9d66e..0c57f279 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcer.java +++ b/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 io.github.dre2n.commons.chat.MessageUtil; -import io.github.dre2n.commons.compatibility.CompatibilityHandler; +import de.erethon.commons.chat.DefaultFontInfo; +import de.erethon.commons.chat.MessageUtil; +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); } diff --git a/src/main/java/io/github/dre2n/dungeonsxl/announcer/AnnouncerCache.java b/src/main/java/io/github/dre2n/dungeonsxl/announcer/AnnouncerCache.java index 47daf704..1d2f3744 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/announcer/AnnouncerCache.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/BreakCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/BreakCommand.java index 74f98543..8d5d4538 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/BreakCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ChatCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/ChatCommand.java index 2436451f..9897a2e8 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/ChatCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ChatSpyCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/ChatSpyCommand.java index d92ab049..95e83a48 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/ChatSpyCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/CreateCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/CreateCommand.java index 59c3bb74..d747de90 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/CreateCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/DCommandCache.java b/src/main/java/io/github/dre2n/dungeonsxl/command/DCommandCache.java index 3d781ffa..cf8c4904 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/DCommandCache.java +++ b/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 io.github.dre2n.commons.command.DRECommandCache; -import io.github.dre2n.commons.compatibility.CompatibilityHandler; -import io.github.dre2n.commons.javaplugin.DREPlugin; +import de.erethon.commons.command.DRECommand; +import de.erethon.commons.command.DRECommandCache; +import de.erethon.commons.compatibility.CompatibilityHandler; +import de.erethon.commons.javaplugin.DREPlugin; import io.github.dre2n.dungeonsxl.DungeonsXL; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/DeleteCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/DeleteCommand.java index fc76efbe..c2b98823 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/DeleteCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; -import io.github.dre2n.commons.compatibility.CompatibilityHandler; -import io.github.dre2n.commons.misc.FileUtil; +import de.erethon.commons.chat.MessageUtil; +import de.erethon.commons.command.DRECommand; +import de.erethon.commons.compatibility.CompatibilityHandler; +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); } } } diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java index e3506ee3..f7601119 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +import de.erethon.commons.command.DRECommand; import io.github.dre2n.dungeonsxl.config.DMessage; import io.github.dre2n.dungeonsxl.global.DPortal; import java.util.Set; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/EditCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/EditCommand.java index 7c7023f8..feb6c451 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/EditCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java index 5f614233..2549fbf8 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/EscapeCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/EscapeCommand.java index 3c47d715..ee2782cb 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/EscapeCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/GameCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/GameCommand.java index 9891418d..32cfeb10 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/GameCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/GroupCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/GroupCommand.java index cb11bce5..1857be2e 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/GroupCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/HelpCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/HelpCommand.java index ea607d34..e5f99cfc 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/HelpCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; -import io.github.dre2n.commons.misc.NumberUtil; +import de.erethon.commons.chat.MessageUtil; +import de.erethon.commons.command.DRECommand; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ImportCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/ImportCommand.java index 506e1cb3..a5f51fe7 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/ImportCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; -import io.github.dre2n.commons.misc.FileUtil; +import de.erethon.commons.chat.MessageUtil; +import de.erethon.commons.command.DRECommand; +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); } diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/InviteCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/InviteCommand.java index 7671c88b..03205907 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/InviteCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/JoinCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/JoinCommand.java index e591d2e1..ab2620f8 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/JoinCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/KickCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/KickCommand.java index 5eb1da60..e26cecb5 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/KickCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/LeaveCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/LeaveCommand.java index 032411a8..7304cb35 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/LeaveCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ListCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/ListCommand.java index a6bb577d..bd62a591 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/ListCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; -import io.github.dre2n.commons.misc.NumberUtil; +import de.erethon.commons.chat.MessageUtil; +import de.erethon.commons.command.DRECommand; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java index 4c21ebff..49cf0b90 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/MainCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/MainCommand.java index b73119c3..c82c77d3 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/MainCommand.java +++ b/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 io.github.dre2n.commons.chat.MessageUtil; -import io.github.dre2n.commons.command.DRECommand; -import io.github.dre2n.commons.compatibility.CompatibilityHandler; -import io.github.dre2n.commons.compatibility.Internals; +import static de.erethon.commons.chat.FatLetter.*; +import de.erethon.commons.chat.MessageUtil; +import de.erethon.commons.command.DRECommand; +import de.erethon.commons.compatibility.CompatibilityHandler; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/MsgCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/MsgCommand.java index f4cebf93..ba5e597d 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/MsgCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java index 4d6ee4a4..c3ef0e1c 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/PortalCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/PortalCommand.java index f529a59c..daa8aa18 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/PortalCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java index fb2c1d94..4df102f5 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java +++ b/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 io.github.dre2n.commons.chat.MessageUtil; -import io.github.dre2n.commons.command.DRECommand; -import io.github.dre2n.commons.compatibility.CompatibilityHandler; -import io.github.dre2n.commons.compatibility.Internals; +import de.erethon.commons.chat.DefaultFontInfo; +import de.erethon.commons.chat.MessageUtil; +import de.erethon.commons.command.DRECommand; +import de.erethon.commons.compatibility.CompatibilityHandler; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommandNoSpigot.java b/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommandNoSpigot.java index 0599ff17..87f10af0 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommandNoSpigot.java +++ b/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 io.github.dre2n.commons.command.DRECommand; -import io.github.dre2n.commons.compatibility.CompatibilityHandler; -import io.github.dre2n.commons.compatibility.Internals; +import de.erethon.commons.chat.MessageUtil; +import de.erethon.commons.command.DRECommand; +import de.erethon.commons.compatibility.CompatibilityHandler; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/RenameCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/RenameCommand.java index 8b304309..11a6b4f9 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/RenameCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ResourcePackCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/ResourcePackCommand.java index 0ff7d385..0e16cb90 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/ResourcePackCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/SaveCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/SaveCommand.java index e679babc..1bf77612 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/SaveCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/StatusCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/StatusCommand.java index 7c749b03..5f5c5915 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/StatusCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; -import io.github.dre2n.commons.compatibility.CompatibilityHandler; +import de.erethon.commons.chat.MessageUtil; +import de.erethon.commons.command.DRECommand; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/TestCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/TestCommand.java index 2a5c8c04..18c0b076 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/TestCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/UninviteCommand.java b/src/main/java/io/github/dre2n/dungeonsxl/command/UninviteCommand.java index 15127773..cf6019e8 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/UninviteCommand.java +++ b/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 io.github.dre2n.commons.command.DRECommand; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/config/DMessage.java b/src/main/java/io/github/dre2n/dungeonsxl/config/DMessage.java index 17be7e00..b50370e8 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/config/DMessage.java +++ b/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 io.github.dre2n.commons.config.Message; +import de.erethon.commons.chat.MessageUtil; +import de.erethon.commons.config.Message; import io.github.dre2n.dungeonsxl.DungeonsXL; import org.bukkit.ChatColor; import org.bukkit.configuration.file.FileConfiguration; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/config/GlobalData.java b/src/main/java/io/github/dre2n/dungeonsxl/config/GlobalData.java index f2666f8c..0eb33d34 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/config/GlobalData.java +++ b/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; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/config/MainConfig.java b/src/main/java/io/github/dre2n/dungeonsxl/config/MainConfig.java index 1cdca33c..c5bcd472 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/config/MainConfig.java +++ b/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 io.github.dre2n.commons.compatibility.CompatibilityHandler; -import io.github.dre2n.commons.compatibility.Internals; -import io.github.dre2n.commons.config.DREConfig; -import io.github.dre2n.commons.misc.EnumUtil; +import de.erethon.commons.chat.MessageUtil; +import de.erethon.commons.compatibility.CompatibilityHandler; +import de.erethon.commons.compatibility.Internals; +import de.erethon.commons.config.DREConfig; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/dungeon/DungeonCache.java b/src/main/java/io/github/dre2n/dungeonsxl/dungeon/DungeonCache.java index 2921148d..93eaacd8 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/dungeon/DungeonCache.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/dungeon/DungeonConfig.java b/src/main/java/io/github/dre2n/dungeonsxl/dungeon/DungeonConfig.java index 7f963c20..607edb56 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/dungeon/DungeonConfig.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/game/Game.java b/src/main/java/io/github/dre2n/dungeonsxl/game/Game.java index 20584b36..46320eee 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/game/Game.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/game/GameTypeCache.java b/src/main/java/io/github/dre2n/dungeonsxl/game/GameTypeCache.java index 3be1ebf8..7eab828e 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/game/GameTypeCache.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/DPortal.java b/src/main/java/io/github/dre2n/dungeonsxl/global/DPortal.java index 0400090b..dba82ea9 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/global/DPortal.java +++ b/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 io.github.dre2n.commons.misc.BlockUtil; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/GameSign.java b/src/main/java/io/github/dre2n/dungeonsxl/global/GameSign.java index 2dc647c0..3670724c 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/global/GameSign.java +++ b/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 io.github.dre2n.commons.misc.BlockUtil; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtection.java b/src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtection.java index bb662bee..60717900 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtection.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtectionListener.java b/src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtectionListener.java index 8291b7ed..39311408 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtectionListener.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/GroupSign.java b/src/main/java/io/github/dre2n/dungeonsxl/global/GroupSign.java index dba7a7c6..23dfae53 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/global/GroupSign.java +++ b/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 io.github.dre2n.commons.misc.BlockUtil; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/LeaveSign.java b/src/main/java/io/github/dre2n/dungeonsxl/global/LeaveSign.java index dea7d65e..b411a21d 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/global/LeaveSign.java +++ b/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 io.github.dre2n.commons.misc.BlockUtil; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/loottable/DLootTable.java b/src/main/java/io/github/dre2n/dungeonsxl/loottable/DLootTable.java index 9daae920..d9f05e2a 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/loottable/DLootTable.java +++ b/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 generateLootList() { List 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()); } } diff --git a/src/main/java/io/github/dre2n/dungeonsxl/loottable/DLootTableCache.java b/src/main/java/io/github/dre2n/dungeonsxl/loottable/DLootTableCache.java index bcd21aeb..fd1db075 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/loottable/DLootTableCache.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/CitizensMobProvider.java b/src/main/java/io/github/dre2n/dungeonsxl/mob/CitizensMobProvider.java index abc3422f..32a62774 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/mob/CitizensMobProvider.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/DMobType.java b/src/main/java/io/github/dre2n/dungeonsxl/mob/DMobType.java index 49346149..9b3ed9c9 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/mob/DMobType.java +++ b/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 io.github.dre2n.commons.misc.EnumUtil; -import io.github.dre2n.commons.misc.NumberUtil; +import de.erethon.commons.chat.MessageUtil; +import de.erethon.commons.misc.EnumUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/DMobTypeCache.java b/src/main/java/io/github/dre2n/dungeonsxl/mob/DMobTypeCache.java index 8160ac53..7d8f9ac3 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/mob/DMobTypeCache.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProviderCache.java b/src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProviderCache.java index 63d52656..ade067cb 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProviderCache.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/CreateDInstancePlayerTask.java b/src/main/java/io/github/dre2n/dungeonsxl/player/CreateDInstancePlayerTask.java index f2242ce6..7bfbf541 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/CreateDInstancePlayerTask.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DClass.java b/src/main/java/io/github/dre2n/dungeonsxl/player/DClass.java index 2a42a8fb..3fbe0c6d 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DClass.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DClassCache.java b/src/main/java/io/github/dre2n/dungeonsxl/player/DClassCache.java index e945d07a..63812dc3 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DClassCache.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DEditPlayer.java b/src/main/java/io/github/dre2n/dungeonsxl/player/DEditPlayer.java index d18f331d..ff86e6c4 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DEditPlayer.java +++ b/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 io.github.dre2n.commons.player.PlayerUtil; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java b/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java index b7db3158..c7998810 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java +++ b/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 io.github.dre2n.commons.player.PlayerUtil; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DGlobalPlayer.java b/src/main/java/io/github/dre2n/dungeonsxl/player/DGlobalPlayer.java index d86e73ff..bd715a29 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DGlobalPlayer.java +++ b/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 io.github.dre2n.commons.compatibility.CompatibilityHandler; -import io.github.dre2n.commons.compatibility.Version; -import io.github.dre2n.commons.player.PlayerUtil; -import io.github.dre2n.commons.player.PlayerWrapper; +import de.erethon.commons.chat.MessageUtil; +import de.erethon.commons.compatibility.CompatibilityHandler; +import de.erethon.commons.compatibility.Version; +import de.erethon.commons.player.PlayerUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DGroup.java b/src/main/java/io/github/dre2n/dungeonsxl/player/DGroup.java index 783effe0..954a4bb5 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DGroup.java +++ b/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 io.github.dre2n.commons.misc.NumberUtil; -import io.github.dre2n.commons.player.PlayerCollection; +import de.erethon.commons.chat.MessageUtil; +import de.erethon.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 { diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DPermission.java b/src/main/java/io/github/dre2n/dungeonsxl/player/DPermission.java index 29846494..8f991d60 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DPermission.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerData.java b/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerData.java index 1e2f508c..deb07167 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerData.java +++ b/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 io.github.dre2n.commons.compatibility.CompatibilityHandler; -import io.github.dre2n.commons.compatibility.Internals; -import io.github.dre2n.commons.config.DREConfig; -import io.github.dre2n.commons.misc.EnumUtil; +import de.erethon.commons.chat.MessageUtil; +import de.erethon.commons.compatibility.CompatibilityHandler; +import de.erethon.commons.compatibility.Internals; +import de.erethon.commons.config.DREConfig; +import de.erethon.commons.misc.EnumUtil; import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.config.DMessage; import java.io.File; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerListener.java b/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerListener.java index f7d46279..345956b6 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerListener.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/RespawnTask.java b/src/main/java/io/github/dre2n/dungeonsxl/player/RespawnTask.java index 8bac53ee..b59a0eeb 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/RespawnTask.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/TimeIsRunningTask.java b/src/main/java/io/github/dre2n/dungeonsxl/player/TimeIsRunningTask.java index 2c56cf76..bb3bd098 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/TimeIsRunningTask.java +++ b/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 io.github.dre2n.commons.config.MessageConfig; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeLevelRequirement.java b/src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeLevelRequirement.java index a4c4b5c6..51c6535b 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeLevelRequirement.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeMoneyRequirement.java b/src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeMoneyRequirement.java index c31f2ee8..f9764755 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeMoneyRequirement.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/Requirement.java b/src/main/java/io/github/dre2n/dungeonsxl/requirement/Requirement.java index 322f18cb..85b9f5d4 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/requirement/Requirement.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/LevelReward.java b/src/main/java/io/github/dre2n/dungeonsxl/reward/LevelReward.java index dadb04d7..0e9e6d53 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/reward/LevelReward.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/MoneyReward.java b/src/main/java/io/github/dre2n/dungeonsxl/reward/MoneyReward.java index ef73f90d..c37cb621 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/reward/MoneyReward.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/Reward.java b/src/main/java/io/github/dre2n/dungeonsxl/reward/Reward.java index f85ee2ea..90b331ab 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/reward/Reward.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardListener.java b/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardListener.java index 73e781e5..8ea892f4 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardListener.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/BedSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/BedSign.java index 5f9c01bb..fd1fef55 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/BedSign.java +++ b/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 io.github.dre2n.commons.misc.NumberUtil; +import de.erethon.commons.misc.BlockUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/BlockSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/BlockSign.java index ad323225..94578633 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/BlockSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/BossShopSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/BossShopSign.java index a6aee63d..a1283a82 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/BossShopSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/CheckpointSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/CheckpointSign.java index c03c5700..de186c86 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/CheckpointSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/ChestSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/ChestSign.java index a861b571..97b957b1 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/ChestSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/ChunkUpdaterSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/ChunkUpdaterSign.java index 4f081a6a..7d899c4f 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/ChunkUpdaterSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/CommandSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/CommandSign.java index 06ebd53c..a263a6c7 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/CommandSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/DSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/DSign.java index b0a974ae..e2486798 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/DSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignListener.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignListener.java index e541eea6..f165ec28 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignListener.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/DropSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/DropSign.java index 101bac0b..f40d7477 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/DropSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/FlagSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/FlagSign.java index 442fc938..25a10195 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/FlagSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/InteractSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/InteractSign.java index 389798ff..4a17dfe2 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/InteractSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/LivesModifierSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/LivesModifierSign.java index 83bff112..1f714fa8 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/LivesModifierSign.java +++ b/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 io.github.dre2n.commons.misc.EnumUtil; -import io.github.dre2n.commons.misc.NumberUtil; +import de.erethon.commons.chat.MessageUtil; +import de.erethon.commons.misc.EnumUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/OpenDoorSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/OpenDoorSign.java index e91cfdf4..44902c35 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/OpenDoorSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/ProtectionSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/ProtectionSign.java index da495335..2a8fc0f6 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/ProtectionSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/RedstoneSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/RedstoneSign.java index f1e7ce9d..4c9feccb 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/RedstoneSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScript.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScript.java index c5180fd1..bb40fbab 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScript.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScriptCache.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScriptCache.java index c5056c52..28394113 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScriptCache.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/TeleportSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/TeleportSign.java index 30068093..5dfe827e 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/TeleportSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/TriggerSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/TriggerSign.java index 2e6e1135..cf8c3705 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/TriggerSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/WaveSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/WaveSign.java index c0114a83..b5dd11d8 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/WaveSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/ReadySign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/ReadySign.java index b56af6f8..de065715 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/ReadySign.java +++ b/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 io.github.dre2n.commons.misc.NumberUtil; +import de.erethon.commons.chat.MessageUtil; +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()); } } diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/StartSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/StartSign.java index 72c36bf2..68b60515 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/StartSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/ActionBarSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/message/ActionBarSign.java index bde59c74..ce90e8d3 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/ActionBarSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/HologramSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/message/HologramSign.java index 0a143be7..c6956d31 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/HologramSign.java +++ b/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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/MessageSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/message/MessageSign.java index 36f9a1c5..ef5e4974 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/MessageSign.java +++ b/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 io.github.dre2n.commons.misc.NumberUtil; +import de.erethon.commons.chat.MessageUtil; +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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/SoundMessageSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/message/SoundMessageSign.java index feaf961e..b4670435 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/SoundMessageSign.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/sign/message/SoundMessageSign.java @@ -16,7 +16,7 @@ */ package io.github.dre2n.dungeonsxl.sign.message; -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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/TitleSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/message/TitleSign.java index 398ab9ab..58e12380 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/TitleSign.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/sign/message/TitleSign.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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/mob/DMobSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/mob/DMobSign.java index 0d2c47eb..f035eaac 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/mob/DMobSign.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/sign/mob/DMobSign.java @@ -16,7 +16,7 @@ */ package io.github.dre2n.dungeonsxl.sign.mob; -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; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/mob/ExternalMobSign.java b/src/main/java/io/github/dre2n/dungeonsxl/sign/mob/ExternalMobSign.java index 1a93a779..6fd925bb 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/mob/ExternalMobSign.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/sign/mob/ExternalMobSign.java @@ -16,7 +16,7 @@ */ package io.github.dre2n.dungeonsxl.sign.mob; -import io.github.dre2n.commons.misc.NumberUtil; +import de.erethon.commons.misc.NumberUtil; import io.github.dre2n.dungeonsxl.mob.ExternalMobPlugin; import io.github.dre2n.dungeonsxl.mob.ExternalMobProvider; import io.github.dre2n.dungeonsxl.sign.DSign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/FortuneTrigger.java b/src/main/java/io/github/dre2n/dungeonsxl/trigger/FortuneTrigger.java index 50e7b82d..648220bf 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/trigger/FortuneTrigger.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/trigger/FortuneTrigger.java @@ -16,9 +16,10 @@ */ package io.github.dre2n.dungeonsxl.trigger; -import io.github.dre2n.commons.misc.NumberUtil; +import de.erethon.commons.misc.NumberUtil; import io.github.dre2n.dungeonsxl.event.trigger.TriggerActionEvent; import io.github.dre2n.dungeonsxl.world.DGameWorld; +import java.util.Random; import org.bukkit.Bukkit; /** @@ -57,7 +58,7 @@ public class FortuneTrigger extends Trigger { /* Actions */ public void onTrigger() { - int random = NumberUtil.generateRandomInt(0, 100); + int random = new Random().nextInt(100); if (chance * 100 < random) { return; } diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/Trigger.java b/src/main/java/io/github/dre2n/dungeonsxl/trigger/Trigger.java index 23caa0d9..01269fa0 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/trigger/Trigger.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/trigger/Trigger.java @@ -16,8 +16,8 @@ */ package io.github.dre2n.dungeonsxl.trigger; -import io.github.dre2n.commons.chat.MessageUtil; -import io.github.dre2n.commons.misc.NumberUtil; +import de.erethon.commons.chat.MessageUtil; +import de.erethon.commons.misc.NumberUtil; import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.event.trigger.TriggerRegistrationEvent; import io.github.dre2n.dungeonsxl.sign.DSign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/util/DColor.java b/src/main/java/io/github/dre2n/dungeonsxl/util/DColor.java index 51e9e5dc..f3113451 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/util/DColor.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/util/DColor.java @@ -16,7 +16,7 @@ */ package io.github.dre2n.dungeonsxl.util; -import io.github.dre2n.commons.misc.EnumUtil; +import de.erethon.commons.misc.EnumUtil; import org.bukkit.ChatColor; import org.bukkit.DyeColor; import org.bukkit.Material; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/util/DeserializationUtil.java b/src/main/java/io/github/dre2n/dungeonsxl/util/DeserializationUtil.java index 73488ff3..00a4d14b 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/util/DeserializationUtil.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/util/DeserializationUtil.java @@ -16,10 +16,9 @@ */ package io.github.dre2n.dungeonsxl.util; -import io.github.dre2n.commons.misc.NumberUtil; +import de.erethon.commons.misc.NumberUtil; import java.util.ArrayList; import java.util.List; -import org.bukkit.Material; import org.bukkit.enchantments.Enchantment; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/util/GUIButton.java b/src/main/java/io/github/dre2n/dungeonsxl/util/GUIButton.java index 37e396b9..5e39aac5 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/util/GUIButton.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/util/GUIButton.java @@ -16,7 +16,7 @@ */ package io.github.dre2n.dungeonsxl.util; -import io.github.dre2n.commons.item.ItemUtil; +import de.erethon.commons.item.ItemUtil; import io.github.dre2n.dungeonsxl.config.DMessage; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/util/GUIUtil.java b/src/main/java/io/github/dre2n/dungeonsxl/util/GUIUtil.java index 6ab1867d..6c529fe3 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/util/GUIUtil.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/util/GUIUtil.java @@ -16,7 +16,7 @@ */ package io.github.dre2n.dungeonsxl.util; -import io.github.dre2n.commons.javaplugin.DREPlugin; +import io.github.dre2n.dungeonsxl.DungeonsXL; import java.util.Arrays; import java.util.List; import org.bukkit.ChatColor; @@ -64,7 +64,7 @@ public enum GUIUtil { * @return * an Inventory that can easily be shown to a Player */ - public static Inventory createGUI(DREPlugin plugin, String title, ItemStack... buttons) { + public static Inventory createGUI(DungeonsXL plugin, String title, ItemStack... buttons) { return createGUI(plugin, title, Arrays.asList(buttons)); } @@ -80,7 +80,7 @@ public enum GUIUtil { * @return * an Inventory that can easily be shown to a Player */ - public static Inventory createGUI(DREPlugin plugin, String title, List buttons) { + public static Inventory createGUI(DungeonsXL plugin, String title, List buttons) { int rows = (int) Math.ceil(((double) buttons.size()) / 9); Inventory gui = plugin.getServer().createInventory(null, rows * 9, ChatColor.translateAlternateColorCodes('&', title)); @@ -110,7 +110,7 @@ public enum GUIUtil { i++; } - plugin.addGUI(gui); + plugin.getGUIs().add(gui); return gui; } diff --git a/src/main/java/io/github/dre2n/dungeonsxl/util/LegacyUtil.java b/src/main/java/io/github/dre2n/dungeonsxl/util/LegacyUtil.java index a22f2335..f1c18b15 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/util/LegacyUtil.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/util/LegacyUtil.java @@ -16,8 +16,8 @@ */ package io.github.dre2n.dungeonsxl.util; -import io.github.dre2n.commons.compatibility.CompatibilityHandler; -import io.github.dre2n.commons.compatibility.Version; +import de.erethon.commons.compatibility.CompatibilityHandler; +import de.erethon.commons.compatibility.Version; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/util/PageGUI.java b/src/main/java/io/github/dre2n/dungeonsxl/util/PageGUI.java deleted file mode 100644 index b1da49f2..00000000 --- a/src/main/java/io/github/dre2n/dungeonsxl/util/PageGUI.java +++ /dev/null @@ -1,152 +0,0 @@ -/* - * Copyright (C) 2017 Daniel Saukel - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package io.github.dre2n.dungeonsxl.util; - -import io.github.dre2n.dungeonsxl.DungeonsXL; -import static io.github.dre2n.dungeonsxl.util.GUIButton.*; -import java.util.Stack; -import org.bukkit.Bukkit; -import org.bukkit.Material; -import org.bukkit.Sound; -import org.bukkit.entity.HumanEntity; -import org.bukkit.entity.Player; -import org.bukkit.event.inventory.InventoryClickEvent; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.ItemStack; - -/** - * @author Daniel Saukel - */ -public class PageGUI { - - private String title; - private boolean allowStealing; - private Stack pages = new Stack<>(); - - public PageGUI(String title) { - this(title, false); - } - - public PageGUI(String title, boolean allowStealing) { - this.title = title; - this.allowStealing = allowStealing; - newPage(); - DungeonsXL.getInstance().getPageGUICache().guis.add(this); - } - - public Inventory newPage() { - Inventory gui = Bukkit.createInventory(null, 54, title); - gui.setItem(45, PREVIOUS_PAGE); - gui.setItem(46, PLACEHOLDER); - gui.setItem(47, PLACEHOLDER); - gui.setItem(48, PLACEHOLDER); - gui.setItem(49, PLACEHOLDER); - gui.setItem(50, PLACEHOLDER); - gui.setItem(51, PLACEHOLDER); - gui.setItem(52, PLACEHOLDER); - gui.setItem(53, NEXT_PAGE); - pages.add(gui); - return gui; - } - - public void addButton(ItemStack button) { - if (hasSpace(pages.peek())) { - pages.peek().addItem(button); - } else { - newPage().addItem(button); - } - } - - public String getTitle() { - return title; - } - - public boolean isStealingAllowed() { - return allowStealing; - } - - public void setStealingAllowed(boolean allowed) { - allowStealing = allowed; - } - - public Stack getPages() { - return pages; - } - - public void open(HumanEntity player) { - player.openInventory(pages.get(0)); - } - - public void open(HumanEntity player, int page) { - if (pages.size() - 1 >= page && page >= 0) { - player.openInventory(pages.get(page)); - } - } - - public void clear() { - pages.clear(); - newPage(); - } - - /* Statics */ - public static boolean hasSpace(Inventory inventory) { - for (ItemStack stack : inventory.getContents()) { - if (stack == null || stack.getType() == Material.AIR) { - return true; - } - } - return false; - } - - public static void playSound(InventoryClickEvent event) { - if (event.getSlot() == -999) { - return; - } - - HumanEntity human = event.getWhoClicked(); - if (!(human instanceof Player)) { - return; - } - - ItemStack clicked = event.getCurrentItem(); - if (clicked == null || clicked.getType() == Material.AIR) { - return; - } - - if (clicked.getType() == Material.BARRIER) { - ((Player) human).playSound(human.getLocation(), Sound.BLOCK_ANVIL_PLACE, 1, 1); - } else if (clicked != null && !clicked.equals(PLACEHOLDER)) { - ((Player) human).playSound(human.getLocation(), Sound.UI_BUTTON_CLICK, 1, 1); - } - } - - public static boolean isPageGUI(Inventory inventory) { - return inventory != null && inventory.getSize() == 54 && PREVIOUS_PAGE.equals(inventory.getItem(45)) && PLACEHOLDER.equals(inventory.getItem(49)); - } - - public static PageGUI getByInventory(Inventory inventory) { - for (PageGUI gui : DungeonsXL.getInstance().getPageGUICache().guis) { - for (Inventory page : gui.pages) { - if (page.getTitle().equals(inventory.getTitle())) { - return gui; - } - } - } - return null; - } - -} diff --git a/src/main/java/io/github/dre2n/dungeonsxl/util/PageGUICache.java b/src/main/java/io/github/dre2n/dungeonsxl/util/PageGUICache.java deleted file mode 100644 index 26c94ed9..00000000 --- a/src/main/java/io/github/dre2n/dungeonsxl/util/PageGUICache.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * Copyright (C) 2017 Daniel Saukel - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package io.github.dre2n.dungeonsxl.util; - -import static io.github.dre2n.dungeonsxl.util.GUIButton.*; -import java.util.HashSet; -import java.util.Set; -import org.bukkit.Material; -import org.bukkit.entity.HumanEntity; -import org.bukkit.event.EventHandler; -import org.bukkit.event.Listener; -import org.bukkit.event.inventory.InventoryClickEvent; -import org.bukkit.inventory.Inventory; -import org.bukkit.inventory.ItemStack; - -/** - * @author Daniel Saukel - */ -public class PageGUICache implements Listener { - - Set guis = new HashSet<>(); - - @EventHandler - public void onClick(InventoryClickEvent event) { - ItemStack button = event.getCurrentItem(); - if (button == null || button.getType() == Material.AIR) { - return; - } - Inventory inventory = event.getInventory(); - PageGUI gui = PageGUI.getByInventory(inventory); - if (gui == null) { - return; - } - - int index = gui.getPages().indexOf(inventory); - HumanEntity player = event.getWhoClicked(); - if (button.equals(PLACEHOLDER)) { - event.setCancelled(true); - } else if (button.equals(NEXT_PAGE)) { - event.setCancelled(true); - PageGUI.playSound(event); - gui.open(player, index + 1); - } else if (button.equals(PREVIOUS_PAGE)) { - event.setCancelled(true); - PageGUI.playSound(event); - gui.open(player, index - 1); - } else if (!gui.isStealingAllowed()) { - event.setCancelled(true); - PageGUI.playSound(event); - } - } - -} diff --git a/src/main/java/io/github/dre2n/dungeonsxl/util/ProgressBar.java b/src/main/java/io/github/dre2n/dungeonsxl/util/ProgressBar.java index 3fa6e970..21f55544 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/util/ProgressBar.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/util/ProgressBar.java @@ -16,7 +16,7 @@ */ package io.github.dre2n.dungeonsxl.util; -import io.github.dre2n.commons.chat.MessageUtil; +import de.erethon.commons.chat.MessageUtil; import io.github.dre2n.dungeonsxl.DungeonsXL; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/BackupResourceTask.java b/src/main/java/io/github/dre2n/dungeonsxl/world/BackupResourceTask.java index 8580d9b4..6979ca51 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/BackupResourceTask.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/world/BackupResourceTask.java @@ -16,7 +16,7 @@ */ package io.github.dre2n.dungeonsxl.world; -import io.github.dre2n.commons.misc.FileUtil; +import de.erethon.commons.misc.FileUtil; import io.github.dre2n.dungeonsxl.DungeonsXL; import java.io.File; import org.bukkit.scheduler.BukkitRunnable; @@ -35,7 +35,7 @@ public class BackupResourceTask extends BukkitRunnable { @Override public void run() { File target = new File(DungeonsXL.BACKUPS, resource.getName() + "-" + System.currentTimeMillis()); - FileUtil.copyDirectory(resource.getFolder(), target, new String[]{}); + FileUtil.copyDir(resource.getFolder(), target); } } diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/DEditWorld.java b/src/main/java/io/github/dre2n/dungeonsxl/world/DEditWorld.java index e585c146..fdb366cc 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/DEditWorld.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/world/DEditWorld.java @@ -16,7 +16,7 @@ */ package io.github.dre2n.dungeonsxl.world; -import io.github.dre2n.commons.misc.FileUtil; +import de.erethon.commons.misc.FileUtil; import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.event.editworld.EditWorldSaveEvent; import io.github.dre2n.dungeonsxl.event.editworld.EditWorldUnloadEvent; @@ -122,15 +122,15 @@ public class DEditWorld extends DInstanceWorld { getWorld().save(); if (!plugin.getMainConfig().areTweaksEnabled()) { - FileUtil.copyDirectory(getFolder(), getResource().getFolder(), DungeonsXL.EXCLUDED_FILES); - FileUtil.deleteUnusedFiles(getResource().getFolder()); + FileUtil.copyDir(getFolder(), getResource().getFolder(), DungeonsXL.EXCLUDED_FILES); + DWorldCache.deleteUnusedFiles(getResource().getFolder()); } else { new BukkitRunnable() { @Override public void run() { - FileUtil.copyDirectory(getFolder(), getResource().getFolder(), DungeonsXL.EXCLUDED_FILES); - FileUtil.deleteUnusedFiles(getResource().getFolder()); + FileUtil.copyDir(getFolder(), getResource().getFolder(), DungeonsXL.EXCLUDED_FILES); + DWorldCache.deleteUnusedFiles(getResource().getFolder()); } }.runTaskAsynchronously(plugin); } @@ -166,12 +166,12 @@ public class DEditWorld extends DInstanceWorld { if (save) { Bukkit.unloadWorld(getWorld(), true); } - FileUtil.copyDirectory(getFolder(), getResource().getFolder(), DungeonsXL.EXCLUDED_FILES); - FileUtil.deleteUnusedFiles(getResource().getFolder()); + FileUtil.copyDir(getFolder(), getResource().getFolder(), DungeonsXL.EXCLUDED_FILES); + DWorldCache.deleteUnusedFiles(getResource().getFolder()); if (!save) { Bukkit.unloadWorld(getWorld(), true); } - FileUtil.removeDirectory(getFolder()); + FileUtil.removeDir(getFolder()); worlds.removeInstance(this); } else { @@ -182,12 +182,12 @@ public class DEditWorld extends DInstanceWorld { if (save) { Bukkit.unloadWorld(getWorld(), true); } - FileUtil.copyDirectory(getFolder(), getResource().getFolder(), DungeonsXL.EXCLUDED_FILES); - FileUtil.deleteUnusedFiles(getResource().getFolder()); + FileUtil.copyDir(getFolder(), getResource().getFolder(), DungeonsXL.EXCLUDED_FILES); + DWorldCache.deleteUnusedFiles(getResource().getFolder()); if (!save) { Bukkit.unloadWorld(getWorld(), true); } - FileUtil.removeDirectory(getFolder()); + FileUtil.removeDir(getFolder()); worlds.removeInstance(editWorld); } }.runTaskAsynchronously(plugin); diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/DGameWorld.java b/src/main/java/io/github/dre2n/dungeonsxl/world/DGameWorld.java index b5666d81..2eec7379 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/DGameWorld.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/world/DGameWorld.java @@ -16,8 +16,8 @@ */ package io.github.dre2n.dungeonsxl.world; -import io.github.dre2n.commons.misc.BlockUtil; -import io.github.dre2n.commons.misc.FileUtil; +import de.erethon.commons.misc.BlockUtil; +import de.erethon.commons.misc.FileUtil; import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.dungeon.Dungeon; import io.github.dre2n.dungeonsxl.event.gameworld.GameWorldStartGameEvent; @@ -496,7 +496,7 @@ public class DGameWorld extends DInstanceWorld { if (!plugin.getMainConfig().areTweaksEnabled()) { Bukkit.unloadWorld(getWorld(), false); - FileUtil.removeDirectory(getFolder()); + FileUtil.removeDir(getFolder()); worlds.removeInstance(this); } else { @@ -505,7 +505,7 @@ public class DGameWorld extends DInstanceWorld { @Override public void run() { Bukkit.unloadWorld(getWorld(), false); - FileUtil.removeDirectory(getFolder()); + FileUtil.removeDir(getFolder()); worlds.removeInstance(gameWorld); } }.runTaskAsynchronously(plugin); diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/DInstanceWorld.java b/src/main/java/io/github/dre2n/dungeonsxl/world/DInstanceWorld.java index af2c0c4f..dd678209 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/DInstanceWorld.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/world/DInstanceWorld.java @@ -16,7 +16,7 @@ */ package io.github.dre2n.dungeonsxl.world; -import io.github.dre2n.commons.chat.MessageUtil; +import de.erethon.commons.chat.MessageUtil; import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.player.DGamePlayer; import java.io.File; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java b/src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java index 9a8cf89f..606059e5 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java @@ -16,8 +16,8 @@ */ package io.github.dre2n.dungeonsxl.world; -import io.github.dre2n.commons.misc.FileUtil; -import io.github.dre2n.commons.worldloader.WorldLoader; +import de.erethon.commons.misc.FileUtil; +import de.erethon.commons.worldloader.WorldLoader; import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.event.editworld.EditWorldGenerateEvent; import io.github.dre2n.dungeonsxl.player.DEditPlayer; @@ -214,7 +214,7 @@ public class DResourceWorld { final DInstanceWorld instance = game ? new DGameWorld(this, instanceFolder, id) : new DEditWorld(this, instanceFolder, id); if (!plugin.getMainConfig().areTweaksEnabled()) { - FileUtil.copyDirectory(folder, instanceFolder, DungeonsXL.EXCLUDED_FILES); + FileUtil.copyDir(folder, instanceFolder, DungeonsXL.EXCLUDED_FILES); instance.world = Bukkit.createWorld(WorldCreator.name(name)); if (game) { @@ -227,7 +227,7 @@ public class DResourceWorld { new BukkitRunnable() { @Override public void run() { - FileUtil.copyDirectory(folder, instanceFolder, DungeonsXL.EXCLUDED_FILES); + FileUtil.copyDir(folder, instanceFolder, DungeonsXL.EXCLUDED_FILES); instance.world = WorldLoader.createWorld(WorldCreator.name(instanceFolder.getName())); new BukkitRunnable() { @@ -295,7 +295,7 @@ public class DResourceWorld { new BukkitRunnable() { @Override public void run() { - FileUtil.copyDirectory(DWorldCache.RAW, folder, DungeonsXL.EXCLUDED_FILES); + FileUtil.copyDir(DWorldCache.RAW, folder, DungeonsXL.EXCLUDED_FILES); editWorld.generateIdFile(); editWorld.world = WorldLoader.createWorld(creator); } diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/DWorldCache.java b/src/main/java/io/github/dre2n/dungeonsxl/world/DWorldCache.java index 5093565f..4163a208 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/DWorldCache.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/world/DWorldCache.java @@ -16,8 +16,8 @@ */ package io.github.dre2n.dungeonsxl.world; -import io.github.dre2n.commons.misc.FileUtil; -import io.github.dre2n.commons.misc.NumberUtil; +import de.erethon.commons.misc.FileUtil; +import de.erethon.commons.misc.NumberUtil; import io.github.dre2n.dungeonsxl.DungeonsXL; import io.github.dre2n.dungeonsxl.config.MainConfig; import io.github.dre2n.dungeonsxl.config.MainConfig.BackupMode; @@ -212,15 +212,15 @@ public class DWorldCache { if (mapFile.getName().startsWith(".id_")) { String name = mapFile.getName().substring(4); - FileUtil.copyDirectory(file, new File(DungeonsXL.MAPS, name), DungeonsXL.EXCLUDED_FILES); - FileUtil.deleteUnusedFiles(new File(DungeonsXL.MAPS, name)); + FileUtil.copyDir(file, new File(DungeonsXL.MAPS, name), DungeonsXL.EXCLUDED_FILES); + deleteUnusedFiles(new File(DungeonsXL.MAPS, name)); - FileUtil.removeDirectory(file); + FileUtil.removeDir(file); } } } else if (file.getName().startsWith("DXL_Game_") && file.isDirectory()) { - FileUtil.removeDirectory(file); + FileUtil.removeDir(file); } } } @@ -293,9 +293,9 @@ public class DWorldCache { creator.generateStructures(false); World world = creator.createWorld(); File worldFolder = new File(Bukkit.getWorldContainer(), ".raw"); - FileUtil.copyDirectory(worldFolder, RAW, DungeonsXL.EXCLUDED_FILES); + FileUtil.copyDir(worldFolder, RAW, DungeonsXL.EXCLUDED_FILES); Bukkit.unloadWorld(world, false); - FileUtil.removeDirectory(worldFolder); + FileUtil.removeDir(worldFolder); } /* Tasks */ @@ -313,4 +313,20 @@ public class DWorldCache { worldUnloadTask = new WorldUnloadTask().runTaskTimer(plugin, period, period); } + /* Util */ + /** + * Removes files that are not needed from a world + * + * @param dir + * the directory to purge + */ + public static void deleteUnusedFiles(File dir) { + File[] files = dir.listFiles(); + for (File file : files) { + if (file.getName().equalsIgnoreCase("uid.dat") || file.getName().contains(".id_")) { + file.delete(); + } + } + } + } diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/WorldConfig.java b/src/main/java/io/github/dre2n/dungeonsxl/world/WorldConfig.java index 78b86a5b..6fea139a 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/WorldConfig.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/world/WorldConfig.java @@ -16,12 +16,12 @@ */ package io.github.dre2n.dungeonsxl.world; +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.UniversalItemStack; -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.DungeonsXL; import io.github.dre2n.dungeonsxl.game.GameRuleProvider; import io.github.dre2n.dungeonsxl.game.GameType; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/block/PlaceableBlock.java b/src/main/java/io/github/dre2n/dungeonsxl/world/block/PlaceableBlock.java index e8f51fb5..110a279c 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/block/PlaceableBlock.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/world/block/PlaceableBlock.java @@ -16,7 +16,7 @@ */ package io.github.dre2n.dungeonsxl.world.block; -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 java.util.HashSet; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/block/RewardChest.java b/src/main/java/io/github/dre2n/dungeonsxl/world/block/RewardChest.java index edfa86df..6997ac82 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/block/RewardChest.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/world/block/RewardChest.java @@ -16,7 +16,7 @@ */ package io.github.dre2n.dungeonsxl.world.block; -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.game.Game; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamBed.java b/src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamBed.java index bb4c530f..21985515 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamBed.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamBed.java @@ -16,7 +16,7 @@ */ package io.github.dre2n.dungeonsxl.world.block; -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.DGroup; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamFlag.java b/src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamFlag.java index dde3592f..7d6dfb8c 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamFlag.java +++ b/src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamFlag.java @@ -16,7 +16,7 @@ */ package io.github.dre2n.dungeonsxl.world.block; -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.DGroup;