Added some sanity checks to assets-related methods

betacraftuk · Oct 16, 2024 · 1cd7dc3 · 1cd7dc3
1 parent 326a9de
commit 1cd7dc3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/src/main/java/uk/betacraft/legacyfix/LegacyFixLauncher.java b/src/main/java/uk/betacraft/legacyfix/LegacyFixLauncher.java
@@ -131,7 +131,9 @@ public static String getAssetsDir() {
     }
 
     public static String getAssetIndexPath() {
-        String assetIndex = getValue("assetIndex", "empty");
+        String assetIndex = getValue("assetIndex", null);
+        if (assetIndex == null)
+            return null;
 
         return new File(getAssetsDir(), "indexes/" + assetIndex + ".json").getAbsolutePath();
     }

diff --git a/src/main/java/uk/betacraft/legacyfix/util/AssetUtils.java b/src/main/java/uk/betacraft/legacyfix/util/AssetUtils.java
@@ -23,7 +23,11 @@ public class AssetUtils {
     public static List<AssetObject> assets = new LinkedList<AssetObject>();
 
     public static JSONObject getAssetIndex() throws FileNotFoundException {
-        return new JSONObject(new JSONTokener(new InputStreamReader(new FileInputStream(LegacyFixLauncher.getAssetIndexPath())))).getJSONObject("objects");
+        String assetIndexPath = LegacyFixLauncher.getAssetIndexPath();
+        if (assetIndexPath == null)
+            return new JSONObject();
+
+        return new JSONObject(new JSONTokener(new InputStreamReader(new FileInputStream(assetIndexPath)))).getJSONObject("objects");
     }
 
     public static String generateTxtIndex() {
@@ -35,10 +39,10 @@ public static String generateTxtIndex() {
             initAssets(assetIndex);
 
             for (AssetObject assetObject : assets) {
-                txtIndex.append("\n").append(assetObject.key).append(",").append(assetObject.size).append(",0");
+                txtIndex.append(assetObject.key).append(",").append(assetObject.size).append(",0").append("\n");
             }
 
-            return txtIndex.substring(1);
+            return txtIndex.toString();
         } catch (Throwable t) {
             LFLogger.error("generateTxtIndex", t);
             return "";