chore(game): change view update handling

Author: theEvilReaper

game/src/main/java/net/onelitefeather/cygnus/Cygnus.java

@@ -2,17 +2,16 @@
 
 import net.onelitefeather.cygnus.event.GameStartEvent;
 import net.onelitefeather.cygnus.listener.game.GameStartListener;
+import net.onelitefeather.cygnus.listener.view.ViewUpdateListener;
 import net.onelitefeather.cygnus.map.GameMapProvider;
 import net.onelitefeather.cygnus.map.event.GameMapLoadedEvent;
+import net.onelitefeather.cygnus.view.event.ViewUpdateEvent;
 import net.theevilreaper.aves.map.provider.AbstractMapProvider;
-import net.theevilreaper.aves.util.Strings;
-import net.theevilreaper.aves.util.TimeFormat;
 import net.theevilreaper.aves.util.functional.VoidConsumer;
 import net.theevilreaper.xerus.api.phase.LinearPhaseSeries;
 import net.theevilreaper.xerus.api.phase.Phase;
 import net.theevilreaper.xerus.api.phase.TimedPhase;
 import net.theevilreaper.xerus.api.team.TeamService;
-import net.kyori.adventure.text.Component;
 import net.minestom.server.MinecraftServer;
 import net.minestom.server.entity.Player;
 import net.minestom.server.event.player.AsyncPlayerConfigurationEvent;
@@ -26,7 +25,6 @@
 import net.onelitefeather.cygnus.ambient.AmbientProvider;
 import net.onelitefeather.cygnus.command.StartCommand;
 import net.onelitefeather.cygnus.common.ListenerHandling;
-import net.onelitefeather.cygnus.common.Messages;
 import net.onelitefeather.cygnus.common.config.GameConfig;
 import net.onelitefeather.cygnus.common.config.GameConfigReader;
 import net.onelitefeather.cygnus.common.event.GamePreLaunchEvent;
@@ -98,7 +96,7 @@ public Cygnus() {
         MinecraftServer.getConnectionManager().setPlayerProvider(CygnusPlayer::new);
         this.pageProvider = new PageProvider(this::handleAllPageFound);
         this.mapProvider = new GameMapProvider(path);
-        this.view = new GameViewImpl(this::getViewComponent);
+        this.view = new GameViewImpl();
         this.createTeams(this.gameConfig, this.teamService, this.ambientProvider);
         this.initPhases();
         this.initCommands();
@@ -155,6 +153,8 @@ private void registerGameListener() {
                 SlenderReviveEvent.class, new SlenderReviveListener(((GameMapProvider) this.mapProvider).getGameMap(), this.staminaService));
         manager.addListener(GamePreLaunchEvent.class, new GamePreLaunchListener(this.pageProvider::setMaxPageAmount));
         manager.addListener(StaminaStateChangeEvent.class, new StaminaStateChangeListener());
+        manager.addListener(ViewUpdateEvent.class, new ViewUpdateListener(this.view, this.pageProvider));
+
         MinecraftServer.getPacketListenerManager().setPlayListener(ClientEntityActionPacket.class, CygnusEntityActionListener::listener);
     }
 
@@ -183,14 +183,6 @@ private void finishGame() {
         MinecraftServer.getPacketListenerManager().setPlayListener(ClientEntityActionPacket.class, EntityActionListener::listener);
     }
 
-    private @NotNull Component getViewComponent() {
-        var gamePhase = (GamePhase) this.linearPhaseSeries.getCurrentPhase();
-        return Messages.getViewComponent(
-                Strings.getTimeString(TimeFormat.MM_SS, gamePhase.getCurrentTicks()),
-                this.pageProvider.getPageStatus()
-        );
-    }
-
     private void triggerViewRuleUpdate(@NotNull Player player) {
         ViewRuleUpdater.updateViewer(player, this.teamService.getTeams().get(Helper.SURVIVOR_ID));
     }

game/src/main/java/net/onelitefeather/cygnus/phase/GamePhase.java

@@ -2,6 +2,7 @@
 
 import net.minestom.server.event.EventDispatcher;
 import net.onelitefeather.cygnus.event.GameStartEvent;
+import net.onelitefeather.cygnus.view.event.ViewUpdateEvent;
 import net.theevilreaper.xerus.api.phase.TickDirection;
 import net.theevilreaper.xerus.api.phase.TimedPhase;
 import net.minestom.server.MinecraftServer;
@@ -72,6 +73,6 @@ protected void onFinish() {
      */
     @Override
     public void onUpdate() {
-        this.gameView.updateView();
+        EventDispatcher.call(new ViewUpdateEvent(getCurrentTicks()));
     }
 }