diff --git a/src/main/java/taintedmagic/common/TaintedMagic.java b/src/main/java/taintedmagic/common/TaintedMagic.java index 62385bd4..eb0cb272 100644 --- a/src/main/java/taintedmagic/common/TaintedMagic.java +++ b/src/main/java/taintedmagic/common/TaintedMagic.java @@ -20,7 +20,6 @@ import cpw.mods.fml.common.event.FMLPreInitializationEvent; import taintedmagic.common.handler.ConfigHandler; import taintedmagic.common.handler.TaintedMagicEventHandler; -import taintedmagic.common.handler.UpdateHandler; import taintedmagic.common.lib.LibCreativeTab; import taintedmagic.common.lib.LibStrings; import taintedmagic.common.network.PacketHandler; @@ -79,8 +78,6 @@ public static void preInit(FMLPreInitializationEvent event) { RecipeRegistry.init(); OreDictionaryRegistry.init(); - - if (configHandler.useUpdateHandler) UpdateHandler.init(); } // Init diff --git a/src/main/java/taintedmagic/common/handler/ConfigHandler.java b/src/main/java/taintedmagic/common/handler/ConfigHandler.java index 347e9f38..941ecec7 100644 --- a/src/main/java/taintedmagic/common/handler/ConfigHandler.java +++ b/src/main/java/taintedmagic/common/handler/ConfigHandler.java @@ -8,7 +8,6 @@ public class ConfigHandler { public static Configuration config; - public static boolean useUpdateHandler = true; public static boolean researchTags = true; public static boolean useCustomResearchTabBackground = false; public static int magesMaceBaseDamage; @@ -28,8 +27,6 @@ public static void init() { config.load(); - useUpdateHandler = config - .getBoolean("use_update_handler", "misc", true, "Should update notifications be enabled?"); researchTags = config.getBoolean( "research_tags", "research", diff --git a/src/main/java/taintedmagic/common/handler/TaintedMagicEventHandler.java b/src/main/java/taintedmagic/common/handler/TaintedMagicEventHandler.java index 61582b11..74d8705a 100644 --- a/src/main/java/taintedmagic/common/handler/TaintedMagicEventHandler.java +++ b/src/main/java/taintedmagic/common/handler/TaintedMagicEventHandler.java @@ -22,7 +22,6 @@ import net.minecraftforge.event.entity.player.ItemTooltipEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; -import cpw.mods.fml.common.gameevent.PlayerEvent; import cpw.mods.fml.common.gameevent.PlayerEvent.ItemCraftedEvent; import taintedmagic.api.IBloodlust; import taintedmagic.common.helper.TaintedMagicHelper; @@ -152,11 +151,6 @@ public void entityAttacked(LivingAttackEvent event) { } // End - @SubscribeEvent - public void onPlayerLogin(PlayerEvent.PlayerLoggedInEvent event) { - if (UpdateHandler.show) event.player.addChatMessage(new ChatComponentText(UpdateHandler.updateStatus)); - } - @SubscribeEvent public void onCrafting(ItemCraftedEvent event) { if (event.crafting == new ItemStack(ItemRegistry.ItemWandCap, 1, 0)) { diff --git a/src/main/java/taintedmagic/common/handler/UpdateHandler.java b/src/main/java/taintedmagic/common/handler/UpdateHandler.java deleted file mode 100644 index d6debf5f..00000000 --- a/src/main/java/taintedmagic/common/handler/UpdateHandler.java +++ /dev/null @@ -1,52 +0,0 @@ -package taintedmagic.common.handler; - -import java.net.URL; -import java.util.Scanner; - -import net.minecraft.util.EnumChatFormatting; - -import taintedmagic.common.TaintedMagic; -import taintedmagic.common.lib.LibStrings; - -public class UpdateHandler { - - private static String currentVersion = LibStrings.VERSION; - private static String newestVersion; - public static String updateStatus = null; - public static boolean show = false; - - public static void init() { - getNewestVersion(); - - if (newestVersion != null) { - if (newestVersion.equalsIgnoreCase(currentVersion)) { - show = false; - } else if (!newestVersion.equalsIgnoreCase(currentVersion)) { - show = true; - updateStatus = (EnumChatFormatting.RED + "Tainted Magic is out of date! The latest version is " - + EnumChatFormatting.GREEN - + newestVersion); - TaintedMagic.log.info( - "Mod out of date! You're still running: " + currentVersion - + ", Latest Version: " - + newestVersion); - } - } else { - show = true; - updateStatus = (EnumChatFormatting.RED + "Tainted Magic failed to connect to update server!"); - TaintedMagic.log.info("Failed to connect to update server..."); - } - } - - private static void getNewestVersion() { - try { - URL url = new URL("https://raw.githubusercontent.com/yorkeJohn/Tainted-Magic/master/version.txt"); - Scanner s = new Scanner(url.openStream()); - newestVersion = s.next(); - s.close(); - } catch (Exception ex) { - ex.printStackTrace(); - TaintedMagic.log.info("Could not connect to GitHub repository!"); - } - } -}