From 5ec1e2f3ff2e1e920a7eeab4c46ffce540510445 Mon Sep 17 00:00:00 2001 From: AntumDeluge Date: Sat, 13 May 2017 04:40:58 -0700 Subject: [PATCH] [pipeworks] Update to Git patch 32b6613: https://github.com/AntumDeluge/mtmod-pipeworks/tree/32b6613 --- README.md | 3 ++- mods/pipeworks/default_settings.lua | 2 +- mods/pipeworks/flowing_logic.lua | 2 +- mods/pipeworks/init.lua | 2 +- mods/pipeworks/item_transport.lua | 4 ++-- mods/pipeworks/luaentity.lua | 2 +- mods/pipeworks/signal_tubes.lua | 2 +- 7 files changed, 9 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index f978b79d..fc2f7b24 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m * npc/ * [peaceful_npc][] ([WTFPL][lic.wtfpl]) -- version: [2b3a7a5 Git][ver.peaceful_npc] *2015-08-09* * [painting][] (???) -* [pipeworks][] ([WTFPL][lic.wtfpl]) -- version: [d822279 Git][ver.pipeworks] *2017-04-13* +* [pipeworks][] ([WTFPL][lic.wtfpl]) -- version: [d822279 Git][ver.pipeworks] *2017-04-13* ([patched][patch.pipeworks]) * plantlife/ * player/ * [airtanks][] ([MIT][lic.airtanks]) -- version: [fc01ffb Git][ver.airtanks] *2017-04-01* @@ -501,6 +501,7 @@ The game includes the mods from the default [minetest_game](https://github.com/m [patch.moreores]: https://github.com/AntumDeluge/mtmod-moreores/tree/2172c49 [patch.mydoors]: https://github.com/AntumDeluge/mtmp-mydoors/tree/e36c9d1 [patch.nether]: https://github.com/AntumDeluge/mtmod-nether/tree/f634851 +[patch.pipeworks]: https://github.com/AntumDeluge/mtmod-pipeworks/tree/32b6613 [patch.quartz]: https://github.com/AntumDeluge/mtmod-quartz/tree/d23dabd [patch.rainbow_ore]: https://github.com/AntumDeluge/mtmod-rainbow_ore/tree/60dc35e [patch.signs_lib]: https://github.com/AntumDeluge/mtmod-signs_lib/tree/770978c diff --git a/mods/pipeworks/default_settings.lua b/mods/pipeworks/default_settings.lua index 6f661b5a..99b86fe3 100644 --- a/mods/pipeworks/default_settings.lua +++ b/mods/pipeworks/default_settings.lua @@ -30,7 +30,7 @@ local settings = { for name, value in pairs(settings) do local setting_type = type(value) if setting_type == "boolean" then - pipeworks[name] = minetest.setting_getbool(prefix..name) + pipeworks[name] = minetest.settings:get_bool(prefix..name) if pipeworks[name] == nil then pipeworks[name] = value end diff --git a/mods/pipeworks/flowing_logic.lua b/mods/pipeworks/flowing_logic.lua index e1c0bf54..632baa63 100644 --- a/mods/pipeworks/flowing_logic.lua +++ b/mods/pipeworks/flowing_logic.lua @@ -4,7 +4,7 @@ -- Contributed by mauvebic, 2013-01-03, rewritten a bit by Vanessa Ezekowitz -- -local finitewater = minetest.setting_getbool("liquid_finite") +local finitewater = minetest.settings:get_bool("liquid_finite") pipeworks.check_for_liquids = function(pos) local coords = { diff --git a/mods/pipeworks/init.lua b/mods/pipeworks/init.lua index 1766e2db..a3f31c74 100644 --- a/mods/pipeworks/init.lua +++ b/mods/pipeworks/init.lua @@ -26,7 +26,7 @@ end -- Random variables pipeworks.expect_infinite_stacks = true -if minetest.get_modpath("unified_inventory") or not minetest.setting_getbool("creative_mode") then +if minetest.get_modpath("unified_inventory") or not minetest.settings:get_bool("creative_mode") then pipeworks.expect_infinite_stacks = false end diff --git a/mods/pipeworks/item_transport.lua b/mods/pipeworks/item_transport.lua index 43adeeae..b2d2aa29 100644 --- a/mods/pipeworks/item_transport.lua +++ b/mods/pipeworks/item_transport.lua @@ -1,6 +1,6 @@ local luaentity = pipeworks.luaentity -local enable_max_limit = minetest.setting_get("pipeworks_enable_items_per_tube_limit") -local max_tube_limit = tonumber(minetest.setting_get("pipeworks_max_items_per_tube")) or 30 +local enable_max_limit = minetest.settings:get("pipeworks_enable_items_per_tube_limit") +local max_tube_limit = tonumber(minetest.settings:get("pipeworks_max_items_per_tube")) or 30 if enable_max_limit == nil then enable_max_limit = true end function pipeworks.tube_item(pos, item) diff --git a/mods/pipeworks/luaentity.lua b/mods/pipeworks/luaentity.lua index ab7280c8..382b0c1c 100644 --- a/mods/pipeworks/luaentity.lua +++ b/mods/pipeworks/luaentity.lua @@ -71,7 +71,7 @@ end local active_blocks = {} -- These only contain active blocks near players (i.e., not forceloaded ones) local move_entities_globalstep_part1 = function(dtime) - local active_block_range = tonumber(minetest.setting_get("active_block_range")) or 2 + local active_block_range = tonumber(minetest.settings:get("active_block_range")) or 2 local new_active_blocks = {} for _, player in ipairs(minetest.get_connected_players()) do local blockpos = get_blockpos(player:getpos()) diff --git a/mods/pipeworks/signal_tubes.lua b/mods/pipeworks/signal_tubes.lua index 3b2653cc..a0a8039d 100644 --- a/mods/pipeworks/signal_tubes.lua +++ b/mods/pipeworks/signal_tubes.lua @@ -1,5 +1,5 @@ if pipeworks.enable_detector_tube then - local detector_tube_step = 5 * tonumber(minetest.setting_get("dedicated_server_step")) + local detector_tube_step = 5 * tonumber(minetest.settings:get("dedicated_server_step")) pipeworks.register_tube("pipeworks:detector_tube_on", { description = "Detecting Pneumatic Tube Segment on (you hacker you)", inventory_image = "pipeworks_detector_tube_inv.png",