Replace inRound boolean with Phase enum

Provides more information to the client, to be used in banner rendering.

Author: S-N00B-1

src/main/java/net/kyrptonaught/lemclienthelper/ServerInfo/ServerInfoData.java

@@ -1,11 +1,11 @@
 package net.kyrptonaught.lemclienthelper.ServerInfo;
 
 public class ServerInfoData {
-    private static boolean IN_ROUND = false;
-    private static byte[] PLAYER_STATUS =  new byte[]{1,0,1,1,1,0,-1,-1};
-
     private static GAME_MODES GAME_MODE = GAME_MODES.CASUAL;
     private static MINIGAME_TYPES MINIGAME = MINIGAME_TYPES.BATTLE;
+    private static MINIGAME_PHASES PHASE = MINIGAME_PHASES.NONE;
+
+    private static byte[] PLAYER_STATUS =  new byte[]{1,0,1,1,1,0,-1,-1};
 
     /**
      * Minigame types
@@ -58,6 +58,24 @@ public enum GAME_MODES {
         SCORE_ATTACK
     }
 
+    /**
+     * Minigame phase
+     * <ul>
+     *     <li> NONE
+     *     <li> LOADING
+     *     <li> COUNTDOWN
+     *     <li> RUNNING
+     *     <li> END
+     * </ul>
+     */
+    public enum MINIGAME_PHASES {
+        NONE,
+        LOADING,
+        COUNTDOWN,
+        RUNNING,
+        END
+    }
+
     public static void setMinigame(MINIGAME_TYPES minigame) {
         MINIGAME = minigame;
     }
@@ -74,12 +92,12 @@ public static GAME_MODES getGamemode() {
         return GAME_MODE;
     }
 
-    public static void setInRound(boolean inRound) {
-        IN_ROUND = inRound;
+    public static void setPhase(MINIGAME_PHASES phase) {
+        PHASE = phase;
     }
 
-    public static boolean getInRound() {
-        return IN_ROUND;
+    public static MINIGAME_PHASES getPhase() {
+        return PHASE;
     }
 
     public static void setPlayerStatus(byte[] playerStatus) {

src/main/java/net/kyrptonaught/lemclienthelper/ServerInfo/ServerInfoNetworking.java

@@ -10,7 +10,7 @@ public static void onInitialize() {
         ClientPlayNetworking.registerGlobalReceiver(serverInfoPackets.serverInfoPacket.PACKET_ID, ((payload, context) -> {
             ServerInfoData.setMinigame(payload.minigame());
             ServerInfoData.setGamemode(payload.gamemode());
-            ServerInfoData.setInRound(payload.inRound());
+            ServerInfoData.setPhase(payload.phase());
             ServerInfoData.setPlayerStatus(payload.playerStatus());
         }));
 
@@ -20,8 +20,8 @@ public static void onInitialize() {
         PayloadTypeRegistry.playS2C().register(serverInfoPackets.gamemodePacket.PACKET_ID, serverInfoPackets.gamemodePacket.codec);
         ClientPlayNetworking.registerGlobalReceiver(serverInfoPackets.gamemodePacket.PACKET_ID, ((payload, context) -> ServerInfoData.setGamemode(payload.gamemode())));
 
-        PayloadTypeRegistry.playS2C().register(serverInfoPackets.inRoundPacket.PACKET_ID, serverInfoPackets.inRoundPacket.codec);
-        ClientPlayNetworking.registerGlobalReceiver(serverInfoPackets.inRoundPacket.PACKET_ID, ((payload, context) -> ServerInfoData.setInRound(payload.inRound())));
+        PayloadTypeRegistry.playS2C().register(serverInfoPackets.phasePacket.PACKET_ID, serverInfoPackets.phasePacket.codec);
+        ClientPlayNetworking.registerGlobalReceiver(serverInfoPackets.phasePacket.PACKET_ID, ((payload, context) -> ServerInfoData.setPhase(payload.phase())));
 
         PayloadTypeRegistry.playS2C().register(serverInfoPackets.playerStatusPacket.PACKET_ID, serverInfoPackets.playerStatusPacket.codec);
         ClientPlayNetworking.registerGlobalReceiver(serverInfoPackets.serverInfoPacket.PACKET_ID, ((payload, context) -> ServerInfoData.setPlayerStatus(payload.playerStatus())));

src/main/java/net/kyrptonaught/lemclienthelper/ServerInfo/packets/serverInfoPackets.java

@@ -18,30 +18,29 @@ public class serverInfoPackets {
      * new serverInfoPacket(
      *      ServerInfoData.MINIGAME_TYPES.BATTLE,
      *      ServerInfoData.GAME_MODES.CASUAL,
-     *      false,
+     *      ServerInfoData.MINIGAME_PHASES.NONE,
      *      new byte[]{0,0,1,1}
      * );</code>
      * </pre>
      *
      * @param minigame {@link ServerInfoData.MINIGAME_TYPES}. Minigame the client is in.
      *
-     * @param gamemode {@link ServerInfoData.GAME_MODES}. Gamemode the client is in.
+     * @param gamemode {@link ServerInfoData.GAME_MODES}. Gamemode the game is in.
      *
-     * @param inRound boolean, Is the client in a round?
+     * @param phase {@link ServerInfoData.MINIGAME_PHASES}, Phase the game is in.
      *
-     * @param playerStatus byte[]. In Round: 0 - Dead; 1 - Alive; -1 - Spectating;<br>
-     *                             In Lobby: 0 - Not Ready; 1 - Ready
+     * @param playerStatus byte[], -1 — Spectating; 0 — Dead/Not Ready; 1 — Alive/Ready;
      *
      * @see gamemodePacket gamemodePacket
      * @see playerStatusPacket playerStatusPacket
-     * @see inRoundPacket inRoundPacket
+     * @see phasePacket phasePacket
      */
-    public record serverInfoPacket(ServerInfoData.MINIGAME_TYPES minigame, ServerInfoData.GAME_MODES gamemode, boolean inRound, byte[] playerStatus) implements CustomPayload {
+    public record serverInfoPacket(ServerInfoData.MINIGAME_TYPES minigame, ServerInfoData.GAME_MODES gamemode, ServerInfoData.MINIGAME_PHASES phase, byte[] playerStatus) implements CustomPayload {
         public static final Id<serverInfoPacket> PACKET_ID = new Id<>(Identifier.of("serverinfo", "serverinfo_set"));
         public static final PacketCodec<RegistryByteBuf, serverInfoPacket> codec = PacketCodec.tuple(
                 PacketCodecs.indexed(i -> ServerInfoData.MINIGAME_TYPES.values()[i], ServerInfoData.MINIGAME_TYPES::ordinal), serverInfoPacket::minigame,
                 PacketCodecs.indexed(i -> ServerInfoData.GAME_MODES.values()[i], ServerInfoData.GAME_MODES::ordinal), serverInfoPacket::gamemode,
-                PacketCodecs.BOOL, serverInfoPacket::inRound,
+                PacketCodecs.indexed(i -> ServerInfoData.MINIGAME_PHASES.values()[i], ServerInfoData.MINIGAME_PHASES::ordinal), serverInfoPacket::phase,
                 PacketCodecs.BYTE_ARRAY, serverInfoPacket::playerStatus,
                 serverInfoPacket::new
         );
@@ -96,16 +95,16 @@ public Id<? extends CustomPayload> getId() {
     }
 
     /**
-     * <pre>inRoundPacket, sends the current inRound status to client.
-     * Intended for use at begining & end of round.</pre>
+     * phasePacket, sends phase to client
+     *
+     * @param phase {@link ServerInfoData.MINIGAME_PHASES}. Phase the game is in.
      *
-     * @param inRound boolean, Is the client in a round?
      */
-    public record inRoundPacket(boolean inRound) implements CustomPayload {
-        public static final Id<inRoundPacket> PACKET_ID = new Id<>(Identifier.of("serverinfo", "inround_set"));
-        public static final PacketCodec<RegistryByteBuf, inRoundPacket> codec = PacketCodec.tuple(
-                PacketCodecs.BOOL, inRoundPacket::inRound,
-                inRoundPacket::new
+    public record phasePacket(ServerInfoData.MINIGAME_PHASES phase) implements CustomPayload {
+        public static final Id<phasePacket> PACKET_ID = new Id<>(Identifier.of("serverinfo", "phase_set"));
+        public static final PacketCodec<RegistryByteBuf, phasePacket> codec = PacketCodec.tuple(
+                PacketCodecs.indexed(i -> ServerInfoData.MINIGAME_PHASES.values()[i], ServerInfoData.MINIGAME_PHASES::ordinal), phasePacket::phase,
+                phasePacket::new
         );
 
         @Override
@@ -120,8 +119,7 @@ public Id<? extends CustomPayload> getId() {
      * <code>new byte[]{0,1,0,-1}</code> 4 players, players 1 & 3 are either not ready or dead, player 4 is spectating.
      * </pre>
      *
-     * @param playerStatus byte[]. In Round: 0 - Dead; 1 - Alive; -1 - Spectating;<br>
-     *                             In Lobby: 0 - Not Ready; 1 - Ready
+     * @param playerStatus byte[], -1 — Spectating; 0 — Dead/Not Ready; 1 — Alive/Ready;
      */
     public record playerStatusPacket(byte[] playerStatus) implements CustomPayload {
         public static final Id<playerStatusPacket> PACKET_ID = new Id<>(Identifier.of("serverinfo", "playerstatus_set"));

src/main/java/net/kyrptonaught/lemclienthelper/hud/genericHud/GenericHudMod.java

@@ -46,7 +46,7 @@ public static void onInitialize() {
                                     .then(CommandManager.argument("target", EntityArgumentType.players())
                                             .executes(context -> {
                                                 ServerPlayNetworking.send(EntityArgumentType.getPlayer(context, "target"),
-                                                        new serverInfoPackets.inRoundPacket(BoolArgumentType.getBool(context,"inRound")));
+                                                        new serverInfoPackets.phasePacket((BoolArgumentType.getBool(context,"inRound") ? ServerInfoData.MINIGAME_PHASES.RUNNING : ServerInfoData.MINIGAME_PHASES.NONE)));
                                                 ServerPlayNetworking.send(EntityArgumentType.getPlayer(context, "target"),
                                                         new PlayerBarPacket(true));
                                                 return 0;

src/main/java/net/kyrptonaught/lemclienthelper/hud/genericHud/PlayerBarRenderer.java

@@ -7,8 +7,9 @@
 import net.minecraft.client.render.RenderTickCounter;
 import net.minecraft.util.Identifier;
 
-public class PlayerBarRenderer {
+import static net.kyrptonaught.lemclienthelper.ServerInfo.ServerInfoData.MINIGAME_PHASES.*;
 
+public class PlayerBarRenderer {
     private static final Identifier BIG_PLAYER_ICON_DEAD = Identifier.of("lem.base", "textures/playerbar/big/dead.png");
     private static final Identifier SMALL_PLAYER_ICON_DEAD = Identifier.of("lem.base", "textures/playerbar/small/dead.png");
 
@@ -40,11 +41,12 @@ public static void renderPlayerBar(DrawContext context, RenderTickCounter v) {
             int e;                                           // Width of texture
             float u;                                         // Width of texture + spacing.
 
+            ServerInfoData.MINIGAME_PHASES Phase = ServerInfoData.getPhase();
             // Horrible awful, no good, very bad, spacing/centring code.
             if (p < 11) {
                 e = 17;
                 u = p > 8 ? 18f : 23f;
-                if (ServerInfoData.getInRound()) {
+                if (Phase != NONE) {
                     // If you're wondering about this calculation,
                     // This is the amount of pixels the matrix is shifted by
                     // after every icon, in order to evenly space all icons, when there are >8.
@@ -59,7 +61,7 @@ public static void renderPlayerBar(DrawContext context, RenderTickCounter v) {
             } else {
                 e = 10;
                 u = 11f;
-                if (ServerInfoData.getInRound()) {
+                if (Phase != NONE) {
                     u = ((182f - (e * p))/(p - 1))+ e;
 
                     context.getMatrices().translate(91f,0f,0f);
@@ -71,13 +73,13 @@ public static void renderPlayerBar(DrawContext context, RenderTickCounter v) {
             for (int i = 0; i < p; i++) {
                 if (i > 0) {context.getMatrices().translate(u, 0f, 0f);}
                 float[] c = RenderSystem.getShaderColor(); // Get the current shader colour to prevent breaking with hud transparency mods.
-                if ((!ServerInfoData.getInRound() && s[i] == 0) || s[i] == -1) {RenderSystem.setShaderColor(c[0],c[1],c[2], c[3]*(128F/255F));}
+                if ((Phase == NONE && s[i] == 0) || s[i] == -1) {RenderSystem.setShaderColor(c[0],c[1],c[2], c[3]*(128F/255F));}
                 if (p < 11) {
-                    context.drawTexture(((s[i] == 0 || s[i] == -1) && ServerInfoData.getInRound()) ? BIG_PLAYER_ICON_DEAD : BIG_PLAYER_ICONS(i), x, l, e, 5, e, 5, e, 5);
+                    context.drawTexture(((s[i] == 0 || s[i] == -1) && (Phase != NONE)) ? BIG_PLAYER_ICON_DEAD : BIG_PLAYER_ICONS(i), x, l, e, 5, e, 5, e, 5);
                 } else {
-                    context.drawTexture(((s[i] == 0 || s[i] == -1) && ServerInfoData.getInRound()) ? SMALL_PLAYER_ICON_DEAD : SMALL_PLAYER_ICONS(i),x, l, e, 5, e, 5, e, 5);
+                    context.drawTexture(((s[i] == 0 || s[i] == -1) && (Phase != NONE)) ? SMALL_PLAYER_ICON_DEAD : SMALL_PLAYER_ICONS(i),x, l, e, 5, e, 5, e, 5);
                 }
-                if ((!ServerInfoData.getInRound() && s[i] == 0) || s[i] == -1) {RenderSystem.setShaderColor(c[0],c[1],c[2],c[3]*(255F/128F));}
+                if ((Phase == NONE && s[i] == 0) || s[i] == -1) {RenderSystem.setShaderColor(c[0],c[1],c[2],c[3]*(255F/128F));}
             }
             RenderSystem.disableBlend();
             context.getMatrices().pop();