- Remove transferred entities #3

- Static server Initialization #15

Author: Manwe03

src/main/java/com/manwe/dsl/arbiter/ConnectionInfo.java

@@ -14,4 +14,31 @@ public static ConnectionInfo read(JsonObject entry){
         int id = entry.get("id").getAsInt();
         return new ConnectionInfo(ip,port,id);
     }
+
+    public static ConnectionInfo read(String entry){
+        int lastColon = entry.lastIndexOf(':');
+        int secondColon = entry.lastIndexOf(':', lastColon - 1);
+
+        if (secondColon < 0 || lastColon < 0) throw new IllegalArgumentException("Missing fields in " + entry);
+
+        String host = entry.substring(0, secondColon);
+        String portStr = entry.substring(secondColon + 1, lastColon);
+        String idStr   = entry.substring(lastColon + 1);
+
+        if (host.startsWith("[") && host.endsWith("]"))
+            host = host.substring(1, host.length() - 1);
+
+        int port;
+        int id;
+        try {
+            port = Integer.parseInt(portStr);
+            id   = Integer.parseInt(idStr);
+        } catch (NumberFormatException e) {
+            throw new IllegalArgumentException("None numeric values " + entry);
+        }
+        if (port < 0 || port > 65_535)
+            throw new IllegalArgumentException("Port out of range (0-65535): " + port);
+
+        return new ConnectionInfo(host, port, id);
+    }
 }

src/main/java/com/manwe/dsl/config/DSLServerConfigs.java

@@ -1,9 +1,13 @@
 package com.manwe.dsl.config;
 
+import com.manwe.dsl.DistributedServerLevels;
+import com.manwe.dsl.arbiter.ConnectionInfo;
 import net.neoforged.neoforge.common.ModConfigSpec;
 
 import java.net.InetAddress;
+import java.net.UnknownHostException;
 import java.util.List;
