Changed way too much before committing

Author: ThePython10110

.gitignore

@@ -0,0 +1 @@
+.qodo

.vscode/settings.json

@@ -1,11 +1,5 @@
 {
-    "Lua.workspace.library": [
-        "C:/Users/Nolan/AppData/Roaming/Code/User/globalStorage/sumneko.lua/addonManager/addons/minetest/module/library"
-    ],
-    "Lua.diagnostics.disable": [
-        "cast-local-type",
-        "undefined-field"
-    ],
+    "editor.inlineSuggest.showToolbar": "always",
     "Lua.diagnostics.globals": [
         "mcl_formspec",
         "mcl_item_id",
@@ -28,12 +22,36 @@
         "core",
         "better_commands",
         "better_command_blocks",
-        "mcl_gamemode",
-        "mcl_experience",
-        "awards",
+        "nether",
+        "vector",
+        "pipeworks",
+        "mcl_burning",
+        "fire_plus",
         "mcl_weather",
+        "weather_mod",
+        "mcl_damage",
         "weather",
-        "weather_mod"
+        "awards",
+        "mcl_craftguide",
+        "mcl_particles",
+        "screwdriver",
+        "mcl_autogroup",
+        "farming",
+        "hopper",
+        "stamina",
+        "mcl_banners",
+        "mcl_hunger",
+        "mcl_experience",
+        "mcl_gamemode"
+    ],
+    "Lua.diagnostics.disable": [
+        "undefined-field"
+    ],
+    "Lua.workspace.userThirdParty": [
+        "C:\\Portable\\LuaLSAddons"
+    ],
+    "Lua.workspace.library": [
+        "C:/Portable/LuaLSAddons/luanti-lls-definitions/library"
     ],
-    "Lua.workspace.checkThirdParty": false,
+    "Lua.workspace.checkThirdParty": false
 }

API/API.lua

@@ -1,12 +1,12 @@
----@alias contextTable {executor: minetest.ObjectRef, pos: vector.Vector, rot: vector.Vector, anchor: string, origin: string, [any]: any}
+---@alias contextTable {executor: core.ObjectRef, pos: vector.Vector, rot: vector.Vector, anchor: string, origin: string, [any]: any}
 ---@alias splitParam {[1]: integer, [2]: integer, [3]: string, type: string, any: string}
 ---@alias betterCommandFunc fun(name: string, param: string, context: contextTable): success: boolean, message: string?, count: number
 ---@alias betterCommandDef {description: string, param?: string, privs: table<string, boolean>, func: betterCommandFunc, real_func: betterCommandFunc?}
 
 --local bc = better_commands
 
 
-local modpath = minetest.get_modpath("better_commands")
+local modpath = core.get_modpath("better_commands")
 
 ---Runs a file
 ---@param file string
@@ -37,7 +37,7 @@ end
 
 better_commands.paused = false
 local timer = 0
