MCPConfig v2 {Java Target, encoding, mapping download tasks}

Moved all MCPFunction classes to package private.

Author: LexManos

src/common/java/net/minecraftforge/gradle/common/config/MCPConfigV1.java

@@ -45,11 +45,11 @@ public static MCPConfigV1 get(byte[] data) {
         return get(new ByteArrayInputStream(data));
     }
 
-    private String version; // Minecraft version
-    private Map<String, Object> data;
-    private Map<String, List<Step>> steps;
-    private Map<String, Function> functions;
-    private Map<String, List<String>> libraries;
+    protected String version; // Minecraft version
+    protected Map<String, Object> data;
+    protected Map<String, List<Step>> steps;
+    protected Map<String, Function> functions;
+    protected Map<String, List<String>> libraries;
 
     public String getVersion() {
         return version;

src/common/java/net/minecraftforge/gradle/common/config/MCPConfigV2.java

@@ -0,0 +1,58 @@
+/*
+ * ForgeGradle
+ * Copyright (C) 2018 Forge Development LLC
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301
+ * USA
+ */
+
+package net.minecraftforge.gradle.common.config;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import net.minecraftforge.gradle.common.util.Utils;
+
+public class MCPConfigV2 extends MCPConfigV1 {
+    public static MCPConfigV2 get(InputStream stream) {
+        return Utils.fromJson(stream, MCPConfigV2.class);
+    }
+    public static MCPConfigV2 get(byte[] data) {
+        return get(new ByteArrayInputStream(data));
+    }
+
+    private boolean official = false;
+    private int java_target = 8;
+    private String encoding = "UTF-8";
+
+    public boolean isOfficial() {
+        return this.official;
+    }
+
+    public int getJavaTarget() {
+        return this.java_target;
+    }
+
+    public String getEncoding() {
+        return this.encoding == null ? "UTF-8" : this.encoding;
+    }
+
+    public MCPConfigV2(MCPConfigV1 old) {
+        this.version = old.version;
+        this.data = old.data;
+        this.steps = old.steps;
+        this.functions = old.functions;
+        this.libraries = old.libraries;
+    }
+}

src/common/java/net/minecraftforge/gradle/common/task/JarExec.java

@@ -44,7 +44,6 @@
 
 public class JarExec extends DefaultTask {
     private static final OutputStream NULL = new OutputStream() { @Override public void write(int b) throws IOException { } };
-    private static int index = 0;
     protected boolean hasLog = true;
     protected String tool;
     private File _tool;

src/common/java/net/minecraftforge/gradle/common/task/TaskApplyRangeMap.java

@@ -24,7 +24,6 @@
 import org.gradle.api.tasks.InputFile;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.OutputFile;
-import net.minecraftforge.gradle.common.task.JarExec;
 import net.minecraftforge.gradle.common.util.Utils;
 
 import java.io.File;

src/common/java/net/minecraftforge/gradle/common/task/TaskExtractRangeMap.java

@@ -24,7 +24,6 @@
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.InputFiles;
 import org.gradle.api.tasks.OutputFile;
-import net.minecraftforge.gradle.common.task.JarExec;
 import net.minecraftforge.gradle.common.util.Utils;
 
 import java.io.File;

src/mcp/java/net/minecraftforge/gradle/mcp/MCPPlugin.java

@@ -21,15 +21,6 @@
 package net.minecraftforge.gradle.mcp;
 
 import net.minecraftforge.gradle.common.util.Utils;
-import net.minecraftforge.gradle.mcp.function.DownloadClientFunction;
-import net.minecraftforge.gradle.mcp.function.DownloadManifestFunction;
-import net.minecraftforge.gradle.mcp.function.DownloadServerFunction;
-import net.minecraftforge.gradle.mcp.function.DownloadVersionJSONFunction;
-import net.minecraftforge.gradle.mcp.function.InjectFunction;
-import net.minecraftforge.gradle.mcp.function.ListLibrariesFunction;
-import net.minecraftforge.gradle.mcp.function.MCPFunction;
-import net.minecraftforge.gradle.mcp.function.PatchFunction;
-import net.minecraftforge.gradle.mcp.function.StripJarFunction;
 import net.minecraftforge.gradle.mcp.task.DownloadMCPConfigTask;
 import net.minecraftforge.gradle.mcp.task.SetupMCPTask;
 import org.gradle.api.Plugin;
@@ -75,28 +66,4 @@ public void apply(@Nonnull Project project) {
             project.getRepositories().mavenCentral(); //Needed for MCP Deps
         });
     }
