ok finally fixed

aabssmc · Mar 11, 2024 · 8734486 · 8734486
1 parent cb22a70
commit 8734486
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 28 deletions.
diff --git a/build.gradle b/build.gradle
@@ -11,20 +11,21 @@ repositories {
     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 "org.json:json:20231013"
-    compileOnly files("libs/Definity-Webhooks-1.0.jar")
-
+    implementation "com.github.ItsRadiiX:Definity-Webhooks:f051e1fa3e"
 }
 
 shadowJar {
     dependencies {
         include(dependency("org.json:json:20231013"))
+        include(dependency("com.github.ItsRadiiX:Definity-Webhooks:f051e1fa3e"))
     }
 }
 

diff --git a/libs/Definity-Webhooks-1.0.jar b/libs/Definity-Webhooks-1.0.jar
diff --git 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.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 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 org.jetbrains.annotations.NotNull;
 
 import java.net.http.HttpClient;
@@ -90,7 +90,7 @@ public boolean canParse(@NotNull ParseContext context) {
                 )
         );
 
-        Classes.registerClass(new ClassInfo<>(DiscordWebHookMessage.class, "discordwebhook")
+        Classes.registerClass(new ClassInfo<>(DiscordWebHook.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(DiscordWebHookMessage o, int flags) {
+                            public @NotNull String toString(DiscordWebHook o, int flags) {
                                 return toVariableNameString(o);
                             }
 
                             @Override
-                            public @NotNull String toVariableNameString(DiscordWebHookMessage o) {
+                            public @NotNull String toVariableNameString(DiscordWebHook 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
@@ -9,7 +9,7 @@
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.util.Kleenean;
-import com.itsradiix.DiscordWebHookMessage;
+import com.itsradiix.discordwebhook.DiscordWebHook;
 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) {
-                    DiscordWebHookMessage message = new DiscordWebHookMessage.Builder()
+                    DiscordWebHook message = new DiscordWebHook.Builder()
                             .content(t)
                             .build();
-                    DiscordWebHookMessage.sendMessage(url, message);
-                } else if (text instanceof DiscordWebHookMessage t){
-                    DiscordWebHookMessage.sendMessage(url, t);
+                    DiscordWebHook.sendMessage(url, message);
+                } else if (text instanceof DiscordWebHook t){
+                    DiscordWebHook.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
@@ -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.embed.models.Author;
+import com.itsradiix.discordwebhook.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
@@ -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.embed.models.Field;
+import com.itsradiix.discordwebhook.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
@@ -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.embed.models.Footer;
+import com.itsradiix.discordwebhook.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
@@ -9,10 +9,10 @@
 import ch.njol.skript.doc.Since;
 import ch.njol.skript.lang.*;
 import ch.njol.util.Kleenean;
-import com.itsradiix.embed.Embed;
-import com.itsradiix.embed.models.Author;
-import com.itsradiix.embed.models.Field;
-import com.itsradiix.embed.models.Footer;
+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 org.bukkit.event.Event;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -55,7 +55,7 @@ public class SecEmbedBuilder extends Section {
     private Variable<?> var;
 
     static {
-        Skript.registerSection(SecRequestBuilder.class,
+        Skript.registerSection(SecEmbedBuilder.class,
                 "discord [webhook] embed [builder]"
         );
         ENTRY_VALIDATOR.addEntryData(new ExpressionEntryData<>("title", null, true, String.class));

diff --git 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.DiscordWebHookMessage;
-import com.itsradiix.embed.Embed;
+import com.itsradiix.discordwebhook.DiscordWebHook;
+import com.itsradiix.discordwebhook.embed.Embed;
 import org.bukkit.event.Event;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
@@ -41,7 +41,7 @@ public class SecWebhookBuilder extends Section {
     private Variable<?> var;
 
     static {
-        Skript.registerSection(SecRequestBuilder.class,
+        Skript.registerSection(SecWebhookBuilder.class,
                 "discord webhook [builder]"
         );
         ENTRY_VALIDATOR.addEntryData(new ExpressionEntryData<>("content", null, false, String.class));
@@ -75,7 +75,7 @@ private void execute(Event e) {
         if (var == null) {
             return;
         }
-        DiscordWebHookMessage.Builder builder = new DiscordWebHookMessage.Builder();
+        DiscordWebHook.Builder builder = new DiscordWebHook.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 DiscordWebHookMessage[]{builder.build()}, Changer.ChangeMode.SET);
+        var.change(e, new DiscordWebHook[]{builder.build()}, Changer.ChangeMode.SET);
     }
 
     @Override