mtcontrib/banners
1
0
Fork 1
mirror of https://github.com/pandorabox-io/banners.git synced 2025-01-08 00:50:32 +01:00
Code Issues Releases Wiki Activity

whitespace and minetest. -> core.

Browse Source 
- use same whitespace style throughout and fix some indents.
- change from minetest. to core. namespace.
This commit is contained in:
Luke aka SwissalpS 2024-11-27 22:32:24 +01:00
parent 283b5bec25
commit c8012c7266
6 changed files with 534 additions and 528 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
crafts.lua
View File

@ -1,78 +1,73 @@
-- craft recipes -- craft recipes
minetest.register_craft( -- wooden flag pole
{ -- wooden flag pole
core.register_craft({
output = "banners:wooden_pole 1", output = "banners:wooden_pole 1",
recipe = { recipe = {
{ "", "", "default:stick" }, { "", "", "default:stick" },
{ "", "default:stick", "" }, { "", "default:stick", "" },
{ "default:stick", "", "" } { "default:stick", "", "" }
} }
} })
)
minetest.register_craft( -- steel flag pole -- steel flag pole
{ core.register_craft({
output = "banners:steel_pole 1", output = "banners:steel_pole 1",
recipe = { recipe = {
{ "", "", "default:steel_ingot" }, { "", "", "default:steel_ingot" },
{ "default:stick", "default:steel_ingot", "default:stick" }, { "default:stick", "default:steel_ingot", "default:stick" },
{ "default:steel_ingot", "", "" } { "default:steel_ingot", "", "" }
} }
} })
)
minetest.register_craft( -- wooden flag support base -- wooden flag support base
{ core.register_craft({
output = "banners:wooden_base 1", output = "banners:wooden_base 1",
recipe = { recipe = {
{ "", "default:stick", "" }, { "", "default:stick", "" },
{ "default:stick", "", "default:stick" }, { "default:stick", "", "default:stick" },
{ "group:wood", "group:wood", "group:wood" } { "group:wood", "group:wood", "group:wood" }
} }
} })
)
minetest.register_craft( -- steel support -- steel support
{ core.register_craft({
output = "banners:steel_base", output = "banners:steel_base",
recipe = { recipe = {
{ "", "default:steel_ingot", "" }, { "", "default:steel_ingot", "" },
{ "default:steel_ingot", "", "default:steel_ingot" }, { "default:steel_ingot", "", "default:steel_ingot" },
{ "", "default:steelblock", "" } { "", "default:steelblock", "" }
} }
} })
)
minetest.register_craft( -- banner sheet -- banner sheet
{ core.register_craft({
output = "banners:banner_sheet 1", output = "banners:banner_sheet 1",
recipe = { recipe = {
{ "", "", "" }, { "", "", "" },
{ "farming:cotton", "farming:cotton", "farming:cotton" }, { "farming:cotton", "farming:cotton", "farming:cotton" },
{ "farming:cotton", "farming:cotton", "farming:cotton" } { "farming:cotton", "farming:cotton", "farming:cotton" }
} }
} })
)
minetest.register_craft( -- wooden support -- wooden support
{ core.register_craft({
output = "banners:wooden_banner 1", output = "banners:wooden_banner 1",
recipe = { recipe = {
{ "", "banners:banner_sheet", "" }, { "", "banners:banner_sheet", "" },
{ "", "banners:wooden_pole", "" }, { "", "banners:wooden_pole", "" },
{ "", "banners:wooden_base", "" } { "", "banners:wooden_base", "" }
} }
} })
)
minetest.register_craft( -- steel support -- steel support
{ core.register_craft({
output = "banners:steel_banner 1", output = "banners:steel_banner 1",
recipe = { recipe = {
{ "", "banners:banner_sheet", "" }, { "", "banners:banner_sheet", "" },
{ "", "banners:steel_pole", "" }, { "", "banners:steel_pole", "" },
{ "", "banners:steel_base", "" } { "", "banners:steel_base", "" }
} }
} })
)

109
factions.lua
View File

