diff --git a/src/main/java/eu/mhsl/craftattack/worldmuseum/Main.java b/src/main/java/eu/mhsl/craftattack/worldmuseum/Main.java index a7e9011..1be71cc 100755 --- a/src/main/java/eu/mhsl/craftattack/worldmuseum/Main.java +++ b/src/main/java/eu/mhsl/craftattack/worldmuseum/Main.java @@ -10,7 +10,7 @@ import eu.mhsl.craftattack.worldmuseum.skins.SkinCache; import eu.mhsl.craftattack.worldmuseum.temp.TablistUpdateTask; import eu.mhsl.craftattack.worldmuseum.util.Config; import eu.mhsl.craftattack.worldmuseum.util.NewPlayer; -import eu.mhsl.craftattack.worldmuseum.util.SignHandler; +import eu.mhsl.craftattack.worldmuseum.handler.SignHandler; import eu.mhsl.craftattack.worldmuseum.worlds.World; import eu.mhsl.craftattack.worldmuseum.worlds.WorldManager; import net.minestom.server.MinecraftServer; @@ -20,7 +20,6 @@ import net.minestom.server.event.inventory.InventoryPreClickEvent; import net.minestom.server.event.item.ItemDropEvent; import net.minestom.server.event.player.*; import net.minestom.server.timer.TaskSchedule; - import java.time.Duration; public class Main { @@ -40,6 +39,7 @@ public class Main { WorldManager worldManager = WorldManager.getInstance(); worldManager.loadWorlds(); + //load main config Config config = Config.getInstance(); config.loadConfig(); @@ -56,8 +56,11 @@ public class Main { globalEventHandler.addListener(PlayerMoveEvent.class, new MovementListener()); globalEventHandler.addListener(PlayerBlockPlaceEvent.class, new BlockPlaceListener()); globalEventHandler.addListener(PlayerDisconnectEvent.class, new DisconnectListener()); + +// Handlers MinecraftServer.getBlockManager().registerHandler("minecraft:sign", SignHandler::new); + //canceled Events globalEventHandler.addListener(PlayerSwapItemEvent.class, new EventCancel<>()); globalEventHandler.addListener(ItemDropEvent.class, new EventCancel<>()); diff --git a/src/main/java/eu/mhsl/craftattack/worldmuseum/util/SignHandler.java b/src/main/java/eu/mhsl/craftattack/worldmuseum/handler/SignHandler.java similarity index 94% rename from src/main/java/eu/mhsl/craftattack/worldmuseum/util/SignHandler.java rename to src/main/java/eu/mhsl/craftattack/worldmuseum/handler/SignHandler.java index b6a0c27..caa0a45 100644 --- a/src/main/java/eu/mhsl/craftattack/worldmuseum/util/SignHandler.java +++ b/src/main/java/eu/mhsl/craftattack/worldmuseum/handler/SignHandler.java @@ -1,11 +1,10 @@ -package eu.mhsl.craftattack.worldmuseum.util; +package eu.mhsl.craftattack.worldmuseum.handler; import net.kyori.adventure.key.Key; import net.minestom.server.instance.block.BlockHandler; import net.minestom.server.tag.Tag; import net.minestom.server.utils.NamespaceID; import org.jetbrains.annotations.NotNull; - import java.util.ArrayList; import java.util.Collection; diff --git a/src/main/java/eu/mhsl/craftattack/worldmuseum/util/ChangeWorld.java b/src/main/java/eu/mhsl/craftattack/worldmuseum/util/ChangeWorld.java index 44048bf..8bda3a5 100644 --- a/src/main/java/eu/mhsl/craftattack/worldmuseum/util/ChangeWorld.java +++ b/src/main/java/eu/mhsl/craftattack/worldmuseum/util/ChangeWorld.java @@ -18,6 +18,6 @@ public class ChangeWorld { player.setAllowCompassUsage(true); }); assert world != null; - System.out.println("[Worldchange] Player " + player.getUsername() + "changed world from " + world.getName() + " to " + targetWorld.getName() +"."); + System.out.println("[Worldchange] Player " + player.getUsername() + " changed world from " + world.getName() + " to " + targetWorld.getName() +"."); } }