CraftAttack/world-museum
Archived
5
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 3 Wiki Activity

cleanup and worldchange message correction

Browse Source
This commit is contained in:
Martin Olischläger 2023-05-09 23:22:48 +02:00
parent c673ca4cb3
commit 382d6b9b37
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/eu/mhsl/craftattack/worldmuseum/Main.java
View File

@ -10,7 +10,7 @@ import eu.mhsl.craftattack.worldmuseum.skins.SkinCache;
import eu.mhsl.craftattack.worldmuseum.temp.TablistUpdateTask; import eu.mhsl.craftattack.worldmuseum.temp.TablistUpdateTask;
import eu.mhsl.craftattack.worldmuseum.util.Config; import eu.mhsl.craftattack.worldmuseum.util.Config;
import eu.mhsl.craftattack.worldmuseum.util.NewPlayer; 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.World;
import eu.mhsl.craftattack.worldmuseum.worlds.WorldManager; import eu.mhsl.craftattack.worldmuseum.worlds.WorldManager;
import net.minestom.server.MinecraftServer; 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.item.ItemDropEvent;
import net.minestom.server.event.player.*; import net.minestom.server.event.player.*;
import net.minestom.server.timer.TaskSchedule; import net.minestom.server.timer.TaskSchedule;
import java.time.Duration; import java.time.Duration;
public class Main { public class Main {
@ -40,6 +39,7 @@ public class Main {
WorldManager worldManager = WorldManager.getInstance(); WorldManager worldManager = WorldManager.getInstance();
worldManager.loadWorlds(); worldManager.loadWorlds();
//load main config //load main config
Config config = Config.getInstance(); Config config = Config.getInstance();
config.loadConfig(); config.loadConfig();
@ -56,8 +56,11 @@ public class Main {
globalEventHandler.addListener(PlayerMoveEvent.class, new MovementListener()); globalEventHandler.addListener(PlayerMoveEvent.class, new MovementListener());
globalEventHandler.addListener(PlayerBlockPlaceEvent.class, new BlockPlaceListener()); globalEventHandler.addListener(PlayerBlockPlaceEvent.class, new BlockPlaceListener());
globalEventHandler.addListener(PlayerDisconnectEvent.class, new DisconnectListener()); globalEventHandler.addListener(PlayerDisconnectEvent.class, new DisconnectListener());
// Handlers
MinecraftServer.getBlockManager().registerHandler("minecraft:sign", SignHandler::new); MinecraftServer.getBlockManager().registerHandler("minecraft:sign", SignHandler::new);
//canceled Events //canceled Events
globalEventHandler.addListener(PlayerSwapItemEvent.class, new EventCancel<>()); globalEventHandler.addListener(PlayerSwapItemEvent.class, new EventCancel<>());
globalEventHandler.addListener(ItemDropEvent.class, new EventCancel<>()); globalEventHandler.addListener(ItemDropEvent.class, new EventCancel<>());

3
src/main/java/eu/mhsl/craftattack/worldmuseum/util/SignHandler.java → src/main/java/eu/mhsl/craftattack/worldmuseum/handler/SignHandler.java
View File

@ -1,11 +1,10 @@
package eu.mhsl.craftattack.worldmuseum.util; package eu.mhsl.craftattack.worldmuseum.handler;
import net.kyori.adventure.key.Key; import net.kyori.adventure.key.Key;
import net.minestom.server.instance.block.BlockHandler; import net.minestom.server.instance.block.BlockHandler;
import net.minestom.server.tag.Tag; import net.minestom.server.tag.Tag;
import net.minestom.server.utils.NamespaceID; import net.minestom.server.utils.NamespaceID;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;