From 1fa358ccee6b2852960ce3e157b93186c444b58c Mon Sep 17 00:00:00 2001 From: cpw Date: Sat, 11 Apr 2015 18:02:00 -0400 Subject: [PATCH] Some tidyup of the PR --- .../minecraftforge/fml/common/FMLModContainer.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/fml/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java b/fml/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java index 8c8ce464fc..72b3e6bb56 100644 --- a/fml/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java +++ b/fml/src/main/java/net/minecraftforge/fml/common/FMLModContainer.java @@ -95,9 +95,10 @@ public class FMLModContainer implements ModContainer this.candidate = container; this.descriptor = modDescriptor; this.eventMethods = ArrayListMultimap.create(); - + this.modLanguage = (String) modDescriptor.get("modLanguage"); - if (modDescriptor.get("modLanguageAdapter").equals("")) + String languageAdapterType = (String)modDescriptor.get("modLanguageAdapter"); + if (Strings.isNullOrEmpty(languageAdapterType)) { this.languageAdapter = "scala".equals(modLanguage) ? new ILanguageAdapter.ScalaAdapter() : new ILanguageAdapter.JavaAdapter(); } @@ -105,13 +106,13 @@ public class FMLModContainer implements ModContainer { try { - this.languageAdapter = (ILanguageAdapter)Class.forName((String)modDescriptor.get("modLanguageAdapter"), true, Loader.instance().getModClassLoader()).newInstance(); - FMLLog.finer("Using custom language adapter %s (for %s)", this.languageAdapter, this.className); + this.languageAdapter = (ILanguageAdapter)Class.forName(languageAdapterType, true, Loader.instance().getModClassLoader()).newInstance(); + FMLLog.finer("Using custom language adapter %s (type %s) for %s (modid %s)", this.languageAdapter, languageAdapterType, this.className, getModId()); } catch (Exception ex) { - FMLLog.severe("Error constructing custom mod language adapter %s (referenced by %s): %s", modDescriptor.get("modLanguageAdapter"), this.className, ex); - FMLCommonHandler.instance().exitJava(1, true); + FMLLog.log(Level.ERROR, ex, "Error constructing custom mod language adapter %s (referenced by %s) (modid: %s)", languageAdapterType, this.className, getModId()); + throw new LoaderException(ex); } } }