diff options
| author | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2024-05-10 18:37:11 -0400 |
|---|---|---|
| committer | Aaron <51387595+AzureAaron@users.noreply.github.com> | 2024-05-10 18:37:11 -0400 |
| commit | 7c36617431a7b76d77c5eb9d04ec01fc9d2cb924 (patch) | |
| tree | 6880727c46f2396102ca68e3ca31b29ebaa1e555 /src/main/java/de/hysky | |
| parent | ccc8d163725c27c0d2e69e667c3f1ce29c1c425d (diff) | |
| download | Skyblocker-7c36617431a7b76d77c5eb9d04ec01fc9d2cb924.tar.gz Skyblocker-7c36617431a7b76d77c5eb9d04ec01fc9d2cb924.tar.bz2 Skyblocker-7c36617431a7b76d77c5eb9d04ec01fc9d2cb924.zip | |
More null safety for newer fields
Diffstat (limited to 'src/main/java/de/hysky')
| -rw-r--r-- | src/main/java/de/hysky/skyblocker/config/ConfigDatafixer.java | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/main/java/de/hysky/skyblocker/config/ConfigDatafixer.java b/src/main/java/de/hysky/skyblocker/config/ConfigDatafixer.java index 90f349fc..7d0bb2d2 100644 --- a/src/main/java/de/hysky/skyblocker/config/ConfigDatafixer.java +++ b/src/main/java/de/hysky/skyblocker/config/ConfigDatafixer.java @@ -257,7 +257,7 @@ public class ConfigDatafixer { dungeonsNew.addProperty("playerSecretsTracker", JsonHelper.getBoolean(dungeonsOld, "playerSecretsTracker").orElse(false)); dungeonsNew.add("starredMobGlow", dungeonsOld.get("starredMobGlow")); dungeonsNew.addProperty("starredMobBoundingBoxes", JsonHelper.getBoolean(dungeonsOld, "starredMobBoundingBoxes").orElse(true)); - dungeonsNew.add("allowDroppingProtectedItems", dungeonsOld.get("allowDroppingProtectedItems")); + dungeonsNew.addProperty("allowDroppingProtectedItems", JsonHelper.getBoolean(dungeonsOld, "allowDroppingProtectedItems").orElse(false)); }; DataFixer map = (oldFmt, newFmt) -> { @@ -281,10 +281,10 @@ public class ConfigDatafixer { solverConfig.add("creeperSolver", dungeonsOld.get("creeperSolver")); solverConfig.add("solveTrivia", dungeonsOld.get("solveTrivia")); solverConfig.add("solveTicTacToe", dungeonsOld.get("solveTicTacToe")); - solverConfig.add("solveWaterboard", dungeonsOld.get("solveWaterboard")); - solverConfig.add("solveBoulder", dungeonsOld.get("solveBoulder")); - solverConfig.add("solveIceFill", dungeonsOld.get("solveIceFill")); - solverConfig.add("solveSilverfish", dungeonsOld.get("solveSilverfish")); + solverConfig.addProperty("solveWaterboard", JsonHelper.getBoolean(dungeonsOld, "solveWaterboard").orElse(true)); + solverConfig.addProperty("solveBoulder", JsonHelper.getBoolean(dungeonsOld, "solveBoulder").orElse(true)); + solverConfig.addProperty("solveIceFill", JsonHelper.getBoolean(dungeonsOld, "solveIceFill").orElse(true)); + solverConfig.addProperty("solveSilverfish", JsonHelper.getBoolean(dungeonsOld, "solveSilverfish").orElse(true)); newFmt.getAsJsonObject("dungeons").add("puzzleSolvers", solverConfig); }; @@ -377,7 +377,6 @@ public class ConfigDatafixer { return new DataFixer[] { mainFixer }; } - private static DataFixer[] getQuickNavDataFixerRules() { DataFixer toggle = (oldFmt, newFmt) -> newFmt.getAsJsonObject("quickNav").add("enableQuickNav", oldFmt.getAsJsonObject("quickNav").get("enableQuickNav")); DataFixer buttonFixer = (oldFmt, newFmt) -> { |