Update dependencies

games647 · May 3, 2024 · 8e35c5d · 8e35c5d
1 parent cf4d19a
commit 8e35c5d
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 55 deletions.
diff --git a/bukkit/pom.xml b/bukkit/pom.xml
@@ -31,6 +31,8 @@
 
     <properties>
         <nettyVersion>4.1.79.Final</nettyVersion>
+
+        <maven.compiler.release>8</maven.compiler.release>
     </properties>
 
     <parent>
@@ -167,13 +169,6 @@
             <version>${project.version}</version>
         </dependency>
 
-        <dependency>
-            <groupId>org.yaml</groupId>
-            <artifactId>snakeyaml</artifactId>
-            <version>1.33</version>
-            <scope>compile</scope>
-        </dependency>
-
         <!-- PaperSpigot API for correcting user cache usage -->
         <dependency>
             <groupId>io.papermc.paper</groupId>

diff --git a/bungee/pom.xml b/bungee/pom.xml
@@ -40,6 +40,10 @@
     <artifactId>fastlogin.bungee</artifactId>
     <packaging>jar</packaging>
 
+    <properties>
+        <maven.compiler.release>8</maven.compiler.release>
+    </properties>
+
     <!--Represents the main plugin-->
     <name>FastLoginBungee</name>
 

diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeLoginSource.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeLoginSource.java
@@ -54,9 +54,15 @@ public void kick(String message) {
         preLoginEvent.setCancelled(true);
 
         if (message == null) {
-            preLoginEvent.setCancelReason(new ComponentBuilder("Kicked").color(ChatColor.WHITE).create());
+            preLoginEvent.setReason(
+                    TextComponent.fromArray(
+                            new ComponentBuilder("Kicked").color(ChatColor.WHITE).create()
+                    ));
         } else {
-            preLoginEvent.setCancelReason(TextComponent.fromLegacyText(message));
+            preLoginEvent.setReason(
+                    TextComponent.fromArray(
+                            TextComponent.fromLegacyText(message)
+                    ));
         }
     }
 
@@ -72,7 +78,7 @@ public PendingConnection getConnection() {
     @Override
     public String toString() {
         return this.getClass().getSimpleName() + '{'
-            + "connection=" + connection
-            + '}';
+                + "connection=" + connection
+                + '}';
     }
 }
diff --git a/core/pom.xml b/core/pom.xml
@@ -39,6 +39,13 @@
     <artifactId>fastlogin.core</artifactId>
     <packaging>jar</packaging>
 
+    <properties>
+        <maven.compiler.source>8</maven.compiler.source>
+        <maven.compiler.target>8</maven.compiler.target>
+        <!-- Make Java 21 test method available in this multi-release project: Caution of breaking older systems -->
+        <maven.compiler.release>21</maven.compiler.release>
+    </properties>
+
     <name>FastLoginCore</name>
 
     <repositories>
@@ -142,7 +149,7 @@
         <dependency>
             <groupId>net.md-5</groupId>
             <artifactId>bungeecord-config</artifactId>
-            <version>1.19-R0.1-SNAPSHOT</version>
+            <version>1.20-R0.2-SNAPSHOT</version>
         </dependency>
 
         <!--Floodgate for Xbox Live Authentication-->
@@ -191,44 +198,7 @@
         <dependency>
             <groupId>com.github.games647</groupId>
             <artifactId>craftapi</artifactId>
-            <version>0.7</version>
-        </dependency>
-
-        <!-- APIs we can use because they are available in all platforms (Spigot, Bungee, Velocity) -->
-        <dependency>
-            <groupId>com.google.guava</groupId>
-            <artifactId>guava</artifactId>
-            <!-- Old version for velocity -->
-            <version>25.1-jre</version>
-            <!-- Exclude compile time dependencies not marked as such on upstream  -->
-            <exclusions>
-                <exclusion>
-                    <groupId>com.google.code.findbugs</groupId>
-                    <artifactId>jsr305</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.checkerframework</groupId>
-                    <artifactId>checker-qual</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.errorprone</groupId>
-                    <artifactId>error_prone_annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>com.google.j2objc</groupId>
-                    <artifactId>j2objc-annotations</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>animal-sniffer-annotations</artifactId>
-                </exclusion>
-            </exclusions>
-        </dependency>
-
-        <dependency>
-            <groupId>com.google.code.gson</groupId>
-            <artifactId>gson</artifactId>
-            <version>2.10.1</version>
+            <version>0.8</version>
         </dependency>
 
         <dependency>

diff --git a/core/src/main/java/com/github/games647/fastlogin/core/storage/StoredProfile.java b/core/src/main/java/com/github/games647/fastlogin/core/storage/StoredProfile.java
@@ -97,10 +97,15 @@ public synchronized void setId(UUID uniqueId) {
         this.id = uniqueId;
     }
 
+    @Deprecated
     public synchronized boolean isPremium() {
         return premium;
     }
 
+    public synchronized boolean isOnlinemodePreferred() {
+        return premium;
+    }
+
     public synchronized void setPremium(boolean premium) {
         this.premium = premium;
     }

diff --git a/pom.xml b/pom.xml
@@ -48,7 +48,7 @@
         <!-- Set default for non-git clones -->
         <git.commit.id>Unknown</git.commit.id>
 
-        <java.version>8</java.version>
+        <maven.compiler.release>8</maven.compiler.release>
 
         <lombook.version>1.18.32</lombook.version>
 

diff --git a/velocity/pom.xml b/velocity/pom.xml
@@ -44,10 +44,7 @@
     <name>FastLoginVelocity</name>
 
     <properties>
-        <java.version>11</java.version>
-        <maven.compiler.source>${java.version}</maven.compiler.source>
-        <maven.compiler.target>${java.version}</maven.compiler.target>
-        <maven.compiler.release>${java.version}</maven.compiler.release>
+        <maven.compiler.release>11</maven.compiler.release>
     </properties>
 
     <build>