Renamed some Variables to improve readability

Author: luigi052005

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

@@ -83,14 +83,14 @@ public void register(CommandDispatcher<ServerCommandSource> dispatcher, CommandR
                         .then(CommandManager.literal("setTicks")
                                 .requires(source -> source.hasPermissionLevel(2))
                                 .executes(context -> {
-                                    context.getSource().sendMessage(Text.literal("Loop ticks is set to: " + mod.loopTicks + " ticks"));
+                                    context.getSource().sendMessage(Text.literal("Loop ticks is set to: " + mod.loopLengthTicks + " ticks"));
                                     return 1;
                                 })
                                 .then(CommandManager.argument("ticks", IntegerArgumentType.integer(20))
                                         .executes(context -> {
                                             int newTicks = IntegerArgumentType.getInteger(context, "ticks");
-                                            mod.loopTicks = newTicks;
-                                            mod.config.loopTicks = newTicks;
+                                            mod.loopLengthTicks = newTicks;
+                                            mod.config.loopLengthTicks = newTicks;
 
                                             mod.ticksLeft = newTicks;
                                             mod.config.ticksLeft = newTicks;
@@ -202,14 +202,14 @@ public void register(CommandDispatcher<ServerCommandSource> dispatcher, CommandR
                         .executes(context -> {
                             mod.stopLoop();
 
-                            mod.timeOfDay = 0;
-                            mod.config.timeOfDay = 0;
+                            mod.startTimeOfDay = 0;
+                            mod.config.startTimeOfDay = 0;
 
                             mod.timeSetting = 0;
                             mod.config.timeSetting = 0;
 
-                            mod.ticksLeft = mod.loopTicks;
-                            mod.config.ticksLeft = mod.config.loopTicks;
+                            mod.ticksLeft = mod.loopLengthTicks;
+                            mod.config.ticksLeft = mod.config.loopLengthTicks;
 
                             mod.trackItems = false;
                             mod.config.trackItems = false;

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

@@ -31,8 +31,8 @@ public class TimeLoop implements ModInitializer {
 
 	// These fields will be initialized from the configuration file.
 	public int loopIteration;
-	public int loopTicks;
-	public long timeOfDay; // Tracks the time of day
+	public int loopLengthTicks;
+	public long startTimeOfDay; // The Time the Loop was started
 	public long timeSetting;
 	public boolean trackTimeOfDay;
 	public boolean isLooping;
@@ -84,9 +84,9 @@ public void onInitialize() {
 			config = TimeLoopConfig.load(worldFolder);
 
 			loopIteration = config.loopIteration;
-			loopTicks = config.loopTicks;
+			loopLengthTicks = config.loopLengthTicks;
 			isLooping = config.isLooping;
-			timeOfDay = config.timeOfDay;
+			startTimeOfDay = config.startTimeOfDay;
 			timeSetting = config.timeSetting;
 			trackTimeOfDay = config.trackTimeOfDay;
 			ticksLeft = config.ticksLeft;
@@ -100,7 +100,7 @@ public void onInitialize() {
 			this.serverWorld = server.getOverworld();
 
 			// Loop boss bar info
-			String loopInfo = (loopType == LoopTypes.TICKS ? "Ticks Left: " + loopTicks : loopType == LoopTypes.TIME_OF_DAY ? "Time left: " + (timeOfDay - timeSetting) : "");
+			String loopInfo = (loopType == LoopTypes.TICKS ? "Ticks Left: " + loopLengthTicks : loopType == LoopTypes.TIME_OF_DAY ? "Time left: " + (startTimeOfDay - timeSetting) : "");
 			loopBossBar.visible(false);
 			loopBossBar.setBossBarName(loopInfo);
 
@@ -126,6 +126,7 @@ public void onInitialize() {
 
 				// Send message to all ops
 				for (ServerPlayerEntity player : server.getPlayerManager().getPlayerList()) {
+					LOOP_LOGGER.info("GRRRRRRRRRRRRRRRRRRRRRRRRRRR");
 					if (server.getPlayerManager().isOperator(player.getGameProfile())) {
 						player.sendMessage(Text.literal(("Use '/loop start' to start the Time loop!")));
 					}
@@ -178,9 +179,8 @@ public void onInitialize() {
 
 			if (isLooping) {
 				if (loopType == LoopTypes.TIME_OF_DAY) {
-					timeOfDay = serverWorld.getTimeOfDay();
-
-					long timeLeft = (timeOfDay > timeSetting) ? Math.abs(serverWorld.getTimeOfDay() - (2 * timeSetting)) : Math.abs(timeOfDay - timeSetting);
+					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);
@@ -194,15 +194,15 @@ public void onInitialize() {
 
 				else if (loopType == LoopTypes.TICKS) {
 					tickCounter++;
-					ticksLeft = loopTicks - tickCounter;
+					ticksLeft = loopLengthTicks - tickCounter;
 					if (showLoopInfo && isLooping) {
 						loopBossBar.setBossBarName("Ticks Left: " + ticksLeft);
-						loopBossBar.setBossBarPercentage(loopTicks, tickCounter);
+						loopBossBar.setBossBarPercentage(loopLengthTicks, tickCounter);
 					}
 
-					if (tickCounter >= loopTicks) {
+					if (tickCounter >= loopLengthTicks) {
 						tickCounter = 0; // Reset counter
-						ticksLeft = loopTicks; // Reset
+						ticksLeft = loopLengthTicks; // Reset
 						runLoopIteration();
 					}
 				}
@@ -223,10 +223,10 @@ public void startLoop() {
         if (showLoopInfo) {loopBossBar.visible(true);}
 		isLooping = true;
 		config.isLooping = true;
-		timeOfDay = serverWorld.getTimeOfDay();
-		config.timeOfDay = timeOfDay;
+		startTimeOfDay = serverWorld.getTimeOfDay();
+		config.startTimeOfDay = startTimeOfDay;
 		tickCounter = 0;
-		ticksLeft = loopTicks;
+		ticksLeft = loopLengthTicks;
 		LOOP_LOGGER.info("Starting Loop");
 		startRecordings();
 	}
@@ -235,11 +235,11 @@ public void startLoop() {
 	 * Runs the next iteration of the loop.
 	 */
 	private void runLoopIteration() {
-		LOOP_LOGGER.info("Starting iteration {} of recording loop", loopIteration);
+		LOOP_LOGGER.info("Starting iteration {} of loop", loopIteration);
 		saveRecordings();
 		removeOldSceneEntries();
 		startRecordings();
-		if (trackTimeOfDay) { serverWorld.setTimeOfDay(timeOfDay); }
+		if (trackTimeOfDay) { serverWorld.setTimeOfDay(startTimeOfDay); }
 		executeCommand("mocap playback stop_all including_others");
 		executeCommand(String.format("mocap playback start .%s", sceneName));
 		loopIteration++;
@@ -287,7 +287,7 @@ public void stopLoop() {
 			saveRecordings();
 			executeCommand("mocap playback stop_all including_others");
 			tickCounter = 0;
-			ticksLeft = loopTicks;
+			ticksLeft = loopLengthTicks;
 			LOOP_LOGGER.info("Loop stopped!");
 		}
 	}

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

@@ -15,10 +15,10 @@ public class TimeLoopConfig {
     public boolean firstStart = true;
     public int loopIteration = 1;
     public boolean isLooping = false;
-    public int loopTicks = 6000; // Default: 6000 ticks (i.e. 5 minutes)
+    public int loopLengthTicks = 6000; // Default: 6000 ticks (i.e. 5 minutes)
     public int maxLoops = 0; //No limit by default
     public long timeSetting = 13000;
-    public long timeOfDay = 0;
+    public long startTimeOfDay = 0;
     public boolean trackTimeOfDay = true;
     public int ticksLeft;