[WIP] Feature/expanse 2

default_launch.json

@@ -20,6 +20,15 @@
         "options": {
           "manual_worker_connection_only": true
         }
+      },
+      {
+        "layer": "entity_worker",
+        "hex_grid": {
+          "num_workers": 1
+        },
+        "options": {
+          "manual_worker_connection_only": true
+        }
       }
     ]
   },
@@ -47,6 +56,14 @@
           "all": {}
         }
       ]
+    },
+    {
+      "worker_type": "EntityWorker",
+      "permissions": [
+        {
+          "all": {}
+        }
+      ]
     }
   ]
 }

schema/components/bootstrap.schema

@@ -0,0 +1,18 @@
+package minecraft.boostrap;
+
+import "components/player.schema";
+
+// Reserves 1400-1449
+
+type Message {
+  string message = 1;
+}
+
+/**
+ * A single chunk holds 16x16x16 states.
+ */
+component Bootstrap {
+  id = 1400;
+  map<string, minecraft.player.GameProfile> online_players = 1;
+  command Message on_chat(Message);
+}

schema/components/entity.schema

@@ -1,5 +1,6 @@
 package minecraft.entity;
 import "improbable/standard_library.schema";
+import "improbable/vector3.schema";
 
 // Reserves 1000-1099
 
