diff --git a/.idea/compiler.xml b/.idea/compiler.xml index b86273d..7b18ee8 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -3,4 +3,11 @@ + + + \ No newline at end of file diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/bedwars/Bedwars.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/bedwars/Bedwars.java index 68273aa..ee9aca2 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/bedwars/Bedwars.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/bedwars/Bedwars.java @@ -26,6 +26,7 @@ import net.minestom.server.item.ItemStack; import net.minestom.server.item.Material; import net.minestom.server.timer.ExecutionType; import net.minestom.server.timer.TaskSchedule; +import net.minestom.server.world.DimensionType; import org.jetbrains.annotations.NotNull; import java.io.IOException; @@ -41,7 +42,7 @@ public class Bedwars extends StatelessGame { public Bedwars() throws IOException { super(Dimension.OVERWORLD.key, "Bedwars", new LastWinsScore()); - this.setChunkLoader(new AnvilLoader(Resource.GAME_MAP.getPath().resolve("bedwars/test"))); + this.setChunkLoader(new AnvilLoader(Resource.GAME_MAP.getPath().resolve("bedwars/test"), DimensionType.OVERWORLD.key())); Configuration config = ConfigurationProvider.getProvider(YamlConfiguration.class).load(Resource.GAME_MAP.getPath().resolve("bedwars/test/config.yml").toFile()); List teamNames = config.getStringList("setup.teams"); diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/boatRace/BoatRace.java b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/boatRace/BoatRace.java index f6b81cb..2ace4bc 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/boatRace/BoatRace.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/game/stateless/types/boatRace/BoatRace.java @@ -15,6 +15,7 @@ import net.minestom.server.entity.Player; import net.minestom.server.event.player.PlayerMoveEvent; import net.minestom.server.instance.anvil.AnvilLoader; import net.minestom.server.instance.block.Block; +import net.minestom.server.world.DimensionType; import org.jetbrains.annotations.NotNull; import java.util.concurrent.CompletableFuture; @@ -23,7 +24,7 @@ import java.util.concurrent.CompletableFuture; public class BoatRace extends StatelessGame { public BoatRace() { super(Dimension.OVERWORLD.key, "boatRace", new FirstWinsScore()); - this.setChunkLoader(new AnvilLoader(Resource.GAME_MAP.getPath().resolve("boatRace/woodlandMansion"))); + this.setChunkLoader(new AnvilLoader(Resource.GAME_MAP.getPath().resolve("boatRace/woodlandMansion"), DimensionType.OVERWORLD.key())); } @Override diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/hub/Hub.java b/src/main/java/eu/mhsl/minenet/minigames/instance/hub/Hub.java index 1ba0635..383c8ce 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/hub/Hub.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/hub/Hub.java @@ -12,8 +12,7 @@ import net.minestom.server.event.player.PlayerBlockBreakEvent; import net.minestom.server.event.player.PlayerBlockInteractEvent; import net.minestom.server.event.player.PlayerBlockPlaceEvent; import net.minestom.server.instance.anvil.AnvilLoader; - -import java.nio.file.Path; +import net.minestom.server.world.DimensionType; public class Hub extends MineNetInstance implements Spawnable { public static final Hub INSTANCE = new Hub(); @@ -21,7 +20,7 @@ public class Hub extends MineNetInstance implements Spawnable { static { MinecraftServer.getInstanceManager().registerInstance(INSTANCE); - INSTANCE.setChunkLoader(new AnvilLoader(Resource.HUB_MAP.getPath())); + INSTANCE.setChunkLoader(new AnvilLoader(Resource.HUB_MAP.getPath(), DimensionType.OVERWORLD.key())); INSTANCE.eventNode() .addListener(PlayerBlockBreakEvent.class, CommonEventHandles::cancel) @@ -33,7 +32,6 @@ public class Hub extends MineNetInstance implements Spawnable { private Hub() { super(Dimension.THE_END.key); - this.setChunkLoader(new AnvilLoader(Path.of("maps/hub"))); this.setTime(18000); this.defaultClock().pause(); diff --git a/src/main/java/eu/mhsl/minenet/minigames/instance/room/Room.java b/src/main/java/eu/mhsl/minenet/minigames/instance/room/Room.java index 4e156ce..40cefd5 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/instance/room/Room.java +++ b/src/main/java/eu/mhsl/minenet/minigames/instance/room/Room.java @@ -18,6 +18,7 @@ import net.minestom.server.entity.Player; import net.minestom.server.event.player.PlayerBlockBreakEvent; import net.minestom.server.event.player.PlayerDisconnectEvent; import net.minestom.server.instance.anvil.AnvilLoader; +import net.minestom.server.world.DimensionType; import java.util.*; import java.util.logging.Logger; @@ -102,7 +103,7 @@ public class Room extends MineNetInstance implements Spawnable { private void construct() { MinecraftServer.getInstanceManager().registerInstance(this); - this.setChunkLoader(new AnvilLoader(Resource.LOBBY_MAP.getPath())); + this.setChunkLoader(new AnvilLoader(Resource.LOBBY_MAP.getPath(), DimensionType.OVERWORLD.key())); this.gameSelector = new GameSelector(); this.gameSelector.setInstance(this, new Pos(0.5, 50, 19.5)); diff --git a/src/main/java/eu/mhsl/minenet/minigames/score/tournament/TournamentDisplay.java b/src/main/java/eu/mhsl/minenet/minigames/score/tournament/TournamentDisplay.java index 16d5495..6fe9782 100644 --- a/src/main/java/eu/mhsl/minenet/minigames/score/tournament/TournamentDisplay.java +++ b/src/main/java/eu/mhsl/minenet/minigames/score/tournament/TournamentDisplay.java @@ -12,6 +12,7 @@ import net.minestom.server.entity.GameMode; import net.minestom.server.entity.Player; import net.minestom.server.event.player.PlayerMoveEvent; import net.minestom.server.instance.anvil.AnvilLoader; +import net.minestom.server.world.DimensionType; import java.util.Comparator; import java.util.List; @@ -29,7 +30,7 @@ public class TournamentDisplay extends MineNetInstance implements Spawnable { public TournamentDisplay(Tournament tournament) { super(Dimension.OVERWORLD.key); - this.setChunkLoader(new AnvilLoader(Resource.RESULT_DISPLAY.getPath())); + this.setChunkLoader(new AnvilLoader(Resource.RESULT_DISPLAY.getPath(), DimensionType.OVERWORLD.key())); this.places = tournament.getPlaces(); this.tournament = tournament; diff --git a/src/main/resources/maps/game/bedwars/test/region/r.-1.-1.mca b/src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.-1.-1.mca similarity index 100% rename from src/main/resources/maps/game/bedwars/test/region/r.-1.-1.mca rename to src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.-1.-1.mca diff --git a/src/main/resources/maps/game/bedwars/test/region/r.-1.-2.mca b/src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.-1.-2.mca similarity index 100% rename from src/main/resources/maps/game/bedwars/test/region/r.-1.-2.mca rename to src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.-1.-2.mca diff --git a/src/main/resources/maps/game/bedwars/test/region/r.-1.0.mca b/src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.-1.0.mca similarity index 100% rename from src/main/resources/maps/game/bedwars/test/region/r.-1.0.mca rename to src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.-1.0.mca diff --git a/src/main/resources/maps/game/bedwars/test/region/r.-1.1.mca b/src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.-1.1.mca similarity index 100% rename from src/main/resources/maps/game/bedwars/test/region/r.-1.1.mca rename to src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.-1.1.mca diff --git a/src/main/resources/maps/game/bedwars/test/region/r.-2.-1.mca b/src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.-2.-1.mca similarity index 100% rename from src/main/resources/maps/game/bedwars/test/region/r.-2.-1.mca rename to src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.-2.-1.mca diff --git a/src/main/resources/maps/game/bedwars/test/region/r.-2.-2.mca b/src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.-2.-2.mca similarity index 100% rename from src/main/resources/maps/game/bedwars/test/region/r.-2.-2.mca rename to src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.-2.-2.mca diff --git a/src/main/resources/maps/game/bedwars/test/region/r.-2.0.mca b/src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.-2.0.mca similarity index 100% rename from src/main/resources/maps/game/bedwars/test/region/r.-2.0.mca rename to src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.-2.0.mca diff --git a/src/main/resources/maps/game/bedwars/test/region/r.-2.1.mca b/src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.-2.1.mca similarity index 100% rename from src/main/resources/maps/game/bedwars/test/region/r.-2.1.mca rename to src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.-2.1.mca diff --git a/src/main/resources/maps/game/bedwars/test/region/r.0.-1.mca b/src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.0.-1.mca similarity index 100% rename from src/main/resources/maps/game/bedwars/test/region/r.0.-1.mca rename to src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.0.-1.mca diff --git a/src/main/resources/maps/game/bedwars/test/region/r.0.-2.mca b/src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.0.-2.mca similarity index 100% rename from src/main/resources/maps/game/bedwars/test/region/r.0.-2.mca rename to src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.0.-2.mca diff --git a/src/main/resources/maps/game/bedwars/test/region/r.0.0.mca b/src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.0.0.mca similarity index 100% rename from src/main/resources/maps/game/bedwars/test/region/r.0.0.mca rename to src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.0.0.mca diff --git a/src/main/resources/maps/game/bedwars/test/region/r.0.1.mca b/src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.0.1.mca similarity index 100% rename from src/main/resources/maps/game/bedwars/test/region/r.0.1.mca rename to src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.0.1.mca diff --git a/src/main/resources/maps/game/bedwars/test/region/r.1.-1.mca b/src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.1.-1.mca similarity index 100% rename from src/main/resources/maps/game/bedwars/test/region/r.1.-1.mca rename to src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.1.-1.mca diff --git a/src/main/resources/maps/game/bedwars/test/region/r.1.-2.mca b/src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.1.-2.mca similarity index 100% rename from src/main/resources/maps/game/bedwars/test/region/r.1.-2.mca rename to src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.1.-2.mca diff --git a/src/main/resources/maps/game/bedwars/test/region/r.1.0.mca b/src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.1.0.mca similarity index 100% rename from src/main/resources/maps/game/bedwars/test/region/r.1.0.mca rename to src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.1.0.mca diff --git a/src/main/resources/maps/game/bedwars/test/region/r.1.1.mca b/src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.1.1.mca similarity index 100% rename from src/main/resources/maps/game/bedwars/test/region/r.1.1.mca rename to src/main/resources/maps/game/bedwars/test/dimensions/minecraft/overworld/region/r.1.1.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.-1.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-1.-1.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.-1.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-1.-1.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.-2.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-1.-2.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.-2.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-1.-2.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.0.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-1.0.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.0.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-1.0.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.1.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-1.1.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.1.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-1.1.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.2.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-1.2.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-1.2.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-1.2.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.-1.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-2.-1.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.-1.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-2.-1.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.-2.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-2.-2.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.-2.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-2.-2.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.0.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-2.0.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.0.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-2.0.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.1.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-2.1.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.1.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-2.1.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.2.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-2.2.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.-2.2.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.-2.2.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.-1.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.0.-1.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.-1.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.0.-1.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.-2.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.0.-2.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.-2.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.0.-2.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.0.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.0.0.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.0.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.0.0.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.1.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.0.1.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.1.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.0.1.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.2.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.0.2.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.0.2.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.0.2.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.-1.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.1.-1.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.-1.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.1.-1.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.-2.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.1.-2.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.-2.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.1.-2.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.0.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.1.0.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.0.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.1.0.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.1.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.1.1.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.1.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.1.1.mca diff --git a/src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.2.mca b/src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.1.2.mca similarity index 100% rename from src/main/resources/maps/game/boatRace/woodlandMansion/region/r.1.2.mca rename to src/main/resources/maps/game/boatRace/woodlandMansion/dimensions/minecraft/overworld/region/r.1.2.mca diff --git a/src/main/resources/maps/hub/region/r.-1.-1.mca b/src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.-1.-1.mca similarity index 100% rename from src/main/resources/maps/hub/region/r.-1.-1.mca rename to src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.-1.-1.mca diff --git a/src/main/resources/maps/hub/region/r.-1.-2.mca b/src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.-1.-2.mca similarity index 100% rename from src/main/resources/maps/hub/region/r.-1.-2.mca rename to src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.-1.-2.mca diff --git a/src/main/resources/maps/hub/region/r.-1.0.mca b/src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.-1.0.mca similarity index 100% rename from src/main/resources/maps/hub/region/r.-1.0.mca rename to src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.-1.0.mca diff --git a/src/main/resources/maps/hub/region/r.-1.1.mca b/src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.-1.1.mca similarity index 100% rename from src/main/resources/maps/hub/region/r.-1.1.mca rename to src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.-1.1.mca diff --git a/src/main/resources/maps/hub/region/r.-2.-1.mca b/src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.-2.-1.mca similarity index 100% rename from src/main/resources/maps/hub/region/r.-2.-1.mca rename to src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.-2.-1.mca diff --git a/src/main/resources/maps/hub/region/r.-2.-2.mca b/src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.-2.-2.mca similarity index 100% rename from src/main/resources/maps/hub/region/r.-2.-2.mca rename to src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.-2.-2.mca diff --git a/src/main/resources/maps/hub/region/r.-2.0.mca b/src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.-2.0.mca similarity index 100% rename from src/main/resources/maps/hub/region/r.-2.0.mca rename to src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.-2.0.mca diff --git a/src/main/resources/maps/hub/region/r.-2.1.mca b/src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.-2.1.mca similarity index 100% rename from src/main/resources/maps/hub/region/r.-2.1.mca rename to src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.-2.1.mca diff --git a/src/main/resources/maps/hub/region/r.0.-1.mca b/src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.0.-1.mca similarity index 100% rename from src/main/resources/maps/hub/region/r.0.-1.mca rename to src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.0.-1.mca diff --git a/src/main/resources/maps/hub/region/r.0.-2.mca b/src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.0.-2.mca similarity index 100% rename from src/main/resources/maps/hub/region/r.0.-2.mca rename to src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.0.-2.mca diff --git a/src/main/resources/maps/hub/region/r.0.0.mca b/src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.0.0.mca similarity index 100% rename from src/main/resources/maps/hub/region/r.0.0.mca rename to src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.0.0.mca diff --git a/src/main/resources/maps/hub/region/r.0.1.mca b/src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.0.1.mca similarity index 100% rename from src/main/resources/maps/hub/region/r.0.1.mca rename to src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.0.1.mca diff --git a/src/main/resources/maps/hub/region/r.1.-1.mca b/src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.1.-1.mca similarity index 100% rename from src/main/resources/maps/hub/region/r.1.-1.mca rename to src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.1.-1.mca diff --git a/src/main/resources/maps/hub/region/r.1.-2.mca b/src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.1.-2.mca similarity index 100% rename from src/main/resources/maps/hub/region/r.1.-2.mca rename to src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.1.-2.mca diff --git a/src/main/resources/maps/hub/region/r.1.0.mca b/src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.1.0.mca similarity index 100% rename from src/main/resources/maps/hub/region/r.1.0.mca rename to src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.1.0.mca diff --git a/src/main/resources/maps/hub/region/r.1.1.mca b/src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.1.1.mca similarity index 100% rename from src/main/resources/maps/hub/region/r.1.1.mca rename to src/main/resources/maps/hub/dimensions/minecraft/overworld/region/r.1.1.mca diff --git a/src/main/resources/maps/lobby/region/r.-1.-1.mca b/src/main/resources/maps/lobby/dimensions/minecraft/overworld/region/r.-1.-1.mca similarity index 100% rename from src/main/resources/maps/lobby/region/r.-1.-1.mca rename to src/main/resources/maps/lobby/dimensions/minecraft/overworld/region/r.-1.-1.mca diff --git a/src/main/resources/maps/lobby/region/r.-1.0.mca b/src/main/resources/maps/lobby/dimensions/minecraft/overworld/region/r.-1.0.mca similarity index 100% rename from src/main/resources/maps/lobby/region/r.-1.0.mca rename to src/main/resources/maps/lobby/dimensions/minecraft/overworld/region/r.-1.0.mca diff --git a/src/main/resources/maps/lobby/region/r.0.-1.mca b/src/main/resources/maps/lobby/dimensions/minecraft/overworld/region/r.0.-1.mca similarity index 100% rename from src/main/resources/maps/lobby/region/r.0.-1.mca rename to src/main/resources/maps/lobby/dimensions/minecraft/overworld/region/r.0.-1.mca diff --git a/src/main/resources/maps/lobby/region/r.0.0.mca b/src/main/resources/maps/lobby/dimensions/minecraft/overworld/region/r.0.0.mca similarity index 100% rename from src/main/resources/maps/lobby/region/r.0.0.mca rename to src/main/resources/maps/lobby/dimensions/minecraft/overworld/region/r.0.0.mca diff --git a/src/main/resources/maps/resultdisplay/region/r.-1.-1.mca b/src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.-1.-1.mca similarity index 100% rename from src/main/resources/maps/resultdisplay/region/r.-1.-1.mca rename to src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.-1.-1.mca diff --git a/src/main/resources/maps/resultdisplay/region/r.-1.-2.mca b/src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.-1.-2.mca similarity index 100% rename from src/main/resources/maps/resultdisplay/region/r.-1.-2.mca rename to src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.-1.-2.mca diff --git a/src/main/resources/maps/resultdisplay/region/r.-1.0.mca b/src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.-1.0.mca similarity index 100% rename from src/main/resources/maps/resultdisplay/region/r.-1.0.mca rename to src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.-1.0.mca diff --git a/src/main/resources/maps/resultdisplay/region/r.-1.1.mca b/src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.-1.1.mca similarity index 100% rename from src/main/resources/maps/resultdisplay/region/r.-1.1.mca rename to src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.-1.1.mca diff --git a/src/main/resources/maps/resultdisplay/region/r.-2.-1.mca b/src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.-2.-1.mca similarity index 100% rename from src/main/resources/maps/resultdisplay/region/r.-2.-1.mca rename to src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.-2.-1.mca diff --git a/src/main/resources/maps/resultdisplay/region/r.-2.-2.mca b/src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.-2.-2.mca similarity index 100% rename from src/main/resources/maps/resultdisplay/region/r.-2.-2.mca rename to src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.-2.-2.mca diff --git a/src/main/resources/maps/resultdisplay/region/r.-2.0.mca b/src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.-2.0.mca similarity index 100% rename from src/main/resources/maps/resultdisplay/region/r.-2.0.mca rename to src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.-2.0.mca diff --git a/src/main/resources/maps/resultdisplay/region/r.-2.1.mca b/src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.-2.1.mca similarity index 100% rename from src/main/resources/maps/resultdisplay/region/r.-2.1.mca rename to src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.-2.1.mca diff --git a/src/main/resources/maps/resultdisplay/region/r.0.-1.mca b/src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.0.-1.mca similarity index 100% rename from src/main/resources/maps/resultdisplay/region/r.0.-1.mca rename to src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.0.-1.mca diff --git a/src/main/resources/maps/resultdisplay/region/r.0.-2.mca b/src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.0.-2.mca similarity index 100% rename from src/main/resources/maps/resultdisplay/region/r.0.-2.mca rename to src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.0.-2.mca diff --git a/src/main/resources/maps/resultdisplay/region/r.0.0.mca b/src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.0.0.mca similarity index 100% rename from src/main/resources/maps/resultdisplay/region/r.0.0.mca rename to src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.0.0.mca diff --git a/src/main/resources/maps/resultdisplay/region/r.0.1.mca b/src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.0.1.mca similarity index 100% rename from src/main/resources/maps/resultdisplay/region/r.0.1.mca rename to src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.0.1.mca diff --git a/src/main/resources/maps/resultdisplay/region/r.1.-1.mca b/src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.1.-1.mca similarity index 100% rename from src/main/resources/maps/resultdisplay/region/r.1.-1.mca rename to src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.1.-1.mca diff --git a/src/main/resources/maps/resultdisplay/region/r.1.-2.mca b/src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.1.-2.mca similarity index 100% rename from src/main/resources/maps/resultdisplay/region/r.1.-2.mca rename to src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.1.-2.mca diff --git a/src/main/resources/maps/resultdisplay/region/r.1.0.mca b/src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.1.0.mca similarity index 100% rename from src/main/resources/maps/resultdisplay/region/r.1.0.mca rename to src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.1.0.mca diff --git a/src/main/resources/maps/resultdisplay/region/r.1.1.mca b/src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.1.1.mca similarity index 100% rename from src/main/resources/maps/resultdisplay/region/r.1.1.mca rename to src/main/resources/maps/resultdisplay/dimensions/minecraft/overworld/region/r.1.1.mca