From 4ebb6372f852588005c7ca487b10aaf64e919761 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Tue, 22 Aug 2017 23:01:15 +0100 Subject: [PATCH] Fix superclass lookups for shadow methods in obf-derived targets --- .../AnnotatedMixinElementHandlerShadow.java | 14 +++++++------- .../asm/launch/platform/MainAttributes.java | 8 +++++++- 2 files changed, 14 insertions(+), 8 deletions(-) diff --git a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerShadow.java b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerShadow.java index 954d6ea7..112b7037 100644 --- a/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerShadow.java +++ b/src/ap/java/org/spongepowered/tools/obfuscation/AnnotatedMixinElementHandlerShadow.java @@ -90,11 +90,11 @@ class AnnotatedMixinElementHandlerShadow extends AnnotatedMixinElementHandler { return this.getName().setObfuscatedName(name); } - public ObfuscationData getObfuscationData(IObfuscationDataProvider provider, String owner) { + public ObfuscationData getObfuscationData(IObfuscationDataProvider provider, TypeHandle owner) { return provider.getObfEntry(this.getMapping(owner, this.getName().toString(), this.getDesc())); } - public abstract M getMapping(String owner, String name, String desc); + public abstract M getMapping(TypeHandle owner, String name, String desc); public abstract void addMapping(ObfuscationType type, IMapping remapped); @@ -110,8 +110,8 @@ class AnnotatedMixinElementHandlerShadow extends AnnotatedMixinElementHandler { } @Override - public MappingField getMapping(String owner, String name, String desc) { - return new MappingField(owner, name, desc); + public MappingField getMapping(TypeHandle owner, String name, String desc) { + return new MappingField(owner.getName(), name, desc); } @Override @@ -131,8 +131,8 @@ class AnnotatedMixinElementHandlerShadow extends AnnotatedMixinElementHandler { } @Override - public MappingMethod getMapping(String owner, String name, String desc) { - return new MappingMethod(owner, name, desc); + public MappingMethod getMapping(TypeHandle owner, String name, String desc) { + return owner.getMappingMethod(name, desc); } @Override @@ -162,7 +162,7 @@ class AnnotatedMixinElementHandlerShadow extends AnnotatedMixinElementHandler { } private void registerShadowForTarget(AnnotatedElementShadow elem, TypeHandle target) { - ObfuscationData> obfData = elem.getObfuscationData(this.obf.getDataProvider(), target.getName()); + ObfuscationData> obfData = elem.getObfuscationData(this.obf.getDataProvider(), target); if (obfData.isEmpty()) { String info = this.mixin.isMultiTarget() ? " in target " + target : ""; diff --git a/src/main/java/org/spongepowered/asm/launch/platform/MainAttributes.java b/src/main/java/org/spongepowered/asm/launch/platform/MainAttributes.java index b1b86c66..6c1a40dd 100644 --- a/src/main/java/org/spongepowered/asm/launch/platform/MainAttributes.java +++ b/src/main/java/org/spongepowered/asm/launch/platform/MainAttributes.java @@ -78,7 +78,13 @@ final class MainAttributes { } catch (IOException ex) { // be quiet checkstyle } finally { - IOUtils.closeQuietly(jarFile); + try { + if (jarFile != null) { + jarFile.close(); + } + } catch (IOException e) { + // ignore + } } return new Attributes(); }