-
-    public static MCPFunction createBuiltInFunction(String type) {
-        switch (type) {
-            case "downloadManifest":
-                return new DownloadManifestFunction();
-            case "downloadJson":
-                return new DownloadVersionJSONFunction();
-            case "downloadClient":
-                return new DownloadClientFunction();
-            case "downloadServer":
-                return new DownloadServerFunction();
-            case "strip":
-                return new StripJarFunction();
-            case "listLibraries":
-                return new ListLibrariesFunction();
-            case "inject":
-                return new InjectFunction();
-            case "patch":
-                return new PatchFunction();
-            default:
-                return null;
-        }
-    }
-
 }

src/mcp/java/net/minecraftforge/gradle/mcp/function/AccessTransformerFunction.java

@@ -37,7 +37,7 @@
 import java.util.List;
 import java.util.concurrent.ExecutionException;
 
-public class AccessTransformerFunction extends ExecuteFunction {
+class AccessTransformerFunction extends ExecuteFunction {
     private List<File> files;
     private String transformers;
 

src/mcp/java/net/minecraftforge/gradle/mcp/function/DownloadClientFunction.java

@@ -28,13 +28,12 @@
 import java.io.IOException;
 import java.io.Reader;
 
-public abstract class AbstractDownloadMCFunction extends AbstractFileDownloadFunction {
-
-    public AbstractDownloadMCFunction(String artifact) {
-        super(env -> artifact + ".jar", env -> getDownloadInfo(env, artifact));
+class DownloadCoreFunction extends DownloadFileFunction {
+    DownloadCoreFunction(String artifact, String ext) {
+        super(env -> artifact + '.' + ext, env -> getDownloadInfo(env, artifact, ext));
     }
 
-    private static DownloadInfo getDownloadInfo(MCPEnvironment environment, String artifact) {
+    private static DownloadInfo getDownloadInfo(MCPEnvironment environment, String artifact, String extension) {
         try {
             Gson gson = new Gson();
             Reader reader = new FileReader(environment.getStepOutput(DownloadVersionJSONFunction.class));
@@ -45,7 +44,7 @@ private static DownloadInfo getDownloadInfo(MCPEnvironment environment, String a
             String url = artifactInfo.get("url").getAsString();
             String hash = artifactInfo.get("sha1").getAsString();
             String version = json.getAsJsonObject().get("id").getAsString();
-            return new DownloadInfo(url, hash, "jar", version, artifact);
+            return new DownloadInfo(url, hash, extension, version, artifact);
         } catch (IOException ex) {
             throw new RuntimeException(ex);
         }

…function/AbstractDownloadMCFunction.java …e/mcp/function/DownloadCoreFunction.javasrc/mcp/java/net/minecraftforge/gradle/mcp/function/AbstractDownloadMCFunction.java renamed to src/mcp/java/net/minecraftforge/gradle/mcp/function/DownloadCoreFunction.java src/mcp/java/net/minecraftforge/gradle/mcp/function/AbstractDownloadMCFunction.java renamed to src/mcp/java/net/minecraftforge/gradle/mcp/function/DownloadCoreFunction.java

@@ -30,17 +30,17 @@
 import java.net.URL;
 import java.util.function.Function;
 
-public abstract class AbstractFileDownloadFunction implements MCPFunction {
+class DownloadFileFunction implements MCPFunction {
 
     private final Function<MCPEnvironment, String> outputGetter;
     private final Function<MCPEnvironment, DownloadInfo> downloadGetter;
 
-    public AbstractFileDownloadFunction(Function<MCPEnvironment, String> outputGetter, Function<MCPEnvironment, DownloadInfo> downloadGetter) {
+    public DownloadFileFunction(Function<MCPEnvironment, String> outputGetter, Function<MCPEnvironment, DownloadInfo> downloadGetter) {
         this.outputGetter = outputGetter;
         this.downloadGetter = downloadGetter;
     }
 
-    public AbstractFileDownloadFunction(String defaultOutput, String url) {
+    public DownloadFileFunction(String defaultOutput, String url) {
         this(env -> defaultOutput, env -> new DownloadInfo(url, null, "unknown", null, null));
     }