-
Notifications
You must be signed in to change notification settings - Fork 21
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Artisan Benches: Fuel Device: migrate Barrel to FuelDevice. Relates to …
- Loading branch information
Showing
2 changed files
with
101 additions
and
276 deletions.
There are no files selected for viewing
12 changes: 2 additions & 10 deletions
12
mods/lord/Blocks/lord_artisan_benches/src/artisan_benches/barrel.lua
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
365 changes: 99 additions & 266 deletions
365
mods/lord/Blocks/lord_artisan_benches/src/artisan_benches/barrel/nodes.lua
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,273 +1,106 @@ | ||
| local lottpotion_nodes = require('artisan_benches.legacy.helpers') | ||
| local geometry = require('artisan_benches.barrel.nodes.geometry') | ||
| local S = minetest.get_mod_translator() | ||
|
|
||
|
|
||
| -- moved AS IS from lottpotion. | ||
|
|
||
| local machine_name = 'Brewer' | ||
|
|
||
| local formspec = 'size[8,9]' .. | ||
| 'label[0,0;' .. S(machine_name) .. ']' .. | ||
| 'image[4,2;1,1;benches_barrel_form_bubble.png]' .. | ||
| 'image[3,2;1,1;benches_form_arrow.png]' .. | ||
| 'image[5,2;1,1;benches_form_arrow.png]' .. | ||
| 'label[2.9,3.2;' .. S('Fuel:') .. ']' .. | ||
| 'list[current_name;fuel;4,3;1,1;]' .. | ||
| 'label[1,1.5;' .. S('Ingredients:') .. ']' .. | ||
| 'list[current_name;src;1,2;2,1;]' .. | ||
| 'label[6,1.5;' .. S('Result:') .. ']' .. | ||
| 'list[current_name;dst;6,2;1,2;]' .. | ||
| 'list[current_player;main;0,5;8,4;]' .. | ||
| 'listring[current_name;fuel]' .. | ||
| 'listring[current_player;main]' .. | ||
| 'listring[current_name;src]' .. | ||
| 'listring[current_player;main]' .. | ||
| 'listring[current_name;dst]' .. | ||
| 'listring[current_player;main]' .. | ||
| 'background[-0.5,-0.65;9,10.35;benches_form_bg.png]' .. | ||
| 'listcolors[#606060AA;#888;#141318;#30434C;#FFF]' | ||
|
|
||
| minetest.register_node(':lottpotion:brewer', { | ||
| description = S(machine_name), | ||
| drawtype = 'nodebox', | ||
| tiles = { 'default_wood.png' }, | ||
| node_box = { | ||
| type = 'fixed', | ||
| fixed = geometry.make_pipe( | ||
| { | ||
| { f = 0.9, h1 = -0.2, h2 = 0.2, b = 0 }, | ||
| { f = 0.75, h1 = -0.50, h2 = -0.35, b = 0 }, | ||
| { f = 0.75, h1 = 0.35, h2 = 0.5, b = 0 }, | ||
| { f = 0.82, h1 = -0.35, h2 = -0.2, b = 0 }, | ||
| { f = 0.82, h1 = 0.2, h2 = 0.35, b = 0 }, | ||
| { f = 0.75, h1 = 0.37, h2 = 0.42, b = 1 }, | ||
| { f = 0.75, h1 = -0.42, h2 = -0.37, b = 1 }, | ||
| local machine_name = 'Barrel' | ||
|
|
||
| --- @class barrel.node.Form: fuel_device.node.Form | ||
| local Form = { | ||
| get_spec = function(type, percent, item_percent) | ||
| assert(type:is_one_of({ 'active', 'inactive' })) | ||
| percent = percent or 0 | ||
| --item_percent = item_percent or 0 | ||
|
|
||
| local bubbles_image = type == 'inactive' | ||
| and 'image[4,2;1,1;benches_barrel_form_bubble.png]' | ||
| or 'image[4,2;1,1;benches_barrel_form_bubble.png^[lowpart:' .. (percent) .. ':benches_form_bubble.png]' | ||
|
|
||
|
|
||
| return 'size[8,9]' .. | ||
| 'label[0,0;' .. S(machine_name) .. ']' .. | ||
| bubbles_image .. | ||
| 'image[3,2;1,1;benches_form_arrow.png]' .. | ||
| 'image[5,2;1,1;benches_form_arrow.png]' .. | ||
| 'label[2.9,3.2;' .. S('Fuel:') .. ']' .. | ||
| 'list[current_name;fuel;4,3;1,1;]' .. | ||
| 'label[1,1.5;' .. S('Ingredients:') .. ']' .. | ||
| 'list[current_name;src;1,2;2,1;]' .. | ||
| 'label[6,1.5;' .. S('Result:') .. ']' .. | ||
| 'list[current_name;dst;6,2;1,2;]' .. | ||
| 'list[current_player;main;0,5;8,4;]' .. | ||
| 'listring[current_name;fuel]' .. | ||
| 'listring[current_player;main]' .. | ||
| 'listring[current_name;src]' .. | ||
| 'listring[current_player;main]' .. | ||
| 'listring[current_name;dst]' .. | ||
| 'listring[current_player;main]' | ||
| end | ||
| } | ||
|
|
||
| fuel_device.register( | ||
| S(machine_name), | ||
| minetest.CraftMethod.BARREL, | ||
| { | ||
| inactive = { | ||
| node_name = ':lottpotion:brewer', | ||
| definition = { | ||
| drawtype = 'nodebox', | ||
| tiles = { 'default_wood.png' }, | ||
| node_box = { | ||
| type = 'fixed', | ||
| fixed = geometry.make_pipe( | ||
| { | ||
| { f = 0.9, h1 = -0.2, h2 = 0.2, b = 0 }, | ||
| { f = 0.75, h1 = -0.50, h2 = -0.35, b = 0 }, | ||
| { f = 0.75, h1 = 0.35, h2 = 0.5, b = 0 }, | ||
| { f = 0.82, h1 = -0.35, h2 = -0.2, b = 0 }, | ||
| { f = 0.82, h1 = 0.2, h2 = 0.35, b = 0 }, | ||
| { f = 0.75, h1 = 0.37, h2 = 0.42, b = 1 }, | ||
| { f = 0.75, h1 = -0.42, h2 = -0.37, b = 1 }, | ||
| }, | ||
| 0 | ||
| ), | ||
| }, | ||
| paramtype = 'light', | ||
| groups = { choppy = 2, }, | ||
| sounds = default.node_sound_stone_defaults(), | ||
| selection_box = { | ||
| type = 'fixed', | ||
| fixed = { -0.3, -0.5, -0.3, 0.3, 0.35, 0.3 } | ||
| }, | ||
| }, | ||
| 0 | ||
| ), | ||
| }, | ||
| paramtype = 'light', | ||
| groups = { choppy = 2, oddly_breakable_by_hand = 2 }, | ||
| sounds = default.node_sound_stone_defaults(), | ||
| selection_box = { | ||
| type = 'fixed', | ||
| fixed = { -0.3, -0.5, -0.3, 0.3, 0.35, 0.3 } | ||
| }, | ||
| on_construct = function(pos) | ||
| local meta = minetest.get_meta(pos) | ||
| meta:set_string('formspec', formspec) | ||
| meta:set_string('infotext', S(machine_name)) | ||
| local inv = meta:get_inventory() | ||
| inv:set_size('fuel', 1) | ||
| inv:set_size('src', 2) | ||
| inv:set_size('dst', 1) | ||
| inv:set_size('dst2', 1) | ||
| end, | ||
| can_dig = lottpotion_nodes.can_dig, | ||
| --backwards compatibility: punch to set formspec | ||
| on_punch = function(pos, player) | ||
| local meta = minetest.get_meta(pos) | ||
| meta:set_string('infotext', S(machine_name)) | ||
| meta:set_string('formspec', formspec) | ||
| end, | ||
|
|
||
| allow_metadata_inventory_put = function(pos, listname, index, stack, player) | ||
| if minetest.is_protected(pos, player:get_player_name()) then | ||
| return 0 | ||
| end | ||
| if listname == 'dst' or listname == 'dst2' then | ||
| return 0 | ||
| end | ||
| return stack:get_count() | ||
| end, | ||
|
|
||
| allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) | ||
| local inv = minetest.get_meta(pos):get_inventory() | ||
| if minetest.is_protected(pos, player:get_player_name()) then | ||
| return 0 | ||
| end | ||
| if from_list == to_list then | ||
| if inv:get_stack(to_list, to_index):is_empty() then | ||
| return 1 | ||
| else | ||
| return 0 | ||
| end | ||
| else | ||
| return 0 | ||
| end | ||
| --return 1 | ||
| end, | ||
|
|
||
| allow_metadata_inventory_take = function(pos, listname, index, stack, player) | ||
| if minetest.is_protected(pos, player:get_player_name()) then | ||
| return 0 | ||
| end | ||
| return stack:get_count() | ||
| end, | ||
| }) | ||
|
|
||
| minetest.register_node(':lottpotion:brewer_active', { | ||
| description = S(machine_name), | ||
| drawtype = 'nodebox', | ||
| tiles = { 'default_wood.png' }, | ||
| node_box = { | ||
| type = 'fixed', | ||
| fixed = geometry.make_pipe( | ||
| { | ||
| { f = 0.9, h1 = -0.2, h2 = 0.2, b = 0 }, | ||
| { f = 0.75, h1 = -0.50, h2 = -0.35, b = 0 }, | ||
| { f = 0.75, h1 = 0.35, h2 = 0.5, b = 0 }, | ||
| { f = 0.82, h1 = -0.35, h2 = -0.2, b = 0 }, | ||
| { f = 0.82, h1 = 0.2, h2 = 0.35, b = 0 }, | ||
| { f = 0.75, h1 = 0.37, h2 = 0.42, b = 1 }, | ||
| { f = 0.75, h1 = -0.42, h2 = -0.37, b = 1 } | ||
| }, | ||
| active = { | ||
| node_name = ':lottpotion:brewer_active', | ||
| definition = { | ||
| drawtype = 'nodebox', | ||
| tiles = { 'default_wood.png' }, | ||
| node_box = { | ||
| type = 'fixed', | ||
| fixed = geometry.make_pipe( | ||
| { | ||
| { f = 0.9, h1 = -0.2, h2 = 0.2, b = 0 }, | ||
| { f = 0.75, h1 = -0.50, h2 = -0.35, b = 0 }, | ||
| { f = 0.75, h1 = 0.35, h2 = 0.5, b = 0 }, | ||
| { f = 0.82, h1 = -0.35, h2 = -0.2, b = 0 }, | ||
| { f = 0.82, h1 = 0.2, h2 = 0.35, b = 0 }, | ||
| { f = 0.75, h1 = 0.37, h2 = 0.42, b = 1 }, | ||
| { f = 0.75, h1 = -0.42, h2 = -0.37, b = 1 } | ||
| }, | ||
| 0 | ||
| ), | ||
| }, | ||
| paramtype = 'light', | ||
| selection_box = { | ||
| type = 'fixed', | ||
| fixed = { -0.3, -0.5, -0.3, 0.3, 0.35, 0.3 } | ||
| }, | ||
| drop = 'lottpotion:brewer', | ||
| groups = { cracky = 2, not_in_creative_inventory = 1 }, | ||
| sounds = default.node_sound_stone_defaults(), | ||
| }, | ||
| 0 | ||
| ), | ||
| } | ||
| }, | ||
| paramtype = 'light', | ||
| selection_box = { | ||
| type = 'fixed', | ||
| fixed = { -0.3, -0.5, -0.3, 0.3, 0.35, 0.3 } | ||
| }, | ||
| drop = 'lottpotion:brewer', | ||
| groups = { cracky = 2, not_in_creative_inventory = 1 }, | ||
| sounds = default.node_sound_stone_defaults(), | ||
| can_dig = lottpotion_nodes.can_dig, | ||
| allow_metadata_inventory_put = function(pos, listname, index, stack, player) | ||
| if minetest.is_protected(pos, player:get_player_name()) then | ||
| return 0 | ||
| end | ||
| if listname == 'dst' or listname == 'dst2' then | ||
| return 0 | ||
| end | ||
| return stack:get_count() | ||
| end, | ||
|
|
||
| allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) | ||
| local inv = minetest.get_meta(pos):get_inventory() | ||
| if minetest.is_protected(pos, player:get_player_name()) then | ||
| return 0 | ||
| end | ||
| if from_list == to_list then | ||
| if inv:get_stack(to_list, to_index):is_empty() then | ||
| return 1 | ||
| else | ||
| return 0 | ||
| end | ||
| else | ||
| return 0 | ||
| end | ||
| --return 1 | ||
| end, | ||
|
|
||
| allow_metadata_inventory_take = function(pos, listname, index, stack, player) | ||
| if minetest.is_protected(pos, player:get_player_name()) then | ||
| return 0 | ||
| end | ||
| return stack:get_count() | ||
| end, | ||
| }) | ||
|
|
||
| ------------------------------ ABM: ----------------------------------- | ||
| --- @param percent number | ||
| local function get_active_info(percent) | ||
| return S(('%s Brewing'):format(machine_name)) .. ' (' .. percent .. '%)' | ||
| end | ||
| --- @param percent number | ||
| local function get_active_form(percent) | ||
| return 'size[8,9]' .. | ||
| 'label[0,0;' .. S(machine_name) .. ']' .. | ||
| 'image[4,2;1,1;benches_barrel_form_bubble.png^[lowpart:' .. (percent) .. ':benches_form_bubble.png]' .. | ||
| 'image[3,2;1,1;benches_form_arrow.png]' .. | ||
| 'image[5,2;1,1;benches_form_arrow.png]' .. | ||
| 'label[2.9,3.2;' .. S('Fuel:') .. ']' .. | ||
| 'list[current_name;fuel;4,3;1,1;]' .. | ||
| 'label[1,1.5;' .. S('Ingredients:') .. ']' .. | ||
| 'list[current_name;src;1,2;2,1;]' .. | ||
| 'label[6,1.5;' .. S('Result:') .. ']' .. | ||
| 'list[current_name;dst;6,2;1,2;]' .. | ||
| 'list[current_player;main;0,5;8,4;]' .. | ||
| 'listring[current_name;fuel]' .. | ||
| 'listring[current_player;main]' .. | ||
| 'listring[current_name;src]' .. | ||
| 'listring[current_player;main]' .. | ||
| 'listring[current_name;dst]' .. | ||
| 'listring[current_player;main]' .. | ||
| 'background[-0.5,-0.65;9,10.35;benches_form_bg.png]' .. | ||
| 'listcolors[#606060AA;#888;#141318;#30434C;#FFF]' | ||
| end | ||
|
|
||
| minetest.register_abm({ | ||
| nodenames = { 'lottpotion:brewer', 'lottpotion:brewer_active' }, | ||
| interval = 1, | ||
| chance = 1, | ||
| action = function(pos, node, active_object_count, active_object_count_wider) | ||
| local meta = minetest.get_meta(pos) | ||
| local inv = meta:get_inventory() | ||
|
|
||
| lottpotion_nodes.init(meta, inv) | ||
|
|
||
| local result = lottpotion_recipe.get('brew', inv:get_list('src')) | ||
|
|
||
| local was_active = false | ||
|
|
||
| if meta:get_float('fuel_time') < meta:get_float('fuel_totaltime') then | ||
| was_active = true | ||
| lottpotion_nodes.process(meta, inv, result) | ||
| end | ||
|
|
||
| if meta:get_float('fuel_time') < meta:get_float('fuel_totaltime') then | ||
| local percent = math.floor(meta:get_float('fuel_time') / meta:get_float('fuel_totaltime') * 100) | ||
| lottpotion_nodes.update_node( | ||
| pos, meta, 'lottpotion:brewer_active', get_active_info(percent), get_active_form(percent) | ||
| ) | ||
| return | ||
| end | ||
|
|
||
| local recipe = lottpotion_recipe.get('brew', inv:get_list('src')) | ||
|
|
||
| if not recipe then | ||
| if was_active then | ||
| lottpotion_nodes.update_node( | ||
| pos, meta, 'lottpotion:brewer', S(('%s is empty'):format(machine_name)), formspec | ||
| ) | ||
| end | ||
|
|
||
| return | ||
| end | ||
|
|
||
| local fuel | ||
| local afterfuel | ||
| local fuellist = inv:get_list('fuel') | ||
|
|
||
| if fuellist then | ||
| fuel, afterfuel = minetest.get_craft_result({ method = 'fuel', width = 1, items = fuellist }) | ||
| end | ||
|
|
||
| if fuel.time <= 0 then | ||
| meta:set_string('infotext', S(('%s Out Of Heat'):format(machine_name))) | ||
| minetest.swap_node_if_not_same(pos, 'lottpotion:brewer') | ||
| meta:set_string('formspec', formspec) | ||
| return | ||
| end | ||
|
|
||
| meta:set_string('fuel_totaltime', fuel.time) | ||
| meta:set_string('fuel_time', 0) | ||
|
|
||
| inv:set_stack('fuel', 1, afterfuel.items[1]) | ||
| end, | ||
| }) | ||
|
|
||
| -- LBMS | ||
| minetest.register_lbm({ | ||
| label = 'Barrel formspec replacement', | ||
| name = ':lottpotion:brewer_formspec_replacement_3', | ||
| nodenames = { 'lottpotion:brewer' }, | ||
| run_at_every_load = false, | ||
| action = function(pos, node) | ||
| local meta = minetest.get_meta(pos) | ||
| meta:set_string('formspec', formspec) | ||
| end | ||
| }) | ||
| Form, | ||
| { src = 2 } | ||
| ) |