Fix/game client

client/apps/landing/env.ts

@@ -18,7 +18,7 @@ const envSchema = z.object({
 
   // Version and chain info
   VITE_PUBLIC_CHAIN: z.enum(["sepolia", "mainnet", "slot", "local"]), // Add other chains as needed
-  
+
   // Ark Marketplace API
   // VITE_PUBLIC_ARK_MARKETPLACE_API: z.string().url(),
   // VITE_PUBLIC_IMAGE_CDN_URL: z.string().url(),

client/apps/landing/src/components/providers/starknet-provider.tsx

@@ -1,12 +1,10 @@
 import ControllerConnector from "@cartridge/connector/controller";
-import { ColorMode } from "@cartridge/controller";
 import { mainnet, sepolia } from "@starknet-react/chains";
 import { StarknetConfig, argent, braavos, jsonRpcProvider, useInjectedConnectors, voyager } from "@starknet-react/core";
 import React, { useCallback } from "react";
 import { constants } from "starknet";
 import { env } from "../../../env";
 import { getResourceAddresses } from "../ui/utils/addresses";
-//import { cartridgeController } from "./cartridge-controller";
 
 const resourceAddresses = await getResourceAddresses();
 
@@ -19,14 +17,14 @@ const theme: string = "eternum";
 const slot: string = env.VITE_PUBLIC_SLOT;
 const namespace: string = "eternum";
 const preset: string = "eternum";
-const colorMode: ColorMode = "dark";
 
 const cartridgeController = new ControllerConnector({
   chains: [{ rpcUrl: env.VITE_PUBLIC_NODE_URL }],
   defaultChainId: constants.StarknetChainId.SN_SEPOLIA,
   namespace,
   slot,
   preset,
+  policies: {},
   theme,
   tokens: {
     erc20: [LORDS, ...otherResources],

client/apps/landing/src/components/ui/sidebar.tsx

@@ -634,6 +634,5 @@ export {
   SidebarRail,
   SidebarSeparator,
   SidebarTrigger,
-  useSidebar
+  useSidebar,
 };
-

package.json

@@ -86,8 +86,8 @@
     "starknet": "^6.8.0",
     "viem": "^2.21.45",
     "vocs": "latest",
-    "@cartridge/connector": "^0.5.7",
-    "@cartridge/controller": "^0.5.7",
+    "@cartridge/connector": "^0.6.x",
+    "@cartridge/controller": "^0.6.x",
     "@dojoengine/create-burner": "1.0.4-alpha.3.1.0",
     "@dojoengine/react": "1.0.4-alpha.3.1.0",
     "@dojoengine/recs": "^2.0.13",

packages/core/src/utils/structure.ts

@@ -23,11 +23,11 @@ export const getStructureAtPosition = (
 };
 
 export const getStructure = (
-  entityId: ID,
+  entityId: Entity | ID,
   playerAddress: ContractAddress,
   components: ClientComponents,
 ): Structure | undefined => {
-  const structureEntity = getEntityIdFromKeys([BigInt(entityId)]);
+  const structureEntity = typeof entityId === "string" ? entityId : getEntityIdFromKeys([BigInt(entityId)]);
   return getStructureInfo(structureEntity, playerAddress, components);
 };
 

packages/react/src/hooks/helpers/use-armies.ts

@@ -13,8 +13,6 @@ export const useArmiesByStructure = ({ structureEntityId }: { structureEntityId:
   const armies = useEntityQuery([
     Has(components.Army),
     Has(components.Position),
-    NotValue(components.Health, { current: 0n }),
-    Has(components.Quantity),
     HasValue(components.EntityOwner, { entity_owner_id: structureEntityId }),
   ]);
 

packages/react/src/hooks/helpers/use-entities.ts

@@ -46,7 +46,7 @@ export const usePlayerStructures = (playerAddress?: ContractAddress) => {
 
   const playerStructures = useMemo(() => {
     return entities
-      .map((id) => getStructure(Number(id), ContractAddress(account.address), components))
+      .map((id) => getStructure(id, ContractAddress(account.address), components))
       .filter((structure): structure is Structure => structure !== undefined)
       .sort((a, b) => a.category.localeCompare(b.category));
   }, [entities]);

packages/react/src/hooks/helpers/use-players.ts

@@ -2,6 +2,7 @@ import { Player } from "@bibliothecadao/eternum";
 import { useEntityQuery } from "@dojoengine/react";
 import { getComponentValue, Has } from "@dojoengine/recs";
 import { useMemo } from "react";
+import { shortString } from "starknet";
 import { useDojo } from "../context";
 
 export const usePlayers = (): Player[] => {
@@ -16,7 +17,11 @@ export const usePlayers = (): Player[] => {
       .map((id) => {
         const addressName = getComponentValue(components.AddressName, id);
         if (!addressName) return;
-        return { entity: id, address: addressName.address, name: addressName.name.toString() };
+        return {
+          entity: id,
+          address: addressName.address,
+          name: shortString.decodeShortString(addressName.name.toString()),
+        };
       })
       .filter(Boolean) as Player[];
   }, [entities]);