From 96591d3bded2999a13ff7ca4b38198fa290784e8 Mon Sep 17 00:00:00 2001 From: Evert Prants Date: Sun, 24 Jun 2018 16:45:21 +0300 Subject: [PATCH] Add a manual grindstone --- elepower_dynamics/crafting.lua | 4 + elepower_fapi/transfer.lua | 8 +- elepower_machines/crafting.lua | 13 ++ elepower_machines/formspec.lua | 18 +++ elepower_machines/machines/grindstone.lua | 136 ++++++++++++++++++ elepower_machines/machines/init.lua | 1 + .../textures/elepower_grinder_side.png | Bin 0 -> 1959 bytes 7 files changed, 178 insertions(+), 2 deletions(-) create mode 100644 elepower_machines/machines/grindstone.lua create mode 100644 elepower_machines/textures/elepower_grinder_side.png diff --git a/elepower_dynamics/crafting.lua b/elepower_dynamics/crafting.lua index d46834a..280cfe9 100644 --- a/elepower_dynamics/crafting.lua +++ b/elepower_dynamics/crafting.lua @@ -227,6 +227,10 @@ minetest.register_craft({ "elepower_dynamics:viridisium_dust", "elepower_dynamics:viridisium_dust", "elepower_dynamics:viridisium_dust", + "elepower_dynamics:copper_dust", + "elepower_dynamics:copper_dust", + "elepower_dynamics:copper_dust", + "elepower_dynamics:copper_dust", "farming:seed_wheat", } }) diff --git a/elepower_fapi/transfer.lua b/elepower_fapi/transfer.lua index 0be0223..80be996 100644 --- a/elepower_fapi/transfer.lua +++ b/elepower_fapi/transfer.lua @@ -86,9 +86,13 @@ end function elefluid.transfer_timer_tick(pos, elapsed) local refresh = true + local node = minetest.get_node_or_nil(pos) + + if not node then + return false + end + local meta = minetest.get_meta(pos) - local node = minetest.get_node(pos) - local meta1 = nil local targets = {} -- Only allow the node directly behind to be a start of a network diff --git a/elepower_machines/crafting.lua b/elepower_machines/crafting.lua index 99329f1..fa11f83 100644 --- a/elepower_machines/crafting.lua +++ b/elepower_machines/crafting.lua @@ -123,6 +123,19 @@ minetest.register_craft({ } }) +-- Grindstone +minetest.register_craft({ + output = "elepower_machines:grindstone", + recipe = { + {"group:stone", "group:stone", "group:stone"}, + {"default:flint", "default:flint", "default:flint"}, + {"group:cobble", "group:cobble", "group:cobble"}, + }, + replacements = { + {"bucket:bucket_lava", "bucket:bucket_empty"} + } +}) + -- Machine block minetest.register_craft({ output = "elepower_machines:machine_block", diff --git a/elepower_machines/formspec.lua b/elepower_machines/formspec.lua index 8ea5faa..8d3a467 100644 --- a/elepower_machines/formspec.lua +++ b/elepower_machines/formspec.lua @@ -88,3 +88,21 @@ function elepm.get_coal_alloy_furnace_formspec(fuel_percent, item_percent) "listring[current_player;main]".. default.get_hotbar_bg(0, 4.25) end + +function elepm.get_grindstone_formspec(item_percent) + return "size[8,8.5]".. + default.gui_bg.. + default.gui_bg_img.. + default.gui_slots.. + "list[context;src;1.6,1;1,1;]".. + "image[3.5,1;1,1;gui_furnace_arrow_bg.png^[lowpart:".. + (item_percent)..":gui_furnace_arrow_fg.png^[transformR270]".. + "list[context;dst;4.5,1;2,1;]".. + "list[current_player;main;0,4.25;8,1;]".. + "list[current_player;main;0,5.5;8,3;8]".. + "listring[context;dst]".. + "listring[current_player;main]".. + "listring[context;src]".. + "listring[current_player;main]".. + default.get_hotbar_bg(0, 4.25) +end diff --git a/elepower_machines/machines/grindstone.lua b/elepower_machines/machines/grindstone.lua new file mode 100644 index 0000000..07a6783 --- /dev/null +++ b/elepower_machines/machines/grindstone.lua @@ -0,0 +1,136 @@ + +local function can_dig(pos, player) + local meta = minetest.get_meta(pos); + local inv = meta:get_inventory() + return inv:is_empty("dst") and inv:is_empty("src") +end + +local function allow_metadata_inventory_put(pos, listname, index, stack, player) + if minetest.is_protected(pos, player:get_player_name()) or 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) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + local stack = inv:get_stack(from_list, from_index) + return allow_metadata_inventory_put(pos, to_list, to_index, stack, player) +end + +local function allow_metadata_inventory_take(pos, listname, index, stack, player) + if minetest.is_protected(pos, player:get_player_name()) then + return 0 + end + + return stack:get_count() +end + +local function metadata_inventory_changed(pos) + local t = minetest.get_node_timer(pos) + + if not t:is_started() then + t:start(0.2) + end +end + +local function grindstone_timer(pos, elapsed) + local refresh = false + + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + + local recipe = elepm.get_recipe("grind", inv:get_list("src")) + if not recipe or recipe.time == 0 then + meta:set_int("src_time", 0) + meta:set_int("src_time_max", 0) + meta:set_string("formspec", elepm.get_grindstone_formspec(0)) + meta:set_string("infotext", "No recipe") + return + end + + local target_time = ele.helpers.round(recipe.time * 18) + local time = meta:get_int("src_time") + + if time >= target_time then + local output = recipe.output + if type(output) ~= "table" then output = { output } end + local output_stacks = {} + for _, o in ipairs(output) do + table.insert(output_stacks, ItemStack(o)) + end + + local room_for_output = true + 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 not room_for_output then + time = target_time - 1 + else + inv:set_list("src", recipe.new_input) + inv:set_list("dst", inv:get_list("dst_tmp")) + time = 0 + end + + refresh = true + end + + local percentile = math.floor(100 * time / target_time) + meta:set_string("formspec", elepm.get_grindstone_formspec(percentile)) + meta:set_int("src_time", time) + meta:set_int("src_time_max", target_time) + meta:set_string("infotext", "Grindstone: ".. percentile .. "%") + + return refresh +end + +ele.register_base_device("elepower_machines:grindstone", { + description = "Grindstone\nA medieval pulverizer", + tiles = { + "elepower_cfalloy_top.png", "elepower_cfalloy_bottom.png", "elepower_grinder_side.png", + "elepower_grinder_side.png", "elepower_grinder_side.png", "elepower_grinder_side.png" + }, + on_construct = function (pos) + local meta = minetest.get_meta(pos) + local inv = meta:get_inventory() + + inv:set_size("src", 1) + inv:set_size("dst", 2) + + meta:set_string("formspec", elepm.get_grindstone_formspec(0)) + end, + allow_metadata_inventory_put = allow_metadata_inventory_put, + allow_metadata_inventory_take = allow_metadata_inventory_take, + allow_metadata_inventory_move = allow_metadata_inventory_move, + on_metadata_inventory_move = metadata_inventory_changed, + on_metadata_inventory_take = metadata_inventory_changed, + on_metadata_inventory_put = metadata_inventory_changed, + can_dig = can_dig, + on_timer = grindstone_timer, + groups = { + tubedevice = 1, + cracky = 2, + }, + on_punch = function (pos, node, puncher, pointed_thing) + local meta = minetest.get_meta(pos) + local stime = meta:get_int("src_time") + local sttm = meta:get_int("src_time_max") + + if sttm > 0 then + meta:set_int("src_time", stime + 1) + minetest.get_node_timer(pos):start(0.2) + end + + minetest.node_punch(pos, node, puncher, pointed_thing) + end +}) diff --git a/elepower_machines/machines/init.lua b/elepower_machines/machines/init.lua index 9bbf8db..e667e99 100644 --- a/elepower_machines/machines/init.lua +++ b/elepower_machines/machines/init.lua @@ -5,6 +5,7 @@ dofile(elepm.modpath.."/machines/furnace.lua") dofile(elepm.modpath.."/machines/alloy_furnace.lua") dofile(elepm.modpath.."/machines/coal_alloy_furnace.lua") dofile(elepm.modpath.."/machines/pulverizer.lua") +dofile(elepm.modpath.."/machines/grindstone.lua") dofile(elepm.modpath.."/machines/sawmill.lua") dofile(elepm.modpath.."/machines/generator.lua") dofile(elepm.modpath.."/machines/storage.lua") diff --git a/elepower_machines/textures/elepower_grinder_side.png b/elepower_machines/textures/elepower_grinder_side.png new file mode 100644 index 0000000000000000000000000000000000000000..1d6f4340ea3b2b192eceb6d47b4dd53dea3675e1 GIT binary patch literal 1959 zcmV;Y2Uz%tP) zaB^>EX>4U6ba`-PAZ2)IW&i+q+O1bxlI$i7{bvgDgJ>jId2l-`rGU zR~sy_9_L76MxB5C+0-Anm=33m^}$8w4qPUh$O)5hTvr-TI?Q;^mqR8mxmpVhk;bU6 z*Wjl7gq*RTr@Tx(33B^T6wkSk-wSCf;xG+}#c4>>W#E{KRho)4Ps`?d&sSK7i@`rb zD06?C>jMV-RDT%l*;z;4;A!~q-bKs+8u3$WB<ujIqPh)%`W>Ka?Gi)D!Q0riz~i_5=*LFbwwRlSA7jN)^yT|R65OR zPj~t=obgNzsn&Ee%{JG33oWXa7HgB%kNaP+Mw2xjO!bX^u?DI4qJnxmv7Iw8#)d$+ z?+lPu%$>6%kTKku>zo~tdlO_hX*)TUI%8naoW!=#;_hb7Dzwr6g*OEv`2S!|b?SbD zxli7HVy&ie(CNWYFT)P%p;3KJm&5`7m_*fBGPW;O>Qev+=dkK<%mmeE{XD%!KldDV zjOc-O3ND2)5Y@S4h6K%Zj4B*#UlOzmQCsztFn^iEAQn_Ve5WW6-w{)qio!K9u=R3O zzJX0A!72I3)h!tE{ML5^AY-c2v}s0NGcwOnuPBeVWn{JBz~v36D#x{iQ#(#AOm7KX zs4vK&rimoakJN5k##@_&x&RU^Q3BV*=FZyd>m-}2NQ7j{<|h=O?pjdeFUJ{@*__x% z$-v`IFIi!A#aeEv>6_*FWr4(_eZhtermxw&BF7dLuUz0epZ$*0%7IyJf*0Q_U-IbY zTYM3%$p2G-6!cvkq4nKHFf`w)&hNFcVv_{@nnzQ|Xc5oCxC;->_7R5~f$VgP*Z;h* z1ZtOjp!ID7ztK~xAa8`|qs`TK?LIJ*;v@B;MOuU2fhOm+HsU0k{lKUvT3+?1_afu6 z168-md@AB^wxq|9mlVlXTt26ybmMB|w_dG65|O1StR$lN6K7Vhu1($zu#p*h@1;Lj zt#>udB9=YY_a$|Aef~^Fei!TQ*X6~tStz~3leM&`ENXaTR{C|pKNEtXa_62Jd(Uzb zc*&y3?WfynY~jw94>-4MQauQY?)ji}@RZ-f=%9eFFoC0FQA3ah14dBea)&rk?v;Y7A24YJ` zL;$1!YXBO>1YeQ>000SaNLh0L04^f{04^f|c%?sf00007bV*G`2jT`83?ms{ZM-}H z000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}0005@Nkl=F8Ay zri4-o)twLm0Dmu+$DY9gp$n)P0Da#x&od&z^)|N&LY|=k<`>^JAZs!5K(f@c=1N42;uG98{;@pYkf##s;C+ANwRym z*VagYT9LP}ueEMJ0*EwD+qY0_{d9sLRO-gNpmi&RZMTMosvpqQp||*06RV(H&eAbTO-T5G#`{w==*^+#zz-6KlXjk`=58*ofH$@ zu0vHB$FWV2Q)0j0GfpD{tn0cNXU{lJTsCLkLq%AYnP7q9P5|LH-^jV3s+cPCvXE0^ t7zR$K6X)|UN^xp+F6#$o?FFkS{{RtyBj4`lPdoqs002ovPDHLkV1o71pXmSq literal 0 HcmV?d00001