Skip to content

Fix the compatibility with lr2ir-read-only #191

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Catizard wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix the compatibility with lr2ir-read-only #191

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions core/src/bms/player/beatoraja/PlayDataAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
import bms.player.beatoraja.ScoreData.SongTrophy;
import bms.player.beatoraja.ScoreDatabaseAccessor.ScoreDataCollector;
import bms.player.beatoraja.ScoreLogDatabaseAccessor.ScoreLog;
import bms.player.beatoraja.ir.LR2IRConnection;
import bms.player.beatoraja.ir.LR2IRAccessor;
import bms.player.beatoraja.song.SongData;

import com.badlogic.gdx.utils.Json;
Expand Down Expand Up @@ -75,7 +75,7 @@ public PlayDataAccessor(Config config) {
scorelogdb = new ScoreLogDatabaseAccessor(playerpath + File.separatorChar + player + File.separatorChar + "scorelog.db");
scoredatalogdb = new ScoreDataLogDatabaseAccessor(playerpath + File.separatorChar + player + File.separatorChar + "scoredatalog.db");
// Share scoredb to LR2IR
LR2IRConnection.setScoreDatabaseAccessor(scoredb);
LR2IRAccessor.setScoreDatabaseAccessor(scoredb);
} catch (ClassNotFoundException e) {
e.printStackTrace();
}
Expand Down
6 changes: 2 additions & 4 deletions .../player/beatoraja/ir/LR2IRConnection.java → ...ms/player/beatoraja/ir/LR2IRAccessor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,8 @@
package bms.player.beatoraja.ir;

import bms.player.beatoraja.MainController;
import bms.player.beatoraja.ScoreData;
import bms.player.beatoraja.ScoreDatabaseAccessor;
import bms.player.beatoraja.modmenu.ImGuiNotify;
import bms.player.beatoraja.skin.property.StringPropertyFactory;
import com.fasterxml.jackson.databind.MapperFeature;
import com.fasterxml.jackson.dataformat.xml.XmlMapper;
import com.fasterxml.jackson.dataformat.xml.annotation.JacksonXmlElementWrapper;
Expand Down Expand Up @@ -36,14 +34,14 @@
* @implNote This class is not a real IR connection, but the original repo is. It keeps the
* original form to make things easier
*/
public class LR2IRConnection {
public class LR2IRAccessor {
private static final String IRUrl = "http://dream-pro.info/~lavalse/LR2IR/2";
private static ScoreDatabaseAccessor scoreDatabaseAccessor;

private static Map<String, LeaderboardEntry[]> lr2IRRankingCache = new HashMap<>();

public static void setScoreDatabaseAccessor(ScoreDatabaseAccessor scoreDatabaseAccessor) {
LR2IRConnection.scoreDatabaseAccessor = scoreDatabaseAccessor;
LR2IRAccessor.scoreDatabaseAccessor = scoreDatabaseAccessor;
}

private static Object convertXMLToObject(String xml, Class c) {
Expand Down
6 changes: 3 additions & 3 deletions core/src/bms/player/beatoraja/select/bar/LeaderBoardBar.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
import bms.player.beatoraja.ir.IRResponse;
import bms.player.beatoraja.ir.IRScoreData;
import bms.player.beatoraja.ir.LeaderboardEntry;
import bms.player.beatoraja.ir.LR2IRConnection;
import bms.player.beatoraja.ir.LR2IRAccessor;
import bms.player.beatoraja.ir.LR2GhostData;
import bms.player.beatoraja.play.GhostBattlePlay;
import bms.player.beatoraja.modmenu.ImGuiNotify;
Expand Down Expand Up @@ -55,7 +55,7 @@ public Bar[] getChildren() {
.toArray(LeaderboardEntry[] ::new);
return fromIRScoreData(leaderboard);
} else {
Pair<IRScoreData, LeaderboardEntry[]> scores = LR2IRConnection.getScoreData(new IRChartData(songData));
Pair<IRScoreData, LeaderboardEntry[]> scores = LR2IRAccessor.getScoreData(new IRChartData(songData));
IRScoreData localScore = scores.getKey();
LeaderboardEntry[] scoreData = scores.getValue();
if (localScore != null) {
Expand Down Expand Up @@ -138,7 +138,7 @@ private FunctionBar createFunctionBar(int rank, LeaderboardEntry entry, boolean
ImGuiNotify.warning("LR2IR Ghost battle is currently only supported for 7K.");
}

LR2GhostData ghost = LR2IRConnection.getGhostData(songData.getMd5(), entry.getLR2Id());
LR2GhostData ghost = LR2IRAccessor.getGhostData(songData.getMd5(), entry.getLR2Id());
// ghost might be null in case of issues with fetching or parsing
// the ghost data; whatever caused the error should have already
// been reported by this point
Expand Down