[WIP] Feature/expanse 2 #34

Bluexin · 2019-02-25T15:16:39Z

No description provided.

#14 Chunk Syncing

This means you should use SpatialLaunchWrapper instead of calling WorkerManager directly.

#14 Chunk Syncing

#15 World Loading

I still have to figure out how to get the client to receive entities (the View remains empty, and web panel shows no readable entities) #14 Chunk Syncing

(cherry picked from commit a2c1dee)

Fix a few stupid mistakes as well

I'm so sorry for anyone who reads this

…/Expanse-2

* Add external launch config for ChunkWorker #14 Chunk Syncing * Revamp chunk schema #14 Chunk Syncing * Use updated reservation api * Fix gradle fatjar and ChunkWorker executable path #14 Chunk Syncing * Abstract away the connection manager * Add worker manager * Fix mistake in worker manager * Move service definition * Run the WorkerManager trough LaunchWrapper This means you should use SpatialLaunchWrapper instead of calling WorkerManager directly. * Connect the Chunk Worker #14 Chunk Syncing * Add a connection callback to the ConnectionManager * Add support for View Mode in ConnectionManager * Update entity db * Add dummy chunk generation ability to the chunk worker * Let the client (dis)connect to/from the server #15 World Loading * Fix ConnectionManager to act as keep-alive again * Fix chunk creation after database upgrade * Let consumers give their own Dispatcher implementation * Read chunk data from client (almost) I still have to figure out how to get the client to receive entities (the View remains empty, and web panel shows no readable entities) #14 Chunk Syncing * add worker-sdk build.gradle (cherry picked from commit a2c1dee) * Package mc & forge in the workers builds * Fix manifests * Fix worker types and implement base worker + doc * Let chunk workers & clients get entities data Fix a few stupid mistakes as well * Render the world I'm so sorry for anyone who reads this * Update branding * Wah? * Disable brand mixin * Implement world converter * Update entity schema * Update chunk provider y level * Fix some issues with chunk loading * Update player id on client worker * Add default snapshot to test with * Fix chunk loading for real and update snapshot * Update spatial launch config * Update spatial launch config (fix derp) * Clean up some leftovers

Bluexin · 2019-02-25T15:18:31Z

schema/components/bootstrap.schema

