diff options
Diffstat (limited to 'src/main')
-rw-r--r-- | src/main/Difficulty.java | 106 | ||||
-rw-r--r-- | src/main/Level.java | 120 | ||||
-rw-r--r-- | src/main/LevelController.java | 36 | ||||
-rw-r--r-- | src/main/SettingsController.java | 36 |
4 files changed, 205 insertions, 93 deletions
diff --git a/src/main/Difficulty.java b/src/main/Difficulty.java index 2c74956..abb12f4 100644 --- a/src/main/Difficulty.java +++ b/src/main/Difficulty.java @@ -1,62 +1,64 @@ package main; import java.io.File; -import java.io.FileNotFoundException; import java.io.FileReader; import java.io.FileWriter; import java.io.IOException; import java.time.LocalDate; - import org.json.simple.JSONArray; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; - import javafx.collections.FXCollections; import javafx.collections.ObservableList; public class Difficulty { public File thisDir; - public String title; + public String title = "Unnamed"; private ObservableList<LeaderboardEntry> leaderboard = FXCollections.observableArrayList(); public File notes; - public int bpm; - public File song; + public Double bpm = 0.0; public int numBeats; - private File leaderboardFile; + public Level level; - public Difficulty(File file) + /** + * Creates a new Difficulty and gives it a file path + * @param newDir: The file path of the Difficulty + */ + public Difficulty(File newDir, Level level) { - thisDir = file; - readData(); + thisDir = newDir; + this.level = level; } + /** + * Checks for files in the difficulty folder and runs cooresponding actions + */ public void readData() { for(File cur: thisDir.listFiles()) //iterates through all files/folders in src/assets/levels/LEVEL/DIFFICULTY { if (cur.getName().equals("metadata.json")) { - parseMetadata(cur); + parseMetadata(); } if (cur.getName().equals("leaderboard.json")) { - parseLeaderboard(cur); + parseLeaderboard(); } if (cur.getName().equals("notes.txt")) { notes = cur; } - if (cur.getName().equals("song.wav")) - { - song = cur; - } } } - - public void parseMetadata(File file) + /** + * Reads in json metadata and assigns values to variables + */ + public void parseMetadata() { + File file = new File(thisDir, "metadata.json"); JSONParser jsonParser = new JSONParser(); //parser to read the file try(FileReader reader = new FileReader(file)) @@ -65,20 +67,44 @@ public class Difficulty 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 = Double.parseDouble(diffStuff.get("bpm")+""); + numBeats = Integer.parseInt(diffStuff.get("numBeats")+""); } catch (Exception e) { - System.out.println("Error in json file "+file); - //e.printStackTrace(); + e.printStackTrace(); + } + } + + /** + * Writes metadata to json file + */ + public void writeMetadata() + { + FileWriter fileWriter; + try + { + File file = new File(thisDir, "metadata.json"); + fileWriter = new FileWriter(file); + JSONObject obj = new JSONObject(); + obj.put("title", title); + obj.put("bpm", bpm); + obj.put("numBeats", numBeats); + obj.writeJSONString(fileWriter); + fileWriter.flush(); + } + catch (IOException e) + { + e.printStackTrace(); } } - public void parseLeaderboard(File file) + /** + * Reads in json leaderboard and assigns populates list with leaderboardEntries + */ + public void parseLeaderboard() { - leaderboardFile = file; + File file = new File(thisDir, "leaderboard.json"); JSONParser jsonParser = new JSONParser(); //parser to read the file try(FileReader reader = new FileReader(file)) @@ -99,17 +125,20 @@ public class Difficulty } catch (Exception e) { - System.out.println("Error in json file "+leaderboardFile); - //e.printStackTrace(); + e.printStackTrace(); } } - public void addToLeaderboard(String name, int score) + /** + * Writes leaderboard to json file + */ + public void writeLeaderboard() { - leaderboard.add(new LeaderboardEntry(name, score, ""+LocalDate.now())); //do not delete this tho its not a placeholder - - try (FileWriter fileWriter = new FileWriter(leaderboardFile)) + FileWriter fileWriter; + try { + File file = new File(thisDir, "leaderboard.json"); + fileWriter = new FileWriter(file); //write the settings JSONObject instance to the file JSONArray jsonArray = new JSONArray(); for (LeaderboardEntry cur: leaderboard) @@ -129,6 +158,17 @@ public class Difficulty } } + /** + * Adds new leaderboardEntry to list and updates json file + * @param name: the players name + * @param score the players score + */ + public void addToLeaderboard(String name, int score) + { + leaderboard.add(new LeaderboardEntry(name, score, ""+LocalDate.now())); //do not delete this tho its not a placeholder + writeLeaderboard(); + } + public ObservableList<LeaderboardEntry> getLeaderboard() { return leaderboard; @@ -138,8 +178,4 @@ public class Difficulty { return title; } - - public void writeMetadata() { - - } } diff --git a/src/main/Level.java b/src/main/Level.java index 95d6b5d..cb16489 100644 --- a/src/main/Level.java +++ b/src/main/Level.java @@ -2,36 +2,43 @@ package main; import java.io.File; import java.util.ArrayList; +import java.util.Comparator; import javafx.scene.image.Image; import javafx.scene.paint.Color; import java.io.FileWriter; -import java.io.FileNotFoundException; import java.io.FileReader; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.StandardCopyOption; import org.json.simple.JSONObject; import org.json.simple.parser.JSONParser; -import org.json.simple.parser.ParseException; - -import gui.Driver; public class Level { public File thisDir; - private String title; - private String artist; + private String title = "Unnamed"; + private String artist = "Unknown"; private ArrayList<Difficulty> diffList; public Image preview; //optional - public String desc; + public String desc = "No description"; public Image background; //optional - public Color[] colors;//optional, have default colors - - public Level(File dir) + public Color[] colors = {Color.RED,Color.BLUE,Color.GREEN,Color.PURPLE,Color.YELLOW};//optional, have default colors + public File song; + + /** + * Creates a new level and gives it a file path + * @param newDir: The path of the Level + */ + public Level(File newDir) { - thisDir = dir; - readData(); + thisDir = newDir; } + /** + * Checks for files in the level folder and runs cooresponding actions + */ public void readData() { diffList = new ArrayList<Difficulty>(); @@ -39,27 +46,32 @@ public class Level { if (cur.isDirectory()) //all subfolders within a level folder are difficulties { - Difficulty diff = new Difficulty(cur); + Difficulty diff = new Difficulty(cur,this); + diff.readData(); diffList.add(diff); } - - if (cur.getName().equals("preview.png")) - { - preview = new Image(cur.toURI().toString()); - } - if (cur.getName().equals("metadata.json")) { parseMetadata(); } - + if (cur.getName().equals("preview.png")) + { + preview = new Image(cur.toURI().toString()); + } if (cur.getName().equals("background.png")) { background = new Image(cur.toURI().toString()); } + if (cur.getName().equals("song.wav")) + { + song = cur; + } } } + /** + * Reads in json metadata and assigns values to variables + */ public void parseMetadata() { JSONParser jsonParser = new JSONParser(); //parser to read the file @@ -95,6 +107,9 @@ public class Level } } + /** + * Writes metadata to json file + */ public void writeMetadata() { FileWriter fileWriter; @@ -105,44 +120,81 @@ public class Level obj.put("title", title); obj.put("artist", artist); obj.put("desc", desc); - obj.put("color1",colors[0]); - obj.put("color2",colors[1]); - obj.put("color3",colors[2]); - obj.put("color4",colors[3]); - obj.put("color5",colors[4]); + obj.put("color1",colors[0].toString()); + obj.put("color2",colors[1].toString()); + obj.put("color3",colors[2].toString()); + obj.put("color4",colors[3].toString()); + obj.put("color5",colors[4].toString()); obj.writeJSONString(fileWriter); + fileWriter.flush(); } catch (IOException e) { e.printStackTrace(); } } - public ArrayList<Difficulty> getDiffList() - { - return diffList; - } - + /** + * Adds a difficulty by creating a directory and required files + * @param text: the name of the directory and default title + */ public void addDiff(String text) { File diffDir = new File(thisDir, text); diffDir.mkdirs(); File metadataDir = new File(diffDir, "metadata.json"); + File leaderboardDir = new File(diffDir, "leaderboard.json"); + File notesDir = new File(diffDir, "notes.txt"); try { metadataDir.createNewFile(); + leaderboardDir.createNewFile(); + notesDir.createNewFile(); } catch (IOException e) { e.printStackTrace(); } + Difficulty temp = new Difficulty(diffDir,this); + temp.title = text; + temp.writeMetadata(); + temp.writeLeaderboard(); readData(); } - public void removeDiff(Difficulty diff) + /** + * Removes the difficaulty from the filesystem then reloads the level + * @param diff: the difficulty to be removed + */ + public void removeDiff(Difficulty diff) + { + File hold = diff.thisDir; + diffList.remove(diff); + + try { + Files.walk(hold.toPath()) + .sorted(Comparator.reverseOrder()) + .map(Path::toFile) + .forEach(File::delete); + } catch (IOException e) { + e.printStackTrace(); + } + } + + /** + * Copies a file into the level directory + * @param newFile: the file to be copied + * @param name: the new file name + */ + public void addFile(File newFile, String name) { - //soon + try { + Files.copy(newFile.toPath(), new File(thisDir, name).toPath(), StandardCopyOption.REPLACE_EXISTING); + } catch (IOException e) { + e.printStackTrace(); + } + readData(); } - public void renameDiff(Difficulty diff, String newName) + public ArrayList<Difficulty> getDiffList() { - //soon + return diffList; } public String getTitle() diff --git a/src/main/LevelController.java b/src/main/LevelController.java index eff512d..78d638a 100644 --- a/src/main/LevelController.java +++ b/src/main/LevelController.java @@ -2,6 +2,9 @@ package main; import java.io.File; import java.io.IOException; +import java.nio.file.Files; +import java.nio.file.Path; +import java.util.Comparator; import javafx.collections.FXCollections; import javafx.collections.ObservableList; @@ -11,21 +14,32 @@ public class LevelController File thisDir = new File("levels"); public static ObservableList<Level> levelList; + /** + * Creates a levelController, which holds all the levels + */ public LevelController() { readData(); } + /** + * Reads contents of folder and creates cooresponding levels + */ public void readData() { levelList = FXCollections.observableArrayList(); for (File cur: thisDir.listFiles()) //iterates through all files/folders in levels { Level level = new Level(cur); + level.readData(); levelList.add(level); } } + /** + * Adds a level to the list by creating a directory and required files + * @param text: the name of the directory and default title + */ public void addLevel(String text) { File levelDir = new File(thisDir,text); @@ -39,16 +53,28 @@ public class LevelController { e.printStackTrace(); } + Level temp = new Level(levelDir); + temp.setTitle(text); + temp.writeMetadata(); readData(); } + /** + * Removes level from the filesystem then reloads this levelController + * @param level: the level to be removed + */ public void removeLevel(Level level) { - //soon - } + File hold = level.thisDir; + levelList.remove(level); - public void renameLevel(Level level, String newName) - { - //soon + try { + Files.walk(hold.toPath()) + .sorted(Comparator.reverseOrder()) + .map(Path::toFile) + .forEach(File::delete); + } catch (IOException e) { + e.printStackTrace(); + } } }
\ No newline at end of file diff --git a/src/main/SettingsController.java b/src/main/SettingsController.java index f3bd671..4bd2b24 100644 --- a/src/main/SettingsController.java +++ b/src/main/SettingsController.java @@ -15,26 +15,9 @@ public class SettingsController {
public SimpleIntegerProperty effectsVol = new SimpleIntegerProperty(0);
public SimpleIntegerProperty musicVol = new SimpleIntegerProperty(0);
- private boolean fullscreen;
private JSONObject settings;
- public void saveAndWrite(int newEffVol, int newMusVol)
- {
- settings.put("musicVol", newMusVol);
- settings.put("effectsVol", newEffVol);
- try (FileWriter file = new FileWriter("settings.json"))
- {
- //write the settings JSONObject instance to the file
- file.write(settings.toJSONString());
- file.flush();
-
- }
- catch (IOException e) {
- e.printStackTrace();
- }
- }
-
- public void readFile() throws ParseException
+ public void read() throws ParseException
{
JSONParser jsonParser = new JSONParser(); //parser to read the file
@@ -57,5 +40,20 @@ public class SettingsController }
}
-
+
+ public void write(int newEffVol, int newMusVol)
+ {
+ settings.put("musicVol", newMusVol);
+ settings.put("effectsVol", newEffVol);
+ try (FileWriter file = new FileWriter("settings.json"))
+ {
+ //write the settings JSONObject instance to the file
+ file.write(settings.toJSONString());
+ file.flush();
+
+ }
+ catch (IOException e) {
+ e.printStackTrace();
+ }
+ }
}
|