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 0000000..9080c83 Binary files /dev/null and b/libs/Definity-Webhooks-1.0.jar differ diff --git a/src/main/java/lol/aabss/skhttp/elements/Types.java b/src/main/java/lol/aabss/skhttp/elements/Types.java index 05b3fdd..db9ea2e 100644 --- a/src/main/java/lol/aabss/skhttp/elements/Types.java +++ b/src/main/java/lol/aabss/skhttp/elements/Types.java @@ -4,11 +4,11 @@ import ch.njol.skript.classes.Parser; import ch.njol.skript.lang.ParseContext; import ch.njol.skript.registrations.Classes; -import com.itsradiix.discordwebhook.DiscordWebHook; -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.DiscordWebHookMessage; +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.jetbrains.annotations.NotNull; import java.net.http.HttpClient; @@ -90,7 +90,7 @@ public boolean canParse(@NotNull ParseContext context) { ) ); - Classes.registerClass(new ClassInfo<>(DiscordWebHook.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