From 487fc17d19b7a2d39ae1b87c831e2b2cc2f46b78 Mon Sep 17 00:00:00 2001 From: pahimar Date: Tue, 18 Dec 2012 13:13:20 -0500 Subject: [PATCH] Bump the version number, add some NPE protection to the version checker --- .../ee3/core/handlers/WorldTransmutationHandler.java | 11 +++++------ .../com/pahimar/ee3/core/helper/VersionHelper.java | 2 +- version.xml | 1 + 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java b/ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java index 04f80434..754b3231 100644 --- a/ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java +++ b/ee3_common/com/pahimar/ee3/core/handlers/WorldTransmutationHandler.java @@ -1,15 +1,14 @@ package com.pahimar.ee3.core.handlers; -import com.pahimar.ee3.event.WorldTransmutationEvent; - +import com.pahimar.ee3.event.ActionEvent; import net.minecraftforge.event.ForgeSubscribe; - public class WorldTransmutationHandler { @ForgeSubscribe - public void onWorldTransmutationEvent(WorldTransmutationEvent event) { - System.out.println(event.toString()); + public void onWorldTransmutationEvent(ActionEvent event) { + + System.out.println(event.data); } - + } diff --git a/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java b/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java index c5f73509..91a255d9 100644 --- a/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java +++ b/ee3_common/com/pahimar/ee3/core/helper/VersionHelper.java @@ -119,7 +119,7 @@ public class VersionHelper { returnString = returnString.replace("@MINECRAFT_VERSION@", Loader.instance().getMCVersionString()); return returnString; } - else if (result == OUTDATED) { + else if ((result == OUTDATED) && (remoteVersion != null) && (remoteUpdateLocation != null)) { String returnString = LanguageRegistry.instance().getStringLocalization(Strings.OUTDATED_MESSAGE); returnString = returnString.replace("@MOD_NAME@", Reference.MOD_NAME); returnString = returnString.replace("@REMOTE_MOD_VERSION@", remoteVersion); diff --git a/version.xml b/version.xml index 106688dd..297e01ce 100644 --- a/version.xml +++ b/version.xml @@ -5,4 +5,5 @@ pre1a|http://goo.gl/Ria2V pre1b|http://goo.gl/Ria2V pre1d|http://goo.gl/Ria2V + pre1d|http://goo.gl/Ria2V \ No newline at end of file