summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormd_5 <git@md-5.net>2016-03-01 09:50:21 +1100
committermd_5 <git@md-5.net>2016-03-01 09:50:21 +1100
commit140d6810aa5b3768401144e051c6ed93d46374c3 (patch)
tree5449faf423126c8a5dc1c18b0e99d22e81fdb0be
parent409eb2313708834c644ed4b9384a5eb0bb21fc71 (diff)
downloadbuildtools-140d6810aa5b3768401144e051c6ed93d46374c3.tar
buildtools-140d6810aa5b3768401144e051c6ed93d46374c3.tar.gz
buildtools-140d6810aa5b3768401144e051c6ed93d46374c3.tar.lz
buildtools-140d6810aa5b3768401144e051c6ed93d46374c3.tar.xz
buildtools-140d6810aa5b3768401144e051c6ed93d46374c3.zip
Make sure that older builds can still be built.
-rw-r--r--src/main/java/org/spigotmc/builder/Builder.java6
-rw-r--r--src/main/java/org/spigotmc/builder/VersionInfo.java2
2 files changed, 6 insertions, 2 deletions
diff --git a/src/main/java/org/spigotmc/builder/Builder.java b/src/main/java/org/spigotmc/builder/Builder.java
index bde98ff..21de6d1 100644
--- a/src/main/java/org/spigotmc/builder/Builder.java
+++ b/src/main/java/org/spigotmc/builder/Builder.java
@@ -323,8 +323,12 @@ public class Builder
return input.startsWith( "net/minecraft/server" );
}
} );
+ if ( versionInfo.getDecompileCommand() == null )
+ {
+ versionInfo.setDecompileCommand( "java -jar BuildData/bin/fernflower.jar -dgs=1 -hdc=0 -rbr=0 -asc=1 -udv=0 {0} {1}" );
+ }
- runProcess( CWD, MessageFormat.format( versionInfo.getDecompileCommand(), clazzDir.getPath(), decompileDir.getPath() ).split( " ") );
+ runProcess( CWD, MessageFormat.format( versionInfo.getDecompileCommand(), clazzDir.getPath(), decompileDir.getPath() ).split( " " ) );
}
System.out.println( "Applying CraftBukkit Patches" );
diff --git a/src/main/java/org/spigotmc/builder/VersionInfo.java b/src/main/java/org/spigotmc/builder/VersionInfo.java
index 935a6d8..65caace 100644
--- a/src/main/java/org/spigotmc/builder/VersionInfo.java
+++ b/src/main/java/org/spigotmc/builder/VersionInfo.java
@@ -12,7 +12,7 @@ public class VersionInfo
private String memberMappings;
private String packageMappings;
private String minecraftHash;
- private String decompileCommand = "java -jar BuildData/bin/fernflower.jar -dgs=1 -hdc=0 -rbr=0 -asc=1 -udv=0 {0} {1}";
+ private String decompileCommand;
public VersionInfo(String minecraftVersion, String accessTransforms, String classMappings, String memberMappings, String packageMappings, String minecraftHash)
{