From d2fda57f2c69dd576c61d82c909b48b20a19463b Mon Sep 17 00:00:00 2001 From: Anuken Date: Mon, 21 Oct 2019 19:32:46 -0400 Subject: [PATCH] Revert merge --- .../java/io/anuke/annotations/AssetsAnnotationProcessor.java | 5 ++++- build.gradle | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java b/annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java index 58b15c0b84..3c28c83cea 100644 --- a/annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java +++ b/annotations/src/main/java/io/anuke/annotations/AssetsAnnotationProcessor.java @@ -34,7 +34,10 @@ public class AssetsAnnotationProcessor extends AbstractProcessor{ if(round++ != 0) return false; //only process 1 round try{ - path = System.getProperty("corePath"); + path = Paths.get(Utils.filer.createResource(StandardLocation.CLASS_OUTPUT, "no", "no") + .toUri().toURL().toString().substring(System.getProperty("os.name").contains("Windows") ? 6 : "file:".length())) + .getParent().getParent().getParent().getParent().getParent().getParent().toString(); + path = path.replace("%20", " "); processSounds("Sounds", path + "/assets/sounds", "io.anuke.arc.audio.Sound"); processSounds("Musics", path + "/assets/music", "io.anuke.arc.audio.Music"); diff --git a/build.gradle b/build.gradle index a1fc7f6031..2455ca1b60 100644 --- a/build.gradle +++ b/build.gradle @@ -201,8 +201,6 @@ project(":core"){ } dependencies{ - System.properties["corePath"] = file(".").toString() - if(System.properties["user.name"] == "anuke"){ task cleanGen{ doFirst{