Skip to content

Commit e6aec88

Browse files
author
Maksim
authoredDec 13, 2020
Use Minetest 5.3 'minetest.is_creative_enabled' API (#2795)
·
5.8.05.4.0
1 parent 9c29019 commit e6aec88

File tree

19 files changed

+34
-65
lines changed

19 files changed

+34
-65
lines changed
 

Diff for: ‎mods/beds/api.lua

+1-2
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,7 @@ function beds.register_bed(name, def)
9595
minetest.set_node(pos, {name = name .. "_bottom", param2 = dir})
9696
minetest.set_node(botpos, {name = name .. "_top", param2 = dir})
9797

98-
if not (creative and creative.is_enabled_for
99-
and creative.is_enabled_for(player_name)) then
98+
if not minetest.is_creative_enabled(player_name) then
10099
itemstack:take_item()
101100
end
102101
return itemstack

Diff for: ‎mods/binoculars/init.lua

+1-10
Original file line numberDiff line numberDiff line change
@@ -8,25 +8,16 @@ binoculars = {}
88
local S = minetest.get_translator("binoculars")
99

1010

11-
-- Detect creative mod
12-
local creative_mod = minetest.get_modpath("creative")
13-
-- Cache creative mode setting as fallback if creative mod not present
14-
local creative_mode_cache = minetest.settings:get_bool("creative_mode")
15-
16-
1711
-- Update player property
1812
-- Global to allow overriding
1913

2014
function binoculars.update_player_property(player)
21-
local creative_enabled =
22-
(creative_mod and creative.is_enabled_for(player:get_player_name())) or
23-
creative_mode_cache
2415
local new_zoom_fov = 0
2516

2617
if player:get_inventory():contains_item(
2718
"main", "binoculars:binoculars") then
2819
new_zoom_fov = 10
29-
elseif creative_enabled then
20+
elseif minetest.is_creative_enabled(player:get_player_name()) then
3021
new_zoom_fov = 15
3122
end
3223

Diff for: ‎mods/binoculars/mod.conf

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
name = binoculars
22
description = Minetest Game mod: binoculars
33
depends = default
4-
optional_depends = creative

Diff for: ‎mods/boats/init.lua

+2-4
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,7 @@ function boat.on_punch(self, puncher)
119119
if not self.driver then
120120
self.removed = true
121121
local inv = puncher:get_inventory()
122-
if not (creative and creative.is_enabled_for
123-
and creative.is_enabled_for(name))
122+
if not minetest.is_creative_enabled(name)
124123
or not inv:contains_item("main", "boats:boat") then
125124
local leftover = inv:add_item("main", "boats:boat")
126125
-- if no room in inventory add a replacement boat to the world
@@ -268,8 +267,7 @@ minetest.register_craftitem("boats:boat", {
268267
boat:set_yaw(placer:get_look_horizontal())
269268
end
270269
local player_name = placer and placer:get_player_name() or ""
271-
if not (creative and creative.is_enabled_for and
272-
creative.is_enabled_for(player_name)) then
270+
if not minetest.is_creative_enabled(player_name) then
273271
itemstack:take_item()
274272
end
275273
end

Diff for: ‎mods/bones/init.lua

+1-3
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,6 @@ local function is_all_empty(player_inv)
191191
end
192192

193193
minetest.register_on_dieplayer(function(player)
194-
195194
local bones_mode = minetest.settings:get("bones_mode") or "bones"
196195
if bones_mode ~= "bones" and bones_mode ~= "drop" and bones_mode ~= "keep" then
197196
bones_mode = "bones"
@@ -203,8 +202,7 @@ minetest.register_on_dieplayer(function(player)
203202
local pos_string = minetest.pos_to_string(pos)
204203

205204
-- return if keep inventory set or in creative mode
206-
if bones_mode == "keep" or (creative and creative.is_enabled_for
207-
and creative.is_enabled_for(player:get_player_name())) then
205+
if bones_mode == "keep" or minetest.is_creative_enabled(player_name) then
208206
minetest.log("action", player_name .. " dies at " .. pos_string ..
209207
". No bones placed")
210208
if bones_position_message then

Diff for: ‎mods/carts/cart_entity.lua

+2-4
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,7 @@ function cart_entity:on_punch(puncher, time_from_last_punch, tool_capabilities,
108108
end
109109
-- Pick up cart
110110
local inv = puncher:get_inventory()
111-
if not (creative and creative.is_enabled_for
112-
and creative.is_enabled_for(puncher:get_player_name()))
111+
if not minetest.is_creative_enabled(puncher:get_player_name())
113112
or not inv:contains_item("main", "carts:cart") then
114113
local leftover = inv:add_item("main", "carts:cart")
115114
-- If no room in inventory add a replacement cart to the world
@@ -416,8 +415,7 @@ minetest.register_craftitem("carts:cart", {
416415
minetest.sound_play({name = "default_place_node_metal", gain = 0.5},
417416
{pos = pointed_thing.above}, true)
418417

419-
if not (creative and creative.is_enabled_for
420-
and creative.is_enabled_for(placer:get_player_name())) then
418+
if not minetest.is_creative_enabled(placer:get_player_name()) then
421419
itemstack:take_item()
422420
end
423421
return itemstack

Diff for: ‎mods/creative/init.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,15 +79,15 @@ end
7979
-- Unlimited node placement
8080
minetest.register_on_placenode(function(pos, newnode, placer, oldnode, itemstack)
8181
if placer and placer:is_player() then
82-
return creative.is_enabled_for(placer:get_player_name())
82+
return minetest.is_creative_enabled(placer:get_player_name())
8383
end
8484
end)
8585

8686
-- Don't pick up if the item is already in the inventory
8787
local old_handle_node_drops = minetest.handle_node_drops
8888
function minetest.handle_node_drops(pos, drops, digger)
8989
if not digger or not digger:is_player() or
90-
not creative.is_enabled_for(digger:get_player_name()) then
90+
not minetest.is_creative_enabled(digger:get_player_name()) then
9191
return old_handle_node_drops(pos, drops, digger)
9292
end
9393
local inv = digger:get_inventory()

Diff for: ‎mods/creative/inventory.lua

+4-4
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function creative.init_creative_inventory(player)
3333
minetest.create_detached_inventory("creative_" .. player_name, {
3434
allow_move = function(inv, from_list, from_index, to_list, to_index, count, player2)
3535
local name = player2 and player2:get_player_name() or ""
36-
if not creative.is_enabled_for(name) or
36+
if not minetest.is_creative_enabled(name) or
3737
to_list == "main" then
3838
return 0
3939
end
@@ -44,7 +44,7 @@ function creative.init_creative_inventory(player)
4444
end,
4545
allow_take = function(inv, listname, index, stack, player2)
4646
local name = player2 and player2:get_player_name() or ""
47-
if not creative.is_enabled_for(name) then
47+
if not minetest.is_creative_enabled(name) then
4848
return 0
4949
end
5050
return -1
@@ -143,7 +143,7 @@ function creative.register_tab(name, title, items)
143143
sfinv.register_page("creative:" .. name, {
144144
title = title,
145145
is_in_nav = function(self, player, context)
146-
return creative.is_enabled_for(player:get_player_name())
146+
return minetest.is_creative_enabled(player:get_player_name())
147147
end,
148148
get = function(self, player, context)
149149
local player_name = player:get_player_name()
@@ -248,7 +248,7 @@ creative.register_tab("craftitems", S("Items"), registered_craftitems)
248248

249249
local old_homepage_name = sfinv.get_homepage_name
250250
function sfinv.get_homepage_name(player)
251-
if creative.is_enabled_for(player:get_player_name()) then
251+
if minetest.is_creative_enabled(player:get_player_name()) then
252252
return "creative:all"
253253
else
254254
return old_homepage_name(player)

Diff for: ‎mods/default/nodes.lua

+2-3
Original file line numberDiff line numberDiff line change
@@ -1998,8 +1998,7 @@ minetest.register_node("default:sand_with_kelp", {
19981998
not minetest.is_protected(pos_top, player_name) then
19991999
minetest.set_node(pos, {name = "default:sand_with_kelp",
20002000
param2 = height * 16})
2001-
if not (creative and creative.is_enabled_for
2002-
and creative.is_enabled_for(player_name)) then
2001+
if not minetest.is_creative_enabled(player_name) then
20032002
itemstack:take_item()
20042003
end
20052004
else
@@ -2054,7 +2053,7 @@ local function coral_on_place(itemstack, placer, pointed_thing)
20542053

20552054
node_under.name = itemstack:get_name()
20562055
minetest.set_node(pos_under, node_under)
2057-
if not (creative and creative.is_enabled_for(player_name)) then
2056+
if not minetest.is_creative_enabled(player_name) then
20582057
itemstack:take_item()
20592058
end
20602059

Diff for: ‎mods/default/trees.lua

+1-2
Original file line numberDiff line numberDiff line change
@@ -575,8 +575,7 @@ function default.sapling_on_place(itemstack, placer, pointed_thing,
575575
minetest.log("action", player_name .. " places node "
576576
.. sapling_name .. " at " .. minetest.pos_to_string(pos))
577577

578-
local take_item = not (creative and creative.is_enabled_for
579-
and creative.is_enabled_for(player_name))
578+
local take_item = not minetest.is_creative_enabled(player_name)
580579
local newnode = {name = sapling_name}
581580
local ndef = minetest.registered_nodes[sapling_name]
582581
minetest.set_node(pos, newnode)

Diff for: ‎mods/doors/init.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -330,7 +330,7 @@ function doors.register(name, def)
330330
meta:set_string("infotext", def.description .. "\n" .. S("Owned by @1", pn))
331331
end
332332

333-
if not (creative and creative.is_enabled_for and creative.is_enabled_for(pn)) then
333+
if not minetest.is_creative_enabled(pn) then
334334
itemstack:take_item()
335335
end
336336

@@ -590,7 +590,7 @@ function doors.register_trapdoor(name, def)
590590
meta:set_string("owner", pn)
591591
meta:set_string("infotext", def.description .. "\n" .. S("Owned by @1", pn))
592592

593-
return (creative and creative.is_enabled_for and creative.is_enabled_for(pn))
593+
return minetest.is_creative_enabled(pn)
594594
end
595595

596596
def.on_blast = function() end

Diff for: ‎mods/farming/api.lua

+8-8
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,14 @@ farming.hoe_on_use = function(itemstack, user, pointed_thing, uses)
4545
return
4646
end
4747

48-
if minetest.is_protected(pt.under, user:get_player_name()) then
49-
minetest.record_protection_violation(pt.under, user:get_player_name())
48+
local player_name = user and user:get_player_name() or ""
49+
50+
if minetest.is_protected(pt.under, player_name) then
51+
minetest.record_protection_violation(pt.under, player_name)
5052
return
5153
end
52-
if minetest.is_protected(pt.above, user:get_player_name()) then
53-
minetest.record_protection_violation(pt.above, user:get_player_name())
54+
if minetest.is_protected(pt.above, player_name) then
55+
minetest.record_protection_violation(pt.above, player_name)
5456
return
5557
end
5658

@@ -61,8 +63,7 @@ farming.hoe_on_use = function(itemstack, user, pointed_thing, uses)
6163
gain = 0.5,
6264
}, true)
6365

64-
if not (creative and creative.is_enabled_for
65-
and creative.is_enabled_for(user:get_player_name())) then
66+
if not minetest.is_creative_enabled(player_name) then
6667
-- wear tool
6768
local wdef = itemstack:get_definition()
6869
itemstack:add_wear(65535/(uses-1))
@@ -181,8 +182,7 @@ farming.place_seed = function(itemstack, placer, pointed_thing, plantname)
181182
minetest.pos_to_string(pt.above))
182183
minetest.add_node(pt.above, {name = plantname, param2 = 1})
183184
tick(pt.above)
184-
if not (creative and creative.is_enabled_for
185-
and creative.is_enabled_for(player_name)) then
185+
if not minetest.is_creative_enabled(player_name) then
186186
itemstack:take_item()
187187
end
188188
return itemstack

Diff for: ‎mods/fire/init.lua

+1-2
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ minetest.register_tool("fire:flint_and_steel", {
111111
minetest.set_node(pointed_thing.above, {name = "fire:basic_flame"})
112112
end
113113
end
114-
if not (creative and creative.is_enabled_for
115-
and creative.is_enabled_for(player_name)) then
114+
if not minetest.is_creative_enabled(player_name) then
116115
-- Wear tool
117116
local wdef = itemstack:get_definition()
118117
itemstack:add_wear(1000)

Diff for: ‎mods/fireflies/init.lua

+3-2
Original file line numberDiff line numberDiff line change
@@ -92,8 +92,9 @@ minetest.register_tool("fireflies:bug_net", {
9292
description = S("Bug Net"),
9393
inventory_image = "fireflies_bugnet.png",
9494
on_use = function(itemstack, player, pointed_thing)
95+
local player_name = player and player:get_player_name() or ""
9596
if not pointed_thing or pointed_thing.type ~= "node" or
96-
minetest.is_protected(pointed_thing.under, player:get_player_name()) then
97+
minetest.is_protected(pointed_thing.under, player_name) then
9798
return
9899
end
99100
local node_name = minetest.get_node(pointed_thing.under).name
@@ -106,7 +107,7 @@ minetest.register_tool("fireflies:bug_net", {
106107
minetest.add_item(pointed_thing.under, node_name.." 1")
107108
end
108109
end
109-
if not (creative and creative.is_enabled_for(player:get_player_name())) then
110+
if not minetest.is_creative_enabled(player_name) then
110111
itemstack:add_wear(256)
111112
return itemstack
112113
end

Diff for: ‎mods/flowers/init.lua

+1-2
Original file line numberDiff line numberDiff line change
@@ -312,8 +312,7 @@ local waterlily_def = {
312312
minetest.set_node(pos, {name = "flowers:waterlily" ..
313313
(def.waving == 3 and "_waving" or ""),
314314
param2 = math.random(0, 3)})
315-
if not (creative and creative.is_enabled_for
316-
and creative.is_enabled_for(player_name)) then
315+
if not minetest.is_creative_enabled(player_name) then
317316
itemstack:take_item()
318317
end
319318
else

Diff for: ‎mods/map/init.lua

+1-8
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,11 @@ map = {}
99
local S = minetest.get_translator("map")
1010

1111

12-
-- Cache creative mode setting
13-
14-
local creative_mode_cache = minetest.settings:get_bool("creative_mode")
15-
16-
1712
-- Update HUD flags
1813
-- Global to allow overriding
1914

2015
function map.update_hud_flags(player)
21-
local creative_enabled =
22-
(creative and creative.is_enabled_for(player:get_player_name())) or
23-
creative_mode_cache
16+
local creative_enabled = minetest.is_creative_enabled(player:get_player_name())
2417

2518
local minimap_enabled = creative_enabled or
2619
player:get_inventory():contains_item("main", "map:mapping_kit")

Diff for: ‎mods/map/mod.conf

-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
name = map
22
description = Minetest Game mod: map
33
depends = default, dye
4-
optional_depends = creative

Diff for: ‎mods/screwdriver/init.lua

+1-2
Original file line numberDiff line numberDiff line change
@@ -140,8 +140,7 @@ screwdriver.handler = function(itemstack, user, pointed_thing, mode, uses)
140140
minetest.check_for_falling(pos)
141141
end
142142

143-
if not (creative and creative.is_enabled_for and
144-
creative.is_enabled_for(player_name)) then
143+
if not minetest.is_creative_enabled(player_name) then
145144
itemstack:add_wear(65535 / ((uses or 200) - 1))
146145
end
147146

Diff for: ‎mods/stairs/init.lua

+1-3
Original file line numberDiff line numberDiff line change
@@ -197,8 +197,6 @@ function stairs.register_slab(subname, recipeitem, groups, images, description,
197197
local under = minetest.get_node(pointed_thing.under)
198198
local wield_item = itemstack:get_name()
199199
local player_name = placer and placer:get_player_name() or ""
200-
local creative_enabled = (creative and creative.is_enabled_for
201-
and creative.is_enabled_for(player_name))
202200

203201
if under and under.name:find("^stairs:slab_") then
204202
-- place slab using under node orientation
@@ -217,7 +215,7 @@ function stairs.register_slab(subname, recipeitem, groups, images, description,
217215

218216
-- else attempt to place node with proper param2
219217
minetest.item_place_node(ItemStack(wield_item), placer, pointed_thing, p2)
220-
if not creative_enabled then
218+
if not minetest.is_creative_enabled(player_name) then
221219
itemstack:take_item()
222220
end
223221
return itemstack

0 commit comments

Comments
 (0)
Please sign in to comment.