diff options
author | Vanessa Ezekowitz <vanessaezekowitz@gmail.com> | 2017-04-12 21:05:32 -0400 |
---|---|---|
committer | Vanessa Ezekowitz <vanessaezekowitz@gmail.com> | 2017-04-12 21:05:32 -0400 |
commit | d33a3f4f29a1c56a139e79b4e771c4221e0de954 (patch) | |
tree | f0f515ca7de904742c25c791dfb92855623895d8 /technic/machines | |
parent | 1105326dc162c7fd5079a55de32fe3c2ad19415a (diff) | |
download | dreambuilder_modpack-d33a3f4f29a1c56a139e79b4e771c4221e0de954.tar dreambuilder_modpack-d33a3f4f29a1c56a139e79b4e771c4221e0de954.tar.gz dreambuilder_modpack-d33a3f4f29a1c56a139e79b4e771c4221e0de954.tar.bz2 dreambuilder_modpack-d33a3f4f29a1c56a139e79b4e771c4221e0de954.tar.xz dreambuilder_modpack-d33a3f4f29a1c56a139e79b4e771c4221e0de954.zip |
update pipeworks and technic
Diffstat (limited to 'technic/machines')
-rw-r--r-- | technic/machines/register/battery_box.lua | 31 | ||||
-rw-r--r-- | technic/machines/register/cables.lua | 13 | ||||
-rw-r--r-- | technic/machines/register/generator.lua | 13 | ||||
-rw-r--r-- | technic/machines/register/grinder_recipes.lua | 3 |
4 files changed, 44 insertions, 16 deletions
diff --git a/technic/machines/register/battery_box.lua b/technic/machines/register/battery_box.lua index 7238d6d..5b298a7 100644 --- a/technic/machines/register/battery_box.lua +++ b/technic/machines/register/battery_box.lua @@ -3,6 +3,7 @@ local digilines_path = minetest.get_modpath("digilines") local S = technic.getter local tube_entry = "^pipeworks_tube_connection_metallic.png" +local cable_entry = "^technic_cable_connection_overlay.png" local fs_helpers = pipeworks.fs_helpers @@ -132,7 +133,14 @@ function technic.register_battery_box(data) end local run = function(pos, node) + local below = minetest.get_node({x=pos.x, y=pos.y-1, z=pos.z}) local meta = minetest.get_meta(pos) + + if below.name ~= "technic:"..ltier.."_cable" then + meta:set_string("infotext", S("%s Battery Box Has No Network"):format(tier)) + return + end + local eu_input = meta:get_int(tier.."_EU_input") local current_charge = meta:get_int("internal_EU_charge") @@ -208,20 +216,27 @@ function technic.register_battery_box(data) groups.tubedevice_receiver = 1 end - local tentry = tube_entry + local top_tex = "technic_"..ltier.."_battery_box_top.png"..tube_entry + local front_tex = "technic_"..ltier.."_battery_box_front.png^technic_power_meter"..i..".png" + local side_tex = "technic_"..ltier.."_battery_box_side.png"..tube_entry + local bottom_tex = "technic_"..ltier.."_battery_box_bottom.png"..tube_entry + if ltier == "lv" then - tentry = "" + top_tex = "technic_"..ltier.."_battery_box_top.png" + front_tex = "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png" + side_tex = "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png" + bottom_tex = "technic_"..ltier.."_battery_box_bottom.png"..cable_entry end minetest.register_node("technic:"..ltier.."_battery_box"..i, { description = S("%s Battery Box"):format(tier), tiles = { - "technic_"..ltier.."_battery_box_top.png"..tentry, - "technic_"..ltier.."_battery_box_bottom.png"..tentry, - "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png", - "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png", - "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png", - "technic_"..ltier.."_battery_box_side.png^technic_power_meter"..i..".png"}, + top_tex, + bottom_tex, + side_tex, + side_tex, + side_tex, + front_tex}, groups = groups, connect_sides = {"bottom"}, tube = data.tube and tube or nil, diff --git a/technic/machines/register/cables.lua b/technic/machines/register/cables.lua index b0e2e06..d65c399 100644 --- a/technic/machines/register/cables.lua +++ b/technic/machines/register/cables.lua @@ -182,7 +182,7 @@ function technic.register_cable(tier, size) tiles = {"technic_"..ltier.."_cable.png"}, groups = table.copy(groups), sounds = default.node_sound_wood_defaults(), - drop = "technic:"..ltier.."_cable", + drop = "technic:"..ltier.."_cable_plate_1", paramtype = "light", sunlight_propagates = true, drawtype = "nodebox", @@ -210,6 +210,10 @@ function technic.register_cable(tier, size) end end minetest.set_node(pointed_thing.above, {name = "technic:"..ltier.."_cable_plate_"..num}) + if not (creative and creative.is_enabled_for(placer)) then + itemstack:take_item() + end + return itemstack end else def.groups.not_in_creative_inventory = 1 @@ -227,6 +231,13 @@ function technic.register_cable(tier, size) {"", "", c}, } }) + + minetest.register_craft({ + output = c, + recipe = { + {"technic:"..ltier.."_cable_plate_1"}, + } + }) end diff --git a/technic/machines/register/generator.lua b/technic/machines/register/generator.lua index 9062d09..7805bf0 100644 --- a/technic/machines/register/generator.lua +++ b/technic/machines/register/generator.lua @@ -108,14 +108,17 @@ function technic.register_generator(data) ) end + local tentry = tube_entry + if ltier == "lv" then tentry = "" end + minetest.register_node("technic:"..ltier.."_generator", { description = desc, tiles = { - "technic_"..ltier.."_generator_top.png"..tube_entry, - "technic_machine_bottom.png"..tube_entry, - "technic_"..ltier.."_generator_side.png"..tube_entry, - "technic_"..ltier.."_generator_side.png"..tube_entry, - "technic_"..ltier.."_generator_side.png"..tube_entry, + "technic_"..ltier.."_generator_top.png"..tentry, + "technic_machine_bottom.png"..tentry, + "technic_"..ltier.."_generator_side.png"..tentry, + "technic_"..ltier.."_generator_side.png"..tentry, + "technic_"..ltier.."_generator_side.png"..tentry, "technic_"..ltier.."_generator_front.png" }, paramtype2 = "facedir", diff --git a/technic/machines/register/grinder_recipes.lua b/technic/machines/register/grinder_recipes.lua index 7ba1e0f..64eb8e1 100644 --- a/technic/machines/register/grinder_recipes.lua +++ b/technic/machines/register/grinder_recipes.lua @@ -30,8 +30,7 @@ local recipes = { } -- defuse the sandstone -> 4 sand recipe to avoid infinite sand bugs (also consult the inverse compressor recipe) -minetest.register_craft({ - output = "default:sandstone 0", +minetest.clear_craft({ recipe = { {'default:sandstone'} }, |