From 46427f565f781a74fdde766031d7acc18f7e961b Mon Sep 17 00:00:00 2001 From: Vanic Date: Fri, 13 Feb 2026 21:35:47 +0300 Subject: [PATCH] Submodules: update ide-helper --- .../src/CraftSystem/ImmersiveCraftStage/TappingStage.lua | 3 --- mods/CORE/MapGen/src/MapGen.lua | 6 +++--- mods/CORE/MapGen/src/MapGen/Peak.lua | 2 +- mods/CORE/MapGen/src/MapGen/Tetrahedron.lua | 1 + mods/CORE/MapGen/src/MapGen/Triangulation.lua | 1 + mods/CORE/MapGen/src/MapGen/Triangulation/FakePeak.lua | 2 +- util/ide-helper | 2 +- 7 files changed, 8 insertions(+), 9 deletions(-) diff --git a/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftStage/TappingStage.lua b/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftStage/TappingStage.lua index bbd000c..6b62b42 100644 --- a/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftStage/TappingStage.lua +++ b/mods/CORE/CraftSystem/src/CraftSystem/ImmersiveCraftStage/TappingStage.lua @@ -111,9 +111,6 @@ function TappingStage:new(def) -- Removing an entity from the world. entity:remove() - -- Clearing the crafting stage time table. - setStageDataByPos(pos) - -- We trigger an event that the crafting stage has been completed. Events.call('craft_system:next_immersive_stage:'..tappingStage.craftName, tappingStage, pos, Player) end diff --git a/mods/CORE/MapGen/src/MapGen.lua b/mods/CORE/MapGen/src/MapGen.lua index 570351d..c90af67 100644 --- a/mods/CORE/MapGen/src/MapGen.lua +++ b/mods/CORE/MapGen/src/MapGen.lua @@ -425,9 +425,9 @@ end function MapGen:registerPeak(layerName, category, def) 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( - layerName, category, def.pos.x, def.pos.y, def.pos.z)) + --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( + -- layerName, category, def.pos.x, def.pos.y, def.pos.z)) ---@type MapGen.Peak local peak = Peak:new(def) diff --git a/mods/CORE/MapGen/src/MapGen/Peak.lua b/mods/CORE/MapGen/src/MapGen/Peak.lua index cc2f152..d798a48 100644 --- a/mods/CORE/MapGen/src/MapGen/Peak.lua +++ b/mods/CORE/MapGen/src/MapGen/Peak.lua @@ -16,7 +16,7 @@ local Peak = { --- ---**Only for EmmyLua.** ---@class MapGen.PeakDef ----@field pos MapPosition +---@field pos MapPosition|vector ---@field color ColorString ---@field groups? table diff --git a/mods/CORE/MapGen/src/MapGen/Tetrahedron.lua b/mods/CORE/MapGen/src/MapGen/Tetrahedron.lua index c8457aa..9757837 100644 --- a/mods/CORE/MapGen/src/MapGen/Tetrahedron.lua +++ b/mods/CORE/MapGen/src/MapGen/Tetrahedron.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: param-type-not-match local mathAbs = math.abs local getInstance = Class.getInstance diff --git a/mods/CORE/MapGen/src/MapGen/Triangulation.lua b/mods/CORE/MapGen/src/MapGen/Triangulation.lua index 2c2cefc..f459944 100644 --- a/mods/CORE/MapGen/src/MapGen/Triangulation.lua +++ b/mods/CORE/MapGen/src/MapGen/Triangulation.lua @@ -1,3 +1,4 @@ +---@diagnostic disable: param-type-not-match -- Tringulation lib -- Original code: https://github.com/iskolbin/Triangulation/blob/master/Triangulation.lua -- Date of copying: 07.11.2025 diff --git a/mods/CORE/MapGen/src/MapGen/Triangulation/FakePeak.lua b/mods/CORE/MapGen/src/MapGen/Triangulation/FakePeak.lua index c12a183..bbbc7ca 100644 --- a/mods/CORE/MapGen/src/MapGen/Triangulation/FakePeak.lua +++ b/mods/CORE/MapGen/src/MapGen/Triangulation/FakePeak.lua @@ -14,7 +14,7 @@ local FakePeak = Class.extend(Peak, {}) ---Returns a fake `MapGen.Peak` that has no noise parameters. ---Note that the initialized peak should not be used in generation. ----@param peakPos vector +---@param peakPos MapPosition|vector ---@return MapGen.Peak function FakePeak:new(peakPos) local instance = Peak:new({pos = peakPos, color = '#000000'}) diff --git a/util/ide-helper b/util/ide-helper index 5d38041..f2e3431 160000 --- a/util/ide-helper +++ b/util/ide-helper @@ -1 +1 @@ -Subproject commit 5d3804168b0e07d52688c40e54fb2f56d09f80be +Subproject commit f2e3431251d7b239d29d8ebc8503287e84252219