Check solution based on recipe[solution].output

zachpmanson · Feb 22, 2024 · 997a5a7 · 997a5a7
1 parent dc94d84
commit 997a5a7
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/components/CraftingTable.component.tsx b/src/components/CraftingTable.component.tsx
@@ -22,6 +22,7 @@ export default function CraftingTable({
     colorTables,
     setColorTables,
     setGameState,
+    recipes,
     options: { highContrast },
   } = useGlobal();
 
@@ -111,7 +112,11 @@ export default function CraftingTable({
   };
 
   const processGuess = () => {
-    if (currentRecipe?.replace("minecraft:", "") === solution) {
+    console.log("processGuess", currentRecipe, solution);
+    if (
+      currentRecipe?.replace("minecraft:", "") ===
+      recipes[solution].output.replace("minecraft:", "")
+    ) {
       setColorTable([
         [2, 2, 2],
         [2, 2, 2],

diff --git a/src/components/Popup.component.tsx b/src/components/Popup.component.tsx
@@ -20,6 +20,8 @@ export default function Popup({
     craftingTables,
     colorTables,
     userId,
+    recipes,
+    items,
     options: { highContrast },
     resetGame,
   } = useGlobal();
@@ -65,9 +67,7 @@ export default function Popup({
   };
 
   // get name of solution item for label
-  const { items } = useGlobal();
-  const solutionName =
-    "minecraft:" + solution ? items["minecraft:" + solution]?.name : undefined;
+  const solutionName = items[recipes[solution].output].name;
 
   return (
     <>
@@ -98,7 +98,7 @@ export default function Popup({
               >
                 <Dialog.Panel className="w-full max-w-sm transform overflow-hidden rounded-2xl inv-background text-left align-middle shadow-xl transition-all">
                   <div className="flex flex-col items-center gap-2">
-                    <Slot item={`minecraft:${solution}`} clickable={false} />
+                    <Slot item={recipes[solution].output} clickable={false} />
                     <Dialog.Description className="text-med font-medium leading-6 text-gray-900">
                       {`Solution: ` + solutionName}
                     </Dialog.Description>