Limework/SkStuff
2
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 6 Wiki Activity

2 new expressions, added Metrics, needs testing.

Browse Source 
Added WG (members|owners) of region
Added WE super pickaxe state of player
Made fireproof state return a list only when necessary
Made noclip state return a list only when necessary
This commit is contained in:
TheBukor
2016-04-09 13:59:15 -03:00
parent 7140ed1cff
commit e47feb2122
7 changed files with 1004 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/me/TheBukor/SkStuff/SkStuff.java
View File

@@ -1,9 +1,12 @@
package me.TheBukor.SkStuff;
import java.io.IOException;
import javax.annotation.Nullable;
import org.bukkit.Bukkit;
import org.bukkit.Location;
import org.bukkit.OfflinePlayer;
import org.bukkit.World;
import org.bukkit.block.Block;
import org.bukkit.entity.Entity;
@@ -13,6 +16,7 @@ import org.bukkit.inventory.Inventory;
import org.bukkit.inventory.ItemStack;
import org.bukkit.plugin.Plugin;
import org.bukkit.plugin.java.JavaPlugin;
import org.mcstats.Metrics;
import com.sk89q.worldedit.EditSession;
import com.sk89q.worldguard.bukkit.WGBukkit;
@@ -77,11 +81,13 @@ import me.TheBukor.SkStuff.expressions.ExprSelectionArea;
import me.TheBukor.SkStuff.expressions.ExprSelectionOfPlayer;
import me.TheBukor.SkStuff.expressions.ExprSelectionPos;
import me.TheBukor.SkStuff.expressions.ExprStepLength;
import me.TheBukor.SkStuff.expressions.ExprSuperPickaxe;
import me.TheBukor.SkStuff.expressions.ExprTagOf;
import me.TheBukor.SkStuff.expressions.ExprTimespanToNumber;
import me.TheBukor.SkStuff.expressions.ExprToLowerCase;
import me.TheBukor.SkStuff.expressions.ExprToUpperCase;
import me.TheBukor.SkStuff.expressions.ExprVanishState;
import me.TheBukor.SkStuff.expressions.ExprWGMemberOwner;
import me.TheBukor.SkStuff.expressions.ExprWordsToUpperCase;
import me.TheBukor.SkStuff.util.NMSInterface;
import me.TheBukor.SkStuff.util.NMS_v1_7_R4;
@@ -147,7 +153,7 @@ public class SkStuff extends JavaPlugin {
//Skript.registerExpression(ExprEndermanBlocks.class, ItemStack.class, ExpressionType.PROPERTY, "blocks that %entity% can (carry|hold|grab|steal)");
Skript.registerExpression(ExprMCIdOf.class, String.class, ExpressionType.PROPERTY, "(mc|minecraft) [(string|native)] id of %itemtype%", "%itemtype%'s minecraft [(string|native)] id");
Skript.registerExpression(ExprMCIdToItem.class, ItemStack.class, ExpressionType.SIMPLE, "item[[ ](stack|type)] (of|from) (mc|minecraft) [(string|native)] id %string%");
Skript.registerExpression(ExprLastLocation.class, Location.class, ExpressionType.SIMPLE, " ");
Skript.registerExpression(ExprLastLocation.class, Location.class, ExpressionType.SIMPLE, "[the] (last|past|former) location of %entity%", "%entity%'s (last|past|former) location", "[the] location of %entity% (1|one) tick before", "%entity%'s location (1|one) tick before");
Skript.registerExpression(ExprStepLength.class, Number.class, ExpressionType.PROPERTY, "[the] step length of %entity%", "%entity%'s step length");
nmsMethods.registerCompoundClassInfo();
nmsMethods.registerNBTListClassInfo();
@@ -179,6 +185,7 @@ public class SkStuff extends JavaPlugin {
Skript.registerExpression(ExprSelectionPos.class, Location.class, ExpressionType.PROPERTY, "[(world[ ]edit|we)] po(s|int)[ ](0¦1|1¦2) of %player%", "%player%'s [(world[ ]edit|we)] po(s|int)[ ](0¦1|1¦2)");
Skript.registerExpression(ExprSelectionArea.class, Integer.class, ExpressionType.SIMPLE, "(0¦volume|1¦(x( |-)size|width)|2¦(y( |-)size|height)|3¦(z( |-)size|length)|4¦area) of [(world[ ]edit|we)] selection of %player%", "%player%'s [(world[ ]edit|we)] selection (0¦volume|1¦(x( |-)size|width)|2¦(y( |-)size|height)|3¦(z( |-)size|length)|4¦area)");
Skript.registerExpression(ExprSchematicArea.class, Integer.class, ExpressionType.SIMPLE, "(0¦volume|1¦(x( |-)size|width)|2¦(y( |-)size|height)|3¦(z( |-)size|length)|4¦area) of schem[atic] [from] %string%");
Skript.registerExpression(ExprSuperPickaxe.class, Boolean.class, ExpressionType.PROPERTY, "[(world[ ]edit|we)] super[ ]pick[axe] (state|mode) of %players%", "%players%'s [(world[ ]edit|we)] super[ ]pick[axe] (state|mode)");
Classes.registerClass(new ClassInfo<EditSession>(EditSession.class, "editsession").name("Edit Session").user("edit ?sessions?"));
try {
Class.forName("com.sk89q.worldedit.extent.logging.AbstractLoggingExtent");
@@ -204,16 +211,17 @@ public class SkStuff extends JavaPlugin {
}
condAmount += 1;
effAmount += 13;
exprAmount += 7;
exprAmount += 8;
typeAmount += 1;
if (Bukkit.getPluginManager().getPlugin("WorldGuard") != null) { //WorldGuard depends on WorldEdit
Plugin umbaska = Bukkit.getPluginManager().getPlugin("Umbaska");
Plugin skRambled = Bukkit.getPluginManager().getPlugin("SkRambled");
boolean registerNewTypes = (umbaska == null && skRambled == null);
if (registerNewTypes) {
Skript.registerExpression(ExprFlagOfWGRegion.class, String.class, ExpressionType.PROPERTY, "[w[orld[ ]]g[uard]] flag %wgflag% of %wgregion%");
Skript.registerExpression(ExprFlagsOfWGRegion.class, Flag.class, ExpressionType.PROPERTY, "all [w[orld[ ]]g[uard]] flags of %wgregion%");
Classes.registerClass(new ClassInfo<Flag>(Flag.class, "wgflag").name("WorldGuard Flag").user("(w(orld ?)?g(uard)? )?flags?").defaultExpression(new EventValueExpression<Flag>(Flag.class)).parser(new Parser<Flag<?>>() {
Skript.registerExpression(ExprFlagOfWGRegion.class, String.class, ExpressionType.PROPERTY, "[(world[ ]guard|wg)] flag %wgflag% of %wgregion%");
Skript.registerExpression(ExprFlagsOfWGRegion.class, Flag.class, ExpressionType.PROPERTY, "[(all|the)] [(world[ ]guard|wg)] flags of %wgregion%");
Skript.registerExpression(ExprWGMemberOwner.class, OfflinePlayer.class, ExpressionType.PROPERTY, "[the] (0¦members|1¦owner[s]) of [[the] (world[ ]guard|wg) region] %wgregion%");
Classes.registerClass(new ClassInfo<Flag>(Flag.class, "wgflag").name("WorldGuard Flag").user("((world ?guard|wg) )?flags?").defaultExpression(new EventValueExpression<Flag>(Flag.class)).parser(new Parser<Flag<?>>() {
@Override
@Nullable
@@ -236,7 +244,7 @@ public class SkStuff extends JavaPlugin {
return ".+";
}
}));
Classes.registerClass(new ClassInfo<ProtectedRegion>(ProtectedRegion.class, "wgregion").name("WorldGuard Region").user("(w(orld ?)?g(uard)? )?regions?").defaultExpression(new EventValueExpression<>(ProtectedRegion.class)).parser(new Parser<ProtectedRegion>() {
Classes.registerClass(new ClassInfo<ProtectedRegion>(ProtectedRegion.class, "wgregion").name("WorldGuard Region").user("((world ?guard|wg) )?regions?").defaultExpression(new EventValueExpression<>(ProtectedRegion.class)).parser(new Parser<ProtectedRegion>() {
@Override
@Nullable
@@ -269,8 +277,9 @@ public class SkStuff extends JavaPlugin {
} else {
Skript.registerExpression(ExprFlagOfWGRegion.class, String.class, ExpressionType.PROPERTY, "[skstuff] [w[orld[ ]]g[uard]] flag %flag% of %protectedregion%");
Skript.registerExpression(ExprFlagsOfWGRegion.class, Flag.class, ExpressionType.PROPERTY, "[skstuff] [all] [w[orld[ ]]g[uard]] flags of %protectedregion%");
Skript.registerExpression(ExprWGMemberOwner.class, OfflinePlayer.class, ExpressionType.PROPERTY, "[the] [skstuff] (0¦members|1¦owner[s]) of [[the] (world[ ]guard|wg) region] %protectedregion%");
}
exprAmount += 2;
exprAmount += 3;
}
}
if (Bukkit.getPluginManager().getPlugin("VanishNoPacket") != null) {
@@ -280,6 +289,13 @@ public class SkStuff extends JavaPlugin {
effAmount += 1;
exprAmount += 1;
}
try {
Metrics metrics = new Metrics(this);
metrics.start();
} catch (IOException ex) {
getLogger().warning("Sorry, I've failed to hook SkStuff into Metrics. I'm really sorry.");
getLogger().warning("Here's an error for you: " + ex.getMessage());
}
getLogger().info("Everything ready! Loaded a total of " + condAmount + " conditions, " + effAmount + " effects, " + evtAmount + "events, " + exprAmount + " expressions and " + typeAmount + " types!");
} else {
getLogger().info("Unable to find Skript or Skript isn't accepting registrations, disabling SkStuff...");

2
src/me/TheBukor/SkStuff/expressions/ExprFireProof.java
View File

@@ -23,7 +23,7 @@ public class ExprFireProof extends SimpleExpression<Boolean> {
@Override
public boolean isSingle() {
return true;
return entities.isSingle();
}
@SuppressWarnings("unchecked")

2
src/me/TheBukor/SkStuff/expressions/ExprNoClip.java
View File

@@ -23,7 +23,7 @@ public class ExprNoClip extends SimpleExpression<Boolean> {
@Override
public boolean isSingle() {
return false;
return entities.isSingle();
}
@SuppressWarnings("unchecked")

82
src/me/TheBukor/SkStuff/expressions/ExprSuperPickaxe.java Normal file
View File

@@ -0,0 +1,82 @@
package me.TheBukor.SkStuff.expressions;
import javax.annotation.Nullable;
import org.bukkit.Bukkit;
import org.bukkit.entity.Player;
import org.bukkit.event.Event;
import com.sk89q.worldedit.bukkit.WorldEditPlugin;
import ch.njol.skript.classes.Changer.ChangeMode;
import ch.njol.skript.lang.Expression;
import ch.njol.skript.lang.SkriptParser.ParseResult;
import ch.njol.skript.lang.util.SimpleExpression;
import ch.njol.util.Kleenean;
import ch.njol.util.coll.CollectionUtils;
public class ExprSuperPickaxe extends SimpleExpression<Boolean> {
private Expression<Player> players;
@Override
public boolean isSingle() {
return players.isSingle();
}
@Override
public Class<? extends Boolean> getReturnType() {
return Boolean.class;
}
@SuppressWarnings("unchecked")
@Override
public boolean init(Expression<?>[] expr, int matchedPattern, Kleenean isDelayed, ParseResult parseResult) {
players = (Expression<Player>) expr[0];
return true;
}
@Override
public String toString(@Nullable Event e, boolean debug) {
return "world edit super pickaxe state of " + players.toString(e, debug);
}
@Override
@Nullable
protected Boolean[] get(Event e) {
WorldEditPlugin we = (WorldEditPlugin) Bukkit.getPluginManager().getPlugin("WorldEdit");
Player[] ps = players.getAll(e);
Boolean[] states = new Boolean[ps.length];
int i = 0;
for (Player p : ps) {
states[i] = we.getSession(p).hasSuperPickAxe();
i++;
}
return states;
}
@SuppressWarnings("unchecked")
@Override
@Nullable
public Class<?>[] acceptChange(ChangeMode mode) {
if (mode == ChangeMode.SET) {
return CollectionUtils.array(Boolean.class);
}
return null;
}
@Override
public void change(Event e, @Nullable Object[] delta, ChangeMode mode) {
if (mode == ChangeMode.SET) {
WorldEditPlugin we = (WorldEditPlugin) Bukkit.getPluginManager().getPlugin("WorldEdit");
Player[] ps = players.getAll(e);
boolean enablePick = (boolean) delta[0];
for (Player p : ps) {
if (enablePick) {
we.getSession(p).enableSuperPickAxe();
} else {
we.getSession(p).disableSuperPickAxe();
}
}
}
}
}

111
src/me/TheBukor/SkStuff/expressions/ExprWGMemberOwner.java Normal file
View File

@@ -0,0 +1,111 @@
package me.TheBukor.SkStuff.expressions;
import java.util.Arrays;
import java.util.Set;
import java.util.UUID;
import javax.annotation.Nullable;
import org.bukkit.Bukkit;
import org.bukkit.OfflinePlayer;
import org.bukkit.event.Event;
import com.sk89q.worldguard.domains.DefaultDomain;
import com.sk89q.worldguard.protection.regions.ProtectedRegion;
import ch.njol.skript.classes.Changer.ChangeMode;
import ch.njol.skript.lang.Expression;
import ch.njol.skript.lang.SkriptParser.ParseResult;
import ch.njol.skript.lang.util.SimpleExpression;
import ch.njol.util.Kleenean;
import ch.njol.util.coll.CollectionUtils;
public class ExprWGMemberOwner extends SimpleExpression<OfflinePlayer> {
private Expression<ProtectedRegion> region;
private int mark;
@Override
public boolean isSingle() {
return false;
}
@Override
public Class<? extends OfflinePlayer> getReturnType() {
return OfflinePlayer.class;
}
@SuppressWarnings("unchecked")
@Override
public boolean init(Expression<?>[] expr, int matchedPattern, Kleenean isDelayed, ParseResult result) {
region = (Expression<ProtectedRegion>) expr[0];
mark = result.mark;
return true;
}
@Override
public String toString(@Nullable Event e, boolean debug) {
String markString = mark == 0 ? "members" : "owners";
return "the " + markString + " of the worldguard region " + region.toString(e, debug);
}
@Override
@Nullable
protected OfflinePlayer[] get(Event e) {
ProtectedRegion reg = region.getSingle(e);
Set<UUID> uuids;
if (mark == 0) {
uuids = reg.getMembers().getUniqueIds();
} else {
uuids = reg.getOwners().getUniqueIds();
}
if (uuids.isEmpty()) {
return null;
}
OfflinePlayer[] offPlayers = new OfflinePlayer[uuids.size()];
int i = 0;
for (UUID uuid : uuids) {
offPlayers[i] = Bukkit.getOfflinePlayer(uuid);
i++;
}
return offPlayers;
}
@SuppressWarnings("unchecked")
@Override
@Nullable
public Class<?>[] acceptChange(ChangeMode mode) {
if (mode == ChangeMode.ADD || mode == ChangeMode.REMOVE) {
return CollectionUtils.array(OfflinePlayer[].class);
}
return null;
}
@Override
public void change(Event e, @Nullable Object[] delta, ChangeMode mode) {
ProtectedRegion reg = region.getSingle(e);
if (mode == ChangeMode.ADD) {
OfflinePlayer[] toAdd = Arrays.copyOf(delta, delta.length, OfflinePlayer[].class);
for (OfflinePlayer offPlayer : toAdd) {
DefaultDomain domain;
if (mark == 0) {
domain = reg.getMembers();
} else {
domain = reg.getOwners();
}
domain.addPlayer(offPlayer.getUniqueId());
}
} else if (mode == ChangeMode.REMOVE) {
OfflinePlayer[] toRemove = Arrays.copyOf(delta, delta.length, OfflinePlayer[].class);
for (OfflinePlayer offPlayer : toRemove) {
DefaultDomain domain;
if (mark == 0) {
domain = reg.getMembers();
} else {
domain = reg.getOwners();
}
domain.removePlayer(offPlayer.getUniqueId());
}
}
}
}