From dd4c8d43f067f75c12337f82050fd35e7427da85 Mon Sep 17 00:00:00 2001 From: Lizbeth Rika Date: Thu, 6 Nov 2014 16:08:30 +0000 Subject: [PATCH] Updated ANT: replace targets with GRADLE: --- build.gradle | 4 ++-- build.properties | 2 +- .../vazkii/botania/common/core/version/VersionChecker.java | 2 +- src/main/java/vazkii/botania/common/item/ItemLexicon.java | 2 +- src/main/java/vazkii/botania/common/lib/LibMisc.java | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/build.gradle b/build.gradle index eb1e7fac4..88994df6d 100644 --- a/build.gradle +++ b/build.gradle @@ -39,8 +39,8 @@ minecraft { //This, does the token replacement. //Though, I reccomend this to be replaced with a token such as @VERSION@ - replace 'ANT:BUILD', config.build_number - replace 'ANT:VERSION', config.version + replace 'GRADLE:BUILD', config.build_number + replace 'GRADLE:VERSION', config.version replaceIn 'LibMisc.java' //I may have missed another file, though I can only find it in here. } diff --git a/build.properties b/build.properties index 079b6e4eb..1a28b8743 100644 --- a/build.properties +++ b/build.properties @@ -6,6 +6,6 @@ forge_version=10.13.1.1217 mod_name=Botania dir.repo=./ dir.gradle=../MCP17 -dir.output=../ANT Output +dir.output=../Build Output dir.temp=../temp dir.forgecraft=D\:/Seafile/incoming/ForgeCraft1/mods 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 9bd69b3f4..2fe378920 100644 --- a/src/main/java/vazkii/botania/common/core/version/VersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/VersionChecker.java @@ -46,7 +46,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("ANT") ? Integer.MAX_VALUE : Integer.parseInt(LibMisc.BUILD); + int clientBuild = LibMisc.BUILD.contains("GRADLE") ? Integer.MAX_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/java/vazkii/botania/common/item/ItemLexicon.java b/src/main/java/vazkii/botania/common/item/ItemLexicon.java index 58d1b7f35..716abc65a 100644 --- a/src/main/java/vazkii/botania/common/item/ItemLexicon.java +++ b/src/main/java/vazkii/botania/common/item/ItemLexicon.java @@ -120,7 +120,7 @@ public class ItemLexicon extends ItemMod implements ILexicon, IElvenItem { public static String getEdition() { String version = LibMisc.BUILD; - int build = version.contains("ANT") ? 0 : Integer.parseInt(version); + int build = version.contains("GRADLE") ? 0 : Integer.parseInt(version); return build == 0 ? StatCollector.translateToLocal("botaniamisc.devEdition") : MathHelper.numberToOrdinal(build); } diff --git a/src/main/java/vazkii/botania/common/lib/LibMisc.java b/src/main/java/vazkii/botania/common/lib/LibMisc.java index 961c002fd..147147bca 100644 --- a/src/main/java/vazkii/botania/common/lib/LibMisc.java +++ b/src/main/java/vazkii/botania/common/lib/LibMisc.java @@ -18,8 +18,8 @@ public final class LibMisc { // Mod Constants public static final String MOD_ID = "Botania"; public static final String MOD_NAME = MOD_ID; - public static final String BUILD = "ANT:BUILD"; - public static final String VERSION = "ANT:VERSION-" + BUILD; + public static final String BUILD = "GRADLE:BUILD"; + public static final String VERSION = "GRADLE:VERSION-" + BUILD; public static final String DEPENDENCIES = "required-after:Forge@[10.12.2.1147,);after:Thaumcraft"; // Network Contants