From dc3923caadd42b917ffcd5dd9045a00f896fc61b Mon Sep 17 00:00:00 2001 From: Stachelbeere1248 Date: Wed, 29 Nov 2023 22:59:13 +0100 Subject: [PATCH] finished game tracking --- .../stachelbeere1248/zombiesutils/timer/Timer.java | 3 +-- .../zombiesutils/timer/recorder/FileManager.java | 10 +++++----- .../timer/recorder/files/CategoryFile.java | 4 ++-- .../zombiesutils/timer/recorder/files/GameFile.java | 3 ++- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/github/stachelbeere1248/zombiesutils/timer/Timer.java b/src/main/java/com/github/stachelbeere1248/zombiesutils/timer/Timer.java index 7c306d8..f211000 100644 --- a/src/main/java/com/github/stachelbeere1248/zombiesutils/timer/Timer.java +++ b/src/main/java/com/github/stachelbeere1248/zombiesutils/timer/Timer.java @@ -6,7 +6,6 @@ import com.github.stachelbeere1248.zombiesutils.game.GameMode; import com.github.stachelbeere1248.zombiesutils.game.Map; import com.github.stachelbeere1248.zombiesutils.game.sla.SLA; import com.github.stachelbeere1248.zombiesutils.timer.recorder.Category; -import com.github.stachelbeere1248.zombiesutils.timer.recorder.FileManager; import com.github.stachelbeere1248.zombiesutils.timer.recorder.files.GameFile; import net.minecraft.client.Minecraft; import net.minecraft.util.ChatComponentText; @@ -71,7 +70,7 @@ public class Timer { if (passedRound == (byte) 1) pbTracking = true; try { - FileManager. + gameFile.setSegment(passedRound,roundTime); RecordManager.compareSegment(passedRound, roundTime, category); if (pbTracking) RecordManager.compareBest(passedRound, gameTime, category); } catch (IndexOutOfBoundsException exception) { diff --git a/src/main/java/com/github/stachelbeere1248/zombiesutils/timer/recorder/FileManager.java b/src/main/java/com/github/stachelbeere1248/zombiesutils/timer/recorder/FileManager.java index 3c97d04..f1d1acd 100644 --- a/src/main/java/com/github/stachelbeere1248/zombiesutils/timer/recorder/FileManager.java +++ b/src/main/java/com/github/stachelbeere1248/zombiesutils/timer/recorder/FileManager.java @@ -26,19 +26,19 @@ public class FileManager { return gson.fromJson(dataJson, CategoryData.class); } - public static void createDataFile(ISplitsData splitsData, @NotNull SplitsFile splitsFile) { + public static void createDataFile(@NotNull SplitsFile splitsFile) { try { //noinspection ResultOfMethodCallIgnored splitsFile.getParentFile().mkdirs(); //noinspection ResultOfMethodCallIgnored splitsFile.createNewFile(); - writeDataToFile(splitsData, splitsFile); + writeDataToFile(splitsFile); } catch (IOException e) { throw new RuntimeException(e); } } - public static void writeDataToFile(@NotNull ISplitsData splitsData, SplitsFile splitsFile) throws IOException { - FileUtils.writeStringToFile(splitsFile, splitsData.toJSON(), StandardCharsets.US_ASCII); + public static void writeDataToFile(SplitsFile splitsFile) throws IOException { + FileUtils.writeStringToFile(splitsFile, splitsFile.getData().toJSON(), StandardCharsets.US_ASCII); } public static CategoryData categoryReadOrCreate(CategoryFile file) { CategoryData data; @@ -46,7 +46,7 @@ public class FileManager { data = FileManager.readDataFromFile(file); } catch (FileNotFoundException ignored) { data = new CategoryData(file.getGameMode().getMap()); - FileManager.createDataFile(data, file); + FileManager.createDataFile(file); } return data; } diff --git a/src/main/java/com/github/stachelbeere1248/zombiesutils/timer/recorder/files/CategoryFile.java b/src/main/java/com/github/stachelbeere1248/zombiesutils/timer/recorder/files/CategoryFile.java index c1ce527..7cd4eb5 100644 --- a/src/main/java/com/github/stachelbeere1248/zombiesutils/timer/recorder/files/CategoryFile.java +++ b/src/main/java/com/github/stachelbeere1248/zombiesutils/timer/recorder/files/CategoryFile.java @@ -27,7 +27,7 @@ public class CategoryFile extends SplitsFile { public void setBestSegment(int round, short ticks) { data.setBestSegment(round-1, ticks); - try { FileManager.writeDataToFile(data,this); } + try { FileManager.writeDataToFile(this); } catch (IOException e) { throw new RuntimeException(e); } } public int getPersonalBest(int round) { @@ -36,7 +36,7 @@ public class CategoryFile extends SplitsFile { public void setPersonalBest(int round, int ticks) { data.setPersonalBest(round-1, ticks); - try { FileManager.writeDataToFile(data,this); } + try { FileManager.writeDataToFile(this); } catch (IOException e) { throw new RuntimeException(e); } } diff --git a/src/main/java/com/github/stachelbeere1248/zombiesutils/timer/recorder/files/GameFile.java b/src/main/java/com/github/stachelbeere1248/zombiesutils/timer/recorder/files/GameFile.java index fd77d0d..499a685 100644 --- a/src/main/java/com/github/stachelbeere1248/zombiesutils/timer/recorder/files/GameFile.java +++ b/src/main/java/com/github/stachelbeere1248/zombiesutils/timer/recorder/files/GameFile.java @@ -20,6 +20,7 @@ public class GameFile extends SplitsFile { public GameFile(String serverNumber, Map map) { super("zombies" + File.separator + "runs", formattedTime() + "_" + serverNumber + ".times"); data = new GameData(map); + FileManager.createDataFile(this); } private static @NotNull String formattedTime() { @@ -30,7 +31,7 @@ public class GameFile extends SplitsFile { public void setSegment(int round, short ticks) { data.setSegment(round-1, ticks); - try { FileManager.writeDataToFile(data,this); } + try { FileManager.writeDataToFile(this); } catch (IOException e) { throw new RuntimeException(e); } }