Added check if forge is installed, added withForgeVersion argument and some fixes

Author: FlowArg

src/main/java/fr/flowarg/flowupdater/FlowUpdater.java

@@ -67,6 +67,9 @@ public void step(Step step) {}
 		@Override
 		public void init() {}
 	};
+	
+	/** Default logger */
+	public static final ILogger DEFAULT_LOGGER = new Logger("[FlowUpdater]", new File(".", "updater/latest.log"));
 
 	/**
 	 * Basic constructor to construct a new {@link FlowUpdater}.
@@ -78,31 +81,20 @@ public void init() {}
 	 * @param postExecutions Post executions are called after update.
 	 */
     private FlowUpdater(IVanillaVersion version, ILogger logger, boolean silentUpdate,
-    		IProgressCallback callback, List<ExternalFile> externalFiles, List<Runnable> postExecutions)
+    		IProgressCallback callback, List<ExternalFile> externalFiles, List<Runnable> postExecutions, IForgeVersion forgeVersion)
     {
         this.logger = logger;
+        this.version = version;
+        this.logFile = this.logger.getLogFile();
         this.externalFiles = externalFiles;
         this.postExecutions = postExecutions;
+        this.forgeVersion = forgeVersion;
         this.isSilent = silentUpdate;
-        this.logFile = this.logger.getLogFile();
-        try
-        {
-            if (!this.logFile.exists())
-            {
-                this.logFile.getParentFile().mkdirs();
-                this.logFile.createNewFile();
-            }
-        }
-        catch (IOException e)
-        {
-            e.printStackTrace();
-        }
-        this.logger.info(String.format("------------------------- FlowUpdater for Minecraft %s v%s -------------------------", version.getName(), "1.1.6"));
-        this.version = version;
         this.downloadInfos = new DownloadInfos();
         this.callback = callback;
         this.callback.init();
        	this.vanillaReader = new VanillaReader(this.version, this.logger, this.isSilent, this.callback, this.downloadInfos);
+       	this.logger.info(String.format("------------------------- FlowUpdater for Minecraft %s v%s -------------------------", this.version.getName(), "1.1.6"));
     }
 
     /**
@@ -126,7 +118,9 @@ public void update(File dir, boolean downloadServer) throws IOException
 
             if (this.getForgeVersion() != null)
             {
-            	this.forgeVersion.install(dir);
+            	if(!this.forgeVersion.isForgeAlreadyInstalled(dir))
+            	  	this.forgeVersion.install(dir);
+            	else this.logger.info("Detected forge ! Skipping installation...");
             	this.forgeVersion.installMods(new File(dir, "mods/"));
             }
     	}
@@ -238,7 +232,9 @@ public DownloadInfos getDownloadInfos()
     /**
      * Necessary if you want install a Forge version.
      * @param forgeVersion Forge version to install.
+     * @deprecated Prefer use {@link FlowUpdaterBuilder#withForgeVersion(IForgeVersion)}
      */
