> functions = new ArrayList<>(Functions.getJavaFunctions());
- Collections.sort(functions, functionComparator);
+ functions.sort(functionComparator);
for (JavaFunction info : functions) {
assert info != null;
generated.append(generateFunction(descTemp, info));
@@ -402,26 +410,26 @@ private static String handleIf(String desc, String start, boolean value) {
*/
private String generateAnnotated(String descTemp, SyntaxElementInfo info, @Nullable String page, String type) {
Class c = info.c;
- String desc = "";
+ String desc;
Name name = c.getAnnotation(Name.class);
- desc = descTemp.replace("${element.name}", getNullOrEmptyDefault(name.value(), "Unknown Name"));
+ desc = descTemp.replace("${element.name}", getNullOrEmptyDefault((name != null ? name.value() : null), "Unknown Name"));
Since since = c.getAnnotation(Since.class);
- desc = desc.replace("${element.since}", getNullOrEmptyDefault(since.value(), "Unknown"));
+ desc = desc.replace("${element.since}", getNullOrEmptyDefault((since != null ? since.value() : null), "Unknown"));
Description description = c.getAnnotation(Description.class);
- desc = desc.replace("${element.desc}", Joiner.on("\n").join(getNullOrEmptyDefault(description.value(), "Unknown description.")).replace("\n\n", ""));
- desc = desc.replace("${element.desc-safe}", Joiner.on("\n").join(getNullOrEmptyDefault(description.value(), "Unknown description."))
+ desc = desc.replace("${element.desc}", Joiner.on("\n").join(getNullOrEmptyDefault((description != null ? description.value() : null), "Unknown description.")).replace("\n\n", "
"));
+ desc = desc.replace("${element.desc-safe}", Joiner.on("\n").join(getNullOrEmptyDefault((description != null ? description.value() : null), "Unknown description."))
.replace("\\", "\\\\").replace("\"", "\\\"").replace("\t", " "));
Examples examples = c.getAnnotation(Examples.class);
- desc = desc.replace("${element.examples}", Joiner.on("
").join(getNullOrEmptyDefault(examples.value(), "Missing examples.")));
- desc = desc.replace("${element.examples-safe}", Joiner.on("\\n").join(getNullOrEmptyDefault(examples.value(), "Missing examples."))
+ desc = desc.replace("${element.examples}", Joiner.on("
").join(getNullOrEmptyDefault((examples != null ? examples.value() : null), "Missing examples.")));
+ desc = desc.replace("${element.examples-safe}", Joiner.on("\\n").join(getNullOrEmptyDefault((examples != null ? examples.value() : null), "Missing examples."))
.replace("\\", "\\\\").replace("\"", "\\\"").replace("\t", " "));
DocumentationId DocID = c.getAnnotation(DocumentationId.class);
- String ID = DocID != null ? DocID.value() : info.c.getSimpleName();
+ String ID = DocID != null ? (DocID != null ? DocID.value() : null) : info.c.getSimpleName();
// Fix duplicated IDs
if (page != null) {
if (page.contains("href=\"#" + ID + "\"")) {
@@ -434,7 +442,7 @@ private String generateAnnotated(String descTemp, SyntaxElementInfo info, @Nu
assert desc != null;
desc = handleIf(desc, "${if events}", events != null);
if (events != null) {
- String[] eventNames = events.value();
+ String[] eventNames = (events != null ? events.value() : null);
String[] eventLinks = new String[eventNames.length];
for (int i = 0; i < eventNames.length; i++) {
String eventName = eventNames[i];
@@ -442,15 +450,20 @@ private String generateAnnotated(String descTemp, SyntaxElementInfo info, @Nu
}
desc = desc.replace("${element.events}", Joiner.on(", ").join(eventLinks));
}
- desc = desc.replace("${element.events-safe}", events == null ? "" : Joiner.on(", ").join(events.value()));
+ desc = desc.replace("${element.events-safe}", events == null ? "" : Joiner.on(", ").join((events != null ? events.value() : null)));
RequiredPlugins plugins = c.getAnnotation(RequiredPlugins.class);
assert desc != null;
desc = handleIf(desc, "${if required-plugins}", plugins != null);
- desc = desc.replace("${element.required-plugins}", plugins == null ? "" : Joiner.on(", ").join(plugins.value()));
+ desc = desc.replace("${element.required-plugins}", plugins == null ? "" : Joiner.on(", ").join((plugins != null ? plugins.value() : null)));
+
+// TODO LATER
+// String addon = info.originClassPath;
+// desc = handleIf(desc, "${if by-addon}", true && !addon.isEmpty());
+// desc = desc.replace("${element.by-addon}", addon);
+ desc = handleIf(desc, "${if by-addon}", false);
- desc = handleIf(desc, "${if new-element}", Pattern.compile(skriptVersion + "(?!\\.)").matcher(since.value()).find()); // (?!\\.) to avoid matching 2.6 in 2.6.1 etc.
-// System.out.println(since.value() + " | " + skriptVersion);
+ desc = handleIf(desc, "${if new-element}", NEW_TAG_PATTERN.matcher((since != null ? since.value() : "")).find()); // (?!\\.) to avoid matching 2.6 in 2.6.1 etc.
desc = desc.replace("${element.type}", type);
List toGen = Lists.newArrayList();
@@ -491,7 +504,7 @@ private String generateAnnotated(String descTemp, SyntaxElementInfo info, @Nu
private String generateEvent(String descTemp, SkriptEventInfo info, @Nullable String page) {
Class c = info.c;
- String desc = "";
+ String desc;
String docName = getNullOrEmptyDefault(info.getName(), "Unknown Name");
desc = descTemp.replace("${element.name}", docName);
@@ -504,7 +517,12 @@ private String generateEvent(String descTemp, SkriptEventInfo info, @Nullable
desc = desc
.replace("${element.desc-safe}", Joiner.on("\\n").join(description)
.replace("\\", "\\\\").replace("\"", "\\\"").replace("\t", " "));
-
+
+// String addon = info.originClassPath;
+// desc = handleIf(desc, "${if by-addon}", true && !addon.isEmpty());
+// desc = desc.replace("${element.by-addon}", addon);
+ desc = handleIf(desc, "${if by-addon}", false);
+
String[] examples = getNullOrEmptyDefault(info.getExamples(), "Missing examples.");
desc = desc.replace("${element.examples}", Joiner.on("\n
").join(examples));
desc = desc
@@ -524,7 +542,7 @@ private String generateEvent(String descTemp, SkriptEventInfo info, @Nullable
assert desc != null;
desc = handleIf(desc, "${if events}", events != null);
if (events != null) {
- String[] eventNames = events.value();
+ String[] eventNames = (events != null ? events.value() : null);
String[] eventLinks = new String[eventNames.length];
for (int i = 0; i < eventNames.length; i++) {
String eventName = eventNames[i];
@@ -532,13 +550,13 @@ private String generateEvent(String descTemp, SkriptEventInfo info, @Nullable
}
desc = desc.replace("${element.events}", Joiner.on(", ").join(eventLinks));
}
- desc = desc.replace("${element.events-safe}", events == null ? "" : Joiner.on(", ").join(events.value()));
+ desc = desc.replace("${element.events-safe}", events == null ? "" : Joiner.on(", ").join((events != null ? events.value() : null)));
String[] requiredPlugins = info.getRequiredPlugins();
desc = handleIf(desc, "${if required-plugins}", requiredPlugins != null);
desc = desc.replace("${element.required-plugins}", Joiner.on(", ").join(requiredPlugins == null ? new String[0] : requiredPlugins));
- desc = handleIf(desc, "${if new-element}", Pattern.compile(skriptVersion + "(?!\\.)").matcher(since).find());
+ desc = handleIf(desc, "${if new-element}", NEW_TAG_PATTERN.matcher(since).find());
desc = desc.replace("${element.type}", "Event");
List toGen = Lists.newArrayList();
@@ -573,7 +591,7 @@ private String generateEvent(String descTemp, SkriptEventInfo info, @Nullable
private String generateClass(String descTemp, ClassInfo info, @Nullable String page) {
Class c = info.getC();
- String desc = "";
+ String desc;
String docName = getNullOrEmptyDefault(info.getDocName(), "Unknown Name");
desc = descTemp.replace("${element.name}", docName);
@@ -586,7 +604,12 @@ private String generateClass(String descTemp, ClassInfo info, @Nullable Strin
desc = desc
.replace("${element.desc-safe}", Joiner.on("\\n").join(description)
.replace("\\", "\\\\").replace("\"", "\\\"").replace("\t", " "));
-
+
+// String addon = c.getPackageName();
+// desc = handleIf(desc, "${if by-addon}", true && !addon.isEmpty());
+// desc = desc.replace("${element.by-addon}", addon);
+ desc = handleIf(desc, "${if by-addon}", false);
+
String[] examples = getNullOrEmptyDefault(info.getExamples(), "Missing examples.");
desc = desc.replace("${element.examples}", Joiner.on("\n
").join(examples));
desc = desc.replace("${element.examples-safe}", Joiner.on("\\n").join(examples)
@@ -605,7 +628,7 @@ private String generateClass(String descTemp, ClassInfo info, @Nullable Strin
Events events = c.getAnnotation(Events.class);
desc = handleIf(desc, "${if events}", events != null);
if (events != null) {
- String[] eventNames = events.value();
+ String[] eventNames = (events != null ? events.value() : null);
String[] eventLinks = new String[eventNames.length];
for (int i = 0; i < eventNames.length; i++) {
String eventName = eventNames[i];
@@ -613,14 +636,14 @@ private String generateClass(String descTemp, ClassInfo info, @Nullable Strin
}
desc = desc.replace("${element.events}", Joiner.on(", ").join(eventLinks));
}
- desc = desc.replace("${element.events-safe}", events == null ? "" : Joiner.on(", ").join(events.value()));
+ desc = desc.replace("${element.events-safe}", events == null ? "" : Joiner.on(", ").join((events != null ? events.value() : null)));
String[] requiredPlugins = info.getRequiredPlugins();
desc = handleIf(desc, "${if required-plugins}", requiredPlugins != null);
desc = desc.replace("${element.required-plugins}", Joiner.on(", ").join(requiredPlugins == null ? new String[0] : requiredPlugins));
- desc = handleIf(desc, "${if new-element}", Pattern.compile(skriptVersion + "(?!\\.)").matcher(since).find());
+ desc = handleIf(desc, "${if new-element}", NEW_TAG_PATTERN.matcher(since).find());
desc = desc.replace("${element.type}", "Type");
List toGen = Lists.newArrayList();
@@ -670,7 +693,12 @@ private String generateFunction(String descTemp, JavaFunction info) {
desc = desc
.replace("${element.desc-safe}", Joiner.on("\\n").join(description)
.replace("\\", "\\\\").replace("\"", "\\\"").replace("\t", " "));
-
+
+// String addon = info.getSignature().getOriginClassPath();
+// desc = handleIf(desc, "${if by-addon}", true && !addon.isEmpty());
+// desc = desc.replace("${element.by-addon}", addon);
+ desc = handleIf(desc, "${if by-addon}", false);
+
String[] examples = getNullOrEmptyDefault(info.getExamples(), "Missing examples.");
desc = desc.replace("${element.examples}", Joiner.on("\n
").join(examples));
desc = desc
@@ -683,7 +711,7 @@ private String generateFunction(String descTemp, JavaFunction info) {
desc = handleIf(desc, "${if events}", false); // Functions do not require events nor plugins (at time writing this)
desc = handleIf(desc, "${if required-plugins}", false);
- desc = handleIf(desc, "${if new-element}", Pattern.compile(skriptVersion + "(?!\\.)").matcher(since).find());
+ desc = handleIf(desc, "${if new-element}", NEW_TAG_PATTERN.matcher(since).find());
desc = desc.replace("${element.type}", "Function");
List toGen = Lists.newArrayList();
diff --git a/src/main/java/ch/njol/skript/expressions/ExprBed.java b/src/main/java/ch/njol/skript/expressions/ExprBed.java
index 361c9c4b4a0..fb31d0849c6 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprBed.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprBed.java
@@ -35,7 +35,7 @@
*/
@Name("Bed")
@Description("The bed location of a player, i.e. the spawn point of a player if he ever slept in a bed and the bed still exists and is unobstructed.")
-@Examples({"bed of player exists:",
+@Examples({"if bed of player exists:",
" teleport player the the player's bed",
"else:",
" teleport the player to the world's spawn point"})
diff --git a/src/main/java/ch/njol/skript/expressions/ExprHotbarSlot.java b/src/main/java/ch/njol/skript/expressions/ExprHotbarSlot.java
index 678c033d475..0c4e497ff46 100644
--- a/src/main/java/ch/njol/skript/expressions/ExprHotbarSlot.java
+++ b/src/main/java/ch/njol/skript/expressions/ExprHotbarSlot.java
@@ -33,9 +33,10 @@
import ch.njol.skript.util.slot.Slot;
@Name("Hotbar Slot")
-@Description({"The slot number of the currently selected hotbar slot."})
+@Description({"The currently selected hotbar slot. To retrieve its number use Slot Index expression."})
@Examples({"message \"%player's current hotbar slot%\"",
- "set player's selected hotbar slot to slot 4 of player"})
+ "set player's selected hotbar slot to slot 4 of player",
+ "send \"index of player's current hotbar slot = 1\" # second slot from the left"})
@Since("2.2-dev36")
public class ExprHotbarSlot extends SimplePropertyExpression {
diff --git a/src/main/java/ch/njol/skript/lang/function/Functions.java b/src/main/java/ch/njol/skript/lang/function/Functions.java
index f325327acc9..a050e2feb09 100644
--- a/src/main/java/ch/njol/skript/lang/function/Functions.java
+++ b/src/main/java/ch/njol/skript/lang/function/Functions.java
@@ -21,7 +21,6 @@
import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
-import java.util.Iterator;
import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -229,10 +228,10 @@ public static Signature loadSignature(String script, SectionNode node) {
return signError("Cannot recognise the type '" + returnType + "'");
}
}
-
+
@SuppressWarnings({"unchecked", "null"})
Signature sign = new Signature<>(script, name,
- params.toArray(new Parameter[0]), (ClassInfo