From ef7812c64ddd7f0eec7e5cae6afaa4f3128f457c Mon Sep 17 00:00:00 2001 From: Thomas Guimbretiere Date: Mon, 29 Dec 2014 02:28:44 +0100 Subject: [PATCH] Added some debug code when registering null block/handler --- build.gradle | 2 +- src/main/java/mcp/mobius/waila/Waila.java | 2 +- src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 0f1e55f..4e04cc2 100644 --- a/build.gradle +++ b/build.gradle @@ -35,7 +35,7 @@ apply plugin: 'java' apply plugin: 'forge' apply plugin: 'maven' -version = "1.5.7b_1.7.10" +version = "1.5.8_dev1_1.7.10" group= "mcp.mobius.waila" // http://maven.apache.org/guides/mini/guide-naming-conventions.html archivesBaseName = "Waila" diff --git a/src/main/java/mcp/mobius/waila/Waila.java b/src/main/java/mcp/mobius/waila/Waila.java index daebe77..e03c993 100644 --- a/src/main/java/mcp/mobius/waila/Waila.java +++ b/src/main/java/mcp/mobius/waila/Waila.java @@ -44,7 +44,7 @@ import mcp.mobius.waila.cbcore.LangUtil; import mcp.mobius.waila.client.KeyEvent; import mcp.mobius.waila.commands.CommandDumpHandlers; -@Mod(modid="Waila", name="Waila", version="1.5.7", dependencies="required-after:NotEnoughItems@(,1.0.3.78]", acceptableRemoteVersions="*") +@Mod(modid="Waila", name="Waila", version="1.5.8", dependencies="required-after:NotEnoughItems@(,1.0.3.78]", acceptableRemoteVersions="*") /* @NetworkMod(channels = {"Waila"},clientSideRequired=false, serverSideRequired=false, connectionHandler = WailaConnectionHandler.class, packetHandler = WailaPacketHandler.class, versionBounds="[1.5.0,)") diff --git a/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java b/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java index 01e2245..77ca199 100644 --- a/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java +++ b/src/main/java/mcp/mobius/waila/api/impl/ModuleRegistrar.java @@ -199,6 +199,9 @@ public class ModuleRegistrar implements IWailaRegistrar { } private void registerProvider(T dataProvider, V clazz, LinkedHashMap> target) { + if (clazz == null || dataProvider == null) + throw new RuntimeException(String.format("Trying to register a null provider or null block ! Please check the stacktrace to know what was the original registration method. [Provider : %s, Target : %s]", dataProvider.getClass().getName(), clazz)); + if (!target.containsKey(clazz)) target.put(clazz, new ArrayList());