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

Fix child annotations not inheriting member name, cleanup

Browse source
This commit is contained in:
tterrag 2020-04-11 01:54:35 -04:00
parent bdd0af5280
commit a3b1007633
2 changed files with 14 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/ModAnnotation.java
View file

@ -57,10 +57,10 @@ public class ModAnnotation
return value;
}
}
ElementType type;
Type asmType;
String member;
Map<String,Object> values = Maps.newHashMap();
private final ElementType type;
private final Type asmType;
private final String member;
private final Map<String,Object> values = Maps.newHashMap();
private ArrayList<Object> arrayList;
private String arrayName;
@ -71,10 +71,17 @@ public class ModAnnotation
this.member = member;
}
@Deprecated // TODO 1.16 remove this
public ModAnnotation(ElementType type, Type asmType, ModAnnotation parent)
{
this.type = type;
this(asmType, parent);
}
public ModAnnotation(Type asmType, ModAnnotation parent)
{
this.type = parent.type;
this.asmType = asmType;
this.member = parent.member;
}
@Override
public String toString()
@ -132,7 +139,7 @@ public class ModAnnotation
}
public ModAnnotation addChildAnnotation(String name, String desc)
{
ModAnnotation child = new ModAnnotation(type, Type.getType(desc), this);
ModAnnotation child = new ModAnnotation(Type.getType(desc), this);
addProperty(name, child.getValues());
return child;
}

2
src/fmllauncher/java/net/minecraftforge/fml/loading/moddiscovery/ModClassVisitor.java
View file

@ -78,7 +78,7 @@ public class ModClassVisitor extends ClassVisitor
public void buildData(final Set<ModFileScanData.ClassData> classes, final Set<ModFileScanData.AnnotationData> annotations) {
classes.add(new ModFileScanData.ClassData(this.asmType, this.asmSuperType, this.interfaces));
final List<ModFileScanData.AnnotationData> collect = this.annotations.stream().
filter(ma->ModFileScanData.interestingAnnotations().test(ma.asmType)).
filter(ma->ModFileScanData.interestingAnnotations().test(ma.getASMType())).
map(a -> ModAnnotation.fromModAnnotation(this.asmType, a)).collect(Collectors.toList());
annotations.addAll(collect);
}