diff options
Diffstat (limited to 'src/Java/gtPlusPlus/core/lib')
| -rw-r--r-- | src/Java/gtPlusPlus/core/lib/CORE.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/src/Java/gtPlusPlus/core/lib/CORE.java b/src/Java/gtPlusPlus/core/lib/CORE.java index d0e767ef3d..3d243b44ff 100644 --- a/src/Java/gtPlusPlus/core/lib/CORE.java +++ b/src/Java/gtPlusPlus/core/lib/CORE.java @@ -3,10 +3,10 @@ package gtPlusPlus.core.lib; import java.util.*; import gregtech.api.GregTech_API; -import gtPlusPlus.core.util.Utils; import gtPlusPlus.core.util.geo.GeoUtils; import gtPlusPlus.core.util.gregtech.recipehandlers.GregtechRecipe; -import gtPlusPlus.core.util.networking.NetworkUtils; +import gtPlusPlus.core.util.version.Version; +import gtPlusPlus.core.util.version.VersionUtils; import gtPlusPlus.xmod.gregtech.api.enums.GregtechOrePrefixes.GT_Materials; import gtPlusPlus.xmod.gregtech.api.interfaces.internal.IGregtech_RecipeAdder; import gtPlusPlus.xmod.gregtech.api.objects.XSTR; @@ -29,10 +29,14 @@ public class CORE { public static final String name = "GT++"; public static final String MODID = "miscutils"; - public static final String VERSION = "1.5.0-Beta"; - public static final String MASTER_VERSION = NetworkUtils.getContentFromURL("https://raw.githubusercontent.com/draknyte1/GTplusplus/master/Recommended.txt").toLowerCase(); + + //Version Objects + public static final Version VERSION = new Version(1, 5, 5, Version.SUFFIX.Release); + public static final Version MASTER_VERSION = VersionUtils.getVersionObjectFromGithub(); + public static final String VERSION_STRING = VersionUtils.getVersionObjectAsString(VERSION); + public static final String USER_COUNTRY = GeoUtils.determineUsersCountry(); - public static boolean isModUpToDate = Utils.isModUpToDate(); + public static boolean isModUpToDate = VersionUtils.isModUpToDate(); public static boolean DEBUG = false; public static final boolean LOAD_ALL_CONTENT = false; public static final int GREG_FIRST_ID = 760; |