Skip to content

Add expressions Region Flag and Region Priority #5

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 13 commits into from
Closed
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,118 @@
package org.skriptlang.skriptworldguard.elements.expressions;

import ch.njol.skript.Skript;
import ch.njol.skript.classes.Changer;
import ch.njol.skript.expressions.base.PropertyExpression;
import ch.njol.skript.lang.Expression;
import ch.njol.skript.lang.ExpressionType;
import ch.njol.skript.lang.SkriptParser.ParseResult;
import ch.njol.skript.classes.Changer.ChangeMode;
import ch.njol.util.Kleenean;
import ch.njol.util.coll.CollectionUtils;
import com.sk89q.worldguard.WorldGuard;
import com.sk89q.worldguard.protection.flags.*;
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import org.bukkit.event.Event;
import org.skriptlang.skriptworldguard.SkriptWorldGuard;
import org.skriptlang.skriptworldguard.worldguard.WorldGuardRegion;
import java.util.ArrayList;
import java.util.List;

public class ExprRegionFlag extends PropertyExpression<WorldGuardRegion, Flag> {

static {
Skript.registerExpression(ExprRegionFlag.class, Flag.class, ExpressionType.COMBINED,"[worldguard] flag[s] %strings%", "worldguardregions");
}

WorldGuard wg = WorldGuard.getInstance();
private Expression<String> exprFlag;
private Expression<WorldGuardRegion[]> exprRegions;

@Override
@SuppressWarnings("unchecked")
public boolean init(Expression<?>[] expression, int matchedPattern, Kleenean kleenean, ParseResult parseResult) {
exprFlag = (Expression<String>) expression[0];
exprRegions = (Expression<WorldGuardRegion[]>) expression[1];
return true;
}

@Override
protected Flag[] get(Event event, WorldGuardRegion[] region) {
Flag<?> flag = Flags.fuzzyMatchFlag(wg.getFlagRegistry(), exprFlag.getSingle(event));
List<Flag> result = new ArrayList<>();
for (WorldGuardRegion wrg : region){
ProtectedRegion rg = wrg.getRegion();
if (rg != null){
result.add((Flag) rg.getFlag(flag));
}
}
return (Flag[]) result.toArray();
}

@Override
public Class<?>[] acceptChange(ChangeMode mode){
switch (mode){
case SET:
case DELETE:
return CollectionUtils.array(String.class);
}
return null;
}

public void change(Event event, Object[] delta, Changer.ChangeMode mode){
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You don't need to worry about warnings IMO. You can just silently fail.

Flag<?> flag;
if(exprFlag.getSingle(event) == null || exprRegions.getSingle(event) == null){
return;
}
WorldGuard wg = WorldGuard.getInstance();
WorldGuardRegion[] regions = getExpr().getArray(event);
flag = Flags.fuzzyMatchFlag(wg.getFlagRegistry(), exprFlag.getSingle(event));
for (WorldGuardRegion region : regions){
ProtectedRegion rg = region.getRegion();
if (rg != null && flag != null){
switch(mode){
case SET:
if(delta != null){
if (delta[0] instanceof Boolean) {
if ((Boolean) delta[0]) {
rg.setFlag((StateFlag) flag, StateFlag.State.ALLOW);
} else {
rg.setFlag((StateFlag) flag, StateFlag.State.DENY);
}
}
else if (delta[0] instanceof String) {
rg.setFlag((StringFlag) flag, (String) delta[0]);
} else if (delta[0] instanceof Integer) {
rg.setFlag((IntegerFlag) flag, (int) delta[0]);
} else if (delta[0] instanceof Double) {
rg.setFlag((DoubleFlag) flag, (double) delta[0]);
} else {
SkriptWorldGuard.getInstance().getLogger().warning("Region flag " + flag.getName() + " cannot be set to: " + delta[0]);
}
}
case DELETE:
rg.setFlag(flag, null);
default:
Skript.error("A flag can only be set or cleared.");
}
}else{
if (rg == null) {
SkriptWorldGuard.getInstance().getLogger().warning("Could not find region " + rg.getId());
}
if (flag == null){
SkriptWorldGuard.getInstance().getLogger().warning("Could not find flag " + flag.getName());
}
}
}
}

@Override
public Class<? extends Flag> getReturnType() {
return Flag.class;
}
Comment on lines +115 to +117
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
public Class<? extends Flag> getReturnType() {
return Flag.class;
}
public Class<Object> getReturnType() {
return Object.class;
}


@Override
public String toString(Event event, boolean debug) {
return "flag " + exprFlag.toString(event, debug) + " of region " + exprRegions.toString(event, debug) ;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
package org.skriptlang.skriptworldguard.elements.expressions;

import ch.njol.skript.classes.Changer;
import ch.njol.skript.expressions.base.SimplePropertyExpression;
import ch.njol.skript.lang.Expression;
import ch.njol.skript.lang.SkriptParser.ParseResult;
import ch.njol.util.Kleenean;
import ch.njol.util.coll.CollectionUtils;
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import org.bukkit.event.Event;
import org.skriptlang.skriptworldguard.SkriptWorldGuard;
import org.skriptlang.skriptworldguard.worldguard.WorldGuardRegion;

public class ExprRegionPriority extends SimplePropertyExpression<WorldGuardRegion, Number> {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs documentation annotations


static {
register(ExprRegionPriority.class, Number.class, "priority", "worldguardregions");
}

private Expression<WorldGuardRegion> region;

@Override
@SuppressWarnings("unchecked")
public boolean init(Expression<?>[] expression, int matchedPattern, Kleenean kleenean, ParseResult parseResult) {
region = (Expression<WorldGuardRegion>) expression[0];
return true;
}

@Override
public Number convert(WorldGuardRegion rg) {
return rg.getRegion().getPriority();
}

@Override
public Class<?>[] acceptChange(final Changer.ChangeMode mode){
switch(mode){
case SET:
case ADD:
case REMOVE:
return CollectionUtils.array(Number.class);
case RESET:
case DELETE:
return CollectionUtils.array();
Comment on lines +24 to +30
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
case SET:
case ADD:
case REMOVE:
return CollectionUtils.array(Number.class);
case RESET:
case DELETE:
return CollectionUtils.array();
case SET:
case ADD:
case REMOVE:
case RESET:
case DELETE:
return CollectionUtils.array(Number.class);

you can just combine them :)

}
return null;
}

public void change(Event event, Object[] delta, Changer.ChangeMode mode){
ProtectedRegion rg = region.getSingle(event).getRegion();
if (rg != null){
if (delta != null) {
switch(mode){
case SET:
rg.setPriority(((Number) delta[0]).intValue());
case ADD:
rg.setPriority(rg.getPriority() + ((Number) delta[0]).intValue());
case REMOVE:
rg.setPriority(rg.getPriority() - ((Number) delta[0]).intValue());
}
} else{
switch(mode){
case RESET:
case DELETE:
rg.setPriority(0);
}
}
}else{
SkriptWorldGuard.getInstance().getLogger().warning("Could not find region " + "\"" + region.toString() +"\".");
}
}

@Override
public Class<? extends Number> getReturnType() {
return Number.class;
}

@Override
protected String getPropertyName() {
return "priority";
}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
}
}

}