From faa6d220f0e35e4a9dd9a5f9edb4f892ca7de696 Mon Sep 17 00:00:00 2001 From: Daniel Saukel Date: Sat, 9 Jul 2016 02:41:45 +0200 Subject: [PATCH] Restructured project --- .gitignore | 8 +- abstract/pom.xml | 13 ++++ .../util/worldloader/InternalsProvider.java | 29 ++++++++ core/pom.xml | 51 +++++++++++++ .../github/dre2n/dungeonsxl/DungeonsXL.java | 0 .../dre2n/dungeonsxl/announcer/Announcer.java | 0 .../dungeonsxl/announcer/Announcers.java | 0 .../dungeonsxl/command/BreakCommand.java | 0 .../dre2n/dungeonsxl/command/ChatCommand.java | 0 .../dungeonsxl/command/ChatSpyCommand.java | 0 .../dungeonsxl/command/CreateCommand.java | 0 .../dre2n/dungeonsxl/command/DCommands.java | 0 .../command/DeletePortalCommand.java | 0 .../dre2n/dungeonsxl/command/EditCommand.java | 0 .../dungeonsxl/command/EnterCommand.java | 0 .../dungeonsxl/command/EscapeCommand.java | 0 .../dre2n/dungeonsxl/command/GameCommand.java | 0 .../dungeonsxl/command/GroupCommand.java | 0 .../dre2n/dungeonsxl/command/HelpCommand.java | 0 .../dungeonsxl/command/ImportCommand.java | 0 .../dungeonsxl/command/InviteCommand.java | 0 .../dre2n/dungeonsxl/command/JoinCommand.java | 0 .../dre2n/dungeonsxl/command/KickCommand.java | 0 .../dungeonsxl/command/LeaveCommand.java | 0 .../dre2n/dungeonsxl/command/ListCommand.java | 0 .../dungeonsxl/command/LivesCommand.java | 0 .../dre2n/dungeonsxl/command/MainCommand.java | 0 .../dre2n/dungeonsxl/command/MsgCommand.java | 0 .../dre2n/dungeonsxl/command/PlayCommand.java | 0 .../dungeonsxl/command/PortalCommand.java | 0 .../dungeonsxl/command/ReloadCommand.java | 0 .../dre2n/dungeonsxl/command/SaveCommand.java | 0 .../dungeonsxl/command/StatusCommand.java | 0 .../dre2n/dungeonsxl/command/TestCommand.java | 0 .../dungeonsxl/command/UninviteCommand.java | 0 .../dre2n/dungeonsxl/config/DMessages.java | 0 .../dungeonsxl/config/DungeonConfig.java | 0 .../dre2n/dungeonsxl/config/GlobalData.java | 0 .../dre2n/dungeonsxl/config/MainConfig.java | 0 .../dre2n/dungeonsxl/config/PlayerData.java | 0 .../dre2n/dungeonsxl/config/SignData.java | 0 .../dre2n/dungeonsxl/config/WorldConfig.java | 0 .../dre2n/dungeonsxl/dungeon/Dungeon.java | 0 .../dre2n/dungeonsxl/dungeon/Dungeons.java | 0 .../event/dgroup/DGroupCreateEvent.java | 0 .../event/dgroup/DGroupDisbandEvent.java | 0 .../dungeonsxl/event/dgroup/DGroupEvent.java | 0 .../dgroup/DGroupFinishDungeonEvent.java | 0 .../event/dgroup/DGroupFinishFloorEvent.java | 0 .../event/dgroup/DGroupRewardEvent.java | 0 .../event/dgroup/DGroupStartFloorEvent.java | 0 .../dungeonsxl/event/dmob/DMobDeathEvent.java | 0 .../dungeonsxl/event/dmob/DMobEvent.java | 0 .../dungeonsxl/event/dmob/DMobSpawnEvent.java | 0 .../event/dplayer/DPlayerDeathEvent.java | 0 .../event/dplayer/DPlayerEscapeEvent.java | 0 .../event/dplayer/DPlayerEvent.java | 0 .../event/dplayer/DPlayerFinishEvent.java | 0 .../event/dplayer/DPlayerJoinDGroupEvent.java | 0 .../event/dplayer/DPlayerKickEvent.java | 0 .../dplayer/DPlayerLeaveDGroupEvent.java | 0 .../event/dplayer/DPlayerUpdateEvent.java | 0 .../dungeonsxl/event/dsign/DSignEvent.java | 0 .../event/dsign/DSignRegistrationEvent.java | 0 .../event/editworld/EditWorldEvent.java | 0 .../editworld/EditWorldGenerateEvent.java | 0 .../event/editworld/EditWorldLoadEvent.java | 0 .../event/editworld/EditWorldSaveEvent.java | 0 .../event/editworld/EditWorldUnloadEvent.java | 0 .../event/gameworld/GameWorldEvent.java | 0 .../event/gameworld/GameWorldLoadEvent.java | 0 .../gameworld/GameWorldStartGameEvent.java | 0 .../event/gameworld/GameWorldUnloadEvent.java | 0 .../requirement/RequirementCheckEvent.java | 0 .../requirement/RequirementDemandEvent.java | 0 .../event/requirement/RequirementEvent.java | 0 .../RequirementRegistrationEvent.java | 0 .../event/reward/RewardAdditionEvent.java | 0 .../dungeonsxl/event/reward/RewardEvent.java | 0 .../event/reward/RewardRegistrationEvent.java | 0 .../event/trigger/TriggerActionEvent.java | 0 .../event/trigger/TriggerEvent.java | 0 .../trigger/TriggerRegistrationEvent.java | 0 .../io/github/dre2n/dungeonsxl/game/Game.java | 0 .../dungeonsxl/game/GamePlaceableBlock.java | 0 .../dre2n/dungeonsxl/game/GameRules.java | 0 .../dre2n/dungeonsxl/game/GameType.java | 0 .../dungeonsxl/game/GameTypeDefault.java | 0 .../dre2n/dungeonsxl/game/GameTypes.java | 0 .../dre2n/dungeonsxl/global/DPortal.java | 0 .../dre2n/dungeonsxl/global/GameSign.java | 0 .../dungeonsxl/global/GlobalProtection.java | 0 .../dungeonsxl/global/GlobalProtections.java | 0 .../dre2n/dungeonsxl/global/GroupSign.java | 0 .../dre2n/dungeonsxl/global/LeaveSign.java | 0 .../dungeonsxl/listener/BlockListener.java | 0 .../dungeonsxl/listener/CitizensListener.java | 0 .../dungeonsxl/listener/EntityListener.java | 0 .../dungeonsxl/listener/GUIListener.java | 0 .../dungeonsxl/listener/HangingListener.java | 0 .../dungeonsxl/listener/PlayerListener.java | 0 .../dungeonsxl/listener/WorldListener.java | 0 .../dungeonsxl/mob/CitizensMobProvider.java | 0 .../mob/CustomExternalMobProvider.java | 0 .../io/github/dre2n/dungeonsxl/mob/DMob.java | 0 .../github/dre2n/dungeonsxl/mob/DMobType.java | 0 .../dre2n/dungeonsxl/mob/DMobTypes.java | 0 .../dre2n/dungeonsxl/mob/DNPCRegistry.java | 0 .../dungeonsxl/mob/ExternalMobPlugin.java | 0 .../dungeonsxl/mob/ExternalMobProvider.java | 0 .../dungeonsxl/mob/ExternalMobProviders.java | 0 .../dre2n/dungeonsxl/player/DClass.java | 0 .../dre2n/dungeonsxl/player/DClasses.java | 0 .../dre2n/dungeonsxl/player/DEditPlayer.java | 0 .../dre2n/dungeonsxl/player/DGamePlayer.java | 0 .../dungeonsxl/player/DGlobalPlayer.java | 0 .../dre2n/dungeonsxl/player/DGroup.java | 0 .../dungeonsxl/player/DInstancePlayer.java | 0 .../dre2n/dungeonsxl/player/DPermissions.java | 0 .../dre2n/dungeonsxl/player/DPlayers.java | 0 .../dre2n/dungeonsxl/player/DSavePlayer.java | 0 .../requirement/FeeLevelRequirement.java | 0 .../requirement/FeeMoneyRequirement.java | 0 .../requirement/GroupSizeRequirement.java | 0 .../requirement/PermissionRequirement.java | 0 .../dungeonsxl/requirement/Requirement.java | 0 .../requirement/RequirementType.java | 0 .../requirement/RequirementTypeDefault.java | 0 .../requirement/RequirementTypes.java | 0 .../dungeonsxl/reward/DLootInventory.java | 0 .../dre2n/dungeonsxl/reward/LevelReward.java | 0 .../dre2n/dungeonsxl/reward/MoneyReward.java | 0 .../dre2n/dungeonsxl/reward/Reward.java | 0 .../dre2n/dungeonsxl/reward/RewardChest.java | 0 .../dre2n/dungeonsxl/reward/RewardType.java | 0 .../dungeonsxl/reward/RewardTypeDefault.java | 0 .../dre2n/dungeonsxl/reward/RewardTypes.java | 0 .../dre2n/dungeonsxl/sign/BlockSign.java | 0 .../dre2n/dungeonsxl/sign/CheckpointSign.java | 0 .../dre2n/dungeonsxl/sign/ChestSign.java | 0 .../dungeonsxl/sign/ChunkUpdaterSign.java | 0 .../dre2n/dungeonsxl/sign/ClassesSign.java | 0 .../dre2n/dungeonsxl/sign/CommandSign.java | 0 .../dre2n/dungeonsxl/sign/DMobSign.java | 0 .../github/dre2n/dungeonsxl/sign/DSign.java | 0 .../dre2n/dungeonsxl/sign/DSignType.java | 0 .../dungeonsxl/sign/DSignTypeDefault.java | 0 .../dre2n/dungeonsxl/sign/DSignTypes.java | 0 .../dre2n/dungeonsxl/sign/DropSign.java | 0 .../github/dre2n/dungeonsxl/sign/EndSign.java | 0 .../dungeonsxl/sign/ExternalMobSign.java | 0 .../dre2n/dungeonsxl/sign/FloorSign.java | 0 .../dre2n/dungeonsxl/sign/HologramSign.java | 0 .../dre2n/dungeonsxl/sign/InteractSign.java | 0 .../dre2n/dungeonsxl/sign/LeaveSign.java | 0 .../dungeonsxl/sign/LivesModifierSign.java | 0 .../dre2n/dungeonsxl/sign/LobbySign.java | 0 .../dre2n/dungeonsxl/sign/MessageSign.java | 0 .../github/dre2n/dungeonsxl/sign/MobSign.java | 0 .../dre2n/dungeonsxl/sign/OpenDoorSign.java | 0 .../dre2n/dungeonsxl/sign/PlaceSign.java | 0 .../dre2n/dungeonsxl/sign/ReadySign.java | 0 .../dre2n/dungeonsxl/sign/RedstoneSign.java | 0 .../dre2n/dungeonsxl/sign/ScriptSign.java | 0 .../dre2n/dungeonsxl/sign/SignScript.java | 0 .../dre2n/dungeonsxl/sign/SignScripts.java | 0 .../dungeonsxl/sign/SoundMessageSign.java | 0 .../dre2n/dungeonsxl/sign/StartSign.java | 0 .../dre2n/dungeonsxl/sign/TeleportSign.java | 0 .../dre2n/dungeonsxl/sign/TriggerSign.java | 0 .../dre2n/dungeonsxl/sign/WaveSign.java | 0 .../task/AnnouncerStartGameTask.java | 0 .../dre2n/dungeonsxl/task/AnnouncerTask.java | 0 .../dungeonsxl/task/BackupResourceTask.java | 0 .../task/CreateDInstancePlayerTask.java | 0 .../dungeonsxl/task/DelayedPowerTask.java | 0 .../dre2n/dungeonsxl/task/DropItemTask.java | 0 .../dungeonsxl/task/ExternalMobSpawnTask.java | 0 .../dre2n/dungeonsxl/task/LazyUpdateTask.java | 0 .../dre2n/dungeonsxl/task/MobSpawnTask.java | 0 .../dungeonsxl/task/RedstoneEventTask.java | 0 .../dre2n/dungeonsxl/task/RespawnTask.java | 0 .../dre2n/dungeonsxl/task/SecureModeTask.java | 0 .../dre2n/dungeonsxl/task/SignUpdateTask.java | 0 .../dungeonsxl/task/TimeIsRunningTask.java | 0 .../dre2n/dungeonsxl/task/UpdateTask.java | 0 .../dungeonsxl/task/WorldUnloadTask.java | 0 .../dungeonsxl/trigger/DistanceTrigger.java | 0 .../dungeonsxl/trigger/FortuneTrigger.java | 0 .../dungeonsxl/trigger/InteractTrigger.java | 0 .../dre2n/dungeonsxl/trigger/MobTrigger.java | 0 .../dungeonsxl/trigger/ProgressTrigger.java | 0 .../dungeonsxl/trigger/RedstoneTrigger.java | 0 .../dre2n/dungeonsxl/trigger/SignTrigger.java | 0 .../dre2n/dungeonsxl/trigger/Trigger.java | 0 .../dre2n/dungeonsxl/trigger/TriggerType.java | 0 .../trigger/TriggerTypeDefault.java | 0 .../dungeonsxl/trigger/TriggerTypes.java | 0 .../dungeonsxl/trigger/UseItemTrigger.java | 0 .../dre2n/dungeonsxl/trigger/WaveTrigger.java | 0 .../dungeonsxl/util/DeserialisazionUtil.java | 0 .../dre2n/dungeonsxl/util/ProgressBar.java | 0 .../util/worldloader/WorldLoader.java | 50 +++++++++++++ .../dre2n/dungeonsxl/world/DEditWorld.java | 0 .../dre2n/dungeonsxl/world/DGameWorld.java | 0 .../dungeonsxl/world/DInstanceWorld.java | 0 .../dungeonsxl/world/DResourceWorld.java | 2 +- .../dre2n/dungeonsxl/world/DWorlds.java | 0 {src => core/src}/main/resources/plugin.yml | 0 .../io/github/dre2n/dungeonsxl/DXLTest.java | 0 .../dungeonsxl/command/CustomCommand.java | 0 .../dre2n/dungeonsxl/game/CustomGameType.java | 0 .../dungeonsxl/global/ChestProtection.java | 0 .../dungeonsxl/listener/DGroupListener.java | 0 .../dungeonsxl/listener/DMobListener.java | 0 .../dungeonsxl/listener/DPlayerListener.java | 0 .../dungeonsxl/listener/DSignListener.java | 0 .../listener/EditWorldListener.java | 0 .../listener/GameWorldListener.java | 0 .../listener/RequirementListener.java | 0 .../dungeonsxl/listener/RewardListener.java | 0 .../dungeonsxl/listener/TriggerListener.java | 0 .../requirement/AwesomenessRequirement.java | 0 .../requirement/RequirementTypeCustom.java | 0 .../reward/HighwayToHellReward.java | 0 .../dungeonsxl/reward/RewardTypeCustom.java | 0 .../dre2n/dungeonsxl/sign/CustomSign.java | 0 .../dungeonsxl/sign/DSignTypeCustom.java | 0 .../dungeonsxl/trigger/CustomTrigger.java | 0 .../dungeonsxl/trigger/TriggerTypeCustom.java | 0 {src => core/src}/test/resources/plugin.yml | 0 craftbukkit_1_10_R1/pom.xml | 40 ++++++++++ .../dungeonsxl/util/worldloader/v1_10_R1.java | 29 +++----- pom.xml | 66 ++--------------- shade/pom.xml | 74 +++++++++++++++++++ 235 files changed, 282 insertions(+), 80 deletions(-) create mode 100644 abstract/pom.xml create mode 100644 abstract/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/InternalsProvider.java create mode 100644 core/pom.xml rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/announcer/Announcer.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/announcer/Announcers.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/BreakCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/ChatCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/ChatSpyCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/CreateCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/DCommands.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/EditCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/EscapeCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/GameCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/GroupCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/HelpCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/ImportCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/InviteCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/JoinCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/KickCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/LeaveCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/ListCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/MainCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/MsgCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/PortalCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/SaveCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/StatusCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/TestCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/command/UninviteCommand.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/config/DMessages.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/config/DungeonConfig.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/config/GlobalData.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/config/MainConfig.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/config/PlayerData.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/config/SignData.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/config/WorldConfig.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeon.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeons.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupCreateEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupDisbandEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupFinishDungeonEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupFinishFloorEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupRewardEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupStartFloorEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobDeathEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobSpawnEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerDeathEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerEscapeEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerFinishEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerJoinDGroupEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerKickEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerLeaveDGroupEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerUpdateEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dsign/DSignEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/dsign/DSignRegistrationEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldGenerateEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldLoadEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldSaveEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldUnloadEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldLoadEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldStartGameEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldUnloadEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementCheckEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementDemandEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementRegistrationEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardAdditionEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardRegistrationEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerActionEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerRegistrationEvent.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/game/Game.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/game/GamePlaceableBlock.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/game/GameRules.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/game/GameType.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/game/GameTypeDefault.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/game/GameTypes.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/global/DPortal.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/global/GameSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtection.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtections.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/global/GroupSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/global/LeaveSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/listener/BlockListener.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/listener/CitizensListener.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/listener/EntityListener.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/listener/GUIListener.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/listener/HangingListener.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/listener/PlayerListener.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/listener/WorldListener.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/mob/CitizensMobProvider.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/mob/CustomExternalMobProvider.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/mob/DMob.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/mob/DMobType.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/mob/DMobTypes.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/mob/DNPCRegistry.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobPlugin.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProvider.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProviders.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/player/DClass.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/player/DClasses.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/player/DEditPlayer.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/player/DGlobalPlayer.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/player/DGroup.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/player/DInstancePlayer.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/player/DPermissions.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/player/DPlayers.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/player/DSavePlayer.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/requirement/FeeLevelRequirement.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/requirement/FeeMoneyRequirement.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/requirement/GroupSizeRequirement.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/requirement/PermissionRequirement.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/requirement/Requirement.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementType.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeDefault.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypes.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/reward/DLootInventory.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/reward/LevelReward.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/reward/MoneyReward.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/reward/Reward.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/reward/RewardChest.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/reward/RewardType.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/reward/RewardTypeDefault.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/reward/RewardTypes.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/BlockSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/CheckpointSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/ChestSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/ChunkUpdaterSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/ClassesSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/CommandSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/DMobSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/DSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/DSignType.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/DSignTypeDefault.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/DSignTypes.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/DropSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/EndSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/ExternalMobSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/FloorSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/HologramSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/InteractSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/LeaveSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/LivesModifierSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/LobbySign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/MessageSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/MobSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/OpenDoorSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/PlaceSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/ReadySign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/RedstoneSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/ScriptSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/SignScript.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/SignScripts.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/SoundMessageSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/StartSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/TeleportSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/TriggerSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/sign/WaveSign.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/task/AnnouncerStartGameTask.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/task/AnnouncerTask.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/task/BackupResourceTask.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/task/CreateDInstancePlayerTask.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/task/DelayedPowerTask.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/task/DropItemTask.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/task/ExternalMobSpawnTask.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/task/LazyUpdateTask.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/task/MobSpawnTask.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/task/RedstoneEventTask.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/task/RespawnTask.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/task/SecureModeTask.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/task/SignUpdateTask.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/task/TimeIsRunningTask.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/task/UpdateTask.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/task/WorldUnloadTask.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/trigger/DistanceTrigger.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/trigger/FortuneTrigger.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/trigger/InteractTrigger.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/trigger/MobTrigger.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/trigger/ProgressTrigger.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/trigger/RedstoneTrigger.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/trigger/SignTrigger.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/trigger/Trigger.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerType.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeDefault.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypes.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/trigger/UseItemTrigger.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/trigger/WaveTrigger.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/util/DeserialisazionUtil.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/util/ProgressBar.java (100%) create mode 100644 core/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/WorldLoader.java rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/world/DEditWorld.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/world/DGameWorld.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/world/DInstanceWorld.java (100%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java (99%) rename {src => core/src}/main/java/io/github/dre2n/dungeonsxl/world/DWorlds.java (100%) rename {src => core/src}/main/resources/plugin.yml (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/DXLTest.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/command/CustomCommand.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/game/CustomGameType.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/global/ChestProtection.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/listener/DGroupListener.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/listener/DMobListener.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/listener/DPlayerListener.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/listener/DSignListener.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/listener/EditWorldListener.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/listener/GameWorldListener.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/listener/RequirementListener.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/listener/RewardListener.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/listener/TriggerListener.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/requirement/AwesomenessRequirement.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeCustom.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/reward/HighwayToHellReward.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/reward/RewardTypeCustom.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/sign/CustomSign.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/sign/DSignTypeCustom.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/trigger/CustomTrigger.java (100%) rename {src => core/src}/test/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeCustom.java (100%) rename {src => core/src}/test/resources/plugin.yml (100%) create mode 100644 craftbukkit_1_10_R1/pom.xml rename src/main/java/io/github/dre2n/dungeonsxl/util/WorldLoader.java => craftbukkit_1_10_R1/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/v1_10_R1.java (92%) create mode 100644 shade/pom.xml diff --git a/.gitignore b/.gitignore index 0d236475..df34b828 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,6 @@ -/nb-configuration.xml -/target -/dependency-reduced-pom.xml +nb-configuration.xml +dependency-reduced-pom.xml licenseheader.txt +*dependency-reduced-pom.xml +*nb-configuration.xml +*/target diff --git a/abstract/pom.xml b/abstract/pom.xml new file mode 100644 index 00000000..b3cc830c --- /dev/null +++ b/abstract/pom.xml @@ -0,0 +1,13 @@ + + 4.0.0 + io.github.dre2n + dungeonsxl-abstract + ${parent.version} + jar + dungeonsxl-abstract + + io.github.dre2n + dungeonsxl + 0.14-SNAPSHOT${buildNo} + + diff --git a/abstract/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/InternalsProvider.java b/abstract/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/InternalsProvider.java new file mode 100644 index 00000000..20db89cd --- /dev/null +++ b/abstract/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/InternalsProvider.java @@ -0,0 +1,29 @@ +/* + * Copyright (C) 2012-2016 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.util.worldloader; + +import org.bukkit.World; +import org.bukkit.WorldCreator; + +/** + * @author Daniel Saukel + */ +abstract class InternalsProvider { + + abstract World createWorld(WorldCreator creator); + +} diff --git a/core/pom.xml b/core/pom.xml new file mode 100644 index 00000000..1fd519b5 --- /dev/null +++ b/core/pom.xml @@ -0,0 +1,51 @@ + + 4.0.0 + io.github.dre2n + dungeonsxl-core + 0.14-SNAPSHOT${buildNo} + jar + dungeonsxl-core + + io.github.dre2n + dungeonsxl + 0.14-SNAPSHOT${buildNo} + + + + + . + true + src/main/resources/ + + plugin.yml + + + + + + maven-compiler-plugin + 2.5.1 + + 1.7 + 1.7 + + + + + + + io.github.dre2n + dungeonsxl-abstract + ${parent.version} + jar + compile + + + io.github.dre2n + dungeonsxl-craftbukkit_1_10_R1 + ${parent.version} + jar + compile + + + diff --git a/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java b/core/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/DungeonsXL.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcer.java b/core/src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcer.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcer.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcer.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcers.java b/core/src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcers.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcers.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/announcer/Announcers.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/BreakCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/BreakCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/BreakCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/BreakCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ChatCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/ChatCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/ChatCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/ChatCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ChatSpyCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/ChatSpyCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/ChatSpyCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/ChatSpyCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/CreateCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/CreateCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/CreateCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/CreateCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/DCommands.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/DCommands.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/DCommands.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/DCommands.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/DeletePortalCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/EditCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/EditCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/EditCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/EditCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/EnterCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/EscapeCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/EscapeCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/EscapeCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/EscapeCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/GameCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/GameCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/GameCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/GameCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/GroupCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/GroupCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/GroupCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/GroupCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/HelpCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/HelpCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/HelpCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/HelpCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ImportCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/ImportCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/ImportCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/ImportCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/InviteCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/InviteCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/InviteCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/InviteCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/JoinCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/JoinCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/JoinCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/JoinCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/KickCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/KickCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/KickCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/KickCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/LeaveCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/LeaveCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/LeaveCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/LeaveCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ListCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/ListCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/ListCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/ListCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/LivesCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/MainCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/MainCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/MainCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/MainCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/MsgCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/MsgCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/MsgCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/MsgCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/PlayCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/PortalCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/PortalCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/PortalCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/PortalCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/ReloadCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/SaveCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/SaveCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/SaveCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/SaveCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/StatusCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/StatusCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/StatusCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/StatusCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/TestCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/TestCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/TestCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/TestCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/command/UninviteCommand.java b/core/src/main/java/io/github/dre2n/dungeonsxl/command/UninviteCommand.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/command/UninviteCommand.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/command/UninviteCommand.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/config/DMessages.java b/core/src/main/java/io/github/dre2n/dungeonsxl/config/DMessages.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/config/DMessages.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/config/DMessages.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/config/DungeonConfig.java b/core/src/main/java/io/github/dre2n/dungeonsxl/config/DungeonConfig.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/config/DungeonConfig.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/config/DungeonConfig.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/config/GlobalData.java b/core/src/main/java/io/github/dre2n/dungeonsxl/config/GlobalData.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/config/GlobalData.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/config/GlobalData.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/config/MainConfig.java b/core/src/main/java/io/github/dre2n/dungeonsxl/config/MainConfig.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/config/MainConfig.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/config/MainConfig.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/config/PlayerData.java b/core/src/main/java/io/github/dre2n/dungeonsxl/config/PlayerData.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/config/PlayerData.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/config/PlayerData.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/config/SignData.java b/core/src/main/java/io/github/dre2n/dungeonsxl/config/SignData.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/config/SignData.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/config/SignData.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/config/WorldConfig.java b/core/src/main/java/io/github/dre2n/dungeonsxl/config/WorldConfig.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/config/WorldConfig.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/config/WorldConfig.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeon.java b/core/src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeon.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeon.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeon.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeons.java b/core/src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeons.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeons.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/dungeon/Dungeons.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupCreateEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupCreateEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupCreateEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupCreateEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupDisbandEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupDisbandEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupDisbandEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupDisbandEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupFinishDungeonEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupFinishDungeonEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupFinishDungeonEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupFinishDungeonEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupFinishFloorEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupFinishFloorEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupFinishFloorEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupFinishFloorEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupRewardEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupRewardEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupRewardEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupRewardEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupStartFloorEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupStartFloorEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupStartFloorEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupStartFloorEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobDeathEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobDeathEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobDeathEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobDeathEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobSpawnEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobSpawnEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobSpawnEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dmob/DMobSpawnEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerDeathEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerDeathEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerDeathEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerDeathEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerEscapeEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerEscapeEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerEscapeEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerEscapeEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerFinishEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerFinishEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerFinishEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerFinishEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerJoinDGroupEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerJoinDGroupEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerJoinDGroupEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerJoinDGroupEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerKickEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerKickEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerKickEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerKickEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerLeaveDGroupEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerLeaveDGroupEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerLeaveDGroupEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerLeaveDGroupEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerUpdateEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerUpdateEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerUpdateEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dplayer/DPlayerUpdateEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dsign/DSignEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dsign/DSignEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dsign/DSignEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dsign/DSignEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/dsign/DSignRegistrationEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/dsign/DSignRegistrationEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/dsign/DSignRegistrationEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/dsign/DSignRegistrationEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldGenerateEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldGenerateEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldGenerateEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldGenerateEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldLoadEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldLoadEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldLoadEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldLoadEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldSaveEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldSaveEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldSaveEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldSaveEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldUnloadEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldUnloadEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldUnloadEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldUnloadEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldLoadEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldLoadEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldLoadEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldLoadEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldStartGameEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldStartGameEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldStartGameEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldStartGameEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldUnloadEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldUnloadEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldUnloadEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldUnloadEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementCheckEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementCheckEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementCheckEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementCheckEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementDemandEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementDemandEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementDemandEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementDemandEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementRegistrationEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementRegistrationEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementRegistrationEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/requirement/RequirementRegistrationEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardAdditionEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardAdditionEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardAdditionEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardAdditionEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardRegistrationEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardRegistrationEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardRegistrationEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/reward/RewardRegistrationEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerActionEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerActionEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerActionEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerActionEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerRegistrationEvent.java b/core/src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerRegistrationEvent.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerRegistrationEvent.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/event/trigger/TriggerRegistrationEvent.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/game/Game.java b/core/src/main/java/io/github/dre2n/dungeonsxl/game/Game.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/game/Game.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/game/Game.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/game/GamePlaceableBlock.java b/core/src/main/java/io/github/dre2n/dungeonsxl/game/GamePlaceableBlock.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/game/GamePlaceableBlock.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/game/GamePlaceableBlock.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/game/GameRules.java b/core/src/main/java/io/github/dre2n/dungeonsxl/game/GameRules.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/game/GameRules.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/game/GameRules.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/game/GameType.java b/core/src/main/java/io/github/dre2n/dungeonsxl/game/GameType.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/game/GameType.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/game/GameType.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/game/GameTypeDefault.java b/core/src/main/java/io/github/dre2n/dungeonsxl/game/GameTypeDefault.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/game/GameTypeDefault.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/game/GameTypeDefault.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/game/GameTypes.java b/core/src/main/java/io/github/dre2n/dungeonsxl/game/GameTypes.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/game/GameTypes.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/game/GameTypes.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/DPortal.java b/core/src/main/java/io/github/dre2n/dungeonsxl/global/DPortal.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/global/DPortal.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/global/DPortal.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/GameSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/global/GameSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/global/GameSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/global/GameSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtection.java b/core/src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtection.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtection.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtection.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtections.java b/core/src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtections.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtections.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/global/GlobalProtections.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/GroupSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/global/GroupSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/global/GroupSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/global/GroupSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/global/LeaveSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/global/LeaveSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/global/LeaveSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/global/LeaveSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/listener/BlockListener.java b/core/src/main/java/io/github/dre2n/dungeonsxl/listener/BlockListener.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/listener/BlockListener.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/listener/BlockListener.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/listener/CitizensListener.java b/core/src/main/java/io/github/dre2n/dungeonsxl/listener/CitizensListener.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/listener/CitizensListener.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/listener/CitizensListener.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/listener/EntityListener.java b/core/src/main/java/io/github/dre2n/dungeonsxl/listener/EntityListener.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/listener/EntityListener.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/listener/EntityListener.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/listener/GUIListener.java b/core/src/main/java/io/github/dre2n/dungeonsxl/listener/GUIListener.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/listener/GUIListener.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/listener/GUIListener.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/listener/HangingListener.java b/core/src/main/java/io/github/dre2n/dungeonsxl/listener/HangingListener.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/listener/HangingListener.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/listener/HangingListener.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/listener/PlayerListener.java b/core/src/main/java/io/github/dre2n/dungeonsxl/listener/PlayerListener.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/listener/PlayerListener.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/listener/PlayerListener.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/listener/WorldListener.java b/core/src/main/java/io/github/dre2n/dungeonsxl/listener/WorldListener.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/listener/WorldListener.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/listener/WorldListener.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/CitizensMobProvider.java b/core/src/main/java/io/github/dre2n/dungeonsxl/mob/CitizensMobProvider.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/CitizensMobProvider.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/mob/CitizensMobProvider.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/CustomExternalMobProvider.java b/core/src/main/java/io/github/dre2n/dungeonsxl/mob/CustomExternalMobProvider.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/CustomExternalMobProvider.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/mob/CustomExternalMobProvider.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/DMob.java b/core/src/main/java/io/github/dre2n/dungeonsxl/mob/DMob.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/DMob.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/mob/DMob.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/DMobType.java b/core/src/main/java/io/github/dre2n/dungeonsxl/mob/DMobType.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/DMobType.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/mob/DMobType.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/DMobTypes.java b/core/src/main/java/io/github/dre2n/dungeonsxl/mob/DMobTypes.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/DMobTypes.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/mob/DMobTypes.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/DNPCRegistry.java b/core/src/main/java/io/github/dre2n/dungeonsxl/mob/DNPCRegistry.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/DNPCRegistry.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/mob/DNPCRegistry.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobPlugin.java b/core/src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobPlugin.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobPlugin.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobPlugin.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProvider.java b/core/src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProvider.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProvider.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProvider.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProviders.java b/core/src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProviders.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProviders.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/mob/ExternalMobProviders.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DClass.java b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DClass.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DClass.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/player/DClass.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DClasses.java b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DClasses.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DClasses.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/player/DClasses.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DEditPlayer.java b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DEditPlayer.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DEditPlayer.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/player/DEditPlayer.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/player/DGamePlayer.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DGlobalPlayer.java b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DGlobalPlayer.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DGlobalPlayer.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/player/DGlobalPlayer.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DGroup.java b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DGroup.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DGroup.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/player/DGroup.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DInstancePlayer.java b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DInstancePlayer.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DInstancePlayer.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/player/DInstancePlayer.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DPermissions.java b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DPermissions.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DPermissions.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/player/DPermissions.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayers.java b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayers.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DPlayers.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/player/DPlayers.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/player/DSavePlayer.java b/core/src/main/java/io/github/dre2n/dungeonsxl/player/DSavePlayer.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/player/DSavePlayer.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/player/DSavePlayer.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeLevelRequirement.java b/core/src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeLevelRequirement.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeLevelRequirement.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeLevelRequirement.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeMoneyRequirement.java b/core/src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeMoneyRequirement.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeMoneyRequirement.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/requirement/FeeMoneyRequirement.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/GroupSizeRequirement.java b/core/src/main/java/io/github/dre2n/dungeonsxl/requirement/GroupSizeRequirement.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/requirement/GroupSizeRequirement.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/requirement/GroupSizeRequirement.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/PermissionRequirement.java b/core/src/main/java/io/github/dre2n/dungeonsxl/requirement/PermissionRequirement.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/requirement/PermissionRequirement.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/requirement/PermissionRequirement.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/Requirement.java b/core/src/main/java/io/github/dre2n/dungeonsxl/requirement/Requirement.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/requirement/Requirement.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/requirement/Requirement.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementType.java b/core/src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementType.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementType.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementType.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeDefault.java b/core/src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeDefault.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeDefault.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeDefault.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypes.java b/core/src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypes.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypes.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypes.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/DLootInventory.java b/core/src/main/java/io/github/dre2n/dungeonsxl/reward/DLootInventory.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/reward/DLootInventory.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/reward/DLootInventory.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/LevelReward.java b/core/src/main/java/io/github/dre2n/dungeonsxl/reward/LevelReward.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/reward/LevelReward.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/reward/LevelReward.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/MoneyReward.java b/core/src/main/java/io/github/dre2n/dungeonsxl/reward/MoneyReward.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/reward/MoneyReward.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/reward/MoneyReward.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/Reward.java b/core/src/main/java/io/github/dre2n/dungeonsxl/reward/Reward.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/reward/Reward.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/reward/Reward.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardChest.java b/core/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardChest.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/reward/RewardChest.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardChest.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardType.java b/core/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardType.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/reward/RewardType.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardType.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardTypeDefault.java b/core/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardTypeDefault.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/reward/RewardTypeDefault.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardTypeDefault.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardTypes.java b/core/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardTypes.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/reward/RewardTypes.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/reward/RewardTypes.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/BlockSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/BlockSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/BlockSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/BlockSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/CheckpointSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/CheckpointSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/CheckpointSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/CheckpointSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/ChestSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/ChestSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/ChestSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/ChestSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/ChunkUpdaterSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/ChunkUpdaterSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/ChunkUpdaterSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/ChunkUpdaterSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/ClassesSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/ClassesSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/ClassesSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/ClassesSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/CommandSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/CommandSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/CommandSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/CommandSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/DMobSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/DMobSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/DMobSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/DMobSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/DSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/DSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/DSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/DSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignType.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignType.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/DSignType.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignType.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignTypeDefault.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignTypeDefault.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/DSignTypeDefault.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignTypeDefault.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignTypes.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignTypes.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/DSignTypes.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/DSignTypes.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/DropSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/DropSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/DropSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/DropSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/EndSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/EndSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/EndSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/EndSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/ExternalMobSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/ExternalMobSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/ExternalMobSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/ExternalMobSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/FloorSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/FloorSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/FloorSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/FloorSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/HologramSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/HologramSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/HologramSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/HologramSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/InteractSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/InteractSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/InteractSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/InteractSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/LeaveSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/LeaveSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/LeaveSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/LeaveSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/LivesModifierSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/LivesModifierSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/LivesModifierSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/LivesModifierSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/LobbySign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/LobbySign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/LobbySign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/LobbySign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/MessageSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/MessageSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/MessageSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/MessageSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/MobSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/MobSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/MobSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/MobSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/OpenDoorSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/OpenDoorSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/OpenDoorSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/OpenDoorSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/PlaceSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/PlaceSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/PlaceSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/PlaceSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/ReadySign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/ReadySign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/ReadySign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/ReadySign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/RedstoneSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/RedstoneSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/RedstoneSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/RedstoneSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/ScriptSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/ScriptSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/ScriptSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/ScriptSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScript.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScript.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/SignScript.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScript.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScripts.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScripts.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/SignScripts.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/SignScripts.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/SoundMessageSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/SoundMessageSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/SoundMessageSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/SoundMessageSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/StartSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/StartSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/StartSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/StartSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/TeleportSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/TeleportSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/TeleportSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/TeleportSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/TriggerSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/TriggerSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/TriggerSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/TriggerSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/sign/WaveSign.java b/core/src/main/java/io/github/dre2n/dungeonsxl/sign/WaveSign.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/sign/WaveSign.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/sign/WaveSign.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/task/AnnouncerStartGameTask.java b/core/src/main/java/io/github/dre2n/dungeonsxl/task/AnnouncerStartGameTask.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/task/AnnouncerStartGameTask.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/task/AnnouncerStartGameTask.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/task/AnnouncerTask.java b/core/src/main/java/io/github/dre2n/dungeonsxl/task/AnnouncerTask.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/task/AnnouncerTask.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/task/AnnouncerTask.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/task/BackupResourceTask.java b/core/src/main/java/io/github/dre2n/dungeonsxl/task/BackupResourceTask.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/task/BackupResourceTask.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/task/BackupResourceTask.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/task/CreateDInstancePlayerTask.java b/core/src/main/java/io/github/dre2n/dungeonsxl/task/CreateDInstancePlayerTask.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/task/CreateDInstancePlayerTask.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/task/CreateDInstancePlayerTask.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/task/DelayedPowerTask.java b/core/src/main/java/io/github/dre2n/dungeonsxl/task/DelayedPowerTask.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/task/DelayedPowerTask.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/task/DelayedPowerTask.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/task/DropItemTask.java b/core/src/main/java/io/github/dre2n/dungeonsxl/task/DropItemTask.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/task/DropItemTask.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/task/DropItemTask.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/task/ExternalMobSpawnTask.java b/core/src/main/java/io/github/dre2n/dungeonsxl/task/ExternalMobSpawnTask.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/task/ExternalMobSpawnTask.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/task/ExternalMobSpawnTask.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/task/LazyUpdateTask.java b/core/src/main/java/io/github/dre2n/dungeonsxl/task/LazyUpdateTask.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/task/LazyUpdateTask.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/task/LazyUpdateTask.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/task/MobSpawnTask.java b/core/src/main/java/io/github/dre2n/dungeonsxl/task/MobSpawnTask.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/task/MobSpawnTask.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/task/MobSpawnTask.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/task/RedstoneEventTask.java b/core/src/main/java/io/github/dre2n/dungeonsxl/task/RedstoneEventTask.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/task/RedstoneEventTask.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/task/RedstoneEventTask.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/task/RespawnTask.java b/core/src/main/java/io/github/dre2n/dungeonsxl/task/RespawnTask.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/task/RespawnTask.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/task/RespawnTask.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/task/SecureModeTask.java b/core/src/main/java/io/github/dre2n/dungeonsxl/task/SecureModeTask.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/task/SecureModeTask.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/task/SecureModeTask.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/task/SignUpdateTask.java b/core/src/main/java/io/github/dre2n/dungeonsxl/task/SignUpdateTask.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/task/SignUpdateTask.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/task/SignUpdateTask.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/task/TimeIsRunningTask.java b/core/src/main/java/io/github/dre2n/dungeonsxl/task/TimeIsRunningTask.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/task/TimeIsRunningTask.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/task/TimeIsRunningTask.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/task/UpdateTask.java b/core/src/main/java/io/github/dre2n/dungeonsxl/task/UpdateTask.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/task/UpdateTask.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/task/UpdateTask.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/task/WorldUnloadTask.java b/core/src/main/java/io/github/dre2n/dungeonsxl/task/WorldUnloadTask.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/task/WorldUnloadTask.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/task/WorldUnloadTask.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/DistanceTrigger.java b/core/src/main/java/io/github/dre2n/dungeonsxl/trigger/DistanceTrigger.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/DistanceTrigger.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/trigger/DistanceTrigger.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/FortuneTrigger.java b/core/src/main/java/io/github/dre2n/dungeonsxl/trigger/FortuneTrigger.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/FortuneTrigger.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/trigger/FortuneTrigger.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/InteractTrigger.java b/core/src/main/java/io/github/dre2n/dungeonsxl/trigger/InteractTrigger.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/InteractTrigger.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/trigger/InteractTrigger.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/MobTrigger.java b/core/src/main/java/io/github/dre2n/dungeonsxl/trigger/MobTrigger.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/MobTrigger.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/trigger/MobTrigger.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/ProgressTrigger.java b/core/src/main/java/io/github/dre2n/dungeonsxl/trigger/ProgressTrigger.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/ProgressTrigger.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/trigger/ProgressTrigger.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/RedstoneTrigger.java b/core/src/main/java/io/github/dre2n/dungeonsxl/trigger/RedstoneTrigger.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/RedstoneTrigger.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/trigger/RedstoneTrigger.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/SignTrigger.java b/core/src/main/java/io/github/dre2n/dungeonsxl/trigger/SignTrigger.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/SignTrigger.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/trigger/SignTrigger.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/Trigger.java b/core/src/main/java/io/github/dre2n/dungeonsxl/trigger/Trigger.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/Trigger.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/trigger/Trigger.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerType.java b/core/src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerType.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerType.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerType.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeDefault.java b/core/src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeDefault.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeDefault.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeDefault.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypes.java b/core/src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypes.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypes.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypes.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/UseItemTrigger.java b/core/src/main/java/io/github/dre2n/dungeonsxl/trigger/UseItemTrigger.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/UseItemTrigger.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/trigger/UseItemTrigger.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/trigger/WaveTrigger.java b/core/src/main/java/io/github/dre2n/dungeonsxl/trigger/WaveTrigger.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/trigger/WaveTrigger.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/trigger/WaveTrigger.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/util/DeserialisazionUtil.java b/core/src/main/java/io/github/dre2n/dungeonsxl/util/DeserialisazionUtil.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/util/DeserialisazionUtil.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/util/DeserialisazionUtil.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/util/ProgressBar.java b/core/src/main/java/io/github/dre2n/dungeonsxl/util/ProgressBar.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/util/ProgressBar.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/util/ProgressBar.java diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/WorldLoader.java b/core/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/WorldLoader.java new file mode 100644 index 00000000..973ef8be --- /dev/null +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/WorldLoader.java @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2012-2016 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.util.worldloader; + +import io.github.dre2n.commons.compatibility.CompatibilityHandler; +import org.bukkit.World; +import org.bukkit.WorldCreator; + +/** + * A custom thread safe world loader. + * + * @author Daniel Saukel + */ +public class WorldLoader { + + static InternalsProvider internals; + + static { + switch (CompatibilityHandler.getInstance().getInternals()) { + case v1_10_R1: + internals = new v1_10_R1(); + break; + } + } + + /** + * @param creator + * the WorldCreator which stores the information to create the new world + * @return + * the new World + */ + public static World createWorld(WorldCreator creator) { + return internals.createWorld(creator); + } + +} diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/DEditWorld.java b/core/src/main/java/io/github/dre2n/dungeonsxl/world/DEditWorld.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/world/DEditWorld.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/world/DEditWorld.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/DGameWorld.java b/core/src/main/java/io/github/dre2n/dungeonsxl/world/DGameWorld.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/world/DGameWorld.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/world/DGameWorld.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/DInstanceWorld.java b/core/src/main/java/io/github/dre2n/dungeonsxl/world/DInstanceWorld.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/world/DInstanceWorld.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/world/DInstanceWorld.java diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java b/core/src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java similarity index 99% rename from src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java index d9e652ca..eb35264a 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java +++ b/core/src/main/java/io/github/dre2n/dungeonsxl/world/DResourceWorld.java @@ -23,7 +23,7 @@ import io.github.dre2n.dungeonsxl.config.WorldConfig; import io.github.dre2n.dungeonsxl.event.editworld.EditWorldGenerateEvent; import io.github.dre2n.dungeonsxl.player.DEditPlayer; import io.github.dre2n.dungeonsxl.task.BackupResourceTask; -import io.github.dre2n.dungeonsxl.util.WorldLoader; +import io.github.dre2n.dungeonsxl.util.worldloader.WorldLoader; import java.io.File; import java.io.IOException; import org.bukkit.Bukkit; diff --git a/src/main/java/io/github/dre2n/dungeonsxl/world/DWorlds.java b/core/src/main/java/io/github/dre2n/dungeonsxl/world/DWorlds.java similarity index 100% rename from src/main/java/io/github/dre2n/dungeonsxl/world/DWorlds.java rename to core/src/main/java/io/github/dre2n/dungeonsxl/world/DWorlds.java diff --git a/src/main/resources/plugin.yml b/core/src/main/resources/plugin.yml similarity index 100% rename from src/main/resources/plugin.yml rename to core/src/main/resources/plugin.yml diff --git a/src/test/java/io/github/dre2n/dungeonsxl/DXLTest.java b/core/src/test/java/io/github/dre2n/dungeonsxl/DXLTest.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/DXLTest.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/DXLTest.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/command/CustomCommand.java b/core/src/test/java/io/github/dre2n/dungeonsxl/command/CustomCommand.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/command/CustomCommand.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/command/CustomCommand.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/game/CustomGameType.java b/core/src/test/java/io/github/dre2n/dungeonsxl/game/CustomGameType.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/game/CustomGameType.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/game/CustomGameType.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/global/ChestProtection.java b/core/src/test/java/io/github/dre2n/dungeonsxl/global/ChestProtection.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/global/ChestProtection.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/global/ChestProtection.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/listener/DGroupListener.java b/core/src/test/java/io/github/dre2n/dungeonsxl/listener/DGroupListener.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/listener/DGroupListener.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/listener/DGroupListener.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/listener/DMobListener.java b/core/src/test/java/io/github/dre2n/dungeonsxl/listener/DMobListener.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/listener/DMobListener.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/listener/DMobListener.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/listener/DPlayerListener.java b/core/src/test/java/io/github/dre2n/dungeonsxl/listener/DPlayerListener.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/listener/DPlayerListener.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/listener/DPlayerListener.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/listener/DSignListener.java b/core/src/test/java/io/github/dre2n/dungeonsxl/listener/DSignListener.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/listener/DSignListener.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/listener/DSignListener.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/listener/EditWorldListener.java b/core/src/test/java/io/github/dre2n/dungeonsxl/listener/EditWorldListener.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/listener/EditWorldListener.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/listener/EditWorldListener.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/listener/GameWorldListener.java b/core/src/test/java/io/github/dre2n/dungeonsxl/listener/GameWorldListener.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/listener/GameWorldListener.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/listener/GameWorldListener.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/listener/RequirementListener.java b/core/src/test/java/io/github/dre2n/dungeonsxl/listener/RequirementListener.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/listener/RequirementListener.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/listener/RequirementListener.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/listener/RewardListener.java b/core/src/test/java/io/github/dre2n/dungeonsxl/listener/RewardListener.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/listener/RewardListener.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/listener/RewardListener.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/listener/TriggerListener.java b/core/src/test/java/io/github/dre2n/dungeonsxl/listener/TriggerListener.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/listener/TriggerListener.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/listener/TriggerListener.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/requirement/AwesomenessRequirement.java b/core/src/test/java/io/github/dre2n/dungeonsxl/requirement/AwesomenessRequirement.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/requirement/AwesomenessRequirement.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/requirement/AwesomenessRequirement.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeCustom.java b/core/src/test/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeCustom.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeCustom.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/requirement/RequirementTypeCustom.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/reward/HighwayToHellReward.java b/core/src/test/java/io/github/dre2n/dungeonsxl/reward/HighwayToHellReward.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/reward/HighwayToHellReward.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/reward/HighwayToHellReward.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/reward/RewardTypeCustom.java b/core/src/test/java/io/github/dre2n/dungeonsxl/reward/RewardTypeCustom.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/reward/RewardTypeCustom.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/reward/RewardTypeCustom.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/sign/CustomSign.java b/core/src/test/java/io/github/dre2n/dungeonsxl/sign/CustomSign.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/sign/CustomSign.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/sign/CustomSign.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/sign/DSignTypeCustom.java b/core/src/test/java/io/github/dre2n/dungeonsxl/sign/DSignTypeCustom.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/sign/DSignTypeCustom.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/sign/DSignTypeCustom.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/trigger/CustomTrigger.java b/core/src/test/java/io/github/dre2n/dungeonsxl/trigger/CustomTrigger.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/trigger/CustomTrigger.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/trigger/CustomTrigger.java diff --git a/src/test/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeCustom.java b/core/src/test/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeCustom.java similarity index 100% rename from src/test/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeCustom.java rename to core/src/test/java/io/github/dre2n/dungeonsxl/trigger/TriggerTypeCustom.java diff --git a/src/test/resources/plugin.yml b/core/src/test/resources/plugin.yml similarity index 100% rename from src/test/resources/plugin.yml rename to core/src/test/resources/plugin.yml diff --git a/craftbukkit_1_10_R1/pom.xml b/craftbukkit_1_10_R1/pom.xml new file mode 100644 index 00000000..544c95e1 --- /dev/null +++ b/craftbukkit_1_10_R1/pom.xml @@ -0,0 +1,40 @@ + + 4.0.0 + io.github.dre2n + dungeonsxl-craftbukkit_1_10_R1 + ${parent.version} + jar + dungeonsxl-craftbukkit_1_10_R1 + + io.github.dre2n + dungeonsxl + 0.14-SNAPSHOT${buildNo} + + + + + maven-compiler-plugin + 2.5.1 + + 1.7 + 1.7 + + + + + + + org.bukkit + craftbukkit + 1.10.2-R0.1-SNAPSHOT + provided + + + io.github.dre2n + dungeonsxl-abstract + ${parent.version} + jar + compile + + + diff --git a/src/main/java/io/github/dre2n/dungeonsxl/util/WorldLoader.java b/craftbukkit_1_10_R1/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/v1_10_R1.java similarity index 92% rename from src/main/java/io/github/dre2n/dungeonsxl/util/WorldLoader.java rename to craftbukkit_1_10_R1/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/v1_10_R1.java index 295d6d51..5432a8ee 100644 --- a/src/main/java/io/github/dre2n/dungeonsxl/util/WorldLoader.java +++ b/craftbukkit_1_10_R1/src/main/java/io/github/dre2n/dungeonsxl/util/worldloader/v1_10_R1.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 io.github.dre2n.dungeonsxl.util.worldloader; import java.io.File; import java.lang.reflect.Field; @@ -46,20 +46,18 @@ import org.bukkit.generator.ChunkGenerator; import org.bukkit.plugin.PluginManager; /** - * A custom thread safe world loader. - * * @author Daniel Saukel */ -public class WorldLoader { +class v1_10_R1 extends InternalsProvider { - static MinecraftServer console; - static CraftServer server = ((CraftServer) Bukkit.getServer()); - static Map worlds; - static PluginManager pluginManager = Bukkit.getPluginManager(); - static File worldContainer = Bukkit.getWorldContainer(); - static Logger logger = Bukkit.getLogger(); + MinecraftServer console; + CraftServer server = ((CraftServer) Bukkit.getServer()); + Map worlds; + PluginManager pluginManager = Bukkit.getPluginManager(); + File worldContainer = Bukkit.getWorldContainer(); + Logger logger = Bukkit.getLogger(); - static { + v1_10_R1() { try { Field fConsole = CraftServer.class.getDeclaredField("console"); fConsole.setAccessible(true); @@ -74,14 +72,9 @@ public class WorldLoader { } } - /** - * @param creator - * the WorldCreator which stores the information to create the new world - * @return - * the new World - */ @SuppressWarnings("deprecation") - public static World createWorld(WorldCreator creator) { + @Override + World createWorld(WorldCreator creator) { String name = creator.name(); ChunkGenerator generator = creator.generator(); File folder = new File(worldContainer, name); diff --git a/pom.xml b/pom.xml index 0a297f5d..3fe3f66c 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ io.github.dre2n dungeonsxl 0.14-SNAPSHOT${buildNo} - jar + pom DungeonsXL https://dre2n.github.io Create custom dungeons and adventure maps with ease! @@ -11,66 +11,16 @@ true - - dungeonsxl-${project.version} - src/main/java - - - . - true - ${basedir}/src/main/resources/ - - plugin.yml - - - - - - maven-compiler-plugin - 2.5.1 - - 1.7 - 1.7 - - - - org.apache.maven.plugins - maven-shade-plugin - 2.4.3 - - - package - - shade - - - - - io.github.dre2n.commons - io.github.dre2n.dungeonsxl.util.commons - - - io.github.dre2n.caliburn - io.github.dre2n.dungeonsxl.util.caliburn - - - - - io.github.dre2n:commons - io.github.dre2n:caliburn - io.github.dre2n:debukkit - - - - - - - - + + shade + core + abstract + craftbukkit_1_10_R1 + org.spigotmc - spigot + spigot-api 1.10.2-R0.1-SNAPSHOT provided diff --git a/shade/pom.xml b/shade/pom.xml new file mode 100644 index 00000000..1f960e92 --- /dev/null +++ b/shade/pom.xml @@ -0,0 +1,74 @@ + + 4.0.0 + io.github.dre2n + dungeonsxl-shade + 0.14-SNAPSHOT${buildNo} + jar + dungeonsxl-shade + + io.github.dre2n + dungeonsxl + 0.14-SNAPSHOT${buildNo} + + + dungeonsxl-${project.version} + + + org.apache.maven.plugins + maven-shade-plugin + 2.4.3 + + + package + + shade + + + + + io.github.dre2n.commons + io.github.dre2n.dungeonsxl.util.commons + + + io.github.dre2n.caliburn + io.github.dre2n.dungeonsxl.util.caliburn + + + + + io.github.dre2n:commons + io.github.dre2n:caliburn + io.github.dre2n:debukkit + io.github.dre2n:dungeonsxl-* + + + + + + + + + + + io.github.dre2n + dungeonsxl-abstract + ${parent.version} + jar + compile + + + io.github.dre2n + dungeonsxl-core + ${parent.version} + jar + compile + + + io.github.dre2n + dungeonsxl-craftbukkit_1_10_R1 + ${parent.version} + jar + compile + + +