From bb773570e916adb287a163e5c83bfdeeb63299bb Mon Sep 17 00:00:00 2001 From: johni0702 Date: Mon, 1 Jun 2015 13:23:06 +0200 Subject: [PATCH] Add extensions to paths and visibility in replay files (preserves backwards compatibility) --- .../eu/crushedpixel/replaymod/utils/ReplayFile.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/main/java/eu/crushedpixel/replaymod/utils/ReplayFile.java b/src/main/java/eu/crushedpixel/replaymod/utils/ReplayFile.java index 171de703..fce7433d 100644 --- a/src/main/java/eu/crushedpixel/replaymod/utils/ReplayFile.java +++ b/src/main/java/eu/crushedpixel/replaymod/utils/ReplayFile.java @@ -23,11 +23,13 @@ public class ReplayFile extends ZipFile { public static final String ZIP_FILE_EXTENSION = ".mcpr"; public static final String ENTRY_RECORDING = "recording" + TEMP_FILE_EXTENSION; public static final String ENTRY_METADATA = "metaData" + JSON_FILE_EXTENSION; - public static final String ENTRY_PATHS = "paths"; + public static final String ENTRY_PATHS_OLD = "paths"; + public static final String ENTRY_PATHS = "paths" + JSON_FILE_EXTENSION; public static final String ENTRY_THUMB = "thumb"; public static final String ENTRY_RESOURCE_PACK = "resourcepack/%s.zip"; public static final String ENTRY_RESOURCE_PACK_INDEX = "resourcepack/index.json"; - public static final String ENTRY_VISIBILITY = "visibility"; + public static final String ENTRY_VISIBILITY_OLD = "visibility"; + public static final String ENTRY_VISIBILITY = "visibility" + JSON_FILE_EXTENSION; private final File file; @@ -76,11 +78,13 @@ public class ReplayFile extends ZipFile { } public ZipArchiveEntry pathsEntry() { - return getEntry(ENTRY_PATHS); + ZipArchiveEntry newEntry = getEntry(ENTRY_PATHS); + return newEntry != null ? newEntry : getEntry(ENTRY_PATHS_OLD); } public ZipArchiveEntry visibilityEntry() { - return getEntry(ENTRY_VISIBILITY); + ZipArchiveEntry newEntry = getEntry(ENTRY_VISIBILITY); + return newEntry != null ? newEntry : getEntry(ENTRY_VISIBILITY_OLD); } public Supplier paths() {