Move worlds to a new package

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

@@ -28,10 +28,10 @@ import io.github.dre2n.dungeonsxl.config.MessageConfig;
 import io.github.dre2n.dungeonsxl.config.WorldConfig;
 import io.github.dre2n.dungeonsxl.dungeon.DLootInventory;
 import io.github.dre2n.dungeonsxl.dungeon.Dungeons;
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
 import io.github.dre2n.dungeonsxl.game.Game;
 import io.github.dre2n.dungeonsxl.game.GameTypes;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.global.GlobalProtections;
 import io.github.dre2n.dungeonsxl.listener.BlockListener;
 import io.github.dre2n.dungeonsxl.listener.EntityListener;

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

@@ -21,7 +21,7 @@ import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.MessageConfig;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
 import io.github.dre2n.dungeonsxl.player.DPlayer;
 import org.bukkit.command.CommandSender;
 import org.bukkit.command.ConsoleCommandSender;

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

@@ -21,7 +21,7 @@ import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.MessageConfig;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPlayer;
 import org.bukkit.command.CommandSender;

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

@@ -21,7 +21,7 @@ import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.MessageConfig;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPlayer;
 import org.bukkit.command.CommandSender;

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

@@ -22,7 +22,7 @@ import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.MessageConfig;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
 import io.github.dre2n.dungeonsxl.game.Game;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;

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

