From cb22a7004f330f7cef7646334ec8dd4f5aa6df86 Mon Sep 17 00:00:00 2001 From: aabssmc Date: Sun, 10 Mar 2024 21:48:43 -0700 Subject: [PATCH] prepare for release --- build.gradle | 14 +++++++++++--- libs/Definity-Webhooks-1.0.jar | Bin 0 -> 13810 bytes .../java/lol/aabss/skhttp/elements/Types.java | 16 ++++++++-------- .../elements/effects/EffSendDiscordWebhook.java | 10 +++++----- .../elements/expressions/ExprEmbedAuthor.java | 2 +- .../elements/expressions/ExprEmbedField.java | 2 +- .../elements/expressions/ExprEmbedFooter.java | 2 +- .../elements/sections/SecEmbedBuilder.java | 8 ++++---- .../elements/sections/SecWebhookBuilder.java | 8 ++++---- 9 files changed, 35 insertions(+), 27 deletions(-) create mode 100644 libs/Definity-Webhooks-1.0.jar diff --git a/build.gradle b/build.gradle index 24576ab..a4397bd 100644 --- a/build.gradle +++ b/build.gradle @@ -1,23 +1,31 @@ plugins { id 'java' + id 'com.github.johnrengelman.shadow' version '8.1.1' } group = 'lol.aabss' -version = '1.0' +version = '1.1' repositories { mavenCentral() maven {url = "https://hub.spigotmc.org/nexus/content/repositories/snapshots/"} maven {url = "https://oss.sonatype.org/content/groups/public/"} maven {url = "https://repo.skriptlang.org/releases"} - maven {url = "https://jitpack.io"} } dependencies { implementation "org.jetbrains:annotations:24.0.0" compileOnly "org.spigotmc:spigot-api:1.20.4-R0.1-SNAPSHOT" implementation "com.github.SkriptLang:Skript:2.7.0" - implementation "com.github.ItsRadiiX:Definity-Webhooks:f051e1fa3e" + implementation "org.json:json:20231013" + compileOnly files("libs/Definity-Webhooks-1.0.jar") + +} + +shadowJar { + dependencies { + include(dependency("org.json:json:20231013")) + } } def targetJavaVersion = 17 diff --git a/libs/Definity-Webhooks-1.0.jar b/libs/Definity-Webhooks-1.0.jar new file mode 100644 index 0000000000000000000000000000000000000000..9080c83dc0ab75e2f6446e8fc36985323e67778b GIT binary patch literal 13810 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.class, "discordwebhook") + Classes.registerClass(new ClassInfo<>(DiscordWebHookMessage.class, "discordwebhook") .name("Discord Webhook") .description("Represents a discord webhook.") .user("discord ?webhooks?") @@ -103,12 +103,12 @@ public boolean canParse(@NotNull ParseContext context) { } @Override - public @NotNull String toString(DiscordWebHook o, int flags) { + public @NotNull String toString(DiscordWebHookMessage o, int flags) { return toVariableNameString(o); } @Override - public @NotNull String toVariableNameString(DiscordWebHook o) { + public @NotNull String toVariableNameString(DiscordWebHookMessage o) { return o.getContent(); } } diff --git a/src/main/java/lol/aabss/skhttp/elements/effects/EffSendDiscordWebhook.java b/src/main/java/lol/aabss/skhttp/elements/effects/EffSendDiscordWebhook.java index 08960ce..bbbe0c9 100644 --- a/src/main/java/lol/aabss/skhttp/elements/effects/EffSendDiscordWebhook.java +++ b/src/main/java/lol/aabss/skhttp/elements/effects/EffSendDiscordWebhook.java @@ -9,7 +9,7 @@ import ch.njol.skript.lang.Expression; import ch.njol.skript.lang.SkriptParser; import ch.njol.util.Kleenean; -import com.itsradiix.discordwebhook.DiscordWebHook; +import com.itsradiix.DiscordWebHookMessage; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -38,12 +38,12 @@ protected void execute(@NotNull Event e) { if (url != null) { Object text = this.text.getSingle(e); if (text instanceof String t) { - DiscordWebHook message = new DiscordWebHook.Builder() + DiscordWebHookMessage message = new DiscordWebHookMessage.Builder() .content(t) .build(); - DiscordWebHook.sendMessage(url, message); - } else if (text instanceof DiscordWebHook t){ - DiscordWebHook.sendMessage(url, t); + DiscordWebHookMessage.sendMessage(url, message); + } else if (text instanceof DiscordWebHookMessage t){ + DiscordWebHookMessage.sendMessage(url, t); } } } diff --git a/src/main/java/lol/aabss/skhttp/elements/expressions/ExprEmbedAuthor.java b/src/main/java/lol/aabss/skhttp/elements/expressions/ExprEmbedAuthor.java index f76af90..e7109ab 100644 --- a/src/main/java/lol/aabss/skhttp/elements/expressions/ExprEmbedAuthor.java +++ b/src/main/java/lol/aabss/skhttp/elements/expressions/ExprEmbedAuthor.java @@ -10,7 +10,7 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import com.itsradiix.discordwebhook.embed.models.Author; +import com.itsradiix.embed.models.Author; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/lol/aabss/skhttp/elements/expressions/ExprEmbedField.java b/src/main/java/lol/aabss/skhttp/elements/expressions/ExprEmbedField.java index 487f171..7dcd819 100644 --- a/src/main/java/lol/aabss/skhttp/elements/expressions/ExprEmbedField.java +++ b/src/main/java/lol/aabss/skhttp/elements/expressions/ExprEmbedField.java @@ -10,7 +10,7 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import com.itsradiix.discordwebhook.embed.models.Field; +import com.itsradiix.embed.models.Field; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/lol/aabss/skhttp/elements/expressions/ExprEmbedFooter.java b/src/main/java/lol/aabss/skhttp/elements/expressions/ExprEmbedFooter.java index c50e78e..da5f73f 100644 --- a/src/main/java/lol/aabss/skhttp/elements/expressions/ExprEmbedFooter.java +++ b/src/main/java/lol/aabss/skhttp/elements/expressions/ExprEmbedFooter.java @@ -10,7 +10,7 @@ import ch.njol.skript.lang.SkriptParser; import ch.njol.skript.lang.util.SimpleExpression; import ch.njol.util.Kleenean; -import com.itsradiix.discordwebhook.embed.models.Footer; +import com.itsradiix.embed.models.Footer; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/lol/aabss/skhttp/elements/sections/SecEmbedBuilder.java b/src/main/java/lol/aabss/skhttp/elements/sections/SecEmbedBuilder.java index ec489d6..b739d2f 100644 --- a/src/main/java/lol/aabss/skhttp/elements/sections/SecEmbedBuilder.java +++ b/src/main/java/lol/aabss/skhttp/elements/sections/SecEmbedBuilder.java @@ -9,10 +9,10 @@ import ch.njol.skript.doc.Since; import ch.njol.skript.lang.*; import ch.njol.util.Kleenean; -import com.itsradiix.discordwebhook.embed.Embed; -import com.itsradiix.discordwebhook.embed.models.Author; -import com.itsradiix.discordwebhook.embed.models.Field; -import com.itsradiix.discordwebhook.embed.models.Footer; +import com.itsradiix.embed.Embed; +import com.itsradiix.embed.models.Author; +import com.itsradiix.embed.models.Field; +import com.itsradiix.embed.models.Footer; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; diff --git a/src/main/java/lol/aabss/skhttp/elements/sections/SecWebhookBuilder.java b/src/main/java/lol/aabss/skhttp/elements/sections/SecWebhookBuilder.java index 0c920d5..eca8925 100644 --- a/src/main/java/lol/aabss/skhttp/elements/sections/SecWebhookBuilder.java +++ b/src/main/java/lol/aabss/skhttp/elements/sections/SecWebhookBuilder.java @@ -9,8 +9,8 @@ import ch.njol.skript.doc.Since; import ch.njol.skript.lang.*; import ch.njol.util.Kleenean; -import com.itsradiix.discordwebhook.DiscordWebHook; -import com.itsradiix.discordwebhook.embed.Embed; +import com.itsradiix.DiscordWebHookMessage; +import com.itsradiix.embed.Embed; import org.bukkit.event.Event; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; @@ -75,7 +75,7 @@ private void execute(Event e) { if (var == null) { return; } - DiscordWebHook.Builder builder = new DiscordWebHook.Builder(); + DiscordWebHookMessage.Builder builder = new DiscordWebHookMessage.Builder(); String content = this.content.getSingle(e); if (content != null){ builder = builder.content(content); @@ -98,7 +98,7 @@ private void execute(Event e) { builder = builder.embed(embed); } } - var.change(e, new DiscordWebHook[]{builder.build()}, Changer.ChangeMode.SET); + var.change(e, new DiscordWebHookMessage[]{builder.build()}, Changer.ChangeMode.SET); } @Override