v1.3

Author: ThePython10110

.gitignore

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

.luacheckrc

@@ -1,7 +1,7 @@
 read_globals = {
     "DIR_DELIM", "INIT",
 
-    "minetest", "core",
+    "core", "core",
     "dump", "dump2",
 
     "Raycast",

.vscode/settings.json

@@ -1,10 +1,57 @@
 {
-    "Lua.workspace.library": [
-        "/home/nolan/.config/Code/User/globalStorage/sumneko.lua/addonManager/addons/minetest/module/library"
+    "editor.inlineSuggest.showToolbar": "always",
+    "Lua.diagnostics.globals": [
+        "mcl_formspec",
+        "mcl_item_id",
+        "armor",
+        "bucket",
+        "mcl_buckets",
+        "mcl_armor",
+        "mcl_enchanting",
+        "default",
+        "mcl_sounds",
+        "mcl_util",
+        "mcl_potions",
+        "mcl_vars",
+        "playerphysics",
+        "mcl_playerinfo",
+        "mcl_bamboo",
+        "mcl_core",
+        "dump",
+        "ItemStack",
+        "core",
+        "better_commands",
+        "better_command_blocks",
+        "nether",
+        "vector",
+        "pipeworks",
+        "mcl_burning",
+        "fire_plus",
+        "mcl_weather",
+        "weather_mod",
+        "mcl_damage",
+        "weather",
+        "awards",
+        "mcl_craftguide",
+        "mcl_particles",
+        "screwdriver",
+        "mcl_autogroup",
+        "farming",
+        "hopper",
+        "stamina",
+        "mcl_banners",
+        "mcl_hunger",
+        "mcl_experience",
+        "mcl_gamemode"
     ],
     "Lua.diagnostics.disable": [
-        "undefined-field",
-        "cast-local-type"
+        "undefined-field"
+    ],
+    "Lua.workspace.userThirdParty": [
+        "C:\\Portable\\LuaLSAddons"
+    ],
+    "Lua.workspace.library": [
+        "C:/Portable/LuaLSAddons/luanti-lls-definitions/library"
     ],
     "Lua.workspace.checkThirdParty": false
 }

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## v1.3
+* Fixed a couple random things (commands can now begin with slashes again)
+
+## v1.2
+* Command blocks can be dug by hand.
+* Repeating command blocks with a missing/invalid command will no longer stop repeating.
+
 ## v1.1 (May 31, 2024)
 * Chain command blocks must now be facing the same direction as the previous command block to match ACOVG
 * Command block success messages are no longer replaced with "success"

init.lua

@@ -1,4 +1,4 @@
-local S = minetest.get_translator(minetest.get_current_modname())
+local S = core.get_translator(core.get_current_modname())
 
 better_command_blocks = {}
 
@@ -22,7 +22,7 @@ local mesecons_rules = {
 local already_run = {}
 
 ---Gets a metadata string or a fallback falue
----@param meta minetest.MetaDataRef
+---@param meta core.MetaDataRef
 ---@param key string
 ---@param fallback any
 ---@return any
@@ -42,13 +42,13 @@ local types = {
 
 ---Opens command block formspec
 ---@param pos vector.Vector
----@param node minetest.Node
----@param player minetest.Player
+---@param node core.Node
+---@param player core.Player
 local function on_rightclick(pos, node, player)
-    if not minetest.check_player_privs(player, "better_command_blocks") then return end
-    local meta = minetest.get_meta(pos)
+    if not core.check_player_privs(player, "better_command_blocks") then return end
+    local meta = core.get_meta(pos)
     local command = meta:get_string("_command")
-    local group = minetest.get_item_group(node.name, "command_block")
+    local group = core.get_item_group(node.name, "command_block")
     if not types[group] then return end
     local power = meta:get_string("_power") == "false" and "Always Active" or "Needs Power"
     local message = meta:get_string("_message")
@@ -60,28 +60,28 @@ local function on_rightclick(pos, node, player)
         "field[6.5,0.5;2,1;delay;Delay (seconds);",delay,"]",
         "field_close_on_enter[delay;false]",
         "button[8.5,0.5;1,1;set_delay;Set]",
-        "field[0.5,2;8,1;command;Command;",minetest.formspec_escape(command),"]",
+        "field[0.5,2;8,1;command;Command;",core.formspec_escape(command),"]",
         "field_close_on_enter[command;false]",
         "button[8.5,2;1,1;set_command;Set]",
         "button[0.5,3.5;3,1;type;",types[group][1],"]",
         "button[3.5,3.5;3,1;conditional;",types[group][2] and "Conditional" or "Unconditional","]",
         "button[6.5,3.5;3,1;power;",power,"]",
-        "textarea[0.5,5;9,1;;Previous output;",minetest.formspec_escape(message),"]",
+        "textarea[0.5,5;9,1;;Previous output;",core.formspec_escape(message),"]",
     })
     local player_name = player:get_player_name()
-    minetest.show_formspec(player_name, "better_command_blocks:"..minetest.pos_to_string(pos), formspec)
+    core.show_formspec(player_name, "better_command_blocks:"..core.pos_to_string(pos), formspec)
 end
 
 local command_block_itemstrings = {}
 
-minetest.register_on_player_receive_fields(function(player, formname, fields)
-    if not minetest.check_player_privs(player, "better_command_blocks") then return end
+core.register_on_player_receive_fields(function(player, formname, fields)
+    if not core.check_player_privs(player, "better_command_blocks") then return end
     -- better_command_blocks:(x,y,z)
-    local pos = minetest.string_to_pos(formname:match("^better_command_blocks:(%(%-?[%d%.]+,%-?[%d%.]+,%-?[%d%.]+%))$"))
+    local pos = core.string_to_pos(formname:match("^better_command_blocks:(%(%-?[%d%.]+,%-?[%d%.]+,%-?[%d%.]+%))$"))
     if not pos then return end
-    local meta = minetest.get_meta(pos)
-    local node = minetest.get_node(pos)
-    local group = minetest.get_item_group(node.name, "command_block")
+    local meta = core.get_meta(pos)
+    local node = core.get_node(pos)
+    local group = core.get_item_group(node.name, "command_block")
     if group < 1 then return end
     local show_formspec
     if fields.command then
@@ -100,11 +100,11 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
         if new_group == 4 or new_group == 7 then new_group = new_group - 3 end
         local new_node = table.copy(node)
         new_node.name = command_block_itemstrings[new_group]
-        minetest.swap_node(pos, new_node)
+        core.swap_node(pos, new_node)
         if new_group == 2 or new_group == 5 then
-            minetest.get_node_timer(pos):start(1)
+            core.get_node_timer(pos):start(1)
         else
-            minetest.get_node_timer(pos):stop()
+            core.get_node_timer(pos):stop()
         end
         if new_group == 2 or new_group == 5 then -- repeating
             if (tonumber(meta:get_string("_delay")) or 1) < 1 then
@@ -121,7 +121,7 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
         if new_group > 6 then new_group = new_group - 6 end
         local new_node = table.copy(node)
         new_node.name = command_block_itemstrings[new_group]
-        minetest.swap_node(pos, new_node)
+        core.swap_node(pos, new_node)
         show_formspec = true
     elseif fields.power then
         local result = fields.power == "Needs Power" and "false" or "true"
@@ -134,21 +134,21 @@ minetest.register_on_player_receive_fields(function(player, formname, fields)
         show_formspec = true
     end
     if show_formspec then
-        on_rightclick(pos, minetest.get_node(pos), player)
+        on_rightclick(pos, core.get_node(pos), player)
     end
 end)
 
 ---Checks for chain command blocks in front of the current command block
 ---@param pos vector.Vector
 local function check_for_chain(pos)
-    local dir = minetest.facedir_to_dir(minetest.get_node(pos).param2)
+    local dir = core.facedir_to_dir(core.get_node(pos).param2)
     local next = vector.add(dir, pos)
-    local next_group = minetest.get_item_group(minetest.get_node(next).name, "command_block")
-    local next_dir = minetest.facedir_to_dir(minetest.get_node(next).param2)
+    local next_group = core.get_item_group(core.get_node(next).name, "command_block")
+    local next_dir = core.facedir_to_dir(core.get_node(next).param2)
     if next_group == 0 then return end
     if dir ~= next_dir then return end
     if next_group == 3 or next_group == 6 then -- chain
-        local pos_string = minetest.pos_to_string(next)
+        local pos_string = core.pos_to_string(next)
         if not already_run[pos_string] then
             better_command_blocks.run(next)
         end
@@ -169,14 +169,14 @@ local function run_command(pos, meta, cmd_def, name, param, context)
     end]]
     meta:set_int("_success", (success == true and 1) or (success or 0))
     meta:set_string("_message", message or "")
-    meta:set_int("_count", count)
+    meta:set_int("_count", count or -1)
     if success == 1 and message and message ~= "" then
-        if minetest.settings:get_bool("better_command_blocks.command_block_output", true)
-        and minetest.settings:get_bool("better_commands.send_command_feedback", true) then
-            minetest.chat_send_all(minetest.colorize("#aaaaaa", S(
+        if core.settings:get_bool("better_command_blocks.command_block_output", true)
+        and core.settings:get_bool("better_commands.send_command_feedback", true) then
+            core.chat_send_all(core.colorize("#aaaaaa", S(
                 "[@1: @2]",
                 S("Command Block"),
-                minetest.strip_colors(message)
+                core.strip_colors(message)
             )))
         end
     end
@@ -186,18 +186,18 @@ end
 ---Triggers the command block
 ---@param pos vector.Vector
 function better_command_blocks.run(pos)
-    local node = minetest.get_node(pos)
-    local meta = minetest.get_meta(pos)
+    local node = core.get_node(pos)
+    local meta = core.get_meta(pos)
     if meta:get_string("_power") ~= "false" then
         if meta:get_string("_mesecons_active") ~= "true" then
             return
         end
     end
-    local group = minetest.get_item_group(node.name, "command_block")
+    local group = core.get_item_group(node.name, "command_block")
     if group > 3 then -- conditional
-        local dir = minetest.facedir_to_dir(node.param2)
+        local dir = core.facedir_to_dir(node.param2)
         local previous = pos - dir
-        if minetest.get_meta(previous):get_int("_success") < 1 then
+        if core.get_meta(previous):get_int("_success") < 1 then
             if group == 6 then -- chain
                 check_for_chain(pos)
             end
@@ -206,16 +206,16 @@ function better_command_blocks.run(pos)
     end
 
     if group == 3 or group == 6 then -- chain
-        local pos_string = minetest.pos_to_string(pos)
+        local pos_string = core.pos_to_string(pos)
         if already_run[pos_string] then return end
         already_run[pos_string] = true
-        minetest.after(0, function() already_run[pos_string] = nil end)
+        core.after(0, function() already_run[pos_string] = nil end)
     end
 
     local command = meta:get_string("_command")
     if command ~= "" then
-        local command_type, param = command:match("(%S+)%s+(.*)$")
-        local def = minetest.registered_chatcommands[command_type]
+        local command_type, param = command:match("%/?(%S+)%s+(.*)$")
+        local def = core.registered_chatcommands[command_type]
         if def then
             local name = meta:get_string("_name")
             -- Other mods' commands may require <name> to be a valid player name.
@@ -227,16 +227,15 @@ function better_command_blocks.run(pos)
                 executor = pos,
                 pos = pos,
                 command_block = true,
-                dir = minetest.facedir_to_dir(minetest.get_node(pos).param2),
+                dir = core.facedir_to_dir(core.get_node(pos).param2),
             }
             if better_commands then context = better_commands.complete_context(S("Command Block"), context) end
             if group == 2 or group == 5 then -- repeating
                 run_command(pos, meta, def, name, param, context)
-                minetest.get_node_timer(pos):start(tonumber(meta:get_string("_delay")) or 1)
             else
                 local delay = tonumber(meta:get_string("_delay")) or 0
                 if delay > 0 then
-                    minetest.after(delay, function()
+                    core.after(delay, function()
                         run_command(pos, meta, def, name, param, context)
                     end)
                 else
@@ -245,15 +244,18 @@ function better_command_blocks.run(pos)
             end
         end
     end
+    if group == 2 or group == 5 then -- repeating
+        core.get_node_timer(pos):start(tonumber(meta:get_string("_delay")) or 1)
+    end
 end
 
 ---Runs when activated by Mesecons
 ---@param pos vector.Vector
 local function mesecons_activate(pos)
-    local meta = minetest.get_meta(pos)
+    local meta = core.get_meta(pos)
     meta:set_string("_mesecons_active", "true")
     if meta:get_string("_power") ~= "false" then
-        local group = minetest.get_item_group(minetest.get_node(pos).name, "command_block")
+        local group = core.get_item_group(core.get_node(pos).name, "command_block")
         if group ~= 3 and group ~= 6 then
             better_command_blocks.run(pos)
         end
@@ -263,18 +265,18 @@ end
 ---Runs when deactivated by Mesecons
 ---@param pos vector.Vector
 local function mesecons_deactivate(pos)
-    local meta = minetest.get_meta(pos)
+    local meta = core.get_meta(pos)
     meta:set_string("_mesecons_active", "")
     if meta:get_string("_power") ~= "false" then
-        minetest.get_node_timer(pos):stop()
+        core.get_node_timer(pos):stop()
     end
 end
 
 for i, command_block in pairs(command_blocks) do
     local name, desc = unpack(command_block)
     local def = {
         description = desc,
-        groups = {cracky = 1, command_block = i, creative_breakable=1, mesecon_effector_off=1, mesecon_effector_on=1},
+        groups = {oddly_breakable_by_hand = 3, cracky = 3, command_block = i, creative_breakable=1, mesecon_effector_off=1, mesecon_effector_on=1},
         tiles = {
             {name = "better_command_blocks_"..name.."_top.png", animation = anim},
             {name = "better_command_blocks_"..name.."_bottom.png", animation = anim},
@@ -296,20 +298,20 @@ for i, command_block in pairs(command_blocks) do
         _mcl_blast_resistance = 3600000,
         _mcl_hardness = -1,
         can_dig = function(pos, player)
-            return minetest.check_player_privs(player, "better_command_blocks")
+            return core.check_player_privs(player, "better_command_blocks")
         end,
         drop = "",
         on_place = function(itemstack, player, pointed_thing)
-            if minetest.check_player_privs(player, "better_command_blocks") then
-                return minetest.item_place(itemstack, player, pointed_thing)
+            if core.check_player_privs(player, "better_command_blocks") then
+                return core.item_place(itemstack, player, pointed_thing)
             end
         end,
         after_place_node = function(pos, placer, itemstack, pointed_thing)
-            minetest.get_meta(pos):set_string("_player", placer:get_player_name())
+            core.get_meta(pos):set_string("_player", placer:get_player_name())
         end
     }
     local itemstring = "better_command_blocks:"..name.."_command_block"
-    minetest.register_node(itemstring, def)
+    core.register_node(itemstring, def)
     command_block_itemstrings[i] = itemstring
 
     local conditional_def = table.copy(def)
@@ -325,15 +327,15 @@ for i, command_block in pairs(command_blocks) do
         {name = "better_command_blocks_"..name.."_back.png", animation = anim},
     }
     itemstring = "better_command_blocks:"..name.."_command_block_conditional"
-    minetest.register_node(itemstring, conditional_def)
+    core.register_node(itemstring, conditional_def)
     command_block_itemstrings[i+3] = itemstring
 end
 
-minetest.register_alias("better_command_blocks:command_block", "better_command_blocks:impulse_command_block")
-minetest.register_alias("better_command_blocks:command_block_conditional", "better_command_blocks:impulse_command_block_conditional")
+core.register_alias("better_command_blocks:command_block", "better_command_blocks:impulse_command_block")
+core.register_alias("better_command_blocks:command_block_conditional", "better_command_blocks:impulse_command_block_conditional")
 
 ---@diagnostic disable-next-line: missing-fields
-minetest.register_privilege("better_command_blocks", {
+core.register_privilege("better_command_blocks", {
     description = S("Allows players to use Better Command Blocks"),
     give_to_singleplayer = false,
     give_to_admin = true

mod.conf

@@ -1,5 +1,5 @@
 name = better_command_blocks
 title = Better Command Blocks
 description = Adds command blocks similar to those of a certain other voxel game
-supported_games = minetest_game, mineclone2, mineclonia
+supported_games = *
 optional_depends = mesecons