spigot-mirror/buildtools
1
0
Fork 0
mirror of https://hub.spigotmc.org/stash/scm/spigot/buildtools.git synced 2025-08-31 22:29:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Add option to check for hash of Vanilla server jar.

Browse source
This commit is contained in:
md_5 2015-07-29 19:54:14 +10:00
parent fdaa042d6b
commit 00c9da2167
2 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
src/main/java/org/spigotmc/builder/Builder.java
View file

@ -173,7 +173,7 @@ public class Builder
File maven;
String m2Home = System.getenv( "M2_HOME" );
if ( m2Home == null || !(maven = new File(m2Home)).exists() )
if ( m2Home == null || !( maven = new File( m2Home ) ).exists() )
{
maven = new File( "apache-maven-3.2.5" );
@ -240,15 +240,20 @@ public class Builder
// Default to 1.8 builds.
if ( versionInfo == null )
{
versionInfo = new VersionInfo( "1.8", "bukkit-1.8.at", "bukkit-1.8-cl.csrg", "bukkit-1.8-members.csrg", "package.srg" );
versionInfo = new VersionInfo( "1.8", "bukkit-1.8.at", "bukkit-1.8-cl.csrg", "bukkit-1.8-members.csrg", "package.srg", null );
}
System.out.println( "Attempting to build Minecraft with details: " + versionInfo );
File vanillaJar = new File( workDir, "minecraft_server." + versionInfo.getMinecraftVersion() + ".jar" );
if ( !vanillaJar.exists() )
if ( !vanillaJar.exists() || !checkHash( vanillaJar, versionInfo ) )
{
download( String.format( "https://s3.amazonaws.com/Minecraft.Download/versions/%1$s/minecraft_server.%1$s.jar", versionInfo.getMinecraftVersion() ), vanillaJar );
}
if ( !checkHash( vanillaJar, versionInfo ) )
{
System.err.println( "**** Could not download clean Minecraft jar, giving up." );
return;
}
Iterable<RevCommit> mappings = buildGit.log()
.addPath( "mappings/" + versionInfo.getAccessTransforms() )
@ -420,6 +425,20 @@ public class Builder
}
}
private static boolean checkHash(File vanillaJar, VersionInfo versionInfo) throws IOException
{
String hash = Files.hash( vanillaJar, Hashing.md5() ).toString();
if ( !dev && versionInfo.getMinecraftHash() != null && !hash.equals( versionInfo.getMinecraftHash() ) )
{
System.err.println( "**** Warning, Minecraft jar hash of " + hash + " does not match stored hash of " + versionInfo.getMinecraftHash() );
return false;
} else
{
System.out.println( "Found good Minecraft hash (" + hash + ")" );
return true;
}
}
public static final String get(String url) throws IOException
{
URLConnection con = new URL( url ).openConnection();

1
src/main/java/org/spigotmc/builder/VersionInfo.java
View file

@ -13,4 +13,5 @@ public class VersionInfo
private String classMappings;
private String memberMappings;
private String packageMappings;
private String minecraftHash;
}