Made the info bar actually work.

Refactored time loop logic to enhance clarity and reliability, particularly for ticks and time-of-day tracking. Updated commands to reflect changes, such as allowing loop type modifications and enabling/disabling loop info visibility. Added and exposed a method to retrieve boss bar percentage for better modularity.

Author: VLTNOgithub

src/main/java/com/vltno/timeloop/Commands.java

@@ -71,6 +71,10 @@ public void register(CommandDispatcher<ServerCommandSource> dispatcher, CommandR
                                 .then(CommandManager.argument("loopType", new LoopTypesArgumentType())
                                         .executes(context -> {
                                             LoopTypes newLoopType = LoopTypesArgumentType.getLoopType(context, "loopType");
+                                            mod.loopType = newLoopType;
+                                            mod.config.loopType = newLoopType;
+                                            mod.config.save();
+                                            
                                             context.getSource().sendMessage(Text.literal("Looping type is set to: " + newLoopType.asString()));
                                             LOGGER.info("Loop type set to {}", newLoopType.asString());
                                             return 1;
@@ -135,10 +139,10 @@ public void register(CommandDispatcher<ServerCommandSource> dispatcher, CommandR
 
                         // TOGGLES
                         .then(CommandManager.literal("toggles")
-                                .then(CommandManager.literal("loopTimeOfDay")
+                                .then(CommandManager.literal("trackTimeOfDay")
                                         .requires(source -> source.hasPermissionLevel(2))
                                         .executes(context -> {
-                                            context.getSource().sendMessage(Text.literal("Looping time of day is set to: " + mod.trackTimeOfDay));
+                                            context.getSource().sendMessage(Text.literal("Tracking time of day is set to: " + mod.trackTimeOfDay));
                                             return 1;
                                         })
                                         .then(CommandManager.argument("value", BoolArgumentType.bool())
@@ -147,7 +151,7 @@ public void register(CommandDispatcher<ServerCommandSource> dispatcher, CommandR
                                                     mod.trackTimeOfDay = newTrackTimeOfDay;
                                                     mod.config.trackTimeOfDay = newTrackTimeOfDay;
                                                     mod.config.save();
-
+        
                                                     context.getSource().sendMessage(Text.literal("Tracking time of day is set to: " + newTrackTimeOfDay));
                                                     LOGGER.info("Tracking time of day set to {}", newTrackTimeOfDay);
                                                     return 1;
@@ -185,6 +189,8 @@ public void register(CommandDispatcher<ServerCommandSource> dispatcher, CommandR
                                                     mod.showLoopInfo = newShowLoopInfo;
                                                     mod.config.showLoopInfo = newShowLoopInfo;
                                                     mod.config.save();
+                                                    
+                                                    mod.loopBossBar.visible(newShowLoopInfo);
 
                                                     context.getSource().sendMessage(Text.literal("Showing loop info is set to: " + newShowLoopInfo));
                                                     LOGGER.info("Show loop info set to {}", newShowLoopInfo);

src/main/java/com/vltno/timeloop/LoopBossBar.java

@@ -28,6 +28,10 @@ public void setBossBarName(String bossBarName) {
     public void setBossBarPercentage(int whole, int part) {
         bossBar.setPercent(1.0f - ((float) part / whole));
     }
+    
+    public float getBossBarPercentage() {
+        return bossBar.getPercent();
+    }
 
     public void addPlayer(ServerPlayerEntity player) {
         LOGGER.info("Adding player: {}", player.getName().getString());

src/main/java/com/vltno/timeloop/TimeLoop.java

@@ -23,10 +23,11 @@
 public class TimeLoop implements ModInitializer {
 	public static final Logger LOOP_LOGGER = LoggerFactory.getLogger("TimeLoop");
 	private Commands commands;
-	private LoopBossBar loopBossBar;
 	private static MinecraftServer server;
 	private ServerWorld serverWorld;
 
+	public LoopBossBar loopBossBar;
+
 	// These fields will be initialized from the configuration file.
 	public int loopIteration;
 	public int loopTicks;
@@ -69,9 +70,8 @@ public void onInitialize() {
 		loopBossBar = new LoopBossBar();
 
 		EntitySleepEvents.STOP_SLEEPING.register((entity, sleepingPos) -> {
-			LOOP_LOGGER.info("Loop type: " + loopType);
 			if (entity.isPlayer() && (loopType == LoopTypes.SLEEP) ) {
-				LOOP_LOGGER.info("PLAYER SLEPT, LOOPING");
+				LOOP_LOGGER.info("Player slept, looping.");
 				runLoopIteration();
 			}
 		});
@@ -98,9 +98,9 @@ public void onInitialize() {
 			TimeLoop.server = server;
 			this.serverWorld = server.getOverworld();
 
-			// loop bossbar info
+			// Loop boss bar info
 			String loopInfo = (loopType == LoopTypes.TICKS ? "Ticks Left: " + loopTicks : loopType == LoopTypes.TIME_OF_DAY ? "Time left: " + (timeOfDay - timeSetting) : "");
-			loopBossBar.visible(showLoopInfo);
+			loopBossBar.visible(false);
 			loopBossBar.setBossBarName(loopInfo);
 
 			// set mocap settings
@@ -163,19 +163,43 @@ public void onInitialize() {
 
 		ServerTickEvents.END_SERVER_TICK.register(server -> {
 			if (loopType == LoopTypes.SLEEP || loopType == LoopTypes.DEATH) { return; }
-			if (loopType == LoopTypes.TIME_OF_DAY) { timeOfDay = serverWorld.getTimeOfDay(); };
+			
 			if (isLooping) {
-				tickCounter++;
-				ticksLeft = loopTicks - tickCounter;
-				loopBossBar.visible(showLoopInfo);
-				if (showLoopInfo && (loopType == LoopTypes.TICKS || loopType == LoopTypes.TIME_OF_DAY)) {
-					loopBossBar.setBossBarName(loopType == LoopTypes.TICKS ? "Ticks Left: " + ticksLeft : loopType == LoopTypes.TIME_OF_DAY ? "Time left: " + (timeOfDay - timeSetting) : "");
-					loopBossBar.setBossBarPercentage(loopTicks, tickCounter);
+				if (loopType == LoopTypes.TIME_OF_DAY) {
+					LOOP_LOGGER.info("TimeOfDay: {}", serverWorld.getTimeOfDay());
+					timeOfDay = serverWorld.getTimeOfDay();
+					
+					long timeLeft = (timeOfDay > timeSetting) ? Math.abs(serverWorld.getTimeOfDay() - (2 * timeSetting)) : Math.abs(timeOfDay - timeSetting);
+					
+					LOOP_LOGGER.info("Time Left: {}", timeLeft);
+					
+					LOOP_LOGGER.info("Time setting: {}", timeSetting);
+					
+					LOOP_LOGGER.info("Time setting - timeleft: {}", timeSetting - timeLeft);
+					
+					if (showLoopInfo) {
+						loopBossBar.setBossBarName("Time Left: " + timeLeft);
+						loopBossBar.setBossBarPercentage((int)timeSetting, (int)(timeSetting - timeLeft));
+					}
+					
+					if (timeSetting - timeLeft == timeSetting) {
+						runLoopIteration();
+					}
 				}
-				if (tickCounter >= loopTicks || ( timeOfDay == timeSetting && (loopType == LoopTypes.TIME_OF_DAY)) ) {
-					tickCounter = 0; // Reset counter
-					ticksLeft = loopTicks; // Reset
-					runLoopIteration();
+				
+				else if (loopType == LoopTypes.TICKS) {
+					tickCounter++;
+					ticksLeft = loopTicks - tickCounter;
+					if (showLoopInfo) {
+						loopBossBar.setBossBarName("Ticks Left: " + ticksLeft);
+						loopBossBar.setBossBarPercentage(loopTicks, tickCounter);
+					}
+
+					if (tickCounter >= loopTicks) {
+						tickCounter = 0; // Reset counter
+						ticksLeft = loopTicks; // Reset
+						runLoopIteration();
+					}
 				}
 			}
 		});