Support, and fix up, interface lists for Optional
This commit is contained in:
parent
1754a5820a
commit
daf454af62
|
@ -17,6 +17,21 @@ public final class Optional {
|
||||||
* Not constructable
|
* Not constructable
|
||||||
*/
|
*/
|
||||||
private Optional() {}
|
private Optional() {}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mark a list of interfaces as removable
|
||||||
|
* @author cpw
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
@Retention(RetentionPolicy.RUNTIME)
|
||||||
|
@Target(ElementType.TYPE)
|
||||||
|
public @interface InterfaceList {
|
||||||
|
/**
|
||||||
|
* Mark a list of interfaces for optional removal.
|
||||||
|
* @return
|
||||||
|
*/
|
||||||
|
public Interface[] value();
|
||||||
|
}
|
||||||
/**
|
/**
|
||||||
* Used to remove optional interfaces
|
* Used to remove optional interfaces
|
||||||
* @author cpw
|
* @author cpw
|
||||||
|
|
|
@ -1,6 +1,8 @@
|
||||||
package cpw.mods.fml.common.asm.transformers;
|
package cpw.mods.fml.common.asm.transformers;
|
||||||
|
|
||||||
|
import java.lang.annotation.Annotation;
|
||||||
import java.util.Iterator;
|
import java.util.Iterator;
|
||||||
|
import java.util.List;
|
||||||
import java.util.ListIterator;
|
import java.util.ListIterator;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
@ -14,6 +16,7 @@ import org.objectweb.asm.tree.MethodNode;
|
||||||
|
|
||||||
import com.google.common.collect.ArrayListMultimap;
|
import com.google.common.collect.ArrayListMultimap;
|
||||||
import com.google.common.collect.ListMultimap;
|
import com.google.common.collect.ListMultimap;
|
||||||
|
import com.google.common.collect.Sets;
|
||||||
|
|
||||||
import cpw.mods.fml.common.FMLLog;
|
import cpw.mods.fml.common.FMLLog;
|
||||||
import cpw.mods.fml.common.Loader;
|
import cpw.mods.fml.common.Loader;
|
||||||
|
@ -52,7 +55,7 @@ public class ModAPITransformer implements IClassTransformer {
|
||||||
}
|
}
|
||||||
if (logDebugInfo) FMLRelaunchLog.finest("Optional on %s triggered - mod missing %s", name, modId);
|
if (logDebugInfo) FMLRelaunchLog.finest("Optional on %s triggered - mod missing %s", name, modId);
|
||||||
|
|
||||||
if ("cpw.mods.fml.common.Optional$Interface".equals(optional.getAnnotationName()))
|
if (optional.getAnnotationInfo().containsKey("iface"))
|
||||||
{
|
{
|
||||||
stripInterface(classNode,(String)optional.getAnnotationInfo().get("iface"));
|
stripInterface(classNode,(String)optional.getAnnotationInfo().get("iface"));
|
||||||
}
|
}
|
||||||
|
@ -95,12 +98,29 @@ public class ModAPITransformer implements IClassTransformer {
|
||||||
public void initTable(ASMDataTable dataTable)
|
public void initTable(ASMDataTable dataTable)
|
||||||
{
|
{
|
||||||
optionals = ArrayListMultimap.create();
|
optionals = ArrayListMultimap.create();
|
||||||
|
Set<ASMData> interfaceLists = dataTable.getAll("cpw.mods.fml.common.Optional$InterfaceList");
|
||||||
|
addData(unpackInterfaces(interfaceLists));
|
||||||
Set<ASMData> interfaces = dataTable.getAll("cpw.mods.fml.common.Optional$Interface");
|
Set<ASMData> interfaces = dataTable.getAll("cpw.mods.fml.common.Optional$Interface");
|
||||||
addData(interfaces);
|
addData(interfaces);
|
||||||
Set<ASMData> methods = dataTable.getAll("cpw.mods.fml.common.Optional$Method");
|
Set<ASMData> methods = dataTable.getAll("cpw.mods.fml.common.Optional$Method");
|
||||||
addData(methods);
|
addData(methods);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private Set<ASMData> unpackInterfaces(Set<ASMData> packedInterfaces)
|
||||||
|
{
|
||||||
|
Set<ASMData> result = Sets.newHashSet();
|
||||||
|
for (ASMData data : packedInterfaces)
|
||||||
|
{
|
||||||
|
List<Map<String,Object>> packedList = (List<Map<String,Object>>) data.getAnnotationInfo().get("value");
|
||||||
|
for (Map<String,Object> packed : packedList)
|
||||||
|
{
|
||||||
|
ASMData newData = data.copy(packed);
|
||||||
|
result.add(newData);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return result;
|
||||||
|
}
|
||||||
private void addData(Set<ASMData> interfaces)
|
private void addData(Set<ASMData> interfaces)
|
||||||
{
|
{
|
||||||
for (ASMData data : interfaces)
|
for (ASMData data : interfaces)
|
||||||
|
|
|
@ -29,7 +29,7 @@ import cpw.mods.fml.common.ModContainer;
|
||||||
|
|
||||||
public class ASMDataTable
|
public class ASMDataTable
|
||||||
{
|
{
|
||||||
public static class ASMData
|
public final static class ASMData implements Cloneable
|
||||||
{
|
{
|
||||||
private ModCandidate candidate;
|
private ModCandidate candidate;
|
||||||
private String annotationName;
|
private String annotationName;
|
||||||
|
@ -64,6 +64,20 @@ public class ASMDataTable
|
||||||
{
|
{
|
||||||
return annotationInfo;
|
return annotationInfo;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public ASMData copy(Map<String,Object> newAnnotationInfo)
|
||||||
|
{
|
||||||
|
try
|
||||||
|
{
|
||||||
|
ASMData clone = (ASMData) this.clone();
|
||||||
|
clone.annotationInfo = newAnnotationInfo;
|
||||||
|
return clone;
|
||||||
|
}
|
||||||
|
catch (CloneNotSupportedException e)
|
||||||
|
{
|
||||||
|
throw new RuntimeException("Unpossible", e);
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private static class ModContainerPredicate implements Predicate<ASMData>
|
private static class ModContainerPredicate implements Predicate<ASMData>
|
||||||
|
|
|
@ -114,6 +114,11 @@ public class ModAnnotation
|
||||||
}
|
}
|
||||||
public ModAnnotation addChildAnnotation(String name, String desc)
|
public ModAnnotation addChildAnnotation(String name, String desc)
|
||||||
{
|
{
|
||||||
return new ModAnnotation(AnnotationType.SUBTYPE, Type.getType(desc), this);
|
ModAnnotation child = new ModAnnotation(AnnotationType.SUBTYPE, Type.getType(desc), this);
|
||||||
|
if (arrayList != null)
|
||||||
|
{
|
||||||
|
arrayList.add(child.getValues());
|
||||||
|
}
|
||||||
|
return child;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue