little changes

hollow-cube · Jan 30, 2024 · 5ad4b14 · 5ad4b14
1 parent 2f49b70
commit 5ad4b14
Show file tree

Hide file tree

Showing 79 changed files with 356 additions and 363 deletions.
diff --git a/demo/src/main/java/net/minestom/demo/PlayerInit.java b/demo/src/main/java/net/minestom/demo/PlayerInit.java
@@ -52,7 +52,7 @@ public PlayerInit(ServerProcess serverProcess) {
         this.serverProcess = serverProcess;
         InstanceManager instanceManager = serverProcess.getInstanceManager();
 
-        InstanceContainer instanceContainer = instanceManager.createInstanceContainer(DimensionType.OVERWORLD);
+        InstanceContainer instanceContainer = instanceManager.createInstanceContainer(serverProcess, DimensionType.OVERWORLD);
         instanceContainer.setGenerator(unit -> unit.modifier().fillHeight(0, 40, Block.STONE));
         instanceContainer.setChunkSupplier(LightingChunk::new);
 
@@ -222,6 +222,6 @@ public void init() {
                     .append(Component.text("ACQ TIME: " + MathUtils.round(tickMonitor.getAcquisitionTime(), 2) + "ms"));
             final Component footer = benchmarkManager.getCpuMonitoringMessage();
             serverProcess.getAudiences().players().sendPlayerListHeaderAndFooter(header, footer);
-        }).repeat(10, TimeUnit.getServerTick(serverProcess.getMinecraftServer())); //.schedule();
+        }).repeat(10, TimeUnit.getServerTick(serverProcess.getServerSetting())); //.schedule();
     }
 }
