From 09889a929b87c02cc3ae852a24d7e8532b3b6e80 Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Sun, 31 May 2026 17:48:54 -0700 Subject: [PATCH 1/2] Replace references to minetest object with core --- .luacheckrc | 4 +-- barter.lua | 24 ++++++++--------- crafting.lua | 40 ++++++++++++++-------------- craftitems.lua | 20 +++++++------- income.lua | 32 +++++++++++----------- init.lua | 22 +++++++-------- loot.lua | 2 +- safe.lua | 42 ++++++++++++++--------------- shop.lua | 72 +++++++++++++++++++++++++------------------------- 9 files changed, 129 insertions(+), 129 deletions(-) diff --git a/.luacheckrc b/.luacheckrc index 1d23b4a..be5eecf 100644 --- a/.luacheckrc +++ b/.luacheckrc @@ -10,8 +10,8 @@ read_globals = { string = {fields = {"split", "trim"}}, table = {fields = {"copy", "getn"}}, - -- Minetest - "minetest", + -- Core + "core", "PseudoRandom", "ItemStack", "VoxelArea", "VoxelManip", "Settings", "vector", diff --git a/barter.lua b/barter.lua index ffc3768..0444c5b 100644 --- a/barter.lua +++ b/barter.lua @@ -1,10 +1,10 @@ currency.barter = {} barter = currency.barter -- Kept as a global variable for compatibility -local S = minetest.get_translator("currency") +local S = core.get_translator("currency") barter.chest = {} -barter.chest.expire_after = tonumber(minetest.settings:get('barter.chest.expireafter')) or 15 * 60 +barter.chest.expire_after = tonumber(core.settings:get('barter.chest.expireafter')) or 15 * 60 barter.chest.formspec = { main = "size[8,9]".. "list[current_name;pl1;0,0;3,4;]".. @@ -65,13 +65,13 @@ barter.chest.update_formspec = function(meta) end barter.chest.give_inventory = function(inv,list,playername) - local player = minetest.get_player_by_name(playername) + local player = core.get_player_by_name(playername) if player then for _,v in ipairs(inv:get_list(list)) do if player:get_inventory():room_for_item("main",v) then player:get_inventory():add_item("main",v) else - minetest.add_item(player:get_pos(),v) + core.add_item(player:get_pos(),v) end inv:remove_item(list,v) end @@ -103,12 +103,12 @@ end barter.chest.start_timer = function(pos, meta) meta:set_int("clean",0) meta:set_int("timer",0) - local node_timer = minetest.get_node_timer(pos) + local node_timer = core.get_node_timer(pos) if node_timer:is_started() then return end node_timer:start(22) end -minetest.register_node("currency:barter", { +core.register_node("currency:barter", { drawtype = "nodebox", description = S("Barter Table"), paramtype = "light", @@ -133,7 +133,7 @@ minetest.register_node("currency:barter", { is_ground_content = false, sounds = currency.node_sound_wood_defaults(), on_construct = function(pos) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) meta:set_string("infotext", S("Barter Table")) meta:set_string("pl1","") meta:set_string("pl2","") @@ -145,7 +145,7 @@ minetest.register_node("currency:barter", { inv:set_size("pl2", 12) -- 3*4 end, on_receive_fields = function(pos, formname, fields, sender) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) barter.chest.start_timer(pos, meta) local pl_receive_fields = function(n) if fields[n.."_start"] and meta:get_string(n) == "" then @@ -173,26 +173,26 @@ minetest.register_node("currency:barter", { barter.chest.update_formspec(meta) end, allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) barter.chest.start_timer(pos, meta) if not barter.chest.check_privilege(from_list,player:get_player_name(),meta) then return 0 end if not barter.chest.check_privilege(to_list,player:get_player_name(),meta) then return 0 end return count end, allow_metadata_inventory_put = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) barter.chest.start_timer(pos, meta) if not barter.chest.check_privilege(listname,player:get_player_name(),meta) then return 0 end return stack:get_count() end, allow_metadata_inventory_take = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) barter.chest.start_timer(pos, meta) if not barter.chest.check_privilege(listname,player:get_player_name(),meta) then return 0 end return stack:get_count() end, on_timer = function(pos, dtime) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) if 1 == meta:get_int("clean") then return false end local timer = meta:get_int("timer") diff --git a/crafting.lua b/crafting.lua index 9abeaab..36633de 100644 --- a/crafting.lua +++ b/crafting.lua @@ -1,5 +1,5 @@ -if minetest.get_modpath("default") then - minetest.register_craft({ +if core.get_modpath("default") then + core.register_craft({ output = "currency:safe", recipe = { {"default:steel_ingot", "default:steel_ingot", @@ -11,7 +11,7 @@ if minetest.get_modpath("default") then } }) - minetest.register_craft({ + core.register_craft({ output = "currency:shop", recipe = { {"default:sign_wall"}, @@ -19,7 +19,7 @@ if minetest.get_modpath("default") then } }) - minetest.register_craft({ + core.register_craft({ output = "currency:barter", recipe = { {"default:sign_wall"}, @@ -28,7 +28,7 @@ if minetest.get_modpath("default") then }) end -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "currency:minegeld_cent_10", recipe = { @@ -37,13 +37,13 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "currency:minegeld_cent_5 2", recipe = {"currency:minegeld_cent_10"}, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "currency:minegeld_cent_25", recipe = { @@ -55,13 +55,13 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "currency:minegeld_cent_5 5", recipe = {"currency:minegeld_cent_25"}, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "currency:minegeld", recipe = { @@ -72,13 +72,13 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "currency:minegeld_cent_25 4", recipe = {"currency:minegeld"}, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "currency:minegeld_5", recipe = { @@ -90,13 +90,13 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "currency:minegeld 5", recipe = {"currency:minegeld_5"}, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "currency:minegeld_10", recipe = { @@ -105,19 +105,19 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "currency:minegeld_5 2", recipe = {"currency:minegeld_10"}, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "currency:minegeld_10 5", recipe = {"currency:minegeld_50"}, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "currency:minegeld_50", recipe = { @@ -129,7 +129,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "currency:minegeld_100", recipe = { @@ -138,13 +138,13 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "currency:minegeld_50 2", recipe = {"currency:minegeld_100" }, }) -minetest.register_craft({ +core.register_craft({ type = "shapeless", output = "currency:minegeld_bundle", recipe = { @@ -160,7 +160,7 @@ minetest.register_craft({ }, }) -minetest.register_craft({ +core.register_craft({ type = "fuel", recipe = "currency:minegeld_bundle", burntime = 1, diff --git a/craftitems.lua b/craftitems.lua index 3201b84..90fa2ea 100644 --- a/craftitems.lua +++ b/craftitems.lua @@ -1,62 +1,62 @@ -local S = minetest.get_translator("currency") +local S = core.get_translator("currency") -minetest.register_craftitem("currency:minegeld_cent_5", { +core.register_craftitem("currency:minegeld_cent_5", { description = S("@1 Minegeld cent coin", "5"), inventory_image = "minegeld_cent_5.png", stack_max = 1000, groups = {minegeld = 1, minegeld_coin = 1} }) -minetest.register_craftitem("currency:minegeld_cent_10", { +core.register_craftitem("currency:minegeld_cent_10", { description = S("@1 Minegeld cent coin", "10"), inventory_image = "minegeld_cent_10.png", stack_max = 1000, groups = {minegeld = 1, minegeld_coin = 1} }) -minetest.register_craftitem("currency:minegeld_cent_25", { +core.register_craftitem("currency:minegeld_cent_25", { description = S("@1 Minegeld cent coin", "25"), inventory_image = "minegeld_cent_25.png", stack_max = 1000, groups = {minegeld = 1, minegeld_coin = 1} }) -minetest.register_craftitem("currency:minegeld", { +core.register_craftitem("currency:minegeld", { description = S("@1 Minegeld Note", "1"), inventory_image = "minegeld.png", stack_max = 65535, groups = {minegeld = 1, minegeld_note = 1} }) -minetest.register_craftitem("currency:minegeld_5", { +core.register_craftitem("currency:minegeld_5", { description = S("@1 Minegeld Note", "5"), inventory_image = "minegeld_5.png", stack_max = 65535, groups = {minegeld = 1, minegeld_note = 1} }) -minetest.register_craftitem("currency:minegeld_10", { +core.register_craftitem("currency:minegeld_10", { description = S("@1 Minegeld Note", "10"), inventory_image = "minegeld_10.png", stack_max = 65535, groups = {minegeld = 1, minegeld_note = 1} }) -minetest.register_craftitem("currency:minegeld_50", { +core.register_craftitem("currency:minegeld_50", { description = S("@1 Minegeld Note", "50"), inventory_image = "minegeld_50.png", stack_max = 65535, groups = {minegeld = 1, minegeld_note = 1} }) -minetest.register_craftitem("currency:minegeld_100", { +core.register_craftitem("currency:minegeld_100", { description = S("@1 Minegeld Note", "100"), inventory_image = "minegeld_100.png", stack_max = 65535, groups = {minegeld = 1, minegeld_note = 1} }) -minetest.register_craftitem("currency:minegeld_bundle", { +core.register_craftitem("currency:minegeld_bundle", { description = S("Bundle of random Minegeld notes"), inventory_image = "minegeld_bundle.png", stack_max = 65535, diff --git a/income.lua b/income.lua index f701203..f495d43 100644 --- a/income.lua +++ b/income.lua @@ -1,36 +1,36 @@ local players_income = {} -local income_enabled = minetest.settings:get_bool("currency.income_enabled", true) -local creative_income_enabled = minetest.settings:get_bool("currency.creative_income_enabled", true) -local income_item = minetest.settings:get("currency.income_item") or "currency:minegeld_10" -local income_count = tonumber(minetest.settings:get("currency.income_count")) or 1 -local income_period = tonumber(minetest.settings:get("currency.income_period")) or 720 +local income_enabled = core.settings:get_bool("currency.income_enabled", true) +local creative_income_enabled = core.settings:get_bool("currency.creative_income_enabled", true) +local income_item = core.settings:get("currency.income_item") or "currency:minegeld_10" +local income_count = tonumber(core.settings:get("currency.income_count")) or 1 +local income_period = tonumber(core.settings:get("currency.income_period")) or 720 if income_enabled then local timer = 0 if creative_income_enabled then - minetest.register_globalstep(function(dtime) + core.register_globalstep(function(dtime) timer = timer + dtime; if timer >= income_period then timer = 0 - for _, player in ipairs(minetest.get_connected_players()) do + for _, player in ipairs(core.get_connected_players()) do local name = player:get_player_name() players_income[name] = income_count - minetest.log("info", "[Currency] basic income for "..name) + core.log("info", "[Currency] basic income for "..name) end end end) else - minetest.register_globalstep(function(dtime) + core.register_globalstep(function(dtime) timer = timer + dtime; if timer >= income_period then timer = 0 - for _, player in ipairs(minetest.get_connected_players()) do + for _, player in ipairs(core.get_connected_players()) do local name = player:get_player_name() - local privs = minetest.get_player_privs(name) + local privs = core.get_player_privs(name) if not (privs.creative or privs.give) then players_income[name] = income_count - minetest.log("info", "[Currency] basic income for "..name) + core.log("info", "[Currency] basic income for "..name) end end end @@ -46,11 +46,11 @@ if income_enabled then local inv = player:get_inventory() inv:add_item("main", {name=income_item, count=ic}) players_income[name] = nil - minetest.log("info", "[Currency] added basic income for "..name.." to inventory") + core.log("info", "[Currency] added basic income for "..name.." to inventory") end end - minetest.register_on_dignode(function(pos, oldnode, digger) earn_income(digger) end) - minetest.register_on_placenode(function(pos, node, placer) earn_income(placer) end) - minetest.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv) earn_income(player) end) + core.register_on_dignode(function(pos, oldnode, digger) earn_income(digger) end) + core.register_on_placenode(function(pos, node, placer) earn_income(placer) end) + core.register_on_craft(function(itemstack, player, old_craft_grid, craft_inv) earn_income(player) end) end diff --git a/init.lua b/init.lua index 2ac2b57..298a7f4 100644 --- a/init.lua +++ b/init.lua @@ -1,28 +1,28 @@ -local modpath = minetest.get_modpath("currency") +local modpath = core.get_modpath("currency") -minetest.log("info", "Currency mod loading...") +core.log("info", "Currency mod loading...") currency = {} -if minetest.global_exists("default") then +if core.global_exists("default") then currency.node_sound_wood_defaults = default.node_sound_wood_defaults else currency.node_sound_wood_defaults = function() end end dofile(modpath.."/craftitems.lua") -minetest.log("info", "[Currency] Craft_items Loaded!") +core.log("info", "[Currency] Craft_items Loaded!") dofile(modpath.."/shop.lua") -minetest.log("info", "[Currency] Shop Loaded!") +core.log("info", "[Currency] Shop Loaded!") dofile(modpath.."/barter.lua") -minetest.log("info", "[Currency] Barter Loaded!") +core.log("info", "[Currency] Barter Loaded!") dofile(modpath.."/safe.lua") -minetest.log("info", "[Currency] Safe Loaded!") +core.log("info", "[Currency] Safe Loaded!") dofile(modpath.."/crafting.lua") -minetest.log("info", "[Currency] Crafting Loaded!") +core.log("info", "[Currency] Crafting Loaded!") -if minetest.settings:get_bool("creative_mode") then - minetest.log("info", "[Currency] Creative mode in use, skipping basic income.") +if core.settings:get_bool("creative_mode") then + core.log("info", "[Currency] Creative mode in use, skipping basic income.") else dofile(modpath.."/income.lua") - minetest.log("info", "[Currency] Income Loaded!") + core.log("info", "[Currency] Income Loaded!") end diff --git a/loot.lua b/loot.lua index d0ea820..0480a12 100644 --- a/loot.lua +++ b/loot.lua @@ -1,4 +1,4 @@ -if not minetest.get_modpath("loot") then +if not core.get_modpath("loot") then return end diff --git a/safe.lua b/safe.lua index e9d0e60..2da2422 100644 --- a/safe.lua +++ b/safe.lua @@ -1,4 +1,4 @@ -local S = minetest.get_translator("currency") +local S = core.get_translator("currency") function currency.get_safe_formspec(pos) local spos = pos.x .. "," .. pos.y .. "," ..pos.z @@ -11,14 +11,14 @@ function currency.get_safe_formspec(pos) return formspec end -if minetest.global_exists("default") then +if core.global_exists("default") then default.get_safe_formspec = currency.get_safe_formspec end local function has_safe_privilege(meta, player) local name = "" if player then - if minetest.check_player_privs(player, "protection_bypass") then + if core.check_player_privs(player, "protection_bypass") then return true end name = player:get_player_name() @@ -29,7 +29,7 @@ local function has_safe_privilege(meta, player) return true end -minetest.register_node("currency:safe", { +core.register_node("currency:safe", { description = S("Safe"), inventory_image = "safe_front.png", paramtype = "light", @@ -43,65 +43,65 @@ minetest.register_node("currency:safe", { is_ground_content = false, groups = {cracky=1}, after_place_node = function(pos, placer) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) meta:set_string("owner", placer:get_player_name() or "") meta:set_string("infotext", S("Safe (owned by @1)", meta:get_string("owner"))) end, on_construct = function(pos) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) meta:set_string("infotext", "Safe") meta:set_string("owner", "") local inv = meta:get_inventory() inv:set_size("main", 6*2) end, can_dig = function(pos,player) - local meta = minetest.get_meta(pos); + local meta = core.get_meta(pos); local inv = meta:get_inventory() return inv:is_empty("main") and has_safe_privilege(meta, player) end, allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) if not has_safe_privilege(meta, player) then - minetest.log("action", player:get_player_name().." tried to access a safe belonging to " + core.log("action", player:get_player_name().." tried to access a safe belonging to " ..meta:get_string("owner").." at " - ..minetest.pos_to_string(pos)) + ..core.pos_to_string(pos)) return 0 end return count end, allow_metadata_inventory_put = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) if not has_safe_privilege(meta, player) then - minetest.log("action", player:get_player_name().." tried to access a safe belonging to " + core.log("action", player:get_player_name().." tried to access a safe belonging to " ..meta:get_string("owner").." at " - ..minetest.pos_to_string(pos)) + ..core.pos_to_string(pos)) return 0 end return stack:get_count() end, allow_metadata_inventory_take = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) if not has_safe_privilege(meta, player) then - minetest.log("action", player:get_player_name().." tried to access a safe belonging to " + core.log("action", player:get_player_name().." tried to access a safe belonging to " ..meta:get_string("owner").." at " - ..minetest.pos_to_string(pos)) + ..core.pos_to_string(pos)) return 0 end return stack:get_count() end, on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - minetest.log("action", player:get_player_name().." moves stuff in safe at "..minetest.pos_to_string(pos)) + core.log("action", player:get_player_name().." moves stuff in safe at "..core.pos_to_string(pos)) end, on_metadata_inventory_put = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().." moves stuff to safe at "..minetest.pos_to_string(pos)) + core.log("action", player:get_player_name().." moves stuff to safe at "..core.pos_to_string(pos)) end, on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().." takes stuff from safe at "..minetest.pos_to_string(pos)) + core.log("action", player:get_player_name().." takes stuff from safe at "..core.pos_to_string(pos)) end, on_rightclick = function(pos, node, clicker) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) if has_safe_privilege(meta, clicker) then - minetest.show_formspec( + core.show_formspec( clicker:get_player_name(), "currency:safe", currency.get_safe_formspec(pos) diff --git a/shop.lua b/shop.lua index 154ffa0..acd0d86 100644 --- a/shop.lua +++ b/shop.lua @@ -1,7 +1,7 @@ -local S = minetest.get_translator("currency") +local S = core.get_translator("currency") currency.shop = {} -if minetest.global_exists("default") then +if core.global_exists("default") then default.shop = currency.shop end @@ -39,7 +39,7 @@ currency.shop.formspec = { end, } -local have_pipeworks = minetest.global_exists("pipeworks") +local have_pipeworks = core.global_exists("pipeworks") currency.shop.check_privilege = function(listname, playername, meta) --[[if listname == "pl1" then @@ -61,7 +61,7 @@ end currency.shop.give_inventory = function(inv, list, playername) - local player = minetest.get_player_by_name(playername) + local player = core.get_player_by_name(playername) if player then for k, v in ipairs(inv:get_list(list)) do player:get_inventory():add_item("main", v) @@ -89,7 +89,7 @@ currency.shop.exchange = function(meta) end local check_stock = function(pos) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local minv = meta:get_inventory() local gives = minv:get_list("owner_gives") local can_exchange = true @@ -104,28 +104,28 @@ local check_stock = function(pos) S("Exchange shop (owned by @1)", owner) ) local applicable = "currency:shop" - local node = minetest.get_node(pos) + local node = core.get_node(pos) if node.name == applicable then return end node.name = applicable - minetest.swap_node(pos, node) + core.swap_node(pos, node) else meta:set_string("infotext", S("Exchange shop (owned by @1)", owner) .. ", " .. S("out of stock") ) local applicable = "currency:shop_empty" - local node = minetest.get_node(pos) + local node = core.get_node(pos) if node.name == applicable then return end node.name = applicable - minetest.swap_node(pos, node) + core.swap_node(pos, node) end end -minetest.register_node("currency:shop", { +core.register_node("currency:shop", { description = S("Shop"), paramtype2 = "facedir", tiles = { @@ -142,7 +142,7 @@ minetest.register_node("currency:shop", { sounds = currency.node_sound_wood_defaults(), after_place_node = function(pos, placer, itemstack) local owner = placer:get_player_name() - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) meta:set_string("infotext", S("Exchange shop (owned by @1)", owner)) meta:set_string("owner", owner) --[[meta:set_string("pl1","") @@ -158,14 +158,14 @@ minetest.register_node("currency:shop", { after_dig_node = (have_pipeworks and pipeworks and pipeworks.after_dig), tube = { insert_object = function(pos, node, stack, direction) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local inv = meta:get_inventory() local result = inv:add_item("stock", stack) check_stock(pos) return result end, can_insert = function(pos, node, stack, direction) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local inv = meta:get_inventory() return inv:room_for_item("stock", stack) end, @@ -176,25 +176,25 @@ minetest.register_node("currency:shop", { clicker:get_inventory():set_size("customer_gives", 3*2) clicker:get_inventory():set_size("customer_gets", 3*2) currency.shop.current_shop[clicker:get_player_name()] = pos - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) if clicker:get_player_name() == meta:get_string("owner") and not clicker:get_player_control().aux1 then - minetest.show_formspec(clicker:get_player_name(),"currency:shop_formspec",currency.shop.formspec.owner(pos)) + core.show_formspec(clicker:get_player_name(),"currency:shop_formspec",currency.shop.formspec.owner(pos)) else - minetest.show_formspec(clicker:get_player_name(),"currency:shop_formspec",currency.shop.formspec.customer(pos)) + core.show_formspec(clicker:get_player_name(),"currency:shop_formspec",currency.shop.formspec.customer(pos)) end end, allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) if player:get_player_name() ~= meta:get_string("owner") then return 0 end return count end, allow_metadata_inventory_put = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) if player:get_player_name() ~= meta:get_string("owner") then return 0 end return stack:get_count() end, allow_metadata_inventory_take = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) if player:get_player_name() ~= meta:get_string("owner") then return 0 end return stack:get_count() end, @@ -202,7 +202,7 @@ minetest.register_node("currency:shop", { on_metadata_inventory_put = check_stock, on_metadata_inventory_take = check_stock, can_dig = function(pos, player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local inv = meta:get_inventory() return inv:is_empty("stock") and inv:is_empty("customers_gave") and @@ -211,7 +211,7 @@ minetest.register_node("currency:shop", { end }) -minetest.register_node("currency:shop_empty", { +core.register_node("currency:shop_empty", { description = S("Shop") .. " (" .. S("out of stock") .. ")", paramtype2 = "facedir", tiles = { @@ -229,14 +229,14 @@ minetest.register_node("currency:shop_empty", { after_dig_node = (have_pipeworks and pipeworks and pipeworks.after_dig), tube = { insert_object = function(pos, node, stack, direction) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local inv = meta:get_inventory() local result = inv:add_item("stock", stack) check_stock(pos) return result end, can_insert = function(pos,node,stack,direction) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local inv = meta:get_inventory() return inv:room_for_item("stock", stack) end, @@ -247,25 +247,25 @@ minetest.register_node("currency:shop_empty", { clicker:get_inventory():set_size("customer_gives", 3*2) clicker:get_inventory():set_size("customer_gets", 3*2) currency.shop.current_shop[clicker:get_player_name()] = pos - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) if clicker:get_player_name() == meta:get_string("owner") and not clicker:get_player_control().aux1 then - minetest.show_formspec(clicker:get_player_name(),"currency:shop_formspec",currency.shop.formspec.owner(pos)) + core.show_formspec(clicker:get_player_name(),"currency:shop_formspec",currency.shop.formspec.owner(pos)) else - minetest.show_formspec(clicker:get_player_name(),"currency:shop_formspec",currency.shop.formspec.customer(pos)) + core.show_formspec(clicker:get_player_name(),"currency:shop_formspec",currency.shop.formspec.customer(pos)) end end, allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) if player:get_player_name() ~= meta:get_string("owner") then return 0 end return count end, allow_metadata_inventory_put = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) if player:get_player_name() ~= meta:get_string("owner") then return 0 end return stack:get_count() end, allow_metadata_inventory_take = function(pos, listname, index, stack, player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) if player:get_player_name() ~= meta:get_string("owner") then return 0 end return stack:get_count() end, @@ -273,7 +273,7 @@ minetest.register_node("currency:shop_empty", { on_metadata_inventory_put = check_stock, on_metadata_inventory_take = check_stock, can_dig = function(pos, player) - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) local inv = meta:get_inventory() return inv:is_empty("stock") and inv:is_empty("customers_gave") and @@ -282,13 +282,13 @@ minetest.register_node("currency:shop_empty", { end }) -minetest.register_on_player_receive_fields(function(sender, formname, fields) +core.register_on_player_receive_fields(function(sender, formname, fields) if formname == "currency:shop_formspec" and fields.exchange ~= nil and fields.exchange ~= "" then local name = sender:get_player_name() local pos = currency.shop.current_shop[name] - local meta = minetest.get_meta(pos) + local meta = core.get_meta(pos) if meta:get_string("owner") == name then - minetest.chat_send_player(name, S("This is your own shop, you can't exchange to yourself!")) + core.chat_send_player(name, S("This is your own shop, you can't exchange to yourself!")) else local minv = meta:get_inventory() local pinv = sender:get_inventory() @@ -326,13 +326,13 @@ minetest.register_on_player_receive_fields(function(sender, formname, fields) it = minv:remove_item("stock", item) pinv:add_item("customer_gets", it) end - minetest.chat_send_player(name, S("Exchanged!")) + core.chat_send_player(name, S("Exchanged!")) check_stock(pos) else if owners_fault then - minetest.chat_send_player(name, S("Exchange can not be done, contact the shop owner.")) + core.chat_send_player(name, S("Exchange can not be done, contact the shop owner.")) else - minetest.chat_send_player(name, S("Exchange can not be done, check if you put all items!")) + core.chat_send_player(name, S("Exchange can not be done, check if you put all items!")) end end end From 09f0a45fd2a647f28bb72e4189d345e800b9541f Mon Sep 17 00:00:00 2001 From: Jordan Irwin Date: Sun, 31 May 2026 17:55:42 -0700 Subject: [PATCH 2/2] Add ContentDB meta --- .cdb.json | 19 +++++++++++++++++++ .gitattributes | 1 + 2 files changed, 20 insertions(+) create mode 100644 .cdb.json create mode 100644 .gitattributes diff --git a/.cdb.json b/.cdb.json new file mode 100644 index 0000000..8c32b3f --- /dev/null +++ b/.cdb.json @@ -0,0 +1,19 @@ +{ + "type": "MOD", + "title": "Currency", + "name": "currency", + "short_description": "Provides shops, barter tables, safes, and multiple denominations of currency, called \"Minegeld\".", + "dev_state": "MAINTENANCE_ONLY", + "ai_disclosure": "NONE", + "tags": ["multiplayer", "commerce"], + "content_warnings": null, + "license": "LGPL-3.0-only", + "media_license": "CC-BY-SA-4.0", + "repo": "https://github.com/mt-mods/currency", + "website": null, + "issue_tracker": "https://github.com/mt-mods/currency/issues", + "forums": 21339, + "video_url": null, + "donate_url": null, + "translation_url": null +} diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..a32c9fa --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +.* export-ignore