From af6a868ed3f9363c6df2ad7fc970ccda3a0ddcf9 Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Thu, 10 Sep 2015 19:17:07 -0400 Subject: [PATCH] Continue --- .../common/misc/VersionChecker.java | 19 +++++++++++++++---- .../assets/bloodarsenal/lang/en_US.lang | 5 ++--- .../assets/bloodarsenal/lang/zh_TW.lang | 1 - 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/arc/bloodarsenal/common/misc/VersionChecker.java b/src/main/java/com/arc/bloodarsenal/common/misc/VersionChecker.java index d384630..6b23d93 100644 --- a/src/main/java/com/arc/bloodarsenal/common/misc/VersionChecker.java +++ b/src/main/java/com/arc/bloodarsenal/common/misc/VersionChecker.java @@ -41,17 +41,28 @@ public class VersionChecker if (!onlineVersion.isEmpty()) { EntityPlayer player = Minecraft.getMinecraft().thePlayer; - int onlineBuild = Integer.parseInt(onlineVersion.split("1.1-")[1]); - int clientBuild = BloodArsenal.VERSION.equals("@VERSION@") ? 0 : Integer.parseInt(BloodArsenal.VERSION.split("1.1-")[1]); + int onlineBuild1 = Integer.parseInt(onlineVersion.substring(2, 3)); + int onlineBuild2 = Integer.parseInt(onlineVersion.substring(3)); + int clientBuild1 = BloodArsenal.VERSION.equals("@VERSION@") ? 0 : Integer.parseInt(BloodArsenal.VERSION.substring(2, 3)); + int clientBuild2 = BloodArsenal.VERSION.equals("@VERSION@") ? 0 : Integer.parseInt(BloodArsenal.VERSION.substring(3)); - if (onlineBuild > clientBuild) + if (onlineBuild1 > clientBuild1) { - player.addChatComponentMessage(new ChatComponentTranslation("ba.versioning.update").setChatStyle(new ChatStyle().setColor(EnumChatFormatting.LIGHT_PURPLE))); player.addChatComponentMessage(new ChatComponentTranslation("ba.versioning.outdated", BloodArsenal.VERSION, onlineVersion)); IChatComponent component = IChatComponent.Serializer.func_150699_a(StatCollector.translateToLocal("ba.versioning.updateMessage").replaceAll("%version%", onlineVersion)); player.addChatComponentMessage(component); } + else if (onlineBuild1 == clientBuild1) + { + if (onlineBuild2 > clientBuild2) + { + player.addChatComponentMessage(new ChatComponentTranslation("ba.versioning.outdated", BloodArsenal.VERSION, onlineVersion)); + + IChatComponent component = IChatComponent.Serializer.func_150699_a(StatCollector.translateToLocal("ba.versioning.updateMessage").replaceAll("%version%", onlineVersion)); + player.addChatComponentMessage(component); + } + } } triedToWarnPlayer = true; diff --git a/src/main/resources/assets/bloodarsenal/lang/en_US.lang b/src/main/resources/assets/bloodarsenal/lang/en_US.lang index afe5207..6148019 100644 --- a/src/main/resources/assets/bloodarsenal/lang/en_US.lang +++ b/src/main/resources/assets/bloodarsenal/lang/en_US.lang @@ -207,9 +207,8 @@ message.inputTank=Input tank: message.outputTank=Output tank: #Miscs -ba.versioning.update=Get the latest Blood Arsenal, NOW! -ba.versioning.outdated=You are running Blood Arsenal %s, the latest is %s. -ba.versioning.updateMessage=["Click for... [",{"text":"Download","color":"red","hoverEvent":{"action":"show_text","value":{"text":"Click this to auto-magically download the latest version","color":"red"}},"clickEvent":{"action":"run_command","value":"/bloodarsenal-download-latest %version%"}},"] [",{"text":"Website","color":"red","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the website","color":"red"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/mc-mods/228823-blood-magic-addon-blood-arsenal/files"}},"] [",{"text":"Changelog","color":"red","hoverEvent":{"action":"show_text","value":{"text":"Click this to go see the changelog","color":"red"}},"clickEvent":{"action":"open_url","value":"http://www.curse.com/mc-mods/minecraft/228823-blood-magic-addon-blood-arsenal#t1:changes"}},"]"] +ba.versioning.outdated=You are using Blood Arsenal %s, the latest is %s. +ba.versioning.updateMessage=["Click to: [",{"text":"Download","color":"red","hoverEvent":{"action":"show_text","value":{"text":"Click this to auto-magically download the latest version","color":"red"}},"clickEvent":{"action":"run_command","value":"/bloodarsenal-download-latest %version%"}},"] [",{"text":"Website","color":"red","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to the website","color":"red"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/mc-mods/228823-blood-magic-addon-blood-arsenal/files"}},"] [",{"text":"Changelog","color":"red","hoverEvent":{"action":"show_text","value":{"text":"Click this to go see the changelog","color":"red"}},"clickEvent":{"action":"open_url","value":"http://www.curse.com/mc-mods/minecraft/228823-blood-magic-addon-blood-arsenal#t1:changes"}},"]"] ba.versioning.startingDownload=[{"text":"Starting download of %s Please do not remove your hard disk.", "color":"orange"},{"text":"Support Arcaratus","color":"cyan"},{"text":" on [","color":"orange"},{"text":"Patreon","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"Click this to go to Arcaratus's Patreon","color":"cyan"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Arcaratus"}},{"text":"]!","color":"orange"}] ba.versioning.doneDownloading=Finished downloading %s Delete your old Blood Arsenal .jar and reload your game to update. ba.versioning.error=An error has occurred while downloading the mod! diff --git a/src/main/resources/assets/bloodarsenal/lang/zh_TW.lang b/src/main/resources/assets/bloodarsenal/lang/zh_TW.lang index 21ad212..a52e44c 100644 --- a/src/main/resources/assets/bloodarsenal/lang/zh_TW.lang +++ b/src/main/resources/assets/bloodarsenal/lang/zh_TW.lang @@ -207,7 +207,6 @@ message.inputTank=輸入槽: message.outputTank=輸出槽: #Miscs -ba.versioning.update=現在去下載最新的 Blood Arsenal! ba.versioning.outdated=您正在使用 Blood Arsenal %s,最新的是 %s。 ba.versioning.updateMessage=["按此... [",{"text":"下載","color":"red","hoverEvent":{"action":"show_text","value":{"text":"按此自動下載最新版本","color":"red"}},"clickEvent":{"action":"run_command","value":"/bloodarsenal-download-latest %version%"}},"] [",{"text":"官網","color":"red","hoverEvent":{"action":"show_text","value":{"text":"按此去官網","color":"red"}},"clickEvent":{"action":"open_url","value":"http://minecraft.curseforge.com/mc-mods/228823-blood-magic-addon-blood-arsenal/files"}},"] [",{"text":"更新紀錄","color":"red","hoverEvent":{"action":"show_text","value":{"text":"按此看更新紀錄","color":"red"}},"clickEvent":{"action":"open_url","value":"http://www.curse.com/mc-mods/minecraft/228823-blood-magic-addon-blood-arsenal#t1:changes"}},"]"] ba.versioning.startingDownload=[{"text":"開始下載 %s 請不要移除硬碟。", "color":"orange"},{"text":"支持作者 Arcaratus","color":"cyan"},{"text":" on [","color":"orange"},{"text":"Patreon","color":"gold","hoverEvent":{"action":"show_text","value":{"text":"按此去 Arcaratus 的 Patreon","color":"cyan"}},"clickEvent":{"action":"open_url","value":"http://www.patreon.com/Arcaratus"}},{"text":"]!","color":"orange"}]