From a699367bf446dd102124f19943a9563565fc0f1b Mon Sep 17 00:00:00 2001 From: Vanic Date: Mon, 8 Dec 2025 22:13:39 +0300 Subject: [PATCH] bruh commit --- mods/CORE/Player/mod.conf | 1 + mods/CORE/Sound/mod.conf | 1 + mods/ENVIRONMENT/MapGenerator/init.lua | 21 ++++-- .../MapGenerator/src/asyncInit.lua | 43 +++++++++++++ .../mapGenerator.lua} | 43 +------------ mods/GAME/ITEMS/Wood/init.lua | 60 +++++++++++++++++- .../ITEMS/Wood/textures/sheets/wood_sheet.png | Bin 124456 -> 124456 bytes 7 files changed, 120 insertions(+), 49 deletions(-) create mode 100644 mods/ENVIRONMENT/MapGenerator/src/asyncInit.lua rename mods/ENVIRONMENT/MapGenerator/{MapGenerator.lua => src/mapGenerator.lua} (79%) diff --git a/mods/CORE/Player/mod.conf b/mods/CORE/Player/mod.conf index ab7e42f..3ce3ec8 100644 --- a/mods/CORE/Player/mod.conf +++ b/mods/CORE/Player/mod.conf @@ -1 +1,2 @@ name = smc__core__player +depends = smc__api__api_loader diff --git a/mods/CORE/Sound/mod.conf b/mods/CORE/Sound/mod.conf index 4a525cb..c2e6bcc 100644 --- a/mods/CORE/Sound/mod.conf +++ b/mods/CORE/Sound/mod.conf @@ -1 +1,2 @@ name = smc__core__sound +depends = smc__api__api_loader \ No newline at end of file diff --git a/mods/ENVIRONMENT/MapGenerator/init.lua b/mods/ENVIRONMENT/MapGenerator/init.lua index 2d05db5..551884e 100644 --- a/mods/ENVIRONMENT/MapGenerator/init.lua +++ b/mods/ENVIRONMENT/MapGenerator/init.lua @@ -1,7 +1,18 @@ --- World generation runs in the mapgen environment (separate thread) --- The Mapgen environment is isolated from the main enviroment. +-- World generation occurs in a separate thread (MapGen Environment). +-- But for the main thread, the mapgenerator object is also initialized. -core.register_mapgen_script(core.get_modpath(core.get_current_modname())..'/MapGenerator.lua') +local mapGeneneratorRequire = Mod.getInfo('smc__core__map_generator').require + +-- Main env init +local mapGenerator = mapGeneneratorRequire('mapGenerator') + +-- Async env init +core.register_mapgen_script(core.get_modpath('smc__core__map_generator')..'/src/asyncInit.lua') + + +-- --- Register vanilla ores & decorations --- +-- For now, the generation does not have its own support +-- for the generation of ores and decorations, so vanilla ones are used. core.register_ore({ ore_type = "scatter", @@ -20,4 +31,6 @@ core.register_decoration({ sidelen = 8, fill_ratio = 0.1, decoration = "plants:plants", -}) \ No newline at end of file +}) + +return mapGenerator \ No newline at end of file diff --git a/mods/ENVIRONMENT/MapGenerator/src/asyncInit.lua b/mods/ENVIRONMENT/MapGenerator/src/asyncInit.lua new file mode 100644 index 0000000..9a42943 --- /dev/null +++ b/mods/ENVIRONMENT/MapGenerator/src/asyncInit.lua @@ -0,0 +1,43 @@ +-- MAPGEN ENVIROMENT ONLY +-- https://api.luanti.org/core-namespace-reference/#mapgen-environment + +-- This environment is isolated from the main environment, +-- so global tables need to be preloaded manually. + +-- --- Global APIs load -- +-- Api loader +dofile(core.get_modpath('smc__api__api_loader')..'/init.lua') + +-- Class +dofile(core.get_modpath('smc__api__class')..'/init.lua') + +-- Ensure +dofile(core.get_modpath('smc__api__ensure')..'/init.lua') + +-- Logger +dofile(core.get_modpath('smc__api__logger')..'/init.lua') + +-- Math +dofile(core.get_modpath('smc__api__math')..'/init.lua') + +-- Require +dofile(core.get_modpath('smc__api__require')..'/init.lua') + +-- Mod +dofile(core.get_modpath('smc__api__mod')..'/init.lua') + +-- TODO: исправить загрузку строковых библиотек (хотя они пока что не юзаются в мапгене) +-- Они не работают из-за get_current_modname внутри utf8 +-- UTF-8 +-- dofile(core.get_modpath('smc__api__utf8')..'/init.lua') + +-- String +-- dofile(core.get_modpath('smc__api__string')..'/init.lua') + +-- Table +dofile(core.get_modpath('smc__api__table')..'/init.lua') + +---@type MapGen +local mapGenerator = dofile(core.get_modpath('smc__core__map_generator')..'/src/mapGenerator.lua') + +mapGenerator:run() \ No newline at end of file diff --git a/mods/ENVIRONMENT/MapGenerator/MapGenerator.lua b/mods/ENVIRONMENT/MapGenerator/src/mapGenerator.lua similarity index 79% rename from mods/ENVIRONMENT/MapGenerator/MapGenerator.lua rename to mods/ENVIRONMENT/MapGenerator/src/mapGenerator.lua index 38e166b..d37ed7f 100644 --- a/mods/ENVIRONMENT/MapGenerator/MapGenerator.lua +++ b/mods/ENVIRONMENT/MapGenerator/src/mapGenerator.lua @@ -1,44 +1,3 @@ --- MAPGEN ENVIROMENT ONLY --- https://api.luanti.org/core-namespace-reference/#mapgen-environment - --- This environment is isolated from the main environment, --- so global tables need to be preloaded manually. - --- --- Global APIs load -- --- Api loader -dofile(core.get_modpath('smc__api__api_loader')..'/init.lua') - --- Class -dofile(core.get_modpath('smc__api__class')..'/init.lua') - --- Ensure -dofile(core.get_modpath('smc__api__ensure')..'/init.lua') - --- Logger -dofile(core.get_modpath('smc__api__logger')..'/init.lua') - --- Math -dofile(core.get_modpath('smc__api__math')..'/init.lua') - --- Require -dofile(core.get_modpath('smc__api__require')..'/init.lua') - --- Mod -dofile(core.get_modpath('smc__api__mod')..'/init.lua') - --- TODO: исправить загрузку строковых библиотек (хотя они пока что не юзаются в мапгене) --- Они не работают из-за get_current_modname внутри utf8 --- UTF-8 --- dofile(core.get_modpath('smc__api__utf8')..'/init.lua') - --- String --- dofile(core.get_modpath('smc__api__string')..'/init.lua') - --- Table -dofile(core.get_modpath('smc__api__table')..'/init.lua') - - - -- --- MapGen definiton --- local id = core.get_content_id @@ -271,4 +230,4 @@ mapGenerator:registerBiome('world', "biome2", { --generateSoil = generateSoil, }) -mapGenerator:run() \ No newline at end of file +return mapGenerator \ No newline at end of file diff --git a/mods/GAME/ITEMS/Wood/init.lua b/mods/GAME/ITEMS/Wood/init.lua index edb0c61..740ae2b 100644 --- a/mods/GAME/ITEMS/Wood/init.lua +++ b/mods/GAME/ITEMS/Wood/init.lua @@ -68,7 +68,7 @@ logFactory:registerItems({ tiles = t(2, 1), }, }, - ---@type Node.NodeDefinition + ---@type Node.NodeDefinition { settings = { name = "fis_log", @@ -77,6 +77,33 @@ logFactory:registerItems({ 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({ @@ -89,7 +116,7 @@ planksFactory:registerItems({ tiles = { logTileSheet:t(0, 4) }, }, }, - ---@type Node.NodeDefinition + ---@type Node.NodeDefinition { settings = { name = "allwhere_planks", @@ -98,7 +125,7 @@ planksFactory:registerItems({ tiles = { logTileSheet:t(2, 4) }, }, }, - ---@type Node.NodeDefinition + ---@type Node.NodeDefinition { settings = { name = "fis_planks", @@ -107,4 +134,31 @@ planksFactory:registerItems({ tiles = { logTileSheet:t(4, 4) }, }, }, + ---@type Node.NodeDefinition + { + settings = { + name = "tammoy_planks", + title = "Tammoy Planks", + --description = "", + tiles = { logTileSheet:t(6, 4) }, + }, + }, + ---@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) }, + }, + }, }) \ No newline at end of file diff --git a/mods/GAME/ITEMS/Wood/textures/sheets/wood_sheet.png b/mods/GAME/ITEMS/Wood/textures/sheets/wood_sheet.png index f1d673ac115e7168079f4906449a369d8938f438..2e3fdb2bccfbb542f95cc964847b103cffd86643 100644 GIT binary patch delta 6511 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 K@Ta=YU;YF>vA^{W^SeEz02R*-gzw`M;&dhS} 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 ZJjH)nxTecprvgpgriP6lRBik9{{fDU;~oG2