diff --git a/mods/API/Mod/init.lua b/mods/API/Mod/init.lua index cb69137..71ec9ed 100644 --- a/mods/API/Mod/init.lua +++ b/mods/API/Mod/init.lua @@ -1,3 +1,4 @@ +-- TODO: ANNOTATE!!!!!!!!!! Mod = {} function Mod.getInfo() @@ -8,6 +9,10 @@ function Mod.getInfo() return {name = name, path = path, require = require} end +-- Mod. + +-- Mod Extend + function Mod:new() local mod = Mod.getInfo() diff --git a/mods/API/System/init.lua b/mods/API/System/init.lua index d170e85..eb9aa6c 100644 --- a/mods/API/System/init.lua +++ b/mods/API/System/init.lua @@ -16,7 +16,7 @@ local allowedDomains = { } --- Adds a mod to the global space under specified domain structure ----@param mod table The mod table containing functionality to expose -- TODO: !!!Make a Mod class!!! +---@param mod table The mod table containing functionality to expose -- TODO: !!!Describe a Mod class to EmmyLua!!! ---@param location string Dot-separated path within domain structure (e.g. "Items.Log") ---@param force boolean? Whether to overwrite the target location. Api.addModToGlobalSpace = function(mod, location, force) diff --git a/mods/CORE/Item/init.lua b/mods/CORE/Item/init.lua index c9afe9f..59c4b69 100644 --- a/mods/CORE/Item/init.lua +++ b/mods/CORE/Item/init.lua @@ -3,3 +3,5 @@ local Item = Mod:new() Item.Class = Item.require('Item') Api.addModToGlobalSpace(Item, 'Core.Item') + + diff --git a/mods/CORE/Item/src/Item.lua b/mods/CORE/Item/src/Item.lua index 352338e..fea2cd3 100644 --- a/mods/CORE/Item/src/Item.lua +++ b/mods/CORE/Item/src/Item.lua @@ -1,41 +1,52 @@ local Item = {} ---- @class ItemDefinition ---- @field settings table -local ItemDefinition = { - settings = { - name = '', - title = '', - description = '', - visual = '', -- '3d' | 'flat' - }, - callbacks = { - ... - }, -} - --- @param itemDef ItemDefinition local function itemDefToLuantiDef(itemDef) + itemDef = table.copy(itemDef) local s = itemDef.settings local c = itemDef.callbacks - local luantiDef = table.copy(c) + local description = s.title .. "\n" .. s.description + s.title, s.description = nil, description + + local luantiDef = table.merge(s, c) return luantiDef end local function register3dItem(luantiDef) local ld = luantiDef - core.register_node(ld.name, { - description = ld.description - }) + local name = ld.name + ld.name = nil + core.register_node(':'..name, luantiDef) end local function registerFlatItem(luantiDef) - + local ld = luantiDef + local name = ld.name + ld.name = nil + core.register_craftitem(':'..name, luantiDef) end function Item:new(itemDef) - local item = {} + local instance = {} + local luantiDef = itemDefToLuantiDef(itemDef) + local visual = itemDef.settings.visual + itemDef.settings.visual = nil - + if visual == '3d' then + register3dItem(luantiDef) + else + visual = 'flat' + registerFlatItem(luantiDef) + end + + function instance:getVisual() + return visual + end + + instance.itemDef = itemDef + instance.luantiDef = luantiDef + return instance end + +return Item diff --git a/mods/CORE/Item/src/ItemDefinition.lua b/mods/CORE/Item/src/ItemDefinition.lua new file mode 100644 index 0000000..e89f3b2 --- /dev/null +++ b/mods/CORE/Item/src/ItemDefinition.lua @@ -0,0 +1,15 @@ +--- @class ItemDefinition +--- @field settings table +local ItemDefinition = { + settings = { + name = '', + title = '', -- 1st line of item description + description = '', -- the rest of item description + visual = '', -- '3d' | 'flat' + ... + }, + callbacks = { + }, +} + +return ItemDefinition diff --git a/mods/CORE/MapGen/init.lua b/mods/CORE/MapGen/init.lua new file mode 100644 index 0000000..25af6e5 --- /dev/null +++ b/mods/CORE/MapGen/init.lua @@ -0,0 +1,7 @@ +local MapGen = Mod:new() +local require = MapGen.require + +MapGen.Class = require('MapGen') +MapGen.Class:enable() + +Api.addModToGlobalSpace(MapGen, 'Core.MapGen') diff --git a/mods/CORE/MapGen/mod.conf b/mods/CORE/MapGen/mod.conf new file mode 100644 index 0000000..5eb2dcb --- /dev/null +++ b/mods/CORE/MapGen/mod.conf @@ -0,0 +1,2 @@ +name = smc__core__map_gen +depends = smc__api__system \ No newline at end of file diff --git a/mods/ENVIRONMENT/MapGen/src/MapGen.lua b/mods/CORE/MapGen/src/MapGen.lua similarity index 88% rename from mods/ENVIRONMENT/MapGen/src/MapGen.lua rename to mods/CORE/MapGen/src/MapGen.lua index 3a9e0fc..2ce6c76 100644 --- a/mods/ENVIRONMENT/MapGen/src/MapGen.lua +++ b/mods/CORE/MapGen/src/MapGen.lua @@ -1,19 +1,18 @@ local modInfo = Mod.getInfo() local require = modInfo.require -local MapGenUtils = require("MapGenUtils") -local Layer = require("Layer") -local Region2D = require("Region2D") -local Region3D = require("Region3D") +local MapGenUtils = require("MapGen.Utils") +local Layer = require("MapGen.Layer") +local Region2D = require("MapGen.Region.Region2D") +local Region3D = require("MapGen.Region.Region3D") local core, table, math = core, table, math -local pairs, ipairs = pairs, ipairs +local ipairs = pairs, ipairs +-- Main MapGen class +local MapGen = {} +MapGen.__index = MapGen --- Main MapGenerator class -local MapGenerator = {} -MapGenerator.__index = MapGenerator - -function MapGenerator:new() +function MapGen:new() return setmetatable({ layersByName = {}, layersList = {}, @@ -26,53 +25,53 @@ function MapGenerator:new() }, self) end -function MapGenerator:registerLayer(name, minY, maxY) +function MapGen:registerLayer(name, minY, maxY) local layer = Layer:new(name, minY, maxY) self.layersByName[name] = layer table.insert(self.layersList, layer) return layer end -function MapGenerator:register2DRegion(params) +function MapGen:register2DRegion(params) local region = Region2D:new(params) local layer = self.layersByName[params.layerName] if not layer then error("Invalid layer: " .. params.layerName) end layer:add2DRegion(region) end -function MapGenerator:register3DRegion(params) +function MapGen:register3DRegion(params) local region = Region3D:new(params) local layer = self.layersByName[params.layerName] if not layer then error("Invalid layer: " .. params.layerName) end layer:add3DRegion(region) end -function MapGenerator:enable() +function MapGen:enable() core.register_on_generated(function(...) self:onMapGenerated(...) end) end -- Main generation logic -function MapGenerator:onMapGenerated(minp, maxp, seed) +function MapGen:onMapGenerated(minp, maxp, seed) local vm, emin, emax = core.get_mapgen_object("voxelmanip") local area = VoxelArea:new{MinEdge=emin, MaxEdge=emax} local data = vm:get_data() - + -- Sort layers by maxY descending for processing priority table.sort(self.layersList, function(a, b) return a.maxY > b.maxY end) - + local terrainCache = self:process2DRegions(minp, maxp) self:process3DRegions(minp, maxp, data, area, terrainCache) - + vm:set_data(data) vm:calc_lighting() vm:write_to_map() end -function MapGenerator:process2DRegions(minp, maxp) +function MapGen:process2DRegions(minp, maxp) local cache = {} local width = maxp.x - minp.x + 1 local zSize = maxp.z - minp.z + 1 @@ -99,7 +98,7 @@ function MapGenerator:process2DRegions(minp, maxp) regionNoiseCache[region] = noiseCache end end - + for x = minp.x, maxp.x do cache[x] = {} for z = minp.z, maxp.z do @@ -107,17 +106,17 @@ function MapGenerator:process2DRegions(minp, maxp) for _, layer in ipairs(self.layersList) do local bestHeight, bestWeight = nil, 0.0 - + for _, region in ipairs(layer.regions2D) do local noiseCache = regionNoiseCache[region] local temp = noiseCache.temp[x][z] local humid = noiseCache.humid[x][z] - + if MapGenUtils.isInRange(temp, region.tempRange) and MapGenUtils.isInRange(humid, region.humidRange) then local tempWeight = MapGenUtils.calculateWeight(temp, region.tempRange.min, region.tempRange.max) local heightWeight = MapGenUtils.calculateWeight(humid, region.humidRange.min, region.humidRange.max) local weight = tempWeight * heightWeight - + if weight > bestWeight then local heightNoise = noiseCache.height[x][z] bestHeight = math.lerp( @@ -129,18 +128,18 @@ function MapGenerator:process2DRegions(minp, maxp) end end end - + if bestHeight then cache[x][z][layer] = math.floor(math.clamp(bestHeight, layer.minY, layer.maxY)) end end end end - + return cache end -function MapGenerator:process3DRegions(minp, maxp, data, area, terrainCache) +function MapGen:process3DRegions(minp, maxp, data, area, terrainCache) -- Precompute 3D noise for regions local region3DNoise = {} for _, layer in ipairs(self.layersList) do @@ -220,4 +219,4 @@ function MapGenerator:process3DRegions(minp, maxp, data, area, terrainCache) end end -return MapGenerator +return MapGen diff --git a/mods/ENVIRONMENT/MapGen/src/Layer.lua b/mods/CORE/MapGen/src/MapGen/Layer.lua similarity index 50% rename from mods/ENVIRONMENT/MapGen/src/Layer.lua rename to mods/CORE/MapGen/src/MapGen/Layer.lua index c472e34..e7d92ea 100644 --- a/mods/ENVIRONMENT/MapGen/src/Layer.lua +++ b/mods/CORE/MapGen/src/MapGen/Layer.lua @@ -20,3 +20,23 @@ end function Layer:add3DRegion(region) table.insert(self.regions3D, region) end + +function Layer:contains(x, y, z) + if y < self.minY or y > self.maxY then + return false + end + + for _, region in ipairs(self.regions2D) do + if region:contains2D(x, z) then + return true + end + end + + for _, region in ipairs(self.regions3D) do + if region:contains3D(x, y, z) then + return true + end + end + + return false +end diff --git a/mods/ENVIRONMENT/MapGen/src/Region.lua b/mods/CORE/MapGen/src/MapGen/Region.lua similarity index 100% rename from mods/ENVIRONMENT/MapGen/src/Region.lua rename to mods/CORE/MapGen/src/MapGen/Region.lua diff --git a/mods/ENVIRONMENT/MapGen/src/Region2D.lua b/mods/CORE/MapGen/src/MapGen/Region/Region2D.lua similarity index 100% rename from mods/ENVIRONMENT/MapGen/src/Region2D.lua rename to mods/CORE/MapGen/src/MapGen/Region/Region2D.lua diff --git a/mods/ENVIRONMENT/MapGen/src/Region3D.lua b/mods/CORE/MapGen/src/MapGen/Region/Region3D.lua similarity index 100% rename from mods/ENVIRONMENT/MapGen/src/Region3D.lua rename to mods/CORE/MapGen/src/MapGen/Region/Region3D.lua diff --git a/mods/ENVIRONMENT/MapGen/src/MapGenUtils.lua b/mods/CORE/MapGen/src/MapGen/Utils.lua similarity index 100% rename from mods/ENVIRONMENT/MapGen/src/MapGenUtils.lua rename to mods/CORE/MapGen/src/MapGen/Utils.lua diff --git a/mods/CORE/MapGen2/init.lua b/mods/CORE/MapGen2/init.lua new file mode 100644 index 0000000..254f3ea --- /dev/null +++ b/mods/CORE/MapGen2/init.lua @@ -0,0 +1,7 @@ +local MapGen = Mod:new() +local require = MapGen.require + +MapGen.Class = require('MapGen') +MapGen.Class:enable() + +Api.addModToGlobalSpace(MapGen, 'Core.MapGen') \ No newline at end of file diff --git a/mods/CORE/MapGen2/mod.conf b/mods/CORE/MapGen2/mod.conf new file mode 100644 index 0000000..5eb2dcb --- /dev/null +++ b/mods/CORE/MapGen2/mod.conf @@ -0,0 +1,2 @@ +name = smc__core__map_gen +depends = smc__api__system \ No newline at end of file diff --git a/mods/CORE/MapGen2/src/MapGen.lua b/mods/CORE/MapGen2/src/MapGen.lua new file mode 100644 index 0000000..05df692 --- /dev/null +++ b/mods/CORE/MapGen2/src/MapGen.lua @@ -0,0 +1,40 @@ +local MapGen = {} +MapGen.__index = MapGen + +function MapGen:new() + local instance = setmetatable({}, self) + instance.layers = {} + return instance +end + +function MapGen:RegisterLayer(layer) + Ensure.argNotNil(layer, 1, "MapGen:RegisterLayer") + Ensure.argType(layer.minHeight, "number", 1, "MapGen:RegisterLayer") + Ensure.argType(layer.maxHeight, "number", 2, "MapGen:RegisterLayer") + assert(layer.minHeight < layer.maxHeight, "minHeight must be less than maxHeight") + + table.insert(self.layers, layer) +end + +function MapGen:GenerateMap() + for _, layer in ipairs(self.layers) do + self:GenerateLayer(layer) + end +end + +function MapGen:GenerateLayer(layer) + -- Implement layer generation logic here + -- This will include processing 2D and 3D regions +end + +function MapGen:RegisterRegion2D(region) + Ensure.argNotNil(region, 1, "MapGen:RegisterRegion2D") + -- Additional validation and registration logic for 2D regions +end + +function MapGen:RegisterRegion3D(region) + Ensure.argNotNil(region, 1, "MapGen:RegisterRegion3D") + -- Additional validation and registration logic for 3D regions +end + +return MapGen \ No newline at end of file diff --git a/mods/CORE/MapGen2/src/MapGen/Layer.lua b/mods/CORE/MapGen2/src/MapGen/Layer.lua new file mode 100644 index 0000000..9fa6264 --- /dev/null +++ b/mods/CORE/MapGen2/src/MapGen/Layer.lua @@ -0,0 +1,42 @@ +local Layer = {} +Layer.__index = Layer + +function Layer:new(minHeight, maxHeight) + Ensure.argType(minHeight, 'number', 1, 'Layer:new') + Ensure.argType(maxHeight, 'number', 2, 'Layer:new') + Ensure.argNotNil(minHeight, 1, 'Layer:new') + Ensure.argNotNil(maxHeight, 2, 'Layer:new') + assert(minHeight < maxHeight, 'minHeight must be less than maxHeight') + + local layer = { + minHeight = minHeight, + maxHeight = maxHeight, + region2DList = {}, + region3DList = {} + } + + setmetatable(layer, self) + return layer +end + +function Layer:RegisterRegion2D(region2D) + Ensure.argNotNil(region2D, 1, 'Layer:RegisterRegion2D') + assert(region2D.minHeight >= self.minHeight and region2D.maxHeight <= self.maxHeight, 'Region2D height must be within layer boundaries') + table.insert(self.region2DList, region2D) +end + +function Layer:RegisterRegion3D(region3D) + Ensure.argNotNil(region3D, 1, 'Layer:RegisterRegion3D') + assert(region3D.minHeight >= self.minHeight and region3D.maxHeight <= self.maxHeight, 'Region3D height must be within layer boundaries') + table.insert(self.region3DList, region3D) +end + +function Layer:GetRegions2D() + return self.region2DList +end + +function Layer:GetRegions3D() + return self.region3DList +end + +return Layer \ No newline at end of file diff --git a/mods/CORE/MapGen2/src/MapGen/Region.lua b/mods/CORE/MapGen2/src/MapGen/Region.lua new file mode 100644 index 0000000..9370da2 --- /dev/null +++ b/mods/CORE/MapGen2/src/MapGen/Region.lua @@ -0,0 +1,34 @@ +local Region = {} +Region.__index = Region + +function Region:new(name, layer, allowedBiomes) + Ensure.stringArgNotEmpty(name, 1, "Region:new") + Ensure.argNotNil(layer, 2, "Region:new") + Ensure.argNotNil(allowedBiomes, 3, "Region:new") + + local instance = setmetatable({}, self) + instance.name = name + instance.layer = layer + instance.allowedBiomes = allowedBiomes + + return instance +end + +function Region:GetName() + return self.name +end + +function Region:GetLayer() + return self.layer +end + +function Region:GetAllowedBiomes() + return self.allowedBiomes +end + +function Region:IsBiomeAllowed(biome) + Ensure.stringArgNotEmpty(biome, 1, "Region:IsBiomeAllowed") + return self.allowedBiomes[biome] == true +end + +return Region \ No newline at end of file diff --git a/mods/CORE/MapGen2/src/MapGen/Region/Region2D.lua b/mods/CORE/MapGen2/src/MapGen/Region/Region2D.lua new file mode 100644 index 0000000..ae1bf1e --- /dev/null +++ b/mods/CORE/MapGen2/src/MapGen/Region/Region2D.lua @@ -0,0 +1,41 @@ +local modInfo = Mod.getInfo() +local require = modInfo.require +local Ensure = require("MapGen.Utils.Ensure") + +local Region2D = {} +Region2D.__index = Region2D + +function Region2D:new(name, layer, allowedBiomes, heightNoise, temperatureNoise, humidityNoise, heightVariance, temperatureVariance, humidityVariance) + Ensure.stringArgNotEmpty(name, 1, "Region2D:new") + Ensure.argNotNil(layer, 2, "Region2D:new") + Ensure.argType(allowedBiomes, "table", 3, "Region2D:new") + Ensure.argType(heightNoise, "table", 4, "Region2D:new") + Ensure.argType(temperatureNoise, "table", 5, "Region2D:new") + Ensure.argType(humidityNoise, "table", 6, "Region2D:new") + Ensure.argType(heightVariance, "table", 7, "Region2D:new") + Ensure.argType(temperatureVariance, "table", 8, "Region2D:new") + Ensure.argType(humidityVariance, "table", 9, "Region2D:new") + + local instance = setmetatable({}, self) + instance.name = name + instance.layer = layer + instance.allowedBiomes = allowedBiomes + instance.heightNoise = heightNoise + instance.temperatureNoise = temperatureNoise + instance.humidityNoise = humidityNoise + instance.heightVariance = heightVariance + instance.temperatureVariance = temperatureVariance + instance.humidityVariance = humidityVariance + + return instance +end + +function Region2D:GenerateTerrain(x, z) + -- Implement terrain generation logic based on noise and variances +end + +function Region2D:CheckBounds(y) + -- Implement boundary checking logic for the layer +end + +return Region2D \ No newline at end of file diff --git a/mods/CORE/MapGen2/src/MapGen/Region/Region3D.lua b/mods/CORE/MapGen2/src/MapGen/Region/Region3D.lua new file mode 100644 index 0000000..89c83bc --- /dev/null +++ b/mods/CORE/MapGen2/src/MapGen/Region/Region3D.lua @@ -0,0 +1,46 @@ +local Ensure = require("MapGen.Utils.Ensure") + +local Region3D = {} +Region3D.__index = Region3D + +function Region3D:new(name, layer, allowedBiomes, caveNoise, temperatureNoise, humidityNoise, temperatureVariance, humidityVariance) + Ensure.stringArgNotEmpty(name, 1, "Region3D:new") + Ensure.argNotNil(layer, 2, "Region3D:new") + Ensure.argType(allowedBiomes, "table", 3, "Region3D:new") + Ensure.argType(caveNoise, "table", 4, "Region3D:new") + Ensure.argType(temperatureNoise, "table", 5, "Region3D:new") + Ensure.argType(humidityNoise, "table", 6, "Region3D:new") + Ensure.argType(temperatureVariance, "table", 7, "Region3D:new") + Ensure.argType(humidityVariance, "table", 8, "Region3D:new") + + local instance = setmetatable({ + name = name, + layer = layer, + allowedBiomes = allowedBiomes, + caveNoise = caveNoise, + temperatureNoise = temperatureNoise, + humidityNoise = humidityNoise, + temperatureVariance = temperatureVariance, + humidityVariance = humidityVariance, + }, self) + + return instance +end + +function Region3D:Register() + -- Logic to register the 3D region within the specified layer +end + +function Region3D:ValidateBounds(minHeight, maxHeight) + -- Logic to validate that the region does not exceed the layer boundaries +end + +function Region3D:GenerateCaves() + -- Logic to generate caves based on the cave noise +end + +function Region3D:GenerateContents() + -- Logic to populate the region with contents based on temperature and humidity +end + +return Region3D \ No newline at end of file diff --git a/mods/CORE/MapGen2/src/MapGen/Utils.lua b/mods/CORE/MapGen2/src/MapGen/Utils.lua new file mode 100644 index 0000000..97801e4 --- /dev/null +++ b/mods/CORE/MapGen2/src/MapGen/Utils.lua @@ -0,0 +1,31 @@ +local Utils = {} + +function Utils.Clamp(value, min, max) + if value < min then + return min + elseif value > max then + return max + else + return value + end +end + +function Utils.Lerp(a, b, t) + return a + (b - a) * t +end + +function Utils.GenerateNoise(seed, x, y, scale) + local noise = core.get_perlin(seed, scale, 1, 0) + return noise:get2d({x, y}) +end + +function Utils.ValidateBiome(biome, allowedBiomes) + for _, allowedBiome in ipairs(allowedBiomes) do + if biome == allowedBiome then + return true + end + end + return false +end + +return Utils \ No newline at end of file diff --git a/mods/CORE/Node/init.lua b/mods/CORE/Node/init.lua index e69de29..bc8a6b9 100644 --- a/mods/CORE/Node/init.lua +++ b/mods/CORE/Node/init.lua @@ -0,0 +1,2 @@ + +---local Node = Core.Item:extend() diff --git a/mods/ENVIRONMENT/MapGen/init.lua b/mods/ENVIRONMENT/MapGen/init.lua deleted file mode 100644 index 847ec48..0000000 --- a/mods/ENVIRONMENT/MapGen/init.lua +++ /dev/null @@ -1,5 +0,0 @@ -local MapGen = Mod:new() - -MapGen.Class = MapGen.require('MapGen') - -Api.addModToGlobalSpace(MapGen, 'Core.MapGen') diff --git a/mods/ENVIRONMENT/MapGen/mod.conf b/mods/ENVIRONMENT/MapGen/mod.conf deleted file mode 100644 index 58a3dfc..0000000 --- a/mods/ENVIRONMENT/MapGen/mod.conf +++ /dev/null @@ -1,2 +0,0 @@ -name = smc__environment__map_gen -depends = smc__api__system \ No newline at end of file