+import java.util.Objects;
 
 public class DSLServerConfigs {
 
@@ -17,7 +21,8 @@ public class DSLServerConfigs {
     public static final ModConfigSpec.ConfigValue<Integer> WORKER_SIZE;
 
     public static final ModConfigSpec.ConfigValue<Boolean> USE_ARBITER;
-    //public static final ModConfigSpec.ConfigValue<List<InetAddress>> CONNECTIONS;
+    public static final ModConfigSpec.ConfigValue<List<? extends String>> CONNECTIONS;
+    public static final ModConfigSpec.ConfigValue<Integer> PORT;
 
     static {
         BUILDER.push("Server");
@@ -32,62 +37,22 @@ public class DSLServerConfigs {
 
         BUILDER.push("Auto start").comment("Address assignment for workers");
         USE_ARBITER = BUILDER.comment("Use the arbiter").define("use_arbiter",true);
+        BUILDER.comment("use_arbiter = TRUE ->");
         ARBITER_ADDR = BUILDER.comment("Complete address of the arbiter, This is ignored if use_arbiter = false").define("arbiter_addr","http://localhost:8080");
-            //BUILDER.push("If proxy").comment("Connections to the workers");
-            //CONNECTIONS = BUILDER.comment("").define("arbiter_addr","http://localhost:8080");
-            //BUILDER.pop();
-        BUILDER.pop();
+        BUILDER.comment("use_arbiter = FALSE ->");
+        PORT = BUILDER.define("this_port",25565);
+        CONNECTIONS = BUILDER.comment("If this is proxy and not using arbiter. Define worker address. ip:port:worker_id").defineListAllowEmpty("connections",List.of("127.0.0.1:25565:1","127.0.0.1:25566:2"),object -> {
+            if (object instanceof String s) return true;
+            return false;
+        });
 
-        /*
-        BUILDER.push("Into Pattern").comment(
-                """
-                This is the ID pattern, form center to edge clockwise
-                +-----------------------------------+
-                |                 |                 |
-                |      8          |         2       |
-                |        +--------+--------+        |
-                |        |        |        |        |
-                |        |      7 | 1      |        |
-                |--------+--------+--------+--------|
-                |        |      5 | 3      |        |
-                |        |        |        |        |
-                |        +--------+--------+        |
-                |      6          |          4      |
-                |                 |                 |
-                +-----------------------------------+
-                
-                +-----------------------------------+
-                |                 |                 |
-                |                 |                 |
-                |     (-x+z)      |      (+x+z)     |
-                |                 |                 |
-                |               4 | 1               |
-                |-----------------+-----------------|
-                |               3 | 2               |
-                |                 |                 |
-                |     (-x-z)      |      (+x-z)     |
-                |                 |                 |
-                |                 |                 |
-                +-----------------------------------+
-                
-                +-----------------------------------+
-                |                 |                 |
-                |                 |                 |
-                |                 |                 |
-                |                 |                 |
-                |                 |                 |
-                |               2 | 1               |
-                |                 |                 |
-                |                 |                 |
-                |                 |                 |
-                |                 |                 |
-                |                 |                 |
-                +-----------------------------------+
-                """
-        );
         BUILDER.pop();
-        */
+
     }
 
     public static final ModConfigSpec SPEC = BUILDER.build();
+
+    public static List<ConnectionInfo> getConnectionAddresses() {
+        return CONNECTIONS.get().stream().map(ConnectionInfo::read).toList();
+    }
 }

src/main/java/com/manwe/dsl/dedicatedServer/proxy/ProxyDedicatedServer.java

@@ -56,14 +56,19 @@ public ProxyDedicatedServer(Thread pServerThread, LevelStorageSource.LevelStorag
 
     @Override
     public boolean initServer() throws IOException {
-        try {
-            topology = arbiterClient.fetch();
-            System.out.println("Port from Arbiter: "+topology.port);
-        } catch (Exception ex) {
-            DistributedServerLevels.LOGGER.error("Unexpected Error",ex);
-            throw new RuntimeException("Arbiter unavailable cannot fetch port and role");
+        if(DSLServerConfigs.USE_ARBITER.get()){
+            try {
+                topology = arbiterClient.fetch();
+                System.out.println("Port from Arbiter: "+topology.port);
+            } catch (Exception ex) {
+                DistributedServerLevels.LOGGER.error("Unexpected Error",ex);
+                throw new RuntimeException("Arbiter unavailable cannot fetch port and role");
+            }
+        }else {
+            topology = new ArbiterClient.ArbiterRes(DSLServerConfigs.PORT.get(),DSLServerConfigs.getConnectionAddresses());
         }
 
+
         if(!isProxy){
             EntityAccessor.getEntityCounter().set((workerId - 1) * SHARD_MAX_ENTITIES); //Set exclusive entity ids for each worker
         }

src/main/java/com/manwe/dsl/dedicatedServer/worker/packets/transfer/WorkerBoundPlayerTransferPacket.java

@@ -90,9 +90,9 @@ public DisconnectionDetails getDefaultDisconnectionDetails(){
 
     public ServerPlayer rebuildServerPlayer(MinecraftServer server) {
         ServerPlayer clone = new ServerPlayer(server, server.overworld(), this.gameProfile, this.clientInformation);
-        clone.setId(this.entityId); //Clone the id assigned by its source worker, entity id do not collide between workers each worker has its own id range
-        clone.setChunkTrackingView(new ChunkTrackingView.Positioned(clone.chunkPosition(),viewDistance)); //Set this view distance to avoid chunk resends
         clone.load(this.playerNbt);
+        clone.setChunkTrackingView(new ChunkTrackingView.Positioned(clone.chunkPosition(),viewDistance)); //Set this view distance to avoid chunk resends
+        clone.setId(this.entityId); //Clone the id assigned by its source worker, entity id do not collide between workers each worker has its own id range
         return clone;
     }
 

src/main/java/com/manwe/dsl/dedicatedServer/worker/packets/transfer/WorkerBoundaryListener.java

@@ -46,6 +46,7 @@ public void onEnteringSection(EntityEvent.EnteringSection event){
                 }else {
                     System.out.println("Transfer Entity NeoForge");
                     workerListener.send(new ProxyBoundEntityTransferPacket(entity,id));
+                    entity.remove(Entity.RemovalReason.DISCARDED); //DELETE
                 }
             }
         } catch (NoSuchElementException exception){

src/main/java/com/manwe/dsl/mixinExtension/ServerLevelExtension.java

@@ -5,4 +5,5 @@
 public interface ServerLevelExtension {
 
     void distributedServerLevels$addEntityWithoutEvent(Entity entity);
+
 }