gradle: partially revert #1166 (#1250)

injected-client/build.gradle

@@ -24,8 +24,24 @@
  */
 description = 'Injected Client'
 
-task injector(){
-    // I kinda want to make the entire injector work here but seems like more work
-    dependsOn ':injector-plugin:compileJava'
+compileJava {
+    dependsOn ':injector-plugin:assemble'
+}
+
+compileJava.outputs.upToDateWhen { false }
+
+compileJava.doLast() {
+    copy {
+        File f = file("build/classes/java/main")
+        f.deleteDir()
+        f.mkdirs()
+        from ("${injectedClassesPath}")
+        into ("build/classes/java/main")
+    }
+}
+
+classes.doLast() {
+    File f = file("build/classes/java/main/Placeholder.class")
+    f.delete()
 }
 

injected-client/src/main/java/Placeholder.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (c) 2019 ThatGamerBlue
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ *
+ * 1. Redistributions of source code must retain the above copyright notice, this
+ *    list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright notice,
+ *    this list of conditions and the following disclaimer in the documentation
+ *    and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/**
+ * @author ThatGamerBlue
+ *
+ * This file exists to force gradle to execute the compileJava task
+ * so we can hijack it and run the injector-plugin
+ */
+public class Placeholder
+{
+}