diff --git a/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java b/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java index 76d8bbaba..52aafb225 100644 --- a/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java +++ b/src/main/java/ellpeck/actuallyadditions/booklet/GuiBooklet.java @@ -153,12 +153,18 @@ public class GuiBooklet extends GuiScreen{ } //Update Checker Hover Text if(x >= this.guiLeft-11 && x <= this.guiLeft-11+10 && y >= this.guiTop-11 && y <= this.guiTop-11+10){ - if(UpdateChecker.doneChecking && UpdateChecker.updateVersion > UpdateChecker.clientVersion){ + if(UpdateChecker.doneChecking){ ArrayList list = new ArrayList(); - list.add(EnumChatFormatting.GOLD+"There is an Update available!"); - list.add(EnumChatFormatting.ITALIC+"You have: "+ModUtil.VERSION+", Newest: "+UpdateChecker.updateVersionS); - list.addAll(this.fontRendererObj.listFormattedStringToWidth(EnumChatFormatting.ITALIC+"Updates include: "+UpdateChecker.changelog, TOOLTIP_SPLIT_LENGTH)); - list.add(EnumChatFormatting.GRAY+"Click this button to visit the download page!"); + if(UpdateChecker.checkFailed){ + list.add(EnumChatFormatting.DARK_RED+"The Update Check failed!"); + list.add("Check your log for more Information!"); + } + else if(UpdateChecker.updateVersion > UpdateChecker.clientVersion){ + list.add(EnumChatFormatting.GOLD+"There is an Update available!"); + list.add(EnumChatFormatting.ITALIC+"You have: "+ModUtil.VERSION+", Newest: "+UpdateChecker.updateVersionS); + list.addAll(this.fontRendererObj.listFormattedStringToWidth(EnumChatFormatting.ITALIC+"Updates include: "+UpdateChecker.changelog, TOOLTIP_SPLIT_LENGTH)); + list.add(EnumChatFormatting.GRAY+"Click this button to visit the download page!"); + } this.func_146283_a(list, x, y); } } diff --git a/src/main/java/ellpeck/actuallyadditions/update/ThreadUpdateChecker.java b/src/main/java/ellpeck/actuallyadditions/update/ThreadUpdateChecker.java index 09beb2ce0..62fdbeb96 100644 --- a/src/main/java/ellpeck/actuallyadditions/update/ThreadUpdateChecker.java +++ b/src/main/java/ellpeck/actuallyadditions/update/ThreadUpdateChecker.java @@ -39,6 +39,9 @@ public class ThreadUpdateChecker extends Thread{ changeReader.close(); ModUtil.LOGGER.info("Update Check done!"); + + UpdateChecker.updateVersion = Integer.parseInt(UpdateChecker.updateVersionS.replace("-", "").replace(".", "")); + UpdateChecker.clientVersion = Integer.parseInt(ModUtil.VERSION.replace("-", "").replace(".", "")); } catch(Exception e){ ModUtil.LOGGER.error("Update Check failed!", e); @@ -46,26 +49,15 @@ public class ThreadUpdateChecker extends Thread{ } if(!UpdateChecker.checkFailed){ - try{ - UpdateChecker.updateVersion = Integer.parseInt(UpdateChecker.updateVersionS.replace("-", "").replace(".", "")); - UpdateChecker.clientVersion = Integer.parseInt(ModUtil.VERSION.replace("-", "").replace(".", "")); + if(UpdateChecker.updateVersion > UpdateChecker.clientVersion){ + ModUtil.LOGGER.info("There is an Update for "+ModUtil.MOD_ID+" available!"); + ModUtil.LOGGER.info("The installed Version is "+ModUtil.VERSION+", but the newest Version is "+UpdateChecker.updateVersionS+"!"); + ModUtil.LOGGER.info("The Changes are: "+UpdateChecker.changelog); + ModUtil.LOGGER.info("Download the newest Version at "+UpdateChecker.DOWNLOAD_LINK); } - catch(Exception e){ - ModUtil.LOGGER.error("Comparing the newest and the current Version failed!", e); - UpdateChecker.checkFailed = true; - } - - if(!UpdateChecker.checkFailed){ - if(UpdateChecker.updateVersion > UpdateChecker.clientVersion){ - ModUtil.LOGGER.info("There is an Update for "+ModUtil.MOD_ID+" available!"); - ModUtil.LOGGER.info("The installed Version is "+ModUtil.VERSION+", but the newest Version is "+UpdateChecker.updateVersionS+"!"); - ModUtil.LOGGER.info("The Changes are: "+UpdateChecker.changelog); - ModUtil.LOGGER.info("Download the newest Version at "+UpdateChecker.DOWNLOAD_LINK); - } - else{ - ModUtil.LOGGER.info("There is no new Update for "+ModUtil.MOD_ID+" available!"); - ModUtil.LOGGER.info("That's cool. You're really up to date, you have all of the latest awesome Features!"); - } + else{ + ModUtil.LOGGER.info("There is no new Update for "+ModUtil.MOD_ID+" available!"); + ModUtil.LOGGER.info("That's cool. You're really up to date, you have all of the latest awesome Features!"); } }