From b00992e411d52415b983747a976e3bacec856f12 Mon Sep 17 00:00:00 2001 From: Mumfrey Date: Fri, 11 Oct 2019 17:57:08 +0100 Subject: [PATCH] Minor tweaks and fixes --- build.gradle | 9 --------- .../asm/mixin/transformer/debug/RuntimeDecompiler.java | 2 +- .../ext/extensions/ExtensionClassExporter.java | 2 +- .../org/spongepowered/asm/launch/MixinLaunchPlugin.java | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-) diff --git a/build.gradle b/build.gradle index 2bd799e3..bb71522f 100644 --- a/build.gradle +++ b/build.gradle @@ -117,8 +117,6 @@ dependencies { thinJar "org.ow2.asm:asm-tree:$asmVersion" thinJar "org.ow2.asm:asm-util:$asmVersion" - stagingJar "org.ow2.asm:asm-util:$asmVersion" - // Tests // testCompile 'junit:junit:4.11' // testCompile 'org.hamcrest:hamcrest-library:1.3' @@ -146,7 +144,6 @@ dependencies { modlauncherCompile configurations.compile modlauncherCompile 'net.sf.jopt-simple:jopt-simple:5.0.4' - modlauncherCompile 'cpw.mods:grossjava9hacks:1.1.0' modlauncherCompile ('cpw.mods:modlauncher:4.0.0') { exclude module: 'log4j-core' } @@ -288,12 +285,6 @@ shadowJar { from sourceSets.ap.output exclude 'META-INF/*.DSA' exclude 'META-INF/*.RSA' - dependencies { - include(dependency('com.google.guava:guava')) - include(dependency('com.google.code.gson:gson')) - include(dependency('org.apache.logging.log4j:log4j-core')) - include(dependency('org.apache.logging.log4j:log4j-api')) - } classifier = 'processor' } build.dependsOn(shadowJar) diff --git a/src/fernflower/java/org/spongepowered/asm/mixin/transformer/debug/RuntimeDecompiler.java b/src/fernflower/java/org/spongepowered/asm/mixin/transformer/debug/RuntimeDecompiler.java index 9480a533..931e3ad8 100644 --- a/src/fernflower/java/org/spongepowered/asm/mixin/transformer/debug/RuntimeDecompiler.java +++ b/src/fernflower/java/org/spongepowered/asm/mixin/transformer/debug/RuntimeDecompiler.java @@ -66,7 +66,7 @@ public class RuntimeDecompiler extends IFernflowerLogger implements IDecompiler, try { MoreFiles.deleteRecursively(this.outputPath.toPath(), RecursiveDeleteOption.ALLOW_INSECURE); } catch (IOException ex) { - this.logger.warn("Error cleaning output directory: {}", ex.getMessage()); + this.logger.debug("Error cleaning output directory: {}", ex.getMessage()); } } } diff --git a/src/main/java/org/spongepowered/asm/mixin/transformer/ext/extensions/ExtensionClassExporter.java b/src/main/java/org/spongepowered/asm/mixin/transformer/ext/extensions/ExtensionClassExporter.java index 427556f7..038a8586 100644 --- a/src/main/java/org/spongepowered/asm/mixin/transformer/ext/extensions/ExtensionClassExporter.java +++ b/src/main/java/org/spongepowered/asm/mixin/transformer/ext/extensions/ExtensionClassExporter.java @@ -77,7 +77,7 @@ public class ExtensionClassExporter implements IExtension { try { MoreFiles.deleteRecursively(this.classExportDir.toPath(), RecursiveDeleteOption.ALLOW_INSECURE); } catch (IOException ex) { - ExtensionClassExporter.logger.warn("Error cleaning class output directory: {}", ex.getMessage()); + ExtensionClassExporter.logger.debug("Error cleaning class output directory: {}", ex.getMessage()); } } diff --git a/src/modlauncher/java/org/spongepowered/asm/launch/MixinLaunchPlugin.java b/src/modlauncher/java/org/spongepowered/asm/launch/MixinLaunchPlugin.java index 5da42cb2..b896a039 100644 --- a/src/modlauncher/java/org/spongepowered/asm/launch/MixinLaunchPlugin.java +++ b/src/modlauncher/java/org/spongepowered/asm/launch/MixinLaunchPlugin.java @@ -194,7 +194,7 @@ public class MixinLaunchPlugin implements ILaunchPluginService, IClassBytecodePr try { classBytes = this.transformerLoader.buildTransformedClassNodeFor(name); } catch (ClassNotFoundException ex) { - URL url = Thread.currentThread().getContextClassLoader().getResource(name + ".class"); + URL url = Thread.currentThread().getContextClassLoader().getResource(name.replace('.', '/') + ".class"); if (url == null) { throw ex; }