[WIP] Feature/expanse 2

schema/components/player.schema

@@ -1,6 +1,7 @@
 package minecraft.player;
 
 import "improbable/vector3.schema";
+import "components/general.schema";
 
 // Reserves 1450-1499
 
@@ -20,12 +21,17 @@ component MapRepresentation {
   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 {

workers/java/worker/src/main/java/com/hrznstudio/spatial/client/vanillawrappers/SpatialNetworkManager.java

@@ -1,11 +1,18 @@
 package com.hrznstudio.spatial.client.vanillawrappers;
 
+import com.hrznstudio.spatial.SpatialMod;
 import com.hrznstudio.spatial.client.HorizonClientWorker;
+import com.hrznstudio.spatial.util.ConnectionManager;
+import improbable.collections.Option;
 import io.netty.channel.ChannelHandlerContext;
 import io.netty.channel.embedded.EmbeddedChannel;
 import io.netty.util.concurrent.Future;
 import io.netty.util.concurrent.GenericFutureListener;
+import minecraft.player.Hand;
+import minecraft.player.PlayerInput;
 import net.minecraft.network.*;
+import net.minecraft.network.play.client.CPacketPlayerTryUseItem;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.text.ITextComponent;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -54,7 +61,13 @@ public void setNetHandler(INetHandler handler) {
 
     @Override
     public void sendPacket(Packet<?> packetIn) {
-        logger.info(() -> "SpatialNetworkManager#sendPacket not implemented (received " + packetIn.getClass() + ")");
+        if (packetIn instanceof CPacketPlayerTryUseItem) {
+            Hand hand = Hand.create();
+            hand.setMain(((CPacketPlayerTryUseItem) packetIn).getHand() == EnumHand.MAIN_HAND);
+            ConnectionManager.getConnection().sendCommandRequest(PlayerInput.Commands.ITEM_RIGHTCLICK, SpatialMod.getClientWorker().getPlayerId(), hand, Option.empty());
+        } else {
+            logger.info(() -> "SpatialNetworkManager#sendPacket not implemented for received packet (" + packetIn.getClass() + ")");
+        }
     }
 
     @Override

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

@@ -10,9 +10,11 @@
 import improbable.worker.EntityId;
 import minecraft.entity.Motion;
 import minecraft.entity.WorldEntity;
+import minecraft.general.Void;
 import minecraft.player.PlayerConnection;
 import minecraft.player.PlayerInput;
 import net.minecraft.init.Bootstrap;
+import net.minecraft.util.EnumHand;
 
 import java.util.HashMap;
 import java.util.HashSet;
@@ -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());
+            getConnection().sendCommandResponse(PlayerInput.Commands.ITEM_RIGHTCLICK, argument.requestId, Void.create());
+        });
+
         getDispatcher().onComponentUpdate(PlayerInput.COMPONENT, argument -> {
             if (getDispatcher().getAuthority(Position.COMPONENT, argument.entityId) != Authority.NOT_AUTHORITATIVE) {
                 Vector3f pos = argument.update.getMovePosition().orElse(null);
@@ -78,7 +85,7 @@ protected void onConnected() {
         });
 
         service.scheduleAtFixedRate(() -> {
-            if(!playerTimeout.isEmpty()) {
+            if (!playerTimeout.isEmpty()) {
                 new HashSet<>(playerTimeout.keySet()).forEach(id -> {
                     int i = playerTimeout.get(id);
                     if (i == 0) {