From 7dfc9db949396aebe98e031f8524ffd45dba2973 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Thu, 11 Aug 2016 12:15:16 -0400 Subject: [PATCH] Bump version to 9.2, add Minecraft version-based version handling --- build.properties | 2 +- src/main/java/mekanism/common/Mekanism.java | 4 +-- .../java/mekanism/common/ThreadGetData.java | 27 ++++++++++++++-- src/main/java/mekanism/common/Version.java | 27 +++++++++++++++- .../mekanism/common/util/MekanismUtils.java | 31 ++----------------- .../generators/common/MekanismGenerators.java | 4 +-- .../mekanism/tools/common/MekanismTools.java | 4 +-- 7 files changed, 60 insertions(+), 39 deletions(-) diff --git a/build.properties b/build.properties index 4f6e893a1..e0ed031bf 100644 --- a/build.properties +++ b/build.properties @@ -3,4 +3,4 @@ mappings_version=snapshot_20160627 forge_version=12.18.1.2014 mcmp_version=1.2.0_74 jei_version=3.7.6.231 -mod_version=9.1.1 +mod_version=9.2.0 diff --git a/src/main/java/mekanism/common/Mekanism.java b/src/main/java/mekanism/common/Mekanism.java index 291fd0dde..d65964222 100644 --- a/src/main/java/mekanism/common/Mekanism.java +++ b/src/main/java/mekanism/common/Mekanism.java @@ -160,7 +160,7 @@ import com.mojang.authlib.GameProfile; * @author AidanBrady * */ -@Mod(modid = "Mekanism", name = "Mekanism", version = "9.1.1", guiFactory = "mekanism.client.gui.ConfigGuiFactory", +@Mod(modid = "Mekanism", name = "Mekanism", version = "9.2.0", guiFactory = "mekanism.client.gui.ConfigGuiFactory", dependencies = "after:mcmultipart;after:JEI;after:BuildCraft;after:BuildCraftAPI;after:IC2;after:CoFHCore;" + "after:ComputerCraft;after:Galacticraft API;after:MetallurgyCore") public class Mekanism @@ -186,7 +186,7 @@ public class Mekanism public static Configuration configuration; /** Mekanism version number */ - public static Version versionNumber = new Version(9, 1, 1); + public static Version versionNumber = new Version(9, 2, 0); /** MultiblockManagers for various structrures */ public static MultiblockManager tankManager = new MultiblockManager("dynamicTank"); diff --git a/src/main/java/mekanism/common/ThreadGetData.java b/src/main/java/mekanism/common/ThreadGetData.java index 310154f54..7c3b8b7ed 100644 --- a/src/main/java/mekanism/common/ThreadGetData.java +++ b/src/main/java/mekanism/common/ThreadGetData.java @@ -1,6 +1,9 @@ package mekanism.common; +import java.util.List; + import mekanism.common.util.MekanismUtils; +import net.minecraftforge.common.ForgeVersion; /** * Thread used to retrieve data from the Mekanism server. @@ -18,9 +21,27 @@ public class ThreadGetData extends Thread @Override public void run() { - Mekanism.latestVersionNumber = MekanismUtils.getLatestVersion(); - Mekanism.recentNews = MekanismUtils.getRecentNews(); - + List ret = MekanismUtils.getHTML("https://dl.dropbox.com/u/90411166/Versions/Mekanism.txt"); + + Mekanism.latestVersionNumber = "null"; + Mekanism.recentNews = "null"; + + for(String s : ret) + { + String[] text = s.split(":"); + + if(text.length == 3 && !text[0].contains("UTF-8") && !text[0].contains("HTML") && !text[0].contains("http")) + { + if(Version.get(text[0]) != null && Version.get(text[0]).equals(Version.get(ForgeVersion.mcVersion))) + { + Mekanism.latestVersionNumber = text[1]; + Mekanism.recentNews = text[2]; + + break; + } + } + } + MekanismUtils.updateDonators(); } } diff --git a/src/main/java/mekanism/common/Version.java b/src/main/java/mekanism/common/Version.java index ee5b058cd..ff1eb97e1 100644 --- a/src/main/java/mekanism/common/Version.java +++ b/src/main/java/mekanism/common/Version.java @@ -1,7 +1,7 @@ package mekanism.common; /** - * Version v1.0.4. Simple version handling for Mekanism. + * Version v2.0.0. Simple version handling for Mekanism. * @author AidanBrady * */ @@ -127,4 +127,29 @@ public class Version return major + "." + minor + "." + build; } } + + @Override + public int hashCode() + { + int result = 1; + + result = 31 * result + build; + result = 31 * result + major; + result = 31 * result + minor; + + return result; + } + + @Override + public boolean equals(Object obj) + { + if(obj == null || getClass() != obj.getClass()) + { + return false; + } + + Version other = (Version)obj; + + return build == other.build && major == other.major && minor == other.minor; + } } diff --git a/src/main/java/mekanism/common/util/MekanismUtils.java b/src/main/java/mekanism/common/util/MekanismUtils.java index 0b6c5ef97..11356f648 100644 --- a/src/main/java/mekanism/common/util/MekanismUtils.java +++ b/src/main/java/mekanism/common/util/MekanismUtils.java @@ -161,28 +161,6 @@ public final class MekanismUtils return false; } - /** - * Gets the latest version using getHTML and returns it as a string. - * @return latest version - */ - public static String getLatestVersion() - { - String[] text = merge(getHTML("https://dl.dropbox.com/u/90411166/Mod%20Versions/Mekanism.txt")).split(":"); - if(text.length > 1 && !text[0].contains("UTF-8") && !text[0].contains("HTML") && !text[0].contains("http")) return text[0]; - return "null"; - } - - /** - * Gets the recent news using getHTML and returns it as a string. - * @return recent news - */ - public static String getRecentNews() - { - String[] text = merge(getHTML("https://dl.dropbox.com/u/90411166/Mod%20Versions/Mekanism.txt")).split(":"); - if(text.length > 1 && !text[1].contains("UTF-8") && !text[1].contains("HTML") && !text[1].contains("http")) return text[1]; - return "null"; - } - /** * Updates the donator list by retrieving the most recent information from a foreign document. */ @@ -203,17 +181,14 @@ public final class MekanismUtils */ public static List getHTML(String urlToRead) { - URL url; - HttpURLConnection conn; - BufferedReader rd; String line; List result = new ArrayList(); try { - url = new URL(urlToRead); - conn = (HttpURLConnection)url.openConnection(); + URL url = new URL(urlToRead); + HttpURLConnection conn = (HttpURLConnection)url.openConnection(); conn.setRequestMethod("GET"); - rd = new BufferedReader(new InputStreamReader(conn.getInputStream())); + BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream())); while((line = rd.readLine()) != null) { diff --git a/src/main/java/mekanism/generators/common/MekanismGenerators.java b/src/main/java/mekanism/generators/common/MekanismGenerators.java index ec3b5a76e..42c06ec87 100644 --- a/src/main/java/mekanism/generators/common/MekanismGenerators.java +++ b/src/main/java/mekanism/generators/common/MekanismGenerators.java @@ -44,7 +44,7 @@ import net.minecraftforge.oredict.OreDictionary; import buildcraft.api.fuels.BuildcraftFuelRegistry; import buildcraft.api.fuels.IFuel; -@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.1.1", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") +@Mod(modid = "MekanismGenerators", name = "MekanismGenerators", version = "9.2.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.generators.client.gui.GeneratorsGuiFactory") public class MekanismGenerators implements IModule { @SidedProxy(clientSide = "mekanism.generators.client.GeneratorsClientProxy", serverSide = "mekanism.generators.common.GeneratorsCommonProxy") @@ -54,7 +54,7 @@ public class MekanismGenerators implements IModule public static MekanismGenerators instance; /** MekanismGenerators version number */ - public static Version versionNumber = new Version(9, 1, 1); + public static Version versionNumber = new Version(9, 2, 0); public static MultiblockManager turbineManager = new MultiblockManager("industrialTurbine"); diff --git a/src/main/java/mekanism/tools/common/MekanismTools.java b/src/main/java/mekanism/tools/common/MekanismTools.java index d5c6d592c..c6809ebcc 100644 --- a/src/main/java/mekanism/tools/common/MekanismTools.java +++ b/src/main/java/mekanism/tools/common/MekanismTools.java @@ -32,7 +32,7 @@ import net.minecraftforge.fml.common.event.FMLInitializationEvent; import net.minecraftforge.fml.common.event.FMLPreInitializationEvent; import net.minecraftforge.fml.common.eventhandler.SubscribeEvent; -@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.1.1", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") +@Mod(modid = "MekanismTools", name = "MekanismTools", version = "9.2.0", dependencies = "required-after:Mekanism", guiFactory = "mekanism.tools.client.gui.ToolsGuiFactory") public class MekanismTools implements IModule { @SidedProxy(clientSide = "mekanism.tools.client.ToolsClientProxy", serverSide = "mekanism.tools.common.ToolsCommonProxy") @@ -42,7 +42,7 @@ public class MekanismTools implements IModule public static MekanismTools instance; /** MekanismTools version number */ - public static Version versionNumber = new Version(9, 1, 1); + public static Version versionNumber = new Version(9, 2, 0); //Enums: Tools public static ToolMaterial toolOBSIDIAN;