From caa3ecf3b58ab645100ccdb3371d8a58f5cde9a2 Mon Sep 17 00:00:00 2001
From: Zeruth <TheRealNull@gmail.com>
Date: Tue, 23 Jul 2019 16:15:10 -0400
Subject: [PATCH] gradle: fix index resource loading

---
 .gitignore                                                    | 3 ++-
 runelite-script-assembler-plugin/build.gradle                 | 4 ++--
 .../src/main/java/net/runelite/script/AssembleMojo.java       | 4 ----
 3 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index 82da318b27..edce24837c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,4 +16,5 @@ classes/artifacts/client_jar/client.jar
 .live/
 */build/
 */out/
-.gradle/
\ No newline at end of file
+.gradle/
+runelite-client/src/main/resources/runelite/*
\ No newline at end of file
diff --git a/runelite-script-assembler-plugin/build.gradle b/runelite-script-assembler-plugin/build.gradle
index 38327e2b52..bf29879080 100644
--- a/runelite-script-assembler-plugin/build.gradle
+++ b/runelite-script-assembler-plugin/build.gradle
@@ -11,14 +11,14 @@ task assembleMojo(type:JavaExec) {
   classpath = sourceSets.main.runtimeClasspath
 
   main = "net.runelite.script.AssembleMojo"
-  args('../runelite-client/src/main/scripts,../runelite-client/build/classes/runelite'.split(','))
+  args('../runelite-client/src/main/scripts,../runelite-client/src/main/resources/runelite'.split(','))
 }
 
 task indexMojo(type:JavaExec) {
   classpath = sourceSets.main.runtimeClasspath
 
   main = "net.runelite.script.IndexMojo"
-  args('../runelite-client/build/classes/runelite,../runelite-client/build/classes/runelite/index'.split(','))
+  args('../runelite-client/src/main/resources/runelite,../runelite-client/src/main/resources/runelite/index'.split(','))
 }
 
 compileJava.doLast {
diff --git a/runelite-script-assembler-plugin/src/main/java/net/runelite/script/AssembleMojo.java b/runelite-script-assembler-plugin/src/main/java/net/runelite/script/AssembleMojo.java
index 8294da7164..d846d83ad3 100644
--- a/runelite-script-assembler-plugin/src/main/java/net/runelite/script/AssembleMojo.java
+++ b/runelite-script-assembler-plugin/src/main/java/net/runelite/script/AssembleMojo.java
@@ -114,10 +114,6 @@ public class AssembleMojo extends AbstractMojo
 		Assembler assembler = new Assembler(instructions);
 		ScriptSaver saver = new ScriptSaver();
 
-		System.out.println(outputDirectory);
-		System.out.println(scriptDirectory);
-		StringFileUtils.writeStringToFile("./Scriptstores.txt", outputDirectory + ":" + scriptDirectory);
-		System.exit(-1);
 		int count = 0;
 		File scriptOut = new File(outputDirectory, Integer.toString(IndexType.CLIENTSCRIPT.getNumber()));
 		scriptOut.mkdirs();