diff --git a/src/main/java/vazkii/botania/common/Botania.java b/src/main/java/vazkii/botania/common/Botania.java index ae77b0bd7..f4829cb9a 100644 --- a/src/main/java/vazkii/botania/common/Botania.java +++ b/src/main/java/vazkii/botania/common/Botania.java @@ -82,12 +82,12 @@ public class Botania { MinecraftForge.EVENT_BUS.register(this); } - @SubscribeEvent // todo temporary nag, remove when merging back into master + @SubscribeEvent public void nagUnofficial(PlayerEvent.PlayerLoggedInEvent evt) { EntityPlayer player = evt.player; IChatComponent message = new ChatComponentTranslation("botaniamisc.unofficial.nag"); - message.setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED).setUnderlined(true)); + message.setChatStyle(new ChatStyle().setColor(EnumChatFormatting.RED)); IChatComponent message2 = new ChatComponentTranslation("botaniamisc.unofficial.report"); message2.setChatStyle(new ChatStyle().setColor(EnumChatFormatting.YELLOW)); diff --git a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java index 7f91cb289..f626e8b78 100644 --- a/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java +++ b/src/main/java/vazkii/botania/common/core/version/ThreadVersionChecker.java @@ -11,6 +11,7 @@ package vazkii.botania.common.core.version; import java.io.BufferedReader; +import java.io.IOException; import java.io.InputStreamReader; import java.net.URL; @@ -18,6 +19,8 @@ import net.minecraftforge.common.MinecraftForge; public class ThreadVersionChecker extends Thread { + private static final String LINK = "https://raw.githubusercontent.com/williewillus/Botania/MC18/version/" + MinecraftForge.MC_VERSION + ".txt"; + public ThreadVersionChecker() { setName("Botania Version Checker Thread"); setDaemon(true); @@ -26,12 +29,9 @@ public class ThreadVersionChecker extends Thread { @Override public void run() { - try { - URL url = new URL("https://raw.githubusercontent.com/williewillus/Botania/MC18/version/" + MinecraftForge.MC_VERSION + ".txt"); - BufferedReader r = new BufferedReader(new InputStreamReader(url.openStream())); + try(BufferedReader r = new BufferedReader(new InputStreamReader(new URL(LINK).openStream()))) { VersionChecker.onlineVersion = r.readLine(); - r.close(); - } catch(Exception e) { + } catch(IOException e) { e.printStackTrace(); } VersionChecker.doneChecking = true;