diff --git a/.nb-gradle-properties b/.nb-gradle-properties index 0af84dec2..2d8fa77b2 100644 --- a/.nb-gradle-properties +++ b/.nb-gradle-properties @@ -6,30 +6,10 @@ 1.8 - launch4j + makeExecutable no - launch4j - - - - - - launch4jpack - no - - launch4jpack - - - - - - publish - no - - clean - build - launch4j + makeExecutable diff --git a/HMCL/HMCLauncher.exe b/HMCL/HMCLauncher.exe index f842386ff..29bf5127b 100644 Binary files a/HMCL/HMCLauncher.exe and b/HMCL/HMCLauncher.exe differ diff --git a/HMCL/build.gradle b/HMCL/build.gradle index 898f6fe49..517b14651 100644 --- a/HMCL/build.gradle +++ b/HMCL/build.gradle @@ -25,10 +25,10 @@ if (!hasProperty('mainClass')) { ext.mainClass = 'org.jackhuang.hellominecraft.launcher.Main' } -def buildnumber = System.getenv("BUILD_NUMBER") == null ? ".12" : "."+System.getenv("BUILD_NUMBER") +def buildnumber = System.getenv("BUILD_NUMBER") == null ? ".0" : "."+System.getenv("BUILD_NUMBER") String mavenGroupId = 'HMCL' -String mavenVersion = '2.3.4' + buildnumber +String mavenVersion = '2.3.5' + buildnumber String bundleName = "Hello Minecraft! Launcher" group = mavenGroupId @@ -112,7 +112,7 @@ task makeExecutable(dependsOn: jar) << { is.close() fos.close() } - +/* launch4j { launch4jCmd = 'D:\\Develop\\Java\\Launch4j\\launch4j.exe' supportUrl = 'http://www.mcbbs.net/thread-142335-1-1.html' @@ -128,9 +128,11 @@ launch4j { outfile = mavenGroupId + '-' + mavenVersion + '.exe' messagesJreVersionError = 'This application requires a Java Runtime Environment installation, or the runtime is corrupted.\n\u6ca1\u6709\u627e\u5230\u004a\u0061\u0076\u0061\u8fd0\u884c\u65f6\uff0c\u8bf7\u4e0d\u8981\u4f7f\u7528\u7eff\u8272\u004a\u0061\u0076\u0061\uff0c\u8bf7\u4f7f\u7528\u5b89\u88c5\u7248\u7684\u004a\u0061\u0076\u0061\uff0c\u70b9\u51fb\u786e\u5b9a\u8fdb\u5165\u004a\u0061\u0076\u0061\u5b89\u88c5\u9875\u9762\u3002' } - +*/ processResources { from(sourceSets.main.resources.srcDirs) { exclude 'icon.icns' } } + +build.dependsOn makeExecutable diff --git a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java index cfbd18e52..0faf48951 100644 --- a/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java +++ b/HMCL/src/main/java/org/jackhuang/hellominecraft/launcher/Main.java @@ -100,7 +100,7 @@ public final class Main implements Runnable { } public static String launcherName = "Hello Minecraft! Launcher"; - public static byte firstVer = 2, secondVer = 3, thirdVer = 4, forthVer = 13; + public static byte firstVer = 2, secondVer = 3, thirdVer = 5, forthVer = 0; public static int minimumLauncherVersion = 16; /**