From 939a45d5e8777f97b525b40b2dce4811c519f80f Mon Sep 17 00:00:00 2001
From: BuckarooBanzay <BuckarooBanzay@users.noreply.github.com>
Date: Wed, 10 Mar 2021 08:19:02 +0100
Subject: [PATCH] some recipe preview fixes

---
 app/js/components/item-preview.js | 11 ++++++++++-
 app/js/components/recipe-info.js  | 22 ++++++++--------------
 2 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/app/js/components/item-preview.js b/app/js/components/item-preview.js
index 502b6a5..99a9c65 100644
--- a/app/js/components/item-preview.js
+++ b/app/js/components/item-preview.js
@@ -7,6 +7,9 @@ Vue.component("item-preview", {
 	},
 	computed: {
 		previewType: function(){
+			if (!this.item){
+				return "unknown";
+			}
 			if (this.item.inventory_image){
 				return "invimage";
 			}
@@ -18,12 +21,18 @@ Vue.component("item-preview", {
 				case "plantlike": return "invimage";
 				default: return "invimage";
 			}
+		},
+		isGroup: function(){
+			return this.item && /^group:/.test(this.item.name);
 		}
 	},
   template: /*html*/`
 	<router-link :to="'/items/' + item.name" :title="item.name">
+		<div v-if="isGroup || !item">
+			?
+		</div>
 		<item-preview-inventoryimage
-			v-if="previewType == 'invimage'"
+			v-else-if="previewType == 'invimage'"
 			:item="item"
 			:size="size">
 		</item-preview-inventoryimage>
diff --git a/app/js/components/recipe-info.js b/app/js/components/recipe-info.js
index eb7acd5..2f3d319 100644
--- a/app/js/components/recipe-info.js
+++ b/app/js/components/recipe-info.js
@@ -39,7 +39,7 @@ Vue.component("recipe-info-smelting", {
 	template: /*html*/`
 		<recipe-base-layout>
 			<template v-slot:header>
-				<i class="fa fa-temperature-high"></i> Smelting
+				<i class="fa fa-temperature-high"></i> Smelting/Cooking
 			</template>
 			<template v-slot:body>
 				<item-preview :item="item" size="64"/>
@@ -152,27 +152,21 @@ Vue.component("recipe-info-normal", {
 				// "shapeless" recipe
 				table[0][0] = this.recipe.items[0];
 				table[0][1] = this.recipe.items[1];
-			}
-
-			if (this.recipe.width == 1) {
-				table[0][0] = this.recipe.items[0];
-			}
-
-			if (this.recipe.width == 3){
-				let row = -1;
+			} else {
+				// shaped recipe
+				let row = 0;
 				let col = 0;
 				for (let i=0; i<this.recipe.items.length; i++){
-					if (i % 3 == 0){
+					table[row][col] = this.recipe.items[i];
+					col++;
+					if (col >= (this.recipe.width || 3)){
 						row++;
 						col = 0;
 					}
-					table[row][col] = this.recipe.items[i];
-
-					col++;
 				}
 			}
 
-			return table;
+		return table;
 		}
 	},
   template: /*html*/`