Merge branch 'master' into beta

# Conflicts:
#	src/main/java/com/vltno/timeloop/Commands.java
#	src/main/java/com/vltno/timeloop/TimeLoop.java

Author: VLTNOgithub

README.md

@@ -18,13 +18,14 @@ Simply use commands to configure the loop.
  - `status` - Shows the status of the loop in chat.
  - **settings**
    - `maxLoops [0]` - Sets the maximum amount of loops. 0 is infinite.
-   - `setTicks [6000]` - Set the duration / length of the loop in ticks (6000 ticks is 5 mins).
+   - `setLength [6000]` - Set the duration / length of the loop in ticks (6000 ticks is 5 mins).
    - `setTimeOfDay [13000]` - Sets the time of day to loop at (same as minecraft so 13000 is night).
    - `loopType [TICK]` - Sets the type of loop.
    - **toggles**
      - `trackTimeOfDay [true]` - Toggles tracking the time of day during loops.
      - `trackItems [false]` - Toggles tracking items during loops.
      - `showLoopInfo [true]` - Toggles a bar at the top of the screen showing the amount of ticks/time left until the next loop.
+     - `displayTimeInTicks [false]` - Displays the ticks instead of HH:MM:SS on the Progress bar.
 
 # LoopType Options
 - `TICK` (Loops every `setTicks` ticks)

gradle.properties

@@ -9,7 +9,7 @@ yarn_mappings=1.21.1+build.3
 loader_version=0.16.10
 
 # Mod Properties
-mod_version=1.6.3
+mod_version=1.7.0
 maven_group=com.vltno.timeloop
 archives_base_name=time-loop
 

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

@@ -80,10 +80,10 @@ public void register(CommandDispatcher<ServerCommandSource> dispatcher, CommandR
                                             return 1;
                                         })))
 
-                        .then(CommandManager.literal("setTicks")
+                        .then(CommandManager.literal("setLength")
                                 .requires(source -> source.hasPermissionLevel(2))
                                 .executes(context -> {
-                                    context.getSource().sendMessage(Text.literal("Loop ticks is set to: " + mod.loopLengthTicks + " ticks"));
+                                    context.getSource().sendMessage(Text.literal("Loop length is set to: " + mod.loopLengthTicks + " ticks"));
                                     return 1;
                                 })
                                 .then(CommandManager.argument("ticks", IntegerArgumentType.integer(20))
@@ -97,7 +97,7 @@ public void register(CommandDispatcher<ServerCommandSource> dispatcher, CommandR
 
                                             mod.config.save();
                                             context.getSource().sendMessage(Text.literal("Loop ticks is set to: " + newTicks + " ticks"));
-                                            LOGGER.info("Loop ticks set to {} ticks", newTicks);
+                                            LOGGER.info("Loop length set to {} ticks", newTicks);
                                             return 1;
                                         })))
 
@@ -174,7 +174,25 @@ public void register(CommandDispatcher<ServerCommandSource> dispatcher, CommandR
                                                     LOGGER.info("Tracking items set to {}", newTrackItems);
                                                     return 1;
                                                 })))
