diff --git a/overrides/scripts/HandFraming.zs b/overrides/scripts/HandFraming.zs index 2b04f11..d2baa79 100644 --- a/overrides/scripts/HandFraming.zs +++ b/overrides/scripts/HandFraming.zs @@ -140,37 +140,6 @@ function getNested(inTag as IData, keys as string[], alt as IData) as IData { return isNull(tag) ? alt : tag; } -val sticksIngredient = .transformConsume(64); -val sticksRecipeFunction = function(out, ins, cinfo) { - var sticks as int = getNested(ins.hft.tag, ["sticks"], 0) as int; - for k, v in ins { - if k != "hft" { - sticks += v.amount; - } - } - return ins.hft.updateTag({ "sticks": sticks }); -} as IRecipeFunction; -val hftIngredient = .marked("hft"); - -for stickStacks in 1 .. 9 { - var ingredients = [hftIngredient] as IIngredient[]; - for i in 0 .. stickStacks { - ingredients += sticksIngredient.marked("stick" + i); - } - recipes.addShapeless( - "hand_framing_tool_sticks_" + stickStacks, - .withTag({sticks: stickStacks}), - ingredients, - sticksRecipeFunction - ); -} - -.addAdvancedTooltip( - function(stack as IItemStack) { - return "Sticks: " + (isNull(stack) ? "0" : getNested(stack.tag, ["sticks"], 0)); - } as ITooltipFunction -); - function makeTagFunc(name as string) as ITooltipFunction { val matTag = "Mat" + name[0]; return function(stack as IItemStack) as string { diff --git a/overrides/scripts/HandFramingTool.zs b/overrides/scripts/HandFramingTool.zs index 9cad95c..faf63ad 100644 --- a/overrides/scripts/HandFramingTool.zs +++ b/overrides/scripts/HandFramingTool.zs @@ -105,9 +105,6 @@ hft.onItemUse = function(player as Player, if (isNull(tag) || isNull(tag.MatS)) return ActionResult.fail(); if !isReframing(definition) { - val stickCount = orElse(tag.sticks, 0) as int; - if (stickCount < 8) return ActionResult.fail(); - tag += { "sticks": stickCount - 8 } as IData; state = makeFramedState(state); }