From a9550c82fee2f8e074a138c0dedcd188fc4ffd0b Mon Sep 17 00:00:00 2001
From: destro174 <40720638+destro174@users.noreply.github.com>
Date: Sun, 27 Jun 2021 19:58:34 +0200
Subject: [PATCH] Usage galaxy 1.17

---
 .../main/java/com/alttd/chat/config/Config.java   |  1 -
 galaxy/dependency-reduced-pom.xml                 | 10 ++--------
 galaxy/pom.xml                                    | 15 ++++++---------
 .../java/com/alttd/chat/commands/Message.java     |  1 -
 .../java/com/alttd/chat/handler/ChatHandler.java  |  1 -
 .../com/alttd/chat/listeners/ChatListener.java    |  4 ++--
 pom.xml                                           |  9 +++++++++
 .../java/com/alttd/chat/handlers/ChatHandler.java | 13 +------------
 8 files changed, 20 insertions(+), 34 deletions(-)

diff --git a/api/src/main/java/com/alttd/chat/config/Config.java b/api/src/main/java/com/alttd/chat/config/Config.java
index 4acee42..2f7f78d 100755
--- a/api/src/main/java/com/alttd/chat/config/Config.java
+++ b/api/src/main/java/com/alttd/chat/config/Config.java
@@ -14,7 +14,6 @@ import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.lang.reflect.Modifier;
-import java.nio.file.Path;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.UUID;
diff --git a/galaxy/dependency-reduced-pom.xml b/galaxy/dependency-reduced-pom.xml
index 8a881ee..9f0798d 100644
--- a/galaxy/dependency-reduced-pom.xml
+++ b/galaxy/dependency-reduced-pom.xml
@@ -52,17 +52,11 @@
       </plugin>
     </plugins>
   </build>
-  <repositories>
-    <repository>
-      <id>Alttd-Nexus</id>
-      <url>http://leo:8081/snapshots/</url>
-    </repository>
-  </repositories>
   <dependencies>
     <dependency>
-      <groupId>com.alttd.galaxy</groupId>
+      <groupId>com.alttd</groupId>
       <artifactId>galaxy-api</artifactId>
-      <version>1.16.5-R0.1-SNAPSHOT</version>
+      <version>1.17-R0.1-SNAPSHOT</version>
       <scope>compile</scope>
     </dependency>
   </dependencies>
diff --git a/galaxy/pom.xml b/galaxy/pom.xml
index 4c6f6e3..a88ad85 100755
--- a/galaxy/pom.xml
+++ b/galaxy/pom.xml
@@ -68,18 +68,10 @@
     </build>
 
     <repositories>
-        <repository>
-            <id>Alttd-Nexus</id>
-            <url>http://leo:8081/snapshots/</url>
-        </repository>
+
     </repositories>
 
     <dependencies>
-        <dependency>
-            <groupId>com.alttd.galaxy</groupId>
-            <artifactId>galaxy-api</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.alttd.chat</groupId>
             <artifactId>chat-api</artifactId>
@@ -96,5 +88,10 @@
             <artifactId>adventure-text-minimessage</artifactId>
             <version>4.1.0-SNAPSHOT</version>
         </dependency>
+        <dependency><!-- Galaxy -->
+            <groupId>com.alttd</groupId>
+            <artifactId>galaxy-api</artifactId>
+            <version>1.17-R0.1-SNAPSHOT</version>
+        </dependency>
     </dependencies>
 </project>
\ No newline at end of file
diff --git a/galaxy/src/main/java/com/alttd/chat/commands/Message.java b/galaxy/src/main/java/com/alttd/chat/commands/Message.java
index 59c840f..36659ca 100644
--- a/galaxy/src/main/java/com/alttd/chat/commands/Message.java
+++ b/galaxy/src/main/java/com/alttd/chat/commands/Message.java
@@ -5,7 +5,6 @@ import org.apache.commons.lang.StringUtils;
 import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
-import org.bukkit.command.TabCompleter;
 import org.bukkit.entity.Player;
 
 public class Message  implements CommandExecutor {
diff --git a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
index be61b63..b4cfb8b 100755
--- a/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
+++ b/galaxy/src/main/java/com/alttd/chat/handler/ChatHandler.java
@@ -14,7 +14,6 @@ import net.kyori.adventure.text.minimessage.Template;
 import net.kyori.adventure.text.serializer.gson.GsonComponentSerializer;
 import org.bukkit.Bukkit;
 import org.bukkit.Material;
-import org.bukkit.OfflinePlayer;
 import org.bukkit.entity.Player;
 import org.bukkit.inventory.ItemStack;
 
diff --git a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java
index 3ba14d5..3afc65a 100755
--- a/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java
+++ b/galaxy/src/main/java/com/alttd/chat/listeners/ChatListener.java
@@ -13,13 +13,13 @@ import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.minimessage.MiniMessage;
 import net.kyori.adventure.text.minimessage.Template;
 import net.kyori.adventure.text.serializer.plain.PlainComponentSerializer;
-import org.bukkit.Bukkit;
 import org.bukkit.entity.Player;
 import org.bukkit.event.EventHandler;
 import org.bukkit.event.Listener;
 import org.jetbrains.annotations.NotNull;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public class ChatListener implements Listener, ChatRenderer {
 
diff --git a/pom.xml b/pom.xml
index 2580303..45a1261 100755
--- a/pom.xml
+++ b/pom.xml
@@ -69,6 +69,15 @@
             <name>Sponge Maven Repository</name>
             <url>https://repo.spongepowered.org/maven</url>
         </repository>
+        <repository>
+            <id>Alttd-Nexus</id>
+            <url>http://leo:8081/snapshots/</url>
+        </repository>
+        <repository> <!-- can be removed when galaxy api is fixed, I fucked up when shading this in -->
+            <id>dv8tion</id>
+            <name>m2-dv8tion</name>
+            <url>https://m2.dv8tion.net/releases</url>
+        </repository>
     </repositories>
 
 </project>
diff --git a/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java b/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java
index a38c9d3..183b8a5 100755
--- a/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java
+++ b/velocity/src/main/java/com/alttd/chat/handlers/ChatHandler.java
@@ -87,16 +87,6 @@ public class ChatHandler {
         // todo construct the mail and notify the player if online?
     }
 
-    /**
-     * @param message the messaged to be parsed by the chatfilter
-     * @param player the player invoking the message
-     * @return the message altered by the filters
-     */
-    public String applyChatFilters(String message, Player player) {
-        return "";
-    }
-
-
     public void readMail(CommandSource commandSource, String targetPlayer, boolean unread) {
 
     }
@@ -105,5 +95,4 @@ public class ChatHandler {
 
     }
 
-
-}
+}
\ No newline at end of file