diff --git a/elepower_dynamics/craftitems.lua b/elepower_dynamics/craftitems.lua index 28fbdcd..9c5b07c 100644 --- a/elepower_dynamics/craftitems.lua +++ b/elepower_dynamics/craftitems.lua @@ -103,7 +103,7 @@ minetest.register_craftitem("elepower_dynamics:acidic_compound", { local pos = pointed_thing.under local node = minetest.get_node(pos) - if not node.name == "water_source" then + if node.name ~= "default:water_source" then return itemstack end diff --git a/elepower_dynamics/textures/elepower_capacitor.png b/elepower_dynamics/textures/elepower_capacitor.png index 499ddc4..ac1c9e8 100644 Binary files a/elepower_dynamics/textures/elepower_capacitor.png and b/elepower_dynamics/textures/elepower_capacitor.png differ diff --git a/elepower_machines/crafting.lua b/elepower_machines/crafting.lua index fa11f83..626bfa8 100644 --- a/elepower_machines/crafting.lua +++ b/elepower_machines/crafting.lua @@ -71,6 +71,13 @@ for mat, data in pairs(elepd.registered_dusts) do end end +-- Other recipes +elepm.register_craft({ + type = "grind", + recipe = { "farming:wheat" }, + output = "farming:flour 2" +}) + ------------- -- Sawmill -- ------------- @@ -219,3 +226,17 @@ minetest.register_craft({ {"elepower_dynamics:steel_gear", "elepower_dynamics:servo_valve", "elepower_dynamics:steel_gear"}, } }) + +-- Lava Cooler +minetest.register_craft({ + output = "elepower_machines:lava_cooler", + recipe = { + {"bucket:bucket_water", "elepower_dynamics:control_circuit", "bucket:bucket_lava"}, + {"elepower_dynamics:fluid_duct", "elepower_machines:machine_block", "elepower_dynamics:fluid_duct"}, + {"elepower_dynamics:servo_valve", "elepower_dynamics:tin_gear", "elepower_dynamics:servo_valve"}, + }, + replacements = { + {"bucket:bucket_water", "bucket:bucket_empty"}, + {"bucket:bucket_lava", "bucket:bucket_empty"}, + } +}) diff --git a/elepower_machines/formspec.lua b/elepower_machines/formspec.lua index 8d3a467..2dc1962 100644 --- a/elepower_machines/formspec.lua +++ b/elepower_machines/formspec.lua @@ -106,3 +106,37 @@ function elepm.get_grindstone_formspec(item_percent) "listring[current_player;main]".. default.get_hotbar_bg(0, 4.25) end + +function elepm.get_lava_cooler_formspec(item_percent, coolant_buffer, hot_buffer, power, recipes, recipe) + local rclist = {} + + local x = 2.5 + for j in pairs(recipes) do + if j == recipe then + rclist[#rclist + 1] = "item_image["..x..",0;1,1;"..j.."]" + else + rclist[#rclist + 1] = "item_image_button[".. x ..",0;1,1;"..j..";"..j..";]" + end + x = x + 1 + end + + return "size[8,8.5]".. + default.gui_bg.. + default.gui_bg_img.. + default.gui_slots.. + ele.formspec.power_meter(power).. + ele.formspec.fluid_bar(1, 0, coolant_buffer).. + ele.formspec.fluid_bar(7, 0, hot_buffer).. + "list[context;dst;3.5,1.5;1,1;]".. + "image[2.5,1.5;1,1;gui_furnace_arrow_bg.png^[lowpart:".. + (item_percent)..":gui_furnace_arrow_fg.png^[transformR270]".. + "image[4.5,1.5;1,1;gui_furnace_arrow_bg.png^[lowpart:".. + (item_percent)..":gui_furnace_arrow_fg.png^[transformFXR90]".. + table.concat(rclist, "").. + "list[current_player;main;0,4.25;8,1;]".. + "list[current_player;main;0,5.5;8,3;8]".. + "listring[current_player;main]".. + "listring[context;dst]".. + "listring[current_player;main]".. + default.get_hotbar_bg(0, 4.25) +end diff --git a/elepower_machines/machines/coal_alloy_furnace.lua b/elepower_machines/machines/coal_alloy_furnace.lua index 10745ab..e82ae31 100644 --- a/elepower_machines/machines/coal_alloy_furnace.lua +++ b/elepower_machines/machines/coal_alloy_furnace.lua @@ -12,16 +12,14 @@ local function allow_metadata_inventory_put(pos, listname, index, stack, player) local meta = minetest.get_meta(pos) local inv = meta:get_inventory() if listname == "fuel" then - if minetest.get_craft_result({method="fuel", width=1, items={stack}}).time ~= 0 then - return stack:get_count() - else + if minetest.get_craft_result({method="fuel", width=1, items={stack}}).time == 0 then return 0 end - elseif listname == "src" then - return stack:get_count() elseif listname == "dst" then return 0 end + + return stack:get_count() end local function allow_metadata_inventory_move(pos, from_list, from_index, to_list, to_index, count, player) diff --git a/elepower_machines/machines/init.lua b/elepower_machines/machines/init.lua index e667e99..d33661e 100644 --- a/elepower_machines/machines/init.lua +++ b/elepower_machines/machines/init.lua @@ -9,3 +9,4 @@ dofile(elepm.modpath.."/machines/grindstone.lua") dofile(elepm.modpath.."/machines/sawmill.lua") dofile(elepm.modpath.."/machines/generator.lua") dofile(elepm.modpath.."/machines/storage.lua") +dofile(elepm.modpath.."/machines/lava_cooler.lua") diff --git a/elepower_machines/machines/lava_cooler.lua b/elepower_machines/machines/lava_cooler.lua new file mode 100644 index 0000000..f42cf0d --- /dev/null +++ b/elepower_machines/machines/lava_cooler.lua @@ -0,0 +1,124 @@ + +local TIME = 5 + +local cooler_recipes = { + ["default:cobble"] = { + lava = 0, + water = 0, + }, + ["default:obsidian"] = { + lava = 1000, + water = 0, + }, + ["default:stone"] = { + lava = 0, + water = 1000, + }, +} + +local function lava_cooler_timer(pos, elapsed) + local refresh = false + + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + + local coolant_buffer = fluid_lib.get_buffer_data(pos, "coolant") + local hot_buffer = fluid_lib.get_buffer_data(pos, "hot") + + local capacity = ele.helpers.get_node_property(meta, pos, "capacity") + local usage = ele.helpers.get_node_property(meta, pos, "usage") + local storage = ele.helpers.get_node_property(meta, pos, "storage") + + local recipe = meta:get_string("recipe") + local consume = cooler_recipes[recipe] + local time = meta:get_int("src_time") + + if storage > usage then + if coolant_buffer.amount >= 1000 and hot_buffer.amount >= 1000 then + if time >= TIME then + local room_for_output = true + local output_stacks = {recipe} + inv:set_size("dst_tmp", inv:get_size("dst")) + inv:set_list("dst_tmp", inv:get_list("dst")) + + for _, o in ipairs(output_stacks) do + if not inv:room_for_item("dst_tmp", o) then + room_for_output = false + break + end + inv:add_item("dst_tmp", o) + end + + if room_for_output then + inv:set_list("dst", inv:get_list("dst_tmp")) + time = 0 + refresh = true + fluid_lib.take_from_buffer(pos, "coolant", consume.water) + fluid_lib.take_from_buffer(pos, "hot", consume.lava) + end + else + time = time + 1 + storage = storage - usage + refresh = true + end + else + refresh = false + end + end + + local power = math.floor(100 * storage / capacity) + local timer = math.floor(100 * time / TIME) + + meta:set_int("src_time", time) + meta:set_int("storage", storage) + + meta:set_string("formspec", elepm.get_lava_cooler_formspec(timer, coolant_buffer, hot_buffer, + power, cooler_recipes, recipe)) + + return refresh +end + +ele.register_machine("elepower_machines:lava_cooler", { + description = "Lava Cooler", + groups = {ele_machine = 1, ele_user = 1, cracky = 2, oddly_breakable_by_hand = 1, fluid_container = 1}, + fluid_buffers = { + coolant = { + capacity = 8000, + accepts = {"default:water_source"}, + }, + hot = { + capacity = 8000, + accepts = {"default:lava_source"}, + } + }, + tiles = { + "elepower_machine_top.png", "elepower_machine_base.png", "elepower_machine_side.png", + "elepower_machine_side.png", "elepower_machine_side.png", "elepower_lava_cooler.png", + }, + on_construct = function (pos) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + + inv:set_size("dst", 1) + + meta:set_string("recipe", "default:cobble") + meta:set_string("formspec", elepm.get_lava_cooler_formspec(0,nil,nil,0,cooler_recipes, "default:cobble")) + end, + on_timer = lava_cooler_timer, + on_receive_fields = function (pos, formname, fields, sender) + local meta = minetest.get_meta(pos) + local frecipe = nil + + for f in pairs(fields) do + if cooler_recipes[f] then + frecipe = f + break + end + end + + if frecipe then + meta:set_string("recipe", frecipe) + minetest.get_node_timer(pos):start(1.0) + end + end, +}) diff --git a/elepower_machines/textures/elepower_lava_cooler.png b/elepower_machines/textures/elepower_lava_cooler.png new file mode 100644 index 0000000..f5d5a16 Binary files /dev/null and b/elepower_machines/textures/elepower_lava_cooler.png differ