From 0322947b528ba6efe64d188d44b670aaa186c7a4 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 28 Feb 2023 03:08:15 +0000 Subject: [PATCH 1/3] Bump maven-compiler-plugin from 3.10.1 to 3.11.0 Bumps [maven-compiler-plugin](https://github.com/apache/maven-compiler-plugin) from 3.10.1 to 3.11.0. - [Release notes](https://github.com/apache/maven-compiler-plugin/releases) - [Commits](https://github.com/apache/maven-compiler-plugin/compare/maven-compiler-plugin-3.10.1...maven-compiler-plugin-3.11.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-compiler-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index df1e547..f5ef1a9 100644 --- a/pom.xml +++ b/pom.xml @@ -30,7 +30,7 @@ org.apache.maven.plugins maven-compiler-plugin - 3.10.1 + 3.11.0 17 -- 2.45.3 From 6f0b87e3208e254846d487007b0fe3cbbfa9b988 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 21 Mar 2023 03:04:37 +0000 Subject: [PATCH 2/3] Bump XSeries from 9.2.0 to 9.3.1 Bumps [XSeries](https://github.com/CryptoMorin/XSeries) from 9.2.0 to 9.3.1. - [Release notes](https://github.com/CryptoMorin/XSeries/releases) - [Commits](https://github.com/CryptoMorin/XSeries/compare/v9.2.0...v9.3.1) --- updated-dependencies: - dependency-name: com.github.cryptomorin:XSeries dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index df1e547..1db40c8 100644 --- a/pom.xml +++ b/pom.xml @@ -118,7 +118,7 @@ com.github.cryptomorin XSeries - 9.2.0 + 9.3.1 co.aikar -- 2.45.3 From aedb0fdcff2d018f40d060b6c9c3028e2f38d7cc Mon Sep 17 00:00:00 2001 From: Stijn Bannink Date: Sun, 9 Apr 2023 14:16:40 +0200 Subject: [PATCH 3/3] Fixes --- .../java/nl/sbdeveloper/showcontrol/ShowControlPlugin.java | 5 +---- src/main/java/nl/sbdeveloper/showcontrol/api/ShowAPI.java | 4 ++-- .../java/nl/sbdeveloper/showcontrol/commands/ShowCMD.java | 5 ++++- .../java/nl/sbdeveloper/showcontrol/utils/MainUtil.java | 6 ++++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/main/java/nl/sbdeveloper/showcontrol/ShowControlPlugin.java b/src/main/java/nl/sbdeveloper/showcontrol/ShowControlPlugin.java index 74a28d7..eeb4b8e 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/ShowControlPlugin.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/ShowControlPlugin.java @@ -34,10 +34,7 @@ public final class ShowControlPlugin extends JavaPlugin { getLogger().info("Loading default triggers..."); ShowAPI.index(ShowControlPlugin.class, "nl.sbdeveloper.showcontrol.api.triggers.impl"); - Bukkit.getScheduler().runTaskLater(this, () -> { - getLogger().info("Loading data..."); - DataStorage.load(); - }, 1L); //Load 1 tick later, because of multi world + Bukkit.getScheduler().runTaskLater(this, DataStorage::load, 1L); //Load 1 tick later, because of multi world getLogger().info("Plugin enabled!"); getLogger().info("-------------------------------"); diff --git a/src/main/java/nl/sbdeveloper/showcontrol/api/ShowAPI.java b/src/main/java/nl/sbdeveloper/showcontrol/api/ShowAPI.java index 94d3204..9b11845 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/api/ShowAPI.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/api/ShowAPI.java @@ -42,7 +42,7 @@ public class ShowAPI { } } - public static T getTrigger(String data) throws ReflectiveOperationException, InvalidTriggerException, TooFewArgumentsException { + public static T getTrigger(String data) throws ReflectiveOperationException, InvalidTriggerException, TooFewArgumentsException, IllegalArgumentException { String[] dataSplitter = data.split(" "); String[] dataSplitterNew = Arrays.copyOfRange(dataSplitter, 1, dataSplitter.length); @@ -52,6 +52,6 @@ public class ShowAPI { 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(dataSplitterNew); + return ctor.newInstance(new Object[] { dataSplitterNew }); } } diff --git a/src/main/java/nl/sbdeveloper/showcontrol/commands/ShowCMD.java b/src/main/java/nl/sbdeveloper/showcontrol/commands/ShowCMD.java index 706d3f9..ebb872b 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/commands/ShowCMD.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/commands/ShowCMD.java @@ -45,7 +45,7 @@ public class ShowCMD extends BaseCommand { @Subcommand("add") @Description("") - @CommandCompletion("@showname @empty @showtype") + @CommandCompletion("@showname @empty @showtype @empty") public void onAdd(CommandSender sender, String name, String time, String args) { if (!Shows.exists(name)) { sender.sendMessage(ChatColor.RED + "That show doesn't exists."); @@ -73,6 +73,9 @@ public class ShowCMD extends BaseCommand { } catch (TooFewArgumentsException e) { sender.sendMessage(ChatColor.RED + "You did not provide enough information for the chosen trigger."); return; + } catch (IllegalArgumentException e) { + sender.sendMessage(ChatColor.RED + "Couldn't create the trigger: " + e.getMessage()); + return; } Shows.addPoint(name, timeMilli, data); diff --git a/src/main/java/nl/sbdeveloper/showcontrol/utils/MainUtil.java b/src/main/java/nl/sbdeveloper/showcontrol/utils/MainUtil.java index b7856f9..b768ac4 100644 --- a/src/main/java/nl/sbdeveloper/showcontrol/utils/MainUtil.java +++ b/src/main/java/nl/sbdeveloper/showcontrol/utils/MainUtil.java @@ -1,8 +1,8 @@ package nl.sbdeveloper.showcontrol.utils; import nl.sbdeveloper.showcontrol.api.ShowCuePoint; +import nl.sbdeveloper.showcontrol.api.triggers.TriggerIdentifier; import org.bukkit.ChatColor; -import org.bukkit.Material; import org.bukkit.inventory.ItemStack; import org.bukkit.util.ChatPaginator; @@ -15,7 +15,9 @@ public class MainUtil { } public static ItemStack pointToItem(ShowCuePoint point) { - ItemBuilder builder = new ItemBuilder(Material.NOTE_BLOCK); + TriggerIdentifier identifier = point.getTask().getClass().getAnnotation(TriggerIdentifier.class); + + ItemBuilder builder = new ItemBuilder(identifier.item()); builder.setName(ChatColor.ITALIC + "TimeCode: " + TimeUtil.makeReadable(point.getTime())); List lores = new ArrayList<>(); -- 2.45.3