-                                
+
+                                .then(CommandManager.literal("displayTimeInTicks")
+                                        .requires(source -> source.hasPermissionLevel(2))
+                                        .executes(context -> {
+                                            context.getSource().sendMessage(Text.literal("Display Time in ticks is set to: " + mod.displayTimeInTicks));
+                                            return 1;
+                                        })
+                                        .then(CommandManager.argument("value", BoolArgumentType.bool())
+                                                .executes(context -> {
+                                                    boolean newDisplayTimeInTicks = BoolArgumentType.getBool(context, "value");
+                                                    mod.displayTimeInTicks = newDisplayTimeInTicks;
+                                                    mod.config.displayTimeInTicks = newDisplayTimeInTicks;
+                                                    mod.config.save();
+
+                                                    context.getSource().sendMessage(Text.literal("Display Time in ticks is set to: " + newDisplayTimeInTicks));
+                                                    LOGGER.info("Display Time in ticks set to {}", newDisplayTimeInTicks);
+                                                    return 1;
+                                                })))
+
                                 .then(CommandManager.literal("showLoopInfo")
                                         .requires(source -> source.hasPermissionLevel(2))
                                         .executes(context -> {

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

@@ -17,6 +17,9 @@
 import net.minecraft.util.WorldSavePath;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
@@ -43,6 +46,7 @@ public class TimeLoop implements ModInitializer {
 	private List<String> recordingPlayers; // Add this field
 
 	public boolean showLoopInfo;
+	public boolean displayTimeInTicks;
 	public boolean trackItems;
 	public LoopTypes loopType;
 
@@ -92,6 +96,7 @@ public void onInitialize() {
 			ticksLeft = config.ticksLeft;
 
 			showLoopInfo = config.showLoopInfo;
+			displayTimeInTicks = config.displayTimeInTicks;
 			trackItems = config.trackItems;
 			loopType = config.loopType;
 
@@ -175,11 +180,7 @@ public void onInitialize() {
 					long time = serverWorld.getTimeOfDay();
 					long timeLeft = (time > timeSetting) ? Math.abs(serverWorld.getTimeOfDay() - (2 * timeSetting)) : Math.abs(startTimeOfDay - timeSetting);
 
-					if (showLoopInfo && isLooping) {
-						loopBossBar.setBossBarName("Time Left: " + timeLeft);
-						loopBossBar.setBossBarPercentage((int)timeSetting, (int)(timeSetting - timeLeft));
-					}
-
+					updateProgressBar((int)timeSetting, (int)(timeSetting - timeLeft));
 					if (timeSetting - timeLeft == timeSetting) {
 						runLoopIteration();
 					}
@@ -188,11 +189,8 @@ public void onInitialize() {
 				else if (loopType == LoopTypes.TICKS) {
 					tickCounter++;
 					ticksLeft = loopLengthTicks - tickCounter;
-					if (showLoopInfo && isLooping) {
-						loopBossBar.setBossBarName("Ticks Left: " + ticksLeft);
-						loopBossBar.setBossBarPercentage(loopLengthTicks, tickCounter);
-					}
 
+					updateProgressBar(loopLengthTicks, ticksLeft);
 					if (tickCounter >= loopLengthTicks) {
 						tickCounter = 0; // Reset counter
 						ticksLeft = loopLengthTicks; // Reset
@@ -245,6 +243,7 @@ private void runLoopIteration() {
 	 * Starts the recordings.
 	 */
 	private void startRecordings() {
+		// Start recording for every player
 		for (String playerName : recordingPlayers) {
 			executeCommand(String.format("mocap recording start %s", playerName));
 		}
@@ -272,6 +271,15 @@ public void stopLoop() {
 		}
 	}
 
+	public void updateProgressBar(int time, int timeLeft) {
+		if (showLoopInfo && isLooping) {
+			if (displayTimeInTicks) {loopBossBar.setBossBarName("Time Left: " + timeLeft);}
+			else {loopBossBar.setBossBarName("Time Left: " + convertTicksToTime(timeLeft));}
+
+			loopBossBar.setBossBarPercentage(time, timeLeft);
+		}
+	}
+
 	/**
 	 * Executes a minecraft chat command.
 	 */
@@ -301,6 +309,19 @@ public void updateEntitiesToTrack(boolean items) {
 		executeCommand(String.format("mocap settings recording track_entities %s", entitiesToTrack));
 		executeCommand(String.format("mocap settings playback play_entities %s", entitiesToTrack));
 	}
+
+	/**
+	 * Converts time in ticks to HH:MM:SS
+	 *
+	 * @param ticksLeft A int value.
+	 */
+	public String convertTicksToTime(int ticksLeft) {
+		int timeLeft = ticksLeft / 20;
+		int hours = timeLeft / 3600;
+		int minutes = (timeLeft % 3600) / 60;
+		int seconds = timeLeft % 60;
+		return String.format("%02d:%02d:%02d", hours, minutes, seconds);
+	}
 }
 
 // use this in the future

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

@@ -22,6 +22,7 @@ public class TimeLoopConfig {
     public int ticksLeft;
 
     public boolean showLoopInfo = true;
+    public boolean displayTimeInTicks = false;
     public boolean trackItems = false;
     public LoopTypes loopType = LoopTypes.TICKS;