diff --git a/pom.xml b/pom.xml index 66d0090..0c83bd5 100644 --- a/pom.xml +++ b/pom.xml @@ -4,12 +4,12 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 - nl.SBDeveloper + tech.sbdevelopment ShowControl - 1.3 + 1.4 jar ShowControl - https://sbdplugins.nl + https://sbdevelopment.tech Create shows easily using this plugin! diff --git a/src/main/java/nl/sbdeveloper/showcontrol/ShowControlPlugin.java b/src/main/java/tech/sbdevelopment/showcontrol/ShowControlPlugin.java similarity index 80% rename from src/main/java/nl/sbdeveloper/showcontrol/ShowControlPlugin.java rename to src/main/java/tech/sbdevelopment/showcontrol/ShowControlPlugin.java index b4879a7..7f5fde5 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/ShowControlPlugin.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/ShowControlPlugin.java @@ -1,11 +1,11 @@ -package nl.sbdeveloper.showcontrol; +package tech.sbdevelopment.showcontrol; import co.aikar.commands.PaperCommandManager; -import nl.sbdeveloper.showcontrol.api.ShowAPI; -import nl.sbdeveloper.showcontrol.commands.ShowCMD; -import nl.sbdeveloper.showcontrol.data.DataStorage; -import nl.sbdeveloper.showcontrol.data.Shows; -import nl.sbdeveloper.showcontrol.utils.inventories.Inventory; +import tech.sbdevelopment.showcontrol.api.ShowAPI; +import tech.sbdevelopment.showcontrol.commands.ShowCMD; +import tech.sbdevelopment.showcontrol.data.DataStorage; +import tech.sbdevelopment.showcontrol.data.Shows; +import tech.sbdevelopment.showcontrol.utils.inventories.Inventory; import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; @@ -32,7 +32,7 @@ public final class ShowControlPlugin extends JavaPlugin { Inventory.init(this); getLogger().info("Loading default triggers..."); - ShowAPI.index(ShowControlPlugin.class, "nl.sbdeveloper.showcontrol.api.triggers.impl"); + ShowAPI.index(ShowControlPlugin.class, "tech.sbdevelopment.showcontrol.api.triggers.impl"); Bukkit.getScheduler().runTaskLater(this, DataStorage::load, 1L); //Load 1 tick later, because of multi world diff --git a/src/main/java/nl/sbdeveloper/showcontrol/api/InvalidArgumentException.java b/src/main/java/tech/sbdevelopment/showcontrol/api/InvalidArgumentException.java similarity index 74% rename from src/main/java/nl/sbdeveloper/showcontrol/api/InvalidArgumentException.java rename to src/main/java/tech/sbdevelopment/showcontrol/api/InvalidArgumentException.java index 549ab01..61d7c43 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/api/InvalidArgumentException.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/api/InvalidArgumentException.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.showcontrol.api; +package tech.sbdevelopment.showcontrol.api; import lombok.experimental.StandardException; diff --git a/src/main/java/nl/sbdeveloper/showcontrol/api/InvalidTriggerException.java b/src/main/java/tech/sbdevelopment/showcontrol/api/InvalidTriggerException.java similarity index 74% rename from src/main/java/nl/sbdeveloper/showcontrol/api/InvalidTriggerException.java rename to src/main/java/tech/sbdevelopment/showcontrol/api/InvalidTriggerException.java index da8c819..26f60b0 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/api/InvalidTriggerException.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/api/InvalidTriggerException.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.showcontrol.api; +package tech.sbdevelopment.showcontrol.api; import lombok.experimental.StandardException; diff --git a/src/main/java/nl/sbdeveloper/showcontrol/api/ShowAPI.java b/src/main/java/tech/sbdevelopment/showcontrol/api/ShowAPI.java similarity index 69% rename from src/main/java/nl/sbdeveloper/showcontrol/api/ShowAPI.java rename to src/main/java/tech/sbdevelopment/showcontrol/api/ShowAPI.java index 9b11845..e022170 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/api/ShowAPI.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/api/ShowAPI.java @@ -1,9 +1,9 @@ -package nl.sbdeveloper.showcontrol.api; +package tech.sbdevelopment.showcontrol.api; import lombok.Getter; -import nl.sbdeveloper.showcontrol.api.triggers.Trigger; -import nl.sbdeveloper.showcontrol.api.triggers.TriggerIdentifier; -import org.bukkit.Bukkit; +import tech.sbdevelopment.showcontrol.ShowControlPlugin; +import tech.sbdevelopment.showcontrol.api.triggers.Trigger; +import tech.sbdevelopment.showcontrol.api.triggers.TriggerIdentifier; import org.reflections.Reflections; import org.reflections.scanners.Scanners; import org.reflections.util.ClasspathHelper; @@ -21,7 +21,7 @@ public class ShowAPI { private static final Map> triggers = new HashMap<>(); public static void index(Class clazz, String... packages) { - Bukkit.getLogger().info("Indexing triggers for starting point " + clazz.getSimpleName() + "..."); + ShowControlPlugin.getInstance().getLogger().info("Indexing triggers for starting point " + clazz.getSimpleName() + "..."); FilterBuilder filterBuilder = new FilterBuilder(); for (String p : packages) filterBuilder.includePackage(p); @@ -35,7 +35,7 @@ public class ShowAPI { Set> trig = reflections.getTypesAnnotatedWith(TriggerIdentifier.class); for (Class trigger : trig) { - Bukkit.getLogger().info("Found trigger " + trigger.getSimpleName() + "."); + ShowControlPlugin.getInstance().getLogger().info("Found trigger " + trigger.getSimpleName() + "."); TriggerIdentifier identifier = trigger.getAnnotation(TriggerIdentifier.class); triggers.put(identifier.value(), (Class) trigger); @@ -48,10 +48,12 @@ public class ShowAPI { String triggerType = dataSplitter[0]; - if (!triggers.containsKey(triggerType)) throw new InvalidTriggerException("Provided trigger " + triggerType + " does not exists!"); + if (!triggers.containsKey(triggerType)) + throw new InvalidTriggerException("Provided trigger " + triggerType + " does not exists!"); Constructor ctor = (Constructor) triggers.get(triggerType).getConstructor(String[].class); - if (dataSplitter.length < triggers.get(triggerType).getAnnotation(TriggerIdentifier.class).minArgs() + 1) throw new TooFewArgumentsException("Provided triggerdata " + data + " has too few arguments!"); - return ctor.newInstance(new Object[] { dataSplitterNew }); + if (dataSplitter.length < triggers.get(triggerType).getAnnotation(TriggerIdentifier.class).minArgs() + 1) + throw new TooFewArgumentsException("Provided triggerdata " + data + " has too few arguments!"); + return ctor.newInstance(new Object[]{dataSplitterNew}); } } diff --git a/src/main/java/nl/sbdeveloper/showcontrol/api/ShowCuePoint.java b/src/main/java/tech/sbdevelopment/showcontrol/api/ShowCuePoint.java similarity index 91% rename from src/main/java/nl/sbdeveloper/showcontrol/api/ShowCuePoint.java rename to src/main/java/tech/sbdevelopment/showcontrol/api/ShowCuePoint.java index 5e790d3..1bc5928 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/api/ShowCuePoint.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/api/ShowCuePoint.java @@ -1,6 +1,6 @@ -package nl.sbdeveloper.showcontrol.api; +package tech.sbdevelopment.showcontrol.api; -import nl.sbdeveloper.showcontrol.api.triggers.Trigger; +import tech.sbdevelopment.showcontrol.api.triggers.Trigger; import java.util.UUID; diff --git a/src/main/java/nl/sbdeveloper/showcontrol/api/TooFewArgumentsException.java b/src/main/java/tech/sbdevelopment/showcontrol/api/TooFewArgumentsException.java similarity index 74% rename from src/main/java/nl/sbdeveloper/showcontrol/api/TooFewArgumentsException.java rename to src/main/java/tech/sbdevelopment/showcontrol/api/TooFewArgumentsException.java index 4482507..44fdc54 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/api/TooFewArgumentsException.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/api/TooFewArgumentsException.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.showcontrol.api; +package tech.sbdevelopment.showcontrol.api; import lombok.experimental.StandardException; diff --git a/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/Trigger.java b/src/main/java/tech/sbdevelopment/showcontrol/api/triggers/Trigger.java similarity index 90% rename from src/main/java/nl/sbdeveloper/showcontrol/api/triggers/Trigger.java rename to src/main/java/tech/sbdevelopment/showcontrol/api/triggers/Trigger.java index 693c082..1e4cc4d 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/Trigger.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/api/triggers/Trigger.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.showcontrol.api.triggers; +package tech.sbdevelopment.showcontrol.api.triggers; import lombok.AllArgsConstructor; import lombok.Getter; @@ -17,7 +17,8 @@ public abstract class Trigger { * This method gets fired when the cue gets removed * It's not required, and does nothing if it's not needed. */ - public void remove() {} + public void remove() { + } /** * Get the datastring from this cue diff --git a/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/TriggerIdentifier.java b/src/main/java/tech/sbdevelopment/showcontrol/api/triggers/TriggerIdentifier.java similarity index 88% rename from src/main/java/nl/sbdeveloper/showcontrol/api/triggers/TriggerIdentifier.java rename to src/main/java/tech/sbdevelopment/showcontrol/api/triggers/TriggerIdentifier.java index 9c29cc2..8651a42 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/TriggerIdentifier.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/api/triggers/TriggerIdentifier.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.showcontrol.api.triggers; +package tech.sbdevelopment.showcontrol.api.triggers; import org.bukkit.Material; @@ -11,7 +11,10 @@ import java.lang.annotation.Target; @Target(ElementType.TYPE) public @interface TriggerIdentifier { String value(); + int minArgs() default 0; + String argDesc() default ""; + Material item() default Material.NOTE_BLOCK; } diff --git a/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/AnimaTrigger.java b/src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/AnimaTrigger.java similarity index 68% rename from src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/AnimaTrigger.java rename to src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/AnimaTrigger.java index 30d62a9..be95e9f 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/AnimaTrigger.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/AnimaTrigger.java @@ -1,7 +1,7 @@ -package nl.sbdeveloper.showcontrol.api.triggers.impl; +package tech.sbdevelopment.showcontrol.api.triggers.impl; -import nl.sbdeveloper.showcontrol.api.triggers.Trigger; -import nl.sbdeveloper.showcontrol.api.triggers.TriggerIdentifier; +import tech.sbdevelopment.showcontrol.api.triggers.Trigger; +import tech.sbdevelopment.showcontrol.api.triggers.TriggerIdentifier; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/CommandTrigger.java b/src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/CommandTrigger.java similarity index 69% rename from src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/CommandTrigger.java rename to src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/CommandTrigger.java index c404768..0eb368f 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/CommandTrigger.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/CommandTrigger.java @@ -1,7 +1,7 @@ -package nl.sbdeveloper.showcontrol.api.triggers.impl; +package tech.sbdevelopment.showcontrol.api.triggers.impl; -import nl.sbdeveloper.showcontrol.api.triggers.Trigger; -import nl.sbdeveloper.showcontrol.api.triggers.TriggerIdentifier; +import tech.sbdevelopment.showcontrol.api.triggers.Trigger; +import tech.sbdevelopment.showcontrol.api.triggers.TriggerIdentifier; import org.bukkit.Bukkit; import org.bukkit.Material; diff --git a/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/FireworkTrigger.java b/src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/FireworkTrigger.java similarity index 82% rename from src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/FireworkTrigger.java rename to src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/FireworkTrigger.java index b1b2069..1551c09 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/FireworkTrigger.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/FireworkTrigger.java @@ -1,10 +1,10 @@ -package nl.sbdeveloper.showcontrol.api.triggers.impl; +package tech.sbdevelopment.showcontrol.api.triggers.impl; -import nl.sbdeveloper.showcontrol.api.InvalidArgumentException; -import nl.sbdeveloper.showcontrol.api.triggers.Trigger; -import nl.sbdeveloper.showcontrol.api.triggers.TriggerIdentifier; -import nl.sbdeveloper.showcontrol.elements.Fireworks; -import nl.sbdeveloper.showcontrol.utils.Color; +import tech.sbdevelopment.showcontrol.api.InvalidArgumentException; +import tech.sbdevelopment.showcontrol.api.triggers.Trigger; +import tech.sbdevelopment.showcontrol.api.triggers.TriggerIdentifier; +import tech.sbdevelopment.showcontrol.elements.Fireworks; +import tech.sbdevelopment.showcontrol.utils.Color; import org.bukkit.*; @TriggerIdentifier(value = "firework", minArgs = 5, argDesc = " ", item = Material.FIREWORK_ROCKET) @@ -40,7 +40,7 @@ public class FireworkTrigger extends Trigger { String key = data[i].split(":")[0]; String value = data[i].split(":")[1]; if (key.equalsIgnoreCase("color")) { - firework = firework.addColor(Color.valueOf(value.toUpperCase()).getBukkitColor()); + firework = firework.addColor(tech.sbdevelopment.showcontrol.utils.Color.valueOf(value.toUpperCase()).getBukkitColor()); } else if (key.equalsIgnoreCase("shape")) { firework = firework.setType(FireworkEffect.Type.valueOf(value.toUpperCase())); } else if (key.equalsIgnoreCase("fade")) { diff --git a/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/FlameThrowerTrigger.java b/src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/FlameThrowerTrigger.java similarity index 65% rename from src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/FlameThrowerTrigger.java rename to src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/FlameThrowerTrigger.java index 0f04df7..20aee37 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/FlameThrowerTrigger.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/FlameThrowerTrigger.java @@ -1,7 +1,7 @@ -package nl.sbdeveloper.showcontrol.api.triggers.impl; +package tech.sbdevelopment.showcontrol.api.triggers.impl; -import nl.sbdeveloper.showcontrol.api.triggers.Trigger; -import nl.sbdeveloper.showcontrol.api.triggers.TriggerIdentifier; +import tech.sbdevelopment.showcontrol.api.triggers.Trigger; +import tech.sbdevelopment.showcontrol.api.triggers.TriggerIdentifier; import org.bukkit.Material; @TriggerIdentifier(value = "flamethrower", minArgs = 5, argDesc = " ", item = Material.FIRE) diff --git a/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/LaserTrigger.java b/src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/LaserTrigger.java similarity index 79% rename from src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/LaserTrigger.java rename to src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/LaserTrigger.java index 931e0da..77a693f 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/LaserTrigger.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/LaserTrigger.java @@ -1,9 +1,9 @@ -package nl.sbdeveloper.showcontrol.api.triggers.impl; +package tech.sbdevelopment.showcontrol.api.triggers.impl; -import nl.sbdeveloper.showcontrol.api.InvalidArgumentException; -import nl.sbdeveloper.showcontrol.api.triggers.Trigger; -import nl.sbdeveloper.showcontrol.api.triggers.TriggerIdentifier; -import nl.sbdeveloper.showcontrol.elements.Lasers; +import tech.sbdevelopment.showcontrol.api.InvalidArgumentException; +import tech.sbdevelopment.showcontrol.api.triggers.Trigger; +import tech.sbdevelopment.showcontrol.api.triggers.TriggerIdentifier; +import tech.sbdevelopment.showcontrol.elements.Lasers; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/ParticleTrigger.java b/src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/ParticleTrigger.java similarity index 86% rename from src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/ParticleTrigger.java rename to src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/ParticleTrigger.java index e5e8671..ea5026d 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/ParticleTrigger.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/ParticleTrigger.java @@ -1,8 +1,8 @@ -package nl.sbdeveloper.showcontrol.api.triggers.impl; +package tech.sbdevelopment.showcontrol.api.triggers.impl; -import nl.sbdeveloper.showcontrol.api.InvalidArgumentException; -import nl.sbdeveloper.showcontrol.api.triggers.Trigger; -import nl.sbdeveloper.showcontrol.api.triggers.TriggerIdentifier; +import tech.sbdevelopment.showcontrol.api.InvalidArgumentException; +import tech.sbdevelopment.showcontrol.api.triggers.Trigger; +import tech.sbdevelopment.showcontrol.api.triggers.TriggerIdentifier; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Particle; diff --git a/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/SpotTrigger.java b/src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/SpotTrigger.java similarity index 81% rename from src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/SpotTrigger.java rename to src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/SpotTrigger.java index ec64ce7..ce64874 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/impl/SpotTrigger.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/api/triggers/impl/SpotTrigger.java @@ -1,9 +1,9 @@ -package nl.sbdeveloper.showcontrol.api.triggers.impl; +package tech.sbdevelopment.showcontrol.api.triggers.impl; -import nl.sbdeveloper.showcontrol.api.InvalidArgumentException; -import nl.sbdeveloper.showcontrol.api.triggers.Trigger; -import nl.sbdeveloper.showcontrol.api.triggers.TriggerIdentifier; -import nl.sbdeveloper.showcontrol.elements.Spots; +import tech.sbdevelopment.showcontrol.api.InvalidArgumentException; +import tech.sbdevelopment.showcontrol.api.triggers.Trigger; +import tech.sbdevelopment.showcontrol.api.triggers.TriggerIdentifier; +import tech.sbdevelopment.showcontrol.elements.Spots; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/main/java/nl/sbdeveloper/showcontrol/commands/ShowCMD.java b/src/main/java/tech/sbdevelopment/showcontrol/commands/ShowCMD.java similarity index 89% rename from src/main/java/nl/sbdeveloper/showcontrol/commands/ShowCMD.java rename to src/main/java/tech/sbdevelopment/showcontrol/commands/ShowCMD.java index ebb872b..4ebb5a0 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/commands/ShowCMD.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/commands/ShowCMD.java @@ -1,14 +1,14 @@ -package nl.sbdeveloper.showcontrol.commands; +package tech.sbdevelopment.showcontrol.commands; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.*; -import nl.sbdeveloper.showcontrol.api.InvalidTriggerException; -import nl.sbdeveloper.showcontrol.api.ShowAPI; -import nl.sbdeveloper.showcontrol.api.TooFewArgumentsException; -import nl.sbdeveloper.showcontrol.api.triggers.Trigger; -import nl.sbdeveloper.showcontrol.data.Shows; -import nl.sbdeveloper.showcontrol.gui.ShowCueGUI; -import nl.sbdeveloper.showcontrol.utils.TimeUtil; +import tech.sbdevelopment.showcontrol.api.InvalidTriggerException; +import tech.sbdevelopment.showcontrol.api.ShowAPI; +import tech.sbdevelopment.showcontrol.api.TooFewArgumentsException; +import tech.sbdevelopment.showcontrol.api.triggers.Trigger; +import tech.sbdevelopment.showcontrol.data.Shows; +import tech.sbdevelopment.showcontrol.gui.ShowCueGUI; +import tech.sbdevelopment.showcontrol.utils.TimeUtil; import org.bukkit.ChatColor; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; diff --git a/src/main/java/nl/sbdeveloper/showcontrol/data/DataStorage.java b/src/main/java/tech/sbdevelopment/showcontrol/data/DataStorage.java similarity index 73% rename from src/main/java/nl/sbdeveloper/showcontrol/data/DataStorage.java rename to src/main/java/tech/sbdevelopment/showcontrol/data/DataStorage.java index ea64d34..6d45fdb 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/data/DataStorage.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/data/DataStorage.java @@ -1,12 +1,12 @@ -package nl.sbdeveloper.showcontrol.data; +package tech.sbdevelopment.showcontrol.data; -import nl.sbdeveloper.showcontrol.ShowControlPlugin; -import nl.sbdeveloper.showcontrol.api.InvalidTriggerException; -import nl.sbdeveloper.showcontrol.api.ShowAPI; -import nl.sbdeveloper.showcontrol.api.ShowCuePoint; -import nl.sbdeveloper.showcontrol.api.TooFewArgumentsException; -import nl.sbdeveloper.showcontrol.api.triggers.Trigger; -import nl.sbdeveloper.showcontrol.utils.YamlFile; +import tech.sbdevelopment.showcontrol.ShowControlPlugin; +import tech.sbdevelopment.showcontrol.api.InvalidTriggerException; +import tech.sbdevelopment.showcontrol.api.ShowAPI; +import tech.sbdevelopment.showcontrol.api.ShowCuePoint; +import tech.sbdevelopment.showcontrol.api.TooFewArgumentsException; +import tech.sbdevelopment.showcontrol.api.triggers.Trigger; +import tech.sbdevelopment.showcontrol.utils.YamlFile; import java.io.File; import java.util.*; @@ -19,6 +19,12 @@ public class DataStorage { } public static void load() { + // Create data folder if not exists + if (!ShowControlPlugin.getInstance().getDataFolder().exists()) + ShowControlPlugin.getInstance().getDataFolder().mkdir(); + if (!new File(ShowControlPlugin.getInstance().getDataFolder(), "data").exists()) + new File(ShowControlPlugin.getInstance().getDataFolder(), "data").mkdir(); + File showsFolder = new File(ShowControlPlugin.getInstance().getDataFolder(), "data"); for (File showFile : showsFolder.listFiles()) { String showID = removeExtension(showFile.getName()); diff --git a/src/main/java/nl/sbdeveloper/showcontrol/data/Shows.java b/src/main/java/tech/sbdevelopment/showcontrol/data/Shows.java similarity index 89% rename from src/main/java/nl/sbdeveloper/showcontrol/data/Shows.java rename to src/main/java/tech/sbdevelopment/showcontrol/data/Shows.java index e633036..89e3fe7 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/data/Shows.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/data/Shows.java @@ -1,10 +1,10 @@ -package nl.sbdeveloper.showcontrol.data; +package tech.sbdevelopment.showcontrol.data; import lombok.Getter; -import nl.sbdeveloper.showcontrol.ShowControlPlugin; -import nl.sbdeveloper.showcontrol.api.ShowCuePoint; -import nl.sbdeveloper.showcontrol.api.triggers.Trigger; -import nl.sbdeveloper.showcontrol.utils.YamlFile; +import tech.sbdevelopment.showcontrol.ShowControlPlugin; +import tech.sbdevelopment.showcontrol.api.ShowCuePoint; +import tech.sbdevelopment.showcontrol.api.triggers.Trigger; +import tech.sbdevelopment.showcontrol.utils.YamlFile; import org.bukkit.Bukkit; import java.io.File; diff --git a/src/main/java/nl/sbdeveloper/showcontrol/elements/Fireworks.java b/src/main/java/tech/sbdevelopment/showcontrol/elements/Fireworks.java similarity index 97% rename from src/main/java/nl/sbdeveloper/showcontrol/elements/Fireworks.java rename to src/main/java/tech/sbdevelopment/showcontrol/elements/Fireworks.java index 318f4de..2719e38 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/elements/Fireworks.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/elements/Fireworks.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.showcontrol.elements; +package tech.sbdevelopment.showcontrol.elements; import org.bukkit.Color; import org.bukkit.FireworkEffect; diff --git a/src/main/java/nl/sbdeveloper/showcontrol/elements/Lasers.java b/src/main/java/tech/sbdevelopment/showcontrol/elements/Lasers.java similarity index 95% rename from src/main/java/nl/sbdeveloper/showcontrol/elements/Lasers.java rename to src/main/java/tech/sbdevelopment/showcontrol/elements/Lasers.java index 37f4c61..9a13528 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/elements/Lasers.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/elements/Lasers.java @@ -1,7 +1,7 @@ -package nl.sbdeveloper.showcontrol.elements; +package tech.sbdevelopment.showcontrol.elements; import fr.skytasul.guardianbeam.Laser; -import nl.sbdeveloper.showcontrol.ShowControlPlugin; +import tech.sbdevelopment.showcontrol.ShowControlPlugin; import org.bukkit.Location; import org.bukkit.scheduler.BukkitRunnable; @@ -24,9 +24,8 @@ public class Lasers { /** * Spawn a new laser, and start it * - * @param name The name of the laser + * @param name The name of the laser * @param baseLoc The start location - * * @return true if done, false if an exception */ public static boolean start(String name, Location baseLoc) { @@ -42,9 +41,9 @@ public class Lasers { /** * Move a laser to a location - * @param name The name of the laser - * @param posLoc The new location * + * @param name The name of the laser + * @param posLoc The new location * @return true if done, false if it doesn't exists */ public static boolean move(String name, Location posLoc) { diff --git a/src/main/java/nl/sbdeveloper/showcontrol/elements/Spots.java b/src/main/java/tech/sbdevelopment/showcontrol/elements/Spots.java similarity index 95% rename from src/main/java/nl/sbdeveloper/showcontrol/elements/Spots.java rename to src/main/java/tech/sbdevelopment/showcontrol/elements/Spots.java index 81645fb..2d8f1ce 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/elements/Spots.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/elements/Spots.java @@ -1,7 +1,7 @@ -package nl.sbdeveloper.showcontrol.elements; +package tech.sbdevelopment.showcontrol.elements; import fr.skytasul.guardianbeam.Laser; -import nl.sbdeveloper.showcontrol.ShowControlPlugin; +import tech.sbdevelopment.showcontrol.ShowControlPlugin; import org.bukkit.Location; import org.bukkit.scheduler.BukkitRunnable; @@ -24,9 +24,8 @@ public class Spots { /** * Spawn a new spot, and start it * - * @param name The name of the spot + * @param name The name of the spot * @param baseLoc The start location - * * @return true if done, false if an exception */ public static boolean start(String name, Location baseLoc) { @@ -42,9 +41,9 @@ public class Spots { /** * Move a spot to a location - * @param name The name of the spot - * @param posLoc The new location * + * @param name The name of the spot + * @param posLoc The new location * @return true if done, false if it doesn't exists */ public static boolean move(String name, Location posLoc) { diff --git a/src/main/java/nl/sbdeveloper/showcontrol/gui/ShowCueGUI.java b/src/main/java/tech/sbdevelopment/showcontrol/gui/ShowCueGUI.java similarity index 50% rename from src/main/java/nl/sbdeveloper/showcontrol/gui/ShowCueGUI.java rename to src/main/java/tech/sbdevelopment/showcontrol/gui/ShowCueGUI.java index 15ed0a7..653171b 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/gui/ShowCueGUI.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/gui/ShowCueGUI.java @@ -1,22 +1,14 @@ -package nl.sbdeveloper.showcontrol.gui; +package tech.sbdevelopment.showcontrol.gui; import fr.minuskube.inv.ClickableItem; -import fr.minuskube.inv.content.InventoryContents; -import fr.minuskube.inv.content.Pagination; -import fr.minuskube.inv.content.SlotIterator; -import nl.sbdeveloper.showcontrol.api.ShowCuePoint; -import nl.sbdeveloper.showcontrol.data.Shows; -import nl.sbdeveloper.showcontrol.utils.MainUtil; -import nl.sbdeveloper.showcontrol.utils.inventories.PaginationInventory; +import tech.sbdevelopment.showcontrol.api.ShowCuePoint; +import tech.sbdevelopment.showcontrol.data.Shows; +import tech.sbdevelopment.showcontrol.utils.MainUtil; +import tech.sbdevelopment.showcontrol.utils.inventories.PaginationInventory; import org.bukkit.ChatColor; -import org.bukkit.Material; import org.bukkit.entity.Player; -import java.util.ArrayList; import java.util.Comparator; -import java.util.List; - -import static nl.sbdeveloper.showcontrol.utils.MainUtil.__; public class ShowCueGUI extends PaginationInventory { public ShowCueGUI(Player p, String name) { @@ -25,7 +17,7 @@ public class ShowCueGUI extends PaginationInventory { Shows.getPoints(name).stream().sorted(Comparator.comparing(ShowCuePoint::getTime)) .forEach(cue -> addItem(ClickableItem.of(MainUtil.pointToItem(cue), e -> { Shows.removePoint(name, cue); - refresh(p); + new ShowCueGUI(p, name).open(p); }))); open(p); diff --git a/src/main/java/nl/sbdeveloper/showcontrol/utils/Color.java b/src/main/java/tech/sbdevelopment/showcontrol/utils/Color.java similarity index 95% rename from src/main/java/nl/sbdeveloper/showcontrol/utils/Color.java rename to src/main/java/tech/sbdevelopment/showcontrol/utils/Color.java index 0af12e9..721d2a3 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/utils/Color.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/utils/Color.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.showcontrol.utils; +package tech.sbdevelopment.showcontrol.utils; public enum Color { WHITE(org.bukkit.Color.fromRGB(16777215)), diff --git a/src/main/java/nl/sbdeveloper/showcontrol/utils/ItemBuilder.java b/src/main/java/tech/sbdevelopment/showcontrol/utils/ItemBuilder.java similarity index 95% rename from src/main/java/nl/sbdeveloper/showcontrol/utils/ItemBuilder.java rename to src/main/java/tech/sbdevelopment/showcontrol/utils/ItemBuilder.java index 4130f54..64eb9ae 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/utils/ItemBuilder.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/utils/ItemBuilder.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.showcontrol.utils; +package tech.sbdevelopment.showcontrol.utils; import com.cryptomorin.xseries.SkullUtils; import com.cryptomorin.xseries.XMaterial; @@ -156,7 +156,8 @@ public class ItemBuilder { } public ItemBuilder potionEffect(PotionType type) { - if (!itemStack.getType().name().contains("POTION")) throw new UnsupportedOperationException("ItemStack is not a potion! (Type: " + itemStack.getType().name() + ")"); + if (!itemStack.getType().name().contains("POTION")) + throw new UnsupportedOperationException("ItemStack is not a potion! (Type: " + itemStack.getType().name() + ")"); applyToMeta(meta -> { if (!(meta instanceof org.bukkit.inventory.meta.PotionMeta)) return meta; ((org.bukkit.inventory.meta.PotionMeta) meta).setBasePotionData(new PotionData(type)); diff --git a/src/main/java/nl/sbdeveloper/showcontrol/utils/MainUtil.java b/src/main/java/tech/sbdevelopment/showcontrol/utils/MainUtil.java similarity index 88% rename from src/main/java/nl/sbdeveloper/showcontrol/utils/MainUtil.java rename to src/main/java/tech/sbdevelopment/showcontrol/utils/MainUtil.java index 3cfbd30..bcbd635 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/utils/MainUtil.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/utils/MainUtil.java @@ -1,7 +1,7 @@ -package nl.sbdeveloper.showcontrol.utils; +package tech.sbdevelopment.showcontrol.utils; -import nl.sbdeveloper.showcontrol.api.ShowCuePoint; -import nl.sbdeveloper.showcontrol.api.triggers.TriggerIdentifier; +import tech.sbdevelopment.showcontrol.api.ShowCuePoint; +import tech.sbdevelopment.showcontrol.api.triggers.TriggerIdentifier; import org.bukkit.ChatColor; import org.bukkit.inventory.ItemStack; import org.bukkit.util.ChatPaginator; diff --git a/src/main/java/nl/sbdeveloper/showcontrol/utils/TimeUtil.java b/src/main/java/tech/sbdevelopment/showcontrol/utils/TimeUtil.java similarity index 97% rename from src/main/java/nl/sbdeveloper/showcontrol/utils/TimeUtil.java rename to src/main/java/tech/sbdevelopment/showcontrol/utils/TimeUtil.java index d851a6a..e9563eb 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/utils/TimeUtil.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/utils/TimeUtil.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.showcontrol.utils; +package tech.sbdevelopment.showcontrol.utils; import java.time.LocalTime; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/nl/sbdeveloper/showcontrol/utils/VersionUtil.java b/src/main/java/tech/sbdevelopment/showcontrol/utils/VersionUtil.java similarity index 94% rename from src/main/java/nl/sbdeveloper/showcontrol/utils/VersionUtil.java rename to src/main/java/tech/sbdevelopment/showcontrol/utils/VersionUtil.java index 8dfcc6b..eb2a46d 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/utils/VersionUtil.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/utils/VersionUtil.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.showcontrol.utils; +package tech.sbdevelopment.showcontrol.utils; import org.bukkit.Bukkit; diff --git a/src/main/java/nl/sbdeveloper/showcontrol/utils/YamlFile.java b/src/main/java/tech/sbdevelopment/showcontrol/utils/YamlFile.java similarity index 95% rename from src/main/java/nl/sbdeveloper/showcontrol/utils/YamlFile.java rename to src/main/java/tech/sbdevelopment/showcontrol/utils/YamlFile.java index 8fe4760..fb0b59f 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/utils/YamlFile.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/utils/YamlFile.java @@ -1,6 +1,6 @@ -package nl.sbdeveloper.showcontrol.utils; +package tech.sbdevelopment.showcontrol.utils; -import nl.sbdeveloper.showcontrol.ShowControlPlugin; +import tech.sbdevelopment.showcontrol.ShowControlPlugin; import org.bukkit.Bukkit; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; diff --git a/src/main/java/nl/sbdeveloper/showcontrol/utils/inventories/Inventory.java b/src/main/java/tech/sbdevelopment/showcontrol/utils/inventories/Inventory.java similarity index 86% rename from src/main/java/nl/sbdeveloper/showcontrol/utils/inventories/Inventory.java rename to src/main/java/tech/sbdevelopment/showcontrol/utils/inventories/Inventory.java index a8550c9..005680d 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/utils/inventories/Inventory.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/utils/inventories/Inventory.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.showcontrol.utils.inventories; +package tech.sbdevelopment.showcontrol.utils.inventories; import com.cryptomorin.xseries.XMaterial; import fr.minuskube.inv.ClickableItem; @@ -6,11 +6,12 @@ import fr.minuskube.inv.InventoryManager; import fr.minuskube.inv.SmartInventory; import fr.minuskube.inv.content.InventoryContents; import fr.minuskube.inv.content.InventoryProvider; -import nl.sbdeveloper.showcontrol.utils.ItemBuilder; +import tech.sbdevelopment.showcontrol.utils.ItemBuilder; +import org.bukkit.Bukkit; import org.bukkit.entity.Player; import org.bukkit.plugin.java.JavaPlugin; -import static nl.sbdeveloper.showcontrol.utils.MainUtil.__; +import static tech.sbdevelopment.showcontrol.utils.MainUtil.__; public abstract class Inventory implements InventoryProvider { private static InventoryManager manager; @@ -35,6 +36,7 @@ public abstract class Inventory implements InventoryProvider { } protected void open(Player player, int page) { + Bukkit.getLogger().info("Opening page " + page + " for " + player.getName() + "..."); this.inventory.open(player, page); } diff --git a/src/main/java/nl/sbdeveloper/showcontrol/utils/inventories/PaginationInventory.java b/src/main/java/tech/sbdevelopment/showcontrol/utils/inventories/PaginationInventory.java similarity index 81% rename from src/main/java/nl/sbdeveloper/showcontrol/utils/inventories/PaginationInventory.java rename to src/main/java/tech/sbdevelopment/showcontrol/utils/inventories/PaginationInventory.java index 19295ca..98f8163 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/utils/inventories/PaginationInventory.java +++ b/src/main/java/tech/sbdevelopment/showcontrol/utils/inventories/PaginationInventory.java @@ -1,23 +1,22 @@ -package nl.sbdeveloper.showcontrol.utils.inventories; +package tech.sbdevelopment.showcontrol.utils.inventories; import com.cryptomorin.xseries.XMaterial; import fr.minuskube.inv.ClickableItem; import fr.minuskube.inv.content.InventoryContents; import fr.minuskube.inv.content.Pagination; import fr.minuskube.inv.content.SlotIterator; -import nl.sbdeveloper.showcontrol.utils.ItemBuilder; import org.bukkit.entity.Player; +import tech.sbdevelopment.showcontrol.utils.ItemBuilder; import java.util.ArrayList; import java.util.List; -import static nl.sbdeveloper.showcontrol.utils.MainUtil.__; +import static tech.sbdevelopment.showcontrol.utils.MainUtil.__; public abstract class PaginationInventory extends Inventory { private final int paginationRows; //Amount of rows for pagination (excluding button row) private final int paginationRow; //The start row of the pagination (starts from 0) private final List items = new ArrayList<>(); - private Pagination pagination; //Available after init() is called, can only be used in the event of a ClickableItem!!! private final int staticRows; //Amount of rows that are static private final boolean filler; @@ -44,10 +43,6 @@ public abstract class PaginationInventory extends Inventory { this.items.add(item); } - public void refresh(Player player) { - open(player, pagination.getPage()); - } - @Override public void addItems(Player player, InventoryContents contents) { //Set up static items @@ -60,22 +55,22 @@ public abstract class PaginationInventory extends Inventory { addStaticItems(player, contents); //Set up pagination - pagination = contents.pagination(); + Pagination pagination = contents.pagination(); pagination.setItems(items.toArray(ClickableItem[]::new)); pagination.setItemsPerPage(9 * paginationRows); pagination.addToIterator(contents.newIterator(SlotIterator.Type.HORIZONTAL, paginationRow, 0)); contents.set(paginationRows, 0, ClickableItem.of(new ItemBuilder(XMaterial.ARROW.parseItem()).displayname(__("&6First page")) - .lore(__("&fGo to the first page (" + pagination.first().getPage() + ")")).getItemStack(), + .lore(__("&fGo to the first page (0)")).getItemStack(), e -> open(player, pagination.first().getPage()))); contents.set(paginationRows, 3, ClickableItem.of(new ItemBuilder(XMaterial.OAK_SIGN.parseItem()).displayname(__("&6Previous")) - .lore(__("&fGo to the previous page (" + pagination.previous().getPage() + ")")).getItemStack(), + .lore(__("&fGo to the previous page (" + (pagination.isFirst() ? pagination.getPage() : pagination.getPage() - 1) + ")")).getItemStack(), e -> open(player, pagination.previous().getPage()))); contents.set(paginationRows, 5, ClickableItem.of(new ItemBuilder(XMaterial.OAK_SIGN.parseItem()).displayname(__("&6Next")) - .lore(__("&fGo to the next page (" + pagination.next().getPage() + ")")).getItemStack(), + .lore(__("&fGo to the next page (" + (pagination.isLast() ? pagination.getPage() : pagination.getPage() + 1) + ")")).getItemStack(), e -> open(player, pagination.next().getPage()))); contents.set(paginationRows, 8, ClickableItem.of(new ItemBuilder(XMaterial.ARROW.parseItem()).displayname(__("&6Last page")) - .lore(__("&fGo to the last page (" + pagination.last().getPage() + ")")).getItemStack(), + .lore(__("&fGo to the last page (" + items.size() / (9 * paginationRows) + ")")).getItemStack(), e -> open(player, pagination.last().getPage()))); } diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 365dcb5..db43d08 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: ShowControl version: ${project.version} -main: nl.sbdeveloper.showcontrol.ShowControlPlugin +main: tech.sbdevelopment.showcontrol.ShowControlPlugin api-version: 1.13 authors: [SBDeveloper] description: Create shows easily using this plugin!