+    @Deprecated
     public void setForgeVersion(IForgeVersion forgeVersion)
     {
         this.forgeVersion = forgeVersion;
@@ -250,12 +246,13 @@ public void setForgeVersion(IForgeVersion forgeVersion)
      */
     public static class FlowUpdaterBuilder
     {
-    	private BuilderArgument<IVanillaVersion> versionArgument = new BuilderArgument<IVanillaVersion>(null).required();
-    	private BuilderArgument<ILogger> loggerArgument = new BuilderArgument<ILogger>(null).required();
-    	private BuilderArgument<Boolean> silentUpdateArgument = new BuilderArgument<Boolean>(null).optional();
-    	private BuilderArgument<IProgressCallback> progressCallbackArgument = new BuilderArgument<IProgressCallback>(null).optional();
-    	private BuilderArgument<List<ExternalFile>> externalFilesArgument = new BuilderArgument<List<ExternalFile>>(null).optional();
-    	private BuilderArgument<List<Runnable>> postExecutionsArgument = new BuilderArgument<List<Runnable>>(null).optional();
+    	private final BuilderArgument<IVanillaVersion> versionArgument = new BuilderArgument<IVanillaVersion>(null).required();
+    	private final BuilderArgument<ILogger> loggerArgument = new BuilderArgument<ILogger>(null).required();
+    	private final BuilderArgument<Boolean> silentUpdateArgument = new BuilderArgument<Boolean>(null).optional();
+    	private final BuilderArgument<IProgressCallback> progressCallbackArgument = new BuilderArgument<IProgressCallback>(null).optional();
+    	private final BuilderArgument<List<ExternalFile>> externalFilesArgument = new BuilderArgument<List<ExternalFile>>(null).optional();
+    	private final BuilderArgument<List<Runnable>> postExecutionsArgument = new BuilderArgument<List<Runnable>>(null).optional();
+    	private final BuilderArgument<IForgeVersion> forgeVersionArgument = new BuilderArgument<IForgeVersion>(null).optional();
 
     	public FlowUpdaterBuilder withVersion(IVanillaVersion version)
     	{
@@ -281,30 +278,40 @@ public FlowUpdaterBuilder withProgressCallback(IProgressCallback callback)
     		return this;
     	}
 
-    	public FlowUpdaterBuilder withExternaFiles(ArrayList<ExternalFile> externalFiles)
+    	public FlowUpdaterBuilder withExternaFiles(List<ExternalFile> externalFiles)
     	{
     		this.externalFilesArgument.set(externalFiles);
     		return this;
     	}
 
-    	public FlowUpdaterBuilder witPostExecutions(ArrayList<Runnable> postExecutions)
+    	public FlowUpdaterBuilder withPostExecutions(List<Runnable> postExecutions)
     	{
     		this.postExecutionsArgument.set(postExecutions);
     		return this;
     	}
 
+        /**
+         * Necessary if you want install a Forge version.
+         * @param forgeVersion Forge version to install.
+         */
+    	public FlowUpdaterBuilder withForgeVersion(IForgeVersion forgeVersion)
+    	{
+    		this.forgeVersionArgument.set(forgeVersion);
+    		return this;
+    	}
+    	
     	public FlowUpdater build() throws BuilderArgumentException
     	{
     		assert this.versionArgument.get() != null;
     		final ILogger logger = this.loggerArgument.get() != null ?
-    				this.loggerArgument.get() :
-    					new Logger("[FlowUpdater]", new File(".", "updater/latest.log"));
+    				this.loggerArgument.get() : DEFAULT_LOGGER;
     		return new FlowUpdater(this.versionArgument.get(),
     				logger,
     				this.silentUpdateArgument.get(),
     				this.progressCallbackArgument.get() != null ? this.progressCallbackArgument.get() : NULL_CALLBACK,
     				this.externalFilesArgument.get() != null ? this.externalFilesArgument.get() : new ArrayList<>(),
-    				this.postExecutionsArgument.get() != null ? this.postExecutionsArgument.get() : new ArrayList<>());
+    				this.postExecutionsArgument.get() != null ? this.postExecutionsArgument.get() : new ArrayList<>(),
+    				this.forgeVersionArgument.get());
     	}
     }
 }

src/main/java/fr/flowarg/flowupdater/versions/IForgeVersion.java

@@ -19,6 +19,9 @@
  */
 public interface IForgeVersion
 {	
+	boolean isForgeAlreadyInstalled(File installDir);
+
+	
 	/**
 	 * This function installs a Forge version at the specified directory.
 	 * @param dirToInstall Specified directory.

src/main/java/fr/flowarg/flowupdater/versions/MCP.java

@@ -50,7 +50,7 @@ public MCP(String clientDownloadURL, String clientSha1, String serverDownloadURL
 	 * 	"serverURL": "https://url.com/launcher/server.jar",
 	 * 	"serverSha1": "777039aab46578247b8954e2f7d482826315fca8",
 	 * 	"clientSize": 1234,
-	 * 	"serverSize": 1234,
+	 * 	"serverSize": 1234
 	 * }
 	 * @param url the JSON file URL.
 	 * @return the MCP instance.

src/main/java/fr/flowarg/flowupdater/versions/NewForgeVersion.java

@@ -255,4 +255,10 @@ public IForgeVersion disableModFileDeleter()
 		this.useFileDeleter = false;
 		return this;
 	}
+
+	@Override
+	public boolean isForgeAlreadyInstalled(File installDir)
+	{
+		return new File(installDir, "libraries/net/minecraftforge/forge/" + this.forgeVersion + "/" + "forge-" + this.forgeVersion + ".jar").exists();
+	}
 }

src/main/java/fr/flowarg/flowupdater/versions/OldForgeVersion.java

@@ -253,4 +253,10 @@ public IForgeVersion disableModFileDeleter()
 		this.useFileDeleter = false;
 		return this;
 	}
+
+	@Override
+	public boolean isForgeAlreadyInstalled(File installDir)
+	{
+		return new File(installDir, "libraries/net/minecraftforge/forge/" + this.forgeVersion + "/" + "forge-" + this.forgeVersion + ".jar").exists();
+	}
 }