aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--levels/testLevel/easy/leaderboard.json32
-rw-r--r--levels/testLevel/easy/metadata.json5
-rw-r--r--levels/testLevel/hard/leaderboard.json1
-rw-r--r--src/main/Difficulty.java95
-rw-r--r--src/main/LevelController.java16
5 files changed, 77 insertions, 72 deletions
diff --git a/levels/testLevel/easy/leaderboard.json b/levels/testLevel/easy/leaderboard.json
index ad9fa86..1d14274 100644
--- a/levels/testLevel/easy/leaderboard.json
+++ b/levels/testLevel/easy/leaderboard.json
@@ -1,15 +1,17 @@
-{
- "leaderboard":
- [
- {
- "name": "tbone",
- "date": "today",
- "score": "100"
- },
- {
- "name": "zbone",
- "date": "today",
- "score": "0"
- }
- ]
-} \ No newline at end of file
+[
+ {
+ "date": "today",
+ "score": 100,
+ "name": "tbone"
+ },
+ {
+ "date": "today",
+ "score": 0,
+ "name": "zbone"
+ },
+ {
+ "date": "2023-05-30",
+ "score": 0,
+ "name": "greg"
+ }
+] \ No newline at end of file
diff --git a/levels/testLevel/easy/metadata.json b/levels/testLevel/easy/metadata.json
index e69de29..29eacc0 100644
--- a/levels/testLevel/easy/metadata.json
+++ b/levels/testLevel/easy/metadata.json
@@ -0,0 +1,5 @@
+{
+ "title": "Easy",
+ "bpm": 28,
+ "numBeats": 100
+} \ No newline at end of file
diff --git a/levels/testLevel/hard/leaderboard.json b/levels/testLevel/hard/leaderboard.json
index e69de29..0637a08 100644
--- a/levels/testLevel/hard/leaderboard.json
+++ b/levels/testLevel/hard/leaderboard.json
@@ -0,0 +1 @@
+[] \ No newline at end of file
diff --git a/src/main/Difficulty.java b/src/main/Difficulty.java
index 02b3797..ebe7a3f 100644
--- a/src/main/Difficulty.java
+++ b/src/main/Difficulty.java
@@ -1,16 +1,12 @@
package main;
-import java.io.BufferedReader;
import java.io.File;
import java.io.FileNotFoundException;
import java.io.FileReader;
import java.io.FileWriter;
import java.io.IOException;
-import java.text.ParseException;
import java.time.LocalDate;
-import javax.lang.model.util.ElementScanner14;
-
import org.json.simple.JSONArray;
import org.json.simple.JSONObject;
import org.json.simple.parser.JSONParser;
@@ -21,95 +17,84 @@ import javafx.collections.ObservableList;
public class Difficulty
{
public String title;
- private ObservableList<LeaderboardEntry> leaderboard;
+ private ObservableList<LeaderboardEntry> leaderboard = FXCollections.observableArrayList();
public File notes;
public int bpm = 28;
public File song;
public int numBeats;
- public JSONObject diffStuff;
- public JSONObject leaderboardStuff;
- public LeaderboardEntry[] fileLeaderboard;
- private String filepath;
+ private File leaderboardFile;
public void parseMetadata(File file) throws FileNotFoundException, IOException
{
JSONParser jsonParser = new JSONParser(); //parser to read the file
- System.out.println("test");
- try (BufferedReader br = new BufferedReader(new FileReader(file))) {
- String line;
- while ((line = br.readLine()) != null) {
- System.out.println(line);
- }
- }
try(FileReader reader = new FileReader(file))
{
Object obj = jsonParser.parse(reader);
-
- diffStuff = (JSONObject)(obj); //converts read object to a JSONObject
+ JSONObject diffStuff = (JSONObject)(obj); //converts read object to a JSONObject
title = (String) diffStuff.get("title");
- bpm = (int) diffStuff.get("bpm");
- numBeats = (int) diffStuff.get("numBeats");
+ bpm = Integer.parseInt(""+diffStuff.get("bpm"));
+ numBeats = Integer.parseInt(""+diffStuff.get("numBeats"));
+
}
- catch (FileNotFoundException e)
- {
- e.printStackTrace();
- }
- catch (IOException e)
- {
- e.printStackTrace();
- } catch (org.json.simple.parser.ParseException e)
+ catch (Exception e)
{
- e.printStackTrace();
- }
-
+ System.out.println("Error in json file "+file);
+ //e.printStackTrace();
+ }
}
- public void parseLeaderboard(File file) throws FileNotFoundException, IOException {
- //and here
- //leaderboard.add(new LeaderboardEntry("placeholderScore", 0, "0/0/0"));
-
+ public void parseLeaderboard(File file) throws FileNotFoundException, IOException
+ {
+ leaderboardFile = file;
JSONParser jsonParser = new JSONParser(); //parser to read the file
- filepath = file.getPath();
-
-
try(FileReader reader = new FileReader(file))
{
Object obj = jsonParser.parse(reader);
- leaderboardStuff = (JSONObject)(obj); //converts read object to a JSONArray
-
- fileLeaderboard = (LeaderboardEntry[]) leaderboardStuff.get("leaderboard");
+ JSONArray leaderboardStuff = (JSONArray)(obj); //converts read object to a JSONArray
- leaderboard.addAll(fileLeaderboard);
+ for (Object cur: leaderboardStuff)
+ {
+ JSONObject cur2 = (JSONObject) cur;
+
+ String name = (String) cur2.get("name");
+ int score = Integer.parseInt(""+cur2.get("score"));
+ String date = (String) cur2.get("date");
+ leaderboard.add(new LeaderboardEntry(name, score, date));
+ }
}
- catch (FileNotFoundException e)
- {
- e.printStackTrace();
- }
- catch (IOException e)
- {
- e.printStackTrace();
- } catch (org.json.simple.parser.ParseException e)
+ catch (Exception e)
{
- e.printStackTrace();
- }
+ System.out.println("Error in json file "+leaderboardFile);
+ //e.printStackTrace();
+ }
}
public void addToLeaderboard(String name, int score)
{
leaderboard.add(new LeaderboardEntry(name, score, ""+LocalDate.now())); //do not delete this tho its not a placeholder
- try (FileWriter fileWriter = new FileWriter(filepath))
+ try (FileWriter fileWriter = new FileWriter(leaderboardFile))
{
//write the settings JSONObject instance to the file
- fileWriter.write(((JSONArray) leaderboard).toJSONString());
+ JSONArray jsonArray = new JSONArray();
+ for (LeaderboardEntry cur: leaderboard)
+ {
+ JSONObject obj = new JSONObject();
+ obj.put("name", cur.getName());
+ obj.put("score", cur.getScore());
+ obj.put("date",cur.getDate());
+ jsonArray.add(obj);
+ }
+ jsonArray.writeJSONString(fileWriter);
fileWriter.flush();
- } catch (IOException e) {
+ }
+ catch (IOException e) {
e.printStackTrace();
}
}
diff --git a/src/main/LevelController.java b/src/main/LevelController.java
index faa5bf4..3abf810 100644
--- a/src/main/LevelController.java
+++ b/src/main/LevelController.java
@@ -1,6 +1,8 @@
package main;
import java.io.File;
+import java.io.IOException;
+
import javafx.collections.FXCollections;
import javafx.collections.ObservableList;
import javafx.scene.image.Image;
@@ -23,11 +25,21 @@ public class LevelController
{
if (curFileInCurDiff.getName().equals("metadata.json"))
{
- diff.parseMetadata(curFileInCurDiff);
+ try {
+ diff.parseMetadata(curFileInCurDiff);
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
if (curFileInCurDiff.getName().equals("leaderboard.json"))
{
- diff.parseLeaderboard(curFileInCurDiff);
+ try {
+ diff.parseLeaderboard(curFileInCurDiff);
+ } catch (IOException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
}
if (curFileInCurDiff.getName().equals("notes.txt"))
{
generated by cgit v1.2.3 (git 2.25.1) at 2025-06-16 22:16:06 +0000