mirror of
https://github.com/MinecraftForge/MinecraftForge.git
synced 2026-11-16 18:45:09 +00:00
Fix up loading mods that are grandchildren of BaseMod
This commit is contained in:
1 parent
c6f362b77f
commit
ee48a3673d
4 files changed
+25
-5
No files matched your search
@@ -20,11 +20,16 @@ public class ModContainerFactory
|
|||||||
public ModContainer build(ASMModParser modParser, File modSource, ModCandidate container)
|
public ModContainer build(ASMModParser modParser, File modSource, ModCandidate container)
|
||||||
{
|
{
|
||||||
String className = modParser.getASMType().getClassName();
|
String className = modParser.getASMType().getClassName();
|
||||||
if (modParser.isBaseMod() && modClass.matcher(className).find())
|
if (modParser.isBaseMod(container.getRememberedBaseMods()) && modClass.matcher(className).find())
|
||||||
{
|
{
|
||||||
FMLLog.fine("Identified a BaseMod type mod %s", className);
|
FMLLog.fine("Identified a BaseMod type mod %s", className);
|
||||||
return new ModLoaderModContainer(className, modSource, modParser.getBaseModProperties());
|
return new ModLoaderModContainer(className, modSource, modParser.getBaseModProperties());
|
||||||
}
|
}
|
||||||
|
else if (modParser.isBaseMod(container.getRememberedBaseMods()))
|
||||||
|
{
|
||||||
|
FMLLog.fine("Found a basemod %s of non-standard naming format", className);
|
||||||
|
container.rememberBaseModType(className);
|
||||||
|
}
|
||||||
|
|
||||||
// We warn if it's not a basemod instance -- compatibility requires it to be in net.minecraft.src *sigh*
|
// We warn if it's not a basemod instance -- compatibility requires it to be in net.minecraft.src *sigh*
|
||||||
if (className.startsWith("net.minecraft.src.") && container.isClasspath())
|
if (className.startsWith("net.minecraft.src.") && container.isClasspath())
|
||||||
|
|||||||
@@ -3,6 +3,8 @@ package cpw.mods.fml.common.discovery;
|
|||||||
import java.io.File;
|
import java.io.File;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
|
import com.google.common.collect.Lists;
|
||||||
|
|
||||||
import cpw.mods.fml.common.ModContainer;
|
import cpw.mods.fml.common.ModContainer;
|
||||||
|
|
||||||
|
|
||||||
@@ -12,6 +14,7 @@ public class ModCandidate
|
|||||||
private File modContainer;
|
private File modContainer;
|
||||||
private ContainerType sourceType;
|
private ContainerType sourceType;
|
||||||
private boolean classpath;
|
private boolean classpath;
|
||||||
|
private List<String> baseModTypes = Lists.newArrayList();
|
||||||
|
|
||||||
public ModCandidate(File classPathRoot, File modContainer, ContainerType sourceType)
|
public ModCandidate(File classPathRoot, File modContainer, ContainerType sourceType)
|
||||||
{
|
{
|
||||||
@@ -48,4 +51,12 @@ public class ModCandidate
|
|||||||
{
|
{
|
||||||
return classpath;
|
return classpath;
|
||||||
}
|
}
|
||||||
|
public void rememberBaseModType(String className)
|
||||||
|
{
|
||||||
|
baseModTypes.add(className);
|
||||||
|
}
|
||||||
|
public List<String> getRememberedBaseMods()
|
||||||
|
{
|
||||||
|
return baseModTypes;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -2,7 +2,9 @@ package cpw.mods.fml.common.discovery.asm;
|
|||||||
|
|
||||||
import java.io.IOException;
|
import java.io.IOException;
|
||||||
import java.io.InputStream;
|
import java.io.InputStream;
|
||||||
|
import java.util.Collections;
|
||||||
import java.util.LinkedList;
|
import java.util.LinkedList;
|
||||||
|
import java.util.List;
|
||||||
import java.util.logging.Level;
|
import java.util.logging.Level;
|
||||||
|
|
||||||
import net.minecraft.src.BaseMod;
|
import net.minecraft.src.BaseMod;
|
||||||
@@ -78,7 +80,7 @@ public class ASMModParser
|
|||||||
.add("classVersion", classVersion)
|
.add("classVersion", classVersion)
|
||||||
.add("superName", asmSuperType.getClassName())
|
.add("superName", asmSuperType.getClassName())
|
||||||
.add("annotations", annotations)
|
.add("annotations", annotations)
|
||||||
.add("isBaseMod", isBaseMod())
|
.add("isBaseMod", isBaseMod(Collections.<String>emptyList()))
|
||||||
.add("baseModProperties", baseModProperties)
|
.add("baseModProperties", baseModProperties)
|
||||||
.toString();
|
.toString();
|
||||||
}
|
}
|
||||||
@@ -112,9 +114,9 @@ public class ASMModParser
|
|||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isBaseMod()
|
public boolean isBaseMod(List<String> rememberedTypes)
|
||||||
{
|
{
|
||||||
return getASMSuperType().equals(Type.getType(BaseMod.class));
|
return getASMSuperType().equals(Type.getType(BaseMod.class)) || rememberedTypes.contains(getASMSuperType().getClassName());
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setBaseModProperties(String foundProperties)
|
public void setBaseModProperties(String foundProperties)
|
||||||
|
|||||||
@@ -1,5 +1,7 @@
|
|||||||
package cpw.mods.fml.common.discovery.asm;
|
package cpw.mods.fml.common.discovery.asm;
|
||||||
|
|
||||||
|
import java.util.Collections;
|
||||||
|
|
||||||
import org.objectweb.asm.AnnotationVisitor;
|
import org.objectweb.asm.AnnotationVisitor;
|
||||||
import org.objectweb.asm.ClassVisitor;
|
import org.objectweb.asm.ClassVisitor;
|
||||||
import org.objectweb.asm.FieldVisitor;
|
import org.objectweb.asm.FieldVisitor;
|
||||||
@@ -41,7 +43,7 @@ public class ModClassVisitor extends ClassVisitor
|
|||||||
@Override
|
@Override
|
||||||
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions)
|
public MethodVisitor visitMethod(int access, String name, String desc, String signature, String[] exceptions)
|
||||||
{
|
{
|
||||||
if (discoverer.isBaseMod() && name.equals("getPriorities") && desc.equals(Type.getMethodDescriptor(Type.getType(String.class))))
|
if (discoverer.isBaseMod(Collections.<String>emptyList()) && name.equals("getPriorities") && desc.equals(Type.getMethodDescriptor(Type.getType(String.class))))
|
||||||
{
|
{
|
||||||
return new ModMethodVisitor(name, discoverer);
|
return new ModMethodVisitor(name, discoverer);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in new issue
Block a user