Fixes for unobfuscated minecraft

Author: LexManos

src/main/groovy/net/minecraftforge/forgedev/ForgeDevExtension.java

@@ -454,8 +454,10 @@ public BinaryPatches binaryPatches(String name) {
                 });
                 ret.create(task -> {
                     task.getClean().setFrom(this.base.getClasses());
-                    task.getSrg().setFrom(this.base.getMap2Srg());
-                    task.getReverseSrg().set(true);
+                    if (Util.isObfuscated(this.base.getMcpVersion().get())) {
+                        task.getSrg().setFrom(this.base.getMap2Srg());
+                        task.getReverseSrg().set(true);
+                    }
                     task.getSas().setFrom(this.base.getSideAnnotationStrippers());
                     task.getDirty().setFrom(this.project.getTasks().named("jar"));
                 });

src/main/groovy/net/minecraftforge/forgedev/Tools.java

@@ -10,7 +10,7 @@ public final class Tools {
     private Tools() { }
 
     // EXECUTABLE
-    public static final Tool MAVENIZER = Tool.ofForge("mavenizer", "net.minecraftforge:minecraft-mavenizer:0.4.58", 25);
+    public static final Tool MAVENIZER = Tool.ofForge("mavenizer", "net.minecraftforge:minecraft-mavenizer:0.5.15", 25);
     public static final Tool DIFFPATCH = Tool.of("diffpatch", "io.codechicken:DiffPatch:2.1.0.42:all", Constants.MAVEN_CENTRAL, 8);
     public static final Tool BINPATCH = Tool.ofForge("binpatcher", "net.minecraftforge:binarypatcher:1.3.3:fatjar", 8);
     public static final Tool INSTALLERTOOLS = Tool.ofForge("installertools", "net.minecraftforge:installertools:1.4.4:fatjar", 8);

src/main/groovy/net/minecraftforge/forgedev/Util.java

@@ -178,9 +178,8 @@ public static String iso8601Now() {
     }
 
     public static String iso8601(Date self) {
-        var format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssZ");
-        var result = format.format(self);
-        return result.substring(0, 22) + ':' + result.substring(22);
+        var format = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX");
+        return format.format(self);
     }
 
     public static <R extends HasConfigurableValue> R finalize(Project project, R ret) {

src/main/groovy/net/minecraftforge/forgedev/base/MCPBaseImpl.java

@@ -97,7 +97,7 @@ public Provider<File> getMap2Srg() {
 
     @Override
     public Provider<File> getClasses() {
-        return this.mavenizer.getClasses().orElse(this.getClassesRaw());
+        return this.mavenizer.getClasses();
     }
 
     @Override

src/main/groovy/net/minecraftforge/forgedev/tasks/userdev/UserDev.java

@@ -122,8 +122,10 @@ public void base(PatcherBase base) {
     private void configureBinaryPatches(CreateBinPatches task) {
         if (this.patcherBase instanceof MCPBase mcp) {
             task.getClean().setFrom(mcp.getClasses());
-            task.getSrg().setFrom(mcp.getMap2Srg());
-            task.getReverseSrg().set(true);
+            if (Util.isObfuscated(mcp.getMcpVersion().get())) {
+                task.getSrg().setFrom(mcp.getMap2Srg());
+                task.getReverseSrg().set(true);
+            }
             task.getSas().setFrom(mcp.getSideAnnotationStrippers());
             task.getDirty().setFrom(this.project.getTasks().named("jar"));
         }

src/main/groovy/net/minecraftforge/forgedev/values/MCPData.java

@@ -110,6 +110,11 @@ public Provider<File> getMap2Srg() {
     }
 
     public Provider<File> getClasses() {
+        return this.optional("classes.srg").orElse(get("classes.raw")).map( path ->
+            getOutputDir() == null ? project.file(path) : new File(getOutputDir(), path)
+        );
+    }
+    public Provider<File> getClassesSrg() {
         return getFile("classes.srg");
     }
     public Provider<File> getClassesRaw() {

src/main/groovy/net/minecraftforge/forgedev/values/MavenizerData.java

@@ -57,6 +57,10 @@ public MavenizerData(final Project project, final ForgeDevPlugin plugin) {
         return null;
     }
 
+    protected Provider<String> optional(String key) {
+        return this.data.getting(key);
+    }
+
     protected Provider<String> get(String key) {
         return this.data.getting(key).orElse(getProviders().provider(() -> {
             throw new IllegalStateException("Mavenizer did not output expected json data " + key);