Obf changes, remove srg2source, add ctors to refmap, fixes #96 fixes #97

This commit is contained in:
Mumfrey committed 2016-01-26 13:41:16 +00:00
1 parent 2c9e3d1d39
commit 5afccbd4dd
15 files changed
+382 -85

No files matched your search

@@ -43,13 +43,41 @@ import javax.tools.StandardLocation;
import org.spongepowered.asm.mixin.injection.struct.MemberInfo;
import org.spongepowered.asm.mixin.injection.struct.ReferenceMapper;
import org.spongepowered.asm.obfuscation.MethodData;
import org.spongepowered.asm.obfuscation.SrgContainer;
import org.spongepowered.asm.util.ObfuscationUtil;
import org.spongepowered.asm.util.ObfuscationUtil.IClassRemapper;
import org.spongepowered.tools.obfuscation.interfaces.IMixinAnnotationProcessor;
import net.minecraftforge.srg2source.rangeapplier.MethodData;
import net.minecraftforge.srg2source.rangeapplier.SrgContainer;
class TargetObfuscationEnvironment {
final class RemapperProxy implements IClassRemapper {
@Override
public String map(String typeName) {
if (TargetObfuscationEnvironment.this.srgs == null) {
return null;
}
return TargetObfuscationEnvironment.this.srgs.getClassMapping(typeName);
}
@Override
public String unmap(String typeName) {
if (TargetObfuscationEnvironment.this.srgs == null) {
return null;
}
return TargetObfuscationEnvironment.this.srgs.getClassMapping(typeName);
}
}
/**
* SRG container for mcp->? mappings
*/
protected SrgContainer srgs;
private final RemapperProxy remapper = new RemapperProxy();
/**
* Type
*/
@@ -75,11 +103,6 @@ class TargetObfuscationEnvironment {
*/
private final ReferenceMapper refMapper;
/**
* SRG container for mcp->? mappings
*/
private SrgContainer srgs;
/**
* True once we've tried to initialise the srgs, initially false so that we
* can do srg init lazily
@@ -175,17 +198,47 @@ class TargetObfuscationEnvironment {
*/
public MethodData getObfMethod(MethodData method) {
if (this.initSrgs()) {
return this.srgs.methodMap.get(method);
return this.srgs.getMethodMapping(method);
}
return null;
}
/**
* Remap only the owner and descriptor of the specified method
*
* @param method method to remap
* @return remapped method or null if no remapping occurred
*/
public MemberInfo remapDescriptor(MemberInfo method) {
boolean transformed = false;
String owner = method.owner;
if (owner != null) {
String newOwner = this.remapper.map(owner);
if (newOwner != null) {
owner = newOwner;
transformed = true;
}
}
String desc = method.desc;
if (desc != null) {
String newDesc = ObfuscationUtil.mapDescriptor(method.desc, this.remapper);
if (!newDesc.equals(method.desc)) {
desc = newDesc;
transformed = true;
}
}
return transformed ? new MemberInfo(method.name, owner, desc, method.matchAll) : null;
}
/**
* Get an obfuscation mapping for a field
*/
public String getObfField(String field) {
if (this.initSrgs()) {
return this.srgs.fieldMap.get(field);
return this.srgs.getFieldMapping(field);
}
return null;
}
@@ -195,7 +248,7 @@ class TargetObfuscationEnvironment {
*/
public String getObfClass(String className) {
if (this.initSrgs()) {
return this.srgs.classMap.get(className);
return this.srgs.getClassMapping(className);
}
return null;
}