Skip to content

Commit

Permalink
Naming cleanup and minor opti (tags have params)
Browse files Browse the repository at this point in the history
  • Loading branch information
@mcmonkey4eva
mcmonkey4eva committed Oct 29, 2021
1 parent 81b4cb7 commit 918c1ea
Show file tree
Hide file tree
Showing 30 changed files with 469 additions and 415 deletions.
20 changes: 10 additions & 10 deletions src/main/java/com/denizenscript/denizencore/flags/AbstractFlagTracker.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,42 +112,42 @@ public static <T extends FlaggableObject> void registerFlagHandlers(ObjectTagPro
}

public ElementTag doHasFlagTag(Attribute attribute) {
if (!attribute.hasContext(1)) {
if (!attribute.hasParam()) {
attribute.echoError("The has_flag[...] tag must have an input!");
return null;
}
return new ElementTag(hasFlag(attribute.getContext(1)));
return new ElementTag(hasFlag(attribute.getParam()));
}

public ObjectTag doFlagTag(Attribute attribute) {
if (!attribute.hasContext(1)) {
if (!attribute.hasParam()) {
attribute.echoError("The flag[...] tag must have an input!");
return null;
}
if (attribute.getAttributeWithoutContext(2).equals("is_expired")) {
if (attribute.getAttributeWithoutParam(2).equals("is_expired")) {
Deprecations.flagIsExpiredTag.warn(attribute.context);
boolean result = !hasFlag(attribute.getContext(1));
boolean result = !hasFlag(attribute.getParam());
attribute.fulfill(1);
return new ElementTag(result);
}
else if (attribute.getAttributeWithoutContext(2).equals("expiration")) {
else if (attribute.getAttributeWithoutParam(2).equals("expiration")) {
Deprecations.flagExpirationTag.warn(attribute.context);
TimeTag time = getFlagExpirationTime(attribute.getContext(1));
TimeTag time = getFlagExpirationTime(attribute.getParam());
if (time == null) {
return null;
}
attribute.fulfill(1);
return new DurationTag((time.millis() - TimeTag.now().millis()) / 1000.0);
}
return getFlagValue(attribute.getContext(1));
return getFlagValue(attribute.getParam());
}

public TimeTag doFlagExpirationTag(Attribute attribute) {
if (!attribute.hasContext(1)) {
if (!attribute.hasParam()) {
attribute.echoError("The flag_expiration[...] tag must have an input!");
return null;
}
return getFlagExpirationTime(attribute.getContext(1));
return getFlagExpirationTime(attribute.getParam());
}

public static Warning listFlagsTagWarning = new SlowWarning("The list_flags and flag_map tags are meant for testing/debugging only. Do not use it in scripts (ignore this warning if using for testing reasons).");
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/com/denizenscript/denizencore/objects/core/CustomObjectTag.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,9 +137,9 @@ public ObjectTag specialTagProcessing(Attribute attribute) {
if (res != null) {
return CoreUtilities.autoAttribTyped(res, attribute.fulfill(1));
}
String taggo = attribute.getAttributeWithoutContext(1);
String taggo = attribute.getAttributeWithoutParam(1);
if (container.hasPath("tags." + taggo)) {
ListTag outcomes = container.runTagScript(taggo, attribute.getContextObject(1), this,
ListTag outcomes = container.runTagScript(taggo, attribute.getParamObject(), this,
attribute.getScriptEntry() != null ? attribute.getScriptEntry().entryData :
DenizenCore.getImplementation().getEmptyScriptEntryData());
if (outcomes == null) {
Expand Down
24 changes: 12 additions & 12 deletions src/main/java/com/denizenscript/denizencore/objects/core/DurationTag.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -402,11 +402,11 @@ public static void registerTags() {
// returns this duration minus another.
// -->
tagProcessor.registerStaticTag(DurationTag.class, "sub", (attribute, object) -> {
if (!attribute.hasContext(1)) {
if (!attribute.hasParam()) {
Debug.echoError("The tag DurationTag.sub[...] must have a value.");
return null;
}
return new DurationTag(object.getTicks() - attribute.contextAsType(1, DurationTag.class).getTicks());
return new DurationTag(object.getTicks() - attribute.paramAsType(DurationTag.class).getTicks());
});

// <--[tag]
Expand All @@ -416,11 +416,11 @@ public static void registerTags() {
// returns this duration plus another.
// -->
tagProcessor.registerStaticTag(DurationTag.class, "add", (attribute, object) -> {
if (!attribute.hasContext(1)) {
if (!attribute.hasParam()) {
Debug.echoError("The tag DurationTag.add[...] must have a value.");
return null;
}
return new DurationTag(object.getTicks() + attribute.contextAsType(1, DurationTag.class).getTicks());
return new DurationTag(object.getTicks() + attribute.paramAsType(DurationTag.class).getTicks());
});

// <--[tag]
Expand All @@ -432,10 +432,10 @@ public static void registerTags() {
// Equivalent to if comparison: >
// -->
tagProcessor.registerStaticTag(ElementTag.class, "is_more_than", (attribute, object) -> {
if (!attribute.hasContext(1)) {
if (!attribute.hasParam()) {
return null;
}
return new ElementTag(object.seconds > attribute.contextAsType(1, DurationTag.class).seconds);
return new ElementTag(object.seconds > attribute.paramAsType(DurationTag.class).seconds);
});

// <--[tag]
Expand All @@ -447,10 +447,10 @@ public static void registerTags() {
// Equivalent to if comparison: <
// -->
tagProcessor.registerStaticTag(ElementTag.class, "is_less_than", (attribute, object) -> {
if (!attribute.hasContext(1)) {
if (!attribute.hasParam()) {
return null;
}
return new ElementTag(object.seconds < attribute.contextAsType(1, DurationTag.class).seconds);
return new ElementTag(object.seconds < attribute.paramAsType(DurationTag.class).seconds);
});

// <--[tag]
Expand All @@ -462,10 +462,10 @@ public static void registerTags() {
// Equivalent to if comparison: >=
// -->
tagProcessor.registerStaticTag(ElementTag.class, "is_more_than_or_equal_to", (attribute, object) -> {
if (!attribute.hasContext(1)) {
if (!attribute.hasParam()) {
return null;
}
return new ElementTag(object.seconds >= attribute.contextAsType(1, DurationTag.class).seconds);
return new ElementTag(object.seconds >= attribute.paramAsType(DurationTag.class).seconds);
});

// <--[tag]
Expand All @@ -477,10 +477,10 @@ public static void registerTags() {
// Equivalent to if comparison: <=
// -->
tagProcessor.registerStaticTag(ElementTag.class, "is_less_than_or_equal_to", (attribute, object) -> {
if (!attribute.hasContext(1)) {
if (!attribute.hasParam()) {
return null;
}
return new ElementTag(object.seconds <= attribute.contextAsType(1, DurationTag.class).seconds);
return new ElementTag(object.seconds <= attribute.paramAsType(DurationTag.class).seconds);
});

tagProcessor.registerTag(TimeTag.class, "time", (attribute, object) -> {
Expand Down
Loading

0 comments on commit 918c1ea

Please sign in to comment.