upstream/MinecraftForge
1
0 Fork 0
mirror of https://github.com/MinecraftForge/MinecraftForge.git synced 2026-11-12 16:27:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Filter out proxy injectors for incorrect mods.

Browse Source 
Prevents mod classes being initialized early when multiple mods are in the same source.
This commit is contained in:
LexManos committed 2016-10-08 16:27:49 -07:00
1 parent ad1324d478
commit c0db34796b
1 file changed
+21 -5
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/net/minecraftforge/fml/common/ProxyInjector.java
+21 -5
View File
@@ -47,6 +47,27 @@ public class ProxyInjector
{
try
{
//Pull this from the ASM data so we do not prematurely initialize mods with the below Class.forName
String modid = (String)targ.getAnnotationInfo().get("modId");
if (modid == null)
{
for (ASMData a : data.getAll(Mod.class.getName()))
{
if (a.getClassName().equals(targ.getClassName()))
{
modid = (String)a.getAnnotationInfo().get("modid");
break;
}
}
}
if (modid == null || !modid.equals(mod.getModId()))
{
//TODO? Throw exception if modid == null? As that shouldn't happen {annotation with no name in a class without a @Mod)
FMLLog.fine("Skipping proxy injection for %s.%s since it is not for mod %s", targ.getClassName(), targ.getObjectName(), mod.getModId());
continue;
}
Class<?> proxyTarget = Class.forName(targ.getClassName(), true, mcl);
Field target = proxyTarget.getDeclaredField(targ.getObjectName());
if (target == null)
@@ -58,11 +79,6 @@ public class ProxyInjector
target.setAccessible(true);
SidedProxy annotation = target.getAnnotation(SidedProxy.class);
if (!Strings.isNullOrEmpty(annotation.modId()) && !annotation.modId().equals(mod.getModId()))
{
FMLLog.fine("Skipping proxy injection for %s.%s since it is not for mod %s", targ.getClassName(), targ.getObjectName(), mod.getModId());
continue;
}
String targetType = side.isClient() ? annotation.clientSide() : annotation.serverSide();
if(targetType.equals(""))
{