diff options
| author | sowgro <tpoke.ferrari@gmail.com> | 2024-09-05 22:27:14 -0400 | 
|---|---|---|
| committer | sowgro <tpoke.ferrari@gmail.com> | 2024-09-05 22:27:14 -0400 | 
| commit | a645b476202bd5b44ab5c22253a70269409b5674 (patch) | |
| tree | 39a45622e6b9e8325a7bf13f626b902e7fed0a65 /src/main/java/net/sowgro/npehero/levelapi | |
| parent | d685d397573c43194fede9b2bbd3aee76d2cd9f8 (diff) | |
| download | NPEhero-a645b476202bd5b44ab5c22253a70269409b5674.tar.gz NPEhero-a645b476202bd5b44ab5c22253a70269409b5674.tar.bz2 NPEhero-a645b476202bd5b44ab5c22253a70269409b5674.zip  | |
Add gui scale and other fixes
- add gui scaling and options in settings
- song with endTime of 0 will now properly get time from song length
- suppress unchecked warnings in levelapi
Diffstat (limited to 'src/main/java/net/sowgro/npehero/levelapi')
3 files changed, 8 insertions, 0 deletions
diff --git a/src/main/java/net/sowgro/npehero/levelapi/Difficulty.java b/src/main/java/net/sowgro/npehero/levelapi/Difficulty.java index c21ecf1..27f025a 100755 --- a/src/main/java/net/sowgro/npehero/levelapi/Difficulty.java +++ b/src/main/java/net/sowgro/npehero/levelapi/Difficulty.java @@ -50,6 +50,7 @@ public class Difficulty implements Comparable<Difficulty>          if (!jsonFile.exists()) {              return;          } +        @SuppressWarnings("unchecked")          Map<String, Object> data = jsonParser.fromJson(new FileReader(jsonFile), Map.class);          if (data == null) {              data = new HashMap<>(); @@ -85,6 +86,7 @@ public class Difficulty implements Comparable<Difficulty>          if (!jsonFile.exists() && !jsonFile.createNewFile()) {              throw new IOException("Could not create file " + jsonFile.getAbsolutePath());          } +        @SuppressWarnings("unchecked")          Map<String, Object> data = jsonParser.fromJson(new FileReader(jsonFile), Map.class); // start with previous values          if (data == null) {              data = new HashMap<>(); diff --git a/src/main/java/net/sowgro/npehero/levelapi/Leaderboard.java b/src/main/java/net/sowgro/npehero/levelapi/Leaderboard.java index bb1f30c..82f9aed 100644 --- a/src/main/java/net/sowgro/npehero/levelapi/Leaderboard.java +++ b/src/main/java/net/sowgro/npehero/levelapi/Leaderboard.java @@ -42,6 +42,7 @@ public class Leaderboard {       */      public void save() throws IOException {          file.createNewFile(); +        @SuppressWarnings("unchecked")          List<Map<String, Object>> data = json.fromJson(new FileReader(file), List.class);          for (LeaderboardEntry cur : entries) {              Map<String, Object> obj = new HashMap<>(); @@ -63,6 +64,7 @@ public class Leaderboard {          if (!file.exists()) {              return;          } +        @SuppressWarnings("unchecked")          List<Map<String, Object>> data = json.fromJson(new FileReader(file), List.class);          if (data == null) {              return; diff --git a/src/main/java/net/sowgro/npehero/levelapi/Level.java b/src/main/java/net/sowgro/npehero/levelapi/Level.java index c90fa47..9b54207 100755 --- a/src/main/java/net/sowgro/npehero/levelapi/Level.java +++ b/src/main/java/net/sowgro/npehero/levelapi/Level.java @@ -6,6 +6,7 @@ import com.google.gson.Gson;  import com.google.gson.GsonBuilder;  import javafx.scene.image.Image;  import javafx.scene.media.Media; +import javafx.scene.media.MediaPlayer;  import javafx.scene.paint.Color;  import java.nio.file.Files; @@ -69,6 +70,7 @@ public class Level implements Comparable<Level>{              if (fileName.contains(SONG_FILE)) {                  songFile = file;                  song = new Media(file.toURI().toString()); +                new MediaPlayer(song); // allows song.getDuration() to return              }              else if (fileName.contains(BACKGROUND_FILE)) {                  backgroundFile = file; @@ -90,6 +92,7 @@ public class Level implements Comparable<Level>{          if (!jsonFile.exists()) {              return;          } +        @SuppressWarnings("unchecked")          Map<String, Object> data = jsonParser.fromJson(new FileReader(jsonFile), Map.class);          title = (String) data.getOrDefault("title", title);          artist = (String) data.getOrDefault("artist", artist); @@ -126,6 +129,7 @@ public class Level implements Comparable<Level>{          if (!jsonFile.exists() && !jsonFile.createNewFile()) {              throw new IOException("Could not create file " + jsonFile.getAbsolutePath());          } +        @SuppressWarnings("unchecked")          Map<String, Object> data = jsonParser.fromJson(new FileReader(jsonFile), Map.class);          data.put("title", title);          data.put("artist", artist);  | 
