diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java index 8328d55b2..2a97e9b6f 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/booklet/BookletUtils.java @@ -107,7 +107,7 @@ public final class BookletUtils{ version = "Dev's Edition"; } else{ - version = StringUtil.localize("info."+ModUtil.MOD_ID+".booklet.edition")+" "+ModUtil.VERSION.substring(ModUtil.VERSION.indexOf("r")+1); + version = StringUtil.localize("info."+ModUtil.MOD_ID+".booklet.edition")+" "+Util.getMajorModVersion(); } strg = TextFormatting.GOLD+TextFormatting.ITALIC.toString()+"-"+version+"-"; booklet.getFontRenderer().drawString(strg, booklet.guiLeft+booklet.xSize/2-booklet.getFontRenderer().getStringWidth(strg)/2-3, booklet.guiTop+33, 0); diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java index 8db0addf9..c38b044c5 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java @@ -12,6 +12,7 @@ package de.ellpeck.actuallyadditions.mod.update; import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; import de.ellpeck.actuallyadditions.mod.util.ModUtil; +import de.ellpeck.actuallyadditions.mod.util.Util; import java.io.InputStreamReader; import java.net.URL; @@ -33,7 +34,7 @@ public class ThreadUpdateChecker extends Thread{ Properties updateProperties = new Properties(); updateProperties.load(new InputStreamReader(newestURL.openStream())); - String currentMcVersion = ModUtil.VERSION.split("-")[0]; + String currentMcVersion = Util.getMcVersion(); if(ConfigBoolValues.UPDATE_CHECK_VERSION_SPECIFIC.isEnabled()){ String newestVersionProp = updateProperties.getProperty(currentMcVersion); @@ -57,7 +58,7 @@ public class ThreadUpdateChecker extends Thread{ UpdateChecker.updateVersionString = highestString; } - String clientVersionString = ModUtil.VERSION.substring(ModUtil.VERSION.indexOf("r")+1); + String clientVersionString = Util.getMajorModVersion(); int clientVersion = Integer.parseInt(clientVersionString.contains("_") ? clientVersionString.substring(0, clientVersionString.indexOf("_")) : clientVersionString); if(UpdateChecker.updateVersionInt > clientVersion){ UpdateChecker.needsUpdateNotify = true; diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java b/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java index d7a697f52..6969c1171 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java @@ -41,4 +41,16 @@ public final class Util{ public static boolean isDevVersion(){ return ModUtil.VERSION.equals("@VERSION@"); } + + private static String[] splitVersion(){ + return ModUtil.VERSION.split("-"); + } + + public static String getMcVersion(){ + return splitVersion()[0]; + } + + public static String getMajorModVersion(){ + return splitVersion()[1].substring(1); + } } \ No newline at end of file