@@ -22,7 +22,7 @@ import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.MessageConfig;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
 import org.bukkit.command.CommandSender;
 
 /**

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

@@ -23,7 +23,7 @@ import io.github.dre2n.dungeonsxl.config.MessageConfig;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
 import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerEscapeEvent;
 import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerLeaveDGroupEvent;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPlayer;
 import org.bukkit.command.CommandSender;

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

@@ -24,8 +24,8 @@ import io.github.dre2n.dungeonsxl.config.DungeonConfig;
 import io.github.dre2n.dungeonsxl.config.MessageConfig;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
 import io.github.dre2n.dungeonsxl.dungeon.Dungeon;
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import java.io.File;
 import java.util.ArrayList;
 import org.bukkit.command.CommandSender;

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

@@ -23,7 +23,7 @@ import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.MessageConfig;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
 import io.github.dre2n.dungeonsxl.config.WorldConfig;
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
 import java.io.File;
 import org.bukkit.ChatColor;
 import org.bukkit.command.CommandSender;

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

@@ -24,9 +24,9 @@ import io.github.dre2n.dungeonsxl.config.MessageConfig;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
 import io.github.dre2n.dungeonsxl.config.WorldConfig;
 import io.github.dre2n.dungeonsxl.dungeon.Dungeon;
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
 import io.github.dre2n.dungeonsxl.event.dgroup.DGroupCreateEvent;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPlayer;
 import java.io.File;

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

@@ -21,7 +21,7 @@ import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.MessageConfig;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 

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

@@ -23,7 +23,7 @@ import io.github.dre2n.dungeonsxl.config.MessageConfig;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
 import io.github.dre2n.dungeonsxl.game.Game;
 import io.github.dre2n.dungeonsxl.game.GameTypeDefault;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPlayer;
 import org.bukkit.command.CommandSender;

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

@@ -22,7 +22,7 @@ import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.MessageConfig;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
 import org.bukkit.command.CommandSender;
 
 /**

src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupFinishFloorEvent.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.event.dgroup;
 
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;

src/main/java/io/github/dre2n/dungeonsxl/event/dgroup/DGroupStartFloorEvent.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.event.dgroup;
 
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;

src/main/java/io/github/dre2n/dungeonsxl/event/dsign/DSignRegistrationEvent.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.event.dsign;
 
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.sign.DSign;
 import org.bukkit.block.Sign;
 import org.bukkit.event.Cancellable;

src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldEvent.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.event.editworld;
 
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
 import org.bukkit.event.Event;
 
 /**

src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldGenerateEvent.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.event.editworld;
 
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 

src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldSaveEvent.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.event.editworld;
 
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 

src/main/java/io/github/dre2n/dungeonsxl/event/editworld/EditWorldUnloadEvent.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.event.editworld;
 
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 

src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldEvent.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.event.gameworld;
 
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import org.bukkit.event.Event;
 
 /**

src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldStartGameEvent.java

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.event.gameworld;
 
 import io.github.dre2n.dungeonsxl.game.Game;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 

src/main/java/io/github/dre2n/dungeonsxl/event/gameworld/GameWorldUnloadEvent.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.event.gameworld;
 
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 

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

@@ -16,6 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.game;
 
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import java.util.ArrayList;

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

@@ -16,6 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.game;
 
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;

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

@@ -16,6 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.game;
 
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.commons.util.NumberUtil;
 import java.util.HashSet;
 import java.util.Set;

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

@@ -41,13 +41,13 @@ public enum GameTypeDefault implements GameType {
 
     private String displayName;
     private String signName;
-    private boolean playerVersusPlayer;// TODO: Testing
+    private boolean playerVersusPlayer;
-    private boolean friendlyFire;// TODO: Testing
+    private boolean friendlyFire;
     private boolean mobWaves;// TODO: Implementing
-    private boolean rewards;// TODO: Testing
+    private boolean rewards;
-    private boolean showTime;// TODO: Implementing
+    private boolean showTime;
-    private boolean build;// TODO: Testing
+    private boolean build;
-    private GameMode gameMode;// TODO: Testing
+    private GameMode gameMode;
     private boolean lives;
 
     GameTypeDefault(String displayName, String signName, boolean playerVersusPlayer, boolean friendlyFire, boolean mobWaves, boolean rewards, boolean showTime, boolean build, GameMode gameMode, boolean lives) {

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

@@ -21,7 +21,7 @@ import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
 import io.github.dre2n.dungeonsxl.game.Game;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPlayer;
 import java.util.Set;

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

@@ -23,7 +23,7 @@ import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
 import io.github.dre2n.dungeonsxl.config.WorldConfig;
 import io.github.dre2n.dungeonsxl.dungeon.Dungeon;
 import io.github.dre2n.dungeonsxl.game.Game;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import java.io.File;
 import java.util.HashSet;

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

@@ -22,7 +22,7 @@ import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
 import io.github.dre2n.dungeonsxl.config.WorldConfig;
 import io.github.dre2n.dungeonsxl.dungeon.Dungeon;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import java.io.File;
 import java.util.HashSet;

src/main/java/io/github/dre2n/dungeonsxl/listener/BlockListener.java

@@ -20,11 +20,11 @@ import io.github.dre2n.commons.util.NumberUtil;
 import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
 import io.github.dre2n.dungeonsxl.game.GamePlaceableBlock;
 import io.github.dre2n.dungeonsxl.game.GameType;
 import io.github.dre2n.dungeonsxl.game.GameTypeDefault;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.global.DPortal;
 import io.github.dre2n.dungeonsxl.global.GameSign;
 import io.github.dre2n.dungeonsxl.global.GlobalProtection;

src/main/java/io/github/dre2n/dungeonsxl/listener/EntityListener.java

@@ -18,11 +18,11 @@ package io.github.dre2n.dungeonsxl.listener;
 
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.WorldConfig;
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
 import io.github.dre2n.dungeonsxl.game.Game;
 import io.github.dre2n.dungeonsxl.game.GameType;
 import io.github.dre2n.dungeonsxl.game.GameTypeDefault;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.mob.DMob;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPlayer;

src/main/java/io/github/dre2n/dungeonsxl/listener/HangingListener.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.listener;
 
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.hanging.HangingBreakByEntityEvent;

src/main/java/io/github/dre2n/dungeonsxl/listener/PlayerListener.java

@@ -22,12 +22,12 @@ import io.github.dre2n.dungeonsxl.config.MessageConfig;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
 import io.github.dre2n.dungeonsxl.config.WorldConfig;
 import io.github.dre2n.dungeonsxl.dungeon.DLootInventory;
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
 import io.github.dre2n.dungeonsxl.event.dgroup.DGroupCreateEvent;
 import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerDeathEvent;
 import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerKickEvent;
 import io.github.dre2n.dungeonsxl.game.GameChest;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.global.DPortal;
 import io.github.dre2n.dungeonsxl.global.GameSign;
 import io.github.dre2n.dungeonsxl.global.GlobalProtection;

src/main/java/io/github/dre2n/dungeonsxl/listener/WorldListener.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.listener;
 
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.EventPriority;
 import org.bukkit.event.Listener;

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

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.mob;
 
 import io.github.dre2n.dungeonsxl.event.dmob.DMobDeathEvent;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.trigger.MobTrigger;
 import java.util.Random;
 import org.bukkit.entity.LivingEntity;

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

@@ -20,7 +20,7 @@ import io.github.dre2n.commons.util.EnumUtil;
 import io.github.dre2n.commons.util.NumberUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import java.util.Arrays;
 import java.util.HashMap;
 import java.util.HashSet;

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

@@ -30,7 +30,7 @@ import io.github.dre2n.dungeonsxl.event.reward.RewardAdditionEvent;
 import io.github.dre2n.dungeonsxl.game.Game;
 import io.github.dre2n.dungeonsxl.game.GameType;
 import io.github.dre2n.dungeonsxl.game.GameTypeDefault;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.global.GameSign;
 import io.github.dre2n.dungeonsxl.global.GroupSign;
 import io.github.dre2n.dungeonsxl.requirement.Requirement;

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

@@ -27,7 +27,7 @@ import io.github.dre2n.dungeonsxl.config.MessageConfig;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
 import io.github.dre2n.dungeonsxl.config.WorldConfig;
 import io.github.dre2n.dungeonsxl.dungeon.DLootInventory;
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
 import io.github.dre2n.dungeonsxl.event.dgroup.DGroupFinishDungeonEvent;
 import io.github.dre2n.dungeonsxl.event.dgroup.DGroupFinishFloorEvent;
 import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerFinishEvent;
@@ -36,7 +36,7 @@ import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerUpdateEvent;
 import io.github.dre2n.dungeonsxl.game.Game;
 import io.github.dre2n.dungeonsxl.game.GameType;
 import io.github.dre2n.dungeonsxl.game.GameTypeDefault;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.reward.Reward;
 import io.github.dre2n.dungeonsxl.trigger.DistanceTrigger;
 import java.io.File;

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

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.sign;
 
 import io.github.dre2n.commons.util.NumberUtil;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import org.bukkit.Material;
 import org.bukkit.block.Sign;
 

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

@@ -18,7 +18,7 @@ package io.github.dre2n.dungeonsxl.sign;
 
 import io.github.dre2n.commons.util.messageutil.MessageUtil;
 import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.player.DPlayer;
 import java.util.concurrent.CopyOnWriteArrayList;
 import org.bukkit.Material;

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

@@ -18,7 +18,7 @@ package io.github.dre2n.dungeonsxl.sign;
 
 import io.github.dre2n.commons.util.NumberUtil;
 import io.github.dre2n.dungeonsxl.game.GameChest;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import org.bukkit.Material;
 import org.bukkit.block.Sign;
 

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

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.sign;
 
 import io.github.dre2n.commons.util.NumberUtil;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import org.bukkit.Chunk;
 import org.bukkit.Material;
 import org.bukkit.block.Sign;

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

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.global.GroupSign;
 import io.github.dre2n.dungeonsxl.player.DClass;
 import org.bukkit.ChatColor;

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

@@ -20,7 +20,7 @@ import io.github.dre2n.commandsxl.CommandsXL;
 import io.github.dre2n.commandsxl.command.CCommand;
 import io.github.dre2n.commandsxl.command.CCommandExecutorTask;
 import io.github.dre2n.commons.util.NumberUtil;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.trigger.InteractTrigger;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;

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

@@ -18,7 +18,7 @@ package io.github.dre2n.dungeonsxl.sign;
 
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.event.dsign.DSignRegistrationEvent;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.trigger.Trigger;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;

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

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.player.DPlayer;
 import io.github.dre2n.dungeonsxl.trigger.InteractTrigger;
 import org.bukkit.ChatColor;

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

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.player.DPlayer;
 import io.github.dre2n.dungeonsxl.trigger.InteractTrigger;
 import org.bukkit.ChatColor;

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

@@ -17,8 +17,8 @@
 package io.github.dre2n.dungeonsxl.sign;
 
 import io.github.dre2n.commons.util.NumberUtil;
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.task.SignUpdateTask;
 import io.github.dre2n.dungeonsxl.trigger.InteractTrigger;
 import java.util.HashSet;

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

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.sign;
 
 import io.github.dre2n.dungeonsxl.event.dplayer.DPlayerEscapeEvent;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.player.DPlayer;
 import io.github.dre2n.dungeonsxl.trigger.InteractTrigger;
 import org.bukkit.ChatColor;

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

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import org.bukkit.Material;
 import org.bukkit.block.Sign;
 

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

@@ -18,7 +18,7 @@ package io.github.dre2n.dungeonsxl.sign;
 
 import io.github.dre2n.commons.util.NumberUtil;
 import io.github.dre2n.commons.util.messageutil.MessageUtil;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import java.util.concurrent.CopyOnWriteArrayList;
 import org.bukkit.Material;
 import org.bukkit.block.Sign;

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

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.sign;
 
 import io.github.dre2n.commons.util.NumberUtil;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.task.MobSpawnTask;
 import org.bukkit.Material;
 import org.bukkit.block.Sign;

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

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.sign;
 
 import io.github.dre2n.commons.util.NumberUtil;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.task.MythicMobSpawnTask;
 import java.util.ArrayList;
 import org.bukkit.Location;

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

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.sign;
 
 import io.github.dre2n.dungeonsxl.game.GamePlaceableBlock;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import org.bukkit.Material;
 import org.bukkit.block.Sign;
 

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

@@ -21,7 +21,7 @@ import io.github.dre2n.dungeonsxl.config.MessageConfig.Messages;
 import io.github.dre2n.dungeonsxl.game.Game;
 import io.github.dre2n.dungeonsxl.game.GameType;
 import io.github.dre2n.dungeonsxl.game.GameTypeDefault;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPlayer;
 import io.github.dre2n.dungeonsxl.trigger.InteractTrigger;

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

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.sign;
 
 import io.github.dre2n.commons.util.NumberUtil;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.task.DelayedPowerTask;
 import org.bukkit.Material;
 import org.bukkit.block.Block;

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

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.sign;
 
 import io.github.dre2n.commons.util.NumberUtil;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import java.util.concurrent.CopyOnWriteArrayList;
 import org.bukkit.Material;
 import org.bukkit.block.Sign;

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

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.sign;
 
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import org.bukkit.Material;
 import org.bukkit.block.Sign;
 

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

@@ -17,8 +17,8 @@
 package io.github.dre2n.dungeonsxl.sign;
 
 import io.github.dre2n.commons.util.NumberUtil;
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.task.SignUpdateTask;
 import io.github.dre2n.dungeonsxl.trigger.SignTrigger;
 import java.util.HashSet;

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

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.sign;
 
 import io.github.dre2n.commons.util.NumberUtil;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.trigger.InteractTrigger;
 import org.bukkit.ChatColor;

src/main/java/io/github/dre2n/dungeonsxl/task/DelayedPowerTask.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.task;
 
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.sign.RedstoneSign;
 import org.bukkit.scheduler.BukkitRunnable;
 

src/main/java/io/github/dre2n/dungeonsxl/task/LazyUpdateTask.java

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.task;
 
 import io.github.dre2n.dungeonsxl.DungeonsXL;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.player.DPlayer;
 import org.bukkit.scheduler.BukkitRunnable;
 

src/main/java/io/github/dre2n/dungeonsxl/task/MobSpawnTask.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.task;
 
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.mob.DMob;
 import io.github.dre2n.dungeonsxl.mob.DMobType;
 import io.github.dre2n.dungeonsxl.sign.MobSign;

src/main/java/io/github/dre2n/dungeonsxl/task/MythicMobSpawnTask.java

@@ -16,7 +16,7 @@
  */
 package io.github.dre2n.dungeonsxl.task;
 
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.mob.DMob;
 import io.github.dre2n.dungeonsxl.sign.MythicMobsSign;
 import org.bukkit.Bukkit;

