diff --git a/pom.xml b/pom.xml index 357752a..fa26ca7 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ nl.SBDeveloper ThemeParkPlus - 3.2 + 3.2.1 jar ThemeParkPlus @@ -115,28 +115,25 @@ https://repo.codemc.org/repository/maven-public/ default + + sbdevelopment-repo-releases + SBDevelopment Repository + https://repo.sbdevelopment.tech/releases + org.spigotmc spigot-api - 1.19.2-R0.1-SNAPSHOT + 1.20.2-R0.1-SNAPSHOT provided - me.paradoxpixel + nl.iobyte themepark - 3.1.1 - system - ${pom.basedir}/src/lib/ThemePark_v3.1.1.jar - - - me.paradoxpixel - parkplusmc - 1.4 - system - ${pom.basedir}/src/lib/parkplus-1.4.jar + 3.1.3 + provided org.projectlombok diff --git a/src/lib/ThemePark_v3.1.1.jar b/src/lib/ThemePark_v3.1.1.jar deleted file mode 100644 index 240a233..0000000 Binary files a/src/lib/ThemePark_v3.1.1.jar and /dev/null differ diff --git a/src/lib/parkplus-1.4.jar b/src/lib/parkplus-1.4.jar deleted file mode 100644 index a2a1ea5..0000000 Binary files a/src/lib/parkplus-1.4.jar and /dev/null differ diff --git a/src/main/java/nl/sbdeveloper/themeparkplus/ThemeParkPlus.java b/src/main/java/nl/sbdeveloper/themeparkplus/ThemeParkPlus.java index 3eccb15..067aead 100644 --- a/src/main/java/nl/sbdeveloper/themeparkplus/ThemeParkPlus.java +++ b/src/main/java/nl/sbdeveloper/themeparkplus/ThemeParkPlus.java @@ -84,14 +84,11 @@ public final class ThemeParkPlus extends JavaPlugin { Bukkit.getPluginManager().registerEvents(new AntiFreerunListener(), this); } - if (Bukkit.getPluginManager().getPlugin("ThemePark") == null && Bukkit.getPluginManager().getPlugin("ParkPlusMC") == null) { - getLogger().severe("ThemePark or ParkPlusMC not found! Some functions will not work without it!"); + if (Bukkit.getPluginManager().getPlugin("ThemePark") == null) { + getLogger().warning("ThemePark not found! Some functions will not work without it!"); } else if (Bukkit.getPluginManager().getPlugin("ThemePark") != null) { getLogger().info("Enabling ThemePark hook..."); hasParkHook = true; - } else if (Bukkit.getPluginManager().getPlugin("ParkPlusMC") != null) { - getLogger().info("Enabling ParkPlusMC hook..."); - hasParkHook = true; } if (hasParkHook) { diff --git a/src/main/java/nl/sbdeveloper/themeparkplus/listeners/StatusChangeListener.java b/src/main/java/nl/sbdeveloper/themeparkplus/listeners/StatusChangeListener.java index 50d9214..6d7c1fa 100644 --- a/src/main/java/nl/sbdeveloper/themeparkplus/listeners/StatusChangeListener.java +++ b/src/main/java/nl/sbdeveloper/themeparkplus/listeners/StatusChangeListener.java @@ -73,34 +73,4 @@ public class StatusChangeListener implements Listener { ThemeParkPlus.getWebhookClient().send(message); } - - @EventHandler - public void onStatusChangePPMC(nl.iobyte.parkplus.generic.event.attraction.AttractionStatusChangeEvent e) { - String title = ThemeParkPlus.getSConfig().getFile().getString("DiscordWebhook.Embed.Title"); - if (title == null) return; - - String rideName = ChatColor.stripColor(ConfigUtil.__(e.getAttraction().getName())); - String regionName = ChatColor.stripColor(ConfigUtil.__(e.getAttraction().getRegionID())); - String statusAfter = ChatColor.stripColor(ConfigUtil.__(e.getCurrent().getColor() + e.getCurrent().getName())); - - title = title.replaceAll("%RideName%", rideName); - title = title.replaceAll("%Region%", regionName); - String copy = ThemeParkPlus.getSConfig().getFile().getString("DiscordWebhook.Embed.Copyright"); - String copyimg = ThemeParkPlus.getSConfig().getFile().getString("DiscordWebhook.Embed.CopyrightImage"); - Integer color = ThemeParkPlus.getSConfig().getFile().getInt("DiscordWebhook.Embed.Colors." + e.getCurrent().name()); - if (copy == null || copyimg == null) return; - - WebhookEmbed embed = new WebhookEmbedBuilder() - .setTitle(new WebhookEmbed.EmbedTitle(title, null)) - .setFooter(new WebhookEmbed.EmbedFooter(copy, copyimg)) - .setColor(color) - .addField(new WebhookEmbed.EmbedField(false, rideName, statusAfter)) - .build(); - - WebhookMessage message = new WebhookMessageBuilder() - .addEmbeds(embed) - .build(); - - ThemeParkPlus.getWebhookClient().send(message); - } }