refactor
This commit is contained in:
44
src/main/java/net/govindas/skooldown/Skooldown.java
Normal file
44
src/main/java/net/govindas/skooldown/Skooldown.java
Normal file
@@ -0,0 +1,44 @@
|
||||
package net.govindas.skooldown;
|
||||
|
||||
import ch.njol.skript.Skript;
|
||||
import ch.njol.skript.lang.ExpressionType;
|
||||
import ch.njol.skript.util.Timespan;
|
||||
import net.govindas.skooldown.conditions.CondIsCooldownOver;
|
||||
import net.govindas.skooldown.effects.EffEndCooldown;
|
||||
import net.govindas.skooldown.effects.EffStartCooldown;
|
||||
import net.govindas.skooldown.expressions.ExprCooldown;
|
||||
import net.govindas.skooldown.utilities.CleanupTimer;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
import java.util.Timer;
|
||||
import java.util.concurrent.ConcurrentHashMap;
|
||||
|
||||
public final class Skooldown extends JavaPlugin {
|
||||
public static ConcurrentHashMap<String, Long> cooldowns = new ConcurrentHashMap<String, Long>();
|
||||
private Timer cleanupTimer;
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
Skript.registerAddon(this);
|
||||
Skript.registerEffect(EffStartCooldown.class, "(create|start) [a] cooldown %string% for %timespan%", "(create|start) [a] cooldown %string% for %timespan%");
|
||||
|
||||
|
||||
Skript.registerEffect(EffEndCooldown.class, "(reset|stop|delete|clear) cooldown %string%");
|
||||
|
||||
Skript.registerCondition(CondIsCooldownOver.class, "cooldown %string% (is|has) (finished|over|done)", "cooldown %string% is(n't| not) unfinished)", "cooldown %string% is(n't| not) (finished|over|done)", "cooldown %string% is unfinished");
|
||||
Skript.registerExpression(ExprCooldown.class, Timespan.class, ExpressionType.PROPERTY, "cooldown %string%");
|
||||
|
||||
getLogger().info("Skript addon enabled!");
|
||||
|
||||
|
||||
cleanupTimer = new CleanupTimer().start();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDisable() {
|
||||
cooldowns = null;
|
||||
getLogger().info("Skript addon disabled!");
|
||||
cleanupTimer.cancel();
|
||||
cleanupTimer = null;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,44 @@
|
||||
package net.govindas.skooldown.conditions;
|
||||
|
||||
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 net.govindas.skooldown.Skooldown;
|
||||
import org.bukkit.event.Event;
|
||||
|
||||
public class CondIsCooldownOver extends Condition {
|
||||
|
||||
private Expression<String> name;
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
|
||||
public boolean init(final Expression<?>[] expr, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
|
||||
name = (Expression<String>) expr[0];
|
||||
setNegated(matchedPattern == 2 || matchedPattern == 3);
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString(Event event, boolean debug) {
|
||||
return "is cooldown over " + name.toString(event, debug);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean check(Event e) {
|
||||
Long cooldown = Skooldown.cooldowns.get(name.getSingle(e));
|
||||
|
||||
//if cooldown isn't created, will return that it is over
|
||||
if (cooldown == null) return !isNegated();
|
||||
|
||||
if (cooldown < System.currentTimeMillis()) {
|
||||
Skooldown.cooldowns.remove(name.getSingle(e));
|
||||
//will return that cooldown is over
|
||||
return !isNegated();
|
||||
}
|
||||
//will return that cooldown is not over
|
||||
|
||||
return isNegated();
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,31 @@
|
||||
package net.govindas.skooldown.effects;
|
||||
|
||||
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 net.govindas.skooldown.Skooldown;
|
||||
import org.bukkit.event.Event;
|
||||
|
||||
public class EffEndCooldown extends Effect {
|
||||
|
||||
private Expression<String> name;
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public boolean init(final Expression<?>[] expr, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
|
||||
name = (Expression<String>) expr[0];
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString(Event event, boolean debug) {
|
||||
return "end cooldown " + name.toString(event, debug);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void execute(Event e) {
|
||||
Skooldown.cooldowns.remove(name.getSingle(e));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
package net.govindas.skooldown.effects;
|
||||
|
||||
import ch.njol.skript.lang.Effect;
|
||||
import ch.njol.skript.lang.Expression;
|
||||
import ch.njol.skript.lang.SkriptParser.ParseResult;
|
||||
import ch.njol.skript.util.Timespan;
|
||||
import ch.njol.util.Kleenean;
|
||||
import net.govindas.skooldown.Skooldown;
|
||||
import org.bukkit.event.Event;
|
||||
|
||||
public class EffStartCooldown extends Effect {
|
||||
|
||||
private Expression<String> name;
|
||||
private Expression<Timespan> time;
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public boolean init(final Expression<?>[] expr, final int matchedPattern, final Kleenean isDelayed, final ParseResult parseResult) {
|
||||
name = (Expression<String>) expr[0];
|
||||
time = (Expression<Timespan>) expr[1];
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString(Event event, boolean debug) {
|
||||
return "start cooldown " + name.toString(event, debug) + " for " + time.toString(event, debug);
|
||||
}
|
||||
|
||||
@Override
|
||||
protected void execute(Event e) {
|
||||
Skooldown.cooldowns.put(name.getSingle(e), System.currentTimeMillis() + time.getSingle(e).getMilliSeconds());
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,5 @@
|
||||
package net.govindas.skooldown.expressions;
|
||||
|
||||
public class ExprAllCooldowns {
|
||||
//TODO
|
||||
}
|
||||
@@ -0,0 +1,100 @@
|
||||
package net.govindas.skooldown.expressions;
|
||||
|
||||
|
||||
import ch.njol.skript.classes.Changer;
|
||||
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.skript.util.Timespan;
|
||||
import ch.njol.util.Kleenean;
|
||||
import ch.njol.util.coll.CollectionUtils;
|
||||
import net.govindas.skooldown.Skooldown;
|
||||
import org.bukkit.event.Event;
|
||||
|
||||
public class ExprCooldown extends SimpleExpression<Timespan> {
|
||||
|
||||
private Expression<String> name;
|
||||
|
||||
@Override
|
||||
public boolean isSingle() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Class<? extends Timespan> getReturnType() {
|
||||
return Timespan.class;
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
@Override
|
||||
public boolean init(final Expression<?>[] expr, final int matchedPattern, final Kleenean isDelayed, final ParseResult paramParseResult) {
|
||||
name = (Expression<String>) expr[0];
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString(Event event, boolean debug) { return "get cooldown " + name.toString(event, debug); }
|
||||
|
||||
@Override
|
||||
protected Timespan[] get(Event e) {
|
||||
Long cooldown;
|
||||
cooldown = Skooldown.cooldowns.get(name.getSingle(e));
|
||||
|
||||
//if cooldown isn't created, will return that it is over
|
||||
|
||||
if (cooldown == null) return new Timespan[]{new Timespan(0)};
|
||||
|
||||
//if cooldown has expired, will return 0ms
|
||||
|
||||
if (cooldown < System.currentTimeMillis()) {
|
||||
Skooldown.cooldowns.remove(name.getSingle(e));
|
||||
return new Timespan[]{new Timespan(0)};
|
||||
}
|
||||
//return time left
|
||||
return new Timespan[]{new Timespan(cooldown - System.currentTimeMillis())};
|
||||
}
|
||||
|
||||
@Override
|
||||
public void change(Event e, Object[] changer, ChangeMode mode) {
|
||||
switch (mode) {
|
||||
case SET:
|
||||
Skooldown.cooldowns.put(name.getSingle(e), System.currentTimeMillis() + ((Timespan) changer[0]).getMilliSeconds());
|
||||
break;
|
||||
case REMOVE_ALL:
|
||||
case DELETE:
|
||||
case RESET:
|
||||
|
||||
Skooldown.cooldowns.remove(name.getSingle(e));
|
||||
break;
|
||||
case ADD:
|
||||
Long cooldown = Skooldown.cooldowns.get(name.getSingle(e));
|
||||
if (cooldown == null) {
|
||||
Skooldown.cooldowns.put(name.getSingle(e), System.currentTimeMillis() + ((Timespan) changer[0]).getMilliSeconds());
|
||||
break;
|
||||
}
|
||||
Skooldown.cooldowns.put(name.getSingle(e), cooldown + ((Timespan) changer[0]).getMilliSeconds());
|
||||
break;
|
||||
case REMOVE:
|
||||
cooldown = Skooldown.cooldowns.get(name.getSingle(e));
|
||||
//if removing from non-existent cooldown, do nothing
|
||||
if (cooldown == null) return;
|
||||
|
||||
//remove cooldown from hashMap if it would expire with new value
|
||||
|
||||
if ((cooldown - ((Timespan) changer[0]).getMilliSeconds()) < System.currentTimeMillis()) {
|
||||
Skooldown.cooldowns.remove(name.getSingle(e));
|
||||
} else {
|
||||
Skooldown.cooldowns.put(name.getSingle(e), cooldown - ((Timespan) changer[0]).getMilliSeconds());
|
||||
}
|
||||
break;
|
||||
default:
|
||||
throw new IllegalStateException("Unexpected value: " + mode);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@Override
|
||||
public Class<?>[] acceptChange(final Changer.ChangeMode mode) { return CollectionUtils.array(Timespan.class); }
|
||||
}
|
||||
|
||||
@@ -0,0 +1,45 @@
|
||||
package net.govindas.skooldown.utilities;
|
||||
|
||||
import net.govindas.skooldown.Skooldown;
|
||||
import org.bukkit.Bukkit;
|
||||
|
||||
import java.util.Iterator;
|
||||
import java.util.Map;
|
||||
import java.util.Timer;
|
||||
import java.util.TimerTask;
|
||||
import java.util.logging.Level;
|
||||
|
||||
public class CleanupTimer {
|
||||
//Regular Cleanup Timer to prevent memory leaks
|
||||
public CleanupTimer() {}
|
||||
public Timer start() {
|
||||
Timer timer = new Timer();
|
||||
TimerTask regularTask = new TimerTask() {
|
||||
int i = 0;
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
Iterator it = Skooldown.cooldowns.entrySet().iterator();
|
||||
i = 0;
|
||||
while (it.hasNext()) {
|
||||
Map.Entry pair = (Map.Entry) it.next();
|
||||
|
||||
long value = (long) pair.getValue();
|
||||
if (value < System.currentTimeMillis()) {
|
||||
i++;
|
||||
|
||||
it.remove();
|
||||
}
|
||||
}
|
||||
if (i > 0) {
|
||||
Bukkit.getLogger().log(Level.INFO, "[Skooldown Regular Memory Cleanup] " + i + " finished cooldowns cleared from memory.");
|
||||
}
|
||||
}
|
||||
|
||||
};
|
||||
//regular schedule
|
||||
int minutes = 30;
|
||||
timer.schedule(regularTask, 100, 1000 * 60 * minutes);
|
||||
return timer;
|
||||
}
|
||||
}
|
||||
5
src/main/resources/plugin.yml
Normal file
5
src/main/resources/plugin.yml
Normal file
@@ -0,0 +1,5 @@
|
||||
name: Skooldown
|
||||
main: net.govindas.skooldown.Skooldown
|
||||
version: 1.2.0
|
||||
author: Govindas
|
||||
depend: [Skript]
|
||||
Reference in New Issue
Block a user