src/main/java/io/github/dre2n/dungeonsxl/task/RedstoneEventTask.java

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.task;
 
 import io.github.dre2n.dungeonsxl.DungeonsXL;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.trigger.RedstoneTrigger;
 import org.bukkit.block.Block;
 import org.bukkit.scheduler.BukkitRunnable;

src/main/java/io/github/dre2n/dungeonsxl/task/WorldUnloadTask.java

@@ -17,8 +17,8 @@
 package io.github.dre2n.dungeonsxl.task;
 
 import io.github.dre2n.dungeonsxl.DungeonsXL;
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.player.DPlayer;
 import org.bukkit.scheduler.BukkitRunnable;
 

src/main/java/io/github/dre2n/dungeonsxl/trigger/DistanceTrigger.java

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.trigger;
 
 import io.github.dre2n.dungeonsxl.event.trigger.TriggerActionEvent;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;

src/main/java/io/github/dre2n/dungeonsxl/trigger/InteractTrigger.java

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.trigger;
 
 import io.github.dre2n.dungeonsxl.event.trigger.TriggerActionEvent;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;

src/main/java/io/github/dre2n/dungeonsxl/trigger/MobTrigger.java

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.trigger;
 
 import io.github.dre2n.dungeonsxl.event.trigger.TriggerActionEvent;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;

