Formatted files, fixed fc_label and fc_hud not resetting properly

src/main/java/com/minecrafttas/mctcommon/Configuration.java

@@ -11,6 +11,7 @@
 import java.util.List;
 import java.util.Properties;
 
+import com.minecrafttas.mctcommon.Configuration.ConfigOptions;
 import com.minecrafttas.mctcommon.registry.AbstractRegistry;
 import com.minecrafttas.mctcommon.registry.Registerable;
 
@@ -20,7 +21,7 @@
  * @author Scribble
  */
 
-public class Configuration extends AbstractRegistry<com.minecrafttas.mctcommon.Configuration.ConfigOptions> {
+public class Configuration extends AbstractRegistry<ConfigOptions> {
 
 	private File file;
 

src/main/java/com/minecrafttas/mctcommon/registry/AbstractRegistry.java

@@ -5,7 +5,7 @@
 
 import com.minecrafttas.tasmod.TASmod;
 
-public abstract class AbstractRegistry<V extends com.minecrafttas.mctcommon.registry.Registerable> {
+public abstract class AbstractRegistry<V extends Registerable> {
 	protected final Map<String, V> REGISTRY;
 	protected final String name;
 

src/main/java/com/minecrafttas/tasmod/TASmod.java

@@ -45,60 +45,58 @@
  * ModContainer for TASmod
  * 
  * @author Scribble
- *
  */
-public class TASmod implements ModInitializer, EventServerInit, EventServerStop{
+public class TASmod implements ModInitializer, EventServerInit, EventServerStop {
 
 	private static MinecraftServer serverInstance;
-	
+
 	public static final Logger LOGGER = LogManager.getLogger("TASmod");
-	
-	public static PlaybackControllerServer playbackControllerServer=new PlaybackControllerServer();;
-	
+
+	public static PlaybackControllerServer playbackControllerServer = new PlaybackControllerServer();;
+
 	public static SavestateHandlerServer savestateHandlerServer;
-	
+
 	public static KillTheRNGHandler ktrngHandler;
-	
+
 	public static TickrateChangerServer tickratechanger;
-	
+
 	public static TickSyncServer ticksyncServer;
-	
+
 	public static final Scheduler tickSchedulerServer = new Scheduler();
-	
+
 	public static Server server;
 
 	public static final int networkingport = 8999;
 
 	public static final boolean isDevEnvironment = FabricLoaderImpl.INSTANCE.isDevelopmentEnvironment();
-	
+
 	public static final StartpositionMetadataExtension startPositionMetadataExtension = new StartpositionMetadataExtension();
-	
+
 	public static final TabCompletionUtils tabCompletionUtils = new TabCompletionUtils();
-	
+
 	public static final CommandFileCommand commandFileCommand = new CommandFileCommand();
-	
+
 	@Override
 	public void onInitialize() {
-		
+
 		LOGGER.info("Initializing TASmod");
-
-
+
 		// Start ticksync
 		ticksyncServer = new TickSyncServer();
-		
+
 		// Initilize KillTheRNG
 		LOGGER.info("Testing connection with KillTheRNG");
-		ktrngHandler=new KillTheRNGHandler(FabricLoaderImpl.INSTANCE.isModLoaded("killtherng"));
-		
+		ktrngHandler = new KillTheRNGHandler(FabricLoaderImpl.INSTANCE.isModLoaded("killtherng"));
+
 		// Initialize TickrateChanger
 		tickratechanger = new TickrateChangerServer(LOGGER);
-		
+
 		// Register event listeners
 		EventListenerRegistry.register(this);
 		EventListenerRegistry.register(ticksyncServer);
 		EventListenerRegistry.register(tickratechanger);
 		EventListenerRegistry.register(ktrngHandler);
-		
+
 		// Register packet handlers
 		LOGGER.info(LoggerMarkers.Networking, "Registering network handlers");
 		PacketHandlerRegistry.register(ticksyncServer);
@@ -109,14 +107,14 @@ public void onInitialize() {
 		PacketHandlerRegistry.register(tabCompletionUtils);
 		PacketHandlerRegistry.register(commandFileCommand);
 	}
-	
+
 	@Override
 	public void onServerInit(MinecraftServer server) {
 		LOGGER.info("Initializing server");
 		serverInstance = server;
-		
+
 		// Command handling
-		
+
 		CommandRegistry.registerServerCommand(new CommandTickrate(), server);
 		CommandRegistry.registerServerCommand(new CommandRecord(), server);
 		CommandRegistry.registerServerCommand(new CommandPlay(), server);
@@ -141,10 +139,10 @@ public void onServerInit(MinecraftServer server) {
 
 		savestateHandlerServer = new SavestateHandlerServer(server, LOGGER);
 		PacketHandlerRegistry.register(savestateHandlerServer);
-		
-		if(!server.isDedicatedServer()) {
-			TASmod.tickratechanger.ticksPerSecond=0F;
-			TASmod.tickratechanger.tickrateSaved=20F;
+
+		if (!server.isDedicatedServer()) {
+			TASmod.tickratechanger.ticksPerSecond = 0F;
+			TASmod.tickratechanger.tickrateSaved = 20F;
 		} else {
 			// Starting custom server instance
 			try {
@@ -154,26 +152,27 @@ public void onServerInit(MinecraftServer server) {
 			}
 		}
 	}
-	
+
 	@Override
 	public void onServerStop(MinecraftServer mcserver) {
-		serverInstance=null;
-		
-		if(mcserver.isDedicatedServer()) {
+		serverInstance = null;
+
+		if (mcserver.isDedicatedServer()) {
 			try {
-				if (server != null) server.close();
+				if (server != null)
+					server.close();
 			} catch (IOException e) {
 				LOGGER.error("Unable to close TASmod server: {}", e);
 				e.printStackTrace();
 			}
 		}
-		
-		if(savestateHandlerServer != null) {
-			PacketHandlerRegistry.unregister(savestateHandlerServer);	// Unregistering the savestatehandler, as a new instance is registered in onServerStart()
+
+		if (savestateHandlerServer != null) {
+			PacketHandlerRegistry.unregister(savestateHandlerServer); // Unregistering the savestatehandler, as a new instance is registered in onServerStart()
 			savestateHandlerServer = null;
 		}
 	}
-	
+
 	public static MinecraftServer getServerInstance() {
 		return serverInstance;
 	}

src/main/java/com/minecrafttas/tasmod/commands/TabCompletionUtils.java

@@ -108,7 +108,7 @@ public boolean accept(File pathname) {
 			}
 		});
 		for (int i = 0; i < listOfFiles.length; i++) {
-			tab.add(listOfFiles[i].getName().replaceAll("\\.mctas", ""));
+			tab.add(listOfFiles[i].getName().replaceFirst("\\.mctas$", ""));
 		}
 		return tab;
 	}

src/main/java/com/minecrafttas/tasmod/handlers/LoadingScreenHandler.java

@@ -16,7 +16,6 @@
  * Handles logic during a loading screen to transition between states.
  * 
  * @author Scribble
- *
  */
 public class LoadingScreenHandler implements EventLaunchIntegratedServer, EventClientGameLoop, EventDoneLoadingWorld {
 

src/main/java/com/minecrafttas/tasmod/playback/filecommands/integrated/LabelFileCommandExtension.java

@@ -62,6 +62,7 @@ public void onClear() {
 		}
 
 		label = new BigArrayList<>();
+		labelText = "";
 	}
 
 	public String getLabelText() {

src/main/java/com/minecrafttas/tasmod/playback/filecommands/integrated/OptionsFileCommandExtension.java

@@ -40,7 +40,7 @@ public void onDeserialiseInlineComment(long tick, TickContainer container, Playb
 
 	@Override
 	public void onPlayback(long tick, TickContainer tickContainer) {
-		PlaybackFileCommandContainer containerInTick = hud.get(tick-1);
+		PlaybackFileCommandContainer containerInTick = hud.get(tick);
 		if(containerInTick == null) {
 			return;
 		}
@@ -81,6 +81,7 @@ public void onClear() {
 		}
 
 		hud = new BigArrayList<>();
+		shouldRenderHud = true;
 	}
 
 	public boolean shouldRenderHud() {

src/main/java/com/minecrafttas/tasmod/playback/metadata/PlaybackMetadata.java

@@ -7,7 +7,6 @@
 import java.util.regex.Pattern;
 
 import com.minecrafttas.mctcommon.registry.Registerable;
-import com.minecrafttas.tasmod.playback.metadata.PlaybackMetadata.PlaybackMetadataExtension;
 
 /**
  * Stores a section of<br>
@@ -103,7 +102,7 @@ public static PlaybackMetadata fromHashMap(String extensionName, LinkedHashMap<S
 		return new PlaybackMetadata(extensionName, new LinkedHashMap<>(data));
 	}
 
-	public static abstract class PlaybackMetadataExtension implements com.minecrafttas.mctcommon.registry.Registerable {
+	public static abstract class PlaybackMetadataExtension implements Registerable {
 
 		/**
 		 * Currently unused.<br>

src/main/java/com/minecrafttas/tasmod/playback/metadata/PlaybackMetadataRegistry.java

@@ -15,11 +15,11 @@
  * The default metadata includes general information such as author name,
  * savestate/rerecord count and category.<br>
  * <br>
- * Any custom class has to implement PlaybackMetadataExtension
+ * Any custom class has to extend PlaybackMetadataExtension
  * 
  * @author Scribble
  */
-public class PlaybackMetadataRegistry extends AbstractRegistry<PlaybackMetadataExtension> implements EventPlaybackClient.EventRecordClear{
+public class PlaybackMetadataRegistry extends AbstractRegistry<PlaybackMetadataExtension> implements EventPlaybackClient.EventRecordClear {
 
 	public PlaybackMetadataRegistry() {
 		super("METADATA_REGISTRY", new LinkedHashMap<>());

src/main/java/com/minecrafttas/tasmod/playback/tasfile/exception/PlaybackLoadException.java

@@ -50,6 +50,6 @@ private static String printTick(long line, long tick, int subtick) {
 
 	@Override
 	public void printStackTrace() {
-		TASmod.LOGGER.catching(this);;
+		TASmod.LOGGER.catching(this);
 	}
 }

src/main/java/com/minecrafttas/tasmod/util/LoggerMarkers.java

@@ -25,18 +25,18 @@
  *
  */
 public class LoggerMarkers {
-	
+
 	public static final Marker Event = MarkerManager.getMarker("Event");
-	
+
 	public static final Marker Savestate = MarkerManager.getMarker("Savestate");
-	
+
 	public static final Marker Networking = MarkerManager.getMarker("Networking");
-	
+
 	public static final Marker Tickrate = MarkerManager.getMarker("Tickrate");
 
 	public static final Marker Playback = MarkerManager.getMarker("Playback");
-	
+
 	public static final Marker Keyboard = MarkerManager.getMarker("Keyboard");
-	
+
 	public static final Marker Mouse = MarkerManager.getMarker("Mouse");
 }

src/main/java/com/minecrafttas/tasmod/util/Monitor.java

@@ -3,10 +3,9 @@
 import java.lang.reflect.Field;
 
 public class Monitor {
-
-
+
 	private static long cooldown;
-	
+
 	public static void printFields(Object monitoredObject) {
 
 		if (monitoredObject == null) {
@@ -37,17 +36,17 @@ public static void printFields(Object monitoredObject) {
 		out = out.concat("------------------------");
 		System.out.println(out);
 	}
-	
+
 	public static boolean shouldPrint(long cooldownTime) {
-		if(cooldown<=0)	{
-			cooldown=cooldownTime;
+		if (cooldown <= 0) {
+			cooldown = cooldownTime;
 			return true;
 		} else {
 			cooldown--;
 			return false;
 		}
 	}
-	
+
 	public static Object accessField(Object objectToAccess, String fieldname) {
 		Field field = null;
 		try {
@@ -56,13 +55,13 @@ public static Object accessField(Object objectToAccess, String fieldname) {
 			e.printStackTrace();
 		}
 		field.setAccessible(true);
-		Object out=null;
+		Object out = null;
 		try {
-			out=field.get(objectToAccess);
+			out = field.get(objectToAccess);
 		} catch (IllegalArgumentException | IllegalAccessException e) {
 			e.printStackTrace();
 		}
 		return out;
 	}
-	
+
 }