@ -1,43 +1,43 @@
banners.power_per_banner = 10. banners.power_per_banner = 10.
-- items -- items
minetest.register_craftitem("banners:golden_finial", { core.register_craftitem("banners:golden_finial", {
groups = {}, groups = {},
description = "Golden finial", description = "Golden finial",
inventory_image = "gold_finial.png", inventory_image = "gold_finial.png",
}) })
minetest.register_craftitem("banners:silver_pole", { core.register_craftitem("banners:silver_pole", {
groups = {}, groups = {},
description = "Silver pole", description = "Silver pole",
inventory_image = "silver_pole.png" inventory_image = "silver_pole.png"
}) })
minetest.register_craftitem("banners:power_pole", { core.register_craftitem("banners:power_pole", {
groups = {}, groups = {},
description = "Power pole", description = "Power pole",
inventory_image = "power_pole.png" inventory_image = "power_pole.png"
}) })
minetest.register_craftitem("banners:golden_sheet", { core.register_craftitem("banners:golden_sheet", {
groups = {}, groups = {},
description = "Golden sheet", description = "Golden sheet",
inventory_image = "golden_sheet.png" inventory_image = "golden_sheet.png"
}) })
minetest.register_craftitem("banners:death_pole", { core.register_craftitem("banners:death_pole", {
groups = {}, groups = {},
description = "Death pole", description = "Death pole",
inventory_image = "death_pole.png" inventory_image = "death_pole.png"
}) })
minetest.register_craftitem("banners:death_sheet", { core.register_craftitem("banners:death_sheet", {
groups = {}, groups = {},
description = "Death sheet", description = "Death sheet",
inventory_image = "death_sheet.png" inventory_image = "death_sheet.png"
}) })
minetest.register_craftitem("banners:death_base", { core.register_craftitem("banners:death_base", {
groups = {}, groups = {},
description = "Death base", description = "Death base",
inventory_image = "death_base.png" inventory_image = "death_base.png"
@ -46,102 +46,93 @@ minetest.register_craftitem("banners:death_base", {
-- crafts -- crafts
minetest.register_craft( -- silver flag pole -- silver flag pole
{ core.register_craft({
output = "banners:silver_pole 1", output = "banners:silver_pole 1",
recipe = { recipe = {
{ "", "", "moreores:silver_ingot" }, { "", "", "moreores:silver_ingot" },
{ "", "moreores:silver_ingot", "" }, { "", "moreores:silver_ingot", "" },
{ "moreores:silver_ingot", "", "" } { "moreores:silver_ingot", "", "" }
} }
} })
)
minetest.register_craft( -- death flag pole -- death flag pole
{ core.register_craft({
output = "banners:death_pole 1", output = "banners:death_pole 1",
recipe = { recipe = {
{ "", "", "default:diamond" }, { "", "", "default:diamond" },
{ "", "default:obsidian", "" }, { "", "default:obsidian", "" },
{ "default:obsidian", "", "" } { "default:obsidian", "", "" }
} }
} })
)
minetest.register_craft( -- golden finial -- golden finial
{ core.register_craft({
output = "banners:golden_finial", output = "banners:golden_finial",
recipe = { recipe = {
{ "", "default:gold_ingot", "default:gold_ingot" }, { "", "default:gold_ingot", "default:gold_ingot" },
{ "", "default:gold_ingot", "default:gold_ingot" }, { "", "default:gold_ingot", "default:gold_ingot" },
{ "default:gold_ingot", "", "" } { "default:gold_ingot", "", "" }
} }
} })
)
minetest.register_craft( -- power flag pole -- power flag pole
{ core.register_craft({
output = "banners:power_pole 1", output = "banners:power_pole 1",
recipe = { recipe = {
{ "", "", "" }, { "", "", "" },
{ "", "banners:golden_finial", "" }, { "", "banners:golden_finial", "" },
{ "banners:silver_pole", "", "" } { "banners:silver_pole", "", "" }
} }
} })
)
minetest.register_craft( -- golden sheet -- golden sheet
{ core.register_craft({
output = "banners:golden_sheet 1", output = "banners:golden_sheet 1",
type = "shapeless", type = "shapeless",
recipe = { "default:gold_ingot", "banners:banner_sheet" } recipe = { "default:gold_ingot", "banners:banner_sheet" }
} })
)
minetest.register_craft( -- death sheet -- death sheet
{ core.register_craft({
output = "banners:death_sheet 1", output = "banners:death_sheet 1",
type = "shapeless", type = "shapeless",
recipe = { "default:obsidian", "banners:banner_sheet" } recipe = { "default:obsidian", "banners:banner_sheet" }
} })
)
minetest.register_craft( -- death sheet -- death sheet
{ core.register_craft({
output = "banners:death_base 1", output = "banners:death_base 1",
recipe = { recipe = {
{ "", "", "" }, { "", "", "" },
{ "", "banners:steel_base", "" }, { "", "banners:steel_base", "" },
{ "default:obsidian", "default:obsidian", "default:obsidian" } { "default:obsidian", "default:obsidian", "default:obsidian" }
} }
} })
)
minetest.register_craft( -- power banner -- power banner
{ core.register_craft({
output = "banners:power_banner", output = "banners:power_banner",
recipe = { recipe = {
{ "", "banners:golden_sheet", "" }, { "", "banners:golden_sheet", "" },
{ "", "banners:power_pole", "" }, { "", "banners:power_pole", "" },
{ "", "banners:steel_base", "" } { "", "banners:steel_base", "" }
} }
} })
)
minetest.register_craft( -- death banner -- death banner
{ core.register_craft({
output = "banners:death_banner", output = "banners:death_banner",
recipe = { recipe = {
{ "", "banners:death_sheet", "" }, { "", "banners:death_sheet", "" },
{ "", "banners:death_pole", "" }, { "", "banners:death_pole", "" },
{ "", "banners:death_base", "" } { "", "banners:death_base", "" }
} }
} })
)
-- nodes -- nodes
minetest.register_node("banners:power_banner", { core.register_node("banners:power_banner", {
drawtype = "mesh", drawtype = "mesh",
mesh = "banner_support.x", mesh = "banner_support.x",
tiles = { "gold_support.png" }, tiles = { "gold_support.png" },
@ -159,10 +150,10 @@ minetest.register_node("banners:power_banner", {
banners.banner_on_destruct(pos) banners.banner_on_destruct(pos)
end, end,
on_dig = function(pos, n, p) on_dig = function(pos, n, p)
if minetest.is_protected(pos, p:get_player_name()) then if core.is_protected(pos, p:get_player_name()) then
return return
end end
local meta = minetest.get_meta(pos) local meta = core.get_meta(pos)
local facname = meta:get_string("faction") local facname = meta:get_string("faction")
if facname then if facname then
local faction = factions.factions[facname] local faction = factions.factions[facname]
@ -174,7 +165,7 @@ minetest.register_node("banners:power_banner", {
end, end,
}) })
minetest.register_node("banners:death_banner", { core.register_node("banners:death_banner", {
drawtype = "mesh", drawtype = "mesh",
mesh = "banner_support.x", mesh = "banner_support.x",
tiles = { "death_uv.png" }, tiles = { "death_uv.png" },
@ -192,10 +183,10 @@ minetest.register_node("banners:death_banner", {
banners.banner_on_destruct(pos) banners.banner_on_destruct(pos)
end, end,
on_dig = function(pos, n, p) on_dig = function(pos, n, p)
if minetest.is_protected(pos, p:get_player_name()) then if core.is_protected(pos, p:get_player_name()) then
return return
end end
local meta = minetest.get_meta(pos) local meta = core.get_meta(pos)
local defending_facname = meta:get_string("faction") local defending_facname = meta:get_string("faction")
local parcelpos = factions.get_parcel_pos(pos) local parcelpos = factions.get_parcel_pos(pos)
if defending_facname then if defending_facname then
@ -204,34 +195,34 @@ minetest.register_node("banners:death_banner", {
faction:stop_attack(parcelpos) faction:stop_attack(parcelpos)
end end
end end
minetest.remove_node(pos) core.remove_node(pos)
end, end,
}) })
banners.after_powerbanner_placed = function(pos, player, itemstack, pointed_thing) banners.after_powerbanner_placed = function(pos, player, itemstack, pointed_thing)
minetest.get_node(pos).param2 = banners.determine_flag_direction(pos, pointed_thing) core.get_node(pos).param2 = banners.determine_flag_direction(pos, pointed_thing)
local faction = factions.players[player:get_player_name()] local faction = factions.players[player:get_player_name()]
if not faction then if not faction then
minetest.get_meta(pos):set_string("banner", "bg_white.png") core.get_meta(pos):set_string("banner", "bg_white.png")
else else
local banner_string = factions.factions[faction].banner local banner_string = factions.factions[faction].banner
minetest.get_meta(pos):set_string("banner", banner_string) core.get_meta(pos):set_string("banner", banner_string)
minetest.get_meta(pos):set_string("faction", faction) core.get_meta(pos):set_string("faction", faction)
factions.factions[faction]:increase_maxpower(banners.power_per_banner) factions.factions[faction]:increase_maxpower(banners.power_per_banner)
end end
minetest.add_entity(pos, "banners:banner_ent") core.add_entity(pos, "banners:banner_ent")
end end
banners.after_deathbanner_placed = function(pos, player, itemstack, pointed_thing) banners.after_deathbanner_placed = function(pos, player, itemstack, pointed_thing)
minetest.get_node(pos).param2 = banners.determine_flag_direction(pos, pointed_thing) core.get_node(pos).param2 = banners.determine_flag_direction(pos, pointed_thing)
local attacking_faction = factions.players[player:get_player_name()] local attacking_faction = factions.players[player:get_player_name()]
if attacking_faction then if attacking_faction then
local parcelpos = factions.get_parcel_pos(pos) local parcelpos = factions.get_parcel_pos(pos)
attacking_faction = factions.factions[attacking_faction] attacking_faction = factions.factions[attacking_faction]
attacking_faction:attack_parcel(parcelpos) attacking_faction:attack_parcel(parcelpos)
minetest.get_meta(pos):set_string("faction", attacking_faction.name) core.get_meta(pos):set_string("faction", attacking_faction.name)
end end
minetest.get_meta(pos):set_string("banner", "death_uv.png") core.get_meta(pos):set_string("banner", "death_uv.png")
minetest.add_entity(pos, "banners:banner_ent") core.add_entity(pos, "banners:banner_ent")
end end

58
init.lua
View File

@ -35,13 +35,15 @@ banners.colors = {
"brown", "darkbrown" "brown", "darkbrown"
} }
banners.base_transform = ({texture = "bg_white.png", banners.base_transform = {
mask="mask_background.png"}) texture = "bg_white.png",
mask = "mask_background.png"
}
banners.creation_form_func = function(state) banners.creation_form_func = function(state)
-- helper functions -- helper functions
state.update_player_inv = function(self) state.update_player_inv = function(self)
local player = minetest.get_player_by_name(self.player) local player = core.get_player_by_name(self.player)
local newbanner = player:get_wielded_item() local newbanner = player:get_wielded_item()
newbanner:get_meta():set_string("", state.banner:get_transform_string()) newbanner:get_meta():set_string("", state.banner:get_transform_string())
player:set_wielded_item(newbanner) player:set_wielded_item(newbanner)
@ -80,13 +82,12 @@ banners.creation_form_func = function(state)
local y = .3 local y = .3
for i in ipairs(banners.colors) do for i in ipairs(banners.colors) do
local b = state:button(x, y, 1, 1, banners.colors[i], "") local b = state:button(x, y, 1, 1, banners.colors[i], "")
b:setImage("bg_"..banners.colors[i]..".png")
b:click(function(self, state) b:click(function(self, state)
state.current_color = "bg_"..self.name..".png" state.current_color = "bg_"..self.name..".png"
state:update_preview() state:update_preview()
b:setImage("bg_" .. banners.colors[i] .. ".png")
-- todo: update masks or something -- todo: update masks or something
end end)
)
x = x + 1 x = x + 1
if x > 19 then if x > 19 then
y = y + 1 y = y + 1
@ -98,12 +99,13 @@ banners.creation_form_func = function(state)
local y = 3 local y = 3
for i in ipairs(banners.masks) do for i in ipairs(banners.masks) do
local b = state:button(x, y, 2, 1, banners.masks[i], "") local b = state:button(x, y, 2, 1, banners.masks[i], "")
b:setImage(banners.masks[i]..".png")
b:click(function(self, state) b:click(function(self, state)
state.banner:push_transform({texture=state.current_color, mask=self.name..".png"}) state.banner:push_transform({texture=state.current_color, mask=self.name..".png"})
state:update_all() state:update_all()
end end
) )
b:setImage(banners.masks[i] .. ".png")
end)
x = x + 2 x = x + 2
if x > 17.5 then if x > 17.5 then
y = y + 1 y = y + 1
@ -114,7 +116,7 @@ banners.creation_form_func = function(state)
end end
banners.creation_form = smartfs.create("banners:banner_creation", banners.creation_form = smartfs.create("banners:banner_creation",
banners.creation_form_func); banners.creation_form_func)
-- banner definition -- banner definition
@ -136,7 +138,8 @@ end
function banners.Banner.get_transform_string(self) function banners.Banner.get_transform_string(self)
local final = {} local final = {}
for i in ipairs(self.transforms) do for i in ipairs(self.transforms) do
table.insert(final, "("..self.transforms[i].texture.."^[mask:"..self.transforms[i].mask.."^[makealpha:0,0,0)") table.insert(final, "(" .. self.transforms[i].texture
.. "^[mask:" .. self.transforms[i].mask .. "^[makealpha:0,0,0)")
end end
local ret = table.concat(final, "^") local ret = table.concat(final, "^")
return ret return ret
@ -146,10 +149,12 @@ end
banners.determine_flag_direction = function(pos, pointed_thing) banners.determine_flag_direction = function(pos, pointed_thing)
local above = pointed_thing.above local above = pointed_thing.above
local under = pointed_thing.under local under = pointed_thing.under
local dir = {x = under.x - above.x, local dir = {
x = under.x - above.x,
y = under.y - above.y, y = under.y - above.y,
z = under.z - above.z} z = under.z - above.z
return minetest.dir_to_wallmounted(dir) }
return core.dir_to_wallmounted(dir)
end end
banners.banner_on_use = function(itemstack, player, pointed_thing) banners.banner_on_use = function(itemstack, player, pointed_thing)
@ -159,17 +164,22 @@ banners.banner_on_use = function(itemstack, player, pointed_thing)
end end
banners.banner_on_dig = function(pos, node, player) banners.banner_on_dig = function(pos, node, player)
if not player or minetest.is_protected(pos, player:get_player_name()) then if not player or core.is_protected(pos, player:get_player_name()) then
return return
end end
local meta = minetest.get_meta(pos) local meta = core.get_meta(pos)
local inventory = player:get_inventory() local inventory = player:get_inventory()
inventory:add_item("main", {name=node.name, count=1, wear=0, metadata=meta:get_string("banner")}) inventory:add_item("main", {
minetest.remove_node(pos) name = node.name,
count = 1,
wear = 0,
metadata = meta:get_string("banner")
})
core.remove_node(pos)
end end
banners.banner_on_destruct = function(pos, node, player) banners.banner_on_destruct = function(pos, node, player)
local objects = minetest.get_objects_inside_radius(pos, 0.5) local objects = core.get_objects_inside_radius(pos, 0.5)
for _, v in ipairs(objects) do for _, v in ipairs(objects) do
local e = v:get_luaentity() local e = v:get_luaentity()
if e and e.name == "banners:banner_ent" then if e and e.name == "banners:banner_ent" then
@ -179,9 +189,9 @@ banners.banner_on_destruct = function(pos, node, player)
end end
banners.banner_after_place = function (pos, player, itemstack, pointed_thing) banners.banner_after_place = function (pos, player, itemstack, pointed_thing)
minetest.get_node(pos).param2 = banners.determine_flag_direction(pos, pointed_thing) core.get_node(pos).param2 = banners.determine_flag_direction(pos, pointed_thing)
minetest.get_meta(pos):set_string("banner", itemstack:get_meta():get_string("")) core.get_meta(pos):set_string("banner", itemstack:get_meta():get_string(""))
minetest.add_entity(pos, "banners:banner_ent") core.add_entity(pos, "banners:banner_ent")
end end
-- banner entity -- banner entity
@ -193,8 +203,8 @@ end
banners.banner_on_activate = function(self) banners.banner_on_activate = function(self)
local pos = self.object:get_pos() local pos = self.object:get_pos()
local banner = minetest.get_meta(pos):get_string("banner") local banner = core.get_meta(pos):get_string("banner")
local banner_face = minetest.get_node(pos).param2 local banner_face = core.get_node(pos).param2
local yaw = 0. local yaw = 0.
if banner_face == 2 then if banner_face == 2 then
yaw = 0. yaw = 0.
@ -211,7 +221,7 @@ banners.banner_on_activate = function(self)
end end
end end
minetest.register_entity("banners:banner_ent", { core.register_entity("banners:banner_ent", {
initial_properties = { initial_properties = {
collisionbox = { 0, 0, 0, 0, 0, 0 }, collisionbox = { 0, 0, 0, 0, 0, 0 },
visual = "mesh", visual = "mesh",
@ -221,8 +231,8 @@ minetest.register_entity("banners:banner_ent", {
on_activate = banners.banner_on_activate, on_activate = banners.banner_on_activate,
}) })
if minetest.get_modpath("factions") then
dofile(minetest.get_modpath("banners").."/factions.lua") dofile(minetest.get_modpath("banners").."/factions.lua")
if core.get_modpath("factions") then
end end
dofile(minetest.get_modpath("banners").."/items.lua") dofile(minetest.get_modpath("banners").."/items.lua")

31
items.lua
View File

@ -2,44 +2,35 @@
-- items -- items
minetest.register_craftitem("banners:banner_sheet", core.register_craftitem("banners:banner_sheet", {
{
groups = {}, groups = {},
description = "Banner sheet", description = "Banner sheet",
inventory_image = "banner_sheet.png", inventory_image = "banner_sheet.png",
stack_max = 1, stack_max = 1,
metadata = "", metadata = "",
} })
)
minetest.register_craftitem("banners:wooden_pole", core.register_craftitem("banners:wooden_pole", {
{
groups = {}, groups = {},
description = "Wooden pole", description = "Wooden pole",
inventory_image = "wooden_pole.png" inventory_image = "wooden_pole.png"
} })
)
minetest.register_craftitem("banners:wooden_base", core.register_craftitem("banners:wooden_base", {
{
groups = {}, groups = {},
description = "Wooden base", description = "Wooden base",
inventory_image = "wooden_base.png" inventory_image = "wooden_base.png"
} })
)
minetest.register_craftitem("banners:steel_pole", core.register_craftitem("banners:steel_pole", {
{
groups = {}, groups = {},
description = "Steel pole", description = "Steel pole",
inventory_image = "steel_pole.png" inventory_image = "steel_pole.png"
} })
)
minetest.register_craftitem("banners:steel_base", core.register_craftitem("banners:steel_base", {
{
groups = {}, groups = {},
description = "Steel base", description = "Steel base",
inventory_image = "steel_base.png" inventory_image = "steel_base.png"
} })
)

12
nodes.lua
View File

@ -1,6 +1,5 @@
-- da wooden banner -- da wooden banner
minetest.register_node("banners:wooden_banner", core.register_node("banners:wooden_banner", {
{
drawtype = "mesh", drawtype = "mesh",
mesh = "banner_support.x", mesh = "banner_support.x",
tiles = { "banner_support.png" }, tiles = { "banner_support.png" },
@ -23,12 +22,10 @@ minetest.register_node("banners:wooden_banner",
on_dig = function(pos, n, p) on_dig = function(pos, n, p)
banners.banner_on_dig(pos, n, p) banners.banner_on_dig(pos, n, p)
end end
} })
)
-- steel banner -- steel banner
minetest.register_node("banners:steel_banner", core.register_node("banners:steel_banner", {
{
drawtype = "mesh", drawtype = "mesh",
mesh = "banner_support.x", mesh = "banner_support.x",
tiles = { "steel_support.png" }, tiles = { "steel_support.png" },
@ -52,6 +49,5 @@ minetest.register_node("banners:steel_banner",
banners.banner_on_dig(pos, n, p) banners.banner_on_dig(pos, n, p)
end end
} })
)

277
smartfs.lua
View File

@ -37,7 +37,7 @@ function smartfs.override_load_checks()
smartfs._loaded_override = true smartfs._loaded_override = true
end end
minetest.after(0, function() core.after(0, function()
smartfs.loaded = true smartfs.loaded = true
end) end)
function smartfs.dynamic(name,player) function smartfs.dynamic(name,player)
@ -68,8 +68,8 @@ function smartfs.inventory_mod()
end end
end end
function smartfs.add_to_inventory(form,icon,title)
if unified_inventory then if unified_inventory then
function smartfs.add_to_inventory(form, icon, title)
unified_inventory.register_button(form.name, { unified_inventory.register_button(form.name, {
type = "image", type = "image",
image = icon, image = icon,
@ -83,10 +83,10 @@ function smartfs.add_to_inventory(form,icon,title)
}) })
return true return true
elseif inventory_plus then elseif inventory_plus then
minetest.register_on_joinplayer(function(player) core.register_on_joinplayer(function(player)
inventory_plus.register_button(player, form.name, title) inventory_plus.register_button(player, form.name, title)
end) end)
minetest.register_on_player_receive_fields(function(player, formname, fields) core.register_on_player_receive_fields(function(player, formname, fields)
if formname == "" and fields[form.name] then if formname == "" and fields[form.name] then
local name = player:get_player_name() local name = player:get_player_name()
local opened = smartfs._show_(form, name, nil, true) local opened = smartfs._show_(form, name, nil, true)
@ -128,19 +128,21 @@ function smartfs._makeState_(form,player,params,is_inv)
_show_ = function(self) _show_ = function(self)
if self.is_inv then if self.is_inv then
if unified_inventory then if unified_inventory then
unified_inventory.set_inventory_formspec(minetest.get_player_by_name(self.player), self.def.name)
elseif inventory_plus then elseif inventory_plus then
inventory_plus.set_inventory_formspec(minetest.get_player_by_name(self.player), self:_getFS_(true)) unified_inventory.set_inventory_formspec(
core.get_player_by_name(self.player), self.def.name)
inventory_plus.set_inventory_formspec(
core.get_player_by_name(self.player), self:_getFS_(true))
end end
else else
local res = self:_getFS_(true) local res = self:_getFS_(true)
minetest.show_formspec(player,form.name,res) core.show_formspec(player, form.name, res)
end end
end, end,
load = function(self,file) load = function(self,file)
local file = io.open(file, "r") local file = io.open(file, "r")
if file then if file then
local table = minetest.deserialize(file:read("*all")) local table = core.deserialize(file:read("*all"))
if type(table) == "table" then if type(table) == "table" then
if table.size then if table.size then
self._size = table.size self._size = table.size
@ -166,7 +168,7 @@ function smartfs._makeState_(form,player,params,is_inv)
local file = io.open(file, "w") local file = io.open(file, "w")
if file then if file then
file:write(minetest.serialize(res)) file:write(core.serialize(res))
file:close() file:close()
return true return true
end end
@ -183,38 +185,92 @@ function smartfs._makeState_(form,player,params,is_inv)
end, end,
button = function(self, x, y, w, h, name, text, exitf) button = function(self, x, y, w, h, name, text, exitf)
if exitf == nil then exitf = false end if exitf == nil then exitf = false end
return self:element("button",{pos={x=x,y=y},size={w=w,h=h},name=name,value=text,closes=exitf}) return self:element("button", {
pos = { x = x, y = y },
size = { w = w, h = h },
name = name,
value = text,
closes = exitf
})
end, end,
label = function(self, x, y, name, text) label = function(self, x, y, name, text)
return self:element("label",{pos={x=x,y=y},name=name,value=text}) return self:element("label", {
pos = { x = x, y = y },
name = name,
value = text
})
end, end,
toggle = function(self, x, y, w, h, name, list) toggle = function(self, x, y, w, h, name, list)
return self:element("toggle",{pos={x=x,y=y},size={w=w,h=h},name=name,id=1,list=list}) return self:element("toggle", {
pos = { x = x, y = y },
size = { w = w, h = h },
name = name,
id = 1,
list = list
})
end, end,
field = function(self, x, y, w, h, name, label) field = function(self, x, y, w, h, name, label)
return self:element("field",{pos={x=x,y=y},size={w=w,h=h},name=name,value="",label=label}) return self:element("field", {
pos = { x = x, y = y },
size = { w = w, h = h },
name = name,
value = "",
label = label
})
end, end,
pwdfield = function(self, x, y, w, h, name, label) pwdfield = function(self, x, y, w, h, name, label)
local res = self:element("field",{pos={x=x,y=y},size={w=w,h=h},name=name,value="",label=label}) local res = self:element("field", {
pos = { x = x, y = y },
size = { w = w, h = h },
name = name,
value = "",
label = label
})
res:isPassword(true) res:isPassword(true)
return res return res
end, end,
textarea = function(self, x, y, w, h, name, label) textarea = function(self, x, y, w, h, name, label)
local res = self:element("field",{pos={x=x,y=y},size={w=w,h=h},name=name,value="",label=label}) local res = self:element("field", {
pos = { x = x, y = y },
size = { w = w, h = h },
name = name,
value = "",
label = label
})
res:isMultiline(true) res:isMultiline(true)
return res return res
end, end,
image = function(self, x, y, w, h, name, img) image = function(self, x, y, w, h, name, img)
return self:element("image",{pos={x=x,y=y},size={w=w,h=h},name=name,value=img}) return self:element("image", {
pos = { x = x, y = y },
size = { w = w, h = h },
name = name,
value = img
})
end, end,
checkbox = function(self, x, y, name, label, selected) checkbox = function(self, x, y, name, label, selected)
return self:element("checkbox",{pos={x=x,y=y},name=name,value=selected,label=label}) return self:element("checkbox", {
pos = { x = x, y = y },
name = name,
value = selected,
label = label
})
end, end,
listbox = function(self, x, y, w, h, name, selected, transparent) listbox = function(self, x, y, w, h, name, selected, transparent)
return self:element("list", { pos={x=x,y=y}, size={w=w,h=h}, name=name, selected=selected, transparent=transparent }) return self:element("list", {
pos = { x = x, y = y },
size = { w = w, h = h },
name = name,
selected = selected,
transparent = transparent
})
end, end,
inventory = function(self, x, y, w, h, name) inventory = function(self, x, y, w, h, name)
return self:element("inventory", { pos={x=x,y=y}, size={w=w,h=h}, name=name }) return self:element("inventory", {
pos = { x = x, y = y },
size = { w = w, h = h },
name = name
})
end, end,
element = function(self, typen, data) element = function(self, typen, data)
local type = smartfs._edef[typen] local type = smartfs._edef[typen]
@ -265,7 +321,7 @@ end
-- Receive fields from formspec -- Receive fields from formspec
local function _sfs_recieve_(state, name, fields) local function _sfs_recieve_(state, name, fields)
if (fields.quit == "true") then if fields.quit == "true" then
if not state.is_inv then if not state.is_inv then
smartfs.opened[name] = nil smartfs.opened[name] = nil
end end
@ -279,7 +335,7 @@ local function _sfs_recieve_(state,name,fields)
end end
for key,val in pairs(state._ele) do for key,val in pairs(state._ele) do
if val.submit then if val.submit then
if (val:submit(fields)==true) then if val:submit(fields) == true then
return true return true
end end
end end
@ -287,7 +343,8 @@ local function _sfs_recieve_(state,name,fields)
if state.closed ~= true then if state.closed ~= true then
state:_show_() state:_show_()
else else
minetest.show_formspec(name,"","size[5,1]label[0,0;Formspec closing not yet created!]") core.show_formspec(name, "",
"size[5,1]label[0,0;Formspec closing not yet created!]")
if not state.is_inv then if not state.is_inv then
smartfs.opened[name] = nil smartfs.opened[name] = nil
end end
@ -295,7 +352,7 @@ local function _sfs_recieve_(state,name,fields)
return true return true
end end
minetest.register_on_player_receive_fields(function(player, formname, fields) core.register_on_player_receive_fields(function(player, formname, fields)
local name = player:get_player_name() local name = player:get_player_name()
if smartfs.opened[name] and not smartfs.opened[name].is_inv then if smartfs.opened[name] and not smartfs.opened[name].is_inv then
if smartfs.opened[name].def.name == formname then if smartfs.opened[name].def.name == formname then
@ -319,38 +376,28 @@ end)
smartfs.element("button", { smartfs.element("button", {
build = function(self) build = function(self)
if self.data.img then if self.data.img then
return "image_button[".. return "image_button["
self.data.pos.x..","..self.data.pos.y.. .. self.data.pos.x .. "," .. self.data.pos.y
";".. .. ";" .. self.data.size.w .. "," ..self.data.size.h
self.data.size.w..","..self.data.size.h.. .. ";" .. self.data.img
";".. .. ";" .. self.name
self.data.img.. .. ";" .. self.data.value
";".. .. "]"
self.name..
";"..
self.data.value..
"]"
else else
if self.data.closes then if self.data.closes then
return "button_exit[".. return "button_exit["
self.data.pos.x..","..self.data.pos.y.. .. self.data.pos.x .. "," .. self.data.pos.y
";".. .. ";" .. self.data.size.w .. "," ..self.data.size.h
self.data.size.w..","..self.data.size.h.. .. ";" .. self.name
";".. .. ";" .. self.data.value
self.name.. .. "]"
";"..
self.data.value..
"]"
else else
return "button[".. return "button["
self.data.pos.x..","..self.data.pos.y.. .. self.data.pos.x .. "," .. self.data.pos.y
";".. .. ";" .. self.data.size.w .. "," .. self.data.size.h
self.data.size.w..","..self.data.size.h.. .. ";" .. self.name
";".. .. ";" .. self.data.value
self.name.. .. "]"
";"..
self.data.value..
"]"
end end
end end
end, end,
@ -400,15 +447,12 @@ smartfs.element("button",{
smartfs.element("toggle", { smartfs.element("toggle", {
build = function(self) build = function(self)
return "button[".. return "button["
self.data.pos.x..","..self.data.pos.y.. .. self.data.pos.x .. "," .. self.data.pos.y
";".. .. ";" .. self.data.size.w .. "," .. self.data.size.h
self.data.size.w..","..self.data.size.h.. .. ";" .. self.name
";".. .. ";" .. self.data.list[self.data.id]
self.name.. .. "]"
";"..
self.data.list[self.data.id]..
"]"
end, end,
submit = function(self,fields) submit = function(self,fields)
if fields[self.name] then if fields[self.name] then
@ -449,11 +493,10 @@ smartfs.element("toggle",{
smartfs.element("label", { smartfs.element("label", {
build = function(self) build = function(self)
return "label[".. return "label["
self.data.pos.x..","..self.data.pos.y.. .. self.data.pos.x .. "," .. self.data.pos.y
";".. .. ";" .. self.data.value
self.data.value.. .. "]"
"]"
end, end,
setPosition = function(self, x, y) setPosition = function(self, x, y)
self.data.pos = { x = x, y = y } self.data.pos = { x = x, y = y }
@ -472,39 +515,28 @@ smartfs.element("label",{
smartfs.element("field", { smartfs.element("field", {
build = function(self) build = function(self)
if self.data.ml then if self.data.ml then
return "textarea[".. return "textarea["
self.data.pos.x..","..self.data.pos.y.. .. self.data.pos.x .. "," .. self.data.pos.y
";".. .. ";" .. self.data.size.w .. "," .. self.data.size.h
self.data.size.w..","..self.data.size.h.. .. ";" .. self.name
";".. .. ";" .. self.data.label
self.name.. .. ";" .. self.data.value
";".. .. "]"
self.data.label..
";"..
self.data.value..
"]"
elseif self.data.pwd then elseif self.data.pwd then
return "pwdfield[".. return "pwdfield["
self.data.pos.x..","..self.data.pos.y.. .. self.data.pos.x .. "," .. self.data.pos.y
";".. .. ";" .. self.data.size.w .. "," .. self.data.size.h
self.data.size.w..","..self.data.size.h.. .. ";" .. self.name
";".. .. ";" .. self.data.label
self.name.. .. "]"
";"..
self.data.label..
"]"
else else
return "field[".. return "field["
self.data.pos.x..","..self.data.pos.y.. .. self.data.pos.x .. "," .. self.data.pos.y
";".. .. ";" .. self.data.size.w .. "," .. self.data.size.h
self.data.size.w..","..self.data.size.h.. .. ";" .. self.name
";".. .. ";" .. self.data.label
self.name.. .. ";" .. self.data.value
";".. .. "]"
self.data.label..
";"..
self.data.value..
"]"
end end
end, end,
setPosition = function(self, x, y) setPosition = function(self, x, y)
@ -535,13 +567,11 @@ smartfs.element("field",{
smartfs.element("image", { smartfs.element("image", {
build = function(self) build = function(self)
return "image[".. return "image["
self.data.pos.x..","..self.data.pos.y.. .. self.data.pos.x .. "," .. self.data.pos.y
";".. .. ";" .. self.data.size.w .. "," .. self.data.size.h
self.data.size.w..","..self.data.size.h.. .. ";" .. self.data.value
";".. .. "]"
self.data.value..
"]"
end, end,
setPosition = function(self, x, y) setPosition = function(self, x, y)
self.data.pos = { x = x, y = y } self.data.pos = { x = x, y = y }
@ -608,18 +638,14 @@ smartfs.element("list",{
if not self.data.items then if not self.data.items then
self.data.items = {} self.data.items = {}
end end
local listformspec = "textlist[".. local listformspec = "textlist["
self.data.pos.x..","..self.data.pos.y.. .. self.data.pos.x .. "," .. self.data.pos.y
";".. .. ";" .. self.data.size.w .. "," .. self.data.size.h
self.data.size.w..","..self.data.size.h.. .. ";" .. self.data.name
";".. .. ";" .. table.concat(self.data.items, ",")
self.data.name.. .. ";" .. tostring(self.data.selected or "")
";".. .. ";" .. tostring(self.data.transparent or "false")
table.concat(self.data.items, ",").. .. "]"
";"..
tostring(self.data.selected or "")..
";"..
tostring(self.data.transparent or "false").."]"
return listformspec return listformspec
end, end,
@ -682,17 +708,13 @@ smartfs.element("list",{
smartfs.element("inventory", { smartfs.element("inventory", {
build = function(self) build = function(self)
return "list[".. return "list["
(self.data.location or "current_player") .. .. (self.data.location or "current_player")
";".. .. ";" .. self.name
self.name.. .. ";" .. self.data.pos.x .. "," .. self.data.pos.y
";".. .. ";" .. self.data.size.w .. "," .. self.data.size.h
self.data.pos.x..","..self.data.pos.y.. .. ";" .. (self.data.index or "")
";".. .. "]"
self.data.size.w..","..self.data.size.h..
";"..
(self.data.index or "") ..
"]"
end, end,
setPosition = function(self, x, y) setPosition = function(self, x, y)
self.data.pos = { x = x, y = y } self.data.pos = { x = x, y = y }
@ -761,3 +783,4 @@ smartfs.element("code",{
return self.data.code return self.data.code
end end
}) })