hrznstudio · Bluexin · Jan 24, 2019 · Jan 24, 2019 · Jan 24, 2019 · Jan 24, 2019
diff --git a/default_launch.json b/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": {}
+        }
+      ]
     }
   ]
 }
diff --git a/schema/components/bootstrap.schema b/schema/components/bootstrap.schema
@@ -0,0 +1,22 @@
+package minecraft.boostrap;
+
+import "components/player.schema";
+import "components/general.schema";
+import "components/world.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;
+  map<uint32, minecraft.world.State> state_registry = 2;
+  command minecraft.general.Void on_chat(Message);
+  event Message on_message;
+}
diff --git a/schema/components/entity.schema b/schema/components/entity.schema
@@ -1,5 +1,7 @@
 package minecraft.entity;
 import "improbable/standard_library.schema";
+import "improbable/vector3.schema";
+import "components/general.schema";
 
 // Reserves 1000-1099
 
@@ -28,18 +30,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 {
@@ -50,10 +45,8 @@ type IgnitionRequest {
   int32 time = 1;
 }
 
-type Void {}
-
 component Flammable {
   id = 1008;
   bool is_on_fire = 1;
-  command Void ignite(IgnitionRequest);
+  command minecraft.general.Void ignite(IgnitionRequest);
 }
diff --git a/schema/components/general.schema b/schema/components/general.schema
@@ -0,0 +1,3 @@
+package minecraft.general;
+
+type Void {}
diff --git a/schema/components/player.schema b/schema/components/player.schema
@@ -0,0 +1,43 @@
+package minecraft.player;
+
+import "improbable/vector3.schema";
+import "components/general.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;
+}
+
+type Hand {
+  bool main = 1;
+}
+
+component PlayerInput {
+  id = 1451;
+  improbable.Vector3f move_position = 1;
+  improbable.Vector3f desired_motion = 2;
+  bool sprinting = 3;
+  bool sneaking = 4;
+  command minecraft.general.Void item_rightclick(Hand);
+}
+
+type Heartbeat {
+}
+
+component PlayerConnection {
+  id = 1452;
+  event Heartbeat heartbeat;
+}
diff --git a/spatialos.json b/spatialos.json
@@ -1,8 +1,8 @@
 {
     "name": "spatial",
     "project_version": "0.0.1",
-    "sdk_version": "13.5.0",
+    "sdk_version": "13.6.1",
     "dependencies": [
-        {"name": "standard_library", "version": "13.5.0"}
+        {"name": "standard_library", "version": "13.6.1"}
     ]
 }
diff --git a/workers/java/settings.gradle b/workers/java/settings.gradle
@@ -3,4 +3,4 @@ include 'worker-sdk'
 include 'worker:patcherdummy'
 
 rootProject.name = "HorizonJavaWorker"
-gradle.ext.mainClass = 'com.hrznstudio.spatial.SpatialLaunchWrapper'
+gradle.ext.mainClass = 'com.hrznstudio.spatial.launch.SpatialLaunchWrapper'
diff --git a/workers/java/spatialos.Bootstrapper.worker.json b/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"
+        ]
+      }
+    }
+  }
+}
diff --git a/workers/java/spatialos.EntityWorker.worker.json b/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"
+        ]
+      }
+    }
+  }
+}
diff --git a/workers/java/spatialos.HorizonClientWorker.worker.json b/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": [],

diff --git a/workers/java/worker/src/main/java/com/hrznstudio/spatial/SpatialLaunchWrapper.java b/workers/java/worker/src/main/java/com/hrznstudio/spatial/SpatialLaunchWrapper.java