From ef6c0d9fe6c103fcef7f3daaa2b5afb234a41ef6 Mon Sep 17 00:00:00 2001 From: Vanic Date: Thu, 22 Jan 2026 14:23:28 +0300 Subject: [PATCH] MapGen: add `getLayerByName()`. close #19 --- mods/CORE/MapGen/src/MapGen.lua | 40 ++++++++++++++++----------------- 1 file changed, 19 insertions(+), 21 deletions(-) diff --git a/mods/CORE/MapGen/src/MapGen.lua b/mods/CORE/MapGen/src/MapGen.lua index 74172d6..32e5969 100644 --- a/mods/CORE/MapGen/src/MapGen.lua +++ b/mods/CORE/MapGen/src/MapGen.lua @@ -81,6 +81,17 @@ function MapGen:new(def) return instance end +---Returns a layer by name. If such a layer does not exist, an error will be raised. +---@param layerName string The name of the layer to be retrieved. +---@return MapGen.Layer +function MapGen:getLayerByName(layerName) + local layer = self.layersByName[layerName] + + assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName)) + + return layer +end + ---Determines which layer a node belongs to based on its height coordinate. ---@param yPos number ---@return MapGen.Layer? @@ -127,9 +138,7 @@ end function MapGen:getPeakByPos(layer, category, pos) if type(layer) == 'string' then local layerName = layer - layer = self.layersByName[layerName] - - assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName)) + layer = self:getLayerByName(layerName) end pos = vector.new(pos) @@ -180,9 +189,7 @@ end function MapGen:getTriangleByPos2D(layer, category, pos) if type(layer) == 'string' then local layerName = layer - layer = self.layersByName[layerName] - - assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName)) + layer = self:getLayerByName(layerName) end for _, triangle in ipairs(layer.trianglesList[category]) do @@ -266,9 +273,7 @@ end ---@param noiseParams NoiseParams Fractal noise parameters. function MapGen:registerLayerNoiseColor(layerName, category, color, noiseParams) ---@type MapGen.Layer - local layer = self.layersByName[layerName] - - assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName)) + local layer = self:getLayerByName(layerName) layer:addNoiseParamsColor(category, color, noiseParams) end @@ -305,9 +310,7 @@ end ---@param def MapGen.PeakDef Peak description table, see details `MapGen.PeakDef`. function MapGen:registerPeak(layerName, category, def) ---@type MapGen.Layer - local layer = self.layersByName[layerName] - - assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName)) + local layer = self:getLayerByName(layerName) assert(self:getPeakByPos(layer, category, def.pos) == nil, ('In the `%s` layer in the `%s` category there is already a peak with coordinates: %s, %s, %s.'):format( @@ -389,9 +392,7 @@ end ---@param groups table Groups to be added. function MapGen:addGroupsToPeakByPos(layerName, category, pos, groups) ---@type MapGen.Layer - local layer = self.layersByName[layerName] - - assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName)) + local layer = self:getLayerByName(layerName) local peak = self:getPeakByPos(layer, category, pos) assert( peak ~= nil, ('In the `%s` layer in the `%s` category there is no peak with coordinates: %s, %s, %s.'):format( @@ -405,8 +406,7 @@ end ---@param biomeName string The name to be assigned to the biome. The name must be unique for each biome. ---@param def MapGen.BiomeDef Biome description table, see details `MapGen.BiomeDef` function MapGen:registerBiome(layerName, biomeName, def) - local layer = self.layersByName[layerName] - assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName)) + local layer = self:getLayerByName(layerName) local biome = Biome:new(biomeName, def) @@ -419,8 +419,7 @@ end ---@param def MapGen.CavernDef Cavern description table, see details `MapGen.CavernDef` ---@param regionVertices Position[]? The region to which the cave generation will be limited. function MapGen:registerCavern(layerName, cavernName, def, regionVertices) - local layer = self.layersByName[layerName] - assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName)) + local layer = self:getLayerByName(layerName) if regionVertices ~= nil then self:registerRegion(layerName, cavernName, { @@ -440,8 +439,7 @@ end ---@param regionName string The name to be assigned to the region. The name must be unique for each region. ---@param def MapGen.RegionDef Region description table, see details `MapGen.RegionDef` function MapGen:registerRegion(layerName, regionName, def) - local layer = self.layersByName[layerName] - assert(layer ~= nil, ('There is no layer named `%s` registered.'):format(layerName)) + local layer = self:getLayerByName(layerName) local region = Region:new(regionName, def)