From 8602848f2c885be503b20b3703516c16ebce04db Mon Sep 17 00:00:00 2001 From: Christian Date: Tue, 4 Jun 2013 12:51:46 -0400 Subject: [PATCH] Don't throw an exception if the scala adapter find a java proxy. I may add some distinguishers to @SidedProxy so you know which mod it's for. --- fml/common/cpw/mods/fml/common/ILanguageAdapter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fml/common/cpw/mods/fml/common/ILanguageAdapter.java b/fml/common/cpw/mods/fml/common/ILanguageAdapter.java index 74e261f7a..4071cfb53 100644 --- a/fml/common/cpw/mods/fml/common/ILanguageAdapter.java +++ b/fml/common/cpw/mods/fml/common/ILanguageAdapter.java @@ -55,8 +55,8 @@ public interface ILanguageAdapter { catch (ClassNotFoundException e) { // Not a singleton, look for @Instance field as a fallback. - FMLLog.log(Level.SEVERE, e, "An error occured trying to load a proxy into %s.%s. Did you declare your mod as 'class' instead of 'object'?", proxyTarget.getSimpleName(), target.getName()); - throw new LoaderException(e); + FMLLog.log(Level.INFO, e, "An error occured trying to load a proxy into %s.%s. Did you declare your mod as 'class' instead of 'object'?", proxyTarget.getSimpleName(), target.getName()); + return; } // Get the instance via the MODULE$ field which is