✨ MinecraftClientService

src/main/java/io/graversen/minecraft/rcon/Defaults.java

@@ -3,8 +3,9 @@
 import java.time.Duration;
 
 public final class Defaults {
+    public static final Duration RCON_TIMEOUT = Duration.ofSeconds(1);
     public static final Duration CONNECTION_WATCHER_INTERVAL = Duration.ofSeconds(1);
-    public static final int DEFAULT_RCON_PORT = 25575;
+    public static final int RCON_PORT = 25575;
 
     private Defaults() {
 

src/main/java/io/graversen/minecraft/rcon/MinecraftRcon.java

@@ -8,8 +8,6 @@
 import java.util.concurrent.TimeUnit;
 
 public class MinecraftRcon implements IMinecraftRcon {
-    static final int DEFAULT_TIMEOUT = 5000;
-
     private final IMinecraftClient rconClient;
 
     public MinecraftRcon(IMinecraftClient rconClient) {
@@ -21,7 +19,7 @@ public RconResponse sendSync(ICommand command) {
         final var responseFuture = sendAsync(command);
 
         try {
-            return responseFuture.get(DEFAULT_TIMEOUT, TimeUnit.MILLISECONDS);
+            return responseFuture.get(Defaults.RCON_TIMEOUT.toMillis(), TimeUnit.MILLISECONDS);
         } catch (Exception e) {
             throw new RconCommandException(e, "Failed to receive response to command");
         }

src/main/java/io/graversen/minecraft/rcon/service/IMinecraftClientService.java → src/main/java/io/graversen/minecraft/rcon/service/IMinecraftRconService.java

@@ -1,15 +1,15 @@
 package io.graversen.minecraft.rcon.service;
 
-import io.graversen.minecraft.rcon.IMinecraftClient;
+import io.graversen.minecraft.rcon.MinecraftRcon;
 
 import java.util.Optional;
 
-public interface IMinecraftClientService {
+public interface IMinecraftRconService {
     void connect();
 
     void disconnect();
 
     boolean isConnected();
 
-    Optional<IMinecraftClient> minecraftClient();
+    Optional<MinecraftRcon> minecraftRcon();
 }

src/main/java/io/graversen/minecraft/rcon/service/MinecraftClientService.java → src/main/java/io/graversen/minecraft/rcon/service/MinecraftRconService.java

@@ -1,6 +1,7 @@
 package io.graversen.minecraft.rcon.service;
 
 import io.graversen.minecraft.rcon.IMinecraftClient;
+import io.graversen.minecraft.rcon.MinecraftRcon;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -10,20 +11,21 @@
 import java.util.concurrent.ScheduledExecutorService;
 import java.util.concurrent.TimeUnit;
 
-public class MinecraftClientService implements IMinecraftClientService {
-    private static Logger LOG = LoggerFactory.getLogger(MinecraftClientService.class);
+public class MinecraftRconService implements IMinecraftRconService {
+    private static Logger LOG = LoggerFactory.getLogger(MinecraftRconService.class);
 
     private final RconDetails rconDetails;
     private final ConnectOptions connectOptions;
     private final ScheduledExecutorService executorService;
 
-    private IMinecraftClient minecraftClient;
+    private volatile IMinecraftClient minecraftClient;
+    private volatile MinecraftRcon minecraftRcon;
 
     private volatile boolean shouldClose;
     private volatile boolean shouldConnect;
     private volatile boolean isConnected;
 
-    public MinecraftClientService(RconDetails rconDetails, ConnectOptions connectOptions) {
+    public MinecraftRconService(RconDetails rconDetails, ConnectOptions connectOptions) {
         this.rconDetails = rconDetails;
         this.connectOptions = connectOptions;
         this.executorService = Executors.newScheduledThreadPool(2);
@@ -50,8 +52,8 @@ public boolean isConnected() {
     }
 
     @Override
-    public Optional<IMinecraftClient> minecraftClient() {
-        return Optional.ofNullable(minecraftClient);
+    public Optional<MinecraftRcon> minecraftRcon() {
+        return Optional.ofNullable(minecraftRcon);
     }
 
     private void safeClose(String reason) {
@@ -85,9 +87,10 @@ public boolean onTestConnection() {
             public void onPingResult(PingResult pingResult) {
                 if (!pingResult.isSuccess() && shouldConnect) {
                     if (isConnected) {
+                        LOG.warn("Connection broken - resetting");
                         isConnected = false;
                         minecraftClient = null;
-                        LOG.warn("Connection broken - reconnecting");
+                        minecraftRcon = null;
                     }
                     doConnect();
                 }
@@ -98,6 +101,7 @@ public void onPingResult(PingResult pingResult) {
     private void doConnect() {
         try {
             minecraftClient = executorService.submit(new ConnectTask(connectOptions, rconDetails)).get();
+            minecraftRcon = new MinecraftRcon(minecraftClient);
             isConnected = true;
         } catch (Exception e) {
             safeClose(e.getMessage());