Replace jbmstable-parser with kbmstable-parser

Author: Catizard

core/build.gradle.kts

@@ -32,7 +32,7 @@ version = libs.versions.beatoraja.get()
 
 sourceSets {
     main {
-        java.srcDirs(listOf("src/", "dependencies/jbms-parser/", "dependencies/jbmstable-parser"))
+        java.srcDirs(listOf("src/", "dependencies/jbms-parser/"))
         resources.srcDirs(listOf("src/"))
     }
 }
@@ -159,6 +159,9 @@ dependencies {
     implementation(libs.javawebsocket)
     implementation(libs.bundles.slf4j)
 
+    implementation(libs.kotlin.reflect)
+    implementation(libs.kbmstableparser)
+
     // non-gradle managed file dependencies. jportaudio not on maven. "custom" scares me.
     implementation(":jportaudio")
     implementation(":luaj-jse:3.0.2-custom")

core/src/bms/player/beatoraja/TableDataAccessor.java

@@ -5,6 +5,10 @@
 import java.security.MessageDigest;
 import java.security.NoSuchAlgorithmException;
 import java.util.*;
+
+import bms.table.DifficultyTable;
+import bms.table.DifficultyTableElement;
+import bms.table.DifficultyTableParser;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import java.util.stream.Collectors;
@@ -14,8 +18,6 @@
 import bms.model.Mode;
 import bms.player.beatoraja.CourseData.TrophyData;
 import bms.player.beatoraja.song.SongData;
-import bms.table.Course.Trophy;
-import bms.table.*;
 
 /**
  * 難易度表データアクセス用クラス
@@ -168,44 +170,39 @@ public DifficultyTableAccessor(String tabledir, String url) {
 
 		@Override
 		public TableData read() {
-			DifficultyTableParser dtp = new DifficultyTableParser();
-			DifficultyTable dt = new DifficultyTable();
-			if (url.endsWith(".json")) {
-				dt.setHeadURL(url);
-			} else {
-				dt.setSourceURL(url);
-			}
+			DifficultyTableParser parser = new DifficultyTableParser();
 			try {
-				dtp.decode(true, dt);
+				DifficultyTable dt = parser.parse(url);
 				TableData td = new TableData();
 				td.setUrl(url);
 				td.setName(dt.getName());
-				td.setTag(dt.getTag());
-				Mode defaultMode = dt.getMode() != null ? Mode.getMode(dt.getMode()) : null;
+				// td.setTag(dt.getTag());
+//				Mode defaultMode = dt.getMode() != null ? Mode.getMode(dt.getMode()) : null;
+				Mode defaultMode = null;
 				td.setFolder(Stream.of(dt.getLevelDescription()).map(lv -> {
 					TableData.TableFolder tde = new TableData.TableFolder();
 					tde.setName(td.getTag() + lv);
-					tde.setSong(Stream.of(dt.getElements()).filter(dte -> lv.equals(dte.getLevel()))
+					tde.setSong(dt.getElements().stream().filter(dte -> lv.equals(dte.getLevel()))
 							.map(dte -> toSongData(dte, defaultMode)).toArray(SongData[]::new));
 					return tde;
 				}).toArray(TableData.TableFolder[]::new));
 
-				if (dt.getCourse() != null && dt.getCourse().length > 0) {
-					td.setCourse(Stream.of(dt.getCourse()).flatMap(courses -> Stream.of(courses)).map(g -> {
+				if (!dt.getCourse().isEmpty()) {
+					td.setCourse(dt.getCourse().stream().map(g -> {
 						CourseData cd = new CourseData();
 						cd.setName(g.getName());
-						cd.setSong(Stream.of(g.getCharts()).map(chart -> toSongData(chart, defaultMode))
+						cd.setSong(g.getCharts().stream().map(chart -> toSongData(chart, defaultMode))
 								.toArray(SongData[]::new));
 
-						cd.setConstraint(Stream.of(g.getConstraint()).map(c -> CourseData.CourseDataConstraint.getValue(c))
+						cd.setConstraint(g.getConstraint().stream().map(CourseData.CourseDataConstraint::getValue)
 								.filter(Objects::nonNull).toArray(CourseData.CourseDataConstraint[]::new));
 
-						if (g.getTrophy() != null) {
-							cd.setTrophy(Stream.of(g.getTrophy()).map(trophy -> {
+						if (!g.getTrophy().isEmpty()) {
+							cd.setTrophy(g.getTrophy().stream().map(trophy -> {
 								TrophyData t = new TrophyData();
 								t.setName(trophy.getName());
-								t.setMissrate((float) trophy.getMissrate());
-								t.setScorerate((float) trophy.getScorerate());
+								t.setMissrate((float) trophy.getMissRate());
+								t.setScorerate((float) trophy.getScoreRate());
 								return t;
 							}).toArray(TrophyData[]::new));
 						}
@@ -229,27 +226,24 @@ public void write(TableData td) {
 		}
 	}
 
-	private static SongData toSongData(BMSTableElement te, Mode defaultMode) {
+	private static SongData toSongData(DifficultyTableElement te, Mode defaultMode) {
 		SongData song = new SongData();
-		if(te.getMD5() != null) {
-			song.setMd5(te.getMD5().toLowerCase());
+		if(te.getMd5() != null) {
+			song.setMd5(te.getMd5().toLowerCase());
 		}
-		if(te.getSHA256() != null) {
-			song.setSha256(te.getSHA256().toLowerCase());
+		if(te.getSha256() != null) {
+			song.setSha256(te.getSha256().toLowerCase());
 		}
 		song.setTitle(te.getTitle());
 		song.setArtist(te.getArtist());
 		Mode mode = te.getMode() != null ? Mode.getMode(te.getMode()) : null;
 		song.setMode(mode != null ? mode.id : (defaultMode != null ? defaultMode.id : 0));
-		song.setUrl(te.getURL());
-		song.setIpfs(te.getIPFS());
-		song.setOrg_md5(te.getParentHash());
-		if(te instanceof DifficultyTableElement) {
-			DifficultyTableElement dte = (DifficultyTableElement) te;
-			song.setAppendurl(dte.getAppendURL());
-			song.setAppendIpfs(dte.getAppendIPFS());
-		}
-		
+		song.setUrl(te.getUrl());
+		song.setIpfs(te.getIpfs());
+//		song.setOrg_md5(te.getParentHash());
+		song.setAppendurl(te.getAppendURL());
+		song.setAppendIpfs(te.getAppendIPFS());
+
 		return song;
 	}
 }

gradle/libs.versions.toml

@@ -23,11 +23,13 @@ ebur128java = "1.2.6-2"
 jna = "5.13.0"
 websocket = "1.6.0"
 slf4j = "2.0.17"
+kbmstable-parser = "1.0.0"
 
 
 [libraries]
 kotlin-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-gradle-plugin", version.ref = "kotlin" }
 kotlin-serialization-gradle-plugin = { group = "org.jetbrains.kotlin", name = "kotlin-serialization", version.ref = "kotlin" }
+kotlin-reflect = { group = "org.jetbrains.kotlin", name = "kotlin-reflect", version.ref = "kotlin" }
 
 gdx-core = { group = "com.badlogicgames.gdx", name = "gdx", version.ref = "gdx" }
 gdx-backend = { group = "com.badlogicgames.gdx", name = "gdx-backend-lwjgl3", version.ref = "gdx" }
@@ -83,6 +85,8 @@ javawebsocket = { group = "org.java-websocket", name = "Java-WebSocket", version
 slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j" }
 slf4j-jul = { group = "org.slf4j", name = "slf4j-jdk14", version.ref = "slf4j" }
 
+kbmstableparser = { group = "io.github.catizard", name = "kbmstable-parser", version.ref = "kbmstable-parser" }
+
 [bundles]
 libgdx = ["gdx-core", "gdx-backend", "gdx-freetype",  "gdx-controllers-core", "gdx-controllers-desktop"]
 lwjgl3 = ["lwjgl", "lwjgl-jemalloc", "lwjgl-glfw", "lwjgl-openal", "lwjgl-opengl", "lwjgl-stb"]