diff --git a/build.gradle b/build.gradle index a58b5ca9b..18cf9cec3 100644 --- a/build.gradle +++ b/build.gradle @@ -108,7 +108,7 @@ artifacts { /** * Increments the buildnumber in your config file, and saves it */ -task incrementBuildNumber(dependsOn: 'reobf') << { +task incrementBuildNumber(dependsOn: 'reobfJar') << { config.build_number = (config.build_number.toString().toInteger()) + 1 configFile.withWriter { config.toProperties().store(it, "") @@ -214,7 +214,7 @@ def parseConfig(File config) { jar { //rename the default output, for some better... sanity with scipts - archiveName = "${baseName}.${version}.${extension}" + archiveName = "${baseName}-unofficial.${version}.${extension}" } curseforge { @@ -225,6 +225,8 @@ curseforge { See https://github.com/williewillus/Botania/releases/tag/${version} """ releaseType = "beta" + addGameVersion '1.8.9' + addGameVersion 'Java 8' relations { requiredLibrary 'baubles' } @@ -232,4 +234,4 @@ curseforge { } //defaultTasks 'clean', 'build', 'sort', 'forgecraft', 'incrementBuildNumber', 'curse', 'upload' -defaultTasks 'clean', 'build', 'incrementBuildNumber', 'curse' \ No newline at end of file +defaultTasks 'clean', 'build', 'incrementBuildNumber', 'curseforge' \ No newline at end of file diff --git a/build.properties b/build.properties index a82be69d2..689caf676 100644 --- a/build.properties +++ b/build.properties @@ -1,9 +1,9 @@ # -#Thu Feb 25 19:50:43 GMT 2016 +#Sat Mar 12 16:00:41 CST 2016 version=r1.8 dir_output=../Build Output/Botania/ -forge_version=11.15.1.1763 -mc_version=1.8.9 dir_repo=./ -build_number=250 +mc_version=1.8.9 +forge_version=11.15.1.1763 +build_number=299 mod_name=Botania diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java index 909434221..7f91cb289 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java @@ -27,7 +27,7 @@ public class ThreadVersionChecker extends Thread { @Override public void run() { try { - URL url = new URL("https://raw.githubusercontent.com/Vazkii/Botania/master/version/" + MinecraftForge.MC_VERSION + ".txt"); + URL url = new URL("https://raw.githubusercontent.com/williewillus/Botania/MC18/version/" + MinecraftForge.MC_VERSION + ".txt"); BufferedReader r = new BufferedReader(new InputStreamReader(url.openStream())); VersionChecker.onlineVersion = r.readLine(); r.close(); diff --git a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java index c337aa373..0b8414317 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -45,7 +45,7 @@ public final class VersionChecker { if(!onlineVersion.isEmpty()) { EntityPlayer player = Minecraft.getMinecraft().thePlayer; int onlineBuild = Integer.parseInt(onlineVersion.split("-")[1]); - int clientBuild = LibMisc.BUILD.contains("GRADLE") ? Integer.MAX_VALUE : Integer.parseInt(LibMisc.BUILD); + int clientBuild = LibMisc.BUILD.contains("GRADLE") ? Integer.MIN_VALUE : Integer.parseInt(LibMisc.BUILD); if(onlineBuild > clientBuild) { player.addChatComponentMessage(new ChatComponentTranslation("botania.versioning.flavour" + player.worldObj.rand.nextInt(FLAVOUR_MESSAGES)).setChatStyle(new ChatStyle().setColor(EnumChatFormatting.LIGHT_PURPLE))); player.addChatComponentMessage(new ChatComponentTranslation("botania.versioning.outdated", clientBuild, onlineBuild)); diff --git a/src/main/resources/assets/botania/lang/en_US.lang b/src/main/resources/assets/botania/lang/en_US.lang index 06d3c4241..8a448425f 100644 --- a/src/main/resources/assets/botania/lang/en_US.lang +++ b/src/main/resources/assets/botania/lang/en_US.lang @@ -420,12 +420,12 @@ botania.versioning.flavour62=Nine out of ten doctors recommend you update Botani botania.versioning.flavour63=The update bacons at midnight. botania.versioning.flavour64=A new Botania Update is out. And it's name is JOHN CENA! DOO DOO DOO DOO botania.versioning.outdated=You are running Botania build %s, the latest is build %s. -botania.versioning.updateMessage=["Click for... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to automatically download the latest version","color":"green"}},"clickEvent":{"action":"run_command","value":"/botania-download-latest %version%"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the mod's website","color":"green"}},"clickEvent":{"action":"open_url","value":"http://botaniamod.net/downloads.php"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the version's Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"http://botaniamod.net/changelog.php#%version%"}},"]"] +botania.versioning.updateMessage=["Click for... [",{"text":"Download","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to automatically download the latest version","color":"green"}},"clickEvent":{"action":"run_command","value":"/botania-download-latest %version%"}},"] [",{"text":"Website","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the mod's website","color":"green"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/projects/botania-unofficial-1-8/files"}},"] [",{"text":"Changelog","color":"green","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the version's Changelog","color":"green"}},"clickEvent":{"action":"open_url","value":"https://github.com/williewillus/Botania/releases/tag/#%version%"}},"]"] botania.versioning.startingDownload=[{"text":"Starting download of %s. Please do not remove your hard disk. Enjoying ","color":"aqua"},{"text":"Botania","color":"green"},{"text":"? Consider supporting ","color":"aqua"},{"text":"Vazkii","color":"light_purple"},{"text":" on [","color":"aqua"},{"text":"Patreon","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to Vazkii's Patreon","color":"light_purple"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Vazkii"}},{"text":"]!","color":"aqua"}] botania.versioning.doneDownloading=Finished downloading %s. Delete your old Botania .jar and reload your game to update. botania.versioning.downloadedAlready=You already downloaded the latest version. Close your game, delete the old version from your mods folder and load it again to update! botania.versioning.downloadingAlready=The update is already downloading, give it some time, will you? -botania.versioning.error=Woah! It seems like something went wrong while trying to download the Botania update. Is botaniamod.net down? +botania.versioning.error=Woah! It seems like something went wrong while trying to download the Botania update. Is CurseForge down? botania.versioning.disabled=Sorry. This feature is currently disabled due to server host problems, it should be back soon. # BAUBLE TOOLTIPS diff --git a/version/1.8.9.txt b/version/1.8.9.txt new file mode 100644 index 000000000..3b0c86793 --- /dev/null +++ b/version/1.8.9.txt @@ -0,0 +1 @@ +r1.8-299 \ No newline at end of file diff --git a/web/versions.ini b/web/versions.ini index 5929531a4..e5181f58c 100644 --- a/web/versions.ini +++ b/web/versions.ini @@ -246,4 +246,5 @@ r1.8-245=1.7.10 r1.8-246=1.7.10 r1.8-247=1.7.10 r1.8-248=1.7.10 -r1.8-249=1.7.10 \ No newline at end of file +r1.8-249=1.7.10 +r1.8-299=1.8.9 \ No newline at end of file