Minor changes and improvements

.luacheckrc

@@ -1,6 +1,6 @@
 unused_args = true
 allow_defined_top = true
-max_line_length = 160
+max_line_length = 140
 
 ignore = {
 	"122", -- setting a read-only field of a global variable

files/bucket/init.lua

@@ -130,8 +130,7 @@ function bucket.register_liquid(source, flowing, itemname, inventory_image, name
 
 				minetest.set_node(lpos, {name = source})
 				if place_restriction
-						or not (creative and creative.is_enabled_for
-						and creative.is_enabled_for(pn)) then
+						or not minetest.is_creative_enabled(pn) then
 					return ItemStack("bucket:bucket_empty")
 				else
 					return itemstack
@@ -268,7 +267,7 @@ bucket.register_liquid(
 
 -- Milk Bucket
 minetest.register_craftitem("bucket:bucket_milk", {
-	description = "Milk Bucket",
+	description = S"Milk Bucket",
 	inventory_image = "bucket.png^bucket_milk.png",
 	stack_max = 1,
 	on_use = minetest.item_eat(8, "bucket:bucket_empty"),

files/carts/cart_entity.lua

@@ -1,5 +1,6 @@
 local abs, floor, min, pi = math.abs, math.floor, math.min, math.pi
-local vector_add, vector_equals, vector_length, vector_multiply, vector_round = vector.add, vector.equals, vector.length, vector.multiply, vector.round
+local vector_add, vector_equals, vector_length, vector_multiply, vector_round =
+	vector.add, vector.equals, vector.length, vector.multiply, vector.round
 local sp = minetest.is_singleplayer()
 
 local cart_entity = {
@@ -123,8 +124,7 @@ function cart_entity:on_punch(puncher, time_from_last_punch, tool_capabilities)
 		end
 		-- Pick up cart
 		local inv = puncher:get_inventory()
-		if not (creative and creative.is_enabled_for
-				and creative.is_enabled_for(puncher_name))
+		if not minetest.is_creative_enabled(puncher_name)
 				or not inv:contains_item("main", "carts:cart") then
 			local leftover = inv:add_item("main", "carts:cart")
 			-- If no room in inventory add a replacement cart to the world
@@ -486,13 +486,14 @@ minetest.register_node("carts:cart", {
 				return itemstack
 			end
 
-			cart:get_luaentity().owner = placer:get_player_name()
+			local player_name = placer:get_player_name()
+
+			cart:get_luaentity().owner = player_name
 
 			minetest.sound_play({name = "default_place_node_metal", gain = 0.5},
 				{pos = pointed_thing.above})
 
-			if not (creative and creative.is_enabled_for and
-					creative.is_enabled_for(placer)) or
+			if not minetest.is_creative_enabled(player_name) or
 					not sp then
 				itemstack:take_item()
 			end

files/default/craftitems.lua

@@ -270,8 +270,7 @@ minetest.register_craftitem("default:snowball", {
 	on_use = default.snow_shoot_snowball,
 	on_place = function(itemstack, placer, pointed_thing)
 		if minetest.item_place_node(ItemStack("default:snow"), placer, pointed_thing) then
-			if not (creative and creative.is_enabled_for
-					and creative.is_enabled_for(placer)) then
+			if not minetest.is_creative_enabled(placer:get_player_name()) then
 				itemstack:take_item()
 			end
 		end

files/default/functions.lua

@@ -729,8 +729,7 @@ function default.snow_shoot_snowball(itemstack, thrower)
 			gain = 0.7,
 			max_hear_distance = 10
 		})
-		if not (creative and creative.is_enabled_for and
-				creative.is_enabled_for(thrower)) or
+		if not minetest.is_creative_enabled(thrower:get_player_name()) or
 				not minetest.is_singleplayer() then
 			itemstack:take_item()
 		end

files/default/nodes.lua

@@ -1787,7 +1787,7 @@ default.register_ladder("default:ladder_pine_wood", {
 })
 
 default.register_ladder("default:ladder_cherry_blossom_wood", {
-	description = "Cherry Blossom Ladder",
+	description = "Cherry Blossom Wood Ladder",
 	tiles = {"default_cherry_blossom_wood.png"},
 	inventory_image = "default_ladder_cherry_blossom_wood.png",
 	wield_image = "default_ladder_cherry_blossom_wood.png",

files/default/trees.lua

@@ -267,8 +267,7 @@ function default.sapling_on_place(itemstack, placer, pointed_thing,
 	minetest.log("action", player_name .. " places node "
 			.. sapling_name .. " at " .. minetest.pos_to_string(pos))
 
-	local take_item = not (creative and creative.is_enabled_for
-		and creative.is_enabled_for(player_name))
+	local take_item = not minetest.is_creative_enabled(player_name)
 	local newnode = {name = sapling_name}
 	local ndef = minetest.registered_nodes[sapling_name]
 	minetest.set_node(pos, newnode)

files/farming/farming/api.lua

@@ -41,8 +41,7 @@ function farming.hoe_on_use(itemstack, user, pt, uses)
 		gain = 0.5
 	})
 
-	if creative and creative.is_enabled_for
-			and creative.is_enabled_for(user:get_player_name()) then
+	if minetest.is_creative_enabled(playername) then
 		return
 	end
 
@@ -137,8 +136,7 @@ function farming.place_seed(itemstack, placer, pt, plantname)
 	minetest.add_node(pt.above, {name = plantname, param2 = 1})
 	tick(pt.above)
 
-	if creative and creative.is_enabled_for
-			and creative.is_enabled_for(playername) then
+	if minetest.is_creative_enabled(playername) then
 		return
 	end
 

files/farming/farming/init.lua

@@ -30,7 +30,7 @@ farming.register_plant("farming:wheat", {
 	minlight = 12,
 	fertility = {"grassland"},
 	place_param2 = 3,
-	groups = {food_wheat = 1, flammable = 4}
+	groups = {food_wheat = 1, flammable = 4, wieldview = 2}
 })
 
 minetest.register_craftitem("farming:flour", {

files/farming/farming_addons/cocoa.lua

@@ -65,11 +65,10 @@ function farming_addons.place_cocoa_bean(itemstack, placer, pointed_thing)
 			pointed_thing) or itemstack
 	end
 
-	local player_name = placer and placer:get_player_name()
+	local player_name = placer and placer:get_player_name() or ""
 
-	if player_name and
-			(minetest.is_protected(pt.under, player_name) or
-			minetest.is_protected(pt.above, player_name)) then
+	if minetest.is_protected(pt.under, player_name) or
+			minetest.is_protected(pt.above, player_name) then
 		minetest.record_protection_violation(pt.under, player_name)
 		return itemstack
 	end
@@ -104,8 +103,7 @@ function farming_addons.place_cocoa_bean(itemstack, placer, pointed_thing)
 	minetest.set_node(pt.above, {name = "farming_addons:cocoa_1", param2 = new_param2})
 
 	tick(pt.above)
-	if player_name and not (creative and creative.is_enabled_for
-			and creative.is_enabled_for(player_name)) then
+	if not minetest.is_creative_enabled(player_name) then
 		itemstack:take_item()
 	end
 	return itemstack

files/fire/init.lua

@@ -84,7 +84,7 @@ minetest.register_tool("fire:flint_and_steel", {
 		local sound_pos = pointed_thing.above or user:get_pos()
 		minetest.sound_play("fire_flint_and_steel",
 			{pos = sound_pos, gain = 0.5, max_hear_distance = 8})
-		local player_name = user:get_player_name()
+		local player_name = user and user:get_player_name() or ""
 		if pointed_thing.type == "node" then
 			local node_under = minetest.get_node(pointed_thing.under).name
 			local nodedef = minetest.registered_nodes[node_under]
@@ -102,8 +102,7 @@ minetest.register_tool("fire:flint_and_steel", {
 				minetest.set_node(pointed_thing.above, {name = "fire:basic_flame"})
 			end
 		end
-		if not (creative and creative.is_enabled_for
-				and creative.is_enabled_for(player_name)) then
+		if not minetest.is_creative_enabled(player_name) then
 			-- Wear tool
 			local wdef = itemstack:get_definition()
 

files/flowers/init.lua

@@ -463,8 +463,7 @@ minetest.register_node("flowers:waterlily", {
 			if not minetest.is_protected(pos, player_name) then
 				minetest.set_node(pos, {name = "flowers:waterlily",
 					param2 = random(0, 3)})
-				if not (creative and creative.is_enabled_for
-						and creative.is_enabled_for(player_name)) then
+				if not minetest.is_creative_enabled(player_name) then
 					itemstack:take_item()
 				end
 			end

files/furniture/ts_furniture/locale/ts_furniture.ru.tr

@@ -13,3 +13,4 @@ Pine=Соснов.
 Acacia=Акациев.
 Wooden=Яблочн.
 Jungle Wood=Джунгли
+Cherry Blossom=Сакуров.

files/player/pep/init.lua

@@ -1,9 +1,11 @@
 pep = {}
 
+local sp = minetest.is_singleplayer()
+
 local translator = minetest.get_translator
 local S = translator and translator("pep") or intllib.make_gettext_pair()
 
-if translator and not minetest.is_singleplayer() then
+if translator and not sp then
 	local lang = minetest.settings:get("language")
 	if lang and lang == "ru" then
 		S = intllib.make_gettext_pair()
@@ -122,9 +124,7 @@ local function use_potion(itemstack, user, pointed_thing, throw)
 		apply_potion(user, pos, potion)
 	end
 
-	if not (creative and creative.is_enabled_for
-			and creative.is_enabled_for(user:get_player_name())) or
-			not minetest.is_singleplayer() then
+	if not minetest.is_creative_enabled(user:get_player_name()) or not sp then
 		itemstack:take_item()
 		if not throw then
 			local inventory = user:get_inventory()
@@ -454,7 +454,7 @@ function pep.moledig(playername)
 		if not minetest.is_protected(digpos, playername) then
 			local node = minetest.get_node(digpos)
 			local def = minetest.registered_nodes[node.name]
-			if def.walkable and def.diggable and
+			if def and def.walkable and def.diggable and
 					(def.can_dig == nil or def.can_dig(digpos, player)) then
 				minetest.node_dig(digpos, node, player)
 

files/player/playereffects/init.lua

@@ -77,7 +77,8 @@ function playereffects.next_effect_id()
 end
 
 --[=[ API functions ]=]
-function playereffects.register_effect_type(effect_type_id, description, icon, groups, apply, cancel, hidden, cancel_on_death, repeat_interval)
+function playereffects.register_effect_type(effect_type_id, description, icon,
+		groups, apply, cancel, hidden, cancel_on_death, repeat_interval)
 	local effect_type = {}
 	effect_type.description = description
 	effect_type.apply = apply

files/toolranks/init.lua

@@ -79,8 +79,7 @@ function toolranks.new_afteruse(itemstack, user, _, digparams)
 		C.grey .. S("Uses: @1", dugnodes))
 
 	-- Set wear level
-	if not (creative and creative.is_enabled_for
-			and creative.is_enabled_for(name)) then
+	if not minetest.is_creative_enabled(name) then
 		local wear = digparams.wear
 		if level > 1 then
 			wear = digparams.wear * 4 / (4 + level)

files/villages/mobs_npc/npc.lua

@@ -16,7 +16,7 @@ for k = 1, 3 do
 		"mobs_npc_man.png" .. "^" ..
 		"mobs_npc_man_hair" .. i .. ".png" .. "^" ..
 		"mobs_npc_man_pants" .. j .. ".png" .. "^" ..
-		"mobs_npc_man_shirt" .. k .. ".png", b, b, b, b
+		"mobs_npc_man_shirt" .. k .. ".png", b, b
 	}
 	mcount = mcount + 1
 end
@@ -37,7 +37,7 @@ mobs:register_mob("mobs_npc:npc_man", {
 	mesh = "mobs_npc.b3d",
 	textures = mtextures,
 --[[child_texture = {
-		{"mobs_npc_baby.png", b, b, b}
+		{"mobs_npc_baby.png", b, b}
 	},]]
 	makes_footstep_sound = true,
 	sounds = {},
@@ -111,7 +111,7 @@ for k = 1, 3 do
 		"mobs_npc_woman.png" .. "^" ..
 		"mobs_npc_woman_hair" .. i .. ".png" .. "^" ..
 		"mobs_npc_woman_pants" .. j .. ".png" .. "^" ..
-		"mobs_npc_woman_shirt" .. k .. ".png", b, b, b, b
+		"mobs_npc_woman_shirt" .. k .. ".png", b, b
 	}
 	wcount = wcount + 1
 end
@@ -132,7 +132,7 @@ mobs:register_mob("mobs_npc:npc_woman", {
 	mesh = "mobs_npc.b3d",
 	textures = wtextures,
 --[[child_texture = {
-		{"mobs_npc_baby.png", b, b, b}
+		{"mobs_npc_baby.png", b, b}
 	},]]
 	makes_footstep_sound = true,
 	sounds = {},

files/villages/mobs_npc/trader.lua

@@ -14,9 +14,9 @@ mobs:register_mob("mobs_npc:trader", {
 	visual = "mesh",
 	mesh = "mobs_npc.b3d",
 	textures = {
-		{"mobs_trader.png^mobs_trader1.png", b, b, b, b},
-		{"mobs_trader.png^mobs_trader2.png", b, b, b, b},
-		{"mobs_trader.png^mobs_trader3.png", b, b, b, b}
+		{"mobs_trader.png^mobs_trader1.png", b, b},
+		{"mobs_trader.png^mobs_trader2.png", b, b},
+		{"mobs_trader.png^mobs_trader3.png", b, b}
 	},
 	makes_footstep_sound = true,
 	sounds = {},
@@ -247,11 +247,13 @@ function mobs_trader.trader_show_goods(self, clicker, race)
 
 			formspec_trade_list = formspec_trade_list ..
 					"item_image[" .. x .. "," .. y .. ";1,1;" .. trades[i][2] .. "]" ..
-					"image_button[" .. x .. "," .. y .. ";1,1;formspec_cell.png;prices#" .. i .. "#" .. id .. ";;;false;formspec_cell.png^formspec_item_pressed.png]" ..
+					"image_button[" .. x .. "," .. y .. ";1,1;formspec_cell.png;prices#" .. i .. "#" .. id ..
+						";;;false;formspec_cell.png^formspec_item_pressed.png]" ..
 					"tooltip[prices#" .. i .. "#" .. id .. ";" .. tooltip_prices .. "]" ..
 					"image[".. x + 1 ..",".. y ..";1,1;default_arrow_bg.png^[transformR270]" ..
 					"item_image[" .. x + 2 .. "," .. y .. ";1,1;" .. trades[i][1] .. "]" ..
-					"image_button[" .. x + 2 .. "," .. y .. ";1,1;formspec_cell.png;goods#" .. i .. "#" .. id .. ";;;false;formspec_cell.png^formspec_item_pressed.png]" ..
+					"image_button[" .. x + 2 .. "," .. y .. ";1,1;formspec_cell.png;goods#" .. i .. "#" .. id ..
+						";;;false;formspec_cell.png^formspec_item_pressed.png]" ..
 					"tooltip[goods#" .. i .. "#" .. id .. ";" .. tooltip_goods .. "]"
 		end
 	end