Add support for new clear_directories field on editions

HyperCubeMC · Feb 1, 2022 · e9341bc · e9341bc
1 parent a29015d
commit e9341bc
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 1 deletion.
diff --git a/gradle.properties b/gradle.properties
@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx1G
 
 # Version and packaging info
-version=1.3.0
+version=1.3.1
 maven_group=net.hypercubemc
 archives_base_name=Universe-Installer
 

diff --git a/src/main/java/net/hypercubemc/universe_installer/Installer.java b/src/main/java/net/hypercubemc/universe_installer/Installer.java
@@ -24,6 +24,7 @@
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.StandardCopyOption;
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -415,6 +416,7 @@ public boolean installFromPack(File pack) {
                 return false;
             }
 
+            deleteDirectories(selectedEdition.clearDirectories);
             installFiles(files);
             return true;
         } catch (IOException e) {
@@ -443,6 +445,12 @@ private void installFiles(File[] files) throws IOException {
         }
     }
 
+    private void deleteDirectories(List<String> pathNames) {
+        for (String pathName : pathNames) {
+            deleteDirectory(getInstallDir().resolve(pathName.replace("/", File.separator)).toFile());
+        }
+    }
+
     public boolean repositoryExists(File directory) {
         FileRepositoryBuilder repositoryBuilder = new FileRepositoryBuilder();
         repositoryBuilder.findGitDir(directory);

diff --git a/src/main/java/net/hypercubemc/universe_installer/InstallerMeta.java b/src/main/java/net/hypercubemc/universe_installer/InstallerMeta.java
@@ -54,6 +54,7 @@ public static class Edition {
         String displayName;
         String defaultInstallDir;
         List<String> compatibleVersions = new ArrayList<>();
+        List<String> clearDirectories = new ArrayList<>();
 
         public Edition(JSONObject jsonObject) {
             this.name = jsonObject.getString("name");
@@ -64,6 +65,9 @@ public Edition(JSONObject jsonObject) {
                 compatibleVersions.add(jsonObject.getJSONArray("compatible_versions").toList().get(i).toString());
             }
 
+            for (int i = 0; i < jsonObject.getJSONArray("clear_directories").toList().size(); i++){
+                clearDirectories.add(jsonObject.getJSONArray("clear_directories").toList().get(i).toString());
+            }
         }
     }
 }