@@ -28,18 +29,11 @@ component Rotation {
 
 component Motion {
   id = 1005;
-  improbable.Coordinates coords = 1;
+  improbable.Vector3f motion = 1;
 }
 
-type GameProfile {
-  string uuid = 1;
-}
-
-component Player {
-  id = 1006;
-  GameProfile profile = 1;
-  bool sneaking = 2;
-  bool sprinting = 3;
+component WorldEntity {
+  id= 1010;
 }
 
 component ChatAbility {

schema/components/player.schema

@@ -0,0 +1,36 @@
+package minecraft.player;
+
+import "improbable/vector3.schema";
+
+// Reserves 1450-1499
+
+type GameProfile {
+  string uuid = 1;
+  string name = 2;
+}
+
+component PlayerInfo {
+  id = 1450;
+  GameProfile profile = 1;
+}
+
+component MapRepresentation {
+  id = 1453;
+  uint32 colour = 1;
+  string icon = 2;
+}
+
+component PlayerInput {
+  id = 1451;
+  improbable.Vector3f move_position = 1;
+  bool sprinting = 2;
+  bool sneaking = 3;
+}
+
+type Heartbeat {
+}
+
+component PlayerConnection {
+  id = 1452;
+  event Heartbeat heartbeat;
+}

workers/java/spatialos.Bootstrapper.worker.json

@@ -0,0 +1,54 @@
+{
+  "build": {
+    "tasks_filename": "spatialos.java.build.json"
+  },
+  "bridge": {
+    "worker_attribute_set": {
+      "attributes": [
+        "bootstrap"
+      ]
+    },
+    "entity_interest": {
+      "range_entity_interest": {
+        "radius": 0
+      }
+    },
+    "streaming_query": [],
+    "component_delivery": {
+      "default": "RELIABLE_ORDERED",
+      "checkout_all_initially": true
+    }
+  },
+  "external": {
+    "default": {
+      "run_type": "EXECUTABLE_ZIP",
+      "linux": {
+        "artifact_name": "[email protected]",
+        "command": "java",
+        "arguments": [
+          "-jar",
+          "HorizonJavaWorker.jar",
+          "Bootstrapper"
+        ]
+      },
+      "windows": {
+        "artifact_name": "[email protected]",
+        "command": "java",
+        "arguments": [
+          "-jar",
+          "HorizonJavaWorker.jar",
+          "Bootstrapper"
+        ]
+      },
+      "macos": {
+        "artifact_name": "[email protected]",
+        "command": "java",
+        "arguments": [
+          "-jar",
+          "HorizonJavaWorker.jar",
+          "Bootstrapper"
+        ]
+      }
+    }
+  }
+}

workers/java/spatialos.EntityWorker.worker.json

@@ -0,0 +1,54 @@
+{
+  "build": {
+    "tasks_filename": "spatialos.java.build.json"
+  },
+  "bridge": {
+    "worker_attribute_set": {
+      "attributes": [
+        "entity_worker"
+      ]
+    },
+    "entity_interest": {
+      "range_entity_interest": {
+        "radius": 0
+      }
+    },
+    "streaming_query": [],
+    "component_delivery": {
+      "default": "RELIABLE_ORDERED",
+      "checkout_all_initially": true
+    }
+  },
+  "external": {
+    "default": {
+      "run_type": "EXECUTABLE_ZIP",
+      "linux": {
+        "artifact_name": "[email protected]",
+        "command": "java",
+        "arguments": [
+          "-jar",
+          "HorizonJavaWorker.jar",
+          "EntityWorker"
+        ]
+      },
+      "windows": {
+        "artifact_name": "[email protected]",
+        "command": "java",
+        "arguments": [
+          "-jar",
+          "HorizonJavaWorker.jar",
+          "EntityWorker"
+        ]
+      },
+      "macos": {
+        "artifact_name": "[email protected]",
+        "command": "java",
+        "arguments": [
+          "-jar",
+          "HorizonJavaWorker.jar",
+          "EntityWorker"
+        ]
+      }
+    }
+  }
+}

workers/java/spatialos.HorizonClientWorker.worker.json

@@ -4,11 +4,13 @@
   },
   "bridge": {
     "worker_attribute_set": {
-      "attributes": []
+      "attributes": [
+        "horizon_client"
+      ]
     },
     "entity_interest": {
       "range_entity_interest": {
-        "radius": 10
+        "radius": 128
       }
     },
     "streaming_query": [],

workers/java/worker/src/main/java/com/hrznstudio/spatial/SpatialLaunchWrapper.java

@@ -1,6 +1,8 @@
 package com.hrznstudio.spatial;
 
 import net.minecraft.launchwrapper.Launch;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraftforge.event.ServerChatEvent;
 import org.apache.commons.lang3.ArrayUtils;
 
 import java.io.File;

workers/java/worker/src/main/java/com/hrznstudio/spatial/SpatialMod.java

@@ -2,26 +2,30 @@
 
 import com.hrznstudio.spatial.client.GuiConnecting;
 import com.hrznstudio.spatial.client.HorizonClientWorker;
-import com.hrznstudio.spatial.util.CommonWorkerRequirements;
-import com.hrznstudio.spatial.util.EntityBuilder;
+import com.hrznstudio.spatial.util.Util;
+import com.mojang.authlib.GameProfile;
 import improbable.Coordinates;
 import improbable.Position;
-import improbable.PositionData;
 import improbable.worker.Entity;
-import minecraft.entity.*;
-import minecraft.inventory.Inventory;
-import minecraft.inventory.InventoryData;
+import minecraft.entity.PlayerInfo;
+import minecraft.entity.PlayerInfoData;
+import minecraft.entity.Rotation;
+import minecraft.entity.RotationData;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityOtherPlayerMP;
 import net.minecraft.client.gui.GuiMainMenu;
+import net.minecraft.client.multiplayer.WorldClient;
+import net.minecraft.entity.EntityTracker;
 import net.minecraftforge.client.event.GuiScreenEvent;
+import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 
-import java.util.Collections;
+import java.util.ArrayList;
 import java.util.UUID;
 
-@Mod(modid = "spatial", name = "Spatial", version = "0.0.1")
+@Mod(modid = "expanse", name = "Expanse", version = "0.0.1")
 @Mod.EventBusSubscriber
 public class SpatialMod {
 
@@ -44,44 +48,4 @@ public static void actionEvent(GuiScreenEvent.ActionPerformedEvent.Pre event) {
     @Mod.EventHandler
     public void serverStarting(FMLServerStartingEvent event) {
     }
-
-    public static Entity createPlayerEntity() {
-        EntityBuilder builder = new EntityBuilder("Player");
-        builder.addComponent(
-                Position.COMPONENT,
-                new PositionData(new Coordinates(0, 0, 0)),
-                CommonWorkerRequirements.getEntityWorkers()
-        );
-        builder.addComponent(
-                Player.COMPONENT,
-                new PlayerData(new GameProfile(UUID.randomUUID().toString()), false, false),
-                CommonWorkerRequirements.getEntityWorkers()
-        );
-        builder.addComponent(
-                Health.COMPONENT,
-                new HealthData(20, 20),
-                CommonWorkerRequirements.getEntityWorkers()
-        );
-        builder.addComponent(
-                Food.COMPONENT,
-                new FoodData(20, 20),
-                CommonWorkerRequirements.getEntityWorkers()
-        );
-        builder.addComponent(
-                Experience.COMPONENT,
-                new ExperienceData(0),
-                CommonWorkerRequirements.getEntityWorkers()
-        );
-        builder.addComponent(
-                Inventory.COMPONENT,
-                new InventoryData(Collections.emptyMap()),
-                CommonWorkerRequirements.getEntityWorkers()
-        );
-        builder.addComponent(
-                Flammable.COMPONENT,
-                new FlammableData(false),
-                CommonWorkerRequirements.getEntityWorkers()
-        );
-        return builder.build();
-    }
 }

workers/java/worker/src/main/java/com/hrznstudio/spatial/WorkerManager.java

@@ -1,12 +1,12 @@
 package com.hrznstudio.spatial;
 
+import com.hrznstudio.spatial.worker.WorkerService;
 import org.apache.commons.lang3.ArrayUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import picocli.CommandLine;
 
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.ServiceLoader;
 @CommandLine.Command(name = "worker", sortOptions = false,
@@ -39,7 +39,7 @@ public static void main(String... args) {
         } else
             logger.warn("Running the WorkerManager directly is not recommended. Please use SpatialLaunchWrapper instead.");
         ServiceLoader<WorkerService> workerService = ServiceLoader.load(WorkerService.class);
-        workerService.forEach(service -> workerMap.put(service.getWorkerID(), service));
+        workerService.forEach(service -> workerMap.put(service.getWorkerType(), service));
 
         CommandLine.run(new WorkerManager(), System.out, args);
     }

workers/java/worker/src/main/java/com/hrznstudio/spatial/api/IDispatcherLoop.java

@@ -0,0 +1,5 @@
+package com.hrznstudio.spatial.api;
+
+public interface IDispatcherLoop {
+    void onLoop();
+}

workers/java/worker/src/main/java/com/hrznstudio/spatial/api/ISpatialEntity.java

@@ -0,0 +1,8 @@
+package com.hrznstudio.spatial.api;
+
+import improbable.worker.EntityId;
+
+public interface ISpatialEntity {
+    EntityId getSpatialId();
+    void setSpatialId(EntityId id);
+}

workers/java/worker/src/main/java/com/hrznstudio/spatial/api/ISpatialWorld.java

@@ -0,0 +1,10 @@
+package com.hrznstudio.spatial.api;
+
+import improbable.worker.EntityId;
+import net.minecraft.entity.Entity;
+
+public interface ISpatialWorld {
+    Entity getEntityById(EntityId id);
+    void addSpatial(Entity entity);
+    void removeSpatial(Entity entity);
+}