From 63c9fe0c0a46a184bb04b1484a9a2fb11e45bb6e Mon Sep 17 00:00:00 2001 From: Vanessa Dannenberg Date: Wed, 30 Jun 2021 06:07:13 -0400 Subject: [PATCH] fix missing input slot on electric alloy furnaces --- .../dreambuilder_extras/customize-dreambuilder-game.sh | 10 +++++++++- mods/technic/machines/register/machine_base.lua | 6 ++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/mods/dreambuilder_extras/customize-dreambuilder-game.sh b/mods/dreambuilder_extras/customize-dreambuilder-game.sh index 97a75a52..63686d83 100755 --- a/mods/dreambuilder_extras/customize-dreambuilder-game.sh +++ b/mods/dreambuilder_extras/customize-dreambuilder-game.sh @@ -335,6 +335,14 @@ sed -i "/formspec = formspec/ { a \\\t\tdreambuilder_theme.make_inv_img_grid_v1(1, 2.95, 2, 1, false).. }" $workdir"/mods/technic/machines/register/machine_base.lua" +# this bit makes electric alloy furnaces look right +sed -i "/if data\.upgrade then/ { + i \\\tif data.typename == \"alloy\" then + i \\\t\tformspec = formspec .. dreambuilder_theme.single_slot_v1(2, 0.95, false) + i \\\tend +}" $workdir"/mods/technic/machines/register/machine_base.lua" + + sed -i "/size\[8,9;\]/ { a \\\t\t$LISTCOLORS_HIDE_SLOTS a \\\t\tdreambuilder_theme.make_inv_img_grid_v1(0, 4.97, 8, 1, true).. @@ -342,7 +350,7 @@ sed -i "/size\[8,9;\]/ { a \\\t\tdreambuilder_theme.single_slot_v1(3, 0.95, false).. }" $workdir"/mods/technic/machines/register/generator.lua" -# this alloy furnace change will match in two places, on purpose. +# this coal alloy furnace change will match in two places, on purpose. sed -i "/size\[8,9\]/ { a \\\t\t$LISTCOLORS_HIDE_SLOTS a \\\t\tdreambuilder_theme.make_inv_img_grid_v1(2, 0.95, 2, 1, false).. diff --git a/mods/technic/machines/register/machine_base.lua b/mods/technic/machines/register/machine_base.lua index 00c6230c..aaf26942 100644 --- a/mods/technic/machines/register/machine_base.lua +++ b/mods/technic/machines/register/machine_base.lua @@ -64,6 +64,9 @@ function technic.register_base_machine(data) "listring[current_player;main]".. "listring[current_name;src]".. "listring[current_player;main]" + if data.typename == "alloy" then + formspec = formspec .. dreambuilder_theme.single_slot_v1(2, 0.95, false) + end if data.upgrade then formspec = formspec.. dreambuilder_theme.make_inv_img_grid_v1(1, 2.95, 2, 1, false).. @@ -101,6 +104,9 @@ function technic.register_base_machine(data) end local EU_upgrade, tube_upgrade = 0, 0 + if data.typename == "alloy" then + formspec = formspec .. dreambuilder_theme.single_slot_v1(2, 0.95, false) + end if data.upgrade then EU_upgrade, tube_upgrade = technic.handle_machine_upgrades(meta) end