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

Revert commits related to filtering proxy and Automatic Subscriber annotations.

Browse source 
Broke some existing setups, will require a annotation definition change in 1.11.
This commit is contained in:
LexManos 2016-10-09 12:36:21 -07:00
parent d159f5f4e2
commit 7a63e67e9d
2 changed files with 5 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/main/java/net/minecraftforge/fml/common/AutomaticEventSubscriber.java
View file

@ -51,24 +51,6 @@ public class AutomaticEventSubscriber
{ {
try try
{ {
//Filter out handlers for things that arnt this mod.
//Perhaps find a way to make this more generic for multiple mods
//from the same source....
boolean register = true;
for (ASMData a : data.getAll(Mod.class.getName()))
{
if (a.getClassName().equals(targ.getClassName()))
{
if (!mod.getModId().equals(a.getAnnotationInfo().get("modid")))
{
register = false;
break;
}
}
}
if (!register)
continue;
//noinspection unchecked //noinspection unchecked
List<ModAnnotation.EnumHolder> sidesEnum = (List<ModAnnotation.EnumHolder>)targ.getAnnotationInfo().get("value"); List<ModAnnotation.EnumHolder> sidesEnum = (List<ModAnnotation.EnumHolder>)targ.getAnnotationInfo().get("value");
EnumSet<Side> sides = DEFAULT; EnumSet<Side> sides = DEFAULT;

61
src/main/java/net/minecraftforge/fml/common/ProxyInjector.java
View file

@ -47,30 +47,6 @@ public class ProxyInjector
{ {
try 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 (isProxyFromMod(a.getClassName(), targ.getClassName()))
{
modid = (String)a.getAnnotationInfo().get("modid");
break;
}
}
}
if (modid == null)
{
FMLLog.warning("Unable to determine the associated mod for proxy injection for %s.%s, assuming it's from %s", targ.getClassName(), targ.getObjectName(), mod.getModId());
}
else if (!modid.equals(mod.getModId()))
{
FMLLog.fine("Skipping proxy injection for %s.%s since it is not for mod %s, it should belong to %s", targ.getClassName(), targ.getObjectName(), mod.getModId(), modid);
continue;
}
Class<?> proxyTarget = Class.forName(targ.getClassName(), true, mcl); Class<?> proxyTarget = Class.forName(targ.getClassName(), true, mcl);
Field target = proxyTarget.getDeclaredField(targ.getObjectName()); Field target = proxyTarget.getDeclaredField(targ.getObjectName());
if (target == null) if (target == null)
@ -82,6 +58,11 @@ public class ProxyInjector
target.setAccessible(true); target.setAccessible(true);
SidedProxy annotation = target.getAnnotation(SidedProxy.class); 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(); String targetType = side.isClient() ? annotation.clientSide() : annotation.serverSide();
if(targetType.equals("")) if(targetType.equals(""))
{ {
@ -111,36 +92,4 @@ public class ProxyInjector
// Allow language specific proxy injection. // Allow language specific proxy injection.
languageAdapter.setInternalProxies(mod, side, mcl); languageAdapter.setInternalProxies(mod, side, mcl);
} }
/**
* Checks if a proxy is part of a mod.
*
* Checks that the proxy is somewhere in the same package that holds the mod.
* For example, the @Mod is 'com.modname.Mod', the Proxy is 'com.modname.proxies.ProxyClient'
* The package of the mod is 'com.modname', and Proxy is in that package, so it is from the mod.
*
* Compares each path section in a for loop instead of simply using {@link String#startsWith(String)}
* because a mod like 'com.modname.Mod' with package 'com.modname'
* does not own a proxy from 'com.modnametools.proxies.ProxyClient' even though they start the same.
*/
private static boolean isProxyFromMod(String modClassName, String proxyClassName)
{
if (modClassName.equals(proxyClassName))
return true;
String[] modPath = modClassName.split("\\.");
String[] proxyPath = proxyClassName.split("\\.");
if (proxyPath.length < modPath.length)
return false;
for (int i = 0; i < modPath.length - 1; i++)
{
if (!modPath[i].equals(proxyPath[i]))
{
return false;
}
}
return true;
}
} }