Merge branch 'rtm516:master' into master

Author: howard12721

README.md

@@ -17,7 +17,7 @@ You use this project at your own risk, the contributors are not responsible for
 ## Features
  - Syncing of MOTD and other server details
  - Automatic friend list management
- - ~~Easy Geyser integration (as an extension)~~ (Currently not working due to API limitations)
+ - Easy Geyser integration (as an extension)
 
 ## Pterodactyl Panel
 There is an egg for easy instance creation supplied for [Pterodactyl Panel](https://pterodactyl.io/), this being `egg-m-c-xbox-broadcast.json`

bootstrap/geyser/pom.xml

@@ -3,7 +3,7 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>boostrap-parent</artifactId>
+        <artifactId>bootstrap-parent</artifactId>
         <groupId>com.rtm516.mcxboxbroadcast</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -38,13 +38,13 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.13.2</version>
+            <version>2.14.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.13.2</version>
+            <version>2.14.0</version>
             <scope>compile</scope>
         </dependency>
     </dependencies>

bootstrap/geyser/src/main/java/com/rtm516/mcxboxbroadcast/bootstrap/geyser/MCXboxBroadcastExtension.java

@@ -8,11 +8,13 @@
 import com.rtm516.mcxboxbroadcast.core.exceptions.SessionCreationException;
 import com.rtm516.mcxboxbroadcast.core.exceptions.SessionUpdateException;
 import com.rtm516.mcxboxbroadcast.core.exceptions.XboxFriendsException;
+import com.rtm516.mcxboxbroadcast.core.models.FollowerResponse;
+import org.geysermc.api.Geyser;
 import org.geysermc.common.PlatformType;
+import org.geysermc.event.subscribe.Subscribe;
 import org.geysermc.floodgate.util.Utils;
 import org.geysermc.floodgate.util.WhitelistUtils;
 import org.geysermc.geyser.GeyserImpl;
-import org.geysermc.geyser.api.event.Subscribe;
 import org.geysermc.geyser.api.event.lifecycle.GeyserPostInitializeEvent;
 import org.geysermc.geyser.api.extension.Extension;
 import org.geysermc.geyser.api.network.AuthType;
@@ -24,9 +26,12 @@
 import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.Socket;
+import java.net.URISyntaxException;
 import java.net.UnknownHostException;
 import java.nio.file.FileSystem;
+import java.nio.file.FileSystems;
 import java.nio.file.Files;
+import java.util.Collections;
 import java.util.concurrent.TimeUnit;
 
 public class MCXboxBroadcastExtension implements Extension {
@@ -45,7 +50,7 @@ public void onPostInitialize(GeyserPostInitializeEvent event) {
         // Create the config file if it doesn't exist
         if (!configFile.exists()) {
             try (FileWriter writer = new FileWriter(configFile)) {
-                try (FileSystem fileSystem = this.fileSystem()) {
+                try (FileSystem fileSystem = FileSystems.newFileSystem(new File(MCXboxBroadcastExtension.class.getProtectionDomain().getCodeSource().getLocation().toURI()).toPath(), Collections.emptyMap())) {
                     try (InputStream input = Files.newInputStream(fileSystem.getPath("config.yml"))) {
                         byte[] bytes = new byte[input.available()];
 
@@ -56,7 +61,7 @@ public void onPostInitialize(GeyserPostInitializeEvent event) {
                         writer.flush();
                     }
                 }
-            } catch (IOException e) {
+            } catch (IOException | URISyntaxException e) {
                 logger.error("Failed to create config", e);
                 return;
             }
@@ -105,7 +110,7 @@ public void onPostInitialize(GeyserPostInitializeEvent event) {
             sessionInfo.setVersion(this.geyserApi().defaultRemoteServer().minecraftVersion());
             sessionInfo.setProtocol(this.geyserApi().defaultRemoteServer().protocolVersion());
             sessionInfo.setPlayers(this.geyserApi().onlineConnections().size());
-            sessionInfo.setMaxPlayers(this.geyserApi().maxPlayers());
+            sessionInfo.setMaxPlayers(GeyserImpl.getInstance().getConfig().getMaxPlayers()); // TODO Find API equivalent
 
             sessionInfo.setIp(ip);
             sessionInfo.setPort(port);
@@ -120,7 +125,7 @@ public void onPostInitialize(GeyserPostInitializeEvent event) {
             }
 
             // Start the update timer
-            GeyserImpl.getInstance().getScheduledThread().scheduleWithFixedDelay(this::tick, config.updateInterval, config.updateInterval, TimeUnit.SECONDS);
+            GeyserImpl.getInstance().getScheduledThread().scheduleWithFixedDelay(this::tick, config.updateInterval, config.updateInterval, TimeUnit.SECONDS); // TODO Find API equivalent
         }).start();
     }
 
@@ -138,13 +143,13 @@ private void tick() {
 
         // If we are in spigot, using floodgate authentication and have the config option enabled
         // get the users friends and whitelist them
-        if (this.geyserApi().defaultRemoteServer().authType() == AuthType.HYBRID
-            && GeyserImpl.getInstance().getPlatformType() == PlatformType.SPIGOT
+        if (this.geyserApi().defaultRemoteServer().authType() == AuthType.FLOODGATE
+            && GeyserImpl.getInstance().getPlatformType() == PlatformType.SPIGOT // TODO Find API equivalent
             && config.whitelistFriends) {
             try {
-                for (String xuid : sessionManager.getXboxFriends()) {
-                    if (WhitelistUtils.addPlayer(Utils.getJavaUuid(xuid), "unknown")) {
-                        logger.info("Added xbox friend " + xuid + " to whitelist");
+                for (FollowerResponse.Person person : sessionManager.getXboxFriends()) {
+                    if (WhitelistUtils.addPlayer(Utils.getJavaUuid(person.xuid), "unknown")) {
+                        logger.info("Added xbox friend " + person.displayName + " to whitelist");
                     }
                 }
             } catch (XboxFriendsException e) {

bootstrap/geyser/src/main/resources/extension.yml

@@ -1,5 +1,6 @@
+id: mcxboxbroadcast
 name: MCXboxBroadcast
 version: 1.0
 main: com.rtm516.mcxboxbroadcast.bootstrap.geyser.MCXboxBroadcastExtension
-api: "2.0.2"
+api: "1.0.1"
 authors: [ "rtm516" ]

bootstrap/pom.xml

@@ -9,7 +9,7 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>boostrap-parent</artifactId>
+    <artifactId>bootstrap-parent</artifactId>
     <packaging>pom</packaging>
 
     <properties>
@@ -38,6 +38,14 @@
                 <enabled>true</enabled>
             </snapshots>
         </repository>
+        <repository>
+            <id>sonatype-oss-snapshots1</id>
+            <url>https://s01.oss.sonatype.org/content/repositories/snapshots/</url>
+        </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
     </repositories>
 
     <dependencies>
@@ -50,7 +58,7 @@
     </dependencies>
 
     <modules>
-<!--        <module>geyser</module>-->
+        <module>geyser</module>
         <module>standalone</module>
     </modules>
 </project>

bootstrap/standalone/pom.xml

@@ -3,13 +3,13 @@
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
-        <artifactId>boostrap-parent</artifactId>
+        <artifactId>bootstrap-parent</artifactId>
         <groupId>com.rtm516.mcxboxbroadcast</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>boostrap-standalone</artifactId>
+    <artifactId>bootstrap-standalone</artifactId>
 
     <properties>
         <maven.compiler.source>17</maven.compiler.source>
@@ -20,20 +20,20 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.13.2</version>
+            <version>2.14.0</version>
             <scope>compile</scope>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.dataformat</groupId>
             <artifactId>jackson-dataformat-yaml</artifactId>
-            <version>2.13.2</version>
+            <version>2.14.0</version>
             <scope>compile</scope>
         </dependency>
         <!-- For pinging servers -->
         <dependency>
             <groupId>com.nukkitx.protocol</groupId>
             <artifactId>bedrock-common</artifactId>
-            <version>2.9.4</version>
+            <version>2.9.17-20230217.002312-1</version>
         </dependency>
         <dependency>
             <groupId>org.slf4j</groupId>

core/pom.xml

@@ -20,7 +20,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.13.2.1</version>
+            <version>2.14.0</version>
         </dependency>
         <dependency>
             <groupId>com.nimbusds</groupId>

core/src/main/java/com/rtm516/mcxboxbroadcast/core/RtaWebsocketClient.java

@@ -73,7 +73,7 @@ public void onMessage(String message) {
      */
     @Override
     public void onClose(int code, String reason, boolean remote) {
-    logger.debug("Websocket disconnected: " + reason + " (" + code + ")");
+        logger.debug("Websocket disconnected: " + reason + " (" + code + ")");
     }
 
     /**