mirrors/Iris
1
0
Fork 0
mirror of https://github.com/VolmitSoftware/Iris.git synced 2026-04-06 07:46:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Patches

Browse Source
This commit is contained in:
CocoTheOwner
2021-09-10 13:55:32 +02:00
parent c3b1d6735e
commit 466cc84c16
7 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/java/com/volmit/iris/util/decree/DecreeNode.java
View File

@@ -77,7 +77,7 @@ public class DecreeNode {
}
public KList<String> getNames() {
KList<String> d = new KList<>();
KList<String> d = new KList<>(getName());
for (String i : decree.aliases()) {
if (i.isEmpty()) {
@@ -88,7 +88,6 @@ public class DecreeNode {
}
d.add(getName());
d.removeDuplicates();
return d;
}

15
src/main/java/com/volmit/iris/util/decree/virtual/VirtualDecreeCommand.java
View File

@@ -161,8 +161,8 @@ public class VirtualDecreeCommand {
return getNode().getNames();
}
KList<String> d = new KList<>();
Decree dc = getType().getDeclaredAnnotation(Decree.class);
KList<String> d = new KList<>(dc.name());
for (String i : dc.aliases()) {
if (i.isEmpty()) {
continue;
@@ -171,7 +171,6 @@ public class VirtualDecreeCommand {
d.add(i);
}
d.add(dc.name());
d.removeDuplicates();
return d;
@@ -461,24 +460,25 @@ public class VirtualDecreeCommand {
}
if (sender.isPlayer() && i.isContextual() && value == null) {
Iris.debug("Contextual!");
DecreeContextHandler<?> ch = DecreeContextHandler.contextHandlers.get(i.getType());
if (ch != null) {
value = ch.handle(sender);
if (value != null) {
Iris.debug("Null Parameter " + i.getName() + " derived a value of " + i.getHandler().toStringForce(value) + " from " + ch.getClass().getSimpleName());
Iris.debug("Parameter \"" + i.getName() + "\" derived a value of \"" + i.getHandler().toStringForce(value) + "\" from " + ch.getClass().getSimpleName());
} else {
Iris.debug("Null Parameter " + i.getName() + " could not derive a value from " + ch.getClass().getSimpleName());
Iris.debug("Parameter \"" + i.getName() + "\" could not derive a value from \"" + ch.getClass().getSimpleName());
}
} else {
Iris.debug("Null Parameter " + i.getName() + " is contextual but has no context handler for " + i.getType().getCanonicalName());
Iris.debug("Parameter \"" + i.getName() + "\" is contextual but has no context handler for \"" + i.getType().getCanonicalName() + "\"");
}
}
if (i.hasDefault() && value == null) {
try {
Iris.debug("Null Parameter " + i.getName() + " is using default value " + i.getParam().defaultValue());
Iris.debug("Parameter \"" + i.getName() + "\" is using default value \"" + i.getParam().defaultValue() + "\"");
value = i.getDefaultValue();
} catch (Throwable e) {
e.printStackTrace();
@@ -486,7 +486,8 @@ public class VirtualDecreeCommand {
}
if (i.isRequired() && value == null) {
sender.sendMessage("Missing: " + i.getName() + " (" + i.getType().getSimpleName() + ") as the " + Form.getNumberSuffixThStRd(vm + 1) + " argument.");
sender.sendMessage(C.RED + "Missing argument \"" + i.getName() + "\" (" + i.getType().getSimpleName() + ") as the " + Form.getNumberSuffixThStRd(vm + 1) + " argument.");
sender.sendDecreeHelpNode(this);
return false;
}