From 08d40c8780a7488879e2d63e2b33cccb27b432d4 Mon Sep 17 00:00:00 2001 From: Starbeamrainbowlabs Date: Sat, 17 Sep 2022 23:42:46 +0100 Subject: [PATCH] fix warnings --- worldeditadditions/utils/bit.lua | 4 ++-- worldeditadditions/utils/format/human_size.lua | 2 +- worldeditadditions/utils/numbers.lua | 4 ++-- worldeditadditions/utils/tables/table_unpack.lua | 2 ++ worldeditadditions_core/core/lib/human_size.lua | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) diff --git a/worldeditadditions/utils/bit.lua b/worldeditadditions/utils/bit.lua index aac0427..fdde798 100644 --- a/worldeditadditions/utils/bit.lua +++ b/worldeditadditions/utils/bit.lua @@ -23,7 +23,7 @@ else powtab = { 1 } } for b = 1, bit_local.bits - 1 do - bit_local.powtab[#bit_local.powtab + 1] = math.pow(2, b) + bit_local.powtab[#bit_local.powtab + 1] = 2 ^ b end end @@ -68,7 +68,7 @@ end -- bit_local.bnot if not bit_local.bnot then bit_local.bnot = function(x) - return bit_local.bxor(x, math.pow((bit_local.bits or math.floor(math.log(x, 2))), 2) - 1) + return bit_local.bxor(x, (bit_local.bits or math.floor(math.log(x, 2)) ^ 2) - 1) end end diff --git a/worldeditadditions/utils/format/human_size.lua b/worldeditadditions/utils/format/human_size.lua index 7bb600c..543b6d8 100644 --- a/worldeditadditions/utils/format/human_size.lua +++ b/worldeditadditions/utils/format/human_size.lua @@ -8,6 +8,6 @@ function worldeditadditions.format.human_size(n, decimals) local sizes = { "", "K", "M", "G", "T", "P", "E", "Y", "Z" } local factor = math.floor((#tostring(n) - 1) / 3) local multiplier = 10^(decimals or 0) - local result = math.floor(0.5 + (n / math.pow(1000, factor)) * multiplier) / multiplier + local result = math.floor(0.5 + (n / (1000 ^ factor)) * multiplier) / multiplier return result .. sizes[factor+1] end diff --git a/worldeditadditions/utils/numbers.lua b/worldeditadditions/utils/numbers.lua index f8fb37c..1c09f9f 100644 --- a/worldeditadditions/utils/numbers.lua +++ b/worldeditadditions/utils/numbers.lua @@ -5,8 +5,8 @@ function worldeditadditions.round(num, numDecimalPlaces) end function worldeditadditions.hypotenuse(x1, y1, x2, y2) - local xSquare = math.pow(x1 - x2, 2); - local ySquare = math.pow(y1 - y2, 2); + local xSquare = (x1 - x2) ^ 2; + local ySquare = (y1 - y2) ^ 2; return math.sqrt(xSquare + ySquare); end diff --git a/worldeditadditions/utils/tables/table_unpack.lua b/worldeditadditions/utils/tables/table_unpack.lua index 9a38720..cc4c643 100644 --- a/worldeditadditions/utils/tables/table_unpack.lua +++ b/worldeditadditions/utils/tables/table_unpack.lua @@ -4,7 +4,9 @@ -- This is needed because in Lua 5.1 it's the global unpack(), but in Lua 5.4 -- it's moved to table.unpack(). local function table_unpack(tbl, offset, count) + ---@diagnostic disable-next-line: deprecated if type(unpack) == "function" then + ---@diagnostic disable-next-line: deprecated return unpack(tbl, offset, count) else return table.unpack(tbl, offset, count) diff --git a/worldeditadditions_core/core/lib/human_size.lua b/worldeditadditions_core/core/lib/human_size.lua index fa8dce3..c8e5bd1 100644 --- a/worldeditadditions_core/core/lib/human_size.lua +++ b/worldeditadditions_core/core/lib/human_size.lua @@ -10,7 +10,7 @@ local function human_size(n, decimals) local sizes = { "", "K", "M", "G", "T", "P", "E", "Y", "Z" } local factor = math.floor((#tostring(n) - 1) / 3) local multiplier = 10^(decimals or 0) - local result = math.floor(0.5 + (n / math.pow(1000, factor)) * multiplier) / multiplier + local result = math.floor(0.5 + (n / (1000 ^ factor)) * multiplier) / multiplier return result .. sizes[factor+1] end