diff --git a/demo/src/main/java/net/minestom/demo/commands/DisplayCommand.java b/demo/src/main/java/net/minestom/demo/commands/DisplayCommand.java
@@ -85,7 +85,7 @@ public void spawnText(@NotNull CommandSender sender, @NotNull CommandContext con
     private void startSmoothFollow(@NotNull Entity entity, @NotNull Player player) {
 //        entity.setCustomName(Component.text("MY CUSTOM NAME"));
 //        entity.setCustomNameVisible(true);
-        TemporalUnit serverTick = TimeUnit.getServerTick(entity.getServerProcess().getMinecraftServer());
+        TemporalUnit serverTick = TimeUnit.getServerTick(entity.getServerProcess().getServerSetting());
         entity.getServerProcess().getSchedulerManager().buildTask(() -> {
             var meta = (AbstractDisplayMeta) entity.getEntityMeta();
             meta.setNotifyAboutChanges(false);

diff --git a/demo/src/main/java/net/minestom/demo/commands/SaveCommand.java b/demo/src/main/java/net/minestom/demo/commands/SaveCommand.java
@@ -24,7 +24,7 @@ private void execute(@NotNull CommandSender commandSender, @NotNull CommandConte
             try {
                 instanceSave.get();
             } catch (InterruptedException | ExecutionException e) {
-                commandSender.getServerProcess().getExceptionManager().handleException(e);
+                commandSender.getServerProcess().getExceptionHandler().handleException(e);
             }
         }
         commandSender.sendMessage("Saving done!");

diff --git a/src/main/java/net/minestom/server/ServerProcess.java b/src/main/java/net/minestom/server/ServerProcess.java
@@ -6,7 +6,7 @@
 import net.minestom.server.adventure.bossbar.BossBarManager;
 import net.minestom.server.command.CommandManager;
 import net.minestom.server.event.GlobalEventHandler;
-import net.minestom.server.exception.ExceptionManager;
+import net.minestom.server.exception.ExceptionHandler;
 import net.minestom.server.extras.MojangAuth;
 import net.minestom.server.gamedata.tags.TagManager;
 import net.minestom.server.instance.Chunk;
@@ -39,7 +39,7 @@ static ServerProcess of(ServerSettings serverSettings) {
         return new ServerProcessImpl(serverSettings);
     }
 
-    ServerSettings getMinecraftServer();
+    ServerSettings getServerSetting();
 
     /**
      * Handles incoming connections/players.
@@ -114,7 +114,7 @@ static ServerProcess of(ServerSettings serverSettings) {
     /**
      * Handles all thrown exceptions from the server.
      */
-    @NotNull ExceptionManager getExceptionManager();
+    @NotNull ExceptionHandler getExceptionHandler();
 
     /**
      * Handles incoming packets.

diff --git a/src/main/java/net/minestom/server/ServerProcessImpl.java b/src/main/java/net/minestom/server/ServerProcessImpl.java
@@ -8,7 +8,8 @@
 import net.minestom.server.entity.Entity;
 import net.minestom.server.event.GlobalEventHandler;
 import net.minestom.server.event.server.ServerTickMonitorEvent;
-import net.minestom.server.exception.ExceptionManager;
+import net.minestom.server.exception.ExceptionHandler;
+import net.minestom.server.exception.ExceptionHandlerImpl;
 import net.minestom.server.extras.MojangAuth;
 import net.minestom.server.gamedata.tags.TagManager;
 import net.minestom.server.instance.Chunk;
@@ -34,21 +35,23 @@
 import net.minestom.server.world.DimensionTypeManager;
 import net.minestom.server.world.biomes.BiomeManager;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.IOException;
 import java.net.SocketAddress;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicReference;
 
 final class ServerProcessImpl implements ServerProcess {
     private static final Logger LOGGER = LoggerFactory.getLogger(ServerProcessImpl.class);
     private static final Boolean SHUTDOWN_ON_SIGNAL = PropertyUtils.getBoolean("minestom.shutdown-on-signal", true);
 
-    private final ExceptionManager exceptionManager;
+    private final ExceptionHandler exceptionHandler;
     private final ConnectionManager connectionManager;
     private final PacketListenerManager packetListenerManager;
     private final PacketProcessor packetProcessor;
@@ -77,34 +80,38 @@ final class ServerProcessImpl implements ServerProcess {
     private final MojangAuth mojangAuth;
 
     public ServerProcessImpl(ServerSettings serverSettings) {
+        this(serverSettings, null);
+    }
+
+    public ServerProcessImpl(ServerSettings serverSettings, @Nullable ExceptionHandler exceptionHandler) {
         this.serverSettings = serverSettings;
-        this.exceptionManager = new ExceptionManager(this);
-        this.packetListenerManager = new PacketListenerManager(this);
+        this.exceptionHandler = Objects.requireNonNullElseGet(exceptionHandler, () -> new ExceptionHandlerImpl(this));
+        this.globalEventHandler = new GlobalEventHandler(exceptionHandler);
+        this.packetListenerManager = new PacketListenerManager(globalEventHandler, exceptionHandler);
         this.packetProcessor = new PacketProcessor(packetListenerManager);
-        this.instanceManager = new InstanceManager(this);
+        this.dispatcher = ThreadDispatcher.singleThread(exceptionHandler);
+        this.instanceManager = new InstanceManager(dispatcher, globalEventHandler);
         this.blockManager = new BlockManager();
         this.commandManager = new CommandManager(this);
         this.recipeManager = new RecipeManager();
         this.teamManager = new TeamManager(this);
-        this.globalEventHandler = new GlobalEventHandler(this);
         this.schedulerManager = new SchedulerManager();
-        this.benchmarkManager = new BenchmarkManager(this);
+        this.benchmarkManager = new BenchmarkManager(exceptionHandler);
         this.dimensionTypeManager = new DimensionTypeManager();
         this.biomeManager = new BiomeManager();
         this.advancementManager = new AdvancementManager(this);
         this.bossBarManager = new BossBarManager(this);
         this.tagManager = new TagManager();
-        this.connectionManager = new ConnectionManager(this, tagManager);
+        this.connectionManager = new ConnectionManager(this, serverSettings, tagManager);
         this.server = new Server(this, packetProcessor);
-        this.mojangAuth = new MojangAuth(this);
-        this.audiences = new Audiences(this);
+        this.mojangAuth = new MojangAuth(this, exceptionHandler);
+        this.audiences = new Audiences(this, connectionManager, commandManager);
 
-        this.dispatcher = ThreadDispatcher.singleThread(this);
         this.ticker = new TickerImpl();
     }
 
     @Override
-    public ServerSettings getMinecraftServer() {
+    public ServerSettings getServerSetting() {
         return serverSettings;
     }
 
@@ -179,8 +186,8 @@ public ServerSettings getMinecraftServer() {
     }
 
     @Override
-    public @NotNull ExceptionManager getExceptionManager() {
-        return exceptionManager;
+    public @NotNull ExceptionHandler getExceptionHandler() {
+        return exceptionHandler;
     }
 
     @Override
@@ -220,7 +227,7 @@ public void start(@NotNull SocketAddress socketAddress) {
         try {
             server.init(socketAddress);
         } catch (IOException e) {
-            exceptionManager.handleException(e);
+            exceptionHandler.handleException(e);
             throw new RuntimeException(e);
         }
 
@@ -311,7 +318,7 @@ private void serverTick(long tickStart) {
                 try {
                     instance.tick(tickStart);
                 } catch (Exception e) {
-                    getExceptionManager().handleException(e);
+                    getExceptionHandler().handleException(e);
                 }
             }
             // Tick all chunks (and entities inside)

diff --git a/src/main/java/net/minestom/server/Viewable.java b/src/main/java/net/minestom/server/Viewable.java
@@ -60,7 +60,7 @@ default boolean isViewer(@NotNull Player player) {
      */
     default void sendPacketToViewers(@NotNull SendablePacket packet) {
         if (packet instanceof ServerPacket serverPacket) {
-            PacketUtils.sendGroupedPacket(getServerProcess(), getViewers(), serverPacket);
+            PacketUtils.sendGroupedPacket(getServerProcess().getServerSetting(), getViewers(), serverPacket);
         } else {
             getViewers().forEach(player -> player.sendPacket(packet));
         }

diff --git a/src/main/java/net/minestom/server/adventure/audience/Audiences.java b/src/main/java/net/minestom/server/adventure/audience/Audiences.java
@@ -4,6 +4,7 @@
 import net.kyori.adventure.key.Key;
 import net.kyori.adventure.key.Keyed;
 import net.minestom.server.ServerProcess;
+import net.minestom.server.command.CommandManager;
 import net.minestom.server.entity.Player;
 import net.minestom.server.network.ConnectionManager;
 import org.jetbrains.annotations.NotNull;
@@ -18,9 +19,9 @@ public class Audiences {
     private final ServerProcess serverProcess;
     private final SingleAudienceProvider audience;
 
-    public Audiences(ServerProcess serverProcess) {
+    public Audiences(ServerProcess serverProcess, ConnectionManager connectionManager, CommandManager commandManager) {
         this.serverProcess = serverProcess;
-        audience = new SingleAudienceProvider(serverProcess);
+        audience = new SingleAudienceProvider(serverProcess, connectionManager, commandManager);
     }
 
     /**

diff --git a/src/main/java/net/minestom/server/adventure/audience/IterableAudienceProvider.java b/src/main/java/net/minestom/server/adventure/audience/IterableAudienceProvider.java
@@ -3,6 +3,7 @@
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.key.Key;
 import net.minestom.server.ServerProcess;
+import net.minestom.server.command.CommandManager;
 import net.minestom.server.command.ConsoleSender;
 import net.minestom.server.entity.Player;
 import org.jetbrains.annotations.NotNull;
@@ -22,9 +23,9 @@ class IterableAudienceProvider implements AudienceProvider<Iterable<? extends Au
     private final AudienceRegistry registry = new AudienceRegistry(new ConcurrentHashMap<>(), CopyOnWriteArrayList::new);
     private final ServerProcess serverProcess;
 
-    protected IterableAudienceProvider(ServerProcess serverProcess) {
+    protected IterableAudienceProvider(ServerProcess serverProcess, CommandManager commandManager) {
         this.serverProcess = serverProcess;
-        this.console = List.of(serverProcess.getCommandManager().getConsoleSender());
+        this.console = List.of(commandManager.getConsoleSender());
     }
 
     @Override

diff --git a/src/main/java/net/minestom/server/adventure/audience/PacketGroupingAudience.java b/src/main/java/net/minestom/server/adventure/audience/PacketGroupingAudience.java
@@ -65,12 +65,12 @@ public ServerProcess getServerProcess() {
      * @param packet the packet to broadcast
      */
     default void sendGroupedPacket(@NotNull ServerPacket packet) {
-        PacketUtils.sendGroupedPacket(getServerProcess(), getPlayers(), packet);
+        PacketUtils.sendGroupedPacket(getServerProcess().getServerSetting(), getPlayers(), packet);
     }
 
     @Override
     default void sendMessage(@NotNull Identity source, @NotNull Component message, @NotNull MessageType type) {
-        Messenger.sendMessage(getServerProcess(), this.getPlayers(), message, ChatPosition.fromMessageType(type), source.uuid());
+        Messenger.sendMessage(getServerProcess().getServerSetting(), this.getPlayers(), message, ChatPosition.fromMessageType(type), source.uuid());
     }
 
     @Override

diff --git a/src/main/java/net/minestom/server/adventure/audience/SingleAudienceProvider.java b/src/main/java/net/minestom/server/adventure/audience/SingleAudienceProvider.java
@@ -3,7 +3,9 @@
 import net.kyori.adventure.audience.Audience;
 import net.kyori.adventure.key.Key;
 import net.minestom.server.ServerProcess;
+import net.minestom.server.command.CommandManager;
 import net.minestom.server.entity.Player;
+import net.minestom.server.network.ConnectionManager;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.function.Predicate;
@@ -20,11 +22,11 @@ class SingleAudienceProvider implements AudienceProvider<Audience> {
     @NotNull
     private final ServerProcess serverProcess;
 
-    protected SingleAudienceProvider(ServerProcess serverProcess) {
+    protected SingleAudienceProvider(ServerProcess serverProcess, ConnectionManager connectionManager, CommandManager commandManager) {
         this.serverProcess = serverProcess;
-        this.collection = new IterableAudienceProvider(serverProcess);
-        this.players = PacketGroupingAudience.of(serverProcess, serverProcess.getConnectionManager().getOnlinePlayers());
-        this.server = Audience.audience(this.players, serverProcess.getCommandManager().getConsoleSender());
+        this.collection = new IterableAudienceProvider(serverProcess, commandManager);
+        this.players = PacketGroupingAudience.of(serverProcess, connectionManager.getOnlinePlayers());
+        this.server = Audience.audience(this.players, commandManager.getConsoleSender());
     }
 
     /**

diff --git a/src/main/java/net/minestom/server/adventure/bossbar/BossBarListener.java b/src/main/java/net/minestom/server/adventure/bossbar/BossBarListener.java
@@ -32,28 +32,28 @@ class BossBarListener implements BossBar.Listener {
 
     @Override
     public void bossBarNameChanged(@NotNull BossBar bar, @NotNull Component oldName, @NotNull Component newName) {
-        this.doIfRegistered(bar, holder -> PacketUtils.sendGroupedPacket(serverProcess, holder.players, holder.createTitleUpdate(newName)));
+        this.doIfRegistered(bar, holder -> PacketUtils.sendGroupedPacket(serverProcess.getServerSetting(), holder.players, holder.createTitleUpdate(newName)));
     }
 
     @Override
     public void bossBarProgressChanged(@NotNull BossBar bar, float oldProgress, float newProgress) {
-        this.doIfRegistered(bar, holder -> PacketUtils.sendGroupedPacket(serverProcess, holder.players, holder.createPercentUpdate(newProgress)));
+        this.doIfRegistered(bar, holder -> PacketUtils.sendGroupedPacket(serverProcess.getServerSetting(), holder.players, holder.createPercentUpdate(newProgress)));
 
     }
 
     @Override
     public void bossBarColorChanged(@NotNull BossBar bar, @NotNull BossBar.Color oldColor, @NotNull BossBar.Color newColor) {
-        this.doIfRegistered(bar, holder -> PacketUtils.sendGroupedPacket(serverProcess, holder.players, holder.createColorUpdate(newColor)));
+        this.doIfRegistered(bar, holder -> PacketUtils.sendGroupedPacket(serverProcess.getServerSetting(), holder.players, holder.createColorUpdate(newColor)));
     }
 
     @Override
     public void bossBarOverlayChanged(@NotNull BossBar bar, BossBar.@NotNull Overlay oldOverlay, BossBar.@NotNull Overlay newOverlay) {
-        this.doIfRegistered(bar, holder -> PacketUtils.sendGroupedPacket(serverProcess, holder.players, holder.createOverlayUpdate(newOverlay)));
+        this.doIfRegistered(bar, holder -> PacketUtils.sendGroupedPacket(serverProcess.getServerSetting(), holder.players, holder.createOverlayUpdate(newOverlay)));
     }
 
     @Override
     public void bossBarFlagsChanged(@NotNull BossBar bar, @NotNull Set<BossBar.Flag> flagsAdded, @NotNull Set<BossBar.Flag> flagsRemoved) {
-        this.doIfRegistered(bar, holder -> PacketUtils.sendGroupedPacket(serverProcess, holder.players, holder.createFlagsUpdate()));
+        this.doIfRegistered(bar, holder -> PacketUtils.sendGroupedPacket(serverProcess.getServerSetting(), holder.players, holder.createFlagsUpdate()));
     }
 
     private void doIfRegistered(@NotNull BossBar bar, @NotNull Consumer<BossBarHolder> consumer) {

diff --git a/src/main/java/net/minestom/server/adventure/bossbar/BossBarManager.java b/src/main/java/net/minestom/server/adventure/bossbar/BossBarManager.java
@@ -76,7 +76,7 @@ public void addBossBar(@NotNull Collection<Player> players, @NotNull BossBar bar
         BossBarHolder holder = this.getOrCreateHandler(bar);
         Collection<Player> addedPlayers = players.stream().filter(holder::addViewer).toList();
         if (!addedPlayers.isEmpty()) {
-            PacketUtils.sendGroupedPacket(serverProcess, addedPlayers, holder.createAddPacket());
+            PacketUtils.sendGroupedPacket(serverProcess.getServerSetting(), addedPlayers, holder.createAddPacket());
         }
     }
 
@@ -91,7 +91,7 @@ public void removeBossBar(@NotNull Collection<Player> players, @NotNull BossBar
         if (holder != null) {
             Collection<Player> removedPlayers = players.stream().filter(holder::removeViewer).toList();
             if (!removedPlayers.isEmpty()) {
-                PacketUtils.sendGroupedPacket(serverProcess, removedPlayers, holder.createRemovePacket());
+                PacketUtils.sendGroupedPacket(serverProcess.getServerSetting(), removedPlayers, holder.createRemovePacket());
             }
         }
     }
@@ -104,7 +104,7 @@ public void removeBossBar(@NotNull Collection<Player> players, @NotNull BossBar
     public void destroyBossBar(@NotNull BossBar bossBar) {
         BossBarHolder holder = this.bars.remove(bossBar);
         if (holder != null) {
-            PacketUtils.sendGroupedPacket(serverProcess, holder.players, holder.createRemovePacket());
+            PacketUtils.sendGroupedPacket(serverProcess.getServerSetting(), holder.players, holder.createRemovePacket());
             for (Player player : holder.players) {
                 this.removePlayer(player, holder);
             }

diff --git a/src/main/java/net/minestom/server/command/CommandManager.java b/src/main/java/net/minestom/server/command/CommandManager.java
@@ -143,15 +143,15 @@ class Reflection {
                     try {
                         callable.call();
                     } catch (Exception e) {
-                        serverProcess.getExceptionManager().handleException(e);
+                        serverProcess.getExceptionHandler().handleException(e);
                     }
                 });
                 return CommandResult.of(CommandResult.Type.UNKNOWN, rawCommand);
             } else {
                 return callable.call();
             }
         } catch (Exception e) {
-            serverProcess.getExceptionManager().handleException(e);
+            serverProcess.getExceptionHandler().handleException(e);
             return CommandResult.of(CommandResult.Type.UNKNOWN, rawCommand);
         }
     }

diff --git a/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentTime.java b/src/main/java/net/minestom/server/command/builder/arguments/minecraft/ArgumentTime.java
@@ -43,7 +43,7 @@ public Duration parse(@NotNull CommandSender sender, @NotNull String input) thro
 
         TemporalUnit timeUnit;
         if (Character.isDigit(lastChar))
-            timeUnit = TimeUnit.getServerTick(sender.getServerProcess().getMinecraftServer());
+            timeUnit = TimeUnit.getServerTick(sender.getServerProcess().getServerSetting());
         else if (SUFFIXES.contains(lastChar)) {
             input = input.substring(0, input.length() - 1);
 
@@ -52,7 +52,7 @@ else if (SUFFIXES.contains(lastChar)) {
             } else if (lastChar == 's') {
                 timeUnit = TimeUnit.SECOND;
             } else if (lastChar == 't') {
-                timeUnit = TimeUnit.getServerTick(sender.getServerProcess().getMinecraftServer());
+                timeUnit = TimeUnit.getServerTick(sender.getServerProcess().getServerSetting());
             } else {
                 throw new ArgumentSyntaxException("Time needs to have the unit d, s, t, or none", input, NO_NUMBER);
             }