-minetest.register_globalstep(function(dtime)
+core.register_globalstep(function(dtime)
     if better_commands.paused then return end
     timer = timer + dtime
     if timer > better_commands.settings.save_interval then
@@ -48,7 +48,7 @@ minetest.register_globalstep(function(dtime)
     end
 end)
 
-minetest.register_on_joinplayer(function(player)
+core.register_on_joinplayer(function(player)
     better_commands.sidebars[player:get_player_name()] = {}
 end)
 

API/damage.lua

@@ -1,31 +1,32 @@
 --local bc = better_commands
 
 ---Deals damage; copied from Mineclonia's mcl_util.deal_damage
----@param target minetest.ObjectRef
+---@param target core.ObjectRef
 ---@param damage integer
 ---@param reason table?
 ---@param damage_immortal? boolean
 function better_commands.deal_damage(target, damage, reason, damage_immortal)
+
 	local luaentity = target:get_luaentity()
 
 	if luaentity then
 		if luaentity.deal_damage then -- Mobs Redo/Mobs MC
-			--minetest.log("deal_damage")
+			--core.log("deal_damage")
 			luaentity:deal_damage(damage, reason or {type = "generic"})
 			return
         elseif luaentity.hurt then -- Animalia
-			--minetest.log("hurt/indicate_damage")
+			--core.log("hurt/indicate_damage")
             luaentity:hurt(damage)
             luaentity:indicate_damage()
             return
         elseif luaentity.health then -- Mobs Redo/Mobs MC/NSSM
 			-- local puncher = mcl_reason and mcl_reason.direct or target
 			-- target:punch(puncher, 1.0, {full_punch_interval = 1.0, damage_groups = {fleshy = damage}}, vector.direction(puncher:get_pos(), target:get_pos()), damage)
 			if luaentity.health > 0 then
-				--minetest.log("luaentity.health")
+				--core.log("luaentity.health")
 				luaentity.health = luaentity.health - damage
 				luaentity:check_for_death(reason)
-				--minetest.log(luaentity.health)
+				--core.log(luaentity.health)
 			end
 			return
 		end
@@ -35,15 +36,16 @@ function better_commands.deal_damage(target, damage, reason, damage_immortal)
 	local armorgroups = target:get_armor_groups()
 
 	if hp > 0 and armorgroups and (damage_immortal or not armorgroups.immortal) then
-		--minetest.log("set_hp")
+		--core.log("set_hp")
 		target:set_hp(hp - damage, reason)
 	end
-	--minetest.log("nothing")
+	--core.log("nothing")
 end
 
 -- Make sure players always die when /killed
-minetest.register_on_player_hpchange(function(player, hp_change, reason)
+core.register_on_player_hpchange(function(player, hp_change, reason)
     if reason.better_commands == "kill" then
+---@diagnostic disable-next-line: redundant-return-value
         return math.min(hp_change, -1000000000), true
     end
     return hp_change

API/entity.lua

@@ -1,14 +1,15 @@
 --local bc = better_commands
-local S = minetest.get_translator(minetest.get_current_modname())
+local S = core.get_translator(core.get_current_modname())
 
 ---Gets the name of an entity
----@param obj minetest.ObjectRef|vector.Vector
+---@param obj core.ObjectRef|vector.Vector
 ---@param no_id? boolean
 ---@return string
 function better_commands.get_entity_name(obj, no_id, no_format)
     if not obj.is_player then
         return S("Command Block")
     end
+    ---@cast obj -vector.Vector
     if obj:is_player() then
         local player_name = obj:get_player_name()
         if no_format then return player_name end
@@ -42,9 +43,10 @@ function better_commands.get_entity_name(obj, no_id, no_format)
 end
 
 ---Gets an entity's current rotation
----@param obj minetest.ObjectRef|vector.Vector
+---@param obj core.ObjectRef|vector.Vector
 ---@return vector.Vector
 function better_commands.get_entity_rotation(obj)
+---@diagnostic disable-next-line: param-type-mismatch
     if obj.is_player and obj:is_player() then
         return {x = obj:get_look_vertical(), y = obj:get_look_horizontal(), z = 0}
     elseif obj.get_rotation then
@@ -55,7 +57,7 @@ function better_commands.get_entity_rotation(obj)
 end
 
 ---Sets an entity's rotation
----@param obj minetest.ObjectRef|any
+---@param obj core.ObjectRef|any
 ---@param rotation vector.Vector
 function better_commands.set_entity_rotation(obj, rotation)
     if not obj.is_player then return end
@@ -68,11 +70,13 @@ function better_commands.set_entity_rotation(obj, rotation)
 end
 
 ---Takes an object and a position, returns the rotation at which the object points at the position
----@param obj minetest.ObjectRef|vector.Vector
+---@param obj core.ObjectRef|vector.Vector
 ---@param pos vector.Vector
 ---@return vector.Vector
 function better_commands.point_at_pos(obj, pos)
+---@diagnostic disable-next-line: param-type-mismatch
     local obj_pos = obj.get_pos and obj:get_pos() or obj
+---@diagnostic disable-next-line: param-type-mismatch
     if obj:is_player() then
         obj_pos.y = obj_pos.y + obj:get_properties().eye_height
     end
@@ -88,8 +92,8 @@ end
 ---@return contextTable?
 function better_commands.complete_context(name, context)
     if not context then context = {} end
-    context.executor = context.executor or minetest.get_player_by_name(name)
-    if not context.executor then minetest.log("error", "Missing executor") return end
+    context.executor = context.executor or core.get_player_by_name(name)
+    if not context.executor then core.log("error", "Missing executor") return end
     context.pos = context.pos or context.executor:get_pos()
     context.rot = context.rot or better_commands.get_entity_rotation(context.executor)
     --context.anchor = context.anchor or "feet"
@@ -98,7 +102,7 @@ function better_commands.complete_context(name, context)
 end
 
 function better_commands.entity_from_alias(alias, list)
-    if minetest.registered_entities[alias] then return alias end
+    if core.registered_entities[alias] then return alias end
     local entities = better_commands.unique_entities[alias]
     if not entities then return end
     if list then return entities end
@@ -139,7 +143,7 @@ end
 
 ---Handles rotation in various commands
 ---@param context contextTable
----@param victim minetest.ObjectRef|vector.Vector
+---@param victim core.ObjectRef|vector.Vector
 ---@param split_param splitParam[]
 ---@param i integer
 ---@return vector.Vector? result
@@ -165,12 +169,14 @@ function better_commands.get_tp_rot(context, victim, split_param, i)
             if split_param[i+1].type == "selector" then
                 local targets, err = better_commands.parse_selector(split_param[i+1], context, true)
                 if err or not targets then return nil, err end
+---@diagnostic disable-next-line: param-type-mismatch
                 local target_pos = targets[1].is_player and targets[1]:get_pos() or targets[1]
 ---@diagnostic disable-next-line: param-type-mismatch
                 victim_rot = better_commands.point_at_pos(victim, target_pos)
             elseif split_param[i+1][3] == "entity" and split_param[i+2].type == "selector" then
                 local targets, err = better_commands.parse_selector(split_param[i+2], context, true)
                 if err or not targets then return nil, err end
+---@diagnostic disable-next-line: param-type-mismatch
                 local target_pos = targets[1].is_player and targets[1]:get_pos() or targets[1]
 ---@diagnostic disable-next-line: param-type-mismatch
                 victim_rot = better_commands.point_at_pos(victim, target_pos)
@@ -188,15 +194,15 @@ function better_commands.get_tp_rot(context, victim, split_param, i)
 end
 
 ---Gets a player's gamemode
----@param player minetest.Player
+---@param player core.Player
 ---@return string?
 function better_commands.get_gamemode(player)
     if player.is_player and player:is_player() then
         local gamemode
         if better_commands.mcl then
             gamemode = mcl_gamemode.get_gamemode(player)
         else
-            gamemode = minetest.is_creative_enabled(player:get_player_name()) and "creative" or "survival"
+            gamemode = core.is_creative_enabled(player:get_player_name()) and "creative" or "survival"
         end
         return gamemode
     end

API/parsing.lua

@@ -1,15 +1,17 @@
 --local bc = better_commands
-local S = minetest.get_translator(minetest.get_current_modname())
+local S = core.get_translator(core.get_current_modname())
 
 ---Parses parameters out of a string
 ---@param str string
 ---@return splitParam[] split_param
 function better_commands.parse_params(str)
+    str = " "..str -- Don't ask
     local i = 1
     local tmp
     local found = {}
     -- selectors, @?[data]
     repeat
+        -- p, a, r, s, e, and n are obviously the selectors but I just like the fact that they include the word "parse" (it was even better before I added @n)
         tmp = {str:find("(@[parsen])%s*(%[.-%])", i)}
         if tmp[1] then
             i = tmp[2] + 1
@@ -54,7 +56,7 @@ function better_commands.parse_params(str)
     i = 1
     repeat
         -- modname:id count wear (everything but id optional)
-        tmp = {str:find("(%s[_%w]*:?[_%w]+)%s*(%d*)%s*(%d*)", i)}
+        tmp = {str:find("%s([_%w]*:?[_%w]+)%s*(%d*)%s*(%d*)", i)}
         if tmp[1] then
             tmp[1] = tmp[1] + 1 -- ignore the space
             local overlap
@@ -172,15 +174,15 @@ end
 ---@param selector_data splitParam
 ---@param context contextTable
 ---@param require_one? boolean
----@return (minetest.ObjectRef|vector.Vector)[]? results
+---@return (core.ObjectRef|vector.Vector)[]? results
 ---@return string? err
 ---@nodiscard
 function better_commands.parse_selector(selector_data, context, require_one)
     local caller = context.executor
     local pos = table.copy(context.pos)
     local result = {}
     if selector_data[3]:sub(1,1) ~= "@" then
-        local player = minetest.get_player_by_name(selector_data[3])
+        local player = core.get_player_by_name(selector_data[3])
         if not player then
             return nil, S("No player was found")
         else
@@ -204,13 +206,13 @@ function better_commands.parse_selector(selector_data, context, require_one)
         return {caller}
     end
     -- Always include players
-    for _, player in pairs(minetest.get_connected_players()) do
+    for _, player in pairs(core.get_connected_players()) do
         if player:get_pos() then
             table.insert(objects, player)
         end
     end
     if selector == "@e" or selector == "@n" then
-        for _, luaentity in pairs(minetest.luaentities) do
+        for _, luaentity in pairs(core.luaentities) do
             if luaentity.object:get_pos() then
                 table.insert(objects, luaentity.object)
             end
@@ -220,7 +222,7 @@ function better_commands.parse_selector(selector_data, context, require_one)
     if selector == "@r" or selector == "@p" then
         for _, arg in ipairs(arg_table) do
             if arg[1] == "type" and arg[2]:lower() ~= "player" then
-                for _, luaentity in pairs(minetest.luaentities) do
+                for _, luaentity in pairs(core.luaentities) do
                     if luaentity.object:get_pos() then
                         table.insert(objects, luaentity.object)
                     end
@@ -491,7 +493,7 @@ end
 
 ---Parses item data, returning an itemstack or err message
 ---@param item_data splitParam
----@return minetest.ItemStack? result
+---@return core.ItemStack? result
 ---@return string? err
 ---@nodiscard
 function better_commands.parse_item(item_data, ignore_count)
@@ -535,7 +537,7 @@ end
 
 ---Parses node data, returns node and metadata table
 ---@param item_data splitParam
----@return minetest.Node? node
+---@return core.Node? node
 ---@return table? metadata
 ---@return string? err
 ---@nodiscard
@@ -547,7 +549,7 @@ function better_commands.parse_node(item_data)
     if not itemstring then
         return nil, nil, S("Unknown node '@1'", item_data[3])
     end
-    if not minetest.registered_nodes[itemstring] then
+    if not core.registered_nodes[itemstring] then
         return nil, nil, S("'@1' is not a node", itemstring)
     end
     if item_data.type == "item" and not item_data.extra_data then
@@ -595,7 +597,7 @@ function better_commands.parse_time_string(time, absolute)
     -- The pattern shouldn't let through any negative numbers... but just in case
     if amount < 0 then return nil, S("Amount must not be negative") end
     if unit == "s" then
-        local tps = tonumber(minetest.settings:get("time_speed")) or 72
+        local tps = tonumber(core.settings:get("time_speed")) or 72
         amount = amount * tps / 3.6 -- (3.6s = 1 millihour)
     elseif unit == "d" then
         amount = amount * 24000
@@ -604,7 +606,7 @@ function better_commands.parse_time_string(time, absolute)
     end
 
     if not absolute then
-        result = (minetest.get_timeofday() + (amount/24000)) % 1
+        result = (core.get_timeofday() + (amount/24000)) % 1
     elseif better_commands.settings.acovg_time then
         result = ((amount + 6000)/24000) % 1
     else