Merge pull request #8 from DazedNConfused-/latest_world_fix

Author: DazedNConfused-

.gitignore

@@ -42,4 +42,5 @@ saves
 backups
 .macatalauncher
 trashed
-userdir
+userdir
+mods

src/main/java/com/dazednconfused/catalauncher/helper/Constants.java

@@ -9,6 +9,7 @@ public class Constants {
     public static final String CUSTOM_SAVE_PATH = LAUNCHER_ROOT_FOLDER + "/saves/";
     public static final String CUSTOM_USER_DIR = LAUNCHER_ROOT_FOLDER + "/userdir/";
     public static final String CUSTOM_SOUNDPACKS_DIR = CUSTOM_USER_DIR + "sound/";
+    public static final String CUSTOM_MODS_DIR = CUSTOM_USER_DIR + "mods/";
     public static final String CUSTOM_TRASHED_SAVE_PATH = LAUNCHER_ROOT_FOLDER + "/trashed/saves/";
     public static final String SAVE_BACKUP_PATH = LAUNCHER_ROOT_FOLDER + "/backups";
 

src/main/java/com/dazednconfused/catalauncher/mod/ModManager.java

@@ -0,0 +1,67 @@
+package com.dazednconfused.catalauncher.mod;
+
+
+import static com.dazednconfused.catalauncher.helper.Constants.CUSTOM_MODS_DIR;
+
+import io.vavr.control.Try;
+
+import java.io.File;
+import java.nio.file.Path;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Objects;
+import java.util.function.Consumer;
+import java.util.stream.Collectors;
+
+import org.apache.commons.io.FileUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ModManager {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ModManager.class);
+
+    /**
+     * Returns all mods currently found in {@link com.dazednconfused.catalauncher.helper.Constants#CUSTOM_MODS_DIR}.
+     * */
+    public static List<File> listAllMods() {
+        LOGGER.debug("Listing all mods...");
+        return Arrays.stream(Objects.requireNonNull(getModsFolder().listFiles()))
+                .filter(file -> !file.getName().equals(".DS_Store"))
+                .collect(Collectors.toList());
+    }
+
+    /**
+     * Deletes given {@code toBeDeleted} mod.
+     * */
+    public static void deleteMod(File toBeDeleted) {
+        LOGGER.info("Deleting mod [{}]...", toBeDeleted);
+        Try.run(() -> FileUtils.deleteDirectory(toBeDeleted)).onFailure(t -> LOGGER.error("There was an error deleting mod [{}]", toBeDeleted, t));
+    }
+
+    /**
+     * Installs given {@code toBeInstalled} mod inside {@link com.dazednconfused.catalauncher.helper.Constants#CUSTOM_MODS_DIR}.
+     * */
+    public static void installMod(File toBeInstalled, Consumer<Path> onDoneCallback) {
+        LOGGER.info("Installing mod [{}]...", toBeInstalled);
+        File installInto = new File(getModsFolder().getPath() + "/" + toBeInstalled.getName());
+
+        Try.run(() -> {
+            LOGGER.debug("Copying [{}] into [{}]...", toBeInstalled, installInto);
+            FileUtils.copyDirectory(toBeInstalled, installInto);
+        }).onFailure(t -> LOGGER.error("There was an error installing mod [{}]", toBeInstalled, t)).andThen(() -> onDoneCallback.accept(installInto.toPath()));
+    }
+
+    /**
+     * Retrieves the {@link com.dazednconfused.catalauncher.helper.Constants#CUSTOM_MODS_DIR} as a {@link File}.
+     * */
+    private static File getModsFolder() {
+        File modsPath = new File(CUSTOM_MODS_DIR);
+        if (!modsPath.exists()) {
+            LOGGER.debug("Mods folder [{}] not found. Creating...", modsPath);
+            Try.of(modsPath::mkdirs).onFailure(t -> LOGGER.error("Could not create mods destination folder [{}]", modsPath, t));
+        }
+
+        return modsPath;
+    }
+}

src/main/resources/osx_launcher_wrapper.sh

@@ -24,6 +24,8 @@ fi
 # (keep arguments here without quotes - also, "$@" doesn't work)
 # ${2} is --savedir
 # ${3} is the custom save directory, in quotes in case there are spaces in the path
-# ${4} is --world
-# ${5} is the latest world's name, in quotes because it may have spaces (which is fairly common in randomized world names)
-./cataclysm-tiles ${2} "${3}" ${4} "${5}"
+# ${4} is --userdir
+# ${5} is the custom user directory, in quotes in case there are spaces in the path
+# ${5} is --world
+# ${6} is the latest world's name, in quotes because it may have spaces (which is fairly common in randomized world names)
+./cataclysm-tiles ${2} "${3}" ${4} "${5}" ${6} "${7}"