From aa4c443358f5c7cf17082497c9b2f4d5d73301cb Mon Sep 17 00:00:00 2001 From: Jesse Boyd Date: Mon, 26 Aug 2019 06:03:58 +0100 Subject: [PATCH] Revert "Revert 'revert ivy change'" --- buildSrc/src/main/kotlin/CommonConfig.kt | 2 +- .../src/main/java/com/boydti/fawe/command/CFICommand.java | 2 +- .../java/com/boydti/fawe/command/CommandProcessor.java | 8 ++++---- .../worldedit/command/util/DelegateCommandManager.java | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/buildSrc/src/main/kotlin/CommonConfig.kt b/buildSrc/src/main/kotlin/CommonConfig.kt index 8f2048586..718b33213 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]/[module]/artifact/[revision].[ext]") + artifact("/[organisation]/[revision]/artifact/[module].[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 390f48ed3..1999fdaf3 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 { } @Override - public int process(InjectedValueAccess context, List args, int result) { + public Object process(InjectedValueAccess context, List args, Object 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 973f75433..daf63f372 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 implements CommandManager { } @Override - public final int execute(InjectedValueAccess context, List args) { + public final Object execute(InjectedValueAccess context, List args) { args = preprocess(context, args); if (args != null) { - int result = parent.execute(context, args); + Object result = parent.execute(context, args); return process(context, args, result); // TODO NOT IMPLEMENTED (recompile piston) } else { - return 0; + return null; } } @@ -89,5 +89,5 @@ public abstract class CommandProcessor implements CommandManager { public abstract List preprocess(InjectedValueAccess context, List args); - public abstract int process(InjectedValueAccess context, List args, int result); + public abstract Object process(InjectedValueAccess context, List args, Object 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 8b284e8d9..6985eba1d 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 int execute(InjectedValueAccess context, List args) { + public Object execute(InjectedValueAccess context, List args) { return parent.execute(context, args); }