From d7e9ce792557f6cf2309afe0f39269b51f9b7f75 Mon Sep 17 00:00:00 2001
From: Etzelia <etzelia@hotmail.com>
Date: Thu, 30 Jul 2020 21:34:02 -0500
Subject: [PATCH] Move sendWebhook to Javacord

Signed-off-by: Etzelia <etzelia@hotmail.com>
---
 pom.xml                                       |  2 +-
 .../java/xyz/etztech/minealert/MineAlert.java | 24 -------------------
 .../minealert/commands/MainCommand.java       |  5 ++--
 .../listeners/BlockBreakListener.java         |  4 ++--
 4 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/pom.xml b/pom.xml
index 652c437..0eb1c94 100644
--- a/pom.xml
+++ b/pom.xml
@@ -37,7 +37,7 @@
         <dependency>
             <groupId>xyz.etztech</groupId>
             <artifactId>javacord</artifactId>
-            <version>0.1.0</version>
+            <version>0.2.0</version>
         </dependency>
         <dependency>
             <groupId>commons-lang</groupId>
diff --git a/src/main/java/xyz/etztech/minealert/MineAlert.java b/src/main/java/xyz/etztech/minealert/MineAlert.java
index 92fa7b1..8ac3820 100644
--- a/src/main/java/xyz/etztech/minealert/MineAlert.java
+++ b/src/main/java/xyz/etztech/minealert/MineAlert.java
@@ -2,15 +2,9 @@ package xyz.etztech.minealert;
 
 
 import org.bukkit.plugin.java.JavaPlugin;
-import xyz.etztech.embed.Webhook;
 import xyz.etztech.minealert.commands.MainCommand;
 import xyz.etztech.minealert.listeners.BlockBreakListener;
 
-import java.io.OutputStream;
-import java.net.HttpURLConnection;
-import java.net.URL;
-import java.net.URLConnection;
-import java.nio.charset.StandardCharsets;
 import java.util.logging.Logger;
 
 public class MineAlert extends JavaPlugin {
@@ -68,23 +62,5 @@ public class MineAlert extends JavaPlugin {
         }
         return def;
     }
-
-    public static void sendWebhook(String webhookURL, Webhook webhook) throws Exception {
-        URL url = new URL(webhookURL);
-        URLConnection con = url.openConnection();
-        HttpURLConnection http = (HttpURLConnection) con;
-        http.setRequestMethod("POST");
-        http.setDoOutput(true);
-
-        byte[] out = webhook.toString().getBytes(StandardCharsets.UTF_8);
-        int length = out.length;
-        http.setFixedLengthStreamingMode(length);
-        http.setRequestProperty("Content-Type", "application/json; utf-8");
-        http.setRequestProperty("User-Agent", "MineAlert Agent");
-
-        try (OutputStream os = http.getOutputStream()) {
-            os.write(out, 0, out.length);
-        }
-    }
 }
 
diff --git a/src/main/java/xyz/etztech/minealert/commands/MainCommand.java b/src/main/java/xyz/etztech/minealert/commands/MainCommand.java
index 6080369..33bf174 100644
--- a/src/main/java/xyz/etztech/minealert/commands/MainCommand.java
+++ b/src/main/java/xyz/etztech/minealert/commands/MainCommand.java
@@ -6,9 +6,10 @@ import org.bukkit.Bukkit;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
+import xyz.etztech.Javacord;
+import xyz.etztech.Webhook;
 import xyz.etztech.embed.Author;
 import xyz.etztech.embed.Embed;
-import xyz.etztech.embed.Webhook;
 import xyz.etztech.minealert.Color;
 import xyz.etztech.minealert.Lang;
 import xyz.etztech.minealert.MineAlert;
@@ -79,7 +80,7 @@ public class MainCommand implements CommandExecutor {
                         .color(Color.PRIMARY.getInt())
                         .description("Test Message")
                         .author(new Author("Console", "", "https://minotar.net/helm/Notch/100.png", ""));
-                MineAlert.sendWebhook(webhook, new Webhook("", embed));
+                Javacord.sendWebhook(webhook, new Webhook("", embed));
                 Color.INFO.sms(commandSender, "Webhook sent!");
             } catch (Exception e) {
                 Lang.WEBHOOK_FAILED.sms(commandSender);
diff --git a/src/main/java/xyz/etztech/minealert/listeners/BlockBreakListener.java b/src/main/java/xyz/etztech/minealert/listeners/BlockBreakListener.java
index 4d16f00..8bd2e4a 100644
--- a/src/main/java/xyz/etztech/minealert/listeners/BlockBreakListener.java
+++ b/src/main/java/xyz/etztech/minealert/listeners/BlockBreakListener.java
@@ -13,9 +13,9 @@ import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.bukkit.event.block.BlockBreakEvent;
 import xyz.etztech.Javacord;
+import xyz.etztech.Webhook;
 import xyz.etztech.embed.Author;
 import xyz.etztech.embed.Embed;
-import xyz.etztech.embed.Webhook;
 import xyz.etztech.minealert.Color;
 import xyz.etztech.minealert.Lang;
 import xyz.etztech.minealert.MineAlert;
@@ -191,7 +191,7 @@ public class BlockBreakListener implements Listener {
                             ""));
             this.plugin.getServer().getScheduler().runTaskAsynchronously(this.plugin, () -> {
                 try {
-                    MineAlert.sendWebhook(webhook, new Webhook(ping ? "@here" : "", embed));
+                    Javacord.sendWebhook(webhook, new Webhook(ping ? "@here" : "", embed));
                 } catch (Exception e) {
                     this.plugin.log(Lang.WEBHOOK_FAILED.getMessage());
                 }