diff --git a/pom.xml b/pom.xml index e6b04ea..df1e547 100644 --- a/pom.xml +++ b/pom.xml @@ -5,13 +5,13 @@ 4.0.0 nl.SBDeveloper - ShowAPI + ShowControl 1.3 jar - ShowAPI + ShowControl https://sbdplugins.nl - Make perfect shows with this API! + Create shows easily using this plugin! UTF-8 @@ -53,25 +53,21 @@ false false - - org.inventivetalent.apihelper - nl.sbdeveloper.showapi.helpers.apihelper - fr.minuskube.inv - nl.sbdeveloper.showapi.helpers.inv + nl.sbdeveloper.showcontrol.libs.inv - com.github.fierioziy.particlenativeapi - nl.sbdeveloper.showapi.helpers.particleapi + fr.skytasul.guardianbeam + nl.sbdeveloper.showcontrol.libs.guardianbeam co.aikar.commands - nl.sbdeveloper.showapi.helpers.acf + nl.sbdeveloper.showcontrol.libs.commands co.aikar.locales - nl.sbdeveloper.showapi.helpers.locales + nl.sbdeveloper.showcontrol.libs.locales @@ -124,12 +120,6 @@ XSeries 9.2.0 - - com.github.fierioziy.particlenativeapi - ParticleNativeAPI-plugin - 3.3.1 - compile - co.aikar acf-paper diff --git a/src/main/java/nl/sbdeveloper/showapi/ShowAPIPlugin.java b/src/main/java/nl/sbdeveloper/showapi/ShowAPIPlugin.java deleted file mode 100644 index 5661048..0000000 --- a/src/main/java/nl/sbdeveloper/showapi/ShowAPIPlugin.java +++ /dev/null @@ -1,73 +0,0 @@ -package nl.sbdeveloper.showapi; - -import co.aikar.commands.PaperCommandManager; -import com.github.fierioziy.particlenativeapi.api.ParticleNativeAPI; -import com.github.fierioziy.particlenativeapi.api.utils.ParticleException; -import com.github.fierioziy.particlenativeapi.core.ParticleNativeCore; -import nl.sbdeveloper.showapi.api.TriggerType; -import nl.sbdeveloper.showapi.commands.ShowCMD; -import nl.sbdeveloper.showapi.data.DataConversion; -import nl.sbdeveloper.showapi.data.DataSaving; -import nl.sbdeveloper.showapi.data.Shows; -import nl.sbdeveloper.showapi.utils.Inventory; -import org.bukkit.Bukkit; -import org.bukkit.plugin.java.JavaPlugin; - -import java.util.Arrays; -import java.util.stream.Collectors; - -public final class ShowAPIPlugin extends JavaPlugin { - private static ShowAPIPlugin instance; - - private static PaperCommandManager commandManager; - - private static ParticleNativeAPI particleAPI; - - @Override - public void onEnable() { - instance = this; - - DataConversion.handle(); - - commandManager = new PaperCommandManager(this); - commandManager.enableUnstableAPI("help"); - - commandManager.registerCommand(new ShowCMD()); - - commandManager.getCommandCompletions().registerCompletion("showname", c -> Shows.getShowsMap().keySet()); - commandManager.getCommandCompletions().registerStaticCompletion("showtype", Arrays.stream(TriggerType.values()).map(Enum::name).collect(Collectors.toList())); - - try { - particleAPI = ParticleNativeCore.loadAPI(this); - } catch (ParticleException ex) { - ex.printStackTrace(); - getPluginLoader().disablePlugin(this); - return; - } - - Inventory.init(); - - Bukkit.getScheduler().runTaskLater(this, DataSaving::load, 1L); //Load 1 tick later, because of multi world - } - - @Override - public void onDisable() { - instance = null; - - DataSaving.save(); - - Shows.getShowsMap().values().forEach(show -> show.forEach(showCue -> showCue.getTask().remove())); - } - - public static ShowAPIPlugin getInstance() { - return instance; - } - - public static PaperCommandManager getCommandManager() { - return commandManager; - } - - public static ParticleNativeAPI getParticleAPI() { - return particleAPI; - } -} diff --git a/src/main/java/nl/sbdeveloper/showapi/api/triggers/FakeFireworkTrigger.java b/src/main/java/nl/sbdeveloper/showapi/api/triggers/FakeFireworkTrigger.java deleted file mode 100644 index acf624b..0000000 --- a/src/main/java/nl/sbdeveloper/showapi/api/triggers/FakeFireworkTrigger.java +++ /dev/null @@ -1,53 +0,0 @@ -package nl.sbdeveloper.showapi.api.triggers; - -import nl.sbdeveloper.showapi.ShowAPIPlugin; -import nl.sbdeveloper.showapi.api.TriggerTask; -import nl.sbdeveloper.showapi.api.TriggerType; -import org.bukkit.Bukkit; -import org.bukkit.Location; -import org.bukkit.World; - -public class FakeFireworkTrigger extends TriggerTask { - private Location spawnLoc; - private float xVelocity; - private float yVelocity; - private float zVelocity; - - public FakeFireworkTrigger(String[] data) { - super(TriggerType.FAKE_FIREWORK, data); - - World w = Bukkit.getWorld(data[0]); - if (w == null) { - Bukkit.getLogger().info("De wereld is null!"); - return; - } - - int x; - int y; - int z; - try { - x = Integer.parseInt(data[1]); - y = Integer.parseInt(data[2]); - z = Integer.parseInt(data[3]); - } catch (NumberFormatException ex) { - Bukkit.getLogger().info("De positie is incorrect!"); - return; - } - - this.spawnLoc = new Location(w, x, y, z); - - try { - this.xVelocity = Float.parseFloat(data[4]); - this.yVelocity = Float.parseFloat(data[5]); - this.zVelocity = Float.parseFloat(data[6]); - } catch (NumberFormatException ex) { - Bukkit.getLogger().info("De velocity is incorrect!"); - } - } - - @Override - public void trigger() { - //TODO Fix this trigger - ShowAPIPlugin.getParticleAPI().getParticles_1_13().DUST().color(255, 0, 0, 5).packet(true, spawnLoc.getX(), spawnLoc.getY(), spawnLoc.getZ(), xVelocity, yVelocity, zVelocity, 0.01, 40); - } -} diff --git a/src/main/java/nl/sbdeveloper/showcontrol/ShowControlPlugin.java b/src/main/java/nl/sbdeveloper/showcontrol/ShowControlPlugin.java new file mode 100644 index 0000000..d6b5b09 --- /dev/null +++ b/src/main/java/nl/sbdeveloper/showcontrol/ShowControlPlugin.java @@ -0,0 +1,50 @@ +package nl.sbdeveloper.showcontrol; + +import co.aikar.commands.PaperCommandManager; +import nl.sbdeveloper.showcontrol.api.TriggerType; +import nl.sbdeveloper.showcontrol.commands.ShowCMD; +import nl.sbdeveloper.showcontrol.data.DataConversion; +import nl.sbdeveloper.showcontrol.data.DataSaving; +import nl.sbdeveloper.showcontrol.data.Shows; +import nl.sbdeveloper.showcontrol.utils.Inventory; +import org.bukkit.Bukkit; +import org.bukkit.plugin.java.JavaPlugin; + +import java.util.Arrays; +import java.util.stream.Collectors; + +public final class ShowControlPlugin extends JavaPlugin { + private static ShowControlPlugin instance; + + @Override + public void onEnable() { + instance = this; + + DataConversion.handle(); + + final PaperCommandManager commandManager = new PaperCommandManager(this); + commandManager.enableUnstableAPI("help"); + + commandManager.registerCommand(new ShowCMD()); + + commandManager.getCommandCompletions().registerCompletion("showname", c -> Shows.getShowsMap().keySet()); + commandManager.getCommandCompletions().registerStaticCompletion("showtype", Arrays.stream(TriggerType.values()).map(Enum::name).collect(Collectors.toList())); + + Inventory.init(); + + Bukkit.getScheduler().runTaskLater(this, DataSaving::load, 1L); //Load 1 tick later, because of multi world + } + + @Override + public void onDisable() { + instance = null; + + DataSaving.save(); + + Shows.getShowsMap().values().forEach(show -> show.forEach(showCue -> showCue.getTask().remove())); + } + + public static ShowControlPlugin getInstance() { + return instance; + } +} diff --git a/src/main/java/nl/sbdeveloper/showapi/api/ShowCue.java b/src/main/java/nl/sbdeveloper/showcontrol/api/ShowCue.java similarity index 96% rename from src/main/java/nl/sbdeveloper/showapi/api/ShowCue.java rename to src/main/java/nl/sbdeveloper/showcontrol/api/ShowCue.java index a18a8bb..54084a5 100644 --- a/src/main/java/nl/sbdeveloper/showapi/api/ShowCue.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/api/ShowCue.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.showapi.api; +package nl.sbdeveloper.showcontrol.api; import java.util.UUID; diff --git a/src/main/java/nl/sbdeveloper/showapi/api/TriggerTask.java b/src/main/java/nl/sbdeveloper/showcontrol/api/TriggerTask.java similarity index 96% rename from src/main/java/nl/sbdeveloper/showapi/api/TriggerTask.java rename to src/main/java/nl/sbdeveloper/showcontrol/api/TriggerTask.java index 550d3df..69e155b 100644 --- a/src/main/java/nl/sbdeveloper/showapi/api/TriggerTask.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/api/TriggerTask.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.showapi.api; +package nl.sbdeveloper.showcontrol.api; public abstract class TriggerTask { private final TriggerType type; diff --git a/src/main/java/nl/sbdeveloper/showapi/api/TriggerType.java b/src/main/java/nl/sbdeveloper/showcontrol/api/TriggerType.java similarity index 88% rename from src/main/java/nl/sbdeveloper/showapi/api/TriggerType.java rename to src/main/java/nl/sbdeveloper/showcontrol/api/TriggerType.java index 24596b1..8593766 100644 --- a/src/main/java/nl/sbdeveloper/showapi/api/TriggerType.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/api/TriggerType.java @@ -1,6 +1,6 @@ -package nl.sbdeveloper.showapi.api; +package nl.sbdeveloper.showcontrol.api; -import nl.sbdeveloper.showapi.api.triggers.*; +import nl.sbdeveloper.showcontrol.api.triggers.*; public enum TriggerType { COMMAND(CommandTrigger.class, 2), diff --git a/src/main/java/nl/sbdeveloper/showapi/api/triggers/AnimaTrigger.java b/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/AnimaTrigger.java similarity index 70% rename from src/main/java/nl/sbdeveloper/showapi/api/triggers/AnimaTrigger.java rename to src/main/java/nl/sbdeveloper/showcontrol/api/triggers/AnimaTrigger.java index c959353..6da09aa 100644 --- a/src/main/java/nl/sbdeveloper/showapi/api/triggers/AnimaTrigger.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/AnimaTrigger.java @@ -1,7 +1,7 @@ -package nl.sbdeveloper.showapi.api.triggers; +package nl.sbdeveloper.showcontrol.api.triggers; -import nl.sbdeveloper.showapi.api.TriggerTask; -import nl.sbdeveloper.showapi.api.TriggerType; +import nl.sbdeveloper.showcontrol.api.TriggerTask; +import nl.sbdeveloper.showcontrol.api.TriggerType; import org.bukkit.Bukkit; public class AnimaTrigger extends TriggerTask { diff --git a/src/main/java/nl/sbdeveloper/showapi/api/triggers/CommandTrigger.java b/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/CommandTrigger.java similarity index 71% rename from src/main/java/nl/sbdeveloper/showapi/api/triggers/CommandTrigger.java rename to src/main/java/nl/sbdeveloper/showcontrol/api/triggers/CommandTrigger.java index 5bf6c63..bfe9317 100644 --- a/src/main/java/nl/sbdeveloper/showapi/api/triggers/CommandTrigger.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/CommandTrigger.java @@ -1,7 +1,7 @@ -package nl.sbdeveloper.showapi.api.triggers; +package nl.sbdeveloper.showcontrol.api.triggers; -import nl.sbdeveloper.showapi.api.TriggerTask; -import nl.sbdeveloper.showapi.api.TriggerType; +import nl.sbdeveloper.showcontrol.api.TriggerTask; +import nl.sbdeveloper.showcontrol.api.TriggerType; import org.bukkit.Bukkit; public class CommandTrigger extends TriggerTask { diff --git a/src/main/java/nl/sbdeveloper/showapi/api/triggers/FireworkTrigger.java b/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/FireworkTrigger.java similarity index 90% rename from src/main/java/nl/sbdeveloper/showapi/api/triggers/FireworkTrigger.java rename to src/main/java/nl/sbdeveloper/showcontrol/api/triggers/FireworkTrigger.java index deb4cee..1973059 100644 --- a/src/main/java/nl/sbdeveloper/showapi/api/triggers/FireworkTrigger.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/FireworkTrigger.java @@ -1,9 +1,9 @@ -package nl.sbdeveloper.showapi.api.triggers; +package nl.sbdeveloper.showcontrol.api.triggers; -import nl.sbdeveloper.showapi.api.TriggerTask; -import nl.sbdeveloper.showapi.api.TriggerType; -import nl.sbdeveloper.showapi.elements.Fireworks; -import nl.sbdeveloper.showapi.utils.Color; +import nl.sbdeveloper.showcontrol.api.TriggerTask; +import nl.sbdeveloper.showcontrol.api.TriggerType; +import nl.sbdeveloper.showcontrol.elements.Fireworks; +import nl.sbdeveloper.showcontrol.utils.Color; import org.bukkit.Bukkit; import org.bukkit.FireworkEffect; import org.bukkit.Location; diff --git a/src/main/java/nl/sbdeveloper/showapi/api/triggers/LaserTrigger.java b/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/LaserTrigger.java similarity index 86% rename from src/main/java/nl/sbdeveloper/showapi/api/triggers/LaserTrigger.java rename to src/main/java/nl/sbdeveloper/showcontrol/api/triggers/LaserTrigger.java index 9ef77a3..3013b05 100644 --- a/src/main/java/nl/sbdeveloper/showapi/api/triggers/LaserTrigger.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/LaserTrigger.java @@ -1,8 +1,8 @@ -package nl.sbdeveloper.showapi.api.triggers; +package nl.sbdeveloper.showcontrol.api.triggers; -import nl.sbdeveloper.showapi.api.TriggerTask; -import nl.sbdeveloper.showapi.api.TriggerType; -import nl.sbdeveloper.showapi.elements.Lasers; +import nl.sbdeveloper.showcontrol.api.TriggerTask; +import nl.sbdeveloper.showcontrol.api.TriggerType; +import nl.sbdeveloper.showcontrol.elements.Lasers; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/main/java/nl/sbdeveloper/showapi/api/triggers/ParticleTrigger.java b/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/ParticleTrigger.java similarity index 90% rename from src/main/java/nl/sbdeveloper/showapi/api/triggers/ParticleTrigger.java rename to src/main/java/nl/sbdeveloper/showcontrol/api/triggers/ParticleTrigger.java index 8d6a3c8..1387f12 100644 --- a/src/main/java/nl/sbdeveloper/showapi/api/triggers/ParticleTrigger.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/ParticleTrigger.java @@ -1,7 +1,7 @@ -package nl.sbdeveloper.showapi.api.triggers; +package nl.sbdeveloper.showcontrol.api.triggers; -import nl.sbdeveloper.showapi.api.TriggerTask; -import nl.sbdeveloper.showapi.api.TriggerType; +import nl.sbdeveloper.showcontrol.api.TriggerTask; +import nl.sbdeveloper.showcontrol.api.TriggerType; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.Particle; diff --git a/src/main/java/nl/sbdeveloper/showapi/api/triggers/SpotTrigger.java b/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/SpotTrigger.java similarity index 85% rename from src/main/java/nl/sbdeveloper/showapi/api/triggers/SpotTrigger.java rename to src/main/java/nl/sbdeveloper/showcontrol/api/triggers/SpotTrigger.java index d74d643..14d7883 100644 --- a/src/main/java/nl/sbdeveloper/showapi/api/triggers/SpotTrigger.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/api/triggers/SpotTrigger.java @@ -1,8 +1,8 @@ -package nl.sbdeveloper.showapi.api.triggers; +package nl.sbdeveloper.showcontrol.api.triggers; -import nl.sbdeveloper.showapi.api.TriggerTask; -import nl.sbdeveloper.showapi.api.TriggerType; -import nl.sbdeveloper.showapi.elements.Spots; +import nl.sbdeveloper.showcontrol.api.TriggerTask; +import nl.sbdeveloper.showcontrol.api.TriggerType; +import nl.sbdeveloper.showcontrol.elements.Spots; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; diff --git a/src/main/java/nl/sbdeveloper/showapi/commands/ShowCMD.java b/src/main/java/nl/sbdeveloper/showcontrol/commands/ShowCMD.java similarity index 92% rename from src/main/java/nl/sbdeveloper/showapi/commands/ShowCMD.java rename to src/main/java/nl/sbdeveloper/showcontrol/commands/ShowCMD.java index 8e12031..e211b82 100644 --- a/src/main/java/nl/sbdeveloper/showapi/commands/ShowCMD.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/commands/ShowCMD.java @@ -1,12 +1,12 @@ -package nl.sbdeveloper.showapi.commands; +package nl.sbdeveloper.showcontrol.commands; import co.aikar.commands.BaseCommand; import co.aikar.commands.annotation.*; -import nl.sbdeveloper.showapi.api.TriggerTask; -import nl.sbdeveloper.showapi.data.Shows; -import nl.sbdeveloper.showapi.gui.ShowCueGUI; -import nl.sbdeveloper.showapi.utils.MainUtil; -import nl.sbdeveloper.showapi.utils.TimeUtil; +import nl.sbdeveloper.showcontrol.api.TriggerTask; +import nl.sbdeveloper.showcontrol.data.Shows; +import nl.sbdeveloper.showcontrol.gui.ShowCueGUI; +import nl.sbdeveloper.showcontrol.utils.MainUtil; +import nl.sbdeveloper.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/showapi/data/DataConversion.java b/src/main/java/nl/sbdeveloper/showcontrol/data/DataConversion.java similarity index 73% rename from src/main/java/nl/sbdeveloper/showapi/data/DataConversion.java rename to src/main/java/nl/sbdeveloper/showcontrol/data/DataConversion.java index 323d182..050ca8e 100644 --- a/src/main/java/nl/sbdeveloper/showapi/data/DataConversion.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/data/DataConversion.java @@ -1,9 +1,9 @@ -package nl.sbdeveloper.showapi.data; +package nl.sbdeveloper.showcontrol.data; -import nl.sbdeveloper.showapi.ShowAPIPlugin; -import nl.sbdeveloper.showapi.api.TriggerTask; -import nl.sbdeveloper.showapi.utils.MainUtil; -import nl.sbdeveloper.showapi.utils.YamlFile; +import nl.sbdeveloper.showcontrol.ShowControlPlugin; +import nl.sbdeveloper.showcontrol.api.TriggerTask; +import nl.sbdeveloper.showcontrol.utils.MainUtil; +import nl.sbdeveloper.showcontrol.utils.YamlFile; import java.io.File; @@ -13,13 +13,13 @@ public class DataConversion { } private static boolean isOldSystem() { - File dataFolder = ShowAPIPlugin.getInstance().getDataFolder(); + File dataFolder = ShowControlPlugin.getInstance().getDataFolder(); File dataFile = new File(dataFolder, "data.yml"); return dataFile.exists(); } private static void convert() { - File dataFolder = new File(ShowAPIPlugin.getInstance().getDataFolder(), "data"); + File dataFolder = new File(ShowControlPlugin.getInstance().getDataFolder(), "data"); if(!dataFolder.exists()) { dataFolder.mkdirs(); } @@ -40,7 +40,7 @@ public class DataConversion { } //STEP 2: Remove old storage. - File data = new File(ShowAPIPlugin.getInstance().getDataFolder(), "data.yml"); + File data = new File(ShowControlPlugin.getInstance().getDataFolder(), "data.yml"); data.delete(); } } diff --git a/src/main/java/nl/sbdeveloper/showapi/data/DataSaving.java b/src/main/java/nl/sbdeveloper/showcontrol/data/DataSaving.java similarity index 83% rename from src/main/java/nl/sbdeveloper/showapi/data/DataSaving.java rename to src/main/java/nl/sbdeveloper/showcontrol/data/DataSaving.java index 1e59a5e..2cadede 100644 --- a/src/main/java/nl/sbdeveloper/showapi/data/DataSaving.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/data/DataSaving.java @@ -1,10 +1,10 @@ -package nl.sbdeveloper.showapi.data; +package nl.sbdeveloper.showcontrol.data; -import nl.sbdeveloper.showapi.ShowAPIPlugin; -import nl.sbdeveloper.showapi.api.ShowCue; -import nl.sbdeveloper.showapi.api.TriggerTask; -import nl.sbdeveloper.showapi.utils.MainUtil; -import nl.sbdeveloper.showapi.utils.YamlFile; +import nl.sbdeveloper.showcontrol.ShowControlPlugin; +import nl.sbdeveloper.showcontrol.api.ShowCue; +import nl.sbdeveloper.showcontrol.api.TriggerTask; +import nl.sbdeveloper.showcontrol.utils.MainUtil; +import nl.sbdeveloper.showcontrol.utils.YamlFile; import java.io.File; import java.util.*; @@ -17,7 +17,7 @@ public class DataSaving { } public static void load() { - File showsFolder = new File(ShowAPIPlugin.getInstance().getDataFolder(), "data"); + File showsFolder = new File(ShowControlPlugin.getInstance().getDataFolder(), "data"); for (File showFile : showsFolder.listFiles()) { String showID = removeExtension(showFile.getName()); YamlFile showConfig = new YamlFile("data/" + showID); diff --git a/src/main/java/nl/sbdeveloper/showapi/data/Shows.java b/src/main/java/nl/sbdeveloper/showcontrol/data/Shows.java similarity index 84% rename from src/main/java/nl/sbdeveloper/showapi/data/Shows.java rename to src/main/java/nl/sbdeveloper/showcontrol/data/Shows.java index 61f49ef..2d21ebf 100644 --- a/src/main/java/nl/sbdeveloper/showapi/data/Shows.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/data/Shows.java @@ -1,9 +1,9 @@ -package nl.sbdeveloper.showapi.data; +package nl.sbdeveloper.showcontrol.data; -import nl.sbdeveloper.showapi.ShowAPIPlugin; -import nl.sbdeveloper.showapi.api.ShowCue; -import nl.sbdeveloper.showapi.api.TriggerTask; -import nl.sbdeveloper.showapi.utils.YamlFile; +import nl.sbdeveloper.showcontrol.ShowControlPlugin; +import nl.sbdeveloper.showcontrol.api.ShowCue; +import nl.sbdeveloper.showcontrol.api.TriggerTask; +import nl.sbdeveloper.showcontrol.utils.YamlFile; import org.bukkit.Bukkit; import java.io.File; @@ -27,7 +27,7 @@ public class Shows { public static void delete(String name) { showsMap.remove(name); - File data = new File(ShowAPIPlugin.getInstance().getDataFolder(), "data/" + name + ".yml"); + File data = new File(ShowControlPlugin.getInstance().getDataFolder(), "data/" + name + ".yml"); data.delete(); } @@ -65,7 +65,7 @@ public class Shows { Bukkit.getLogger().info("Scheduled show " + name); for (ShowCue point : getPoints(name)) { Bukkit.getLogger().info("Point " + point.getTask().getDataString() + " on " + point.getTime()); - showTimer.schedule(() -> Bukkit.getScheduler().runTask(ShowAPIPlugin.getInstance(), () -> point.getTask().trigger()), point.getTime(), TimeUnit.MILLISECONDS); + showTimer.schedule(() -> Bukkit.getScheduler().runTask(ShowControlPlugin.getInstance(), () -> point.getTask().trigger()), point.getTime(), TimeUnit.MILLISECONDS); } showTimers.put(name, showTimer); } diff --git a/src/main/java/nl/sbdeveloper/showapi/elements/Fireworks.java b/src/main/java/nl/sbdeveloper/showcontrol/elements/Fireworks.java similarity index 97% rename from src/main/java/nl/sbdeveloper/showapi/elements/Fireworks.java rename to src/main/java/nl/sbdeveloper/showcontrol/elements/Fireworks.java index c6c0f81..318f4de 100644 --- a/src/main/java/nl/sbdeveloper/showapi/elements/Fireworks.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/elements/Fireworks.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.showapi.elements; +package nl.sbdeveloper.showcontrol.elements; import org.bukkit.Color; import org.bukkit.FireworkEffect; diff --git a/src/main/java/nl/sbdeveloper/showapi/elements/Lasers.java b/src/main/java/nl/sbdeveloper/showcontrol/elements/Lasers.java similarity index 93% rename from src/main/java/nl/sbdeveloper/showapi/elements/Lasers.java rename to src/main/java/nl/sbdeveloper/showcontrol/elements/Lasers.java index 55430d6..37f4c61 100644 --- a/src/main/java/nl/sbdeveloper/showapi/elements/Lasers.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/elements/Lasers.java @@ -1,7 +1,7 @@ -package nl.sbdeveloper.showapi.elements; +package nl.sbdeveloper.showcontrol.elements; import fr.skytasul.guardianbeam.Laser; -import nl.sbdeveloper.showapi.ShowAPIPlugin; +import nl.sbdeveloper.showcontrol.ShowControlPlugin; import org.bukkit.Location; import org.bukkit.scheduler.BukkitRunnable; @@ -32,7 +32,7 @@ public class Lasers { public static boolean start(String name, Location baseLoc) { try { lasers.put(name, new LaserRunnable(name, baseLoc)); - lasers.get(name).runTaskTimer(ShowAPIPlugin.getInstance(), 0, 1); + lasers.get(name).runTaskTimer(ShowControlPlugin.getInstance(), 0, 1); return true; } catch (ReflectiveOperationException e) { e.printStackTrace(); @@ -97,7 +97,7 @@ public class Lasers { laser.changePositionLocation(oldLoc); } - }.runTaskTimer(ShowAPIPlugin.getInstance(), 0L, 1L); + }.runTaskTimer(ShowControlPlugin.getInstance(), 0L, 1L); return true; } @@ -119,7 +119,7 @@ public class Lasers { this.name = name; this.baseLoc = baseLoc; this.laser = new Laser.GuardianLaser(baseLoc, baseLoc.add(0, 5, 0), -1, 50); - this.laser.start(ShowAPIPlugin.getInstance()); + this.laser.start(ShowControlPlugin.getInstance()); } @Override diff --git a/src/main/java/nl/sbdeveloper/showapi/elements/Spots.java b/src/main/java/nl/sbdeveloper/showcontrol/elements/Spots.java similarity index 93% rename from src/main/java/nl/sbdeveloper/showapi/elements/Spots.java rename to src/main/java/nl/sbdeveloper/showcontrol/elements/Spots.java index 5ee0be6..81645fb 100644 --- a/src/main/java/nl/sbdeveloper/showapi/elements/Spots.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/elements/Spots.java @@ -1,7 +1,7 @@ -package nl.sbdeveloper.showapi.elements; +package nl.sbdeveloper.showcontrol.elements; import fr.skytasul.guardianbeam.Laser; -import nl.sbdeveloper.showapi.ShowAPIPlugin; +import nl.sbdeveloper.showcontrol.ShowControlPlugin; import org.bukkit.Location; import org.bukkit.scheduler.BukkitRunnable; @@ -32,7 +32,7 @@ public class Spots { public static boolean start(String name, Location baseLoc) { try { spots.put(name, new SpotRunnable(name, baseLoc)); - spots.get(name).runTaskTimer(ShowAPIPlugin.getInstance(), 0, 1); + spots.get(name).runTaskTimer(ShowControlPlugin.getInstance(), 0, 1); return true; } catch (ReflectiveOperationException e) { e.printStackTrace(); @@ -97,7 +97,7 @@ public class Spots { laser.changePositionLocation(oldLoc); } - }.runTaskTimer(ShowAPIPlugin.getInstance(), 0L, 1L); + }.runTaskTimer(ShowControlPlugin.getInstance(), 0L, 1L); return true; } @@ -119,7 +119,7 @@ public class Spots { this.name = name; this.baseLoc = baseLoc; this.spot = new Laser.CrystalLaser(baseLoc, baseLoc.add(0, 5, 0), -1, 50); - this.spot.start(ShowAPIPlugin.getInstance()); + this.spot.start(ShowControlPlugin.getInstance()); } @Override diff --git a/src/main/java/nl/sbdeveloper/showapi/gui/ShowCueGUI.java b/src/main/java/nl/sbdeveloper/showcontrol/gui/ShowCueGUI.java similarity index 87% rename from src/main/java/nl/sbdeveloper/showapi/gui/ShowCueGUI.java rename to src/main/java/nl/sbdeveloper/showcontrol/gui/ShowCueGUI.java index 90a3afe..9d661b7 100644 --- a/src/main/java/nl/sbdeveloper/showapi/gui/ShowCueGUI.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/gui/ShowCueGUI.java @@ -1,14 +1,14 @@ -package nl.sbdeveloper.showapi.gui; +package nl.sbdeveloper.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.showapi.api.ShowCue; -import nl.sbdeveloper.showapi.data.Shows; -import nl.sbdeveloper.showapi.utils.Inventory; -import nl.sbdeveloper.showapi.utils.ItemBuilder; -import nl.sbdeveloper.showapi.utils.MainUtil; +import nl.sbdeveloper.showcontrol.api.ShowCue; +import nl.sbdeveloper.showcontrol.data.Shows; +import nl.sbdeveloper.showcontrol.utils.Inventory; +import nl.sbdeveloper.showcontrol.utils.ItemBuilder; +import nl.sbdeveloper.showcontrol.utils.MainUtil; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.entity.Player; @@ -17,7 +17,7 @@ import java.util.ArrayList; import java.util.Comparator; import java.util.List; -import static nl.sbdeveloper.showapi.utils.MainUtil.__; +import static nl.sbdeveloper.showcontrol.utils.MainUtil.__; public class ShowCueGUI extends Inventory { private final String showName; diff --git a/src/main/java/nl/sbdeveloper/showapi/utils/Color.java b/src/main/java/nl/sbdeveloper/showcontrol/utils/Color.java similarity index 95% rename from src/main/java/nl/sbdeveloper/showapi/utils/Color.java rename to src/main/java/nl/sbdeveloper/showcontrol/utils/Color.java index 3bf4839..0af12e9 100644 --- a/src/main/java/nl/sbdeveloper/showapi/utils/Color.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/utils/Color.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.showapi.utils; +package nl.sbdeveloper.showcontrol.utils; public enum Color { WHITE(org.bukkit.Color.fromRGB(16777215)), diff --git a/src/main/java/nl/sbdeveloper/showapi/utils/Inventory.java b/src/main/java/nl/sbdeveloper/showcontrol/utils/Inventory.java similarity index 86% rename from src/main/java/nl/sbdeveloper/showapi/utils/Inventory.java rename to src/main/java/nl/sbdeveloper/showcontrol/utils/Inventory.java index aaaf15e..3b5cf53 100644 --- a/src/main/java/nl/sbdeveloper/showapi/utils/Inventory.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/utils/Inventory.java @@ -1,13 +1,13 @@ -package nl.sbdeveloper.showapi.utils; +package nl.sbdeveloper.showcontrol.utils; 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.showapi.ShowAPIPlugin; +import nl.sbdeveloper.showcontrol.ShowControlPlugin; import org.bukkit.entity.Player; -import static nl.sbdeveloper.showapi.utils.MainUtil.__; +import static nl.sbdeveloper.showcontrol.utils.MainUtil.__; public abstract class Inventory implements InventoryProvider { /* @@ -47,7 +47,7 @@ public abstract class Inventory implements InventoryProvider { } public static void init() { - manager = new InventoryManager(ShowAPIPlugin.getInstance()); + manager = new InventoryManager(ShowControlPlugin.getInstance()); manager.init(); } } diff --git a/src/main/java/nl/sbdeveloper/showapi/utils/ItemBuilder.java b/src/main/java/nl/sbdeveloper/showcontrol/utils/ItemBuilder.java similarity index 99% rename from src/main/java/nl/sbdeveloper/showapi/utils/ItemBuilder.java rename to src/main/java/nl/sbdeveloper/showcontrol/utils/ItemBuilder.java index 561a7b1..37311ed 100644 --- a/src/main/java/nl/sbdeveloper/showapi/utils/ItemBuilder.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/utils/ItemBuilder.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.showapi.utils; +package nl.sbdeveloper.showcontrol.utils; import com.cryptomorin.xseries.SkullUtils; import org.bukkit.Bukkit; diff --git a/src/main/java/nl/sbdeveloper/showapi/utils/MainUtil.java b/src/main/java/nl/sbdeveloper/showcontrol/utils/MainUtil.java similarity index 91% rename from src/main/java/nl/sbdeveloper/showapi/utils/MainUtil.java rename to src/main/java/nl/sbdeveloper/showcontrol/utils/MainUtil.java index f90cdcf..9867375 100644 --- a/src/main/java/nl/sbdeveloper/showapi/utils/MainUtil.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/utils/MainUtil.java @@ -1,8 +1,8 @@ -package nl.sbdeveloper.showapi.utils; +package nl.sbdeveloper.showcontrol.utils; -import nl.sbdeveloper.showapi.api.ShowCue; -import nl.sbdeveloper.showapi.api.TriggerTask; -import nl.sbdeveloper.showapi.api.TriggerType; +import nl.sbdeveloper.showcontrol.api.ShowCue; +import nl.sbdeveloper.showcontrol.api.TriggerTask; +import nl.sbdeveloper.showcontrol.api.TriggerType; import org.bukkit.ChatColor; import org.bukkit.Material; import org.bukkit.inventory.ItemStack; diff --git a/src/main/java/nl/sbdeveloper/showapi/utils/TimeUtil.java b/src/main/java/nl/sbdeveloper/showcontrol/utils/TimeUtil.java similarity index 97% rename from src/main/java/nl/sbdeveloper/showapi/utils/TimeUtil.java rename to src/main/java/nl/sbdeveloper/showcontrol/utils/TimeUtil.java index 5ac05d4..d851a6a 100644 --- a/src/main/java/nl/sbdeveloper/showapi/utils/TimeUtil.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/utils/TimeUtil.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.showapi.utils; +package nl.sbdeveloper.showcontrol.utils; import java.time.LocalTime; import java.time.format.DateTimeFormatter; diff --git a/src/main/java/nl/sbdeveloper/showapi/utils/VersionUtil.java b/src/main/java/nl/sbdeveloper/showcontrol/utils/VersionUtil.java similarity index 95% rename from src/main/java/nl/sbdeveloper/showapi/utils/VersionUtil.java rename to src/main/java/nl/sbdeveloper/showcontrol/utils/VersionUtil.java index 70b00ab..8dfcc6b 100644 --- a/src/main/java/nl/sbdeveloper/showapi/utils/VersionUtil.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/utils/VersionUtil.java @@ -1,4 +1,4 @@ -package nl.sbdeveloper.showapi.utils; +package nl.sbdeveloper.showcontrol.utils; import org.bukkit.Bukkit; diff --git a/src/main/java/nl/sbdeveloper/showapi/utils/YamlFile.java b/src/main/java/nl/sbdeveloper/showcontrol/utils/YamlFile.java similarity index 81% rename from src/main/java/nl/sbdeveloper/showapi/utils/YamlFile.java rename to src/main/java/nl/sbdeveloper/showcontrol/utils/YamlFile.java index cb27629..8fe4760 100644 --- a/src/main/java/nl/sbdeveloper/showapi/utils/YamlFile.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/utils/YamlFile.java @@ -1,6 +1,6 @@ -package nl.sbdeveloper.showapi.utils; +package nl.sbdeveloper.showcontrol.utils; -import nl.sbdeveloper.showapi.ShowAPIPlugin; +import nl.sbdeveloper.showcontrol.ShowControlPlugin; import org.bukkit.Bukkit; import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.YamlConfiguration; @@ -20,14 +20,14 @@ public class YamlFile { public YamlFile(String name) { this.name = name; - if (!ShowAPIPlugin.getInstance().getDataFolder().exists()) { - if (!ShowAPIPlugin.getInstance().getDataFolder().mkdir()) { + if (!ShowControlPlugin.getInstance().getDataFolder().exists()) { + if (!ShowControlPlugin.getInstance().getDataFolder().mkdir()) { Bukkit.getLogger().severe("[ShowAPI] Couldn't generate the pluginfolder!"); return; } } - this.file = new File(ShowAPIPlugin.getInstance().getDataFolder(), name + ".yml"); + this.file = new File(ShowControlPlugin.getInstance().getDataFolder(), name + ".yml"); if (!this.file.exists()) { try { if (!this.file.createNewFile()) { @@ -44,7 +44,7 @@ public class YamlFile { } public void loadDefaults() { - Reader defConfigStream1 = new InputStreamReader(Objects.requireNonNull(ShowAPIPlugin.getInstance().getResource(name + ".yml"), "Resource is null"), StandardCharsets.UTF_8); + Reader defConfigStream1 = new InputStreamReader(Objects.requireNonNull(ShowControlPlugin.getInstance().getResource(name + ".yml"), "Resource is null"), StandardCharsets.UTF_8); YamlConfiguration defConfig1 = YamlConfiguration.loadConfiguration(defConfigStream1); getFile().setDefaults(defConfig1); getFile().options().copyDefaults(true); diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index e0b0c12..5544498 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,7 +1,7 @@ -name: ShowAPI +name: ShowControl version: ${project.version} -main: nl.sbdeveloper.showapi.ShowAPIPlugin -api-version: 1.17 +main: nl.sbdeveloper.showcontrol.ShowControlPlugin +api-version: 1.13 authors: [SBDeveloper] description: Make perfect shows with this API! -website: https://sbdplugins.nl \ No newline at end of file +website: https://sbdevelopment.tech \ No newline at end of file