Skip to content

Commit 8b013b7

Browse files
Update property registrations
1 parent d5009db commit 8b013b7

File tree

12 files changed

+43
-18
lines changed

12 files changed

+43
-18
lines changed

build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ dependencies {
2828
implementation group: 'org.jetbrains', name: 'annotations', version: '24.1.0'
2929

3030
implementation group: 'org.spigotmc', name: 'spigot-api', version: '1.19.4-R0.1-SNAPSHOT'
31-
implementation (group: 'com.github.SkriptLang', name: 'Skript', version: '2.12.0-pre1') {
31+
implementation (group: 'com.github.SkriptLang', name: 'Skript', version: '2.12.0-pre2') {
3232
transitive = false
3333
}
3434
implementation (group: 'com.sk89q.worldguard', name: 'worldguard-bukkit', version: '7.0.8') {

src/main/java/org/skriptlang/skriptworldguard/elements/conditions/CondIsRegionTemporary.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
public class CondIsRegionTemporary extends PropertyCondition<WorldGuardRegion> {
2323

2424
public static void register(SyntaxRegistry registry) {
25-
register(registry, CondIsRegionTemporary.class, "(temporary|transient)", "worldguardregions");
25+
registry.register(SyntaxRegistry.CONDITION, infoBuilder(CondIsRegionTemporary.class, PropertyType.BE,
26+
"(temporary|transient)", "worldguardregions")
27+
.supplier(CondIsRegionTemporary::new)
28+
.build());
2629
}
2730

2831
@Override

src/main/java/org/skriptlang/skriptworldguard/elements/conditions/CondIsRegionType.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@
2525
public class CondIsRegionType extends PropertyCondition<WorldGuardRegion> {
2626

2727
public static void register(SyntaxRegistry registry) {
28-
register(registry, CondIsRegionType.class, "[a] (:global|:cuboid[s]|:polygon[s|al]) [region[s]]", "worldguardregions");
28+
registry.register(SyntaxRegistry.CONDITION, infoBuilder(CondIsRegionType.class, PropertyType.BE,
29+
"[a] (:global|:cuboid[s]|:polygon[s|al]) [region[s]]", "worldguardregions")
30+
.supplier(CondIsRegionType::new)
31+
.build());
2932
}
3033

3134
private RegionType regionType;

src/main/java/org/skriptlang/skriptworldguard/elements/conditions/CondIsValidRegionId.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
public class CondIsValidRegionId extends PropertyCondition<String> {
2424

2525
public static void register(SyntaxRegistry registry) {
26-
register(registry, CondIsValidRegionId.class, "[a] valid [worldguard] region id", "strings");
26+
registry.register(SyntaxRegistry.CONDITION, infoBuilder(CondIsValidRegionId.class, PropertyType.BE,
27+
"[a] valid [worldguard] region id", "strings")
28+
.supplier(CondIsValidRegionId::new)
29+
.build());
2730
}
2831

2932
@Override

src/main/java/org/skriptlang/skriptworldguard/elements/expressions/ExprBlocksInRegion.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,10 @@
2727
public class ExprBlocksInRegion extends PropertyExpression<WorldGuardRegion, Block> {
2828

2929
public static void register(SyntaxRegistry registry) {
30-
register(registry, ExprBlocksInRegion.class, Block.class, "blocks", "worldguardregions");
30+
registry.register(SyntaxRegistry.EXPRESSION, infoBuilder(ExprBlocksInRegion.class, Block.class,
31+
"blocks", "worldguardregions", false)
32+
.supplier(ExprBlocksInRegion::new)
33+
.build());
3134
}
3235

3336
@Override

src/main/java/org/skriptlang/skriptworldguard/elements/expressions/ExprMoveType.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
public class ExprMoveType extends EventValueExpression<MoveType> {
2424

2525
public static void register(SyntaxRegistry registry) {
26-
register(registry, ExprMoveType.class, MoveType.class, "[worldguard] move[ment][ ]type");
26+
registry.register(SyntaxRegistry.EXPRESSION, infoBuilder(ExprMoveType.class, MoveType.class,
27+
"[worldguard] move[ment][ ]type")
28+
.supplier(ExprMoveType::new)
29+
.build());
2730
}
2831

2932
public ExprMoveType() {

src/main/java/org/skriptlang/skriptworldguard/elements/expressions/ExprRegion.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,10 @@
2222
public class ExprRegion extends EventValueExpression<WorldGuardRegion> {
2323

2424
public static void register(SyntaxRegistry registry) {
25-
register(registry, ExprRegion.class, WorldGuardRegion.class, "[worldguard] region");
25+
registry.register(SyntaxRegistry.EXPRESSION, infoBuilder(ExprRegion.class, WorldGuardRegion.class,
26+
"[worldguard] region")
27+
.supplier(ExprRegion::new)
28+
.build());
2629
}
2730

2831
public ExprRegion() {

src/main/java/org/skriptlang/skriptworldguard/elements/expressions/ExprRegionFlag.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,10 @@
4646
public class ExprRegionFlag extends SimpleExpression<Object> {
4747

4848
public static void register(SyntaxRegistry registry) {
49-
PropertyExpression.register(registry, ExprRegionFlag.class, Object.class,
50-
"[region] [group:group flag of [the]] flag %string%", "worldguardregions");
49+
registry.register(SyntaxRegistry.EXPRESSION, PropertyExpression.infoBuilder(ExprRegionFlag.class, Object.class,
50+
"[region] [group:group flag of [the]] flag %string%", "worldguardregions", false)
51+
.supplier(ExprRegionFlag::new)
52+
.build());
5153
}
5254

5355
private Expression<String> flagName;

src/main/java/org/skriptlang/skriptworldguard/elements/expressions/ExprRegionMembersOwners.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import ch.njol.util.Kleenean;
1313
import com.sk89q.worldguard.domains.DefaultDomain;
1414
import org.jetbrains.annotations.Nullable;
15-
import org.skriptlang.skript.registration.SyntaxInfo;
1615
import org.skriptlang.skript.registration.SyntaxRegistry;
1716
import org.skriptlang.skriptworldguard.worldguard.WorldGuardRegion;
1817
import org.bukkit.Bukkit;
@@ -37,8 +36,9 @@
3736
public class ExprRegionMembersOwners extends PropertyExpression<WorldGuardRegion, Object> {
3837

3938
public static void register(SyntaxRegistry registry) {
40-
registry.register(SyntaxRegistry.EXPRESSION, SyntaxInfo.Expression.builder(ExprRegionMembersOwners.class, Object.class)
41-
.priority(DEFAULT_PRIORITY)
39+
registry.register(SyntaxRegistry.EXPRESSION, infoBuilder(ExprRegionMembersOwners.class, Object.class, "", "", false)
40+
.supplier(ExprRegionMembersOwners::new)
41+
.clearPatterns() // overwrite them
4242
.addPatterns(getPatterns("player (members|:owners)", "worldguardregions"))
4343
.addPatterns(getPatterns("(member|:owner) groups", "worldguardregions"))
4444
.build());

src/main/java/org/skriptlang/skriptworldguard/elements/expressions/ExprRegionParent.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,10 @@
2727
public class ExprRegionParent extends SimplePropertyExpression<WorldGuardRegion, WorldGuardRegion> {
2828

2929
public static void register(SyntaxRegistry registry) {
30-
register(registry, ExprRegionParent.class, WorldGuardRegion.class,
31-
"[region] parent[s]", "worldguardregions");
30+
registry.register(SyntaxRegistry.EXPRESSION, infoBuilder(ExprRegionParent.class, WorldGuardRegion.class,
31+
"[region] parent[s]", "worldguardregions", false)
32+
.supplier(ExprRegionParent::new)
33+
.build());
3234
}
3335

3436
@Override

0 commit comments

Comments
 (0)