From d3a7d82233e06d601a35c56136e05fd3e96f0d9b Mon Sep 17 00:00:00 2001 From: sys4 Date: Sat, 28 Oct 2017 18:17:58 +0200 Subject: [PATCH] Fix nether mod with >minetest-0.4.15 --- .dir-locals.el | 4 ++++ mods/nether/nether/guide.lua | 4 +++- mods/nether/nether/items.lua | 4 +++- worlds/minetestforfun/world.mt | 7 ++----- 4 files changed, 12 insertions(+), 7 deletions(-) create mode 100755 .dir-locals.el mode change 100755 => 100644 worlds/minetestforfun/world.mt diff --git a/.dir-locals.el b/.dir-locals.el new file mode 100755 index 00000000..f48b1599 --- /dev/null +++ b/.dir-locals.el @@ -0,0 +1,4 @@ +((nil . ((indent-tabs-mode . t) + (tab-width . 3))) + (lua-mode . ( + (eval . (highlight-regexp "^ *"))))) diff --git a/mods/nether/nether/guide.lua b/mods/nether/nether/guide.lua index c26b9ca0..6cef6898 100755 --- a/mods/nether/nether/guide.lua +++ b/mods/nether/nether/guide.lua @@ -315,7 +315,9 @@ for n,data in ipairs(guide_infos) do elseif typ == "x" then x = math.max(x, content) elseif typ == "text" then - local tab = minetest.splittext(content, guide_size.fx) + local wrap_func = minetest.wrap_text + if not wrap_func then wrap_func = minetest.splittext end + local tab = wrap_func(content, guide_size.fx) local l = guide_size.cx for _,str in ipairs(tab) do form = form.."label["..guide_size.cx ..","..guide_size.cy+y..";"..str.."]" diff --git a/mods/nether/nether/items.lua b/mods/nether/nether/items.lua index e30bd84a..e81826f0 100755 --- a/mods/nether/nether/items.lua +++ b/mods/nether/nether/items.lua @@ -386,7 +386,9 @@ minetest.register_node("nether:apple", { p_hunger = 30 end hbhunger.hunger[user:get_player_name()] = p_hunger - hbhunger.set_hunger(user) + local save_hunger = hbhunger.save_hunger + if not save_hunger then save_hunger = hbhunger.set_hunger end + save_hunger(user) local amount = math.random(4, 6) inv:add_item("main", {name="nether:blood_extracted", count=math.floor(amount/3)}) diff --git a/worlds/minetestforfun/world.mt b/worlds/minetestforfun/world.mt old mode 100755 new mode 100644 index 5eaf86ba..02d93c39 --- a/worlds/minetestforfun/world.mt +++ b/worlds/minetestforfun/world.mt @@ -126,7 +126,6 @@ load_mod_pipeworks = true load_mod_factions = true load_mod_invtweak = true -load_mod_screwdriver = true load_mod_carts = true load_mod_sponge = true @@ -140,7 +139,6 @@ load_mod_more_chests = true load_mod_connected_chests = true load_mod_chesttools = true -load_mod_farming = true load_mod_food = true load_mod_food_basic = true load_mod_fishing = true @@ -217,7 +215,6 @@ load_mod_building_blocks = true load_mod_inbox = true load_mod_money = true load_mod_minercantile = true -load_mod_beds = true load_mod_builtin_item = true load_mod_email = true load_mod_report = true @@ -249,7 +246,6 @@ load_mod_playereffects = true load_mod_meshnode = false load_mod_experience = false load_mod_bonemeal = true -load_mod_tnt = true load_mod_playeranim = true load_mod_lightning = true @@ -266,4 +262,5 @@ load_mod_cotton = true load_mod_camera = true load_mod_claycrafter = true -load_mod_snowdrift = true \ No newline at end of file +load_mod_snowdrift = true +player_backend = files