From 20dd46b696759076ac5441eb3b66409fdafc3a38 Mon Sep 17 00:00:00 2001 From: AbrarSyed Date: Thu, 6 Nov 2014 21:43:16 -0600 Subject: [PATCH 1/2] fixed dependency notation This used to cause a crash in the GUiMissingMods if CCC missing --- src/codechicken/nei/NEIModContainer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/codechicken/nei/NEIModContainer.java b/src/codechicken/nei/NEIModContainer.java index 11355539..f3229314 100644 --- a/src/codechicken/nei/NEIModContainer.java +++ b/src/codechicken/nei/NEIModContainer.java @@ -34,7 +34,7 @@ public class NEIModContainer extends DummyModContainer @Override public Set getRequirements() { Set deps = new HashSet(); - deps.add(VersionParser.parseVersionReference("CodeChickenCore@"+CodeChickenCorePlugin.version+",)")); + deps.add(VersionParser.parseVersionReference("CodeChickenCore@["+CodeChickenCorePlugin.version+",)")); return deps; } From f8da4d8147c9d2ee3619fade5d688638ec4832e7 Mon Sep 17 00:00:00 2001 From: AbrarSyed Date: Fri, 7 Nov 2014 01:08:50 -0600 Subject: [PATCH 2/2] added failsafe location --- src/codechicken/nei/asm/NEICorePlugin.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/codechicken/nei/asm/NEICorePlugin.java b/src/codechicken/nei/asm/NEICorePlugin.java index f1a952b8..4e629220 100644 --- a/src/codechicken/nei/asm/NEICorePlugin.java +++ b/src/codechicken/nei/asm/NEICorePlugin.java @@ -37,6 +37,8 @@ public class NEICorePlugin implements IFMLLoadingPlugin, IFMLCallHook @Override public void injectData(Map data) { location = (File) data.get("coremodLocation"); + if (location == null) + location = new File(getClass().getProtectionDomain().getCodeSource().getLocation().getPath()); } @Override