Add leafs & fix list command

This commit is contained in:
Van
2026-02-22 22:01:22 +03:00
parent 745eaa8569
commit e0b9024458
6 changed files with 90 additions and 146 deletions

View File

@@ -4,43 +4,47 @@ local require = modInfo.require
---@type Formspec ---@type Formspec
local Formspec = require('Formspec') local Formspec = require('Formspec')
local listForm = Formspec:new({ local function getForm()
size = {x=21, y=12}, local listForm = Formspec:new({
}) size = {x=21, y=12},
})
listForm:list('current_player', 'main', 10.5, 6.5, 8, 4) listForm:list('current_player', 'main', 10.5, 6.5, 8, 4)
local listFormItems = Formspec:new() local listFormItems = Formspec:new()
local items = table.get_keys(core.registered_nodes) local items = table.get_keys(core.registered_nodes)
table.sort(items) table.sort(items)
local w, h = 0, 0 local w, h = 0, 0
---@param name string ---@param name string
for _, name in ipairs(items) do for _, name in ipairs(items) do
listFormItems:itemImageButton(w, h, 1, 1, name, name..'::item_button') listFormItems:itemImageButton(w, h, 1, 1, name, name..'::item_button')
w = w + 1 w = w + 1
if w > 9 then if w >= 9 then
w = 0 w = 0
h = h + 1 h = h + 1
end
end end
--listFormItems:list('current_player', 'main', 0, 0, 1, 32)
listForm:
scrollContainer(listFormItems, 0.5, 0.5, 9, 11, 'admin_commands:list_items', 'vertical'):
scrollbar(10, 0.5, 0.25, 10, 'vertical', 'admin_commands:list_items')
return listForm
end end
--listFormItems:list('current_player', 'main', 0, 0, 1, 32)
listForm:
scrollContainer(listFormItems, 0.5, 0.5, 9, 11, 'admin_commands:list_items', 'vertical'):
scrollbar(10, 0.5, 0.25, 10, 'vertical', 'admin_commands:list_items')
core.register_chatcommand('list', { core.register_chatcommand('list', {
privs = {server = true}, privs = {server = true},
func = function(name, param) func = function(name, param)
local player = core.get_player_by_name(name) local player = core.get_player_by_name(name)
core.show_formspec(name, 'admin_commands:list_form', listForm:toString()) core.show_formspec(name, 'admin_commands:list_form', getForm():toString())
return true, '' return true, ''
end end

View File

@@ -1,2 +1,2 @@
name = smc__core__admin_commands name = smc__core__admin_commands
depends = smc__system__system_loader, smc__core__formspec, smc__core__item depends = smc__system__system_loader, smc__core__formspec

View File

@@ -1,3 +1,3 @@
name = smc__game__items__items_loader name = smc__game__items__items_loader
description = Include this mod in your `depends` to ensure all items are registered description = Include this mod in your `depends` to ensure all items are registered
depends = smc__game__items__rocks, smc__game__items__wood, smc__game__items__soils, smc__game__items__liquids depends = smc__game__items__rocks, smc__game__items__wood, smc__game__items__soils, smc__game__items__liquids, smc__game__items__plants

View File

@@ -5,39 +5,54 @@ local Node = Mod.getInfo('smc__core__node').require('Node')
local TileSheet = Mod.getInfo('smc__core__tilesheet').require('TileSheet') local TileSheet = Mod.getInfo('smc__core__tilesheet').require('TileSheet')
---@type Node.NodeDefinition ---@type Node.NodeDefinition
local defaultRockDef = { local defaultLogDef = {
settings = { settings = {
name = "", name = '',
_description = "A log",
tiles = {}, tiles = {},
groups = { groups = {
dig_immediate = 2, dig_immediate = 2,
}, },
paramtype2 = "facedir", paramtype2 = 'facedir',
}, },
} }
---@type Node.NodeDefinition ---@type Node.NodeDefinition
local defaultPlanksDef = { local defaultPlanksDef = {
settings = { settings = {
name = "", name = '',
_description = "A planks",
tiles = {}, tiles = {},
groups = { groups = {
dig_immediate = 2, dig_immediate = 2,
}, },
paramtype2 = "facedir", paramtype2 = 'facedir',
}, },
} }
local defaultLog = Node:getExtended(defaultRockDef) ---@type Node.NodeDefinition
local defaultLeafsDef = {
settings = {
drawtype = 'allfaces_optional',
name = '',
tiles = {},
groups = {
dig_immediate = 2,
},
--paramtype = 'light',
paramtype2 = 'facedir',
use_texture_alpha = 'clip',
sunlight_propagates = true,
},
}
local defaultLog = Node:getExtended(defaultLogDef)
local defaultPlanks = Node:getExtended(defaultPlanksDef) local defaultPlanks = Node:getExtended(defaultPlanksDef)
local defaultLeafs = Node:getExtended(defaultLeafsDef)
local logFactory = defaultLog:getFactory() local logFactory = defaultLog:getFactory()
local planksFactory = defaultPlanks:getFactory() local planksFactory = defaultPlanks:getFactory()
---@type TileSheet ---@type TileSheet
local logTileSheet = TileSheet:new("wood_sheet.png", 16, 16) local logTileSheet = TileSheet:new('wood_sheet.png', 16, 16)
local function getLogTiles(x, y) local function getLogTiles(x, y)
return { return {
@@ -47,126 +62,51 @@ local function getLogTiles(x, y)
} }
end end
local t = getLogTiles local t = logTileSheet
logFactory:registerItems({ local function registerWood(name, x)
---@type Node.NodeDefinition defaultLog:new({
{
settings = { settings = {
name = "marentine_log", name = name..'_log',
_title = "Marentine Log", tiles = getLogTiles(x, 1)
--description = "",
tiles = t(0, 1),
}, },
}, })
---@type Node.NodeDefinition
{
settings = {
name = "allwhere_log",
_title = "Allwhere Log",
--description = "",
tiles = t(2, 1),
},
},
---@type Node.NodeDefinition
{
settings = {
name = "fis_log",
_title = "Fis Log",
--description = "",
tiles = t(4, 1),
},
},
---@type Node.NodeDefinition
{
settings = {
name = "tammoy_log",
_title = "Tammoy Log",
--description = "",
tiles = t(6, 1),
},
},
---@type Node.NodeDefinition
{
settings = {
name = "dallalia_log",
_title = "Dallalia Log",
--description = "",
tiles = t(8, 1),
},
},
---@type Node.NodeDefinition
{
settings = {
name = "zuph_log",
_title = "Zuph Log",
--description = "",
tiles = t(10, 1),
},
},
})
planksFactory:registerItems({ defaultLog:new({
---@type Node.NodeDefinition
{
settings = { settings = {
name = "marentine_planks", name = name..'_trunk',
_title = "Marentine Planks", tiles = getLogTiles(x, 1),
--description = "", inventory_overlay = 'wood_trunk_overlay.png',
tiles = { logTileSheet:t(0, 4) }, drop = 'wood:'..name..'_log'
}, },
}, })
---@type Node.NodeDefinition
{ defaultPlanks:new({
settings = { settings = {
name = "allwhere_planks", name = name..'_planks',
_title = "Allwhere Planks", tiles = { logTileSheet:t(x, 4) },
--description = "",
tiles = { logTileSheet:t(2, 4) },
}, },
}, })
---@type Node.NodeDefinition
{ defaultLeafs:new({
settings = { settings = {
name = "fis_planks", name = name..'_leafs',
_title = "Fis Planks", tiles = { logTileSheet:t(x, 0) },
--description = "",
tiles = { logTileSheet:t(4, 4) },
}, },
}, })
---@type Node.NodeDefinition end
{
settings = { registerWood('marentine', 0)
name = "tammoy_planks", registerWood('allwhere', 2)
_title = "Tammoy Planks", registerWood('fis', 4)
--description = "", registerWood('tammoy', 6)
tiles = { logTileSheet:t(6, 4) }, registerWood('dallalia', 8)
}, registerWood('zuph', 10)
},
---@type Node.NodeDefinition
{
settings = {
name = "dallalia_planks",
_title = "Dallalia Planks",
--description = "",
tiles = { logTileSheet:t(8, 4) },
},
},
---@type Node.NodeDefinition
{
settings = {
name = "zuph_planks",
_title = "Zuph Planks",
--description = "",
tiles = { logTileSheet:t(10, 4) },
},
},
})
-- сундучки -- сундучки
---@type TileSheet ---@type TileSheet
local caseTileSheet = TileSheet:new("cases_sheet.png", 16, 16) local caseTileSheet = TileSheet:new('cases_sheet.png', 16, 16)
local function getCaseTiles(x, y) local function getCaseTiles(x, y)
return { return {
@@ -182,22 +122,22 @@ planksFactory:registerItems({
---@type Node.NodeDefinition ---@type Node.NodeDefinition
{ {
settings = { settings = {
name = "case_closed", name = 'case_closed',
_title = "Case", _title = 'Case',
--description = "", --description = '',
tiles = t(0,0) tiles = t(0,0)
}, },
}, },
---@type Node.NodeDefinition ---@type Node.NodeDefinition
{ {
settings = { settings = {
name = "case_open", name = 'case_open',
_title = "Case", _title = 'Case',
--description = "", --description = '',
tiles = t(1,0); tiles = t(1,0);
drawtype = 'nodebox'; drawtype = 'nodebox';
node_box = { node_box = {
type = "fixed", type = 'fixed',
fixed = { fixed = {
{-0.5, -0.5, -0.5, 0.5, 0.5 - 1/16*2, 0.5}, {-0.5, -0.5, -0.5, 0.5, 0.5 - 1/16*2, 0.5},
} }

Binary file not shown.

Before

Width:  |  Height:  |  Size: 122 KiB

After

Width:  |  Height:  |  Size: 122 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.2 KiB