From dabfb89163d9132d3199344cef782488da80ba3f Mon Sep 17 00:00:00 2001 From: stijnb1234 Date: Wed, 2 Mar 2022 13:01:58 +0100 Subject: [PATCH] Updated to 1.18.1, and other small things. --- pom.xml | 16 +++++----------- .../java/nl/sbdeveloper/showapi/ShowAPI.java | 4 ++-- .../nl/sbdeveloper/showapi/api/TriggerType.java | 2 +- .../showapi/api/triggers/LaserTrigger.java | 6 +++--- .../showapi/api/triggers/SpotTrigger.java | 3 ++- .../nl/sbdeveloper/showapi/data/DataSaving.java | 12 +++++++++--- .../java/nl/sbdeveloper/showapi/data/Shows.java | 6 ++++-- .../nl/sbdeveloper/showapi/utils/YamlFile.java | 2 -- 8 files changed, 26 insertions(+), 25 deletions(-) diff --git a/pom.xml b/pom.xml index 6c40b83..0eee4e2 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,7 @@ maven-compiler-plugin 3.9.0-SNAPSHOT - 16 + 17 -parameters @@ -107,16 +107,10 @@ - - org.bukkit - craftbukkit - 1.17.1-R0.1-SNAPSHOT - provided - org.spigotmc spigot-api - 1.17.1-R0.1-SNAPSHOT + 1.18.1-R0.1-SNAPSHOT provided @@ -128,7 +122,7 @@ org.jetbrains annotations - 21.0.1 + 22.0.0 compile @@ -140,12 +134,12 @@ com.github.cryptomorin XSeries - 8.2.0 + 8.6.1 com.github.fierioziy.particlenativeapi ParticleNativeAPI-plugin - 3.1.0 + 3.2.0 compile diff --git a/src/main/java/nl/sbdeveloper/showapi/ShowAPI.java b/src/main/java/nl/sbdeveloper/showapi/ShowAPI.java index e369cb9..ea6725e 100644 --- a/src/main/java/nl/sbdeveloper/showapi/ShowAPI.java +++ b/src/main/java/nl/sbdeveloper/showapi/ShowAPI.java @@ -31,8 +31,8 @@ public class ShowAPI implements API, Listener { //This gets called either by #initAPI above or #initAPI in one of the requiring plugins @Override public void init(Plugin plugin) { - if (VersionUtil.getVersion() < 9 || VersionUtil.getVersion() > 16) { - logger.severe("Deze API werkt alleen tussen 1.9.x en 1.16.x."); + if (VersionUtil.getVersion() < 9 || VersionUtil.getVersion() > 17) { + logger.severe("Deze API werkt alleen tussen 1.9.x en 1.17.x."); disable(plugin); return; } diff --git a/src/main/java/nl/sbdeveloper/showapi/api/TriggerType.java b/src/main/java/nl/sbdeveloper/showapi/api/TriggerType.java index db17541..24596b1 100644 --- a/src/main/java/nl/sbdeveloper/showapi/api/TriggerType.java +++ b/src/main/java/nl/sbdeveloper/showapi/api/TriggerType.java @@ -7,7 +7,7 @@ public enum TriggerType { FIREWORK(FireworkTrigger.class, 6), FAKE_FIREWORK(FakeFireworkTrigger.class, 7), SPOT(SpotTrigger.class, 6), -// LASER(LaserTrigger.class, 6), + LASER(LaserTrigger.class, 6), ANIMA(AnimaTrigger.class, 2), PARTICLE(ParticleTrigger.class, 7); diff --git a/src/main/java/nl/sbdeveloper/showapi/api/triggers/LaserTrigger.java b/src/main/java/nl/sbdeveloper/showapi/api/triggers/LaserTrigger.java index aa7c775..e4a709e 100644 --- a/src/main/java/nl/sbdeveloper/showapi/api/triggers/LaserTrigger.java +++ b/src/main/java/nl/sbdeveloper/showapi/api/triggers/LaserTrigger.java @@ -13,8 +13,7 @@ public class LaserTrigger extends TriggerTask { //TODO Fix laser for 1.17 public LaserTrigger(String[] data) { - //super(TriggerType.LASER, data); - super(null, data); + super(TriggerType.LASER, data); this.name = data[0]; @@ -45,7 +44,8 @@ public class LaserTrigger extends TriggerTask { @Override public void trigger() { - ShowAPI.Lasers.move(name, newLocation); + Bukkit.broadcastMessage("[ShowAPI] De trigger " + name + " is genegeerd, omdat de LASER is disabled."); +// ShowAPI.Lasers.move(name, newLocation); } @Override diff --git a/src/main/java/nl/sbdeveloper/showapi/api/triggers/SpotTrigger.java b/src/main/java/nl/sbdeveloper/showapi/api/triggers/SpotTrigger.java index 88ac173..cee58ef 100644 --- a/src/main/java/nl/sbdeveloper/showapi/api/triggers/SpotTrigger.java +++ b/src/main/java/nl/sbdeveloper/showapi/api/triggers/SpotTrigger.java @@ -43,7 +43,8 @@ public class SpotTrigger extends TriggerTask { @Override public void trigger() { - ShowAPI.Spots.move(name, newLocation); +// ShowAPI.Spots.move(name, newLocation); + Bukkit.broadcastMessage("[ShowAPI] De trigger " + name + " is genegeerd, omdat de SPOT is disabled."); } @Override diff --git a/src/main/java/nl/sbdeveloper/showapi/data/DataSaving.java b/src/main/java/nl/sbdeveloper/showapi/data/DataSaving.java index 4d4289a..1e59a5e 100644 --- a/src/main/java/nl/sbdeveloper/showapi/data/DataSaving.java +++ b/src/main/java/nl/sbdeveloper/showapi/data/DataSaving.java @@ -5,7 +5,6 @@ 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 org.bukkit.craftbukkit.libs.org.apache.commons.io.FilenameUtils; import java.io.File; import java.util.*; @@ -20,7 +19,7 @@ public class DataSaving { public static void load() { File showsFolder = new File(ShowAPIPlugin.getInstance().getDataFolder(), "data"); for (File showFile : showsFolder.listFiles()) { - String showID = FilenameUtils.removeExtension(showFile.getName()); + String showID = removeExtension(showFile.getName()); YamlFile showConfig = new YamlFile("data/" + showID); files.put(showID, showConfig); @@ -38,13 +37,20 @@ public class DataSaving { public static void save() { for (Map.Entry> entry : Shows.getShowsMap().entrySet()) { - YamlFile file = files.get(entry.getKey()); + YamlFile file = files.containsKey(entry.getKey()) ? files.get(entry.getKey()) : new YamlFile("data/" + entry.getKey()); for (ShowCue cue : entry.getValue()) { file.getFile().set(cue.getCueID().toString() + ".Time", cue.getTime()); file.getFile().set(cue.getCueID().toString() + ".Type", cue.getTask().getType().name()); file.getFile().set(cue.getCueID().toString() + ".Data", cue.getTask().getDataString()); } file.saveFile(); + + if (!files.containsKey(entry.getKey())) files.put(entry.getKey(), file); } } + + private static String removeExtension(String fileName) { + int lastDot = fileName.lastIndexOf("."); + return (lastDot == -1 ? fileName : fileName.substring(0, lastDot)); + } } diff --git a/src/main/java/nl/sbdeveloper/showapi/data/Shows.java b/src/main/java/nl/sbdeveloper/showapi/data/Shows.java index b7742c7..61f49ef 100644 --- a/src/main/java/nl/sbdeveloper/showapi/data/Shows.java +++ b/src/main/java/nl/sbdeveloper/showapi/data/Shows.java @@ -20,7 +20,8 @@ public class Shows { public static void create(String name) { showsMap.put(name, new ArrayList<>()); - Bukkit.getScheduler().runTaskAsynchronously(ShowAPIPlugin.getInstance(), DataSaving::save); + DataSaving.save(); +// Bukkit.getScheduler().runTaskAsynchronously(ShowAPIPlugin.getInstance(), DataSaving::save); } public static void delete(String name) { @@ -42,7 +43,8 @@ public class Shows { public static void addPoint(String name, Long time, TriggerTask data) { if (!exists(name)) return; getPoints(name).add(new ShowCue(time, data)); - Bukkit.getScheduler().runTaskAsynchronously(ShowAPIPlugin.getInstance(), DataSaving::save); + DataSaving.save(); +// Bukkit.getScheduler().runTaskAsynchronously(ShowAPIPlugin.getInstance(), DataSaving::save); } public static void removePoint(String name, ShowCue point) { diff --git a/src/main/java/nl/sbdeveloper/showapi/utils/YamlFile.java b/src/main/java/nl/sbdeveloper/showapi/utils/YamlFile.java index d3ee5ce..cb27629 100644 --- a/src/main/java/nl/sbdeveloper/showapi/utils/YamlFile.java +++ b/src/main/java/nl/sbdeveloper/showapi/utils/YamlFile.java @@ -13,8 +13,6 @@ import java.nio.charset.StandardCharsets; import java.util.Objects; public class YamlFile { - //SBYamlFile file = new SBYamlFile(this, "data"); - private FileConfiguration fileConfiguration; private File file; private final String name;