From 0a1d976ce09c5d37e34cecf23ce9b06afeb44350 Mon Sep 17 00:00:00 2001 From: Shadows_of_Fire Date: Thu, 10 May 2018 05:40:16 -0400 Subject: [PATCH] refactor has forgotten u apparently but u fix now --- .../mod/update/ThreadUpdateChecker.java | 11 +++++------ .../actuallyadditions/mod/update/UpdateChecker.java | 3 +-- .../de/ellpeck/actuallyadditions/mod/util/Util.java | 11 +++++------ 3 files changed, 11 insertions(+), 14 deletions(-) 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 ff146def2..bdb1b99d2 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/update/ThreadUpdateChecker.java @@ -10,15 +10,14 @@ package de.ellpeck.actuallyadditions.mod.update; -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; -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; import java.util.Properties; +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; +import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; +import de.ellpeck.actuallyadditions.mod.util.Util; + public class ThreadUpdateChecker extends Thread{ public ThreadUpdateChecker(){ @@ -75,7 +74,7 @@ public class ThreadUpdateChecker extends Thread{ if(!UpdateChecker.checkFailed){ if(UpdateChecker.needsUpdateNotify){ ActuallyAdditions.LOGGER.info("There is an Update for "+ActuallyAdditions.NAME+" available!"); - ActuallyAdditions.LOGGER.info("Current Version: "+ModUtil.VERSION+", newest Version: "+UpdateChecker.updateVersionString+"!"); + ActuallyAdditions.LOGGER.info("Current Version: "+ActuallyAdditions.VERSION+", newest Version: "+UpdateChecker.updateVersionString+"!"); ActuallyAdditions.LOGGER.info("View the Changelog at "+UpdateChecker.CHANGELOG_LINK); ActuallyAdditions.LOGGER.info("Download at "+UpdateChecker.DOWNLOAD_LINK); } diff --git a/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java b/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java index bed3aa00c..503283d2a 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/update/UpdateChecker.java @@ -12,7 +12,6 @@ package de.ellpeck.actuallyadditions.mod.update; import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import de.ellpeck.actuallyadditions.mod.config.values.ConfigBoolValues; -import de.ellpeck.actuallyadditions.mod.util.ModUtil; import de.ellpeck.actuallyadditions.mod.util.StringUtil; import de.ellpeck.actuallyadditions.mod.util.Util; import net.minecraft.client.Minecraft; @@ -59,7 +58,7 @@ public class UpdateChecker{ } else if(UpdateChecker.needsUpdateNotify){ player.sendMessage(ITextComponent.Serializer.jsonToComponent(StringUtil.localize("info."+ActuallyAdditions.MODID+".update.generic"))); - player.sendMessage(ITextComponent.Serializer.jsonToComponent(StringUtil.localizeFormatted("info."+ActuallyAdditions.MODID+".update.versionCompare", ModUtil.VERSION, UpdateChecker.updateVersionString))); + player.sendMessage(ITextComponent.Serializer.jsonToComponent(StringUtil.localizeFormatted("info."+ActuallyAdditions.MODID+".update.versionCompare", ActuallyAdditions.VERSION, UpdateChecker.updateVersionString))); player.sendMessage(ITextComponent.Serializer.jsonToComponent(StringUtil.localizeFormatted("info."+ActuallyAdditions.MODID+".update.buttons", UpdateChecker.CHANGELOG_LINK, UpdateChecker.DOWNLOAD_LINK))); notified = 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 01b05e81d..f4fad78bb 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java +++ b/src/main/java/de/ellpeck/actuallyadditions/mod/util/Util.java @@ -10,6 +10,9 @@ package de.ellpeck.actuallyadditions.mod.util; +import java.util.Locale; + +import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; import net.minecraft.item.EnumRarity; import net.minecraft.util.text.TextFormatting; import net.minecraftforge.common.util.EnumHelper; @@ -17,10 +20,6 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fml.common.FMLCommonHandler; import net.minecraftforge.oredict.OreDictionary; -import java.util.Locale; - -import de.ellpeck.actuallyadditions.mod.ActuallyAdditions; - public final class Util{ public static final int WILDCARD = OreDictionary.WILDCARD_VALUE; @@ -40,7 +39,7 @@ public final class Util{ } public static boolean isDevVersion(){ - return ModUtil.VERSION.equals("@VERSION@"); + return ActuallyAdditions.VERSION.equals("@VERSION@"); } public static boolean isClient(){ @@ -48,7 +47,7 @@ public final class Util{ } private static String[] splitVersion(){ - return ModUtil.VERSION.split("-"); + return ActuallyAdditions.VERSION.split("-"); } public static String getMcVersion(){