From 483667c91996cc21103a3dce407815aeb9c12ba1 Mon Sep 17 00:00:00 2001 From: Christian Date: Sun, 26 Aug 2012 10:55:55 -0400 Subject: [PATCH] Some functionality fixes for @Instance injection. --- common/cpw/mods/fml/common/FMLModContainer.java | 9 ++++++++- eclipse/FML-MockMod/src/cpw/mods/mockmod/MockBlock.java | 4 ++++ eclipse/FML-MockMod/src/cpw/mods/mockmod/MockMod.java | 4 ++-- 3 files changed, 14 insertions(+), 3 deletions(-) diff --git a/common/cpw/mods/fml/common/FMLModContainer.java b/common/cpw/mods/fml/common/FMLModContainer.java index f1b420bb08..0617a51681 100644 --- a/common/cpw/mods/fml/common/FMLModContainer.java +++ b/common/cpw/mods/fml/common/FMLModContainer.java @@ -291,7 +291,14 @@ public class FMLModContainer implements ModContainer Class clz = modInstance.getClass(); if (!Strings.isNullOrEmpty(targetMod)) { - mc = Loader.instance().getIndexedModList().get(targetMod); + if (Loader.isModLoaded(targetMod)) + { + mc = Loader.instance().getIndexedModList().get(targetMod); + } + else + { + mc = null; + } } if (mc != null) { diff --git a/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockBlock.java b/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockBlock.java index c33ef24a15..da9274e7a2 100644 --- a/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockBlock.java +++ b/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockBlock.java @@ -6,6 +6,10 @@ import net.minecraft.src.Material; public class MockBlock extends Block { + static + { + Thread.dumpStack(); + } @Instance("mod_testMod") public static Object tstInstance; diff --git a/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockMod.java b/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockMod.java index 9118933bb6..0562d855b7 100644 --- a/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockMod.java +++ b/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockMod.java @@ -45,8 +45,8 @@ public class MockMod @Metadata private ModMetadata meta; - @Block(name="MyBlock", itemTypeClass=TestItem.class) - private MockBlock myBlock; +// @Block(name="MyBlock", itemTypeClass=TestItem.class) +// private MockBlock myBlock; @PreInit public void preinit(FMLPreInitializationEvent evt)