General AAC Update & Fix

plugin.yml

@@ -1,6 +1,6 @@
 main: pl.pickaxe.largesk.LargeSk
 name: LargeSk
-version: 0.4
+version: 0.5
 description: An addon for Skript with some cool features.
 author: Nicofisi
 website: http://github.com/Nicofisi/LargeSk

src/pl/pickaxe/largesk/LargeSk.java

@@ -10,6 +10,11 @@
 import pl.pickaxe.largesk.GeneralEffects.EffDisableAllPlugins;
 import pl.pickaxe.largesk.GeneralExpressions.ExprFullTime;
 import pl.pickaxe.largesk.SkinsRestorer.ExprSkinOfPlayer;
+import pl.pickaxe.largesk.aac.CondIsBypassed;
+import pl.pickaxe.largesk.aac.CondOnGround;
+import pl.pickaxe.largesk.aac.EffReloadAAC;
+import pl.pickaxe.largesk.aac.EffReloadPermissionCache;
+import pl.pickaxe.largesk.aac.ExprAacPing;
 
 public class LargeSk extends JavaPlugin {
 
@@ -24,13 +29,22 @@ public void onEnable() {
 		Skript.registerEffect(EffSendMessage.class, "send great message %string% to %player%");
 		Skript.registerEvent("Amazing Player Level Change", SimpleEvent.class, PlayerLevelChangeEvent.class, "amazing player level change");
 
-		//Real
+		//General Expressions
 		Skript.registerExpression(ExprFullTime.class, Long.class, ExpressionType.PROPERTY, "(full|total)[ ]time of %world%","%world%'s (full|total)[ ]time");
 		//Skript.registerExpression(ExprCakeSlicesEaten.class, Integer.class, ExpressionType.PROPERTY, "[the] [(amount|number) of] (slices eaten|eaten slices) of %block%");
+
+		//General Effects
 		Skript.registerEffect(EffDisableAllPlugins.class, "disable all plugins","disable every plugin");
 
 		//AAC
-		//Coming Soon
+		if (getServer().getPluginManager().isPluginEnabled("AAC")) {
+			getLogger().info("You've got AAC, wow. You are so rich ^^ I'll collaborate!");
+			Skript.registerCondition(CondIsBypassed.class, "[aac] %player%('s| is) bypass(ed|ing) aac");
+			Skript.registerCondition(CondOnGround.class, "[aac] %player%('s| is) (on ground|not in air)");
+			Skript.registerExpression(ExprAacPing.class, Integer.class, ExpressionType.PROPERTY, "aac (ping of %player%|%player%'s ping)", "[aac] (ping of %player%|%player%'s ping) by aac");
+			Skript.registerEffect(EffReloadAAC.class, "aac reload [config[s]]","reload aac [config[s]]","reload config[s] of aac");
+			Skript.registerEffect(EffReloadPermissionCache.class, "aac reload permission(s|[s] cache)","reload permission(s|[s] cache) of aac","reload aac's permission(s|[s] cache)");
+		}
 
 		//SkinsRestorer
 		if (getServer().getPluginManager().isPluginEnabled("SkinsRestorer")) {

src/pl/pickaxe/largesk/aac/CondIsPlayerOnGround.java → src/pl/pickaxe/largesk/aac/CondIsBypassed.java

@@ -8,9 +8,9 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
-import me.konsolas.aac.api.AACAPI;
+import me.konsolas.aac.api.AACAPIProvider;
 
-public class CondIsPlayerOnGround extends Condition {
+public class CondIsBypassed extends Condition {
 
 	private Expression<Player> p;
 
@@ -23,14 +23,17 @@ public boolean init(Expression<?>[] e, int arg1, Kleenean arg2, ParseResult arg3
 
 	@Override
 	public String toString(@Nullable Event arg0, boolean arg1) {
-		return "is player on ground";
+		return "aac player is bypassed";
 	}
 
 	@Override
 	public boolean check(Event e) {
-		if (AACAPI.isPlayerOnGround(p.getSingle(e)) == true) {
+		if (AACAPIProvider.isAPILoaded() && AACAPIProvider.getAPI().isBypassed(p.getSingle(e)))
+		{
 			return true;
-		} else {
+		}
+		else
+		{
 			return false;
 		}
 	}

src/pl/pickaxe/largesk/aac/CondOnGround.java

@@ -0,0 +1,41 @@
+package pl.pickaxe.largesk.aac;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import javax.annotation.Nullable;
+
+import ch.njol.skript.lang.Condition;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import me.konsolas.aac.api.AACAPIProvider;
+
+public class CondOnGround extends Condition {
+
+	private Expression<Player> p;
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public boolean init(Expression<?>[] e, int arg1, Kleenean arg2, ParseResult arg3) {
+		p = (Expression<Player>) e[0];
+		return true;
+	}
+
+	@Override
+	public String toString(@Nullable Event arg0, boolean arg1) {
+		return "aac player on ground";
+	}
+
+	@Override
+	public boolean check(Event e) {
+		if (AACAPIProvider.isAPILoaded() && AACAPIProvider.getAPI().isPlayerOnGround(p.getSingle(e)))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+}

src/pl/pickaxe/largesk/aac/EffReloadAAC.java

@@ -7,7 +7,7 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser.ParseResult;
 import ch.njol.util.Kleenean;
-import me.konsolas.aac.api.AACAPI;;
+import me.konsolas.aac.api.AACAPIProvider;
 
 public class EffReloadAAC extends Effect {
 
@@ -23,7 +23,9 @@ public String toString(@Nullable Event arg0, boolean arg1) {
 
 	@Override
 	protected void execute(Event arg0) {
-		AACAPI.reloadAAC();
+		if (AACAPIProvider.isAPILoaded() == true) {
+			AACAPIProvider.getAPI().reloadAAC();
+		}
 	}
 
 }

src/pl/pickaxe/largesk/aac/EffReloadPermissionCache.java

@@ -0,0 +1,31 @@
+package pl.pickaxe.largesk.aac;
+
+import org.bukkit.event.Event;
+import javax.annotation.Nullable;
+
+import ch.njol.skript.lang.Effect;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser.ParseResult;
+import ch.njol.util.Kleenean;
+import me.konsolas.aac.api.AACAPIProvider;
+
+public class EffReloadPermissionCache extends Effect {
+
+	@Override
+	public boolean init(Expression<?>[] arg0, int arg1, Kleenean arg2, ParseResult arg3) {
+		return true;
+	}
+
+	@Override
+	public String toString(@Nullable Event arg0, boolean arg1) {
+		return "aac reload permission cache";
+	}
+
+	@Override
+	protected void execute(Event arg0) {
+		if (AACAPIProvider.isAPILoaded() == true) {
+			AACAPIProvider.getAPI().reloadPermissionCache();
+		}
+	}
+
+}

src/pl/pickaxe/largesk/aac/ExprAacPing.java

@@ -0,0 +1,59 @@
+package pl.pickaxe.largesk.aac;
+
+import org.bukkit.entity.Player;
+import org.bukkit.event.Event;
+import javax.annotation.Nullable;
+
+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 me.konsolas.aac.api.AACAPIProvider;
+
+public class ExprAacPing extends SimpleExpression<Integer>
+{
+	// full time of %world%
+
+	private Expression<Player> player;
+
+	@Override
+	public Class<? extends Integer> getReturnType()
+	{
+		return Integer.class;
+	}
+
+	@Override
+	public boolean isSingle()
+	{
+		return true;
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public boolean init(Expression<?>[] expr, int arg1, Kleenean arg2, ParseResult arg3)
+	{
+		player = (Expression<Player>) expr[0];
+		return true;
+	}
+
+	@Override
+	public String toString(@Nullable Event arg0, boolean arg1)
+	{
+		return "full time";
+	}
+
+	@Override
+	@Nullable
+	protected Integer[] get(Event e)
+	{
+		if (AACAPIProvider.isAPILoaded())
+		{
+			return new Integer[]{AACAPIProvider.getAPI().getPing(player.getSingle(e))};
+		}
+		else
+		{
+			return new Integer[]{0};
+		}
+	}
+
+}