@jgengine/shell 0.2.0 → 0.3.0

package/dist/GamePlayerShell.js

@@ -2,7 +2,8 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import { Canvas, useFrame, useLoader } from "@react-three/fiber";
 import { Component, useEffect, useMemo, useRef, useState } from "react";
 import * as THREE from "three";
-import { createActionStateTracker, toActionStateBindingMap, } from "@jgengine/core/input/actionBindings";
+import { createActionStateTracker, hotbarSlotActionIndex, resolveActionCommand, toActionStateBindingMap, } from "@jgengine/core/input/actionBindings";
+import { resolveActivePrompt } from "@jgengine/core/interaction/proximityPrompt";
 import { advancePlayerMotion, createEmptyMovementKeys, createPlayerMotionState, resolveMovementIntent, } from "@jgengine/core/movement/movementModel";
 import { createGameContext } from "@jgengine/core/runtime/gameContext";
 import { useGameContext } from "@jgengine/react/provider";
@@ -25,10 +26,24 @@ function logRuntimeError(error, phase) {
     console.error(`[jgengine:${phase}] ${diagnostic.message}`, error);
     return diagnostic;
 }
+const RESERVED_INPUT_ACTIONS = new Set([
+    "moveForward",
+    "moveBack",
+    "moveLeft",
+    "moveRight",
+    "turnLeft",
+    "turnRight",
+    "sprint",
+    "jump",
+    "tabTarget",
+    "clearTarget",
+    "useAbility",
+    "interact",
+]);
 function findHotbarSlotActions(input) {
     return Object.keys(input ?? {}).flatMap((action) => {
-        const match = /^(?:hotbar)?slot(\d+)$/i.exec(action);
-        return match === null ? [] : [{ action, slot: Number(match[1]) - 1 }];
+        const slot = hotbarSlotActionIndex(action);
+        return slot === null ? [] : [{ action, slot }];
     });
 }
 function hotbarIdFor(playable) {
@@ -164,15 +179,23 @@ function FrameDriver({ ctx, playable, tracker, yawRef, primaryClickRef, onRuntim
                 else
                     ctx.scene.entity.setTarget(playerId, null);
             }
-            const uiActions = {
-                openBackpack: "ui.openBackpack",
-                openCharacter: "ui.openCharacter",
-                openAbilities: "ui.openAbilities",
-            };
-            for (const [action, command] of Object.entries(uiActions)) {
-                if (tracker.wasPressed(action) && ctx.game.commands.has(command)) {
-                    ctx.game.commands.run(command, {});
+            for (const action of Object.keys(playable.game.input ?? {})) {
+                if (!tracker.wasPressed(action))
+                    continue;
+                if (action === "interact") {
+                    const prompts = playable.prompts?.(ctx);
+                    const focus = prompts === undefined ? null : ctx.scene.entity.get(playerId);
+                    if (prompts !== undefined && focus !== null) {
+                        const active = resolveActivePrompt({ x: focus.position[0], z: focus.position[2] }, prompts);
+                        if (active !== null && active.prompt.invoke !== null) {
+                            ctx.game.commands.run(active.prompt.invoke.name, active.prompt.invoke.input);
+                        }
+                    }
+                    continue;
                 }
+                const command = resolveActionCommand(action, (name) => ctx.game.commands.has(name), RESERVED_INPUT_ACTIONS);
+                if (command !== null)
+                    ctx.game.commands.run(command, {});
             }
             if (hotbarId !== null) {
                 for (const { action, slot } of slotActions) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jgengine/shell",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Game player shell for JGengine: React Three Fiber canvas, orbit camera, input tracking, HUD mounting, GameUiPreview, and a demo game. Consumers supply a GameRegistry.",
   "license": "AGPL-3.0-only",
   "type": "module",
@@ -23,9 +23,9 @@
     "test": "bun test src"
   },
   "dependencies": {
-    "@jgengine/core": "^0.2.0",
-    "@jgengine/react": "^0.2.0",
-    "@jgengine/ws": "^0.2.0"
+    "@jgengine/core": "^0.3.0",
+    "@jgengine/react": "^0.3.0",
+    "@jgengine/ws": "^0.3.0"
   },
   "peerDependencies": {
     "@react-three/drei": "^10.0.0",