From 5bb91be6795918673c5d2752aa4b1ddd08dc364e Mon Sep 17 00:00:00 2001
From: Integer Limit <103940576+IntegerLimit@users.noreply.github.com>
Date: Mon, 9 Dec 2024 21:42:47 +1100
Subject: [PATCH] Update Labs to 0.11.2 + Use New GrS API (#1144)

[SKIP]
---
 manifest.json                                 |  2 +-
 .../Main/General/Misc/handFraming.groovy      | 38 +++++--------------
 2 files changed, 10 insertions(+), 30 deletions(-)

diff --git a/manifest.json b/manifest.json
index a7cf058..dba5f14 100644
--- a/manifest.json
+++ b/manifest.json
@@ -725,7 +725,7 @@
     },
     {
       "projectID": 932060,
-      "fileID": 5976554,
+      "fileID": 5976827,
       "required": true
     },
     {
diff --git a/overrides/groovy/postInit/Post-Initial/Main/General/Misc/handFraming.groovy b/overrides/groovy/postInit/Post-Initial/Main/General/Misc/handFraming.groovy
index 62ee103..4553eb3 100644
--- a/overrides/groovy/postInit/Post-Initial/Main/General/Misc/handFraming.groovy
+++ b/overrides/groovy/postInit/Post-Initial/Main/General/Misc/handFraming.groovy
@@ -4,7 +4,6 @@ import com.nomiceu.nomilabs.groovy.ShapedDummyRecipe
 import com.nomiceu.nomilabs.util.ItemMeta
 import net.minecraft.item.ItemStack
 
-import static com.nomiceu.nomilabs.groovy.GroovyHelpers.JEIHelpers.addRecipeOutputTooltip
 import static com.nomiceu.nomilabs.groovy.GroovyHelpers.TranslationHelpers.translatable
 
 // Hand Framing Tool
@@ -35,47 +34,28 @@ items.add(tool)
 for (ItemStack stack : items) {
 	for (boolean trim : [true, false]) {
 		for (boolean front : [true, false]) {
-			def recipeName = getRecipeName(stack, trim, front)
 			def recipeStack = addNBT(stack, trim, front)
 
 			crafting.shapedBuilder()
-				.name(recipeName)
 				.output(recipeStack)
-				.matrix(
-					'ST ',
-					'FI ',
-					'   ')
+				.matrix('ST ', 'FI ', '   ')
 				.key('S', item("xtones:zane"))
 				.key('T', trim ? item("extendedcrafting:storage", 4) : IIngredient.EMPTY)
 				.key('F', front ? item("xtones:zane", 15) : IIngredient.EMPTY)
 				.key('I', stack)
 				.recipeClassFunction((output, width, height, ingredients) -> new ShapedDummyRecipe(output, ingredients, width, height, false))
-				.register()
-
-			addRecipeOutputTooltip(recipeStack, resource(recipeName),
-				ItemMeta.compare(tool, recipeStack) ?
-					translatable("nomiceu.tooltip.labs.hand_framing.tool") :
-					translatable("nomiceu.tooltip.labs.hand_framing.drawer"),
-				translatable("nomiceu.tooltip.labs.hand_framing.top_left"),
-				translatable("nomiceu.tooltip.labs.hand_framing.top_right"),
-				translatable("nomiceu.tooltip.labs.hand_framing.bottom_left"))
+				.setOutputTooltip(
+					ItemMeta.compare(tool, recipeStack) ?
+						translatable("nomiceu.tooltip.labs.hand_framing.tool") :
+						translatable("nomiceu.tooltip.labs.hand_framing.drawer"),
+					translatable("nomiceu.tooltip.labs.hand_framing.top_left"),
+					translatable("nomiceu.tooltip.labs.hand_framing.top_right"),
+					translatable("nomiceu.tooltip.labs.hand_framing.bottom_left")
+				).register()
 		}
 	}
 }
 
-static String getRecipeName(ItemStack stack, boolean trim, boolean front) {
-	String baseName = "nomiceu:hand_framing_"
-
-	def rl = stack.getItem().getRegistryName()
-	if (rl != null)
-		baseName = baseName + rl.getNamespace() + "_" + rl.getPath()
-
-	baseName = baseName + "." + stack.getMetadata() + "_side"
-	if (trim) baseName = baseName + "_trim"
-	if (front) baseName = baseName + "_front"
-	return baseName
-}
-
 static ItemStack addNBT(ItemStack stack, boolean trim, boolean front) {
 	def sideStack = item("xtones:zane")
 	def trimStack = trim ? item("extendedcrafting:storage", 4) : ItemStack.EMPTY