src/main/java/io/github/dre2n/dungeonsxl/trigger/RedstoneTrigger.java

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.trigger;
 
 import io.github.dre2n.dungeonsxl.event.trigger.TriggerActionEvent;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;

src/main/java/io/github/dre2n/dungeonsxl/trigger/SignTrigger.java

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.trigger;
 
 import io.github.dre2n.dungeonsxl.event.trigger.TriggerActionEvent;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;

src/main/java/io/github/dre2n/dungeonsxl/trigger/Trigger.java

@@ -19,7 +19,7 @@ package io.github.dre2n.dungeonsxl.trigger;
 import io.github.dre2n.commons.util.NumberUtil;
 import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.event.trigger.TriggerRegistrationEvent;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import io.github.dre2n.dungeonsxl.sign.DSign;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;

src/main/java/io/github/dre2n/dungeonsxl/trigger/UseItemTrigger.java

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.trigger;
 
 import io.github.dre2n.dungeonsxl.event.trigger.TriggerActionEvent;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;

src/main/java/io/github/dre2n/dungeonsxl/trigger/WaveTrigger.java

@@ -17,7 +17,7 @@
 package io.github.dre2n.dungeonsxl.trigger;
 
 import io.github.dre2n.dungeonsxl.event.trigger.TriggerActionEvent;
