From 6998c2d230b326cdafc6e0c7eea89dc4d2c931f0 Mon Sep 17 00:00:00 2001
From: MattBDev <4009945+MattBDev@users.noreply.github.com>
Date: Tue, 20 Aug 2019 16:03:50 -0400
Subject: [PATCH] fix compile

---
 buildSrc/src/main/kotlin/CommonConfig.kt               |  2 +-
 .../main/java/com/boydti/fawe/command/CFICommand.java  |  2 +-
 .../java/com/boydti/fawe/command/CommandProcessor.java | 10 +++++-----
 .../worldedit/command/util/DelegateCommandManager.java |  2 +-
 worldedit-libs/core/ap/build.gradle.kts                |  2 ++
 worldedit-libs/core/build.gradle.kts                   |  5 +++++
 6 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/buildSrc/src/main/kotlin/CommonConfig.kt b/buildSrc/src/main/kotlin/CommonConfig.kt
index ddbaa1dfe..4fe17b56b 100644
--- a/buildSrc/src/main/kotlin/CommonConfig.kt
+++ b/buildSrc/src/main/kotlin/CommonConfig.kt
@@ -16,7 +16,7 @@ fun Project.applyCommonConfiguration() {
         //maven { url = uri("https://ci.athion.net/job/FAWE-Piston/ws/") }
         ivy { url = uri("https://ci.athion.net/job")
             patternLayout {
-                artifact("/[organisation]/ws/[module].[ext]")
+                artifact("/[organisation]/[module]/artifact/[revision].[ext]")
             }}
     }
     configurations.all {
diff --git a/worldedit-core/src/main/java/com/boydti/fawe/command/CFICommand.java b/worldedit-core/src/main/java/com/boydti/fawe/command/CFICommand.java
index 1999fdaf3..390f48ed3 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/command/CFICommand.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/command/CFICommand.java
@@ -42,7 +42,7 @@ public class CFICommand extends CommandProcessor<Object, Object> {
     }
 
     @Override
-    public Object process(InjectedValueAccess context, List<String> args, Object result) {
+    public int process(InjectedValueAccess context, List<String> args, int result) {
         return result;
     }
 
diff --git a/worldedit-core/src/main/java/com/boydti/fawe/command/CommandProcessor.java b/worldedit-core/src/main/java/com/boydti/fawe/command/CommandProcessor.java
index 348eff575..973f75433 100644
--- a/worldedit-core/src/main/java/com/boydti/fawe/command/CommandProcessor.java
+++ b/worldedit-core/src/main/java/com/boydti/fawe/command/CommandProcessor.java
@@ -67,13 +67,13 @@ public abstract class CommandProcessor<I, O> implements CommandManager {
     }
 
     @Override
-    public final O /* Need to recompile with FAWE-piston */ execute(InjectedValueAccess context, List<String> args) {
+    public final int execute(InjectedValueAccess context, List<String> args) {
         args = preprocess(context, args);
         if (args != null) {
-            I result = (I) parent.execute(context, args);
+            int result = parent.execute(context, args);
             return process(context, args, result); // TODO NOT IMPLEMENTED (recompile piston)
         } else {
-            return null;
+            return 0;
         }
     }
 
@@ -89,5 +89,5 @@ public abstract class CommandProcessor<I, O> implements CommandManager {
 
     public abstract List<String> preprocess(InjectedValueAccess context, List<String> args);
 
-    public abstract O process(InjectedValueAccess context, List<String> args, I result);
-}
\ No newline at end of file
+    public abstract int process(InjectedValueAccess context, List<String> args, int result);
+}
diff --git a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/DelegateCommandManager.java b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/DelegateCommandManager.java
index 6985eba1d..8b284e8d9 100644
--- a/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/DelegateCommandManager.java
+++ b/worldedit-core/src/main/java/com/sk89q/worldedit/command/util/DelegateCommandManager.java
@@ -61,7 +61,7 @@ public class DelegateCommandManager implements CommandManager {
     }
 
     @Override
-    public Object execute(InjectedValueAccess context, List<String> args) {
+    public int execute(InjectedValueAccess context, List<String> args) {
         return parent.execute(context, args);
     }
 
diff --git a/worldedit-libs/core/ap/build.gradle.kts b/worldedit-libs/core/ap/build.gradle.kts
index 355efe01c..1c3c3e8d8 100644
--- a/worldedit-libs/core/ap/build.gradle.kts
+++ b/worldedit-libs/core/ap/build.gradle.kts
@@ -1,9 +1,11 @@
 applyLibrariesConfiguration()
 
 dependencies {
+/*
     "shade"("FAWE-Piston:core/build/libs/core-${Versions.PISTON}:lastSuccessfulBuild@jar")
     "shade"("FAWE-Piston:core-ap/runtime/build/libs/runtime-${Versions.PISTON}:lastSuccessfulBuild@jar")
     "shade"("FAWE-Piston:default-impl/build/libs/default-impl-${Versions.PISTON}:lastSuccessfulBuild@jar")
+*/
     "shade"("org.enginehub.piston.core-ap:annotations:${Versions.PISTON}")
     "shade"("org.enginehub.piston.core-ap:processor:${Versions.PISTON}")
 }
diff --git a/worldedit-libs/core/build.gradle.kts b/worldedit-libs/core/build.gradle.kts
index 37b7215a5..f413cdb48 100644
--- a/worldedit-libs/core/build.gradle.kts
+++ b/worldedit-libs/core/build.gradle.kts
@@ -10,7 +10,12 @@ dependencies {
     }
     "shade"("com.thoughtworks.paranamer:paranamer:2.6")
     "shade"("com.sk89q.lib:jlibnoise:1.0.0")
+    "shade"("org.enginehub.piston:core:${Versions.PISTON}")
+    "shade"("org.enginehub.piston.core-ap:runtime:${Versions.PISTON}")
+    "shade"("org.enginehub.piston:default-impl:${Versions.PISTON}")
+/*
     "shade"("FAWE-Piston:core/build/libs/core-${Versions.PISTON}:lastSuccessfulBuild@jar")
     "shade"("FAWE-Piston:core-ap/runtime/build/libs/runtime-${Versions.PISTON}:lastSuccessfulBuild@jar")
     "shade"("FAWE-Piston:default-impl/build/libs/default-impl-${Versions.PISTON}:lastSuccessfulBuild@jar")
+*/
 }