keith
/
ForgePatch
1
0
Fork 0
Code Issues Pull Requests Projects Releases 2 Wiki Activity

Some functionality fixes for @Instance injection.

This commit is contained in:
Christian 2012-08-26 10:55:55 -04:00
parent fe73f11443
commit 85a585725b
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fml/common/cpw/mods/fml/common/FMLModContainer.java
View File

@ -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)
{

4
fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockBlock.java
View File

@ -6,6 +6,10 @@ import net.minecraft.src.Material;
public class MockBlock extends Block
{
static
{
Thread.dumpStack();
}
@Instance("mod_testMod")
public static Object tstInstance;

4
fml/eclipse/FML-MockMod/src/cpw/mods/mockmod/MockMod.java
View File

@ -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)