From 46607b539e30cac544d5b15a845c03dd3e4563f6 Mon Sep 17 00:00:00 2001 From: Daniel Saukel Date: Thu, 3 May 2018 21:54:25 +0200 Subject: [PATCH] Move to de.erethon.dungeonsxl --- pom.xml | 2 +- .../erethon}/dungeonsxl/DungeonsXL.java | 50 +- .../dungeonsxl/announcer/Announcer.java | 18 +- .../dungeonsxl/announcer/AnnouncerCache.java | 4 +- .../announcer/AnnouncerListener.java | 4 +- .../announcer/AnnouncerStartGameTask.java | 12 +- .../dungeonsxl/announcer/AnnouncerTask.java | 8 +- .../dungeonsxl/command/BreakCommand.java | 10 +- .../dungeonsxl/command/ChatCommand.java | 12 +- .../dungeonsxl/command/ChatSpyCommand.java | 10 +- .../dungeonsxl/command/CreateCommand.java | 16 +- .../dungeonsxl/command/DCommandCache.java | 4 +- .../dungeonsxl/command/DeleteCommand.java | 14 +- .../command/DeletePortalCommand.java | 6 +- .../dungeonsxl/command/EditCommand.java | 22 +- .../dungeonsxl/command/EnterCommand.java | 12 +- .../dungeonsxl/command/EscapeCommand.java | 14 +- .../dungeonsxl/command/GameCommand.java | 12 +- .../dungeonsxl/command/GroupCommand.java | 18 +- .../dungeonsxl/command/HelpCommand.java | 8 +- .../dungeonsxl/command/ImportCommand.java | 10 +- .../dungeonsxl/command/InviteCommand.java | 10 +- .../dungeonsxl/command/JoinCommand.java | 14 +- .../dungeonsxl/command/KickCommand.java | 8 +- .../dungeonsxl/command/LeaveCommand.java | 24 +- .../dungeonsxl/command/ListCommand.java | 20 +- .../dungeonsxl/command/LivesCommand.java | 10 +- .../dungeonsxl/command/MainCommand.java | 8 +- .../dungeonsxl/command/MsgCommand.java | 10 +- .../dungeonsxl/command/PlayCommand.java | 24 +- .../dungeonsxl/command/PortalCommand.java | 16 +- .../dungeonsxl/command/ReloadCommand.java | 12 +- .../command/ReloadCommandNoSpigot.java | 12 +- .../dungeonsxl/command/RenameCommand.java | 20 +- .../command/ResourcePackCommand.java | 8 +- .../dungeonsxl/command/SaveCommand.java | 14 +- .../dungeonsxl/command/StatusCommand.java | 8 +- .../dungeonsxl/command/TestCommand.java | 26 +- .../dungeonsxl/command/UninviteCommand.java | 10 +- .../erethon}/dungeonsxl/config/DMessage.java | 2 +- .../dungeonsxl/config/GlobalData.java | 2 +- .../dungeonsxl/config/MainConfig.java | 8 +- .../erethon}/dungeonsxl/dungeon/Dungeon.java | 8 +- .../dungeonsxl/dungeon/DungeonCache.java | 4 +- .../dungeonsxl/dungeon/DungeonConfig.java | 12 +- .../dungeonsxl/event/DataReloadEvent.java | 2 +- .../event/dgroup/DGroupCreateEvent.java | 4 +- .../event/dgroup/DGroupDisbandEvent.java | 4 +- .../dungeonsxl/event/dgroup/DGroupEvent.java | 4 +- .../dgroup/DGroupFinishDungeonEvent.java | 6 +- .../event/dgroup/DGroupFinishFloorEvent.java | 8 +- .../event/dgroup/DGroupRewardEvent.java | 6 +- .../event/dgroup/DGroupScoreEvent.java | 4 +- .../event/dgroup/DGroupStartFloorEvent.java | 6 +- .../dungeonsxl/event/dmob/DMobDeathEvent.java | 4 +- .../dungeonsxl/event/dmob/DMobEvent.java | 4 +- .../dungeonsxl/event/dmob/DMobSpawnEvent.java | 4 +- .../event/dplayer/DPlayerEvent.java | 4 +- .../event/dplayer/DPlayerJoinDGroupEvent.java | 6 +- .../event/dplayer/DPlayerKickEvent.java | 4 +- .../dplayer/DPlayerLeaveDGroupEvent.java | 6 +- .../instance/DInstancePlayerEvent.java | 6 +- .../instance/DInstancePlayerUpdateEvent.java | 4 +- .../instance/edit/DEditPlayerEscapeEvent.java | 4 +- .../instance/edit/DEditPlayerEvent.java | 6 +- .../instance/game/DGamePlayerDeathEvent.java | 4 +- .../instance/game/DGamePlayerEscapeEvent.java | 4 +- .../instance/game/DGamePlayerEvent.java | 6 +- .../instance/game/DGamePlayerFinishEvent.java | 4 +- .../dungeonsxl/event/dsign/DSignEvent.java | 4 +- .../event/dsign/DSignRegistrationEvent.java | 6 +- .../event/editworld/EditWorldEvent.java | 4 +- .../editworld/EditWorldGenerateEvent.java | 4 +- .../event/editworld/EditWorldLoadEvent.java | 2 +- .../event/editworld/EditWorldSaveEvent.java | 4 +- .../event/editworld/EditWorldUnloadEvent.java | 4 +- .../event/gameworld/GameWorldEvent.java | 4 +- .../event/gameworld/GameWorldLoadEvent.java | 2 +- .../gameworld/GameWorldStartGameEvent.java | 6 +- .../event/gameworld/GameWorldUnloadEvent.java | 4 +- .../requirement/RequirementCheckEvent.java | 4 +- .../requirement/RequirementDemandEvent.java | 4 +- .../event/requirement/RequirementEvent.java | 4 +- .../RequirementRegistrationEvent.java | 4 +- .../event/reward/RewardAdditionEvent.java | 6 +- .../dungeonsxl/event/reward/RewardEvent.java | 4 +- .../event/reward/RewardRegistrationEvent.java | 4 +- .../event/trigger/TriggerActionEvent.java | 4 +- .../event/trigger/TriggerEvent.java | 4 +- .../trigger/TriggerRegistrationEvent.java | 4 +- .../erethon}/dungeonsxl/game/Game.java | 28 +- .../erethon}/dungeonsxl/game/GameGoal.java | 2 +- .../dungeonsxl/game/GameRuleProvider.java | 8 +- .../erethon}/dungeonsxl/game/GameType.java | 2 +- .../dungeonsxl/game/GameTypeCache.java | 4 +- .../dungeonsxl/game/GameTypeDefault.java | 6 +- .../erethon}/dungeonsxl/global/DPortal.java | 18 +- .../erethon}/dungeonsxl/global/GameSign.java | 16 +- .../dungeonsxl/global/GlobalProtection.java | 8 +- .../global/GlobalProtectionCache.java | 4 +- .../global/GlobalProtectionListener.java | 15 +- .../erethon}/dungeonsxl/global/GroupSign.java | 14 +- .../erethon}/dungeonsxl/global/LeaveSign.java | 10 +- .../dungeonsxl/loottable/DLootTable.java | 2 +- .../dungeonsxl/loottable/DLootTableCache.java | 2 +- .../dungeonsxl/mob/CitizensMobProvider.java | 4 +- .../mob/CustomExternalMobProvider.java | 2 +- .../erethon}/dungeonsxl/mob/DMob.java | 14 +- .../erethon}/dungeonsxl/mob/DMobListener.java | 6 +- .../erethon}/dungeonsxl/mob/DMobType.java | 8 +- .../dungeonsxl/mob/DMobTypeCache.java | 4 +- .../erethon}/dungeonsxl/mob/DNPCRegistry.java | 2 +- .../dungeonsxl/mob/ExternalMobPlugin.java | 2 +- .../dungeonsxl/mob/ExternalMobProvider.java | 2 +- .../mob/ExternalMobProviderCache.java | 4 +- .../player/CreateDInstancePlayerTask.java | 10 +- .../erethon}/dungeonsxl/player/DClass.java | 4 +- .../dungeonsxl/player/DClassCache.java | 2 +- .../dungeonsxl/player/DEditPlayer.java | 10 +- .../dungeonsxl/player/DGamePlayer.java | 44 +- .../dungeonsxl/player/DGlobalPlayer.java | 17 +- .../erethon}/dungeonsxl/player/DGroup.java | 1976 ++++++++--------- .../erethon}/dungeonsxl/player/DGroupTag.java | 6 +- .../dungeonsxl/player/DInstancePlayer.java | 8 +- .../dungeonsxl/player/DPermission.java | 2 +- .../dungeonsxl/player/DPlayerCache.java | 6 +- .../dungeonsxl/player/DPlayerData.java | 6 +- .../dungeonsxl/player/DPlayerListener.java | 24 +- .../dungeonsxl/player/LazyUpdateTask.java | 4 +- .../dungeonsxl/player/RespawnTask.java | 4 +- .../dungeonsxl/player/SecureModeTask.java | 4 +- .../dungeonsxl/player/TimeIsRunningTask.java | 10 +- .../dungeonsxl/player/UpdateTask.java | 4 +- .../requirement/FeeLevelRequirement.java | 222 +- .../requirement/FeeMoneyRequirement.java | 6 +- .../requirement/GroupSizeRequirement.java | 4 +- .../requirement/PermissionRequirement.java | 4 +- .../dungeonsxl/requirement/Requirement.java | 4 +- .../requirement/RequirementType.java | 2 +- .../requirement/RequirementTypeCache.java | 2 +- .../requirement/RequirementTypeDefault.java | 2 +- .../dungeonsxl/reward/ItemReward.java | 2 +- .../dungeonsxl/reward/LevelReward.java | 4 +- .../dungeonsxl/reward/MoneyReward.java | 4 +- .../erethon}/dungeonsxl/reward/Reward.java | 6 +- .../dungeonsxl/reward/RewardListener.java | 16 +- .../dungeonsxl/reward/RewardType.java | 2 +- .../dungeonsxl/reward/RewardTypeCache.java | 4 +- .../dungeonsxl/reward/RewardTypeDefault.java | 2 +- .../erethon}/dungeonsxl/sign/BedSign.java | 8 +- .../erethon}/dungeonsxl/sign/BlockSign.java | 4 +- .../dungeonsxl/sign/BossShopSign.java | 8 +- .../dungeonsxl/sign/CheckpointSign.java | 8 +- .../erethon}/dungeonsxl/sign/ChestSign.java | 8 +- .../dungeonsxl/sign/ChunkUpdaterSign.java | 4 +- .../erethon}/dungeonsxl/sign/CommandSign.java | 6 +- .../erethon}/dungeonsxl/sign/DSign.java | 14 +- .../dungeonsxl/sign/DSignListener.java | 14 +- .../erethon}/dungeonsxl/sign/DSignType.java | 2 +- .../dungeonsxl/sign/DSignTypeCache.java | 4 +- .../dungeonsxl/sign/DSignTypeDefault.java | 26 +- .../dungeonsxl/sign/DelayedPowerTask.java | 4 +- .../erethon}/dungeonsxl/sign/DropSign.java | 4 +- .../erethon}/dungeonsxl/sign/EndSign.java | 10 +- .../erethon}/dungeonsxl/sign/FlagSign.java | 6 +- .../erethon}/dungeonsxl/sign/FloorSign.java | 12 +- .../dungeonsxl/sign/InteractSign.java | 8 +- .../erethon}/dungeonsxl/sign/LeaveSign.java | 12 +- .../dungeonsxl/sign/LivesModifierSign.java | 12 +- .../dungeonsxl/sign/LocationSign.java | 4 +- .../dungeonsxl/sign/OpenDoorSign.java | 6 +- .../dungeonsxl/sign/PerPlayerSign.java | 4 +- .../erethon}/dungeonsxl/sign/PlaceSign.java | 6 +- .../dungeonsxl/sign/ProtectionSign.java | 6 +- .../dungeonsxl/sign/RedstoneSign.java | 4 +- .../dungeonsxl/sign/ResourcePackSign.java | 8 +- .../erethon}/dungeonsxl/sign/ScriptSign.java | 4 +- .../erethon}/dungeonsxl/sign/SignScript.java | 2 +- .../dungeonsxl/sign/SignScriptCache.java | 2 +- .../dungeonsxl/sign/SignUpdateTask.java | 2 +- .../dungeonsxl/sign/TeleportSign.java | 4 +- .../erethon}/dungeonsxl/sign/TriggerSign.java | 8 +- .../erethon}/dungeonsxl/sign/WaveSign.java | 8 +- .../dungeonsxl/sign/lobby/ClassesSign.java | 12 +- .../dungeonsxl/sign/lobby/LobbySign.java | 10 +- .../dungeonsxl/sign/lobby/ReadySign.java | 24 +- .../dungeonsxl/sign/lobby/StartSign.java | 10 +- .../sign/message/ActionBarSign.java | 10 +- .../dungeonsxl/sign/message/HologramSign.java | 12 +- .../dungeonsxl/sign/message/MessageSign.java | 10 +- .../sign/message/SoundMessageSign.java | 10 +- .../dungeonsxl/sign/message/TitleSign.java | 10 +- .../dungeonsxl/sign/mob/DMobSign.java | 10 +- .../dungeonsxl/sign/mob/ExternalMobSign.java | 14 +- .../sign/mob/ExternalMobSpawnTask.java | 8 +- .../erethon}/dungeonsxl/sign/mob/MobSign.java | 2 +- .../dungeonsxl/sign/mob/MobSpawnTask.java | 10 +- .../dungeonsxl/trigger/DistanceTrigger.java | 6 +- .../dungeonsxl/trigger/FortuneTrigger.java | 6 +- .../dungeonsxl/trigger/InteractTrigger.java | 6 +- .../dungeonsxl/trigger/MobTrigger.java | 6 +- .../dungeonsxl/trigger/ProgressTrigger.java | 10 +- .../dungeonsxl/trigger/RedstoneTrigger.java | 6 +- .../dungeonsxl/trigger/SignTrigger.java | 6 +- .../erethon}/dungeonsxl/trigger/Trigger.java | 10 +- .../dungeonsxl/trigger/TriggerListener.java | 6 +- .../dungeonsxl/trigger/TriggerType.java | 2 +- .../dungeonsxl/trigger/TriggerTypeCache.java | 4 +- .../trigger/TriggerTypeDefault.java | 2 +- .../dungeonsxl/trigger/UseItemTrigger.java | 6 +- .../dungeonsxl/trigger/WaveTrigger.java | 6 +- .../erethon}/dungeonsxl/util/DColor.java | 2 +- .../dungeonsxl/util/DeserializationUtil.java | 2 +- .../erethon}/dungeonsxl/util/GUIUtil.java | 4 +- .../erethon}/dungeonsxl/util/LegacyUtil.java | 2 +- .../erethon}/dungeonsxl/util/NoReload.java | 2 +- .../erethon}/dungeonsxl/util/ParsingUtil.java | 6 +- .../erethon}/dungeonsxl/util/ProgressBar.java | 4 +- .../dungeonsxl/world/BackupResourceTask.java | 4 +- .../erethon}/dungeonsxl/world/DEditWorld.java | 10 +- .../erethon}/dungeonsxl/world/DGameWorld.java | 56 +- .../dungeonsxl/world/DInstanceWorld.java | 8 +- .../dungeonsxl/world/DResourceWorld.java | 626 +++--- .../dungeonsxl/world/DWorldCache.java | 8 +- .../dungeonsxl/world/DWorldListener.java | 4 +- .../erethon}/dungeonsxl/world/SignData.java | 4 +- .../dungeonsxl/world/WorldConfig.java | 12 +- .../dungeonsxl/world/WorldUnloadTask.java | 6 +- .../dungeonsxl/world/WorldUpdateTask.java | 4 +- .../dungeonsxl/world/block/GameBlock.java | 2 +- .../dungeonsxl/world/block/LockedDoor.java | 2 +- .../dungeonsxl/world/block/MultiBlock.java | 2 +- .../world/block/PlaceableBlock.java | 6 +- .../world/block/ProtectedBlock.java | 2 +- .../dungeonsxl/world/block/RewardChest.java | 24 +- .../dungeonsxl/world/block/TeamBed.java | 10 +- .../dungeonsxl/world/block/TeamBlock.java | 4 +- .../dungeonsxl/world/block/TeamFlag.java | 10 +- src/main/resources/plugin.yml | 2 +- 239 files changed, 2336 insertions(+), 2338 deletions(-) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/DungeonsXL.java (90%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/announcer/Announcer.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/announcer/AnnouncerCache.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/announcer/AnnouncerListener.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/announcer/AnnouncerStartGameTask.java (89%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/announcer/AnnouncerTask.java (89%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/BreakCommand.java (87%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/ChatCommand.java (85%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/ChatSpyCommand.java (86%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/CreateCommand.java (89%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/DCommandCache.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/DeleteCommand.java (90%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/DeletePortalCommand.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/EditCommand.java (81%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/EnterCommand.java (90%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/EscapeCommand.java (86%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/GameCommand.java (90%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/GroupCommand.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/HelpCommand.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/ImportCommand.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/InviteCommand.java (88%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/JoinCommand.java (82%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/KickCommand.java (88%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/LeaveCommand.java (80%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/ListCommand.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/LivesCommand.java (91%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/MainCommand.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/MsgCommand.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/PlayCommand.java (83%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/PortalCommand.java (87%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/ReloadCommand.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/ReloadCommandNoSpigot.java (91%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/RenameCommand.java (87%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/ResourcePackCommand.java (90%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/SaveCommand.java (84%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/StatusCommand.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/TestCommand.java (82%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/command/UninviteCommand.java (88%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/config/DMessage.java (99%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/config/GlobalData.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/config/MainConfig.java (99%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/dungeon/Dungeon.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/dungeon/DungeonCache.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/dungeon/DungeonConfig.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/DataReloadEvent.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dgroup/DGroupCreateEvent.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dgroup/DGroupDisbandEvent.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dgroup/DGroupEvent.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dgroup/DGroupFinishDungeonEvent.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dgroup/DGroupFinishFloorEvent.java (91%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dgroup/DGroupRewardEvent.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dgroup/DGroupScoreEvent.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dgroup/DGroupStartFloorEvent.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dmob/DMobDeathEvent.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dmob/DMobEvent.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dmob/DMobSpawnEvent.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dplayer/DPlayerEvent.java (91%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dplayer/DPlayerJoinDGroupEvent.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dplayer/DPlayerKickEvent.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dplayer/DPlayerLeaveDGroupEvent.java (91%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dplayer/instance/DInstancePlayerEvent.java (85%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dplayer/instance/DInstancePlayerUpdateEvent.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dplayer/instance/edit/DEditPlayerEscapeEvent.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dplayer/instance/edit/DEditPlayerEvent.java (85%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dplayer/instance/game/DGamePlayerDeathEvent.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dplayer/instance/game/DGamePlayerEscapeEvent.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dplayer/instance/game/DGamePlayerEvent.java (85%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dplayer/instance/game/DGamePlayerFinishEvent.java (93%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dsign/DSignEvent.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/dsign/DSignRegistrationEvent.java (93%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/editworld/EditWorldEvent.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/editworld/EditWorldGenerateEvent.java (93%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/editworld/EditWorldLoadEvent.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/editworld/EditWorldSaveEvent.java (93%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/editworld/EditWorldUnloadEvent.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/gameworld/GameWorldEvent.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/gameworld/GameWorldLoadEvent.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/gameworld/GameWorldStartGameEvent.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/gameworld/GameWorldUnloadEvent.java (93%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/requirement/RequirementCheckEvent.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/requirement/RequirementDemandEvent.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/requirement/RequirementEvent.java (91%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/requirement/RequirementRegistrationEvent.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/reward/RewardAdditionEvent.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/reward/RewardEvent.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/reward/RewardRegistrationEvent.java (93%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/trigger/TriggerActionEvent.java (93%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/trigger/TriggerEvent.java (91%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/event/trigger/TriggerRegistrationEvent.java (93%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/game/Game.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/game/GameGoal.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/game/GameRuleProvider.java (99%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/game/GameType.java (98%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/game/GameTypeCache.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/game/GameTypeDefault.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/global/DPortal.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/global/GameSign.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/global/GlobalProtection.java (93%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/global/GlobalProtectionCache.java (98%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/global/GlobalProtectionListener.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/global/GroupSign.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/global/LeaveSign.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/loottable/DLootTable.java (98%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/loottable/DLootTableCache.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/mob/CitizensMobProvider.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/mob/CustomExternalMobProvider.java (98%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/mob/DMob.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/mob/DMobListener.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/mob/DMobType.java (98%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/mob/DMobTypeCache.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/mob/DNPCRegistry.java (99%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/mob/ExternalMobPlugin.java (98%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/mob/ExternalMobProvider.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/mob/ExternalMobProviderCache.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/player/CreateDInstancePlayerTask.java (91%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/player/DClass.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/player/DClassCache.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/player/DEditPlayer.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/player/DGamePlayer.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/player/DGlobalPlayer.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/player/DGroup.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/player/DGroupTag.java (91%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/player/DInstancePlayer.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/player/DPermission.java (99%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/player/DPlayerCache.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/player/DPlayerData.java (99%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/player/DPlayerListener.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/player/LazyUpdateTask.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/player/RespawnTask.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/player/SecureModeTask.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/player/TimeIsRunningTask.java (91%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/player/UpdateTask.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/requirement/FeeLevelRequirement.java (87%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/requirement/FeeMoneyRequirement.java (93%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/requirement/GroupSizeRequirement.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/requirement/PermissionRequirement.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/requirement/Requirement.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/requirement/RequirementType.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/requirement/RequirementTypeCache.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/requirement/RequirementTypeDefault.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/reward/ItemReward.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/reward/LevelReward.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/reward/MoneyReward.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/reward/Reward.java (93%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/reward/RewardListener.java (91%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/reward/RewardType.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/reward/RewardTypeCache.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/reward/RewardTypeDefault.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/BedSign.java (90%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/BlockSign.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/BossShopSign.java (93%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/CheckpointSign.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/ChestSign.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/ChunkUpdaterSign.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/CommandSign.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/DSign.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/DSignListener.java (91%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/DSignType.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/DSignTypeCache.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/DSignTypeDefault.java (84%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/DelayedPowerTask.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/DropSign.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/EndSign.java (90%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/FlagSign.java (91%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/FloorSign.java (90%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/InteractSign.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/LeaveSign.java (88%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/LivesModifierSign.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/LocationSign.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/OpenDoorSign.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/PerPlayerSign.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/PlaceSign.java (89%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/ProtectionSign.java (90%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/RedstoneSign.java (98%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/ResourcePackSign.java (93%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/ScriptSign.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/SignScript.java (98%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/SignScriptCache.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/SignUpdateTask.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/TeleportSign.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/TriggerSign.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/WaveSign.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/lobby/ClassesSign.java (87%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/lobby/LobbySign.java (83%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/lobby/ReadySign.java (88%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/lobby/StartSign.java (86%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/message/ActionBarSign.java (88%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/message/HologramSign.java (91%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/message/MessageSign.java (91%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/message/SoundMessageSign.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/message/TitleSign.java (89%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/mob/DMobSign.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/mob/ExternalMobSign.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/mob/ExternalMobSpawnTask.java (91%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/mob/MobSign.java (98%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/sign/mob/MobSpawnTask.java (93%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/trigger/DistanceTrigger.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/trigger/FortuneTrigger.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/trigger/InteractTrigger.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/trigger/MobTrigger.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/trigger/ProgressTrigger.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/trigger/RedstoneTrigger.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/trigger/SignTrigger.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/trigger/Trigger.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/trigger/TriggerListener.java (91%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/trigger/TriggerType.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/trigger/TriggerTypeCache.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/trigger/TriggerTypeDefault.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/trigger/UseItemTrigger.java (93%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/trigger/WaveTrigger.java (93%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/util/DColor.java (98%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/util/DeserializationUtil.java (98%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/util/GUIUtil.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/util/LegacyUtil.java (98%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/util/NoReload.java (98%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/util/ParsingUtil.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/util/ProgressBar.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/BackupResourceTask.java (93%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/DEditWorld.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/DGameWorld.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/DInstanceWorld.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/DResourceWorld.java (94%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/DWorldCache.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/DWorldListener.java (98%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/SignData.java (98%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/WorldConfig.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/WorldUnloadTask.java (91%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/WorldUpdateTask.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/block/GameBlock.java (96%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/block/LockedDoor.java (97%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/block/MultiBlock.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/block/PlaceableBlock.java (98%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/block/ProtectedBlock.java (95%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/block/RewardChest.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/block/TeamBed.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/block/TeamBlock.java (92%) rename src/main/java/{io/github/dre2n => de/erethon}/dungeonsxl/world/block/TeamFlag.java (88%) diff --git a/pom.xml b/pom.xml index 0a9a3a65..067d939f 100644 --- a/pom.xml +++ b/pom.xml @@ -52,7 +52,7 @@ de.erethon.commons - io.github.dre2n.dungeonsxl.util.commons + de.erethon.dungeonsxl.util.commons diff --git a/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java b/src/main/java/de/erethon/dungeonsxl/DungeonsXL.java similarity index 90% rename from src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java rename to src/main/java/de/erethon/dungeonsxl/DungeonsXL.java index 0a4c759f..c5685dc9 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java +++ b/src/main/java/de/erethon/dungeonsxl/DungeonsXL.java @@ -14,37 +14,37 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl; +package de.erethon.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 de.erethon.dungeonsxl.announcer.AnnouncerCache; +import de.erethon.dungeonsxl.command.DCommandCache; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.config.GlobalData; +import de.erethon.dungeonsxl.config.MainConfig; +import de.erethon.dungeonsxl.dungeon.DungeonCache; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.game.GameTypeCache; +import de.erethon.dungeonsxl.global.GlobalProtectionCache; +import de.erethon.dungeonsxl.loottable.DLootTableCache; +import de.erethon.dungeonsxl.mob.DMobTypeCache; +import de.erethon.dungeonsxl.mob.ExternalMobProviderCache; +import de.erethon.dungeonsxl.player.DClassCache; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.player.DPlayerCache; +import de.erethon.dungeonsxl.requirement.RequirementTypeCache; +import de.erethon.dungeonsxl.reward.RewardTypeCache; +import de.erethon.dungeonsxl.sign.DSignTypeCache; +import de.erethon.dungeonsxl.sign.SignScriptCache; +import de.erethon.dungeonsxl.trigger.TriggerTypeCache; +import de.erethon.dungeonsxl.util.NoReload; +import de.erethon.dungeonsxl.world.DWorldCache; import io.github.dre2n.caliburn.CaliburnAPI; -import io.github.dre2n.dungeonsxl.announcer.AnnouncerCache; -import io.github.dre2n.dungeonsxl.command.DCommandCache; -import io.github.dre2n.dungeonsxl.config.DMessage; -import io.github.dre2n.dungeonsxl.config.GlobalData; -import io.github.dre2n.dungeonsxl.config.MainConfig; -import io.github.dre2n.dungeonsxl.dungeon.DungeonCache; -import io.github.dre2n.dungeonsxl.game.Game; -import io.github.dre2n.dungeonsxl.game.GameTypeCache; -import io.github.dre2n.dungeonsxl.global.GlobalProtectionCache; -import io.github.dre2n.dungeonsxl.loottable.DLootTableCache; -import io.github.dre2n.dungeonsxl.mob.DMobTypeCache; -import io.github.dre2n.dungeonsxl.mob.ExternalMobProviderCache; -import io.github.dre2n.dungeonsxl.player.DClassCache; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.player.DPermission; -import io.github.dre2n.dungeonsxl.player.DPlayerCache; -import io.github.dre2n.dungeonsxl.requirement.RequirementTypeCache; -import io.github.dre2n.dungeonsxl.reward.RewardTypeCache; -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.world.DWorldCache; import java.io.File; import java.util.HashSet; import java.util.List; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcer.java b/src/main/java/de/erethon/dungeonsxl/announcer/Announcer.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcer.java rename to src/main/java/de/erethon/dungeonsxl/announcer/Announcer.java index 0c57f279..11131325 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcer.java +++ b/src/main/java/de/erethon/dungeonsxl/announcer/Announcer.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.announcer; +package de.erethon.dungeonsxl.announcer; 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; -import io.github.dre2n.dungeonsxl.event.dgroup.DGroupCreateEvent; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.util.DColor; -import io.github.dre2n.dungeonsxl.util.GUIUtil; -import io.github.dre2n.dungeonsxl.util.LegacyUtil; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.dungeon.Dungeon; +import de.erethon.dungeonsxl.event.dgroup.DGroupCreateEvent; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.util.DColor; +import de.erethon.dungeonsxl.util.GUIUtil; +import de.erethon.dungeonsxl.util.LegacyUtil; import java.io.File; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/announcer/AnnouncerCache.java b/src/main/java/de/erethon/dungeonsxl/announcer/AnnouncerCache.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/announcer/AnnouncerCache.java rename to src/main/java/de/erethon/dungeonsxl/announcer/AnnouncerCache.java index 1d2f3744..b9f1252d 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/announcer/AnnouncerCache.java +++ b/src/main/java/de/erethon/dungeonsxl/announcer/AnnouncerCache.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.announcer; +package de.erethon.dungeonsxl.announcer; import de.erethon.commons.misc.FileUtil; -import io.github.dre2n.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.DungeonsXL; import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/announcer/AnnouncerListener.java b/src/main/java/de/erethon/dungeonsxl/announcer/AnnouncerListener.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/announcer/AnnouncerListener.java rename to src/main/java/de/erethon/dungeonsxl/announcer/AnnouncerListener.java index bdbf7466..5a160896 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/announcer/AnnouncerListener.java +++ b/src/main/java/de/erethon/dungeonsxl/announcer/AnnouncerListener.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.announcer; +package de.erethon.dungeonsxl.announcer; -import io.github.dre2n.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.DungeonsXL; import org.bukkit.entity.Player; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/announcer/AnnouncerStartGameTask.java b/src/main/java/de/erethon/dungeonsxl/announcer/AnnouncerStartGameTask.java similarity index 89% rename from src/main/java/io/github/dre2n/dungeonsxl/announcer/AnnouncerStartGameTask.java rename to src/main/java/de/erethon/dungeonsxl/announcer/AnnouncerStartGameTask.java index 282169a7..52893f47 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/announcer/AnnouncerStartGameTask.java +++ b/src/main/java/de/erethon/dungeonsxl/announcer/AnnouncerStartGameTask.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.announcer; +package de.erethon.dungeonsxl.announcer; -import io.github.dre2n.dungeonsxl.DungeonsXL; -import io.github.dre2n.dungeonsxl.game.Game; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.util.ProgressBar; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.util.ProgressBar; import java.util.HashSet; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/announcer/AnnouncerTask.java b/src/main/java/de/erethon/dungeonsxl/announcer/AnnouncerTask.java similarity index 89% rename from src/main/java/io/github/dre2n/dungeonsxl/announcer/AnnouncerTask.java rename to src/main/java/de/erethon/dungeonsxl/announcer/AnnouncerTask.java index b531fad5..383c0c4f 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/announcer/AnnouncerTask.java +++ b/src/main/java/de/erethon/dungeonsxl/announcer/AnnouncerTask.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.announcer; +package de.erethon.dungeonsxl.announcer; -import io.github.dre2n.dungeonsxl.DungeonsXL; -import io.github.dre2n.dungeonsxl.player.DGlobalPlayer; -import io.github.dre2n.dungeonsxl.player.DInstancePlayer; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.player.DGlobalPlayer; +import de.erethon.dungeonsxl.player.DInstancePlayer; import java.util.List; import org.bukkit.Bukkit; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/BreakCommand.java b/src/main/java/de/erethon/dungeonsxl/command/BreakCommand.java similarity index 87% rename from src/main/java/io/github/dre2n/dungeonsxl/command/BreakCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/BreakCommand.java index 8d5d4538..05ceafb8 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/BreakCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/BreakCommand.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DGlobalPlayer; +import de.erethon.dungeonsxl.player.DPermission; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ChatCommand.java b/src/main/java/de/erethon/dungeonsxl/command/ChatCommand.java similarity index 85% rename from src/main/java/io/github/dre2n/dungeonsxl/command/ChatCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/ChatCommand.java index 9897a2e8..7fc2cafb 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/ChatCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/ChatCommand.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DGlobalPlayer; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DPermission; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ChatSpyCommand.java b/src/main/java/de/erethon/dungeonsxl/command/ChatSpyCommand.java similarity index 86% rename from src/main/java/io/github/dre2n/dungeonsxl/command/ChatSpyCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/ChatSpyCommand.java index 95e83a48..cb350662 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/ChatSpyCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/ChatSpyCommand.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DGlobalPlayer; +import de.erethon.dungeonsxl.player.DPermission; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/CreateCommand.java b/src/main/java/de/erethon/dungeonsxl/command/CreateCommand.java similarity index 89% rename from src/main/java/io/github/dre2n/dungeonsxl/command/CreateCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/CreateCommand.java index d747de90..9ea09cc9 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/CreateCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/CreateCommand.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; -import io.github.dre2n.dungeonsxl.player.DPermission; -import io.github.dre2n.dungeonsxl.world.DEditWorld; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DEditPlayer; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.world.DResourceWorld; import java.io.File; import org.bukkit.command.CommandSender; import org.bukkit.command.ConsoleCommandSender; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/DCommandCache.java b/src/main/java/de/erethon/dungeonsxl/command/DCommandCache.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/command/DCommandCache.java rename to src/main/java/de/erethon/dungeonsxl/command/DCommandCache.java index cf8c4904..5165c536 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/DCommandCache.java +++ b/src/main/java/de/erethon/dungeonsxl/command/DCommandCache.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; +import de.erethon.dungeonsxl.DungeonsXL; /** * An enumeration of all command instances. diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/DeleteCommand.java b/src/main/java/de/erethon/dungeonsxl/command/DeleteCommand.java similarity index 90% rename from src/main/java/io/github/dre2n/dungeonsxl/command/DeleteCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/DeleteCommand.java index c2b98823..74f3033f 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/DeleteCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/DeleteCommand.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.world.DEditWorld; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; -import io.github.dre2n.dungeonsxl.world.DWorldCache; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.world.DWorldCache; import java.io.File; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.TextComponent; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java b/src/main/java/de/erethon/dungeonsxl/command/DeletePortalCommand.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/DeletePortalCommand.java index f7601119..3d04a9ce 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/DeletePortalCommand.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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 de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.global.DPortal; import java.util.Set; import org.bukkit.Material; import org.bukkit.command.CommandSender; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/EditCommand.java b/src/main/java/de/erethon/dungeonsxl/command/EditCommand.java similarity index 81% rename from src/main/java/io/github/dre2n/dungeonsxl/command/EditCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/EditCommand.java index feb6c451..a707c004 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/EditCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/EditCommand.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.player.DGlobalPlayer; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.player.DInstancePlayer; -import io.github.dre2n.dungeonsxl.player.DPermission; -import io.github.dre2n.dungeonsxl.world.DEditWorld; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; -import io.github.dre2n.dungeonsxl.world.DWorldCache; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DEditPlayer; +import de.erethon.dungeonsxl.player.DGlobalPlayer; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DInstancePlayer; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.world.DWorldCache; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java b/src/main/java/de/erethon/dungeonsxl/command/EnterCommand.java similarity index 90% rename from src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/EnterCommand.java index 2549fbf8..5c0aff9c 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/EnterCommand.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DPermission; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/EscapeCommand.java b/src/main/java/de/erethon/dungeonsxl/command/EscapeCommand.java similarity index 86% rename from src/main/java/io/github/dre2n/dungeonsxl/command/EscapeCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/EscapeCommand.java index ee2782cb..e31c2b05 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/EscapeCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/EscapeCommand.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.player.DPermission; -import io.github.dre2n.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DEditPlayer; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.world.DEditWorld; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/GameCommand.java b/src/main/java/de/erethon/dungeonsxl/command/GameCommand.java similarity index 90% rename from src/main/java/io/github/dre2n/dungeonsxl/command/GameCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/GameCommand.java index 32cfeb10..324fc304 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/GameCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/GameCommand.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.player.DPermission; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/GroupCommand.java b/src/main/java/de/erethon/dungeonsxl/command/GroupCommand.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/command/GroupCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/GroupCommand.java index 1857be2e..7c224fc9 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/GroupCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/GroupCommand.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.event.dgroup.DGroupDisbandEvent; -import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerKickEvent; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.event.dgroup.DGroupCreateEvent; +import de.erethon.dungeonsxl.event.dgroup.DGroupDisbandEvent; +import de.erethon.dungeonsxl.event.dplayer.DPlayerKickEvent; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DPermission; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/HelpCommand.java b/src/main/java/de/erethon/dungeonsxl/command/HelpCommand.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/command/HelpCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/HelpCommand.java index e5f99cfc..c09d78a8 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/HelpCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/HelpCommand.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DPermission; import java.util.ArrayList; import java.util.Set; import org.bukkit.command.CommandSender; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ImportCommand.java b/src/main/java/de/erethon/dungeonsxl/command/ImportCommand.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/command/ImportCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/ImportCommand.java index 35d733e5..e71df57f 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/ImportCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/ImportCommand.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.world.DResourceWorld; import java.io.File; import org.bukkit.Bukkit; import org.bukkit.World; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/InviteCommand.java b/src/main/java/de/erethon/dungeonsxl/command/InviteCommand.java similarity index 88% rename from src/main/java/io/github/dre2n/dungeonsxl/command/InviteCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/InviteCommand.java index 03205907..3042ea21 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/InviteCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/InviteCommand.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.world.DResourceWorld; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/JoinCommand.java b/src/main/java/de/erethon/dungeonsxl/command/JoinCommand.java similarity index 82% rename from src/main/java/io/github/dre2n/dungeonsxl/command/JoinCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/JoinCommand.java index ab2620f8..daaf701f 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/JoinCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/JoinCommand.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.player.DGlobalPlayer; -import io.github.dre2n.dungeonsxl.player.DInstancePlayer; -import io.github.dre2n.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.announcer.Announcer; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DGlobalPlayer; +import de.erethon.dungeonsxl.player.DInstancePlayer; +import de.erethon.dungeonsxl.player.DPermission; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/KickCommand.java b/src/main/java/de/erethon/dungeonsxl/command/KickCommand.java similarity index 88% rename from src/main/java/io/github/dre2n/dungeonsxl/command/KickCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/KickCommand.java index e26cecb5..b46ee92c 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/KickCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/KickCommand.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; +import static de.erethon.dungeonsxl.command.DCommandCache.LEAVE; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DPermission; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/LeaveCommand.java b/src/main/java/de/erethon/dungeonsxl/command/LeaveCommand.java similarity index 80% rename from src/main/java/io/github/dre2n/dungeonsxl/command/LeaveCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/LeaveCommand.java index 7304cb35..1ef466a7 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/LeaveCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/LeaveCommand.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.event.dplayer.instance.game.DGamePlayerEscapeEvent; -import io.github.dre2n.dungeonsxl.game.Game; -import io.github.dre2n.dungeonsxl.player.DEditPlayer; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; -import io.github.dre2n.dungeonsxl.player.DGlobalPlayer; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.player.DInstancePlayer; -import io.github.dre2n.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.event.dplayer.DPlayerLeaveDGroupEvent; +import de.erethon.dungeonsxl.event.dplayer.instance.game.DGamePlayerEscapeEvent; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.player.DEditPlayer; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGlobalPlayer; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DInstancePlayer; +import de.erethon.dungeonsxl.player.DPermission; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ListCommand.java b/src/main/java/de/erethon/dungeonsxl/command/ListCommand.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/command/ListCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/ListCommand.java index bd62a591..322c9059 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/ListCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/ListCommand.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.dungeon.DungeonConfig; -import io.github.dre2n.dungeonsxl.player.DPermission; -import io.github.dre2n.dungeonsxl.world.DEditWorld; -import io.github.dre2n.dungeonsxl.world.DGameWorld; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; -import io.github.dre2n.dungeonsxl.world.DWorldCache; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.dungeon.Dungeon; +import de.erethon.dungeonsxl.dungeon.DungeonConfig; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.world.DWorldCache; import java.io.File; import java.util.ArrayList; import org.bukkit.command.CommandSender; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java b/src/main/java/de/erethon/dungeonsxl/command/LivesCommand.java similarity index 91% rename from src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/LivesCommand.java index 49cf0b90..cfc3bc06 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/LivesCommand.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DPermission; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/MainCommand.java b/src/main/java/de/erethon/dungeonsxl/command/MainCommand.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/command/MainCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/MainCommand.java index c82c77d3..b9a20c17 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/MainCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/MainCommand.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DPermission; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.plugin.PluginManager; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/MsgCommand.java b/src/main/java/de/erethon/dungeonsxl/command/MsgCommand.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/command/MsgCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/MsgCommand.java index ba5e597d..5ee0e7a7 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/MsgCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/MsgCommand.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.world.WorldConfig; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.world.WorldConfig; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java b/src/main/java/de/erethon/dungeonsxl/command/PlayCommand.java similarity index 83% rename from src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/PlayCommand.java index c3ef0e1c..478c41f4 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/PlayCommand.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.event.dgroup.DGroupCreateEvent; -import io.github.dre2n.dungeonsxl.game.Game; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; -import io.github.dre2n.dungeonsxl.player.DGlobalPlayer; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.player.DInstancePlayer; -import io.github.dre2n.dungeonsxl.player.DPermission; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.dungeon.Dungeon; +import de.erethon.dungeonsxl.event.dgroup.DGroupCreateEvent; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGlobalPlayer; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DInstancePlayer; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.world.DResourceWorld; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/PortalCommand.java b/src/main/java/de/erethon/dungeonsxl/command/PortalCommand.java similarity index 87% rename from src/main/java/io/github/dre2n/dungeonsxl/command/PortalCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/PortalCommand.java index daa8aa18..d679710b 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/PortalCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/PortalCommand.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; -import io.github.dre2n.dungeonsxl.player.DGlobalPlayer; -import io.github.dre2n.dungeonsxl.player.DPermission; -import io.github.dre2n.dungeonsxl.util.LegacyUtil; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.global.DPortal; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGlobalPlayer; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.util.LegacyUtil; import org.bukkit.Material; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java b/src/main/java/de/erethon/dungeonsxl/command/ReloadCommand.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/ReloadCommand.java index 4df102f5..8920adbf 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/ReloadCommand.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.player.DInstancePlayer; -import io.github.dre2n.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.event.DataReloadEvent; +import de.erethon.dungeonsxl.player.DInstancePlayer; +import de.erethon.dungeonsxl.player.DPermission; import java.util.List; import net.md_5.bungee.api.chat.ClickEvent; import net.md_5.bungee.api.chat.TextComponent; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommandNoSpigot.java b/src/main/java/de/erethon/dungeonsxl/command/ReloadCommandNoSpigot.java similarity index 91% rename from src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommandNoSpigot.java rename to src/main/java/de/erethon/dungeonsxl/command/ReloadCommandNoSpigot.java index 87f10af0..d084fab0 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommandNoSpigot.java +++ b/src/main/java/de/erethon/dungeonsxl/command/ReloadCommandNoSpigot.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.player.DInstancePlayer; -import io.github.dre2n.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.event.DataReloadEvent; +import de.erethon.dungeonsxl.player.DInstancePlayer; +import de.erethon.dungeonsxl.player.DPermission; import java.util.List; import org.bukkit.Bukkit; import org.bukkit.command.CommandSender; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/RenameCommand.java b/src/main/java/de/erethon/dungeonsxl/command/RenameCommand.java similarity index 87% rename from src/main/java/io/github/dre2n/dungeonsxl/command/RenameCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/RenameCommand.java index 11a6b4f9..fedeb61a 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/RenameCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/RenameCommand.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.dungeon.DungeonConfig; -import io.github.dre2n.dungeonsxl.global.GameSign; -import io.github.dre2n.dungeonsxl.global.GlobalProtection; -import io.github.dre2n.dungeonsxl.global.GroupSign; -import io.github.dre2n.dungeonsxl.player.DPermission; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.dungeon.Dungeon; +import de.erethon.dungeonsxl.dungeon.DungeonConfig; +import de.erethon.dungeonsxl.global.GameSign; +import de.erethon.dungeonsxl.global.GlobalProtection; +import de.erethon.dungeonsxl.global.GroupSign; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.world.DResourceWorld; import java.io.File; import java.io.IOException; import java.util.List; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ResourcePackCommand.java b/src/main/java/de/erethon/dungeonsxl/command/ResourcePackCommand.java similarity index 90% rename from src/main/java/io/github/dre2n/dungeonsxl/command/ResourcePackCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/ResourcePackCommand.java index 0e16cb90..2af529e9 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/ResourcePackCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/ResourcePackCommand.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DPermission; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/SaveCommand.java b/src/main/java/de/erethon/dungeonsxl/command/SaveCommand.java similarity index 84% rename from src/main/java/io/github/dre2n/dungeonsxl/command/SaveCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/SaveCommand.java index 1bf77612..e9f7796d 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/SaveCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/SaveCommand.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.config.MainConfig.BackupMode; -import io.github.dre2n.dungeonsxl.player.DPermission; -import io.github.dre2n.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.config.MainConfig; +import de.erethon.dungeonsxl.config.MainConfig.BackupMode; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.world.DEditWorld; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/StatusCommand.java b/src/main/java/de/erethon/dungeonsxl/command/StatusCommand.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/command/StatusCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/StatusCommand.java index 5f5c5915..5e0961fa 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/StatusCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/StatusCommand.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DPermission; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/TestCommand.java b/src/main/java/de/erethon/dungeonsxl/command/TestCommand.java similarity index 82% rename from src/main/java/io/github/dre2n/dungeonsxl/command/TestCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/TestCommand.java index 18c0b076..1a0948c9 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/TestCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/TestCommand.java @@ -14,22 +14,22 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.game.Game; -import io.github.dre2n.dungeonsxl.game.GameTypeDefault; -import io.github.dre2n.dungeonsxl.player.DEditPlayer; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; -import io.github.dre2n.dungeonsxl.player.DGlobalPlayer; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.player.DPermission; -import io.github.dre2n.dungeonsxl.world.DGameWorld; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.dungeon.Dungeon; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.game.GameTypeDefault; +import de.erethon.dungeonsxl.player.DEditPlayer; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGlobalPlayer; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DResourceWorld; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/UninviteCommand.java b/src/main/java/de/erethon/dungeonsxl/command/UninviteCommand.java similarity index 88% rename from src/main/java/io/github/dre2n/dungeonsxl/command/UninviteCommand.java rename to src/main/java/de/erethon/dungeonsxl/command/UninviteCommand.java index cf6019e8..11ce69e5 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/command/UninviteCommand.java +++ b/src/main/java/de/erethon/dungeonsxl/command/UninviteCommand.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.command; +package de.erethon.dungeonsxl.command; 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; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.world.DResourceWorld; import org.bukkit.Bukkit; import org.bukkit.OfflinePlayer; import org.bukkit.command.CommandSender; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/config/DMessage.java b/src/main/java/de/erethon/dungeonsxl/config/DMessage.java similarity index 99% rename from src/main/java/io/github/dre2n/dungeonsxl/config/DMessage.java rename to src/main/java/de/erethon/dungeonsxl/config/DMessage.java index b0d90833..1b21ab5d 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/config/DMessage.java +++ b/src/main/java/de/erethon/dungeonsxl/config/DMessage.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.config; +package de.erethon.dungeonsxl.config; import de.erethon.commons.chat.MessageUtil; import de.erethon.commons.config.Message; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/config/GlobalData.java b/src/main/java/de/erethon/dungeonsxl/config/GlobalData.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/config/GlobalData.java rename to src/main/java/de/erethon/dungeonsxl/config/GlobalData.java index 0eb33d34..0c049439 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/config/GlobalData.java +++ b/src/main/java/de/erethon/dungeonsxl/config/GlobalData.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.config; +package de.erethon.dungeonsxl.config; 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/de/erethon/dungeonsxl/config/MainConfig.java similarity index 99% rename from src/main/java/io/github/dre2n/dungeonsxl/config/MainConfig.java rename to src/main/java/de/erethon/dungeonsxl/config/MainConfig.java index d2e83253..8e5763c0 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/config/MainConfig.java +++ b/src/main/java/de/erethon/dungeonsxl/config/MainConfig.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.config; +package de.erethon.dungeonsxl.config; 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; +import de.erethon.dungeonsxl.util.DColor; +import static de.erethon.dungeonsxl.util.DColor.*; +import de.erethon.dungeonsxl.world.WorldConfig; import java.io.File; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeon.java b/src/main/java/de/erethon/dungeonsxl/dungeon/Dungeon.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeon.java rename to src/main/java/de/erethon/dungeonsxl/dungeon/Dungeon.java index bf87edfd..02a8b816 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeon.java +++ b/src/main/java/de/erethon/dungeonsxl/dungeon/Dungeon.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.dungeon; +package de.erethon.dungeonsxl.dungeon; -import io.github.dre2n.dungeonsxl.DungeonsXL; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.world.DResourceWorld; import java.io.File; import java.util.ArrayList; import java.util.Arrays; @@ -25,7 +25,7 @@ import java.util.List; /** * Represents a dungeon. - * While multi floor dungeon scripts are represented by {@link io.github.dre2n.dungeonsxl.config.DungeonConfig}, + * While multi floor dungeon scripts are represented by {@link de.erethon.dungeonsxl.config.DungeonConfig}, * single floor dungeons also get a dungeon object without a config file as a placeholder. * * @author Daniel Saukel diff --git a/src/main/java/io/github/dre2n/dungeonsxl/dungeon/DungeonCache.java b/src/main/java/de/erethon/dungeonsxl/dungeon/DungeonCache.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/dungeon/DungeonCache.java rename to src/main/java/de/erethon/dungeonsxl/dungeon/DungeonCache.java index 93eaacd8..c9b0134b 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/dungeon/DungeonCache.java +++ b/src/main/java/de/erethon/dungeonsxl/dungeon/DungeonCache.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.dungeon; +package de.erethon.dungeonsxl.dungeon; import de.erethon.commons.chat.MessageUtil; -import io.github.dre2n.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.config.DMessage; import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/dungeon/DungeonConfig.java b/src/main/java/de/erethon/dungeonsxl/dungeon/DungeonConfig.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/dungeon/DungeonConfig.java rename to src/main/java/de/erethon/dungeonsxl/dungeon/DungeonConfig.java index 607edb56..8d00202b 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/dungeon/DungeonConfig.java +++ b/src/main/java/de/erethon/dungeonsxl/dungeon/DungeonConfig.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.dungeon; +package de.erethon.dungeonsxl.dungeon; 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; -import io.github.dre2n.dungeonsxl.world.WorldConfig; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.world.DWorldCache; +import de.erethon.dungeonsxl.world.WorldConfig; import java.io.File; import java.util.ArrayList; import java.util.List; /** - * Represents a dungeon script. See {@link io.github.dre2n.dungeonsxl.dungeon.Dungeon}. + * Represents a dungeon script. See {@link de.erethon.dungeonsxl.dungeon.Dungeon}. * * @author Daniel Saukel */ diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/DataReloadEvent.java b/src/main/java/de/erethon/dungeonsxl/event/DataReloadEvent.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/event/DataReloadEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/DataReloadEvent.java index f91b0588..dec3cdf3 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/DataReloadEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/DataReloadEvent.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event; +package de.erethon.dungeonsxl.event; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupCreateEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupCreateEvent.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupCreateEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupCreateEvent.java index b0c6b605..07e74d30 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupCreateEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupCreateEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dgroup; +package de.erethon.dungeonsxl.event.dgroup; -import io.github.dre2n.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DGroup; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupDisbandEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupDisbandEvent.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupDisbandEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupDisbandEvent.java index 6fd45ecd..1cc13970 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupDisbandEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupDisbandEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dgroup; +package de.erethon.dungeonsxl.event.dgroup; -import io.github.dre2n.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DGroup; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupEvent.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupEvent.java index a60cb9c8..34600416 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dgroup; +package de.erethon.dungeonsxl.event.dgroup; -import io.github.dre2n.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DGroup; import org.bukkit.event.Event; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupFinishDungeonEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupFinishDungeonEvent.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupFinishDungeonEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupFinishDungeonEvent.java index 25a315c5..c73f80de 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupFinishDungeonEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupFinishDungeonEvent.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dgroup; +package de.erethon.dungeonsxl.event.dgroup; -import io.github.dre2n.dungeonsxl.dungeon.Dungeon; -import io.github.dre2n.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.dungeon.Dungeon; +import de.erethon.dungeonsxl.player.DGroup; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupFinishFloorEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupFinishFloorEvent.java similarity index 91% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupFinishFloorEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupFinishFloorEvent.java index 80cca6b8..f4e36009 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupFinishFloorEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupFinishFloorEvent.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dgroup; +package de.erethon.dungeonsxl.event.dgroup; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.world.DGameWorld; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DResourceWorld; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupRewardEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupRewardEvent.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupRewardEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupRewardEvent.java index 9881b6a1..1ffcb3cf 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupRewardEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupRewardEvent.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dgroup; +package de.erethon.dungeonsxl.event.dgroup; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.reward.Reward; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.reward.Reward; import java.util.ArrayList; import java.util.List; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupScoreEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupScoreEvent.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupScoreEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupScoreEvent.java index b058686f..0c85b19f 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupScoreEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupScoreEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dgroup; +package de.erethon.dungeonsxl.event.dgroup; -import io.github.dre2n.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DGroup; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupStartFloorEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupStartFloorEvent.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupStartFloorEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupStartFloorEvent.java index 66a33edd..d1487fe7 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupStartFloorEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dgroup/DGroupStartFloorEvent.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dgroup; +package de.erethon.dungeonsxl.event.dgroup; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobDeathEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dmob/DMobDeathEvent.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobDeathEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dmob/DMobDeathEvent.java index 284b6d23..1d666024 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobDeathEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dmob/DMobDeathEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dmob; +package de.erethon.dungeonsxl.event.dmob; -import io.github.dre2n.dungeonsxl.mob.DMob; +import de.erethon.dungeonsxl.mob.DMob; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; import org.bukkit.event.entity.EntityDeathEvent; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dmob/DMobEvent.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dmob/DMobEvent.java index 7ae7180a..18b98ebe 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dmob/DMobEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dmob; +package de.erethon.dungeonsxl.event.dmob; -import io.github.dre2n.dungeonsxl.mob.DMob; +import de.erethon.dungeonsxl.mob.DMob; import org.bukkit.event.Event; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobSpawnEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dmob/DMobSpawnEvent.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobSpawnEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dmob/DMobSpawnEvent.java index 3cd46734..3470b7ed 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobSpawnEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dmob/DMobSpawnEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dmob; +package de.erethon.dungeonsxl.event.dmob; -import io.github.dre2n.dungeonsxl.mob.DMob; +import de.erethon.dungeonsxl.mob.DMob; import org.bukkit.entity.LivingEntity; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dplayer/DPlayerEvent.java similarity index 91% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dplayer/DPlayerEvent.java index 6ef5f688..5092ad78 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dplayer/DPlayerEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dplayer; +package de.erethon.dungeonsxl.event.dplayer; -import io.github.dre2n.dungeonsxl.player.DGlobalPlayer; +import de.erethon.dungeonsxl.player.DGlobalPlayer; import org.bukkit.event.Event; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerJoinDGroupEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dplayer/DPlayerJoinDGroupEvent.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerJoinDGroupEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dplayer/DPlayerJoinDGroupEvent.java index 43a05637..4bdc7ef3 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerJoinDGroupEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dplayer/DPlayerJoinDGroupEvent.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dplayer; +package de.erethon.dungeonsxl.event.dplayer; -import io.github.dre2n.dungeonsxl.player.DGlobalPlayer; -import io.github.dre2n.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DGlobalPlayer; +import de.erethon.dungeonsxl.player.DGroup; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerKickEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dplayer/DPlayerKickEvent.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerKickEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dplayer/DPlayerKickEvent.java index a5bd691c..384b9e69 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerKickEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dplayer/DPlayerKickEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dplayer; +package de.erethon.dungeonsxl.event.dplayer; -import io.github.dre2n.dungeonsxl.player.DGlobalPlayer; +import de.erethon.dungeonsxl.player.DGlobalPlayer; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerLeaveDGroupEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dplayer/DPlayerLeaveDGroupEvent.java similarity index 91% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerLeaveDGroupEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dplayer/DPlayerLeaveDGroupEvent.java index f41dce22..323f33a6 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerLeaveDGroupEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dplayer/DPlayerLeaveDGroupEvent.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dplayer; +package de.erethon.dungeonsxl.event.dplayer; -import io.github.dre2n.dungeonsxl.player.DGlobalPlayer; -import io.github.dre2n.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DGlobalPlayer; +import de.erethon.dungeonsxl.player.DGroup; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/DInstancePlayerEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/DInstancePlayerEvent.java similarity index 85% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/DInstancePlayerEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/DInstancePlayerEvent.java index d122c0df..eab85ed2 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/DInstancePlayerEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/DInstancePlayerEvent.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dplayer.instance; +package de.erethon.dungeonsxl.event.dplayer.instance; -import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerEvent; -import io.github.dre2n.dungeonsxl.player.DInstancePlayer; +import de.erethon.dungeonsxl.event.dplayer.DPlayerEvent; +import de.erethon.dungeonsxl.player.DInstancePlayer; /** * @author Daniel Saukel diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/DInstancePlayerUpdateEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/DInstancePlayerUpdateEvent.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/DInstancePlayerUpdateEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/DInstancePlayerUpdateEvent.java index 30480e99..651059fa 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/DInstancePlayerUpdateEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/DInstancePlayerUpdateEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dplayer.instance; +package de.erethon.dungeonsxl.event.dplayer.instance; -import io.github.dre2n.dungeonsxl.player.DInstancePlayer; +import de.erethon.dungeonsxl.player.DInstancePlayer; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/edit/DEditPlayerEscapeEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/edit/DEditPlayerEscapeEvent.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/edit/DEditPlayerEscapeEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/edit/DEditPlayerEscapeEvent.java index 614b4f9f..13febe8f 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/edit/DEditPlayerEscapeEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/edit/DEditPlayerEscapeEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dplayer.instance.edit; +package de.erethon.dungeonsxl.event.dplayer.instance.edit; -import io.github.dre2n.dungeonsxl.player.DEditPlayer; +import de.erethon.dungeonsxl.player.DEditPlayer; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/edit/DEditPlayerEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/edit/DEditPlayerEvent.java similarity index 85% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/edit/DEditPlayerEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/edit/DEditPlayerEvent.java index 1e25bd73..7be515e3 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/edit/DEditPlayerEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/edit/DEditPlayerEvent.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dplayer.instance.edit; +package de.erethon.dungeonsxl.event.dplayer.instance.edit; -import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerEvent; -import io.github.dre2n.dungeonsxl.player.DEditPlayer; +import de.erethon.dungeonsxl.event.dplayer.DPlayerEvent; +import de.erethon.dungeonsxl.player.DEditPlayer; /** * @author Daniel Saukel diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/game/DGamePlayerDeathEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/game/DGamePlayerDeathEvent.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/game/DGamePlayerDeathEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/game/DGamePlayerDeathEvent.java index d6415686..ffdcc1dc 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/game/DGamePlayerDeathEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/game/DGamePlayerDeathEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dplayer.instance.game; +package de.erethon.dungeonsxl.event.dplayer.instance.game; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGamePlayer; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; import org.bukkit.event.entity.PlayerDeathEvent; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/game/DGamePlayerEscapeEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/game/DGamePlayerEscapeEvent.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/game/DGamePlayerEscapeEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/game/DGamePlayerEscapeEvent.java index 1564417a..b1e918af 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/game/DGamePlayerEscapeEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/game/DGamePlayerEscapeEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dplayer.instance.game; +package de.erethon.dungeonsxl.event.dplayer.instance.game; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGamePlayer; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/game/DGamePlayerEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/game/DGamePlayerEvent.java similarity index 85% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/game/DGamePlayerEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/game/DGamePlayerEvent.java index eb2d600c..a7b486bf 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/game/DGamePlayerEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/game/DGamePlayerEvent.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dplayer.instance.game; +package de.erethon.dungeonsxl.event.dplayer.instance.game; -import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerEvent; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.event.dplayer.DPlayerEvent; +import de.erethon.dungeonsxl.player.DGamePlayer; /** * @author Daniel Saukel diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/game/DGamePlayerFinishEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/game/DGamePlayerFinishEvent.java similarity index 93% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/game/DGamePlayerFinishEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/game/DGamePlayerFinishEvent.java index 89e2edbd..10780404 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/instance/game/DGamePlayerFinishEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dplayer/instance/game/DGamePlayerFinishEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dplayer.instance.game; +package de.erethon.dungeonsxl.event.dplayer.instance.game; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGamePlayer; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dsign/DSignEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dsign/DSignEvent.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dsign/DSignEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dsign/DSignEvent.java index d04aee91..363be54f 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dsign/DSignEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dsign/DSignEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dsign; +package de.erethon.dungeonsxl.event.dsign; -import io.github.dre2n.dungeonsxl.sign.DSign; +import de.erethon.dungeonsxl.sign.DSign; import org.bukkit.event.Event; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dsign/DSignRegistrationEvent.java b/src/main/java/de/erethon/dungeonsxl/event/dsign/DSignRegistrationEvent.java similarity index 93% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dsign/DSignRegistrationEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/dsign/DSignRegistrationEvent.java index 4a8c3d69..4f8dec0c 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/dsign/DSignRegistrationEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/dsign/DSignRegistrationEvent.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.dsign; +package de.erethon.dungeonsxl.event.dsign; -import io.github.dre2n.dungeonsxl.sign.DSign; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.sign.DSign; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.block.Sign; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldEvent.java b/src/main/java/de/erethon/dungeonsxl/event/editworld/EditWorldEvent.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/editworld/EditWorldEvent.java index 3db2d397..87a90fb1 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/editworld/EditWorldEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.editworld; +package de.erethon.dungeonsxl.event.editworld; -import io.github.dre2n.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.world.DEditWorld; import org.bukkit.event.Event; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldGenerateEvent.java b/src/main/java/de/erethon/dungeonsxl/event/editworld/EditWorldGenerateEvent.java similarity index 93% rename from src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldGenerateEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/editworld/EditWorldGenerateEvent.java index 197aaea9..b447db1e 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldGenerateEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/editworld/EditWorldGenerateEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.editworld; +package de.erethon.dungeonsxl.event.editworld; -import io.github.dre2n.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.world.DEditWorld; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldLoadEvent.java b/src/main/java/de/erethon/dungeonsxl/event/editworld/EditWorldLoadEvent.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldLoadEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/editworld/EditWorldLoadEvent.java index 219cdbd5..98483b6b 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldLoadEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/editworld/EditWorldLoadEvent.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.editworld; +package de.erethon.dungeonsxl.event.editworld; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldSaveEvent.java b/src/main/java/de/erethon/dungeonsxl/event/editworld/EditWorldSaveEvent.java similarity index 93% rename from src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldSaveEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/editworld/EditWorldSaveEvent.java index 77b17a7e..49fe02f9 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldSaveEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/editworld/EditWorldSaveEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.editworld; +package de.erethon.dungeonsxl.event.editworld; -import io.github.dre2n.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.world.DEditWorld; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldUnloadEvent.java b/src/main/java/de/erethon/dungeonsxl/event/editworld/EditWorldUnloadEvent.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldUnloadEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/editworld/EditWorldUnloadEvent.java index 72f202a5..29e28f7e 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldUnloadEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/editworld/EditWorldUnloadEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.editworld; +package de.erethon.dungeonsxl.event.editworld; -import io.github.dre2n.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.world.DEditWorld; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldEvent.java b/src/main/java/de/erethon/dungeonsxl/event/gameworld/GameWorldEvent.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/gameworld/GameWorldEvent.java index c635441a..a97a3435 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/gameworld/GameWorldEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.gameworld; +package de.erethon.dungeonsxl.event.gameworld; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.event.Event; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldLoadEvent.java b/src/main/java/de/erethon/dungeonsxl/event/gameworld/GameWorldLoadEvent.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldLoadEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/gameworld/GameWorldLoadEvent.java index df2f7907..58dde4de 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldLoadEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/gameworld/GameWorldLoadEvent.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.gameworld; +package de.erethon.dungeonsxl.event.gameworld; import org.bukkit.event.Cancellable; import org.bukkit.event.Event; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldStartGameEvent.java b/src/main/java/de/erethon/dungeonsxl/event/gameworld/GameWorldStartGameEvent.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldStartGameEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/gameworld/GameWorldStartGameEvent.java index 1dfc0d87..7f6ae876 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldStartGameEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/gameworld/GameWorldStartGameEvent.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.gameworld; +package de.erethon.dungeonsxl.event.gameworld; -import io.github.dre2n.dungeonsxl.game.Game; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldUnloadEvent.java b/src/main/java/de/erethon/dungeonsxl/event/gameworld/GameWorldUnloadEvent.java similarity index 93% rename from src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldUnloadEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/gameworld/GameWorldUnloadEvent.java index 466a1796..2dbc2a74 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldUnloadEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/gameworld/GameWorldUnloadEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.gameworld; +package de.erethon.dungeonsxl.event.gameworld; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementCheckEvent.java b/src/main/java/de/erethon/dungeonsxl/event/requirement/RequirementCheckEvent.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementCheckEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/requirement/RequirementCheckEvent.java index 8e24635c..cd341aa7 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementCheckEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/requirement/RequirementCheckEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.requirement; +package de.erethon.dungeonsxl.event.requirement; -import io.github.dre2n.dungeonsxl.requirement.Requirement; +import de.erethon.dungeonsxl.requirement.Requirement; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementDemandEvent.java b/src/main/java/de/erethon/dungeonsxl/event/requirement/RequirementDemandEvent.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementDemandEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/requirement/RequirementDemandEvent.java index ee0cb284..859007a8 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementDemandEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/requirement/RequirementDemandEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.requirement; +package de.erethon.dungeonsxl.event.requirement; -import io.github.dre2n.dungeonsxl.requirement.Requirement; +import de.erethon.dungeonsxl.requirement.Requirement; import org.bukkit.entity.Player; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementEvent.java b/src/main/java/de/erethon/dungeonsxl/event/requirement/RequirementEvent.java similarity index 91% rename from src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/requirement/RequirementEvent.java index 2ff8c4dc..25bbfed3 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/requirement/RequirementEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.requirement; +package de.erethon.dungeonsxl.event.requirement; -import io.github.dre2n.dungeonsxl.requirement.Requirement; +import de.erethon.dungeonsxl.requirement.Requirement; import org.bukkit.event.Event; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementRegistrationEvent.java b/src/main/java/de/erethon/dungeonsxl/event/requirement/RequirementRegistrationEvent.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementRegistrationEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/requirement/RequirementRegistrationEvent.java index d9dea3bf..056bcca6 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementRegistrationEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/requirement/RequirementRegistrationEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.requirement; +package de.erethon.dungeonsxl.event.requirement; -import io.github.dre2n.dungeonsxl.requirement.Requirement; +import de.erethon.dungeonsxl.requirement.Requirement; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardAdditionEvent.java b/src/main/java/de/erethon/dungeonsxl/event/reward/RewardAdditionEvent.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardAdditionEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/reward/RewardAdditionEvent.java index a320fe69..e788db71 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardAdditionEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/reward/RewardAdditionEvent.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.reward; +package de.erethon.dungeonsxl.event.reward; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.reward.Reward; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.reward.Reward; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardEvent.java b/src/main/java/de/erethon/dungeonsxl/event/reward/RewardEvent.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/reward/RewardEvent.java index 02b51401..86c61f3b 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/reward/RewardEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.reward; +package de.erethon.dungeonsxl.event.reward; -import io.github.dre2n.dungeonsxl.reward.Reward; +import de.erethon.dungeonsxl.reward.Reward; import org.bukkit.event.Event; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardRegistrationEvent.java b/src/main/java/de/erethon/dungeonsxl/event/reward/RewardRegistrationEvent.java similarity index 93% rename from src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardRegistrationEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/reward/RewardRegistrationEvent.java index 6bd69bbb..f6e6cdb3 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardRegistrationEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/reward/RewardRegistrationEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.reward; +package de.erethon.dungeonsxl.event.reward; -import io.github.dre2n.dungeonsxl.reward.Reward; +import de.erethon.dungeonsxl.reward.Reward; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerActionEvent.java b/src/main/java/de/erethon/dungeonsxl/event/trigger/TriggerActionEvent.java similarity index 93% rename from src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerActionEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/trigger/TriggerActionEvent.java index 8a19079f..4f115a44 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerActionEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/trigger/TriggerActionEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.trigger; +package de.erethon.dungeonsxl.event.trigger; -import io.github.dre2n.dungeonsxl.trigger.Trigger; +import de.erethon.dungeonsxl.trigger.Trigger; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerEvent.java b/src/main/java/de/erethon/dungeonsxl/event/trigger/TriggerEvent.java similarity index 91% rename from src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/trigger/TriggerEvent.java index 7eb7c908..f4bd6164 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/trigger/TriggerEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.trigger; +package de.erethon.dungeonsxl.event.trigger; -import io.github.dre2n.dungeonsxl.trigger.Trigger; +import de.erethon.dungeonsxl.trigger.Trigger; import org.bukkit.event.Event; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerRegistrationEvent.java b/src/main/java/de/erethon/dungeonsxl/event/trigger/TriggerRegistrationEvent.java similarity index 93% rename from src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerRegistrationEvent.java rename to src/main/java/de/erethon/dungeonsxl/event/trigger/TriggerRegistrationEvent.java index e627616c..7471ed6c 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerRegistrationEvent.java +++ b/src/main/java/de/erethon/dungeonsxl/event/trigger/TriggerRegistrationEvent.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.event.trigger; +package de.erethon.dungeonsxl.event.trigger; -import io.github.dre2n.dungeonsxl.trigger.Trigger; +import de.erethon.dungeonsxl.trigger.Trigger; import org.bukkit.event.Cancellable; import org.bukkit.event.HandlerList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/game/Game.java b/src/main/java/de/erethon/dungeonsxl/game/Game.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/game/Game.java rename to src/main/java/de/erethon/dungeonsxl/game/Game.java index 46320eee..a3334821 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/game/Game.java +++ b/src/main/java/de/erethon/dungeonsxl/game/Game.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.game; +package de.erethon.dungeonsxl.game; 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; -import io.github.dre2n.dungeonsxl.dungeon.DungeonConfig; -import io.github.dre2n.dungeonsxl.global.GameSign; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.sign.DSign; -import io.github.dre2n.dungeonsxl.sign.mob.MobSign; -import io.github.dre2n.dungeonsxl.trigger.ProgressTrigger; -import io.github.dre2n.dungeonsxl.world.DGameWorld; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; -import io.github.dre2n.dungeonsxl.world.WorldConfig; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.dungeon.Dungeon; +import de.erethon.dungeonsxl.dungeon.DungeonConfig; +import de.erethon.dungeonsxl.global.GameSign; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.sign.DSign; +import de.erethon.dungeonsxl.sign.mob.MobSign; +import de.erethon.dungeonsxl.trigger.ProgressTrigger; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.world.WorldConfig; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -41,7 +41,7 @@ import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; /** - * Game mostly stores for which purposes and how a {@link io.github.dre2n.dungeonsxl.dungeon.Dungeon} is used, + * Game mostly stores for which purposes and how a {@link de.erethon.dungeonsxl.dungeon.Dungeon} is used, * the player groups and the progress. * * @author Daniel Saukel diff --git a/src/main/java/io/github/dre2n/dungeonsxl/game/GameGoal.java b/src/main/java/de/erethon/dungeonsxl/game/GameGoal.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/game/GameGoal.java rename to src/main/java/de/erethon/dungeonsxl/game/GameGoal.java index 2f0e7920..09456351 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/game/GameGoal.java +++ b/src/main/java/de/erethon/dungeonsxl/game/GameGoal.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.game; +package de.erethon.dungeonsxl.game; /** * A game goal defines what the players have to do in order to finish the game. diff --git a/src/main/java/io/github/dre2n/dungeonsxl/game/GameRuleProvider.java b/src/main/java/de/erethon/dungeonsxl/game/GameRuleProvider.java similarity index 99% rename from src/main/java/io/github/dre2n/dungeonsxl/game/GameRuleProvider.java rename to src/main/java/de/erethon/dungeonsxl/game/GameRuleProvider.java index d3940615..22e28d96 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/game/GameRuleProvider.java +++ b/src/main/java/de/erethon/dungeonsxl/game/GameRuleProvider.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.game; +package de.erethon.dungeonsxl.game; -import io.github.dre2n.dungeonsxl.requirement.Requirement; -import io.github.dre2n.dungeonsxl.reward.Reward; +import de.erethon.dungeonsxl.requirement.Requirement; +import de.erethon.dungeonsxl.reward.Reward; import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; @@ -32,7 +32,7 @@ import org.bukkit.entity.EntityType; import org.bukkit.inventory.ItemStack; /** - * See {@link io.github.dre2n.dungeonsxl.config.WorldConfig} + * See {@link de.erethon.dungeonsxl.config.WorldConfig} * * @author Daniel Saukel */ diff --git a/src/main/java/io/github/dre2n/dungeonsxl/game/GameType.java b/src/main/java/de/erethon/dungeonsxl/game/GameType.java similarity index 98% rename from src/main/java/io/github/dre2n/dungeonsxl/game/GameType.java rename to src/main/java/de/erethon/dungeonsxl/game/GameType.java index 048b28c4..40c77f87 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/game/GameType.java +++ b/src/main/java/de/erethon/dungeonsxl/game/GameType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.game; +package de.erethon.dungeonsxl.game; import org.bukkit.GameMode; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/game/GameTypeCache.java b/src/main/java/de/erethon/dungeonsxl/game/GameTypeCache.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/game/GameTypeCache.java rename to src/main/java/de/erethon/dungeonsxl/game/GameTypeCache.java index 7eab828e..0cdeae88 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/game/GameTypeCache.java +++ b/src/main/java/de/erethon/dungeonsxl/game/GameTypeCache.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.game; +package de.erethon.dungeonsxl.game; import de.erethon.commons.chat.MessageUtil; -import io.github.dre2n.dungeonsxl.sign.DSign; +import de.erethon.dungeonsxl.sign.DSign; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/game/GameTypeDefault.java b/src/main/java/de/erethon/dungeonsxl/game/GameTypeDefault.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/game/GameTypeDefault.java rename to src/main/java/de/erethon/dungeonsxl/game/GameTypeDefault.java index 20d92e67..9d5579f0 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/game/GameTypeDefault.java +++ b/src/main/java/de/erethon/dungeonsxl/game/GameTypeDefault.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.game; +package de.erethon.dungeonsxl.game; -import static io.github.dre2n.dungeonsxl.game.GameGoal.*; +import static de.erethon.dungeonsxl.game.GameGoal.*; import org.bukkit.GameMode; /** - * Default implementation of {@link io.github.dre2n.dungeonsxl.game.GameType}. + * Default implementation of {@link de.erethon.dungeonsxl.game.GameType}. * * @author Daniel Saukel */ diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/DPortal.java b/src/main/java/de/erethon/dungeonsxl/global/DPortal.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/global/DPortal.java rename to src/main/java/de/erethon/dungeonsxl/global/DPortal.java index 69eecec1..7663641d 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/global/DPortal.java +++ b/src/main/java/de/erethon/dungeonsxl/global/DPortal.java @@ -14,18 +14,18 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.global; +package de.erethon.dungeonsxl.global; 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; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; -import io.github.dre2n.dungeonsxl.player.DGlobalPlayer; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.world.DGameWorld; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGlobalPlayer; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DResourceWorld; import java.util.HashSet; import java.util.Set; import org.bukkit.Location; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/GameSign.java b/src/main/java/de/erethon/dungeonsxl/global/GameSign.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/global/GameSign.java rename to src/main/java/de/erethon/dungeonsxl/global/GameSign.java index 3eba3fba..4de72344 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/global/GameSign.java +++ b/src/main/java/de/erethon/dungeonsxl/global/GameSign.java @@ -14,17 +14,17 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.global; +package de.erethon.dungeonsxl.global; 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; -import io.github.dre2n.dungeonsxl.game.Game; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.util.LegacyUtil; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.dungeon.Dungeon; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.util.LegacyUtil; +import de.erethon.dungeonsxl.world.DResourceWorld; import java.util.HashSet; import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtection.java b/src/main/java/de/erethon/dungeonsxl/global/GlobalProtection.java similarity index 93% rename from src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtection.java rename to src/main/java/de/erethon/dungeonsxl/global/GlobalProtection.java index 60717900..4aeb86be 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtection.java +++ b/src/main/java/de/erethon/dungeonsxl/global/GlobalProtection.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.global; +package de.erethon.dungeonsxl.global; 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; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DGlobalPlayer; import java.io.File; import java.util.Collection; import org.bukkit.World; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtectionCache.java b/src/main/java/de/erethon/dungeonsxl/global/GlobalProtectionCache.java similarity index 98% rename from src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtectionCache.java rename to src/main/java/de/erethon/dungeonsxl/global/GlobalProtectionCache.java index c490567f..c942abf4 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtectionCache.java +++ b/src/main/java/de/erethon/dungeonsxl/global/GlobalProtectionCache.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.global; +package de.erethon.dungeonsxl.global; -import io.github.dre2n.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.DungeonsXL; import java.io.File; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtectionListener.java b/src/main/java/de/erethon/dungeonsxl/global/GlobalProtectionListener.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtectionListener.java rename to src/main/java/de/erethon/dungeonsxl/global/GlobalProtectionListener.java index 1e4e91a4..9b506949 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtectionListener.java +++ b/src/main/java/de/erethon/dungeonsxl/global/GlobalProtectionListener.java @@ -14,17 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.global; +package de.erethon.dungeonsxl.global; 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; -import io.github.dre2n.dungeonsxl.player.DPermission; -import io.github.dre2n.dungeonsxl.util.LegacyUtil; -import io.github.dre2n.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DGlobalPlayer; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.util.LegacyUtil; +import de.erethon.dungeonsxl.world.DEditWorld; import java.util.List; -import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/GroupSign.java b/src/main/java/de/erethon/dungeonsxl/global/GroupSign.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/global/GroupSign.java rename to src/main/java/de/erethon/dungeonsxl/global/GroupSign.java index d0054648..6eb7eb4d 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/global/GroupSign.java +++ b/src/main/java/de/erethon/dungeonsxl/global/GroupSign.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.global; +package de.erethon.dungeonsxl.global; 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; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.util.LegacyUtil; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.dungeon.Dungeon; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.util.LegacyUtil; +import de.erethon.dungeonsxl.world.DResourceWorld; import java.util.HashSet; import java.util.Set; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/LeaveSign.java b/src/main/java/de/erethon/dungeonsxl/global/LeaveSign.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/global/LeaveSign.java rename to src/main/java/de/erethon/dungeonsxl/global/LeaveSign.java index 1348840f..05f11e05 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/global/LeaveSign.java +++ b/src/main/java/de/erethon/dungeonsxl/global/LeaveSign.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.global; +package de.erethon.dungeonsxl.global; 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; -import io.github.dre2n.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGroup; import java.util.HashSet; import java.util.Set; import org.bukkit.ChatColor; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/loottable/DLootTable.java b/src/main/java/de/erethon/dungeonsxl/loottable/DLootTable.java similarity index 98% rename from src/main/java/io/github/dre2n/dungeonsxl/loottable/DLootTable.java rename to src/main/java/de/erethon/dungeonsxl/loottable/DLootTable.java index d9f05e2a..2f0f52a2 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/loottable/DLootTable.java +++ b/src/main/java/de/erethon/dungeonsxl/loottable/DLootTable.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.loottable; +package de.erethon.dungeonsxl.loottable; import io.github.dre2n.caliburn.item.UniversalItemStack; import java.io.File; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/loottable/DLootTableCache.java b/src/main/java/de/erethon/dungeonsxl/loottable/DLootTableCache.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/loottable/DLootTableCache.java rename to src/main/java/de/erethon/dungeonsxl/loottable/DLootTableCache.java index fd1db075..2b28a084 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/loottable/DLootTableCache.java +++ b/src/main/java/de/erethon/dungeonsxl/loottable/DLootTableCache.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.loottable; +package de.erethon.dungeonsxl.loottable; import de.erethon.commons.misc.FileUtil; import java.io.File; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/CitizensMobProvider.java b/src/main/java/de/erethon/dungeonsxl/mob/CitizensMobProvider.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/CitizensMobProvider.java rename to src/main/java/de/erethon/dungeonsxl/mob/CitizensMobProvider.java index 32a62774..bed5103b 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/mob/CitizensMobProvider.java +++ b/src/main/java/de/erethon/dungeonsxl/mob/CitizensMobProvider.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.mob; +package de.erethon.dungeonsxl.mob; import de.erethon.commons.misc.NumberUtil; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DGameWorld; import java.util.HashSet; import java.util.Set; import net.citizensnpcs.api.CitizensAPI; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/CustomExternalMobProvider.java b/src/main/java/de/erethon/dungeonsxl/mob/CustomExternalMobProvider.java similarity index 98% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/CustomExternalMobProvider.java rename to src/main/java/de/erethon/dungeonsxl/mob/CustomExternalMobProvider.java index 515d2d92..e32e2c8f 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/mob/CustomExternalMobProvider.java +++ b/src/main/java/de/erethon/dungeonsxl/mob/CustomExternalMobProvider.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.mob; +package de.erethon.dungeonsxl.mob; import java.util.Map.Entry; import org.bukkit.Bukkit; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/DMob.java b/src/main/java/de/erethon/dungeonsxl/mob/DMob.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/DMob.java rename to src/main/java/de/erethon/dungeonsxl/mob/DMob.java index 388eb4e5..95b41c5b 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/mob/DMob.java +++ b/src/main/java/de/erethon/dungeonsxl/mob/DMob.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.mob; +package de.erethon.dungeonsxl.mob; -import io.github.dre2n.dungeonsxl.event.dmob.DMobDeathEvent; -import io.github.dre2n.dungeonsxl.event.dmob.DMobSpawnEvent; -import io.github.dre2n.dungeonsxl.game.Game; -import io.github.dre2n.dungeonsxl.trigger.MobTrigger; -import io.github.dre2n.dungeonsxl.trigger.WaveTrigger; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.event.dmob.DMobDeathEvent; +import de.erethon.dungeonsxl.event.dmob.DMobSpawnEvent; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.trigger.MobTrigger; +import de.erethon.dungeonsxl.trigger.WaveTrigger; +import de.erethon.dungeonsxl.world.DGameWorld; import java.util.Random; import java.util.Set; import org.bukkit.Bukkit; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/DMobListener.java b/src/main/java/de/erethon/dungeonsxl/mob/DMobListener.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/DMobListener.java rename to src/main/java/de/erethon/dungeonsxl/mob/DMobListener.java index a7336930..9bdfb79f 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/mob/DMobListener.java +++ b/src/main/java/de/erethon/dungeonsxl/mob/DMobListener.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.mob; +package de.erethon.dungeonsxl.mob; -import io.github.dre2n.dungeonsxl.world.DEditWorld; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.World; import org.bukkit.entity.LivingEntity; import org.bukkit.event.EventHandler; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/DMobType.java b/src/main/java/de/erethon/dungeonsxl/mob/DMobType.java similarity index 98% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/DMobType.java rename to src/main/java/de/erethon/dungeonsxl/mob/DMobType.java index 9b3ed9c9..2c77ea67 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/mob/DMobType.java +++ b/src/main/java/de/erethon/dungeonsxl/mob/DMobType.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.mob; +package de.erethon.dungeonsxl.mob; 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; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.util.LegacyUtil; +import de.erethon.dungeonsxl.world.DGameWorld; import java.io.File; import java.util.Arrays; import java.util.HashMap; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/DMobTypeCache.java b/src/main/java/de/erethon/dungeonsxl/mob/DMobTypeCache.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/DMobTypeCache.java rename to src/main/java/de/erethon/dungeonsxl/mob/DMobTypeCache.java index 7d8f9ac3..9f6fb512 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/mob/DMobTypeCache.java +++ b/src/main/java/de/erethon/dungeonsxl/mob/DMobTypeCache.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.mob; +package de.erethon.dungeonsxl.mob; import de.erethon.commons.misc.FileUtil; -import io.github.dre2n.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.DungeonsXL; import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/DNPCRegistry.java b/src/main/java/de/erethon/dungeonsxl/mob/DNPCRegistry.java similarity index 99% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/DNPCRegistry.java rename to src/main/java/de/erethon/dungeonsxl/mob/DNPCRegistry.java index 49db26cd..0f0bacc9 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/mob/DNPCRegistry.java +++ b/src/main/java/de/erethon/dungeonsxl/mob/DNPCRegistry.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.mob; +package de.erethon.dungeonsxl.mob; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobPlugin.java b/src/main/java/de/erethon/dungeonsxl/mob/ExternalMobPlugin.java similarity index 98% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobPlugin.java rename to src/main/java/de/erethon/dungeonsxl/mob/ExternalMobPlugin.java index 8dfd4cf6..4d76931e 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobPlugin.java +++ b/src/main/java/de/erethon/dungeonsxl/mob/ExternalMobPlugin.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.mob; +package de.erethon.dungeonsxl.mob; import org.bukkit.Bukkit; import org.bukkit.Location; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProvider.java b/src/main/java/de/erethon/dungeonsxl/mob/ExternalMobProvider.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProvider.java rename to src/main/java/de/erethon/dungeonsxl/mob/ExternalMobProvider.java index b9907e6b..6baacf5d 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProvider.java +++ b/src/main/java/de/erethon/dungeonsxl/mob/ExternalMobProvider.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.mob; +package de.erethon.dungeonsxl.mob; import org.bukkit.Location; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProviderCache.java b/src/main/java/de/erethon/dungeonsxl/mob/ExternalMobProviderCache.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProviderCache.java rename to src/main/java/de/erethon/dungeonsxl/mob/ExternalMobProviderCache.java index ade067cb..cd6fd07d 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProviderCache.java +++ b/src/main/java/de/erethon/dungeonsxl/mob/ExternalMobProviderCache.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.mob; +package de.erethon.dungeonsxl.mob; import de.erethon.commons.chat.MessageUtil; -import io.github.dre2n.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.DungeonsXL; import java.util.Arrays; import java.util.HashSet; import java.util.Map.Entry; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/CreateDInstancePlayerTask.java b/src/main/java/de/erethon/dungeonsxl/player/CreateDInstancePlayerTask.java similarity index 91% rename from src/main/java/io/github/dre2n/dungeonsxl/player/CreateDInstancePlayerTask.java rename to src/main/java/de/erethon/dungeonsxl/player/CreateDInstancePlayerTask.java index 7bfbf541..53b8b440 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/CreateDInstancePlayerTask.java +++ b/src/main/java/de/erethon/dungeonsxl/player/CreateDInstancePlayerTask.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.player; +package de.erethon.dungeonsxl.player; 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; -import io.github.dre2n.dungeonsxl.world.DInstanceWorld; +import de.erethon.dungeonsxl.game.GameType; +import de.erethon.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DInstanceWorld; import java.util.UUID; import org.bukkit.Bukkit; import org.bukkit.ChatColor; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DClass.java b/src/main/java/de/erethon/dungeonsxl/player/DClass.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DClass.java rename to src/main/java/de/erethon/dungeonsxl/player/DClass.java index 3fbe0c6d..63a10295 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DClass.java +++ b/src/main/java/de/erethon/dungeonsxl/player/DClass.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.player; +package de.erethon.dungeonsxl.player; import de.erethon.commons.compatibility.CompatibilityHandler; import de.erethon.commons.compatibility.Version; +import de.erethon.dungeonsxl.util.DeserializationUtil; import io.github.dre2n.caliburn.item.UniversalItemStack; -import io.github.dre2n.dungeonsxl.util.DeserializationUtil; import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DClassCache.java b/src/main/java/de/erethon/dungeonsxl/player/DClassCache.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DClassCache.java rename to src/main/java/de/erethon/dungeonsxl/player/DClassCache.java index 63812dc3..3774f37b 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DClassCache.java +++ b/src/main/java/de/erethon/dungeonsxl/player/DClassCache.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.player; +package de.erethon.dungeonsxl.player; import de.erethon.commons.misc.FileUtil; import java.io.File; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DEditPlayer.java b/src/main/java/de/erethon/dungeonsxl/player/DEditPlayer.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DEditPlayer.java rename to src/main/java/de/erethon/dungeonsxl/player/DEditPlayer.java index ff86e6c4..51c663d3 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DEditPlayer.java +++ b/src/main/java/de/erethon/dungeonsxl/player/DEditPlayer.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.player; +package de.erethon.dungeonsxl.player; 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; -import io.github.dre2n.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.event.dplayer.instance.DInstancePlayerUpdateEvent; +import de.erethon.dungeonsxl.world.DEditWorld; import java.util.concurrent.CopyOnWriteArrayList; import org.bukkit.Bukkit; import org.bukkit.GameMode; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java b/src/main/java/de/erethon/dungeonsxl/player/DGamePlayer.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java rename to src/main/java/de/erethon/dungeonsxl/player/DGamePlayer.java index f94491e7..2bbc7282 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java +++ b/src/main/java/de/erethon/dungeonsxl/player/DGamePlayer.java @@ -14,31 +14,31 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.player; +package de.erethon.dungeonsxl.player; 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.dungeon.Dungeon; -import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerKickEvent; -import io.github.dre2n.dungeonsxl.event.dplayer.instance.DInstancePlayerUpdateEvent; -import io.github.dre2n.dungeonsxl.event.dplayer.instance.game.DGamePlayerDeathEvent; -import io.github.dre2n.dungeonsxl.event.dplayer.instance.game.DGamePlayerFinishEvent; -import io.github.dre2n.dungeonsxl.event.requirement.RequirementCheckEvent; -import io.github.dre2n.dungeonsxl.game.Game; -import io.github.dre2n.dungeonsxl.game.GameGoal; -import io.github.dre2n.dungeonsxl.game.GameRuleProvider; -import io.github.dre2n.dungeonsxl.game.GameType; -import io.github.dre2n.dungeonsxl.game.GameTypeDefault; -import io.github.dre2n.dungeonsxl.mob.DMob; -import io.github.dre2n.dungeonsxl.requirement.Requirement; -import io.github.dre2n.dungeonsxl.reward.Reward; -import io.github.dre2n.dungeonsxl.trigger.DistanceTrigger; -import io.github.dre2n.dungeonsxl.util.LegacyUtil; -import io.github.dre2n.dungeonsxl.world.DGameWorld; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; -import io.github.dre2n.dungeonsxl.world.block.TeamFlag; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.dungeon.Dungeon; +import de.erethon.dungeonsxl.event.dplayer.DPlayerKickEvent; +import de.erethon.dungeonsxl.event.dplayer.instance.DInstancePlayerUpdateEvent; +import de.erethon.dungeonsxl.event.dplayer.instance.game.DGamePlayerDeathEvent; +import de.erethon.dungeonsxl.event.dplayer.instance.game.DGamePlayerFinishEvent; +import de.erethon.dungeonsxl.event.requirement.RequirementCheckEvent; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.game.GameGoal; +import de.erethon.dungeonsxl.game.GameRuleProvider; +import de.erethon.dungeonsxl.game.GameType; +import de.erethon.dungeonsxl.game.GameTypeDefault; +import de.erethon.dungeonsxl.mob.DMob; +import de.erethon.dungeonsxl.requirement.Requirement; +import de.erethon.dungeonsxl.reward.Reward; +import de.erethon.dungeonsxl.trigger.DistanceTrigger; +import de.erethon.dungeonsxl.util.LegacyUtil; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.world.block.TeamFlag; import java.io.File; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DGlobalPlayer.java b/src/main/java/de/erethon/dungeonsxl/player/DGlobalPlayer.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DGlobalPlayer.java rename to src/main/java/de/erethon/dungeonsxl/player/DGlobalPlayer.java index 633c8f0c..2c238505 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DGlobalPlayer.java +++ b/src/main/java/de/erethon/dungeonsxl/player/DGlobalPlayer.java @@ -14,21 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.player; +package de.erethon.dungeonsxl.player; import de.erethon.commons.chat.MessageUtil; import de.erethon.commons.compatibility.CompatibilityHandler; import de.erethon.commons.compatibility.Internals; -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; -import io.github.dre2n.dungeonsxl.game.Game; -import io.github.dre2n.dungeonsxl.global.DPortal; -import io.github.dre2n.dungeonsxl.world.DGameWorld; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.event.dgroup.DGroupCreateEvent; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.global.DPortal; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DResourceWorld; import java.io.File; import java.util.List; import java.util.UUID; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DGroup.java b/src/main/java/de/erethon/dungeonsxl/player/DGroup.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DGroup.java rename to src/main/java/de/erethon/dungeonsxl/player/DGroup.java index a1277e38..75e9e5f4 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DGroup.java +++ b/src/main/java/de/erethon/dungeonsxl/player/DGroup.java @@ -1,988 +1,988 @@ -/* - * Copyright (C) 2012-2018 Frank Baumann - * - * 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.player; - -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; -import io.github.dre2n.dungeonsxl.dungeon.DungeonConfig; -import io.github.dre2n.dungeonsxl.event.dgroup.DGroupDisbandEvent; -import io.github.dre2n.dungeonsxl.event.dgroup.DGroupFinishDungeonEvent; -import io.github.dre2n.dungeonsxl.event.dgroup.DGroupFinishFloorEvent; -import io.github.dre2n.dungeonsxl.event.dgroup.DGroupRewardEvent; -import io.github.dre2n.dungeonsxl.event.dgroup.DGroupStartFloorEvent; -import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerJoinDGroupEvent; -import io.github.dre2n.dungeonsxl.event.requirement.RequirementDemandEvent; -import io.github.dre2n.dungeonsxl.event.reward.RewardAdditionEvent; -import io.github.dre2n.dungeonsxl.game.Game; -import io.github.dre2n.dungeonsxl.game.GameRuleProvider; -import io.github.dre2n.dungeonsxl.global.GroupSign; -import io.github.dre2n.dungeonsxl.requirement.Requirement; -import io.github.dre2n.dungeonsxl.reward.Reward; -import io.github.dre2n.dungeonsxl.util.DColor; -import io.github.dre2n.dungeonsxl.world.DGameWorld; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; -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; -import org.bukkit.entity.Player; -import org.bukkit.scheduler.BukkitTask; - -/** - * Represents a group of players. - * - * @author Frank Baumann, Daniel Saukel - */ -public class DGroup { - - DungeonsXL plugin = DungeonsXL.getInstance(); - DPlayerCache dPlayers = plugin.getDPlayers(); - - private String name; - private Player captain; - private PlayerCollection players = new PlayerCollection(); - private PlayerCollection invitedPlayers = new PlayerCollection(); - private Dungeon dungeon; - private List unplayedFloors = new ArrayList<>(); - private DGameWorld gameWorld; - private boolean playing; - private int floorCount; - private List rewards = new ArrayList<>(); - private BukkitTask timeIsRunningTask; - private DResourceWorld nextFloor; - private DColor color; - private int score = 0; - private int initialLives = -1; - private int lives = -1; - - public DGroup(Player player) { - this("Group " + DungeonsXL.getInstance().getDGroups().size(), player); - } - - public DGroup(Player player, DColor color) { - this(color.toString().replace("_", " "), player); - } - - public DGroup(String name, Player player) { - plugin.getDGroups().add(this); - this.name = name; - - setCaptain(player); - addPlayer(player); - - playing = false; - floorCount = 0; - } - - @Deprecated - public DGroup(Player player, String identifier, boolean multiFloor) { - this(DungeonsXL.getInstance().getMainConfig().getGroupColorPriority().get(DungeonsXL.getInstance().getDGroups().size()).toString(), player, identifier, multiFloor); - } - - @Deprecated - public DGroup(String name, Player player, String identifier, boolean multiFloor) { - this(name, player, new ArrayList(), identifier, multiFloor); - } - - @Deprecated - public DGroup(String name, Player captain, List players, String identifier, boolean multiFloor) { - plugin.getDGroups().add(this); - this.name = name; - - DPlayerJoinDGroupEvent event = new DPlayerJoinDGroupEvent(plugin.getDPlayers().getByPlayer(captain), true, this); - Bukkit.getPluginManager().callEvent(event); - - if (!event.isCancelled()) { - this.captain = captain; - this.players.add(captain); - } - - for (Player player : players) { - if (!this.players.contains(player.getUniqueId())) { - addPlayer(player); - } - } - - dungeon = plugin.getDungeons().getByName(identifier); - if (multiFloor && dungeon != null) { - // Real dungeon - unplayedFloors = new ArrayList<>(dungeon.getConfig().getFloors()); - - } else { - // Artificial dungeon - DResourceWorld resource = plugin.getDWorlds().getResourceByName(identifier); - dungeon = new Dungeon(resource); - } - - playing = false; - floorCount = 0; - } - - public DGroup(Player player, Dungeon dungeon) { - this(DungeonsXL.getInstance().getMainConfig().getGroupColorPriority().get(DungeonsXL.getInstance().getDGroups().size()).toString(), player, dungeon); - } - - public DGroup(String name, Player player, Dungeon dungeon) { - this(name, player, new ArrayList(), dungeon); - } - - public DGroup(String name, Player captain, List players, Dungeon dungeon) { - plugin.getDGroups().add(this); - this.name = name; - - DPlayerJoinDGroupEvent event = new DPlayerJoinDGroupEvent(plugin.getDPlayers().getByPlayer(captain), true, this); - Bukkit.getPluginManager().callEvent(event); - - if (!event.isCancelled()) { - this.captain = captain; - this.players.add(captain); - } - - for (Player player : players) { - if (!this.players.contains(player)) { - addPlayer(player); - } - } - - setDungeon(dungeon); - playing = false; - floorCount = 0; - } - - // Getters and setters - /** - * @return the name; formatted - */ - public String getName() { - return (color != null ? color.getChatColor().toString() : new String()) + name; - } - - /** - * @return the name; not formatted - */ - public String getRawName() { - return name; - } - - /** - * @param name - * the name to set - */ - public void setName(String name) { - this.name = name; - } - - /** - * @param name - * the name to set - */ - public void setName(DColor color) { - name = color.toString().replace("_", " "); - } - - /** - * @return the captain - */ - public Player getCaptain() { - return captain; - } - - /** - * @param captain - * the captain to set - */ - public void setCaptain(Player captain) { - this.captain = captain; - } - - /** - * @return the players - */ - public PlayerCollection getPlayers() { - return players; - } - - /** - * @return the players as a Set - */ - public Set getDGlobalPlayers() { - Set players = new HashSet<>(); - for (UUID uuid : this.players.getUniqueIds()) { - players.add(dPlayers.getByUniqueId(uuid)); - } - return players; - } - - /** - * @return the players as a Set - */ - public Set getDGamePlayers() { - Set players = new HashSet<>(); - for (UUID uuid : this.players.getUniqueIds()) { - DGlobalPlayer dPlayer = dPlayers.getByUniqueId(uuid); - if (dPlayer instanceof DGamePlayer) { - players.add((DGamePlayer) dPlayer); - } - } - return players; - } - - /** - * Sends messages by default. - * - * @param player - * the player to add - */ - public void addPlayer(Player player) { - addPlayer(player, true); - } - - /** - * @param player - * the player to add - * @param message - * if messages should be sent - */ - public void addPlayer(Player player, boolean message) { - DPlayerJoinDGroupEvent event = new DPlayerJoinDGroupEvent(DGamePlayer.getByPlayer(player), false, this); - Bukkit.getPluginManager().callEvent(event); - - if (!event.isCancelled()) { - if (message) { - sendMessage(DMessage.GROUP_PLAYER_JOINED.getMessage(player.getName())); - MessageUtil.sendMessage(player, DMessage.PLAYER_JOIN_GROUP.getMessage()); - } - - players.add(player.getUniqueId()); - } - } - - /** - * Sends messages by default. - * - * @param player - * the player to remove - */ - public void removePlayer(Player player) { - removePlayer(player, true); - } - - /** - * @param player - * the player to remove - * @param message - * if messages should be sent - */ - public void removePlayer(Player player, boolean message) { - players.remove(player.getUniqueId()); - GroupSign.updatePerGroup(this); - - if (message) { - sendMessage(DMessage.PLAYER_LEFT_GROUP.getMessage(player.getName())); - } - - if (isEmpty()) { - DGroupDisbandEvent event = new DGroupDisbandEvent(this, player, DGroupDisbandEvent.Cause.GROUP_IS_EMPTY); - Bukkit.getPluginManager().callEvent(event); - - if (!event.isCancelled()) { - delete(); - } - } - } - - /** - * @return the players - */ - public PlayerCollection getInvitedPlayers() { - return invitedPlayers; - } - - /** - * @param player - * the player to add - */ - public void addInvitedPlayer(Player player, boolean silent) { - if (player == null) { - return; - } - - if (DGroup.getByPlayer(player) != null) { - if (!silent) { - MessageUtil.sendMessage(getCaptain(), DMessage.ERROR_IN_GROUP.getMessage(player.getName())); - } - return; - } - - if (!silent) { - MessageUtil.sendMessage(player, DMessage.PLAYER_INVITED.getMessage(getCaptain().getName(), name)); - } - - // Send message - if (!silent) { - sendMessage(DMessage.GROUP_INVITED_PLAYER.getMessage(getCaptain().getName(), player.getName(), name)); - } - - // Add player - invitedPlayers.add(player.getUniqueId()); - } - - /** - * @param player - * the player to remove - */ - public void removeInvitedPlayer(Player player, boolean silent) { - if (player == null) { - return; - } - - if (DGroup.getByPlayer(player) != this) { - if (!silent) { - MessageUtil.sendMessage(getCaptain(), DMessage.ERROR_NOT_IN_GROUP.getMessage(player.getName(), name)); - } - return; - } - - if (!silent) { - MessageUtil.sendMessage(player, DMessage.PLAYER_UNINVITED.getMessage(player.getName(), name)); - } - - // Send message - if (!silent) { - for (Player groupPlayer : players.getOnlinePlayers()) { - MessageUtil.sendMessage(groupPlayer, DMessage.GROUP_UNINVITED_PLAYER.getMessage(getCaptain().getName(), player.getName(), name)); - } - } - - invitedPlayers.remove(player.getUniqueId()); - } - - /** - * Remove all invitations for players who are not online - */ - public void clearOfflineInvitedPlayers() { - ArrayList toRemove = new ArrayList<>(); - for (UUID uuid : invitedPlayers.getUniqueIds()) { - if (Bukkit.getPlayer(uuid) == null) { - toRemove.add(uuid); - } - } - invitedPlayers.removeAll(toRemove); - } - - /** - * @return the gameWorld - */ - public DGameWorld getGameWorld() { - return gameWorld; - } - - /** - * @param gameWorld - * the gameWorld to set - */ - public void setGameWorld(DGameWorld gameWorld) { - this.gameWorld = gameWorld; - } - - /** - * @return the dungeon - */ - public Dungeon getDungeon() { - return dungeon; - } - - /** - * Sets up all dungeon-related fields. - * - * @param dungeon - * the dungeon to set - */ - public void setDungeon(Dungeon dungeon) { - this.dungeon = dungeon; - if (dungeon.isMultiFloor()) { - unplayedFloors = new ArrayList<>(dungeon.getConfig().getFloors()); - } - } - - /** - * Sets up all dungeon-related fields. - * - * @param name - * the name of the dungeon - */ - public boolean setDungeon(String name) { - dungeon = plugin.getDungeons().getByName(name); - if (dungeon != null) { - unplayedFloors = dungeon.getConfig().getFloors(); - return true; - - } else { - DResourceWorld resource = plugin.getDWorlds().getResourceByName(name); - if (resource != null) { - dungeon = new Dungeon(resource); - return true; - } - return false; - } - } - - /** - * @return the dungeonName - */ - public String getDungeonName() { - return dungeon.getName(); - } - - /** - * @return if the group is playing - */ - public String getMapName() { - return gameWorld == null ? null : gameWorld.getName(); - } - - /** - * @return the unplayed floors - */ - public List getUnplayedFloors() { - return unplayedFloors; - } - - /** - * @param unplayedFloor - * the unplayed floor to add - */ - public void addUnplayedFloor(DResourceWorld unplayedFloor) { - unplayedFloors.add(unplayedFloor); - } - - /** - * @param unplayedFloor - * the unplayed floor to remove - * @param force - * remove the floor even if removeWhenPlayed is disabled - */ - public void removeUnplayedFloor(DResourceWorld unplayedFloor, boolean force) { - if (getDungeon().getConfig().getRemoveWhenPlayed() || force) { - unplayedFloors.remove(unplayedFloor); - } - } - - /** - * @return if the group is playing - */ - public boolean isPlaying() { - return playing; - } - - /** - * @param playing - * set if the group is playing - */ - public void setPlaying(boolean playing) { - this.playing = playing; - } - - /** - * @return the floorCount - */ - public int getFloorCount() { - return floorCount; - } - - /** - * @param floorCount - * the floorCount to set - */ - public void setFloorCount(int floorCount) { - this.floorCount = floorCount; - } - - /** - * @return the rewards - */ - public List getRewards() { - return rewards; - } - - /** - * @param reward - * the rewards to add - */ - public void addReward(Reward reward) { - RewardAdditionEvent event = new RewardAdditionEvent(reward, this); - Bukkit.getPluginManager().callEvent(event); - - if (event.isCancelled()) { - return; - } - - rewards.add(reward); - } - - /** - * @param reward - * the rewards to remove - */ - public void removeReward(Reward reward) { - rewards.remove(reward); - } - - /** - * @return the "Time is Running" task of the game - */ - public BukkitTask getTimeIsRunningTask() { - return timeIsRunningTask; - } - - /** - * @param task - * the task to set - */ - public void setTimeIsRunningTask(BukkitTask task) { - this.timeIsRunningTask = task; - } - - /** - * @return whether there are players in the group - */ - public boolean isEmpty() { - return players.size() == 0; - } - - /** - * @return if the group has been customized with a command - */ - public boolean isCustom() { - return !name.matches("Group_[0-9]{1,}"); - } - - /** - * @return the next floor the group will enter - */ - public DResourceWorld getNextFloor() { - return nextFloor; - } - - /** - * @param floor - * the next floor to set - */ - public void setNextFloor(DResourceWorld floor) { - nextFloor = floor; - } - - /** - * @return the color that represents this group - */ - public DColor getDColor() { - if (color != null) { - return color; - } else { - return DColor.DEFAULT; - } - } - - /** - * @param color the group color to set - */ - public void setDColor(DColor color) { - this.color = color; - } - - /** - * @return the current score - */ - public int getScore() { - return score; - } - - /** - * @param score - * the score to set - */ - public void setScore(int score) { - this.score = score; - } - - /** - * @return the initial group lives - */ - public int getInitialLives() { - return initialLives; - } - - /** - * @param initialLives - * the initial group lives to set - */ - public void setInitialLives(int initialLives) { - this.initialLives = initialLives; - } - - /** - * @return the group lives - */ - public int getLives() { - return lives; - } - - /** - * @param lives - * the group lives to set - */ - public void setLives(int lives) { - this.lives = lives; - } - - /** - * @return true if all players are finished - */ - public boolean isFinished() { - for (DGamePlayer dPlayer : getDGamePlayers()) { - if (!dPlayer.isFinished()) { - return false; - } - } - return true; - } - - /* Actions */ - /** - * The group finishs the dungeon. - */ - public void finish() { - DGroupFinishDungeonEvent dGroupFinishDungeonEvent = new DGroupFinishDungeonEvent(dungeon, this); - Bukkit.getPluginManager().callEvent(dGroupFinishDungeonEvent); - if (dGroupFinishDungeonEvent.isCancelled()) { - return; - } - - Game.getByDGroup(this).resetWaveKills(); - DGroupRewardEvent dGroupRewardEvent = new DGroupRewardEvent(this); - Bukkit.getPluginManager().callEvent(dGroupRewardEvent); - for (DGamePlayer player : getDGamePlayers()) { - player.leave(false); - if (!dGroupRewardEvent.isCancelled()) { - for (Reward reward : rewards) { - reward.giveTo(player.getPlayer()); - } - } - } - } - - /** - * The group finishs the current floor. - * - * @param specifiedFloor - * the name of the next floor - */ - public void finishFloor(DResourceWorld specifiedFloor) { - DungeonConfig dConfig = dungeon.getConfig(); - int floorsLeft = getUnplayedFloors().size(); - DResourceWorld newFloor = null; - DGameWorld.Type type = null; - if (gameWorld.getType() == DGameWorld.Type.END_FLOOR) { - finish(); - return; - } else if (specifiedFloor != null) { - newFloor = specifiedFloor; - type = DGameWorld.Type.DEFAULT; - } else if (floorsLeft > 0) { - int random = new Random().nextInt(floorsLeft); - newFloor = getUnplayedFloors().get(random); - type = DGameWorld.Type.DEFAULT; - } else { - newFloor = dConfig.getEndFloor(); - type = DGameWorld.Type.END_FLOOR; - } - - DGroupFinishFloorEvent event = new DGroupFinishFloorEvent(this, gameWorld, newFloor); - Bukkit.getPluginManager().callEvent(event); - if (event.isCancelled()) { - return; - } - - Game game = gameWorld.getGame(); - removeUnplayedFloor(gameWorld.getResource(), false); - DGameWorld gameWorld = newFloor.instantiateAsGameWorld(); - gameWorld.setType(type); - this.gameWorld = gameWorld; - game.setWorld(gameWorld); - - for (DGamePlayer player : getDGamePlayers()) { - player.setWorld(gameWorld.getWorld()); - player.setCheckpoint(gameWorld.getStartLocation(this)); - if (player.getWolf() != null) { - player.getWolf().teleport(player.getCheckpoint()); - } - player.setFinished(false); - } - startGame(game); - } - - /** - * Remove the group from the List - */ - public void delete() { - Game game = Game.getByDGroup(this); - - plugin.getDGroups().remove(this); - - if (game != null) { - game.removeDGroup(this); - } - - if (timeIsRunningTask != null) { - timeIsRunningTask.cancel(); - } - - GroupSign.updatePerGroup(this); - } - - public void startGame(Game game) { - if (game == null) { - return; - } - game.fetchRules(); - GameRuleProvider rules = game.getRules(); - gameWorld.setWeather(rules); - - color = plugin.getMainConfig().getGroupColorPriority().get(game.getDGroups().indexOf(this)); - - for (DGroup dGroup : game.getDGroups()) { - if (dGroup == null) { - continue; - } - - boolean ready = true; - for (Player player : dGroup.getPlayers().getOnlinePlayers()) { - DGamePlayer dPlayer = DGamePlayer.getByPlayer(player); - if (dPlayer == null) { - dPlayer = new DGamePlayer(player, gameWorld); - } - if (rules.isGroupTagEnabled()) { - dPlayer.initDGroupTag(); - } - if (!dPlayer.isReady()) { - ready = false; - } - } - - if (!ready) { - return; - } - } - - DGroupStartFloorEvent event = new DGroupStartFloorEvent(this, gameWorld); - Bukkit.getPluginManager().callEvent(event); - - if (event.isCancelled()) { - return; - } - - playing = true; - - if (gameWorld != null) { - if (!gameWorld.isPlaying()) { - gameWorld.startGame(); - } - } - - floorCount++; - - for (Player player : players.getOnlinePlayers()) { - DGamePlayer dPlayer = DGamePlayer.getByPlayer(player); - if (dPlayer == null) { - continue; - } - dPlayer.getData().logTimeLastStarted(getDungeonName()); - dPlayer.getData().setKeepInventoryAfterLogout(rules.getKeepInventoryOnEscape()); - - dPlayer.respawn(); - - if (plugin.getMainConfig().isSendFloorTitleEnabled()) { - if (rules.getTitle() != null || rules.getSubTitle() != null) { - String title = rules.getTitle() == null ? "" : rules.getTitle(); - String subtitle = rules.getSubTitle() == null ? "" : rules.getSubTitle(); - - MessageUtil.sendTitleMessage(player, title, subtitle, rules.getTitleFadeIn(), rules.getTitleShow(), rules.getTitleFadeOut()); - - } else if (!getDungeonName().equals(getMapName())) { - MessageUtil.sendTitleMessage(player, "&b&l" + getDungeonName().replaceAll("_", " "), "&4&l" + getMapName().replaceAll("_", " ")); - - } else { - MessageUtil.sendTitleMessage(player, "&4&l" + getMapName().replaceAll("_", " ")); - } - - if (rules.getActionBar() != null) { - MessageUtil.sendActionBarMessage(player, rules.getActionBar()); - } - - if (rules.getChatText() != null) { - MessageUtil.sendCenteredMessage(player, rules.getChatText()); - } - } - - for (Requirement requirement : rules.getRequirements()) { - RequirementDemandEvent requirementDemandEvent = new RequirementDemandEvent(requirement, player); - Bukkit.getPluginManager().callEvent(event); - - if (requirementDemandEvent.isCancelled()) { - continue; - } - - if (!DPermission.hasPermission(player, DPermission.IGNORE_REQUIREMENTS)) { - requirement.demand(player); - } - } - - player.setGameMode(rules.getGameMode()); - if (rules.isTimeIsRunning()) { - timeIsRunningTask = new TimeIsRunningTask(this, rules.getTimeToFinish()).runTaskTimer(plugin, 20, 20); - } - - // Permission bridge - if (plugin.getPermissionProvider() != null) { - for (String permission : rules.getGamePermissions()) { - plugin.getPermissionProvider().playerRemoveTransient(gameWorld.getWorld().getName(), player, permission); - } - } - } - - GroupSign.updatePerGroup(this); - nextFloor = null; - initialLives = rules.getInitialGroupLives(); - lives = initialLives; - } - - public void winGame() { - String title = DMessage.GROUP_CONGRATS.getMessage(); - String subtitle = DMessage.GROUP_CONGRATS_SUB.getMessage(getName()); - for (DGamePlayer player : getDGamePlayers()) { - player.leave(false); - MessageUtil.sendTitleMessage(player.getPlayer(), title, subtitle, 20, 20, 100); - } - } - - public boolean checkTime(Game game) { - if (DPermission.hasPermission(getCaptain(), DPermission.IGNORE_TIME_LIMIT)) { - return true; - } - - for (DGamePlayer dPlayer : getDGamePlayers()) { - if (!dPlayer.checkTimeAfterStart(game) || !dPlayer.checkTimeAfterFinish(game)) { - return false; - } - } - - return true; - } - - public boolean checkRequirements(Game game) { - if (DPermission.hasPermission(getCaptain(), DPermission.IGNORE_REQUIREMENTS)) { - return true; - } - - for (DGamePlayer dPlayer : getDGamePlayers()) { - if (!dPlayer.checkRequirements(game)) { - return false; - } - } - - return true; - } - - /** - * Send a message to all players in the group - */ - public void sendMessage(String message) { - for (Player player : players.getOnlinePlayers()) { - if (player.isOnline()) { - MessageUtil.sendMessage(player, message); - } - } - } - - /** - * Send a message to all players in the group - * - * @param except - * Players who do not receive the message - */ - public void sendMessage(String message, Player... except) { - HashSet exceptSet = new HashSet<>(Arrays.asList(except)); - for (Player player : players.getOnlinePlayers()) { - if (player.isOnline() && !exceptSet.contains(player)) { - MessageUtil.sendMessage(player, message); - } - } - } - - /* Statics */ - public static DGroup getByName(String name) { - for (DGroup dGroup : DungeonsXL.getInstance().getDGroups()) { - if (dGroup.getName().equalsIgnoreCase(name) || dGroup.getRawName().equalsIgnoreCase(name)) { - return dGroup; - } - } - - return null; - } - - public static DGroup getByPlayer(Player player) { - for (DGroup dGroup : DungeonsXL.getInstance().getDGroups()) { - if (dGroup.getPlayers().contains(player)) { - return dGroup; - } - } - - return null; - } - - public static void leaveGroup(Player player) { - for (DGroup dGroup : DungeonsXL.getInstance().getDGroups()) { - if (dGroup.getPlayers().contains(player)) { - dGroup.getPlayers().remove(player); - } - } - } - - /** - * @param gameWorld - * the DGameWorld to check - * @return a List of DGroups in this DGameWorld - */ - public static List getByGameWorld(DGameWorld gameWorld) { - List dGroups = new ArrayList<>(); - for (DGroup dGroup : DungeonsXL.getInstance().getDGroups()) { - if (dGroup.getGameWorld().equals(gameWorld)) { - dGroups.add(dGroup); - } - } - - return dGroups; - } - -} +/* + * Copyright (C) 2012-2018 Frank Baumann + * + * 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 de.erethon.dungeonsxl.player; + +import de.erethon.commons.chat.MessageUtil; +import de.erethon.commons.player.PlayerCollection; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.dungeon.Dungeon; +import de.erethon.dungeonsxl.dungeon.DungeonConfig; +import de.erethon.dungeonsxl.event.dgroup.DGroupDisbandEvent; +import de.erethon.dungeonsxl.event.dgroup.DGroupFinishDungeonEvent; +import de.erethon.dungeonsxl.event.dgroup.DGroupFinishFloorEvent; +import de.erethon.dungeonsxl.event.dgroup.DGroupRewardEvent; +import de.erethon.dungeonsxl.event.dgroup.DGroupStartFloorEvent; +import de.erethon.dungeonsxl.event.dplayer.DPlayerJoinDGroupEvent; +import de.erethon.dungeonsxl.event.requirement.RequirementDemandEvent; +import de.erethon.dungeonsxl.event.reward.RewardAdditionEvent; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.game.GameRuleProvider; +import de.erethon.dungeonsxl.global.GroupSign; +import de.erethon.dungeonsxl.requirement.Requirement; +import de.erethon.dungeonsxl.reward.Reward; +import de.erethon.dungeonsxl.util.DColor; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DResourceWorld; +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; +import org.bukkit.entity.Player; +import org.bukkit.scheduler.BukkitTask; + +/** + * Represents a group of players. + * + * @author Frank Baumann, Daniel Saukel + */ +public class DGroup { + + DungeonsXL plugin = DungeonsXL.getInstance(); + DPlayerCache dPlayers = plugin.getDPlayers(); + + private String name; + private Player captain; + private PlayerCollection players = new PlayerCollection(); + private PlayerCollection invitedPlayers = new PlayerCollection(); + private Dungeon dungeon; + private List unplayedFloors = new ArrayList<>(); + private DGameWorld gameWorld; + private boolean playing; + private int floorCount; + private List rewards = new ArrayList<>(); + private BukkitTask timeIsRunningTask; + private DResourceWorld nextFloor; + private DColor color; + private int score = 0; + private int initialLives = -1; + private int lives = -1; + + public DGroup(Player player) { + this("Group " + DungeonsXL.getInstance().getDGroups().size(), player); + } + + public DGroup(Player player, DColor color) { + this(color.toString().replace("_", " "), player); + } + + public DGroup(String name, Player player) { + plugin.getDGroups().add(this); + this.name = name; + + setCaptain(player); + addPlayer(player); + + playing = false; + floorCount = 0; + } + + @Deprecated + public DGroup(Player player, String identifier, boolean multiFloor) { + this(DungeonsXL.getInstance().getMainConfig().getGroupColorPriority().get(DungeonsXL.getInstance().getDGroups().size()).toString(), player, identifier, multiFloor); + } + + @Deprecated + public DGroup(String name, Player player, String identifier, boolean multiFloor) { + this(name, player, new ArrayList(), identifier, multiFloor); + } + + @Deprecated + public DGroup(String name, Player captain, List players, String identifier, boolean multiFloor) { + plugin.getDGroups().add(this); + this.name = name; + + DPlayerJoinDGroupEvent event = new DPlayerJoinDGroupEvent(plugin.getDPlayers().getByPlayer(captain), true, this); + Bukkit.getPluginManager().callEvent(event); + + if (!event.isCancelled()) { + this.captain = captain; + this.players.add(captain); + } + + for (Player player : players) { + if (!this.players.contains(player.getUniqueId())) { + addPlayer(player); + } + } + + dungeon = plugin.getDungeons().getByName(identifier); + if (multiFloor && dungeon != null) { + // Real dungeon + unplayedFloors = new ArrayList<>(dungeon.getConfig().getFloors()); + + } else { + // Artificial dungeon + DResourceWorld resource = plugin.getDWorlds().getResourceByName(identifier); + dungeon = new Dungeon(resource); + } + + playing = false; + floorCount = 0; + } + + public DGroup(Player player, Dungeon dungeon) { + this(DungeonsXL.getInstance().getMainConfig().getGroupColorPriority().get(DungeonsXL.getInstance().getDGroups().size()).toString(), player, dungeon); + } + + public DGroup(String name, Player player, Dungeon dungeon) { + this(name, player, new ArrayList(), dungeon); + } + + public DGroup(String name, Player captain, List players, Dungeon dungeon) { + plugin.getDGroups().add(this); + this.name = name; + + DPlayerJoinDGroupEvent event = new DPlayerJoinDGroupEvent(plugin.getDPlayers().getByPlayer(captain), true, this); + Bukkit.getPluginManager().callEvent(event); + + if (!event.isCancelled()) { + this.captain = captain; + this.players.add(captain); + } + + for (Player player : players) { + if (!this.players.contains(player)) { + addPlayer(player); + } + } + + setDungeon(dungeon); + playing = false; + floorCount = 0; + } + + // Getters and setters + /** + * @return the name; formatted + */ + public String getName() { + return (color != null ? color.getChatColor().toString() : new String()) + name; + } + + /** + * @return the name; not formatted + */ + public String getRawName() { + return name; + } + + /** + * @param name + * the name to set + */ + public void setName(String name) { + this.name = name; + } + + /** + * @param name + * the name to set + */ + public void setName(DColor color) { + name = color.toString().replace("_", " "); + } + + /** + * @return the captain + */ + public Player getCaptain() { + return captain; + } + + /** + * @param captain + * the captain to set + */ + public void setCaptain(Player captain) { + this.captain = captain; + } + + /** + * @return the players + */ + public PlayerCollection getPlayers() { + return players; + } + + /** + * @return the players as a Set + */ + public Set getDGlobalPlayers() { + Set players = new HashSet<>(); + for (UUID uuid : this.players.getUniqueIds()) { + players.add(dPlayers.getByUniqueId(uuid)); + } + return players; + } + + /** + * @return the players as a Set + */ + public Set getDGamePlayers() { + Set players = new HashSet<>(); + for (UUID uuid : this.players.getUniqueIds()) { + DGlobalPlayer dPlayer = dPlayers.getByUniqueId(uuid); + if (dPlayer instanceof DGamePlayer) { + players.add((DGamePlayer) dPlayer); + } + } + return players; + } + + /** + * Sends messages by default. + * + * @param player + * the player to add + */ + public void addPlayer(Player player) { + addPlayer(player, true); + } + + /** + * @param player + * the player to add + * @param message + * if messages should be sent + */ + public void addPlayer(Player player, boolean message) { + DPlayerJoinDGroupEvent event = new DPlayerJoinDGroupEvent(DGamePlayer.getByPlayer(player), false, this); + Bukkit.getPluginManager().callEvent(event); + + if (!event.isCancelled()) { + if (message) { + sendMessage(DMessage.GROUP_PLAYER_JOINED.getMessage(player.getName())); + MessageUtil.sendMessage(player, DMessage.PLAYER_JOIN_GROUP.getMessage()); + } + + players.add(player.getUniqueId()); + } + } + + /** + * Sends messages by default. + * + * @param player + * the player to remove + */ + public void removePlayer(Player player) { + removePlayer(player, true); + } + + /** + * @param player + * the player to remove + * @param message + * if messages should be sent + */ + public void removePlayer(Player player, boolean message) { + players.remove(player.getUniqueId()); + GroupSign.updatePerGroup(this); + + if (message) { + sendMessage(DMessage.PLAYER_LEFT_GROUP.getMessage(player.getName())); + } + + if (isEmpty()) { + DGroupDisbandEvent event = new DGroupDisbandEvent(this, player, DGroupDisbandEvent.Cause.GROUP_IS_EMPTY); + Bukkit.getPluginManager().callEvent(event); + + if (!event.isCancelled()) { + delete(); + } + } + } + + /** + * @return the players + */ + public PlayerCollection getInvitedPlayers() { + return invitedPlayers; + } + + /** + * @param player + * the player to add + */ + public void addInvitedPlayer(Player player, boolean silent) { + if (player == null) { + return; + } + + if (DGroup.getByPlayer(player) != null) { + if (!silent) { + MessageUtil.sendMessage(getCaptain(), DMessage.ERROR_IN_GROUP.getMessage(player.getName())); + } + return; + } + + if (!silent) { + MessageUtil.sendMessage(player, DMessage.PLAYER_INVITED.getMessage(getCaptain().getName(), name)); + } + + // Send message + if (!silent) { + sendMessage(DMessage.GROUP_INVITED_PLAYER.getMessage(getCaptain().getName(), player.getName(), name)); + } + + // Add player + invitedPlayers.add(player.getUniqueId()); + } + + /** + * @param player + * the player to remove + */ + public void removeInvitedPlayer(Player player, boolean silent) { + if (player == null) { + return; + } + + if (DGroup.getByPlayer(player) != this) { + if (!silent) { + MessageUtil.sendMessage(getCaptain(), DMessage.ERROR_NOT_IN_GROUP.getMessage(player.getName(), name)); + } + return; + } + + if (!silent) { + MessageUtil.sendMessage(player, DMessage.PLAYER_UNINVITED.getMessage(player.getName(), name)); + } + + // Send message + if (!silent) { + for (Player groupPlayer : players.getOnlinePlayers()) { + MessageUtil.sendMessage(groupPlayer, DMessage.GROUP_UNINVITED_PLAYER.getMessage(getCaptain().getName(), player.getName(), name)); + } + } + + invitedPlayers.remove(player.getUniqueId()); + } + + /** + * Remove all invitations for players who are not online + */ + public void clearOfflineInvitedPlayers() { + ArrayList toRemove = new ArrayList<>(); + for (UUID uuid : invitedPlayers.getUniqueIds()) { + if (Bukkit.getPlayer(uuid) == null) { + toRemove.add(uuid); + } + } + invitedPlayers.removeAll(toRemove); + } + + /** + * @return the gameWorld + */ + public DGameWorld getGameWorld() { + return gameWorld; + } + + /** + * @param gameWorld + * the gameWorld to set + */ + public void setGameWorld(DGameWorld gameWorld) { + this.gameWorld = gameWorld; + } + + /** + * @return the dungeon + */ + public Dungeon getDungeon() { + return dungeon; + } + + /** + * Sets up all dungeon-related fields. + * + * @param dungeon + * the dungeon to set + */ + public void setDungeon(Dungeon dungeon) { + this.dungeon = dungeon; + if (dungeon.isMultiFloor()) { + unplayedFloors = new ArrayList<>(dungeon.getConfig().getFloors()); + } + } + + /** + * Sets up all dungeon-related fields. + * + * @param name + * the name of the dungeon + */ + public boolean setDungeon(String name) { + dungeon = plugin.getDungeons().getByName(name); + if (dungeon != null) { + unplayedFloors = dungeon.getConfig().getFloors(); + return true; + + } else { + DResourceWorld resource = plugin.getDWorlds().getResourceByName(name); + if (resource != null) { + dungeon = new Dungeon(resource); + return true; + } + return false; + } + } + + /** + * @return the dungeonName + */ + public String getDungeonName() { + return dungeon.getName(); + } + + /** + * @return if the group is playing + */ + public String getMapName() { + return gameWorld == null ? null : gameWorld.getName(); + } + + /** + * @return the unplayed floors + */ + public List getUnplayedFloors() { + return unplayedFloors; + } + + /** + * @param unplayedFloor + * the unplayed floor to add + */ + public void addUnplayedFloor(DResourceWorld unplayedFloor) { + unplayedFloors.add(unplayedFloor); + } + + /** + * @param unplayedFloor + * the unplayed floor to remove + * @param force + * remove the floor even if removeWhenPlayed is disabled + */ + public void removeUnplayedFloor(DResourceWorld unplayedFloor, boolean force) { + if (getDungeon().getConfig().getRemoveWhenPlayed() || force) { + unplayedFloors.remove(unplayedFloor); + } + } + + /** + * @return if the group is playing + */ + public boolean isPlaying() { + return playing; + } + + /** + * @param playing + * set if the group is playing + */ + public void setPlaying(boolean playing) { + this.playing = playing; + } + + /** + * @return the floorCount + */ + public int getFloorCount() { + return floorCount; + } + + /** + * @param floorCount + * the floorCount to set + */ + public void setFloorCount(int floorCount) { + this.floorCount = floorCount; + } + + /** + * @return the rewards + */ + public List getRewards() { + return rewards; + } + + /** + * @param reward + * the rewards to add + */ + public void addReward(Reward reward) { + RewardAdditionEvent event = new RewardAdditionEvent(reward, this); + Bukkit.getPluginManager().callEvent(event); + + if (event.isCancelled()) { + return; + } + + rewards.add(reward); + } + + /** + * @param reward + * the rewards to remove + */ + public void removeReward(Reward reward) { + rewards.remove(reward); + } + + /** + * @return the "Time is Running" task of the game + */ + public BukkitTask getTimeIsRunningTask() { + return timeIsRunningTask; + } + + /** + * @param task + * the task to set + */ + public void setTimeIsRunningTask(BukkitTask task) { + this.timeIsRunningTask = task; + } + + /** + * @return whether there are players in the group + */ + public boolean isEmpty() { + return players.size() == 0; + } + + /** + * @return if the group has been customized with a command + */ + public boolean isCustom() { + return !name.matches("Group_[0-9]{1,}"); + } + + /** + * @return the next floor the group will enter + */ + public DResourceWorld getNextFloor() { + return nextFloor; + } + + /** + * @param floor + * the next floor to set + */ + public void setNextFloor(DResourceWorld floor) { + nextFloor = floor; + } + + /** + * @return the color that represents this group + */ + public DColor getDColor() { + if (color != null) { + return color; + } else { + return DColor.DEFAULT; + } + } + + /** + * @param color the group color to set + */ + public void setDColor(DColor color) { + this.color = color; + } + + /** + * @return the current score + */ + public int getScore() { + return score; + } + + /** + * @param score + * the score to set + */ + public void setScore(int score) { + this.score = score; + } + + /** + * @return the initial group lives + */ + public int getInitialLives() { + return initialLives; + } + + /** + * @param initialLives + * the initial group lives to set + */ + public void setInitialLives(int initialLives) { + this.initialLives = initialLives; + } + + /** + * @return the group lives + */ + public int getLives() { + return lives; + } + + /** + * @param lives + * the group lives to set + */ + public void setLives(int lives) { + this.lives = lives; + } + + /** + * @return true if all players are finished + */ + public boolean isFinished() { + for (DGamePlayer dPlayer : getDGamePlayers()) { + if (!dPlayer.isFinished()) { + return false; + } + } + return true; + } + + /* Actions */ + /** + * The group finishs the dungeon. + */ + public void finish() { + DGroupFinishDungeonEvent dGroupFinishDungeonEvent = new DGroupFinishDungeonEvent(dungeon, this); + Bukkit.getPluginManager().callEvent(dGroupFinishDungeonEvent); + if (dGroupFinishDungeonEvent.isCancelled()) { + return; + } + + Game.getByDGroup(this).resetWaveKills(); + DGroupRewardEvent dGroupRewardEvent = new DGroupRewardEvent(this); + Bukkit.getPluginManager().callEvent(dGroupRewardEvent); + for (DGamePlayer player : getDGamePlayers()) { + player.leave(false); + if (!dGroupRewardEvent.isCancelled()) { + for (Reward reward : rewards) { + reward.giveTo(player.getPlayer()); + } + } + } + } + + /** + * The group finishs the current floor. + * + * @param specifiedFloor + * the name of the next floor + */ + public void finishFloor(DResourceWorld specifiedFloor) { + DungeonConfig dConfig = dungeon.getConfig(); + int floorsLeft = getUnplayedFloors().size(); + DResourceWorld newFloor = null; + DGameWorld.Type type = null; + if (gameWorld.getType() == DGameWorld.Type.END_FLOOR) { + finish(); + return; + } else if (specifiedFloor != null) { + newFloor = specifiedFloor; + type = DGameWorld.Type.DEFAULT; + } else if (floorsLeft > 0) { + int random = new Random().nextInt(floorsLeft); + newFloor = getUnplayedFloors().get(random); + type = DGameWorld.Type.DEFAULT; + } else { + newFloor = dConfig.getEndFloor(); + type = DGameWorld.Type.END_FLOOR; + } + + DGroupFinishFloorEvent event = new DGroupFinishFloorEvent(this, gameWorld, newFloor); + Bukkit.getPluginManager().callEvent(event); + if (event.isCancelled()) { + return; + } + + Game game = gameWorld.getGame(); + removeUnplayedFloor(gameWorld.getResource(), false); + DGameWorld gameWorld = newFloor.instantiateAsGameWorld(); + gameWorld.setType(type); + this.gameWorld = gameWorld; + game.setWorld(gameWorld); + + for (DGamePlayer player : getDGamePlayers()) { + player.setWorld(gameWorld.getWorld()); + player.setCheckpoint(gameWorld.getStartLocation(this)); + if (player.getWolf() != null) { + player.getWolf().teleport(player.getCheckpoint()); + } + player.setFinished(false); + } + startGame(game); + } + + /** + * Remove the group from the List + */ + public void delete() { + Game game = Game.getByDGroup(this); + + plugin.getDGroups().remove(this); + + if (game != null) { + game.removeDGroup(this); + } + + if (timeIsRunningTask != null) { + timeIsRunningTask.cancel(); + } + + GroupSign.updatePerGroup(this); + } + + public void startGame(Game game) { + if (game == null) { + return; + } + game.fetchRules(); + GameRuleProvider rules = game.getRules(); + gameWorld.setWeather(rules); + + color = plugin.getMainConfig().getGroupColorPriority().get(game.getDGroups().indexOf(this)); + + for (DGroup dGroup : game.getDGroups()) { + if (dGroup == null) { + continue; + } + + boolean ready = true; + for (Player player : dGroup.getPlayers().getOnlinePlayers()) { + DGamePlayer dPlayer = DGamePlayer.getByPlayer(player); + if (dPlayer == null) { + dPlayer = new DGamePlayer(player, gameWorld); + } + if (rules.isGroupTagEnabled()) { + dPlayer.initDGroupTag(); + } + if (!dPlayer.isReady()) { + ready = false; + } + } + + if (!ready) { + return; + } + } + + DGroupStartFloorEvent event = new DGroupStartFloorEvent(this, gameWorld); + Bukkit.getPluginManager().callEvent(event); + + if (event.isCancelled()) { + return; + } + + playing = true; + + if (gameWorld != null) { + if (!gameWorld.isPlaying()) { + gameWorld.startGame(); + } + } + + floorCount++; + + for (Player player : players.getOnlinePlayers()) { + DGamePlayer dPlayer = DGamePlayer.getByPlayer(player); + if (dPlayer == null) { + continue; + } + dPlayer.getData().logTimeLastStarted(getDungeonName()); + dPlayer.getData().setKeepInventoryAfterLogout(rules.getKeepInventoryOnEscape()); + + dPlayer.respawn(); + + if (plugin.getMainConfig().isSendFloorTitleEnabled()) { + if (rules.getTitle() != null || rules.getSubTitle() != null) { + String title = rules.getTitle() == null ? "" : rules.getTitle(); + String subtitle = rules.getSubTitle() == null ? "" : rules.getSubTitle(); + + MessageUtil.sendTitleMessage(player, title, subtitle, rules.getTitleFadeIn(), rules.getTitleShow(), rules.getTitleFadeOut()); + + } else if (!getDungeonName().equals(getMapName())) { + MessageUtil.sendTitleMessage(player, "&b&l" + getDungeonName().replaceAll("_", " "), "&4&l" + getMapName().replaceAll("_", " ")); + + } else { + MessageUtil.sendTitleMessage(player, "&4&l" + getMapName().replaceAll("_", " ")); + } + + if (rules.getActionBar() != null) { + MessageUtil.sendActionBarMessage(player, rules.getActionBar()); + } + + if (rules.getChatText() != null) { + MessageUtil.sendCenteredMessage(player, rules.getChatText()); + } + } + + for (Requirement requirement : rules.getRequirements()) { + RequirementDemandEvent requirementDemandEvent = new RequirementDemandEvent(requirement, player); + Bukkit.getPluginManager().callEvent(event); + + if (requirementDemandEvent.isCancelled()) { + continue; + } + + if (!DPermission.hasPermission(player, DPermission.IGNORE_REQUIREMENTS)) { + requirement.demand(player); + } + } + + player.setGameMode(rules.getGameMode()); + if (rules.isTimeIsRunning()) { + timeIsRunningTask = new TimeIsRunningTask(this, rules.getTimeToFinish()).runTaskTimer(plugin, 20, 20); + } + + // Permission bridge + if (plugin.getPermissionProvider() != null) { + for (String permission : rules.getGamePermissions()) { + plugin.getPermissionProvider().playerRemoveTransient(gameWorld.getWorld().getName(), player, permission); + } + } + } + + GroupSign.updatePerGroup(this); + nextFloor = null; + initialLives = rules.getInitialGroupLives(); + lives = initialLives; + } + + public void winGame() { + String title = DMessage.GROUP_CONGRATS.getMessage(); + String subtitle = DMessage.GROUP_CONGRATS_SUB.getMessage(getName()); + for (DGamePlayer player : getDGamePlayers()) { + player.leave(false); + MessageUtil.sendTitleMessage(player.getPlayer(), title, subtitle, 20, 20, 100); + } + } + + public boolean checkTime(Game game) { + if (DPermission.hasPermission(getCaptain(), DPermission.IGNORE_TIME_LIMIT)) { + return true; + } + + for (DGamePlayer dPlayer : getDGamePlayers()) { + if (!dPlayer.checkTimeAfterStart(game) || !dPlayer.checkTimeAfterFinish(game)) { + return false; + } + } + + return true; + } + + public boolean checkRequirements(Game game) { + if (DPermission.hasPermission(getCaptain(), DPermission.IGNORE_REQUIREMENTS)) { + return true; + } + + for (DGamePlayer dPlayer : getDGamePlayers()) { + if (!dPlayer.checkRequirements(game)) { + return false; + } + } + + return true; + } + + /** + * Send a message to all players in the group + */ + public void sendMessage(String message) { + for (Player player : players.getOnlinePlayers()) { + if (player.isOnline()) { + MessageUtil.sendMessage(player, message); + } + } + } + + /** + * Send a message to all players in the group + * + * @param except + * Players who do not receive the message + */ + public void sendMessage(String message, Player... except) { + HashSet exceptSet = new HashSet<>(Arrays.asList(except)); + for (Player player : players.getOnlinePlayers()) { + if (player.isOnline() && !exceptSet.contains(player)) { + MessageUtil.sendMessage(player, message); + } + } + } + + /* Statics */ + public static DGroup getByName(String name) { + for (DGroup dGroup : DungeonsXL.getInstance().getDGroups()) { + if (dGroup.getName().equalsIgnoreCase(name) || dGroup.getRawName().equalsIgnoreCase(name)) { + return dGroup; + } + } + + return null; + } + + public static DGroup getByPlayer(Player player) { + for (DGroup dGroup : DungeonsXL.getInstance().getDGroups()) { + if (dGroup.getPlayers().contains(player)) { + return dGroup; + } + } + + return null; + } + + public static void leaveGroup(Player player) { + for (DGroup dGroup : DungeonsXL.getInstance().getDGroups()) { + if (dGroup.getPlayers().contains(player)) { + dGroup.getPlayers().remove(player); + } + } + } + + /** + * @param gameWorld + * the DGameWorld to check + * @return a List of DGroups in this DGameWorld + */ + public static List getByGameWorld(DGameWorld gameWorld) { + List dGroups = new ArrayList<>(); + for (DGroup dGroup : DungeonsXL.getInstance().getDGroups()) { + if (dGroup.getGameWorld().equals(gameWorld)) { + dGroups.add(dGroup); + } + } + + return dGroups; + } + +} diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DGroupTag.java b/src/main/java/de/erethon/dungeonsxl/player/DGroupTag.java similarity index 91% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DGroupTag.java rename to src/main/java/de/erethon/dungeonsxl/player/DGroupTag.java index c0c87014..bc6b1ca0 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DGroupTag.java +++ b/src/main/java/de/erethon/dungeonsxl/player/DGroupTag.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.player; +package de.erethon.dungeonsxl.player; import com.gmail.filoghost.holographicdisplays.api.Hologram; import com.gmail.filoghost.holographicdisplays.api.HologramsAPI; -import io.github.dre2n.dungeonsxl.DungeonsXL; -import io.github.dre2n.dungeonsxl.util.LegacyUtil; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.util.LegacyUtil; /** * @author Daniel Saukel diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DInstancePlayer.java b/src/main/java/de/erethon/dungeonsxl/player/DInstancePlayer.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DInstancePlayer.java rename to src/main/java/de/erethon/dungeonsxl/player/DInstancePlayer.java index 0bc4e45b..5eb74353 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DInstancePlayer.java +++ b/src/main/java/de/erethon/dungeonsxl/player/DInstancePlayer.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.player; +package de.erethon.dungeonsxl.player; -import io.github.dre2n.dungeonsxl.config.MainConfig; -import io.github.dre2n.dungeonsxl.util.ParsingUtil; -import io.github.dre2n.dungeonsxl.world.DInstanceWorld; +import de.erethon.dungeonsxl.config.MainConfig; +import de.erethon.dungeonsxl.util.ParsingUtil; +import de.erethon.dungeonsxl.world.DInstanceWorld; import org.bukkit.World; import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffect; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DPermission.java b/src/main/java/de/erethon/dungeonsxl/player/DPermission.java similarity index 99% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DPermission.java rename to src/main/java/de/erethon/dungeonsxl/player/DPermission.java index 8f991d60..a8ff5d1a 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DPermission.java +++ b/src/main/java/de/erethon/dungeonsxl/player/DPermission.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.player; +package de.erethon.dungeonsxl.player; import de.erethon.commons.misc.EnumUtil; import java.util.ArrayList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerCache.java b/src/main/java/de/erethon/dungeonsxl/player/DPlayerCache.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerCache.java rename to src/main/java/de/erethon/dungeonsxl/player/DPlayerCache.java index 53601a1b..bfa0d26f 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerCache.java +++ b/src/main/java/de/erethon/dungeonsxl/player/DPlayerCache.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.player; +package de.erethon.dungeonsxl.player; -import io.github.dre2n.dungeonsxl.DungeonsXL; -import io.github.dre2n.dungeonsxl.config.MainConfig; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.MainConfig; import java.util.ArrayList; import java.util.List; import java.util.UUID; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerData.java b/src/main/java/de/erethon/dungeonsxl/player/DPlayerData.java similarity index 99% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerData.java rename to src/main/java/de/erethon/dungeonsxl/player/DPlayerData.java index f29c44de..83182f1a 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerData.java +++ b/src/main/java/de/erethon/dungeonsxl/player/DPlayerData.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.player; +package de.erethon.dungeonsxl.player; 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 de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; import java.io.File; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerListener.java b/src/main/java/de/erethon/dungeonsxl/player/DPlayerListener.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerListener.java rename to src/main/java/de/erethon/dungeonsxl/player/DPlayerListener.java index e51ed0b3..c488af32 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayerListener.java +++ b/src/main/java/de/erethon/dungeonsxl/player/DPlayerListener.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.player; +package de.erethon.dungeonsxl.player; 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; -import io.github.dre2n.dungeonsxl.game.Game; -import io.github.dre2n.dungeonsxl.mob.DMob; -import io.github.dre2n.dungeonsxl.trigger.UseItemTrigger; -import io.github.dre2n.dungeonsxl.util.LegacyUtil; -import io.github.dre2n.dungeonsxl.util.ParsingUtil; -import io.github.dre2n.dungeonsxl.world.DEditWorld; -import io.github.dre2n.dungeonsxl.world.DGameWorld; -import io.github.dre2n.dungeonsxl.world.block.LockedDoor; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.config.MainConfig; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.mob.DMob; +import de.erethon.dungeonsxl.trigger.UseItemTrigger; +import de.erethon.dungeonsxl.util.LegacyUtil; +import de.erethon.dungeonsxl.util.ParsingUtil; +import de.erethon.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.block.LockedDoor; import java.util.ArrayList; import org.bukkit.Location; import org.bukkit.Material; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/LazyUpdateTask.java b/src/main/java/de/erethon/dungeonsxl/player/LazyUpdateTask.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/player/LazyUpdateTask.java rename to src/main/java/de/erethon/dungeonsxl/player/LazyUpdateTask.java index db1b26bf..48619913 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/LazyUpdateTask.java +++ b/src/main/java/de/erethon/dungeonsxl/player/LazyUpdateTask.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.player; +package de.erethon.dungeonsxl.player; -import io.github.dre2n.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.DungeonsXL; import org.bukkit.scheduler.BukkitRunnable; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/RespawnTask.java b/src/main/java/de/erethon/dungeonsxl/player/RespawnTask.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/player/RespawnTask.java rename to src/main/java/de/erethon/dungeonsxl/player/RespawnTask.java index b59a0eeb..70934919 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/RespawnTask.java +++ b/src/main/java/de/erethon/dungeonsxl/player/RespawnTask.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.player; +package de.erethon.dungeonsxl.player; import de.erethon.commons.player.PlayerUtil; -import io.github.dre2n.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.DungeonsXL; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/SecureModeTask.java b/src/main/java/de/erethon/dungeonsxl/player/SecureModeTask.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/player/SecureModeTask.java rename to src/main/java/de/erethon/dungeonsxl/player/SecureModeTask.java index 36f6998a..a31d500a 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/SecureModeTask.java +++ b/src/main/java/de/erethon/dungeonsxl/player/SecureModeTask.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.player; +package de.erethon.dungeonsxl.player; -import io.github.dre2n.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.DungeonsXL; import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/TimeIsRunningTask.java b/src/main/java/de/erethon/dungeonsxl/player/TimeIsRunningTask.java similarity index 91% rename from src/main/java/io/github/dre2n/dungeonsxl/player/TimeIsRunningTask.java rename to src/main/java/de/erethon/dungeonsxl/player/TimeIsRunningTask.java index bb3bd098..52e52dbb 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/TimeIsRunningTask.java +++ b/src/main/java/de/erethon/dungeonsxl/player/TimeIsRunningTask.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.player; +package de.erethon.dungeonsxl.player; 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; -import io.github.dre2n.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.event.dplayer.DPlayerKickEvent; +import de.erethon.dungeonsxl.game.Game; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/UpdateTask.java b/src/main/java/de/erethon/dungeonsxl/player/UpdateTask.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/player/UpdateTask.java rename to src/main/java/de/erethon/dungeonsxl/player/UpdateTask.java index fddfc25d..9f2f48e2 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/player/UpdateTask.java +++ b/src/main/java/de/erethon/dungeonsxl/player/UpdateTask.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.player; +package de.erethon.dungeonsxl.player; -import io.github.dre2n.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.DungeonsXL; import org.bukkit.scheduler.BukkitRunnable; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeLevelRequirement.java b/src/main/java/de/erethon/dungeonsxl/requirement/FeeLevelRequirement.java similarity index 87% rename from src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeLevelRequirement.java rename to src/main/java/de/erethon/dungeonsxl/requirement/FeeLevelRequirement.java index 77844c79..3be683e7 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeLevelRequirement.java +++ b/src/main/java/de/erethon/dungeonsxl/requirement/FeeLevelRequirement.java @@ -1,111 +1,111 @@ -/* - * Copyright (C) 2012-2018 Frank Baumann - * - * 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.requirement; - -import de.erethon.commons.chat.MessageUtil; -import io.github.dre2n.dungeonsxl.config.DMessage; -import io.github.dre2n.dungeonsxl.game.Game; -import io.github.dre2n.dungeonsxl.game.GameRuleProvider; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; -import io.github.dre2n.dungeonsxl.player.DPlayerData; -import org.bukkit.configuration.ConfigurationSection; -import org.bukkit.entity.Player; - -/** - * @author Daniel Saukel - */ -public class FeeLevelRequirement extends Requirement { - - private RequirementType type = RequirementTypeDefault.FEE_LEVEL; - - private int fee; - private Boolean keepInventory; - - /* Getters and setters */ - /** - * @return the fee - */ - public int getFee() { - return fee; - } - - /** - * @param fee - * the fee to set - */ - public void setFee(int fee) { - this.fee = fee; - } - - @Override - public RequirementType getType() { - return type; - } - - /* Actions */ - @Override - public void setup(ConfigurationSection config) { - fee = config.getInt("feeLevel"); - } - - @Override - public boolean check(Player player) { - if (isKeepInventory(player)) { - return player.getLevel() >= fee; - } - - DGamePlayer dPlayer = DGamePlayer.getByPlayer(player); - return dPlayer != null ? dPlayer.getData().getOldLevel() >= fee : true; - } - - @Override - public void demand(Player player) { - if (isKeepInventory(player)) { - player.setLevel(player.getLevel() - fee); - - } else { - DGamePlayer dPlayer = DGamePlayer.getByPlayer(player); - if (dPlayer == null) { - return; - } - DPlayerData data = dPlayer.getData(); - data.setOldLevel(data.getOldLevel() - fee); - } - - MessageUtil.sendMessage(player, DMessage.REQUIREMENT_FEE.getMessage(fee + " levels")); - } - - private boolean isKeepInventory(Player player) { - if (keepInventory != null) { - return keepInventory; - } - - Game game = Game.getByPlayer(player); - GameRuleProvider rules = null; - if (game != null) { - rules = game.getRules(); - } - if (rules != null) { - keepInventory = rules.getKeepInventoryOnEnter(); - return keepInventory; - } - - keepInventory = GameRuleProvider.DEFAULT_VALUES.getKeepInventoryOnEnter(); - return keepInventory; - } - -} +/* + * Copyright (C) 2012-2018 Frank Baumann + * + * 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 de.erethon.dungeonsxl.requirement; + +import de.erethon.commons.chat.MessageUtil; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.game.GameRuleProvider; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DPlayerData; +import org.bukkit.configuration.ConfigurationSection; +import org.bukkit.entity.Player; + +/** + * @author Daniel Saukel + */ +public class FeeLevelRequirement extends Requirement { + + private RequirementType type = RequirementTypeDefault.FEE_LEVEL; + + private int fee; + private Boolean keepInventory; + + /* Getters and setters */ + /** + * @return the fee + */ + public int getFee() { + return fee; + } + + /** + * @param fee + * the fee to set + */ + public void setFee(int fee) { + this.fee = fee; + } + + @Override + public RequirementType getType() { + return type; + } + + /* Actions */ + @Override + public void setup(ConfigurationSection config) { + fee = config.getInt("feeLevel"); + } + + @Override + public boolean check(Player player) { + if (isKeepInventory(player)) { + return player.getLevel() >= fee; + } + + DGamePlayer dPlayer = DGamePlayer.getByPlayer(player); + return dPlayer != null ? dPlayer.getData().getOldLevel() >= fee : true; + } + + @Override + public void demand(Player player) { + if (isKeepInventory(player)) { + player.setLevel(player.getLevel() - fee); + + } else { + DGamePlayer dPlayer = DGamePlayer.getByPlayer(player); + if (dPlayer == null) { + return; + } + DPlayerData data = dPlayer.getData(); + data.setOldLevel(data.getOldLevel() - fee); + } + + MessageUtil.sendMessage(player, DMessage.REQUIREMENT_FEE.getMessage(fee + " levels")); + } + + private boolean isKeepInventory(Player player) { + if (keepInventory != null) { + return keepInventory; + } + + Game game = Game.getByPlayer(player); + GameRuleProvider rules = null; + if (game != null) { + rules = game.getRules(); + } + if (rules != null) { + keepInventory = rules.getKeepInventoryOnEnter(); + return keepInventory; + } + + keepInventory = GameRuleProvider.DEFAULT_VALUES.getKeepInventoryOnEnter(); + return keepInventory; + } + +} diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeMoneyRequirement.java b/src/main/java/de/erethon/dungeonsxl/requirement/FeeMoneyRequirement.java similarity index 93% rename from src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeMoneyRequirement.java rename to src/main/java/de/erethon/dungeonsxl/requirement/FeeMoneyRequirement.java index f9764755..8075bca3 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeMoneyRequirement.java +++ b/src/main/java/de/erethon/dungeonsxl/requirement/FeeMoneyRequirement.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.requirement; +package de.erethon.dungeonsxl.requirement; import de.erethon.commons.chat.MessageUtil; -import io.github.dre2n.dungeonsxl.DungeonsXL; -import io.github.dre2n.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/GroupSizeRequirement.java b/src/main/java/de/erethon/dungeonsxl/requirement/GroupSizeRequirement.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/requirement/GroupSizeRequirement.java rename to src/main/java/de/erethon/dungeonsxl/requirement/GroupSizeRequirement.java index dc164ed3..b5210a47 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/requirement/GroupSizeRequirement.java +++ b/src/main/java/de/erethon/dungeonsxl/requirement/GroupSizeRequirement.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.requirement; +package de.erethon.dungeonsxl.requirement; -import io.github.dre2n.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DGroup; import org.bukkit.configuration.ConfigurationSection; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/PermissionRequirement.java b/src/main/java/de/erethon/dungeonsxl/requirement/PermissionRequirement.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/requirement/PermissionRequirement.java rename to src/main/java/de/erethon/dungeonsxl/requirement/PermissionRequirement.java index ec501b3c..3d0ad731 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/requirement/PermissionRequirement.java +++ b/src/main/java/de/erethon/dungeonsxl/requirement/PermissionRequirement.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.requirement; +package de.erethon.dungeonsxl.requirement; -import io.github.dre2n.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.player.DPermission; import java.util.ArrayList; import java.util.List; import org.bukkit.configuration.ConfigurationSection; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/Requirement.java b/src/main/java/de/erethon/dungeonsxl/requirement/Requirement.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/requirement/Requirement.java rename to src/main/java/de/erethon/dungeonsxl/requirement/Requirement.java index 85b9f5d4..eb1a7a11 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/requirement/Requirement.java +++ b/src/main/java/de/erethon/dungeonsxl/requirement/Requirement.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.requirement; +package de.erethon.dungeonsxl.requirement; import de.erethon.commons.chat.MessageUtil; -import io.github.dre2n.dungeonsxl.event.requirement.RequirementRegistrationEvent; +import de.erethon.dungeonsxl.event.requirement.RequirementRegistrationEvent; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import org.bukkit.Bukkit; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementType.java b/src/main/java/de/erethon/dungeonsxl/requirement/RequirementType.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementType.java rename to src/main/java/de/erethon/dungeonsxl/requirement/RequirementType.java index e00e4c94..23a0c87e 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementType.java +++ b/src/main/java/de/erethon/dungeonsxl/requirement/RequirementType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.requirement; +package de.erethon.dungeonsxl.requirement; /** * Implement this to create custom requirement types. diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeCache.java b/src/main/java/de/erethon/dungeonsxl/requirement/RequirementTypeCache.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeCache.java rename to src/main/java/de/erethon/dungeonsxl/requirement/RequirementTypeCache.java index b35ccc11..46012f3e 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeCache.java +++ b/src/main/java/de/erethon/dungeonsxl/requirement/RequirementTypeCache.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.requirement; +package de.erethon.dungeonsxl.requirement; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeDefault.java b/src/main/java/de/erethon/dungeonsxl/requirement/RequirementTypeDefault.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeDefault.java rename to src/main/java/de/erethon/dungeonsxl/requirement/RequirementTypeDefault.java index b545149b..72803bd9 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeDefault.java +++ b/src/main/java/de/erethon/dungeonsxl/requirement/RequirementTypeDefault.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.requirement; +package de.erethon.dungeonsxl.requirement; /** * Default implementation of RequirementType. diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/ItemReward.java b/src/main/java/de/erethon/dungeonsxl/reward/ItemReward.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/reward/ItemReward.java rename to src/main/java/de/erethon/dungeonsxl/reward/ItemReward.java index 77cbb9c4..cc2c059b 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/reward/ItemReward.java +++ b/src/main/java/de/erethon/dungeonsxl/reward/ItemReward.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.reward; +package de.erethon.dungeonsxl.reward; import java.util.ArrayList; import java.util.Arrays; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/LevelReward.java b/src/main/java/de/erethon/dungeonsxl/reward/LevelReward.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/reward/LevelReward.java rename to src/main/java/de/erethon/dungeonsxl/reward/LevelReward.java index 0e9e6d53..eb064809 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/reward/LevelReward.java +++ b/src/main/java/de/erethon/dungeonsxl/reward/LevelReward.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.reward; +package de.erethon.dungeonsxl.reward; import de.erethon.commons.chat.MessageUtil; -import io.github.dre2n.dungeonsxl.config.DMessage; +import de.erethon.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/de/erethon/dungeonsxl/reward/MoneyReward.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/reward/MoneyReward.java rename to src/main/java/de/erethon/dungeonsxl/reward/MoneyReward.java index c37cb621..a5fba776 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/reward/MoneyReward.java +++ b/src/main/java/de/erethon/dungeonsxl/reward/MoneyReward.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.reward; +package de.erethon.dungeonsxl.reward; import de.erethon.commons.chat.MessageUtil; -import io.github.dre2n.dungeonsxl.config.DMessage; +import de.erethon.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/de/erethon/dungeonsxl/reward/Reward.java similarity index 93% rename from src/main/java/io/github/dre2n/dungeonsxl/reward/Reward.java rename to src/main/java/de/erethon/dungeonsxl/reward/Reward.java index 90b331ab..10915529 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/reward/Reward.java +++ b/src/main/java/de/erethon/dungeonsxl/reward/Reward.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.reward; +package de.erethon.dungeonsxl.reward; import de.erethon.commons.chat.MessageUtil; -import io.github.dre2n.dungeonsxl.DungeonsXL; -import io.github.dre2n.dungeonsxl.event.reward.RewardRegistrationEvent; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.event.reward.RewardRegistrationEvent; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import org.bukkit.Bukkit; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardListener.java b/src/main/java/de/erethon/dungeonsxl/reward/RewardListener.java similarity index 91% rename from src/main/java/io/github/dre2n/dungeonsxl/reward/RewardListener.java rename to src/main/java/de/erethon/dungeonsxl/reward/RewardListener.java index 8ea892f4..fab240a6 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardListener.java +++ b/src/main/java/de/erethon/dungeonsxl/reward/RewardListener.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.reward; +package de.erethon.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.world.DEditWorld; -import io.github.dre2n.dungeonsxl.world.DGameWorld; -import io.github.dre2n.dungeonsxl.world.block.RewardChest; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DGlobalPlayer; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.block.RewardChest; import org.bukkit.Material; import org.bukkit.World; import org.bukkit.block.Chest; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardType.java b/src/main/java/de/erethon/dungeonsxl/reward/RewardType.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/reward/RewardType.java rename to src/main/java/de/erethon/dungeonsxl/reward/RewardType.java index 32787733..f0f03148 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardType.java +++ b/src/main/java/de/erethon/dungeonsxl/reward/RewardType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.reward; +package de.erethon.dungeonsxl.reward; /** * Implement this to create custom reward types. diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardTypeCache.java b/src/main/java/de/erethon/dungeonsxl/reward/RewardTypeCache.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/reward/RewardTypeCache.java rename to src/main/java/de/erethon/dungeonsxl/reward/RewardTypeCache.java index f717abed..e5459e71 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardTypeCache.java +++ b/src/main/java/de/erethon/dungeonsxl/reward/RewardTypeCache.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.reward; +package de.erethon.dungeonsxl.reward; -import io.github.dre2n.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.DungeonsXL; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardTypeDefault.java b/src/main/java/de/erethon/dungeonsxl/reward/RewardTypeDefault.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/reward/RewardTypeDefault.java rename to src/main/java/de/erethon/dungeonsxl/reward/RewardTypeDefault.java index 7f96b3ab..961a65a2 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardTypeDefault.java +++ b/src/main/java/de/erethon/dungeonsxl/reward/RewardTypeDefault.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.reward; +package de.erethon.dungeonsxl.reward; /** * Default implementation of RewardType. diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/BedSign.java b/src/main/java/de/erethon/dungeonsxl/sign/BedSign.java similarity index 90% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/BedSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/BedSign.java index fd1fef55..805267ef 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/BedSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/BedSign.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; 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; +import de.erethon.dungeonsxl.util.LegacyUtil; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.block.TeamBed; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/BlockSign.java b/src/main/java/de/erethon/dungeonsxl/sign/BlockSign.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/BlockSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/BlockSign.java index 94578633..11436adf 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/BlockSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/BlockSign.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; import de.erethon.commons.misc.NumberUtil; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.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/de/erethon/dungeonsxl/sign/BossShopSign.java similarity index 93% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/BossShopSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/BossShopSign.java index a1283a82..2d841114 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/BossShopSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/BossShopSign.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; 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; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.trigger.InteractTrigger; +import de.erethon.dungeonsxl.world.DGameWorld; import org.black_ixx.bossshop.BossShop; import org.black_ixx.bossshop.core.BSShop; import org.bukkit.Bukkit; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/CheckpointSign.java b/src/main/java/de/erethon/dungeonsxl/sign/CheckpointSign.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/CheckpointSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/CheckpointSign.java index de186c86..b11034a9 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/CheckpointSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/CheckpointSign.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; 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; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.world.DGameWorld; import java.util.concurrent.CopyOnWriteArrayList; import org.bukkit.Material; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/ChestSign.java b/src/main/java/de/erethon/dungeonsxl/sign/ChestSign.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/ChestSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/ChestSign.java index 97b957b1..8a18cb09 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/ChestSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/ChestSign.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; 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; +import de.erethon.dungeonsxl.loottable.DLootTable; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.block.RewardChest; import java.util.Arrays; import java.util.LinkedList; import java.util.List; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/ChunkUpdaterSign.java b/src/main/java/de/erethon/dungeonsxl/sign/ChunkUpdaterSign.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/ChunkUpdaterSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/ChunkUpdaterSign.java index 7d899c4f..06fb58f2 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/ChunkUpdaterSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/ChunkUpdaterSign.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; import de.erethon.commons.misc.NumberUtil; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Chunk; import org.bukkit.Material; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/CommandSign.java b/src/main/java/de/erethon/dungeonsxl/sign/CommandSign.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/CommandSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/CommandSign.java index a263a6c7..2c1e7910 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/CommandSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/CommandSign.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; import de.erethon.commons.misc.NumberUtil; +import de.erethon.dungeonsxl.trigger.InteractTrigger; +import de.erethon.dungeonsxl.world.DGameWorld; import io.github.dre2n.commandsxl.CommandsXL; import io.github.dre2n.commandsxl.command.CCommand; import io.github.dre2n.commandsxl.command.CCommandExecutorTask; -import io.github.dre2n.dungeonsxl.trigger.InteractTrigger; -import io.github.dre2n.dungeonsxl.world.DGameWorld; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/DSign.java b/src/main/java/de/erethon/dungeonsxl/sign/DSign.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/DSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/DSign.java index e2486798..217690e5 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/DSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/DSign.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; 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; -import io.github.dre2n.dungeonsxl.game.Game; -import io.github.dre2n.dungeonsxl.trigger.Trigger; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.event.dsign.DSignRegistrationEvent; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.trigger.Trigger; +import de.erethon.dungeonsxl.world.DGameWorld; import java.lang.reflect.Constructor; import java.lang.reflect.InvocationTargetException; import java.util.HashSet; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignListener.java b/src/main/java/de/erethon/dungeonsxl/sign/DSignListener.java similarity index 91% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/DSignListener.java rename to src/main/java/de/erethon/dungeonsxl/sign/DSignListener.java index f165ec28..95fff537 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignListener.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/DSignListener.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; 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; -import io.github.dre2n.dungeonsxl.trigger.InteractTrigger; -import io.github.dre2n.dungeonsxl.world.DEditWorld; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.trigger.InteractTrigger; +import de.erethon.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.ChatColor; import org.bukkit.block.Block; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignType.java b/src/main/java/de/erethon/dungeonsxl/sign/DSignType.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/DSignType.java rename to src/main/java/de/erethon/dungeonsxl/sign/DSignType.java index c29717c0..5a894329 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignType.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/DSignType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; /** * Implement this to create custom sign types. diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignTypeCache.java b/src/main/java/de/erethon/dungeonsxl/sign/DSignTypeCache.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/DSignTypeCache.java rename to src/main/java/de/erethon/dungeonsxl/sign/DSignTypeCache.java index 78187f50..9b36879f 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignTypeCache.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/DSignTypeCache.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; -import io.github.dre2n.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.DungeonsXL; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignTypeDefault.java b/src/main/java/de/erethon/dungeonsxl/sign/DSignTypeDefault.java similarity index 84% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/DSignTypeDefault.java rename to src/main/java/de/erethon/dungeonsxl/sign/DSignTypeDefault.java index e3a8a721..51d1dd0f 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignTypeDefault.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/DSignTypeDefault.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; -import io.github.dre2n.dungeonsxl.player.DPermission; -import io.github.dre2n.dungeonsxl.sign.lobby.ClassesSign; -import io.github.dre2n.dungeonsxl.sign.lobby.LobbySign; -import io.github.dre2n.dungeonsxl.sign.lobby.ReadySign; -import io.github.dre2n.dungeonsxl.sign.lobby.StartSign; -import io.github.dre2n.dungeonsxl.sign.message.ActionBarSign; -import io.github.dre2n.dungeonsxl.sign.message.HologramSign; -import io.github.dre2n.dungeonsxl.sign.message.MessageSign; -import io.github.dre2n.dungeonsxl.sign.message.SoundMessageSign; -import io.github.dre2n.dungeonsxl.sign.message.TitleSign; -import io.github.dre2n.dungeonsxl.sign.mob.DMobSign; -import io.github.dre2n.dungeonsxl.sign.mob.ExternalMobSign; +import de.erethon.dungeonsxl.player.DPermission; +import de.erethon.dungeonsxl.sign.lobby.ClassesSign; +import de.erethon.dungeonsxl.sign.lobby.LobbySign; +import de.erethon.dungeonsxl.sign.lobby.ReadySign; +import de.erethon.dungeonsxl.sign.lobby.StartSign; +import de.erethon.dungeonsxl.sign.message.ActionBarSign; +import de.erethon.dungeonsxl.sign.message.HologramSign; +import de.erethon.dungeonsxl.sign.message.MessageSign; +import de.erethon.dungeonsxl.sign.message.SoundMessageSign; +import de.erethon.dungeonsxl.sign.message.TitleSign; +import de.erethon.dungeonsxl.sign.mob.DMobSign; +import de.erethon.dungeonsxl.sign.mob.ExternalMobSign; /** * Default implementation of DSignType. diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/DelayedPowerTask.java b/src/main/java/de/erethon/dungeonsxl/sign/DelayedPowerTask.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/DelayedPowerTask.java rename to src/main/java/de/erethon/dungeonsxl/sign/DelayedPowerTask.java index 23ae451a..aaf9187a 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/DelayedPowerTask.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/DelayedPowerTask.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.scheduler.BukkitRunnable; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/DropSign.java b/src/main/java/de/erethon/dungeonsxl/sign/DropSign.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/DropSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/DropSign.java index f40d7477..5d88321d 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/DropSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/DropSign.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; import de.erethon.commons.misc.NumberUtil; +import de.erethon.dungeonsxl.world.DGameWorld; import io.github.dre2n.caliburn.CaliburnAPI; import io.github.dre2n.caliburn.item.UniversalItem; -import io.github.dre2n.dungeonsxl.world.DGameWorld; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/EndSign.java b/src/main/java/de/erethon/dungeonsxl/sign/EndSign.java similarity index 90% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/EndSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/EndSign.java index aa3ea7a2..817ea420 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/EndSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/EndSign.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; -import io.github.dre2n.dungeonsxl.config.DMessage; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; -import io.github.dre2n.dungeonsxl.trigger.InteractTrigger; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.trigger.InteractTrigger; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/FlagSign.java b/src/main/java/de/erethon/dungeonsxl/sign/FlagSign.java similarity index 91% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/FlagSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/FlagSign.java index 25a10195..5137a5e2 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/FlagSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/FlagSign.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; import de.erethon.commons.misc.NumberUtil; -import io.github.dre2n.dungeonsxl.world.DGameWorld; -import io.github.dre2n.dungeonsxl.world.block.TeamFlag; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.block.TeamFlag; import org.bukkit.block.Sign; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/FloorSign.java b/src/main/java/de/erethon/dungeonsxl/sign/FloorSign.java similarity index 90% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/FloorSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/FloorSign.java index 40bab920..1ad09892 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/FloorSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/FloorSign.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; -import io.github.dre2n.dungeonsxl.config.DMessage; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; -import io.github.dre2n.dungeonsxl.trigger.InteractTrigger; -import io.github.dre2n.dungeonsxl.world.DGameWorld; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.trigger.InteractTrigger; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DResourceWorld; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/InteractSign.java b/src/main/java/de/erethon/dungeonsxl/sign/InteractSign.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/InteractSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/InteractSign.java index 4a17dfe2..784abbbe 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/InteractSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/InteractSign.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; 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; +import de.erethon.dungeonsxl.trigger.InteractTrigger; +import de.erethon.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.world.DGameWorld; import java.util.HashSet; import java.util.Set; import org.bukkit.ChatColor; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/LeaveSign.java b/src/main/java/de/erethon/dungeonsxl/sign/LeaveSign.java similarity index 88% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/LeaveSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/LeaveSign.java index 93f29a03..bb9fd64c 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/LeaveSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/LeaveSign.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; -import io.github.dre2n.dungeonsxl.config.DMessage; -import io.github.dre2n.dungeonsxl.event.dplayer.instance.game.DGamePlayerEscapeEvent; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; -import io.github.dre2n.dungeonsxl.trigger.InteractTrigger; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.event.dplayer.instance.game.DGamePlayerEscapeEvent; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.trigger.InteractTrigger; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Material; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/LivesModifierSign.java b/src/main/java/de/erethon/dungeonsxl/sign/LivesModifierSign.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/LivesModifierSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/LivesModifierSign.java index 1f714fa8..17cefbff 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/LivesModifierSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/LivesModifierSign.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; 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; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Material; import org.bukkit.block.Sign; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/LocationSign.java b/src/main/java/de/erethon/dungeonsxl/sign/LocationSign.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/LocationSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/LocationSign.java index 5ba2720f..5ed4717e 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/LocationSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/LocationSign.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Location; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/OpenDoorSign.java b/src/main/java/de/erethon/dungeonsxl/sign/OpenDoorSign.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/OpenDoorSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/OpenDoorSign.java index 44902c35..539ad081 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/OpenDoorSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/OpenDoorSign.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; import de.erethon.commons.misc.BlockUtil; -import io.github.dre2n.dungeonsxl.world.DGameWorld; -import io.github.dre2n.dungeonsxl.world.block.LockedDoor; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.block.LockedDoor; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/PerPlayerSign.java b/src/main/java/de/erethon/dungeonsxl/sign/PerPlayerSign.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/PerPlayerSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/PerPlayerSign.java index 8cd516be..e5cdfcbd 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/PerPlayerSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/PerPlayerSign.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DGameWorld; import java.util.HashSet; import java.util.Set; import java.util.UUID; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/PlaceSign.java b/src/main/java/de/erethon/dungeonsxl/sign/PlaceSign.java similarity index 89% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/PlaceSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/PlaceSign.java index 86f8d0f2..04faa56e 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/PlaceSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/PlaceSign.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; -import io.github.dre2n.dungeonsxl.world.DGameWorld; -import io.github.dre2n.dungeonsxl.world.block.PlaceableBlock; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.block.PlaceableBlock; import org.bukkit.Material; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/ProtectionSign.java b/src/main/java/de/erethon/dungeonsxl/sign/ProtectionSign.java similarity index 90% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/ProtectionSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/ProtectionSign.java index 2a8fc0f6..09f22d89 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/ProtectionSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/ProtectionSign.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; import de.erethon.commons.misc.BlockUtil; -import io.github.dre2n.dungeonsxl.world.DGameWorld; -import io.github.dre2n.dungeonsxl.world.block.ProtectedBlock; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.block.ProtectedBlock; import org.bukkit.Material; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/RedstoneSign.java b/src/main/java/de/erethon/dungeonsxl/sign/RedstoneSign.java similarity index 98% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/RedstoneSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/RedstoneSign.java index 4c9feccb..4c24ff24 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/RedstoneSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/RedstoneSign.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; import de.erethon.commons.misc.NumberUtil; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/ResourcePackSign.java b/src/main/java/de/erethon/dungeonsxl/sign/ResourcePackSign.java similarity index 93% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/ResourcePackSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/ResourcePackSign.java index ef8a76ef..25536d40 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/ResourcePackSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/ResourcePackSign.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; -import io.github.dre2n.dungeonsxl.config.DMessage; -import io.github.dre2n.dungeonsxl.trigger.InteractTrigger; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.trigger.InteractTrigger; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/ScriptSign.java b/src/main/java/de/erethon/dungeonsxl/sign/ScriptSign.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/ScriptSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/ScriptSign.java index 257ca788..cc3b348a 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/ScriptSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/ScriptSign.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Material; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScript.java b/src/main/java/de/erethon/dungeonsxl/sign/SignScript.java similarity index 98% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/SignScript.java rename to src/main/java/de/erethon/dungeonsxl/sign/SignScript.java index bb40fbab..8de0731e 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScript.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/SignScript.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; import de.erethon.commons.misc.NumberUtil; import java.io.File; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScriptCache.java b/src/main/java/de/erethon/dungeonsxl/sign/SignScriptCache.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/SignScriptCache.java rename to src/main/java/de/erethon/dungeonsxl/sign/SignScriptCache.java index 28394113..cf3850c2 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScriptCache.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/SignScriptCache.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; import de.erethon.commons.misc.FileUtil; import java.io.File; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/SignUpdateTask.java b/src/main/java/de/erethon/dungeonsxl/sign/SignUpdateTask.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/SignUpdateTask.java rename to src/main/java/de/erethon/dungeonsxl/sign/SignUpdateTask.java index 5f0d5312..742e0b08 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/SignUpdateTask.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/SignUpdateTask.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; import org.bukkit.block.Sign; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/TeleportSign.java b/src/main/java/de/erethon/dungeonsxl/sign/TeleportSign.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/TeleportSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/TeleportSign.java index afe3d0f7..e274acc0 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/TeleportSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/TeleportSign.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; import de.erethon.commons.misc.NumberUtil; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Material; import org.bukkit.block.Sign; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/TriggerSign.java b/src/main/java/de/erethon/dungeonsxl/sign/TriggerSign.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/TriggerSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/TriggerSign.java index cf8c3705..a90a1521 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/TriggerSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/TriggerSign.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; 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; +import de.erethon.dungeonsxl.trigger.SignTrigger; +import de.erethon.dungeonsxl.world.DEditWorld; +import de.erethon.dungeonsxl.world.DGameWorld; import java.util.HashSet; import java.util.Set; import org.bukkit.Material; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/WaveSign.java b/src/main/java/de/erethon/dungeonsxl/sign/WaveSign.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/WaveSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/WaveSign.java index f2f0819a..5c84928a 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/WaveSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/WaveSign.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign; +package de.erethon.dungeonsxl.sign; import de.erethon.commons.misc.NumberUtil; -import io.github.dre2n.dungeonsxl.config.DMessage; -import io.github.dre2n.dungeonsxl.trigger.InteractTrigger; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.trigger.InteractTrigger; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/ClassesSign.java b/src/main/java/de/erethon/dungeonsxl/sign/lobby/ClassesSign.java similarity index 87% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/ClassesSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/lobby/ClassesSign.java index a1a192a6..bd5917b9 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/ClassesSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/lobby/ClassesSign.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign.lobby; +package de.erethon.dungeonsxl.sign.lobby; -import io.github.dre2n.dungeonsxl.player.DClass; -import io.github.dre2n.dungeonsxl.sign.DSign; -import io.github.dre2n.dungeonsxl.sign.DSignType; -import io.github.dre2n.dungeonsxl.sign.DSignTypeDefault; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.player.DClass; +import de.erethon.dungeonsxl.sign.DSign; +import de.erethon.dungeonsxl.sign.DSignType; +import de.erethon.dungeonsxl.sign.DSignTypeDefault; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.ChatColor; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/LobbySign.java b/src/main/java/de/erethon/dungeonsxl/sign/lobby/LobbySign.java similarity index 83% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/LobbySign.java rename to src/main/java/de/erethon/dungeonsxl/sign/lobby/LobbySign.java index 4556f224..f67696a6 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/LobbySign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/lobby/LobbySign.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign.lobby; +package de.erethon.dungeonsxl.sign.lobby; -import io.github.dre2n.dungeonsxl.sign.DSignType; -import io.github.dre2n.dungeonsxl.sign.DSignTypeDefault; -import io.github.dre2n.dungeonsxl.sign.LocationSign; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.sign.DSignType; +import de.erethon.dungeonsxl.sign.DSignTypeDefault; +import de.erethon.dungeonsxl.sign.LocationSign; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Material; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/ReadySign.java b/src/main/java/de/erethon/dungeonsxl/sign/lobby/ReadySign.java similarity index 88% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/ReadySign.java rename to src/main/java/de/erethon/dungeonsxl/sign/lobby/ReadySign.java index 48c85217..c03f8d41 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/ReadySign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/lobby/ReadySign.java @@ -14,21 +14,21 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign.lobby; +package de.erethon.dungeonsxl.sign.lobby; 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; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.sign.DSign; -import io.github.dre2n.dungeonsxl.sign.DSignType; -import io.github.dre2n.dungeonsxl.sign.DSignTypeDefault; -import io.github.dre2n.dungeonsxl.trigger.InteractTrigger; -import io.github.dre2n.dungeonsxl.util.ProgressBar; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.game.GameType; +import de.erethon.dungeonsxl.game.GameTypeDefault; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.sign.DSign; +import de.erethon.dungeonsxl.sign.DSignType; +import de.erethon.dungeonsxl.sign.DSignTypeDefault; +import de.erethon.dungeonsxl.trigger.InteractTrigger; +import de.erethon.dungeonsxl.util.ProgressBar; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/StartSign.java b/src/main/java/de/erethon/dungeonsxl/sign/lobby/StartSign.java similarity index 86% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/StartSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/lobby/StartSign.java index bbe8b76d..a0ac105f 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/lobby/StartSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/lobby/StartSign.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign.lobby; +package de.erethon.dungeonsxl.sign.lobby; import de.erethon.commons.misc.NumberUtil; -import io.github.dre2n.dungeonsxl.sign.DSignType; -import io.github.dre2n.dungeonsxl.sign.DSignTypeDefault; -import io.github.dre2n.dungeonsxl.sign.LocationSign; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.sign.DSignType; +import de.erethon.dungeonsxl.sign.DSignTypeDefault; +import de.erethon.dungeonsxl.sign.LocationSign; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Material; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/ActionBarSign.java b/src/main/java/de/erethon/dungeonsxl/sign/message/ActionBarSign.java similarity index 88% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/message/ActionBarSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/message/ActionBarSign.java index ce90e8d3..cecd1fda 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/ActionBarSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/message/ActionBarSign.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign.message; +package de.erethon.dungeonsxl.sign.message; 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; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.sign.DSignType; +import de.erethon.dungeonsxl.sign.DSignTypeDefault; +import de.erethon.dungeonsxl.sign.PerPlayerSign; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Material; import org.bukkit.block.Sign; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/HologramSign.java b/src/main/java/de/erethon/dungeonsxl/sign/message/HologramSign.java similarity index 91% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/message/HologramSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/message/HologramSign.java index c6956d31..33556eff 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/HologramSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/message/HologramSign.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign.message; +package de.erethon.dungeonsxl.sign.message; import com.gmail.filoghost.holographicdisplays.api.Hologram; import com.gmail.filoghost.holographicdisplays.api.HologramsAPI; @@ -22,13 +22,13 @@ 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 de.erethon.dungeonsxl.sign.DSign; +import de.erethon.dungeonsxl.sign.DSignType; +import de.erethon.dungeonsxl.sign.DSignTypeDefault; +import de.erethon.dungeonsxl.util.LegacyUtil; +import de.erethon.dungeonsxl.world.DGameWorld; import io.github.dre2n.caliburn.CaliburnAPI; import io.github.dre2n.caliburn.item.UniversalItem; -import io.github.dre2n.dungeonsxl.sign.DSign; -import io.github.dre2n.dungeonsxl.sign.DSignType; -import io.github.dre2n.dungeonsxl.sign.DSignTypeDefault; -import io.github.dre2n.dungeonsxl.util.LegacyUtil; -import io.github.dre2n.dungeonsxl.world.DGameWorld; import org.bukkit.Bukkit; import org.bukkit.ChatColor; import org.bukkit.Location; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/MessageSign.java b/src/main/java/de/erethon/dungeonsxl/sign/message/MessageSign.java similarity index 91% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/message/MessageSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/message/MessageSign.java index ef5e4974..c7987459 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/MessageSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/message/MessageSign.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign.message; +package de.erethon.dungeonsxl.sign.message; 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; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.sign.DSign; +import de.erethon.dungeonsxl.sign.DSignType; +import de.erethon.dungeonsxl.sign.DSignTypeDefault; +import de.erethon.dungeonsxl.world.DGameWorld; import java.util.concurrent.CopyOnWriteArrayList; import org.bukkit.Material; import org.bukkit.block.Sign; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/SoundMessageSign.java b/src/main/java/de/erethon/dungeonsxl/sign/message/SoundMessageSign.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/message/SoundMessageSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/message/SoundMessageSign.java index 471b9293..0341bb9a 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/SoundMessageSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/message/SoundMessageSign.java @@ -14,16 +14,16 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign.message; +package de.erethon.dungeonsxl.sign.message; import de.erethon.commons.compatibility.CompatibilityHandler; import de.erethon.commons.compatibility.Internals; import de.erethon.commons.misc.EnumUtil; 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; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.sign.DSign; +import de.erethon.dungeonsxl.sign.DSignType; +import de.erethon.dungeonsxl.sign.DSignTypeDefault; +import de.erethon.dungeonsxl.world.DGameWorld; import java.util.concurrent.CopyOnWriteArrayList; import org.bukkit.Material; import org.bukkit.SoundCategory; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/TitleSign.java b/src/main/java/de/erethon/dungeonsxl/sign/message/TitleSign.java similarity index 89% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/message/TitleSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/message/TitleSign.java index 58e12380..0c3c0cb8 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/message/TitleSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/message/TitleSign.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign.message; +package de.erethon.dungeonsxl.sign.message; 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; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.sign.DSignType; +import de.erethon.dungeonsxl.sign.DSignTypeDefault; +import de.erethon.dungeonsxl.sign.PerPlayerSign; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Material; import org.bukkit.block.Sign; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/mob/DMobSign.java b/src/main/java/de/erethon/dungeonsxl/sign/mob/DMobSign.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/mob/DMobSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/mob/DMobSign.java index f035eaac..e130dacf 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/mob/DMobSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/mob/DMobSign.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign.mob; +package de.erethon.dungeonsxl.sign.mob; 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; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.sign.DSign; +import de.erethon.dungeonsxl.sign.DSignType; +import de.erethon.dungeonsxl.sign.DSignTypeDefault; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Material; import org.bukkit.block.Sign; import org.bukkit.scheduler.BukkitTask; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/mob/ExternalMobSign.java b/src/main/java/de/erethon/dungeonsxl/sign/mob/ExternalMobSign.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/mob/ExternalMobSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/mob/ExternalMobSign.java index 6fd925bb..ecbf13f2 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/mob/ExternalMobSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/mob/ExternalMobSign.java @@ -14,15 +14,15 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign.mob; +package de.erethon.dungeonsxl.sign.mob; 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; -import io.github.dre2n.dungeonsxl.sign.DSignType; -import io.github.dre2n.dungeonsxl.sign.DSignTypeDefault; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.mob.ExternalMobPlugin; +import de.erethon.dungeonsxl.mob.ExternalMobProvider; +import de.erethon.dungeonsxl.sign.DSign; +import de.erethon.dungeonsxl.sign.DSignType; +import de.erethon.dungeonsxl.sign.DSignTypeDefault; +import de.erethon.dungeonsxl.world.DGameWorld; import java.util.ArrayList; import java.util.List; import org.bukkit.Location; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/mob/ExternalMobSpawnTask.java b/src/main/java/de/erethon/dungeonsxl/sign/mob/ExternalMobSpawnTask.java similarity index 91% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/mob/ExternalMobSpawnTask.java rename to src/main/java/de/erethon/dungeonsxl/sign/mob/ExternalMobSpawnTask.java index b2d7eaff..5a4d6673 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/mob/ExternalMobSpawnTask.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/mob/ExternalMobSpawnTask.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign.mob; +package de.erethon.dungeonsxl.sign.mob; -import io.github.dre2n.dungeonsxl.mob.DMob; -import io.github.dre2n.dungeonsxl.mob.ExternalMobProvider; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.mob.DMob; +import de.erethon.dungeonsxl.mob.ExternalMobProvider; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.World; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/mob/MobSign.java b/src/main/java/de/erethon/dungeonsxl/sign/mob/MobSign.java similarity index 98% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/mob/MobSign.java rename to src/main/java/de/erethon/dungeonsxl/sign/mob/MobSign.java index b3062dd5..22877d9f 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/mob/MobSign.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/mob/MobSign.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign.mob; +package de.erethon.dungeonsxl.sign.mob; import org.bukkit.scheduler.BukkitTask; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/mob/MobSpawnTask.java b/src/main/java/de/erethon/dungeonsxl/sign/mob/MobSpawnTask.java similarity index 93% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/mob/MobSpawnTask.java rename to src/main/java/de/erethon/dungeonsxl/sign/mob/MobSpawnTask.java index c16fa575..f93fbe20 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/sign/mob/MobSpawnTask.java +++ b/src/main/java/de/erethon/dungeonsxl/sign/mob/MobSpawnTask.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.sign.mob; +package de.erethon.dungeonsxl.sign.mob; -import io.github.dre2n.dungeonsxl.DungeonsXL; -import io.github.dre2n.dungeonsxl.mob.DMob; -import io.github.dre2n.dungeonsxl.mob.DMobType; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.mob.DMob; +import de.erethon.dungeonsxl.mob.DMobType; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Location; import org.bukkit.Material; import org.bukkit.World; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/DistanceTrigger.java b/src/main/java/de/erethon/dungeonsxl/trigger/DistanceTrigger.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/DistanceTrigger.java rename to src/main/java/de/erethon/dungeonsxl/trigger/DistanceTrigger.java index a966c83d..b1c4713d 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/trigger/DistanceTrigger.java +++ b/src/main/java/de/erethon/dungeonsxl/trigger/DistanceTrigger.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.trigger; +package de.erethon.dungeonsxl.trigger; -import io.github.dre2n.dungeonsxl.event.trigger.TriggerActionEvent; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.event.trigger.TriggerActionEvent; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/FortuneTrigger.java b/src/main/java/de/erethon/dungeonsxl/trigger/FortuneTrigger.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/FortuneTrigger.java rename to src/main/java/de/erethon/dungeonsxl/trigger/FortuneTrigger.java index 648220bf..c397157a 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/trigger/FortuneTrigger.java +++ b/src/main/java/de/erethon/dungeonsxl/trigger/FortuneTrigger.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.trigger; +package de.erethon.dungeonsxl.trigger; import de.erethon.commons.misc.NumberUtil; -import io.github.dre2n.dungeonsxl.event.trigger.TriggerActionEvent; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.event.trigger.TriggerActionEvent; +import de.erethon.dungeonsxl.world.DGameWorld; import java.util.Random; import org.bukkit.Bukkit; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/InteractTrigger.java b/src/main/java/de/erethon/dungeonsxl/trigger/InteractTrigger.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/InteractTrigger.java rename to src/main/java/de/erethon/dungeonsxl/trigger/InteractTrigger.java index 78309b39..33e368a2 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/trigger/InteractTrigger.java +++ b/src/main/java/de/erethon/dungeonsxl/trigger/InteractTrigger.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.trigger; +package de.erethon.dungeonsxl.trigger; -import io.github.dre2n.dungeonsxl.event.trigger.TriggerActionEvent; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.event.trigger.TriggerActionEvent; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Bukkit; import org.bukkit.block.Block; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/MobTrigger.java b/src/main/java/de/erethon/dungeonsxl/trigger/MobTrigger.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/MobTrigger.java rename to src/main/java/de/erethon/dungeonsxl/trigger/MobTrigger.java index e47bf442..8a306ca0 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/trigger/MobTrigger.java +++ b/src/main/java/de/erethon/dungeonsxl/trigger/MobTrigger.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.trigger; +package de.erethon.dungeonsxl.trigger; -import io.github.dre2n.dungeonsxl.event.trigger.TriggerActionEvent; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.event.trigger.TriggerActionEvent; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Bukkit; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/ProgressTrigger.java b/src/main/java/de/erethon/dungeonsxl/trigger/ProgressTrigger.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/ProgressTrigger.java rename to src/main/java/de/erethon/dungeonsxl/trigger/ProgressTrigger.java index 56ee7bcc..68b6f5c9 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/trigger/ProgressTrigger.java +++ b/src/main/java/de/erethon/dungeonsxl/trigger/ProgressTrigger.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.trigger; +package de.erethon.dungeonsxl.trigger; -import io.github.dre2n.dungeonsxl.DungeonsXL; -import io.github.dre2n.dungeonsxl.event.trigger.TriggerActionEvent; -import io.github.dre2n.dungeonsxl.world.DGameWorld; -import io.github.dre2n.dungeonsxl.world.DResourceWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.event.trigger.TriggerActionEvent; +import de.erethon.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.world.DResourceWorld; import java.util.HashSet; import java.util.Set; import org.bukkit.Bukkit; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/RedstoneTrigger.java b/src/main/java/de/erethon/dungeonsxl/trigger/RedstoneTrigger.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/RedstoneTrigger.java rename to src/main/java/de/erethon/dungeonsxl/trigger/RedstoneTrigger.java index c9e2d462..5d6fff05 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/trigger/RedstoneTrigger.java +++ b/src/main/java/de/erethon/dungeonsxl/trigger/RedstoneTrigger.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.trigger; +package de.erethon.dungeonsxl.trigger; -import io.github.dre2n.dungeonsxl.event.trigger.TriggerActionEvent; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.event.trigger.TriggerActionEvent; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.block.Block; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/SignTrigger.java b/src/main/java/de/erethon/dungeonsxl/trigger/SignTrigger.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/SignTrigger.java rename to src/main/java/de/erethon/dungeonsxl/trigger/SignTrigger.java index d58aeac6..3ba39312 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/trigger/SignTrigger.java +++ b/src/main/java/de/erethon/dungeonsxl/trigger/SignTrigger.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.trigger; +package de.erethon.dungeonsxl.trigger; -import io.github.dre2n.dungeonsxl.event.trigger.TriggerActionEvent; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.event.trigger.TriggerActionEvent; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Bukkit; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/Trigger.java b/src/main/java/de/erethon/dungeonsxl/trigger/Trigger.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/Trigger.java rename to src/main/java/de/erethon/dungeonsxl/trigger/Trigger.java index 01269fa0..6421fc83 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/trigger/Trigger.java +++ b/src/main/java/de/erethon/dungeonsxl/trigger/Trigger.java @@ -14,14 +14,14 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.trigger; +package de.erethon.dungeonsxl.trigger; 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; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.event.trigger.TriggerRegistrationEvent; +import de.erethon.dungeonsxl.sign.DSign; +import de.erethon.dungeonsxl.world.DGameWorld; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.HashSet; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerListener.java b/src/main/java/de/erethon/dungeonsxl/trigger/TriggerListener.java similarity index 91% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerListener.java rename to src/main/java/de/erethon/dungeonsxl/trigger/TriggerListener.java index a1e6b687..f7dc55bd 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerListener.java +++ b/src/main/java/de/erethon/dungeonsxl/trigger/TriggerListener.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.trigger; +package de.erethon.dungeonsxl.trigger; -import io.github.dre2n.dungeonsxl.DungeonsXL; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.event.EventHandler; import org.bukkit.event.Listener; import org.bukkit.event.block.BlockRedstoneEvent; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerType.java b/src/main/java/de/erethon/dungeonsxl/trigger/TriggerType.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerType.java rename to src/main/java/de/erethon/dungeonsxl/trigger/TriggerType.java index 2fda18c1..5c54b52d 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerType.java +++ b/src/main/java/de/erethon/dungeonsxl/trigger/TriggerType.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.trigger; +package de.erethon.dungeonsxl.trigger; /** * Implement this to create custom trigger types. diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeCache.java b/src/main/java/de/erethon/dungeonsxl/trigger/TriggerTypeCache.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeCache.java rename to src/main/java/de/erethon/dungeonsxl/trigger/TriggerTypeCache.java index 41deab86..22d07d54 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeCache.java +++ b/src/main/java/de/erethon/dungeonsxl/trigger/TriggerTypeCache.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.trigger; +package de.erethon.dungeonsxl.trigger; -import io.github.dre2n.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.DungeonsXL; import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeDefault.java b/src/main/java/de/erethon/dungeonsxl/trigger/TriggerTypeDefault.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeDefault.java rename to src/main/java/de/erethon/dungeonsxl/trigger/TriggerTypeDefault.java index 07b914d0..cc33732d 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeDefault.java +++ b/src/main/java/de/erethon/dungeonsxl/trigger/TriggerTypeDefault.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.trigger; +package de.erethon.dungeonsxl.trigger; /** * Default implementation of TriggerType. diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/UseItemTrigger.java b/src/main/java/de/erethon/dungeonsxl/trigger/UseItemTrigger.java similarity index 93% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/UseItemTrigger.java rename to src/main/java/de/erethon/dungeonsxl/trigger/UseItemTrigger.java index 4b2cb6dc..be3b05c3 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/trigger/UseItemTrigger.java +++ b/src/main/java/de/erethon/dungeonsxl/trigger/UseItemTrigger.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.trigger; +package de.erethon.dungeonsxl.trigger; -import io.github.dre2n.dungeonsxl.event.trigger.TriggerActionEvent; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.event.trigger.TriggerActionEvent; +import de.erethon.dungeonsxl.world.DGameWorld; import org.bukkit.Bukkit; import org.bukkit.Material; import org.bukkit.entity.Player; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/WaveTrigger.java b/src/main/java/de/erethon/dungeonsxl/trigger/WaveTrigger.java similarity index 93% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/WaveTrigger.java rename to src/main/java/de/erethon/dungeonsxl/trigger/WaveTrigger.java index 9577394e..3bd757ef 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/trigger/WaveTrigger.java +++ b/src/main/java/de/erethon/dungeonsxl/trigger/WaveTrigger.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.trigger; +package de.erethon.dungeonsxl.trigger; -import io.github.dre2n.dungeonsxl.event.trigger.TriggerActionEvent; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.event.trigger.TriggerActionEvent; +import de.erethon.dungeonsxl.world.DGameWorld; import java.util.HashSet; import java.util.Set; import org.bukkit.Bukkit; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/util/DColor.java b/src/main/java/de/erethon/dungeonsxl/util/DColor.java similarity index 98% rename from src/main/java/io/github/dre2n/dungeonsxl/util/DColor.java rename to src/main/java/de/erethon/dungeonsxl/util/DColor.java index f3113451..0c442afb 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/util/DColor.java +++ b/src/main/java/de/erethon/dungeonsxl/util/DColor.java @@ -14,7 +14,7 @@ * 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; +package de.erethon.dungeonsxl.util; import de.erethon.commons.misc.EnumUtil; import org.bukkit.ChatColor; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/util/DeserializationUtil.java b/src/main/java/de/erethon/dungeonsxl/util/DeserializationUtil.java similarity index 98% rename from src/main/java/io/github/dre2n/dungeonsxl/util/DeserializationUtil.java rename to src/main/java/de/erethon/dungeonsxl/util/DeserializationUtil.java index 00a4d14b..42abc784 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/util/DeserializationUtil.java +++ b/src/main/java/de/erethon/dungeonsxl/util/DeserializationUtil.java @@ -14,7 +14,7 @@ * 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; +package de.erethon.dungeonsxl.util; import de.erethon.commons.misc.NumberUtil; import java.util.ArrayList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/util/GUIUtil.java b/src/main/java/de/erethon/dungeonsxl/util/GUIUtil.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/util/GUIUtil.java rename to src/main/java/de/erethon/dungeonsxl/util/GUIUtil.java index 6c529fe3..579d1631 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/util/GUIUtil.java +++ b/src/main/java/de/erethon/dungeonsxl/util/GUIUtil.java @@ -14,9 +14,9 @@ * 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; +package de.erethon.dungeonsxl.util; -import io.github.dre2n.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.DungeonsXL; import java.util.Arrays; import java.util.List; import org.bukkit.ChatColor; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/util/LegacyUtil.java b/src/main/java/de/erethon/dungeonsxl/util/LegacyUtil.java similarity index 98% rename from src/main/java/io/github/dre2n/dungeonsxl/util/LegacyUtil.java rename to src/main/java/de/erethon/dungeonsxl/util/LegacyUtil.java index 3e015fba..8095ee61 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/util/LegacyUtil.java +++ b/src/main/java/de/erethon/dungeonsxl/util/LegacyUtil.java @@ -14,7 +14,7 @@ * 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; +package de.erethon.dungeonsxl.util; import de.erethon.commons.compatibility.CompatibilityHandler; import de.erethon.commons.compatibility.Version; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/util/NoReload.java b/src/main/java/de/erethon/dungeonsxl/util/NoReload.java similarity index 98% rename from src/main/java/io/github/dre2n/dungeonsxl/util/NoReload.java rename to src/main/java/de/erethon/dungeonsxl/util/NoReload.java index 31ed0fc7..4095ddf7 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/util/NoReload.java +++ b/src/main/java/de/erethon/dungeonsxl/util/NoReload.java @@ -14,7 +14,7 @@ * 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; +package de.erethon.dungeonsxl.util; import org.bukkit.Bukkit; import org.bukkit.ChatColor; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/util/ParsingUtil.java b/src/main/java/de/erethon/dungeonsxl/util/ParsingUtil.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/util/ParsingUtil.java rename to src/main/java/de/erethon/dungeonsxl/util/ParsingUtil.java index 3ae1ac28..fff3cc35 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/util/ParsingUtil.java +++ b/src/main/java/de/erethon/dungeonsxl/util/ParsingUtil.java @@ -14,10 +14,10 @@ * 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; +package de.erethon.dungeonsxl.util; -import io.github.dre2n.dungeonsxl.player.DGlobalPlayer; -import io.github.dre2n.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DGlobalPlayer; +import de.erethon.dungeonsxl.player.DGroup; /** * @author Daniel Saukel diff --git a/src/main/java/io/github/dre2n/dungeonsxl/util/ProgressBar.java b/src/main/java/de/erethon/dungeonsxl/util/ProgressBar.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/util/ProgressBar.java rename to src/main/java/de/erethon/dungeonsxl/util/ProgressBar.java index 21f55544..4bc5e3db 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/util/ProgressBar.java +++ b/src/main/java/de/erethon/dungeonsxl/util/ProgressBar.java @@ -14,10 +14,10 @@ * 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; +package de.erethon.dungeonsxl.util; import de.erethon.commons.chat.MessageUtil; -import io.github.dre2n.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.DungeonsXL; import java.util.HashSet; import java.util.Set; import java.util.UUID; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/BackupResourceTask.java b/src/main/java/de/erethon/dungeonsxl/world/BackupResourceTask.java similarity index 93% rename from src/main/java/io/github/dre2n/dungeonsxl/world/BackupResourceTask.java rename to src/main/java/de/erethon/dungeonsxl/world/BackupResourceTask.java index 6979ca51..ea2bf3aa 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/BackupResourceTask.java +++ b/src/main/java/de/erethon/dungeonsxl/world/BackupResourceTask.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world; +package de.erethon.dungeonsxl.world; import de.erethon.commons.misc.FileUtil; -import io.github.dre2n.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.DungeonsXL; import java.io.File; import org.bukkit.scheduler.BukkitRunnable; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/DEditWorld.java b/src/main/java/de/erethon/dungeonsxl/world/DEditWorld.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/world/DEditWorld.java rename to src/main/java/de/erethon/dungeonsxl/world/DEditWorld.java index fdb366cc..8954c28f 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/DEditWorld.java +++ b/src/main/java/de/erethon/dungeonsxl/world/DEditWorld.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world; +package de.erethon.dungeonsxl.world; 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; -import io.github.dre2n.dungeonsxl.player.DEditPlayer; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.event.editworld.EditWorldSaveEvent; +import de.erethon.dungeonsxl.event.editworld.EditWorldUnloadEvent; +import de.erethon.dungeonsxl.player.DEditPlayer; import java.io.File; import java.io.IOException; import java.util.concurrent.CopyOnWriteArrayList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/DGameWorld.java b/src/main/java/de/erethon/dungeonsxl/world/DGameWorld.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/world/DGameWorld.java rename to src/main/java/de/erethon/dungeonsxl/world/DGameWorld.java index 4653038f..0f1dc04d 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/DGameWorld.java +++ b/src/main/java/de/erethon/dungeonsxl/world/DGameWorld.java @@ -14,37 +14,37 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world; +package de.erethon.dungeonsxl.world; 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; -import io.github.dre2n.dungeonsxl.event.gameworld.GameWorldUnloadEvent; -import io.github.dre2n.dungeonsxl.game.Game; -import io.github.dre2n.dungeonsxl.game.GameRuleProvider; -import io.github.dre2n.dungeonsxl.mob.DMob; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.sign.DSign; -import io.github.dre2n.dungeonsxl.sign.DSignType; -import io.github.dre2n.dungeonsxl.sign.DSignTypeDefault; -import io.github.dre2n.dungeonsxl.sign.LocationSign; -import io.github.dre2n.dungeonsxl.sign.lobby.StartSign; -import io.github.dre2n.dungeonsxl.sign.mob.MobSign; -import io.github.dre2n.dungeonsxl.trigger.FortuneTrigger; -import io.github.dre2n.dungeonsxl.trigger.ProgressTrigger; -import io.github.dre2n.dungeonsxl.trigger.RedstoneTrigger; -import io.github.dre2n.dungeonsxl.trigger.Trigger; -import io.github.dre2n.dungeonsxl.trigger.TriggerType; -import io.github.dre2n.dungeonsxl.trigger.TriggerTypeDefault; -import io.github.dre2n.dungeonsxl.world.block.GameBlock; -import io.github.dre2n.dungeonsxl.world.block.LockedDoor; -import io.github.dre2n.dungeonsxl.world.block.MultiBlock; -import io.github.dre2n.dungeonsxl.world.block.PlaceableBlock; -import io.github.dre2n.dungeonsxl.world.block.RewardChest; -import io.github.dre2n.dungeonsxl.world.block.TeamBed; -import io.github.dre2n.dungeonsxl.world.block.TeamFlag; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.dungeon.Dungeon; +import de.erethon.dungeonsxl.event.gameworld.GameWorldStartGameEvent; +import de.erethon.dungeonsxl.event.gameworld.GameWorldUnloadEvent; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.game.GameRuleProvider; +import de.erethon.dungeonsxl.mob.DMob; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.sign.DSign; +import de.erethon.dungeonsxl.sign.DSignType; +import de.erethon.dungeonsxl.sign.DSignTypeDefault; +import de.erethon.dungeonsxl.sign.LocationSign; +import de.erethon.dungeonsxl.sign.lobby.StartSign; +import de.erethon.dungeonsxl.sign.mob.MobSign; +import de.erethon.dungeonsxl.trigger.FortuneTrigger; +import de.erethon.dungeonsxl.trigger.ProgressTrigger; +import de.erethon.dungeonsxl.trigger.RedstoneTrigger; +import de.erethon.dungeonsxl.trigger.Trigger; +import de.erethon.dungeonsxl.trigger.TriggerType; +import de.erethon.dungeonsxl.trigger.TriggerTypeDefault; +import de.erethon.dungeonsxl.world.block.GameBlock; +import de.erethon.dungeonsxl.world.block.LockedDoor; +import de.erethon.dungeonsxl.world.block.MultiBlock; +import de.erethon.dungeonsxl.world.block.PlaceableBlock; +import de.erethon.dungeonsxl.world.block.RewardChest; +import de.erethon.dungeonsxl.world.block.TeamBed; +import de.erethon.dungeonsxl.world.block.TeamFlag; import java.io.File; import java.util.ArrayList; import java.util.HashSet; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/DInstanceWorld.java b/src/main/java/de/erethon/dungeonsxl/world/DInstanceWorld.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/world/DInstanceWorld.java rename to src/main/java/de/erethon/dungeonsxl/world/DInstanceWorld.java index 72e5cfb5..2fec3218 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/DInstanceWorld.java +++ b/src/main/java/de/erethon/dungeonsxl/world/DInstanceWorld.java @@ -14,12 +14,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world; +package de.erethon.dungeonsxl.world; import de.erethon.commons.chat.MessageUtil; -import io.github.dre2n.dungeonsxl.DungeonsXL; -import io.github.dre2n.dungeonsxl.game.GameRuleProvider; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.game.GameRuleProvider; +import de.erethon.dungeonsxl.player.DGamePlayer; import java.io.File; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java b/src/main/java/de/erethon/dungeonsxl/world/DResourceWorld.java similarity index 94% rename from src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java rename to src/main/java/de/erethon/dungeonsxl/world/DResourceWorld.java index baddc8bc..995e177e 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java +++ b/src/main/java/de/erethon/dungeonsxl/world/DResourceWorld.java @@ -1,313 +1,313 @@ -/* - * Copyright (C) 2012-2018 Frank Baumann - * - * 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.world; - -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; -import java.io.File; -import java.io.IOException; -import org.bukkit.Bukkit; -import org.bukkit.OfflinePlayer; -import org.bukkit.World.Environment; -import org.bukkit.WorldCreator; -import org.bukkit.WorldType; -import org.bukkit.scheduler.BukkitRunnable; - -/** - * This class represents unloaded worlds. - * - * @author Daniel Saukel - */ -public class DResourceWorld { - - DungeonsXL plugin = DungeonsXL.getInstance(); - DWorldCache worlds; - - private File folder; - private WorldConfig config; - private SignData signData; - - public DResourceWorld(DWorldCache worlds, String name) { - this.worlds = worlds; - - folder = new File(DungeonsXL.MAPS, name); - if (!folder.exists()) { - folder.mkdir(); - } - - File configFile = new File(folder, "config.yml"); - if (configFile.exists()) { - config = new WorldConfig(configFile); - } - - File signDataFile = new File(folder, "DXLData.data"); - signData = new SignData(signDataFile); - } - - public DResourceWorld(DWorldCache worlds, File folder) { - this.worlds = worlds; - - this.folder = folder; - - File configFile = new File(folder, "config.yml"); - if (configFile.exists()) { - config = new WorldConfig(configFile); - } - - File signDataFile = new File(folder, "DXLData.data"); - signData = new SignData(signDataFile); - } - - /* Getters and setters */ - /** - * @return the folder that stores the world - */ - public File getFolder() { - return folder; - } - - /** - * @return the name of the world - */ - public String getName() { - return folder.getName(); - } - - /** - * @param name - * the name to set - */ - public void setName(String name) { - folder.renameTo(new File(folder.getParentFile(), name)); - folder = new File(folder.getParentFile(), name); - } - - /** - * @return the WorldConfig - */ - public WorldConfig getConfig() { - return getConfig(false); - } - - /** - * @param generate - * if a config should be generated if none exists - * @return the WorldConfig - */ - public WorldConfig getConfig(boolean generate) { - if (config == null) { - File file = new File(folder, "config.yml"); - if (file.exists()) { - try { - file.createNewFile(); - } catch (IOException exception) { - exception.printStackTrace(); - } - } - config = new WorldConfig(file); - } - - return config; - } - - public Environment getWorldEnvironment() { - return (config != null && config.getWorldEnvironment() != null) ? config.getWorldEnvironment() : Environment.NORMAL; - } - - /** - * @return the DXLData.data file - */ - public SignData getSignData() { - return signData; - } - - /** - * @param player - * the player to invite - */ - public void addInvitedPlayer(OfflinePlayer player) { - if (config == null) { - config = new WorldConfig(); - } - - config.addInvitedPlayer(player.getUniqueId().toString()); - config.save(); - } - - /** - * @param player - * the player to uninvite - */ - public boolean removeInvitedPlayer(OfflinePlayer player) { - if (config == null) { - return false; - } - - config.removeInvitedPlayers(player.getUniqueId().toString(), player.getName().toLowerCase()); - config.save(); - - DEditPlayer editPlayer = DEditPlayer.getByName(player.getName()); - if (editPlayer != null) { - if (DEditWorld.getByWorld(editPlayer.getWorld()).getResource() == this) { - editPlayer.leave(); - } - } - - return true; - } - - /** - * @param player - * the player to check - */ - public boolean isInvitedPlayer(OfflinePlayer player) { - if (config == null) { - return false; - } - - return config.getInvitedPlayers().contains(player.getName().toLowerCase()) || config.getInvitedPlayers().contains(player.getUniqueId().toString()); - } - - /* Actions */ - /** - * Creates a backup of the resource - * - * @param async - * whether the task shall be performed asyncronously - */ - public void backup(boolean async) { - BackupResourceTask task = new BackupResourceTask(this); - if (async) { - task.runTaskAsynchronously(plugin); - } else { - task.run(); - } - } - - /** - * @param game - * whether the instance is a DGameWorld - * @return an instance of this world - */ - public DInstanceWorld instantiate(final boolean game) { - int id = worlds.generateId(); - String name = worlds.generateName(game, id); - final File instanceFolder = new File(Bukkit.getWorldContainer(), name); - - while (Bukkit.getWorld(name) != null) { - id++; - name = worlds.generateName(game, id); - } - - final DInstanceWorld instance = game ? new DGameWorld(this, instanceFolder, id) : new DEditWorld(this, instanceFolder, id); - - if (!plugin.getMainConfig().areTweaksEnabled()) { - FileUtil.copyDir(folder, instanceFolder, DungeonsXL.EXCLUDED_FILES); - instance.world = Bukkit.createWorld(WorldCreator.name(name).environment(getWorldEnvironment())); - - if (game) { - signData.deserializeSigns((DGameWorld) instance); - } else { - signData.deserializeSigns((DEditWorld) instance); - } - - } else { - new BukkitRunnable() { - @Override - public void run() { - FileUtil.copyDir(folder, instanceFolder, DungeonsXL.EXCLUDED_FILES); - instance.world = WorldLoader.createWorld(WorldCreator.name(instanceFolder.getName()).environment(getWorldEnvironment())); - - new BukkitRunnable() { - @Override - public void run() { - if (game) { - signData.deserializeSigns((DGameWorld) instance); - } else { - signData.deserializeSigns((DEditWorld) instance); - } - } - }.runTask(plugin); - } - }.runTaskAsynchronously(plugin); - } - - return instance; - } - - /** - * @return an old or a new instance of this world. - */ - public DEditWorld instantiateAsEditWorld() { - for (DEditWorld instance : worlds.getEditWorlds()) { - if (instance.getName().equals(getName())) { - return instance; - } - } - - return (DEditWorld) instantiate(false); - } - - /** - * @return a new instance of this world - */ - public DGameWorld instantiateAsGameWorld() { - return (DGameWorld) instantiate(true); - } - - /** - * Generate a new DResourceWorld. - * - * @return the automatically created DEditWorld instance - */ - public DEditWorld generate() { - final String name = worlds.generateName(false); - int id = worlds.generateId(); - final File folder = new File(Bukkit.getWorldContainer(), name); - final WorldCreator creator = new WorldCreator(name); - creator.type(WorldType.FLAT); - creator.generateStructures(false); - - final DEditWorld editWorld = new DEditWorld(this, folder, id); - - EditWorldGenerateEvent event = new EditWorldGenerateEvent(editWorld); - Bukkit.getPluginManager().callEvent(event); - if (event.isCancelled()) { - return null; - } - - if (!plugin.getMainConfig().areTweaksEnabled()) { - editWorld.world = creator.createWorld(); - - } else { - new BukkitRunnable() { - @Override - public void run() { - FileUtil.copyDir(DWorldCache.RAW, folder, DungeonsXL.EXCLUDED_FILES); - editWorld.generateIdFile(); - editWorld.world = WorldLoader.createWorld(creator); - } - }.runTaskAsynchronously(plugin); - } - - return editWorld; - } - -} +/* + * Copyright (C) 2012-2018 Frank Baumann + * + * 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 de.erethon.dungeonsxl.world; + +import de.erethon.commons.misc.FileUtil; +import de.erethon.commons.worldloader.WorldLoader; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.event.editworld.EditWorldGenerateEvent; +import de.erethon.dungeonsxl.player.DEditPlayer; +import java.io.File; +import java.io.IOException; +import org.bukkit.Bukkit; +import org.bukkit.OfflinePlayer; +import org.bukkit.World.Environment; +import org.bukkit.WorldCreator; +import org.bukkit.WorldType; +import org.bukkit.scheduler.BukkitRunnable; + +/** + * This class represents unloaded worlds. + * + * @author Daniel Saukel + */ +public class DResourceWorld { + + DungeonsXL plugin = DungeonsXL.getInstance(); + DWorldCache worlds; + + private File folder; + private WorldConfig config; + private SignData signData; + + public DResourceWorld(DWorldCache worlds, String name) { + this.worlds = worlds; + + folder = new File(DungeonsXL.MAPS, name); + if (!folder.exists()) { + folder.mkdir(); + } + + File configFile = new File(folder, "config.yml"); + if (configFile.exists()) { + config = new WorldConfig(configFile); + } + + File signDataFile = new File(folder, "DXLData.data"); + signData = new SignData(signDataFile); + } + + public DResourceWorld(DWorldCache worlds, File folder) { + this.worlds = worlds; + + this.folder = folder; + + File configFile = new File(folder, "config.yml"); + if (configFile.exists()) { + config = new WorldConfig(configFile); + } + + File signDataFile = new File(folder, "DXLData.data"); + signData = new SignData(signDataFile); + } + + /* Getters and setters */ + /** + * @return the folder that stores the world + */ + public File getFolder() { + return folder; + } + + /** + * @return the name of the world + */ + public String getName() { + return folder.getName(); + } + + /** + * @param name + * the name to set + */ + public void setName(String name) { + folder.renameTo(new File(folder.getParentFile(), name)); + folder = new File(folder.getParentFile(), name); + } + + /** + * @return the WorldConfig + */ + public WorldConfig getConfig() { + return getConfig(false); + } + + /** + * @param generate + * if a config should be generated if none exists + * @return the WorldConfig + */ + public WorldConfig getConfig(boolean generate) { + if (config == null) { + File file = new File(folder, "config.yml"); + if (file.exists()) { + try { + file.createNewFile(); + } catch (IOException exception) { + exception.printStackTrace(); + } + } + config = new WorldConfig(file); + } + + return config; + } + + public Environment getWorldEnvironment() { + return (config != null && config.getWorldEnvironment() != null) ? config.getWorldEnvironment() : Environment.NORMAL; + } + + /** + * @return the DXLData.data file + */ + public SignData getSignData() { + return signData; + } + + /** + * @param player + * the player to invite + */ + public void addInvitedPlayer(OfflinePlayer player) { + if (config == null) { + config = new WorldConfig(); + } + + config.addInvitedPlayer(player.getUniqueId().toString()); + config.save(); + } + + /** + * @param player + * the player to uninvite + */ + public boolean removeInvitedPlayer(OfflinePlayer player) { + if (config == null) { + return false; + } + + config.removeInvitedPlayers(player.getUniqueId().toString(), player.getName().toLowerCase()); + config.save(); + + DEditPlayer editPlayer = DEditPlayer.getByName(player.getName()); + if (editPlayer != null) { + if (DEditWorld.getByWorld(editPlayer.getWorld()).getResource() == this) { + editPlayer.leave(); + } + } + + return true; + } + + /** + * @param player + * the player to check + */ + public boolean isInvitedPlayer(OfflinePlayer player) { + if (config == null) { + return false; + } + + return config.getInvitedPlayers().contains(player.getName().toLowerCase()) || config.getInvitedPlayers().contains(player.getUniqueId().toString()); + } + + /* Actions */ + /** + * Creates a backup of the resource + * + * @param async + * whether the task shall be performed asyncronously + */ + public void backup(boolean async) { + BackupResourceTask task = new BackupResourceTask(this); + if (async) { + task.runTaskAsynchronously(plugin); + } else { + task.run(); + } + } + + /** + * @param game + * whether the instance is a DGameWorld + * @return an instance of this world + */ + public DInstanceWorld instantiate(final boolean game) { + int id = worlds.generateId(); + String name = worlds.generateName(game, id); + final File instanceFolder = new File(Bukkit.getWorldContainer(), name); + + while (Bukkit.getWorld(name) != null) { + id++; + name = worlds.generateName(game, id); + } + + final DInstanceWorld instance = game ? new DGameWorld(this, instanceFolder, id) : new DEditWorld(this, instanceFolder, id); + + if (!plugin.getMainConfig().areTweaksEnabled()) { + FileUtil.copyDir(folder, instanceFolder, DungeonsXL.EXCLUDED_FILES); + instance.world = Bukkit.createWorld(WorldCreator.name(name).environment(getWorldEnvironment())); + + if (game) { + signData.deserializeSigns((DGameWorld) instance); + } else { + signData.deserializeSigns((DEditWorld) instance); + } + + } else { + new BukkitRunnable() { + @Override + public void run() { + FileUtil.copyDir(folder, instanceFolder, DungeonsXL.EXCLUDED_FILES); + instance.world = WorldLoader.createWorld(WorldCreator.name(instanceFolder.getName()).environment(getWorldEnvironment())); + + new BukkitRunnable() { + @Override + public void run() { + if (game) { + signData.deserializeSigns((DGameWorld) instance); + } else { + signData.deserializeSigns((DEditWorld) instance); + } + } + }.runTask(plugin); + } + }.runTaskAsynchronously(plugin); + } + + return instance; + } + + /** + * @return an old or a new instance of this world. + */ + public DEditWorld instantiateAsEditWorld() { + for (DEditWorld instance : worlds.getEditWorlds()) { + if (instance.getName().equals(getName())) { + return instance; + } + } + + return (DEditWorld) instantiate(false); + } + + /** + * @return a new instance of this world + */ + public DGameWorld instantiateAsGameWorld() { + return (DGameWorld) instantiate(true); + } + + /** + * Generate a new DResourceWorld. + * + * @return the automatically created DEditWorld instance + */ + public DEditWorld generate() { + final String name = worlds.generateName(false); + int id = worlds.generateId(); + final File folder = new File(Bukkit.getWorldContainer(), name); + final WorldCreator creator = new WorldCreator(name); + creator.type(WorldType.FLAT); + creator.generateStructures(false); + + final DEditWorld editWorld = new DEditWorld(this, folder, id); + + EditWorldGenerateEvent event = new EditWorldGenerateEvent(editWorld); + Bukkit.getPluginManager().callEvent(event); + if (event.isCancelled()) { + return null; + } + + if (!plugin.getMainConfig().areTweaksEnabled()) { + editWorld.world = creator.createWorld(); + + } else { + new BukkitRunnable() { + @Override + public void run() { + FileUtil.copyDir(DWorldCache.RAW, folder, DungeonsXL.EXCLUDED_FILES); + editWorld.generateIdFile(); + editWorld.world = WorldLoader.createWorld(creator); + } + }.runTaskAsynchronously(plugin); + } + + return editWorld; + } + +} diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/DWorldCache.java b/src/main/java/de/erethon/dungeonsxl/world/DWorldCache.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/world/DWorldCache.java rename to src/main/java/de/erethon/dungeonsxl/world/DWorldCache.java index 4163a208..e352b364 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/DWorldCache.java +++ b/src/main/java/de/erethon/dungeonsxl/world/DWorldCache.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world; +package de.erethon.dungeonsxl.world; 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; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.MainConfig; +import de.erethon.dungeonsxl.config.MainConfig.BackupMode; import java.io.File; import java.util.HashSet; import java.util.Set; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/DWorldListener.java b/src/main/java/de/erethon/dungeonsxl/world/DWorldListener.java similarity index 98% rename from src/main/java/io/github/dre2n/dungeonsxl/world/DWorldListener.java rename to src/main/java/de/erethon/dungeonsxl/world/DWorldListener.java index 3b0ea480..744b4915 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/DWorldListener.java +++ b/src/main/java/de/erethon/dungeonsxl/world/DWorldListener.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world; +package de.erethon.dungeonsxl.world; -import io.github.dre2n.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.game.Game; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.LivingEntity; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/SignData.java b/src/main/java/de/erethon/dungeonsxl/world/SignData.java similarity index 98% rename from src/main/java/io/github/dre2n/dungeonsxl/world/SignData.java rename to src/main/java/de/erethon/dungeonsxl/world/SignData.java index 6495d727..6480372a 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/SignData.java +++ b/src/main/java/de/erethon/dungeonsxl/world/SignData.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world; +package de.erethon.dungeonsxl.world; -import io.github.dre2n.dungeonsxl.sign.DSign; +import de.erethon.dungeonsxl.sign.DSign; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/WorldConfig.java b/src/main/java/de/erethon/dungeonsxl/world/WorldConfig.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/world/WorldConfig.java rename to src/main/java/de/erethon/dungeonsxl/world/WorldConfig.java index 586541ca..2a4adb84 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/WorldConfig.java +++ b/src/main/java/de/erethon/dungeonsxl/world/WorldConfig.java @@ -14,19 +14,19 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world; +package de.erethon.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 de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.game.GameRuleProvider; +import de.erethon.dungeonsxl.game.GameType; +import de.erethon.dungeonsxl.requirement.Requirement; +import de.erethon.dungeonsxl.util.DeserializationUtil; import io.github.dre2n.caliburn.CaliburnAPI; import io.github.dre2n.caliburn.item.UniversalItemStack; -import io.github.dre2n.dungeonsxl.DungeonsXL; -import io.github.dre2n.dungeonsxl.game.GameRuleProvider; -import io.github.dre2n.dungeonsxl.game.GameType; -import io.github.dre2n.dungeonsxl.requirement.Requirement; -import io.github.dre2n.dungeonsxl.util.DeserializationUtil; import java.io.File; import java.io.IOException; import java.util.ArrayList; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/WorldUnloadTask.java b/src/main/java/de/erethon/dungeonsxl/world/WorldUnloadTask.java similarity index 91% rename from src/main/java/io/github/dre2n/dungeonsxl/world/WorldUnloadTask.java rename to src/main/java/de/erethon/dungeonsxl/world/WorldUnloadTask.java index e8a712ab..fa2e2666 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/WorldUnloadTask.java +++ b/src/main/java/de/erethon/dungeonsxl/world/WorldUnloadTask.java @@ -14,10 +14,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world; +package de.erethon.dungeonsxl.world; -import io.github.dre2n.dungeonsxl.DungeonsXL; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.player.DGamePlayer; import org.bukkit.scheduler.BukkitRunnable; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/WorldUpdateTask.java b/src/main/java/de/erethon/dungeonsxl/world/WorldUpdateTask.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/world/WorldUpdateTask.java rename to src/main/java/de/erethon/dungeonsxl/world/WorldUpdateTask.java index ea5e0ad6..9137d536 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/WorldUpdateTask.java +++ b/src/main/java/de/erethon/dungeonsxl/world/WorldUpdateTask.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world; +package de.erethon.dungeonsxl.world; -import io.github.dre2n.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.DungeonsXL; import org.bukkit.scheduler.BukkitRunnable; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/block/GameBlock.java b/src/main/java/de/erethon/dungeonsxl/world/block/GameBlock.java similarity index 96% rename from src/main/java/io/github/dre2n/dungeonsxl/world/block/GameBlock.java rename to src/main/java/de/erethon/dungeonsxl/world/block/GameBlock.java index 44a3993c..0e8cd118 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/block/GameBlock.java +++ b/src/main/java/de/erethon/dungeonsxl/world/block/GameBlock.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world.block; +package de.erethon.dungeonsxl.world.block; import org.bukkit.block.Block; import org.bukkit.event.block.BlockBreakEvent; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/block/LockedDoor.java b/src/main/java/de/erethon/dungeonsxl/world/block/LockedDoor.java similarity index 97% rename from src/main/java/io/github/dre2n/dungeonsxl/world/block/LockedDoor.java rename to src/main/java/de/erethon/dungeonsxl/world/block/LockedDoor.java index 96bd7ecc..3c440145 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/block/LockedDoor.java +++ b/src/main/java/de/erethon/dungeonsxl/world/block/LockedDoor.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world.block; +package de.erethon.dungeonsxl.world.block; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/block/MultiBlock.java b/src/main/java/de/erethon/dungeonsxl/world/block/MultiBlock.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/world/block/MultiBlock.java rename to src/main/java/de/erethon/dungeonsxl/world/block/MultiBlock.java index 645b29c9..d1d9b28f 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/block/MultiBlock.java +++ b/src/main/java/de/erethon/dungeonsxl/world/block/MultiBlock.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world.block; +package de.erethon.dungeonsxl.world.block; import org.bukkit.block.Block; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/block/PlaceableBlock.java b/src/main/java/de/erethon/dungeonsxl/world/block/PlaceableBlock.java similarity index 98% rename from src/main/java/io/github/dre2n/dungeonsxl/world/block/PlaceableBlock.java rename to src/main/java/de/erethon/dungeonsxl/world/block/PlaceableBlock.java index 110a279c..9b7d372f 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/block/PlaceableBlock.java +++ b/src/main/java/de/erethon/dungeonsxl/world/block/PlaceableBlock.java @@ -14,11 +14,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world.block; +package de.erethon.dungeonsxl.world.block; import de.erethon.commons.misc.NumberUtil; -import io.github.dre2n.dungeonsxl.util.LegacyUtil; -import io.github.dre2n.dungeonsxl.world.DGameWorld; +import de.erethon.dungeonsxl.util.LegacyUtil; +import de.erethon.dungeonsxl.world.DGameWorld; import java.util.HashSet; import java.util.Set; import org.bukkit.Material; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/block/ProtectedBlock.java b/src/main/java/de/erethon/dungeonsxl/world/block/ProtectedBlock.java similarity index 95% rename from src/main/java/io/github/dre2n/dungeonsxl/world/block/ProtectedBlock.java rename to src/main/java/de/erethon/dungeonsxl/world/block/ProtectedBlock.java index 61f6719d..b348971c 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/block/ProtectedBlock.java +++ b/src/main/java/de/erethon/dungeonsxl/world/block/ProtectedBlock.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world.block; +package de.erethon.dungeonsxl.world.block; import org.bukkit.block.Block; import org.bukkit.event.block.BlockBreakEvent; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/block/RewardChest.java b/src/main/java/de/erethon/dungeonsxl/world/block/RewardChest.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/world/block/RewardChest.java rename to src/main/java/de/erethon/dungeonsxl/world/block/RewardChest.java index 6997ac82..0408bf83 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/block/RewardChest.java +++ b/src/main/java/de/erethon/dungeonsxl/world/block/RewardChest.java @@ -14,20 +14,20 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world.block; +package de.erethon.dungeonsxl.world.block; 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; -import io.github.dre2n.dungeonsxl.game.GameTypeDefault; -import io.github.dre2n.dungeonsxl.player.DGamePlayer; -import io.github.dre2n.dungeonsxl.player.DGroup; -import io.github.dre2n.dungeonsxl.reward.ItemReward; -import io.github.dre2n.dungeonsxl.reward.LevelReward; -import io.github.dre2n.dungeonsxl.reward.MoneyReward; -import io.github.dre2n.dungeonsxl.reward.Reward; -import io.github.dre2n.dungeonsxl.reward.RewardTypeDefault; +import de.erethon.dungeonsxl.DungeonsXL; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.game.Game; +import de.erethon.dungeonsxl.game.GameTypeDefault; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.reward.ItemReward; +import de.erethon.dungeonsxl.reward.LevelReward; +import de.erethon.dungeonsxl.reward.MoneyReward; +import de.erethon.dungeonsxl.reward.Reward; +import de.erethon.dungeonsxl.reward.RewardTypeDefault; import net.milkbowl.vault.item.ItemInfo; import net.milkbowl.vault.item.Items; import org.bukkit.Bukkit; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamBed.java b/src/main/java/de/erethon/dungeonsxl/world/block/TeamBed.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamBed.java rename to src/main/java/de/erethon/dungeonsxl/world/block/TeamBed.java index 21985515..242da9f4 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamBed.java +++ b/src/main/java/de/erethon/dungeonsxl/world/block/TeamBed.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world.block; +package de.erethon.dungeonsxl.world.block; 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; -import io.github.dre2n.dungeonsxl.util.LegacyUtil; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.util.LegacyUtil; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.block.BlockFace; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamBlock.java b/src/main/java/de/erethon/dungeonsxl/world/block/TeamBlock.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamBlock.java rename to src/main/java/de/erethon/dungeonsxl/world/block/TeamBlock.java index 6d0eca54..6a5f1a2d 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamBlock.java +++ b/src/main/java/de/erethon/dungeonsxl/world/block/TeamBlock.java @@ -14,9 +14,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world.block; +package de.erethon.dungeonsxl.world.block; -import io.github.dre2n.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.player.DGroup; import org.bukkit.block.Block; /** diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamFlag.java b/src/main/java/de/erethon/dungeonsxl/world/block/TeamFlag.java similarity index 88% rename from src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamFlag.java rename to src/main/java/de/erethon/dungeonsxl/world/block/TeamFlag.java index 7d6dfb8c..fb6067ed 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/block/TeamFlag.java +++ b/src/main/java/de/erethon/dungeonsxl/world/block/TeamFlag.java @@ -14,13 +14,13 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -package io.github.dre2n.dungeonsxl.world.block; +package de.erethon.dungeonsxl.world.block; 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; -import io.github.dre2n.dungeonsxl.util.LegacyUtil; +import de.erethon.dungeonsxl.config.DMessage; +import de.erethon.dungeonsxl.player.DGamePlayer; +import de.erethon.dungeonsxl.player.DGroup; +import de.erethon.dungeonsxl.util.LegacyUtil; import org.bukkit.Material; import org.bukkit.block.Block; import org.bukkit.entity.Player; diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 023a3b18..7edc3566 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,5 +1,5 @@ name: DungeonsXL -main: io.github.dre2n.dungeonsxl.DungeonsXL +main: de.erethon.dungeonsxl.DungeonsXL version: ${project.version}${buildNo} authors: [Frank Baumann, Milan Albrecht, Tobias Schmitz, Daniel Saukel] description: ${project.description}