-import io.github.dre2n.dungeonsxl.game.GameWorld;
+import io.github.dre2n.dungeonsxl.world.GameWorld;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;

src/main/java/io/github/dre2n/dungeonsxl/world/EditWorld.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package io.github.dre2n.dungeonsxl.dungeon;
+package io.github.dre2n.dungeonsxl.world;
 
 import io.github.dre2n.commons.util.FileUtil;
 import io.github.dre2n.commons.util.messageutil.MessageUtil;

src/main/java/io/github/dre2n/dungeonsxl/world/GameWorld.java

@@ -14,7 +14,7 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-package io.github.dre2n.dungeonsxl.game;
+package io.github.dre2n.dungeonsxl.world;
 
 import io.github.dre2n.commons.util.FileUtil;
 import io.github.dre2n.commons.util.messageutil.MessageUtil;
@@ -22,11 +22,14 @@ import io.github.dre2n.dungeonsxl.DungeonsXL;
 import io.github.dre2n.dungeonsxl.config.DungeonConfig;
 import io.github.dre2n.dungeonsxl.config.WorldConfig;
 import io.github.dre2n.dungeonsxl.dungeon.Dungeon;
-import io.github.dre2n.dungeonsxl.dungeon.EditWorld;
+import io.github.dre2n.dungeonsxl.world.EditWorld;
 import io.github.dre2n.dungeonsxl.event.gameworld.GameWorldLoadEvent;
 import io.github.dre2n.dungeonsxl.event.gameworld.GameWorldStartGameEvent;
 import io.github.dre2n.dungeonsxl.event.gameworld.GameWorldUnloadEvent;
 import io.github.dre2n.dungeonsxl.event.requirement.RequirementCheckEvent;
+import io.github.dre2n.dungeonsxl.game.Game;
+import io.github.dre2n.dungeonsxl.game.GameChest;
+import io.github.dre2n.dungeonsxl.game.GamePlaceableBlock;
 import io.github.dre2n.dungeonsxl.mob.DMob;
 import io.github.dre2n.dungeonsxl.player.DGroup;
 import io.github.dre2n.dungeonsxl.player.DPlayer;