From f3a2be4a06b6b6ba344c35cc9d31f584695ced80 Mon Sep 17 00:00:00 2001 From: cyberpwn Date: Sat, 28 Aug 2021 12:34:50 -0400 Subject: [PATCH] Revert "Fixes " This reverts commit 8e53be68109a6d17db0020dbaf7651901063e8cf. --- src/main/java/com/volmit/iris/Iris.java | 6 ++++++ src/main/java/com/volmit/iris/core/decrees/DecIris.java | 2 +- src/main/java/com/volmit/iris/core/decrees/DecObject.java | 2 +- src/main/java/com/volmit/iris/core/service/CommandSVC.java | 2 +- src/main/resources/plugin.yml | 2 ++ 5 files changed, 11 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/volmit/iris/Iris.java b/src/main/java/com/volmit/iris/Iris.java index 723a35169..54280530b 100644 --- a/src/main/java/com/volmit/iris/Iris.java +++ b/src/main/java/com/volmit/iris/Iris.java @@ -93,6 +93,12 @@ public class Iris extends VolmitPlugin implements Listener { @Permission public static PermissionIris perm; + @com.volmit.iris.util.plugin.Command + public CommandIris commandIris; + + @com.volmit.iris.util.plugin.Command + public CommandIrisStudio commandStudio; + public static VolmitSender getSender() { return sender; } diff --git a/src/main/java/com/volmit/iris/core/decrees/DecIris.java b/src/main/java/com/volmit/iris/core/decrees/DecIris.java index f9d5acd87..fc696e274 100644 --- a/src/main/java/com/volmit/iris/core/decrees/DecIris.java +++ b/src/main/java/com/volmit/iris/core/decrees/DecIris.java @@ -35,7 +35,7 @@ import com.volmit.iris.util.format.C; import java.io.File; import java.util.Objects; -@Decree(name = "iris", aliases = {"ir", "irs"}, description = "Basic Command") +@Decree(name = "irisd", aliases = {"ird"}, description = "Basic Command") public class DecIris implements DecreeExecutor { private DecStudio studio; diff --git a/src/main/java/com/volmit/iris/core/decrees/DecObject.java b/src/main/java/com/volmit/iris/core/decrees/DecObject.java index 07c804cba..3da95e599 100644 --- a/src/main/java/com/volmit/iris/core/decrees/DecObject.java +++ b/src/main/java/com/volmit/iris/core/decrees/DecObject.java @@ -245,7 +245,7 @@ public class DecObject implements DecreeExecutor { } } } else { - sender().sendMessage("Placed " + object); + sender().sendMessage("Placed " + "objects/" + o.getLoadKey() + ".iob "); } } diff --git a/src/main/java/com/volmit/iris/core/service/CommandSVC.java b/src/main/java/com/volmit/iris/core/service/CommandSVC.java index a61dce0da..2bc017fb1 100644 --- a/src/main/java/com/volmit/iris/core/service/CommandSVC.java +++ b/src/main/java/com/volmit/iris/core/service/CommandSVC.java @@ -29,7 +29,7 @@ import com.volmit.iris.util.plugin.IrisService; public class CommandSVC implements IrisService, DecreeSystem { @Override public void onEnable() { - Iris.instance.getCommand("iris").setExecutor(this); + Iris.instance.getCommand("irisd").setExecutor(this); } @Override diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 43ab6a751..e59e41bf3 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -20,5 +20,7 @@ libraries: commands: iris: aliases: [ ir, irs ] + irisd: + aliases: [ ird, id ] api-version: ${apiversion} hotload-dependencies: false \ No newline at end of file