Improved Reforged support, natives, bug fixes, stability, refactoring

build.gradle

@@ -76,6 +76,13 @@ project(":core") {
         api "org.apache.commons:commons-compress:1.20"
         api "net.nikr:dds:1.0.0"
         api files(fileTree(dir:'../jars', includes: ['*.jar']))
+
+        testImplementation "org.junit.jupiter:junit-jupiter-api:5.10.2"
+        testRuntimeOnly "org.junit.jupiter:junit-jupiter-engine:5.10.2"
+    }
+
+    test {
+        useJUnitPlatform()
     }
 }
 

core/build.gradle

@@ -2,8 +2,15 @@
 
 sourceCompatibility = 1.17
 
-sourceSets.main.java.srcDirs = [ "src/" ]
-
+sourceSets {
+    main {
+        java.srcDirs = [ "src/" ]
+    }
+    test {
+        java.srcDirs = [ "test/" ]
+        resources.srcDirs = [ "test/resources" ]
+    }
+}
 
 eclipse.project {
     name = appName + "-core"

core/src/com/etheller/warsmash/parsers/fdf/DataSourceFDFParserBuilder.java

@@ -22,27 +22,32 @@ public DataSourceFDFParserBuilder(final DataSource dataSource) {
 
 	@Override
 	public FDFParser build(final String path) {
-		FDFLexer lexer;
-		try {
-			lexer = new FDFLexer(CharStreams.fromStream(this.dataSource.getResourceAsStream(path)));
-		}
-		catch (final IOException e) {
-			throw new RuntimeException(e);
-		}
-		final FDFParser fdfParser = new FDFParser(new CommonTokenStream(lexer));
-		final BaseErrorListener errorListener = new BaseErrorListener() {
-			@Override
-			public void syntaxError(final Recognizer<?, ?> recognizer, final Object offendingSymbol, final int line,
-					final int charPositionInLine, final String msg, final RecognitionException e) {
-				String sourceName = path;
-				if (!sourceName.isEmpty()) {
-					sourceName = String.format("%s:%d:%d: ", sourceName, line, charPositionInLine);
-				}
-
-				System.err.println(sourceName + "line " + line + ":" + charPositionInLine + " " + msg);
+		if (this.dataSource.has(path)) {
+			System.out.println("Loading FDF file: " + path);
+			FDFLexer lexer;
+			try {
+				lexer = new FDFLexer(CharStreams.fromStream(this.dataSource.getResourceAsStream(path)));
+			} catch (final IOException e) {
+				throw new RuntimeException(e);
 			}
-		};
-		fdfParser.addErrorListener(errorListener);
-		return fdfParser;
+			final FDFParser fdfParser = new FDFParser(new CommonTokenStream(lexer));
+			final BaseErrorListener errorListener = new BaseErrorListener() {
+				@Override
+				public void syntaxError(final Recognizer<?, ?> recognizer, final Object offendingSymbol, final int line,
+				                        final int charPositionInLine, final String msg, final RecognitionException e) {
+					String sourceName = path;
+					if (!sourceName.isEmpty()) {
+						sourceName = String.format("%s:%d:%d: ", sourceName, line, charPositionInLine);
+					}
+
+					System.err.println(sourceName + "line " + line + ":" + charPositionInLine + " " + msg);
+				}
+			};
+			fdfParser.addErrorListener(errorListener);
+			return fdfParser;
+		} else {
+			System.err.println("Missing FDF file: " + path);
+			return null;
+		}
 	}
 }

core/src/com/etheller/warsmash/parsers/fdf/GameUI.java

@@ -222,20 +222,26 @@ public static GameSkin loadSkin(final DataSource dataSource, final int skinIndex
 	}
 
 	public void loadTOCFile(final String tocFilePath) throws IOException {
-		final DataSourceFDFParserBuilder dataSourceFDFParserBuilder = new DataSourceFDFParserBuilder(this.dataSource);
-		final FrameDefinitionVisitor fdfVisitor = new FrameDefinitionVisitor(this.templates,
-				dataSourceFDFParserBuilder);
-		System.err.println("Loading TOC file: " + tocFilePath);
-		try (BufferedReader reader = new BufferedReader(
-				new InputStreamReader(this.dataSource.getResourceAsStream(tocFilePath)))) {
-			String line;
-			int tocLines = 0;
-			while ((line = reader.readLine()) != null) {
-				final FDFParser firstFileParser = dataSourceFDFParserBuilder.build(line);
-				fdfVisitor.visit(firstFileParser.program());
-				tocLines++;
+		if (this.dataSource.has(tocFilePath)) {
+			final DataSourceFDFParserBuilder dataSourceFDFParserBuilder = new DataSourceFDFParserBuilder(this.dataSource);
+			final FrameDefinitionVisitor fdfVisitor = new FrameDefinitionVisitor(this.templates,
+					dataSourceFDFParserBuilder);
+			System.out.println("Loading TOC file: " + tocFilePath);
+			try (BufferedReader reader = new BufferedReader(
+					new InputStreamReader(this.dataSource.getResourceAsStream(tocFilePath)))) {
+				String line;
+				int tocLines = 0;
+				while ((line = reader.readLine()) != null) {
+					final FDFParser firstFileParser = dataSourceFDFParserBuilder.build(line);
+					if (firstFileParser != null) {
+						fdfVisitor.visit(firstFileParser.program());
+					}
+					tocLines++;
+				}
+				System.out.println("TOC file loaded " + tocLines + " lines");
 			}
-			System.out.println("TOC file loaded " + tocLines + " lines");
+		} else {
+			System.err.println("TOC file not found: " + tocFilePath);
 		}
 	}
 

core/src/com/etheller/warsmash/parsers/fdf/Main.java

@@ -39,7 +39,9 @@ public static void main(final String[] args) {
 				String line;
 				while ((line = reader.readLine()) != null) {
 					final FDFParser firstFileParser = dataSourceFDFParserBuilder.build(line);
-					fdfVisitor.visit(firstFileParser.program());
+					if (firstFileParser != null) {
+						fdfVisitor.visit(firstFileParser.program());
+					}
 				}
 			}
 

core/src/com/etheller/warsmash/parsers/fdf/frames/AbstractRenderableFrame.java

@@ -2,6 +2,7 @@
 
 import java.util.EnumMap;
 
+import com.badlogic.gdx.graphics.Color;
 import com.badlogic.gdx.graphics.g2d.BitmapFont;
 import com.badlogic.gdx.graphics.g2d.GlyphLayout;
 import com.badlogic.gdx.graphics.g2d.SpriteBatch;
@@ -399,4 +400,8 @@ public String getName() {
 	public Rectangle getRenderBounds() {
 		return this.renderBounds;
 	}
+
+	public static Color createColor8888(int r, int g, int b, int a) {
+		return new Color(r / 255f, g / 255f, b / 255f, a / 255f);
+	}
 }