From 489618a28a2f5a405a6523638b5eb55a28e8a7d2 Mon Sep 17 00:00:00 2001
From: Dhvani Patel <dhvani.patel@uwaterloo.ca>
Date: Fri, 16 May 2025 14:13:10 -0600
Subject: [PATCH] remove workbench for crafting powerstone

---
 packages/world/script/initRecipes.sol | 4 ++--
 packages/world/test/Craft.t.sol       | 7 ++-----
 packages/world/ts/recipes.ts          | 1 -
 packages/world/worlds.json            | 2 +-
 4 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/packages/world/script/initRecipes.sol b/packages/world/script/initRecipes.sol
index ec0c913c..31d7c862 100644
--- a/packages/world/script/initRecipes.sol
+++ b/packages/world/script/initRecipes.sol
@@ -400,8 +400,8 @@ function initRecipes() {
     (outputTypes[0], outputAmounts[0]) = (ObjectTypes.Powerstone.unwrap(), 1);
 
     Recipes.set(
-      keccak256(abi.encode(ObjectTypes.Workbench, inputTypes, inputAmounts, outputTypes, outputAmounts)),
-      ObjectTypes.Workbench,
+      keccak256(abi.encode(ObjectTypes.Null, inputTypes, inputAmounts, outputTypes, outputAmounts)),
+      ObjectTypes.Null,
       0,
       inputTypes,
       inputAmounts,
diff --git a/packages/world/test/Craft.t.sol b/packages/world/test/Craft.t.sol
index a3f192c8..c09f611e 100644
--- a/packages/world/test/Craft.t.sol
+++ b/packages/world/test/Craft.t.sol
@@ -98,16 +98,13 @@ contract CraftTest is DustTest {
     outputTypes[0] = ObjectTypes.Powerstone;
     uint16[] memory outputAmounts = new uint16[](1);
     outputAmounts[0] = 1;
-    bytes32 recipeId = hashRecipe(ObjectTypes.Workbench, inputTypes, inputAmounts, outputTypes, outputAmounts);
+    bytes32 recipeId = hashRecipe(ObjectTypes.Null, inputTypes, inputAmounts, outputTypes, outputAmounts);
 
     for (uint256 i = 0; i < inputTypes.length; i++) {
       TestInventoryUtils.addObject(aliceEntityId, inputTypes[i], inputAmounts[i]);
       assertInventoryHasObject(aliceEntityId, inputTypes[i], inputAmounts[i]);
     }
 
-    Vec3 stationCoord = playerCoord + vec3(1, 0, 0);
-    EntityId stationEntityId = setObjectAtCoord(stationCoord, ObjectTypes.Workbench);
-
     EnergyDataSnapshot memory snapshot = getEnergyDataSnapshot(aliceEntityId);
 
     SlotAmount[] memory inputs = new SlotAmount[](2);
@@ -116,7 +113,7 @@ contract CraftTest is DustTest {
 
     vm.prank(alice);
     startGasReport("handcraft multiple inputs");
-    world.craftWithStation(aliceEntityId, stationEntityId, recipeId, inputs);
+    world.craft(aliceEntityId, recipeId, inputs);
     endGasReport();
 
     for (uint256 i = 0; i < inputTypes.length; i++) {
diff --git a/packages/world/ts/recipes.ts b/packages/world/ts/recipes.ts
index 466e7146..71898e76 100644
--- a/packages/world/ts/recipes.ts
+++ b/packages/world/ts/recipes.ts
@@ -112,7 +112,6 @@ export const recipes: Recipe[] = [
     outputs: [["Workbench", 1]],
   },
   {
-    station: "Workbench",
     inputs: [
       ["Stone", 6],
       ["Sand", 2],
diff --git a/packages/world/worlds.json b/packages/world/worlds.json
index a693f511..cd43e10c 100644
--- a/packages/world/worlds.json
+++ b/packages/world/worlds.json
@@ -4,7 +4,7 @@
     "blockNumber": 17624412
   },
   "31337": {
-    "address": "0x79BE91C0472c76c655e88496643001710e76c54d"
+    "address": "0x6439113f0e1f64018c3167DA2aC21e2689818086"
   },
   "695569": {
     "address": "0xaa544E5e0D1C45cC43Ac8D5512a5081aA6Ca9EFE",