+}
+
+/**
+ * A single chunk holds 16x16x16 states.


copypasta doc comment should be fixed

schema/components/bootstrap.schema

Bluexin · 2019-02-25T15:23:30Z

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

+public interface ISpatialWorld {
+    Entity getEntityById(EntityId id);
+    void addSpatial(Entity entity);
+    void removeSpatial(Entity entity);


IMO one shouldn't need documentation in code, but interfaces can use it.
It might help me understand these methods, as they're not very clear to me (spatial but then they take n.m.e.Entity ??)

Bluexin · 2019-02-25T15:25:49Z

workers/java/worker/src/main/java/com/hrznstudio/spatial/client/ClientView.java

+                        EntityOtherPlayerMP mp = new EntityOtherPlayerMP(world, profile);
+                        double d0 = pos.getX();
+                        double d1 = pos.getY();
+                        double d2 = pos.getZ();


x, y, z
However in this case why not just use pos.get[XYZ]()? I see no benefit to local vars here.

Bluexin · 2019-02-25T15:28:26Z

workers/java/worker/src/main/java/com/hrznstudio/spatial/client/ClientView.java

+                        double d1 = pos.getY();
+                        double d2 = pos.getZ();
+                        float f = (rotation.getYaw() * 360) / 256.0F;
+                        float f1 = (rotation.getPitch() * 360) / 256.0F;


yaw, pitch
They only have 1 usage (which is even several lines below), and the only benefit to not inlining them would be for clarity -- which is not increased with non clear names (on top of having the usage split so far away from the declaration).

Bluexin · 2019-02-25T15:50:55Z

workers/java/worker/src/main/java/com/hrznstudio/spatial/snapshot/WorldConverter.java

+                                int extensionID = extensionNibble == null ? 0 : extensionNibble.get(j, k, l);
+                                int blockID = extensionID << 8 | (b & 255);
+                                int meta = metaNibble.get(j, k, l);
+                                if (map.get(blockID).getId().equals("minecraft:air"))


Could be shifted one line up to avoid array lookup

Bluexin · 2019-02-25T15:58:48Z

workers/java/worker/src/main/java/com/hrznstudio/spatial/util/EntityRequirementCallback.java

+    }
+
+    @FunctionalInterface
+    public interface Callback {


Why not use stl's Consumer<EntityId> ?

workers/java/worker/src/main/java/com/hrznstudio/spatial/util/EntityRequirementCallback.java

Bluexin · 2019-02-25T16:07:00Z

workers/java/worker/src/main/java/com/hrznstudio/spatial/util/Util.java

+        return getData(entity, Metadata.COMPONENT).getEntityType();
+    }
+
+    public static boolean isWithin(double a, double b, double dist) {


This looks like something very common, which one of the innumerable mc libs already has.
Moreover, an implementation like this seems more efficient :

return Math.abs(a - b) <= dist;

workers/java/worker/src/main/java/com/hrznstudio/spatial/worker/entity/EntityWorker.java

Bluexin · 2019-03-01T08:31:32Z

workers/java/worker/src/main/java/com/hrznstudio/spatial/worker/entity/EntityWorker.java

@@ -42,6 +44,11 @@ protected void onConnected() {
            }
        });

+        getDispatcher().onCommandRequest(PlayerInput.Commands.ITEM_RIGHTCLICK, argument -> {
+            System.out.println("Received right click with hand " + (argument.request.getMain() ? EnumHand.MAIN_HAND : EnumHand.OFF_HAND).name());


Please use a logger !

its a temporary debug output

I've seen those temporary debug outputs too many times in production :/

CLAassistant · 2020-05-03T10:58:43Z

Thank you for your submission! We really appreciate it. Like many open source projects, we ask that you all sign our Contributor License Agreement before we can accept your contribution.
0 out of 2 committers have signed the CLA.

❌ Coded
❌ Bluexin

Coded seems not to be a GitHub user. You need a GitHub account to be able to sign the CLA. If you have already a GitHub account, please add the email address used for this commit to your account.
_{You have signed the CLA already but the status is still pending? Let us recheck it.}

Bluexin and others added 30 commits January 24, 2019 17:44

Add external launch config for ChunkWorker

e8f7981

#14 Chunk Syncing

Revamp chunk schema

fbe5e08

#14 Chunk Syncing

Use updated reservation api

614025d

Fix gradle fatjar and ChunkWorker executable path

dd67e1d

#14 Chunk Syncing

Abstract away the connection manager

ebcd760

Add worker manager

c97adb9

Fix mistake in worker manager

10353ea

Move service definition

b531e29

Run the WorkerManager trough LaunchWrapper

1c20f80

This means you should use SpatialLaunchWrapper instead of calling WorkerManager directly.

Connect the Chunk Worker

cf47f6f

#14 Chunk Syncing

Add a connection callback to the ConnectionManager

fcad5ca

Add support for View Mode in ConnectionManager

d450926

Update entity db

a1fb38b

Add dummy chunk generation ability to the chunk worker

0970cac

Let the client (dis)connect to/from the server

8da1413

#15 World Loading

Fix ConnectionManager to act as keep-alive again

b29b96d

Fix chunk creation after database upgrade

d13a4dd

Let consumers give their own Dispatcher implementation

5c4fde1

Read chunk data from client (almost)

68e24c0

I still have to figure out how to get the client to receive entities (the View remains empty, and web panel shows no readable entities) #14 Chunk Syncing

add worker-sdk build.gradle

3eca72c

(cherry picked from commit a2c1dee)

Package mc & forge in the workers builds

2f1445f

Fix manifests

8cb5969

Fix worker types and implement base worker + doc

5c6fd95

Let chunk workers & clients get entities data

1a0560a

Fix a few stupid mistakes as well

Render the world

f3461b9

I'm so sorry for anyone who reads this

Update branding

09cb661

Wah?

739ae33

Merge branch 'develop' into feature/Spatial-14

f375cbe

Disable brand mixin

71cb04b

Implement world converter

536f6d2

Coded and others added 18 commits February 4, 2019 16:53

Add default snapshot to test with

926bcc7

Work on entity syncing

3434ab8

Fix chunk loading for real and update snapshot

4bc47bf

Update spatial launch config

bb8606e

Merge remote-tracking branch 'origin/feature/Spatial-14' into feature…

39c4795

…/Expanse-2

Update spatial launch config (fix derp)

f6b706f

Merge remote-tracking branch 'origin/feature/Spatial-14' into feature…

0b8a57a

…/Expanse-2

Merge branch 'develop' into feature/Expanse-2

9e742f1

Fix some issue with chunks

916bd2d

Improve component requirements

adfea00

Fix world converter formatting

616c340

Fix worker service

109aef7

Add attributes to client worker

d6d4c14

Implement entity worker and client disconnection

3c78d8f

Prevent player from directly updating position

a341bf5

Player syncing

9eb5f9c

Bootstrapper

9347eb3

Bluexin marked this pull request as ready for review February 25, 2019 15:16

Bluexin assigned TheCodedOne Feb 25, 2019

Bluexin commented Feb 25, 2019

View reviewed changes

Coded and others added 6 commits February 25, 2019 17:51

Customize main menu

9eea4ab

Reduce timeout time to 5 seconds

95d40e9

Remove used entities from the requirement callback

aba5c3e

Fix *some* worker issues, update to SpatialOS 13.6.1

e701126

Do a bit more on player syncing

b2456bf

Send right click with item

b218f7e

Bluexin commented Mar 1, 2019

View reviewed changes

CLAassistant unassigned TheCodedOne May 3, 2020

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

[WIP] Feature/expanse 2 #34

[WIP] Feature/expanse 2 #34

Bluexin commented Feb 25, 2019

Bluexin Feb 25, 2019

Bluexin Feb 25, 2019

Bluexin Feb 25, 2019

Bluexin Feb 25, 2019

Bluexin Feb 25, 2019

Bluexin Feb 25, 2019

Bluexin Feb 25, 2019

Bluexin Mar 1, 2019

TheCodedOne Mar 1, 2019

Bluexin Mar 1, 2019

CLAassistant commented May 3, 2020 •

edited

Loading

[WIP] Feature/expanse 2 #34

Are you sure you want to change the base?

[WIP] Feature/expanse 2 #34

Conversation

Bluexin commented Feb 25, 2019

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

CLAassistant commented May 3, 2020 • edited Loading

CLAassistant commented May 3, 2020 •

edited

Loading