Commits
md_5 authored 409eb231370
| 28 28 | import java.io.InputStreamReader; |
| 29 29 | import java.io.OutputStream; |
| 30 30 | import java.io.PrintStream; |
| 31 31 | import java.net.URI; |
| 32 32 | import java.net.URL; |
| 33 33 | import java.net.URLConnection; |
| 34 34 | import java.security.KeyManagementException; |
| 35 35 | import java.security.NoSuchAlgorithmException; |
| 36 36 | import java.security.SecureRandom; |
| 37 37 | import java.security.cert.X509Certificate; |
| 38 + | import java.text.MessageFormat; |
| 38 39 | import java.util.Arrays; |
| 39 40 | import java.util.Date; |
| 40 41 | import java.util.Enumeration; |
| 41 42 | import java.util.List; |
| 42 43 | import java.util.zip.ZipEntry; |
| 43 44 | import java.util.zip.ZipFile; |
| 44 45 | import javax.net.ssl.HostnameVerifier; |
| 45 46 | import javax.net.ssl.HttpsURLConnection; |
| 46 47 | import javax.net.ssl.SSLContext; |
| 47 48 | import javax.net.ssl.SSLSession; |
| 233 234 | ex.printStackTrace(); |
| 234 235 | return; |
| 235 236 | } |
| 236 237 | System.out.println( "Found version" ); |
| 237 238 | System.out.println( verInfo ); |
| 238 239 | |
| 239 240 | buildInfo = new Gson().fromJson( verInfo, BuildInfo.class ); |
| 240 241 | |
| 241 242 | if ( buildNumber != -1 && buildInfo.getToolsVersion() != -1 && buildNumber < buildInfo.getToolsVersion() ) |
| 242 243 | { |
| 243 - | System.err.println( "**** Your BuildTools is out of date and will not build the requested version. Please grab a new copy from http://www.spigotmc.org/" ); |
| 244 + | System.err.println( "**** Your BuildTools is out of date and will not build the requested version. Please grab a new copy from https://www.spigotmc.org/" ); |
| 244 245 | System.exit( 1 ); |
| 245 246 | } |
| 246 247 | } |
| 247 248 | |
| 248 249 | pull( buildGit, buildInfo.getRefs().getBuildData() ); |
| 249 250 | pull( bukkitGit, buildInfo.getRefs().getBukkit() ); |
| 250 251 | pull( craftBukkitGit, buildInfo.getRefs().getCraftBukkit() ); |
| 251 252 | pull( spigotGit, buildInfo.getRefs().getSpigot() ); |
| 252 253 | } |
| 253 254 | |
| 316 317 | unzip( finalMappedJar, clazzDir, new Predicate<String>() |
| 317 318 | { |
| 318 319 | |
| 319 320 | |
| 320 321 | public boolean apply(String input) |
| 321 322 | { |
| 322 323 | return input.startsWith( "net/minecraft/server" ); |
| 323 324 | } |
| 324 325 | } ); |
| 325 326 | |
| 326 - | runProcess( CWD, "java", "-jar", "BuildData/bin/fernflower.jar", "-dgs=1", "-hdc=0", "-rbr=0", "-asc=1", "-udv=0", clazzDir.getPath(), decompileDir.getPath() ); |
| 327 + | runProcess( CWD, MessageFormat.format( versionInfo.getDecompileCommand(), clazzDir.getPath(), decompileDir.getPath() ).split( " ") ); |
| 327 328 | } |
| 328 329 | |
| 329 330 | System.out.println( "Applying CraftBukkit Patches" ); |
| 330 331 | File nmsDir = new File( craftBukkit, "src/main/java/net" ); |
| 331 332 | if ( nmsDir.exists() ) |
| 332 333 | { |
| 333 334 | System.out.println( "Backing up NMS dir" ); |
| 334 335 | FileUtils.moveDirectory( nmsDir, new File( workDir, "nms.old." + System.currentTimeMillis() ) ); |
| 335 336 | } |
| 336 337 | File patchDir = new File( craftBukkit, "nms-patches" ); |