breaking(deps): Update to waterdogPE 2.0.0

Author: funniray

pom.xml

@@ -16,24 +16,20 @@
 
     <repositories>
         <repository>
-            <id>opencollab-releases</id>
-            <url>https://repo.opencollab.dev/maven-releases/</url>
+            <id>waterdogpe-snapshots</id>
+            <url>https://repo.waterdog.dev/snapshots</url>
         </repository>
         <repository>
-            <id>opencollab-snapshots</id>
-            <url>https://repo.opencollab.dev/maven-snapshots/</url>
-        </repository>
-        <repository>
-            <id>waterdog-repo</id>
-            <url>https://repo.waterdog.dev/artifactory/main</url>
+            <id>waterdogpe-releases</id>
+            <url>https://repo.waterdog.dev/releases</url>
         </repository>
     </repositories>
 
     <dependencies>
         <dependency>
             <groupId>dev.waterdog.waterdogpe</groupId>
             <artifactId>waterdog</artifactId>
-            <version>1.2.4</version>
+            <version>2.0.0-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>

src/main/java/com/funniray/lbwd/Datastores/Datastore.java

@@ -20,7 +20,6 @@
 import com.funniray.lbwd.datatypes.Alt;
 import com.funniray.lbwd.datatypes.Ban;
 
-import javax.annotation.Nullable;
 import java.util.HashSet;
 import java.util.UUID;
 

src/main/java/com/funniray/lbwd/LBWD.java

@@ -24,9 +24,9 @@
 import com.funniray.lbwd.handlers.LoginHandler;
 import com.funniray.lbwd.handlers.PreLoginHandler;
 import com.funniray.lbwd.handlers.MessageHandler;
+import dev.waterdog.waterdogpe.event.defaults.PlayerAuthenticatedEvent;
 import dev.waterdog.waterdogpe.event.defaults.PlayerChatEvent;
 import dev.waterdog.waterdogpe.event.defaults.PlayerLoginEvent;
-import dev.waterdog.waterdogpe.event.defaults.PlayerPreLoginEvent;
 import dev.waterdog.waterdogpe.plugin.Plugin;
 import dev.waterdog.waterdogpe.utils.config.Configuration;
 
@@ -82,12 +82,6 @@ public void onEnable() {
                 datastore = new SQLStore(config.getString("jdbcurl"),config.getString("dbusername"),config.getString("dbpassword"));
         }
 
-        if (getConfig().getBoolean("showpiracywarning")) {
-            this.getLogger().warn("A WaterDogPE plugin that attempts at being fully compatible with litebans\n" +
-                "A free plugin by Funniray. https://github.com/funniray/waterdog-litebans If you paid for this plugin, you were scammed.\n" +
-                "Report resellers to beingscammed@reallyisnt.fun");
-        }
-
         getProxy().getCommandMap().registerCommand(new BanCommand());
         getProxy().getCommandMap().registerCommand(new PardonCommand());
         getProxy().getCommandMap().registerCommand(new MuteCommand());
@@ -102,7 +96,7 @@ public void onEnable() {
         getProxy().getCommandMap().registerCommand(new HistoryCommand());
         getProxy().getCommandMap().registerCommand(new AltsCommand());
 
-        getProxy().getEventManager().subscribe(PlayerPreLoginEvent.class, new PreLoginHandler());
+        getProxy().getEventManager().subscribe(PlayerAuthenticatedEvent.class, new PreLoginHandler());
         getProxy().getEventManager().subscribe(PlayerLoginEvent.class, new LoginHandler());
         getProxy().getEventManager().subscribe(PlayerChatEvent.class, new MessageHandler());
 

src/main/java/com/funniray/lbwd/datatypes/Ban.java

@@ -25,8 +25,8 @@
 import dev.waterdog.waterdogpe.ProxyServer;
 import dev.waterdog.waterdogpe.command.CommandSender;
 import dev.waterdog.waterdogpe.player.ProxiedPlayer;
+import jline.internal.Nullable;
 
-import javax.annotation.Nullable;
 import java.util.*;
 
 public class Ban {

src/main/java/com/funniray/lbwd/datatypes/Server.java

@@ -17,7 +17,8 @@
 
 package com.funniray.lbwd.datatypes;
 
-import javax.annotation.Nullable;
+import jline.internal.Nullable;
+
 import java.util.Date;
 import java.util.UUID;
 

src/main/java/com/funniray/lbwd/handlers/PreLoginHandler.java

@@ -22,17 +22,17 @@
 import com.funniray.lbwd.utils.Colors;
 import com.funniray.lbwd.utils.DateUtils;
 import dev.waterdog.waterdogpe.ProxyServer;
-import dev.waterdog.waterdogpe.event.defaults.PlayerPreLoginEvent;
+import dev.waterdog.waterdogpe.event.defaults.PlayerAuthenticatedEvent;
 import dev.waterdog.waterdogpe.player.ProxiedPlayer;
 
 import java.util.Date;
 import java.util.Set;
 import java.util.UUID;
 import java.util.function.Consumer;
 
-public class PreLoginHandler implements Consumer<PlayerPreLoginEvent> {
+public class PreLoginHandler implements Consumer<PlayerAuthenticatedEvent> {
     @Override
-    public void accept(PlayerPreLoginEvent e) {
+    public void accept(PlayerAuthenticatedEvent e) {
         LBWD.datastore.addHistory(e.getLoginData().getDisplayName(), e.getLoginData().getUuid(), e.getAddress().getAddress().getHostAddress());
 
         UUID uuid = e.getLoginData().getUuid();

src/main/resources/config.yml

@@ -15,19 +15,6 @@
 #   I am available for any questions/requests: funniray10@gmail.com
 #
 
-###############################################################################################################
-###############################################################################################################
-####                                                                                                       ####
-####                               IF YOU PAID FOR THIS, YOU WERE SCAMMED                                  ####
-####                                     THIS IS A FREE PLUGIN                                             ####
-####                           https://github.com/funniray/waterdog-litebans                               ####
-####                           Report scammers to beingscammed@reallyisnt.fun                              ####
-####                                                                                                       ####
-###############################################################################################################
-###############################################################################################################
-
-showpiracywarning: true
-
 # What datastore to use
 # Options available: h2 (local), mysql
 store: h2
@@ -61,4 +48,4 @@ BanIPJoinMessage: "%s tried to join, but they were ipbanned."
 BanBroadcast: "Player %1$s was banned by %2$s for %3$s duration: %4$s"
 MuteBroadcast: "Player %1$s was muted by %2$s for %3$s duration: %4$s"
 WarnBroadcast: "Player %1$s was warned by %2$s for %3$s"
-KickBroadcast: "Player %1$s was banned by %2$s for %3$s"
+KickBroadcast: "Player %1$s was banned by %2$s for %3$s"