Clean up default

mods/default/armor.lua

@@ -40,7 +40,7 @@ default.armor_update = function(player, heal, list, old_hp)
 		local stack = armor_inv:get_stack("armor_"..v, 1)
 		if stack:get_count() > 0 then
 			if heal and old_hp~=nil and now_hp < old_hp then
-				local use = stack:get_definition().groups["armor_use"] or 9--0
+				local use = stack:get_definition().groups["armor_use"] or 0
 				local heal_p = stack:get_definition().groups["armor_heal"] or 0
 				local item = stack:get_name()
 				local damage_amount = (old_hp-now_hp)/2

mods/default/conifers.lua

@@ -37,16 +37,13 @@ minetest.register_on_generated(function(minp, maxp, seed)
 		return
 	end
 
-	--local t1 = os.clock()
 	local x1 = maxp.x
 	local y1 = maxp.y
 	local z1 = maxp.z
 	local x0 = minp.x
 	local y0 = minp.y
 	local z0 = minp.z
-	
+
-	--print ("[]chunk minp ("..x0.." "..y0.." "..z0..")")
-	
 	local vm, emin, emax = minetest.get_mapgen_object("voxelmanip")
 	local area = VoxelArea:new{MinEdge=emin, MaxEdge=emax}
 	local data = vm:get_data()
@@ -81,11 +78,9 @@ minetest.register_on_generated(function(minp, maxp, seed)
 		nixz = nixz + 1 -- increment 2D noise index
 	end
 	end
-	
+
 	vm:set_data(data)
 	vm:set_lighting({day=0, night=0})
 	vm:calc_lighting()
 	vm:write_to_map(data)
-	--local chugent = math.ceil((os.clock() - t1) * 1000)
-	--print ("[] "..chugent.." ms")
 end)

mods/default/functions.lua

@@ -8,42 +8,6 @@ function default.spawn_falling_node(p, nodename)
 	spawn_falling_node(p, nodename)
 end
 
--- Horrible crap to support old code
--- Don't use this and never do what this does, it's completely wrong!
--- (More specifically, the client and the C++ code doesn't get the group)
-function default.register_falling_node(nodename, texture)
-	minetest.log("error", debug.traceback())
-	minetest.log('error', "WARNING: default.register_falling_node is deprecated")
-	if minetest.registered_nodes[nodename] then
-		minetest.registered_nodes[nodename].groups.falling_node = 1
-	end
-end
-
---
--- Global callbacks
---
-
--- Global environment step function
-function on_step(dtime)
-	-- print("on_step")
-end
-minetest.register_globalstep(on_step)
-
-function on_placenode(p, node)
-	--print("on_placenode")
-end
-minetest.register_on_placenode(on_placenode)
-
-function on_dignode(p, node)
-	--print("on_dignode")
-end
-minetest.register_on_dignode(on_dignode)
-
-function on_punchnode(p, node)
-end
-minetest.register_on_punchnode(on_punchnode)
-
-
 --
 -- Remove grass
 --
@@ -64,8 +28,6 @@ minetest.register_abm({
         end
 })
 
-
-
 --
 -- Lavacooling
 --
@@ -135,16 +97,13 @@ minetest.register_abm({
 	chance = 5,
 
 	action = function(p0, node, _, _)
-		--print("leafdecay ABM at "..p0.x..", "..p0.y..", "..p0.z..")")
 		local do_preserve = false
 		local d = minetest.registered_nodes[node.name].groups.leafdecay
 		if not d or d == 0 then
-			--print("not groups.leafdecay")
 			return
 		end
 		local n0 = minetest.get_node(p0)
 		if n0.param2 ~= 0 then
-			--print("param2 ~= 0")
 			return
 		end
 		local p0_hash = nil
@@ -159,7 +118,6 @@ minetest.register_abm({
 					--print("cached trunk still exists")
 					return
 				end
-				--print("cached trunk is invalid")
 				-- Cache is invalid
 				table.remove(default.leafdecay_trunk_cache, p0_hash)
 			end
@@ -174,7 +132,6 @@ minetest.register_abm({
 		if p1 then
 			do_preserve = true
 			if default.leafdecay_enable_cache then
-				--print("caching trunk")
 				-- Cache the trunk
 				default.leafdecay_trunk_cache[p0_hash] = p1
 			end
@@ -224,7 +181,6 @@ minetest.register_abm({
 	interval = 1,
 	chance = 1,
 	action = function(pos, node, active_object_count, active_object_count_wider)
-		--pos.y =pos.y-0.4
 		for _,object in ipairs(minetest.env:get_objects_inside_radius(pos, 15.1/16)) do--1.3
 			if object:get_hp() > 0 then
 				object:set_hp(object:get_hp()-1)

mods/default/hud.lua

@@ -2,7 +2,6 @@ default.hud = {}
 -- HUD statbar values
 default.hud.health = {}
 default.hud.hunger = {}
-default.hud.air = {}
 default.hud.armor = {}
 default.hud.hunger_out = {}
 default.hud.armor_out = {}
@@ -10,7 +9,6 @@ default.hud.armor_out = {}
 -- HUD item ids
 local health_hud = {}
 local hunger_hud = {}
-local air_hud = {}
 local armor_hud = {}
 local armor_hud_bg = {}
 
@@ -96,8 +94,7 @@ local function custom_hud(player)
 	})
 
  --air
-	minetest.hud_replace_builtin("breath", 
+	minetest.hud_replace_builtin("breath", {
-	{
 		hud_elem_type = "statbar",
 		position = HUD_AIR_POS,
 		size = {x=24,y=24},
@@ -105,7 +102,7 @@ local function custom_hud(player)
 		number = 0,
 		alignment = {x=-1,y=-1},
 		offset = HUD_AIR_OFFSET,
-	})--air_hud[name] = player:hud_add(
+	})
 
  --armor
  if HUD_SHOW_ARMOR then
@@ -131,25 +128,10 @@ local function custom_hud(player)
  end
 end
 
---needs to be defined for older version of 3darmor
-function default.hud.set_armor()
-end
-
-
---if HUD_ENABLE_HUNGER then dofile(minetest.get_modpath("hud").."/hunger.lua") end
---if HUD_SHOW_ARMOR then dofile(minetest.get_modpath("hud").."/armor.lua") end
-
 -- update hud elemtens if value has changed
 local function update_hud(player, item)
 	local name = player:get_player_name()
- --[[air
+
-	local air = tonumber(default.hud.air[name])
-	if player:get_breath() ~= air then
-		air = player:get_breath()
-		default.hud.air[name] = air
-		if air > 10 then air = 0 end
-		player:hud_change(air_hud[name], "number", air*2)
-	end]]
  --health
 	local hp = tonumber(default.hud.health[name])
 	if item == "health" and player:get_hp() ~= hp then
@@ -194,12 +176,13 @@ function default.hud.event_handler(player, eventname)
 
 	if eventname == "health_changed" then
 		update_hud(player, "health")
-		--update_armor()
+		if player:get_hp() < 1 then
+			default.player_set_animation(player, "lay")
+		end
 		return true
 	end
 
 	if eventname == "breath_changed" then
-		--update_hud(player)
 		return true
 	end
 
@@ -267,6 +250,7 @@ minetest.register_on_joinplayer(function(player)
 end)
 
 minetest.register_on_respawnplayer(function(player)
+	default.player_set_animation(player, "stand", 25)
 	-- reset player breath since the engine doesnt
 	player:set_breath(11)
 	-- reset hunger (and save)

mods/default/hunger.lua

@@ -35,11 +35,6 @@ minetest.after(2.5, function()
 					default.hud.set_hunger(player)
 				end
 			 end
-			 -- update current armor level
-			 --if HUD_SHOW_ARMOR then default.hud.get_armor(player) end
-
-			 -- update all hud elements
-			 --update_hud(player)
 			end
 		 end
 		

mods/default/init.lua

@@ -12,24 +12,35 @@ SNOW_START = 27
 -- Definitions made by this mod that other mods can use too
 default = {}
 
--- Load files
+local load_more = true
+
+-- Check engine version and load files
+if dump(minetest.hud_replace_builtin) == "nil" then
+	load_more = false
+	minetest.after(3,function()
+		minetest.chat_send_all("#WARNING: Your version of Minetest is outdated and can't run Minetest+ properly")
+	end)
+end
+
 dofile(minetest.get_modpath("default").."/functions.lua")
 dofile(minetest.get_modpath("default").."/sounds.lua")
 dofile(minetest.get_modpath("default").."/nodes.lua")
 dofile(minetest.get_modpath("default").."/plants.lua")
-dofile(minetest.get_modpath("default").."/tools.lua")
-dofile(minetest.get_modpath("default").."/food.lua")
-dofile(minetest.get_modpath("default").."/growing.lua")
-dofile(minetest.get_modpath("default").."/intweak.lua")
-dofile(minetest.get_modpath("default").."/craftitems.lua")
-dofile(minetest.get_modpath("default").."/crafting.lua")
-dofile(minetest.get_modpath("default").."/trees.lua")
-dofile(minetest.get_modpath("default").."/jungle.lua")
-dofile(minetest.get_modpath("default").."/conifers.lua")
 dofile(minetest.get_modpath("default").."/mapgen.lua")
-dofile(minetest.get_modpath("default").."/player.lua")
-dofile(minetest.get_modpath("default").."/armor.lua")
-dofile(minetest.get_modpath("default").."/hud.lua")
-dofile(minetest.get_modpath("default").."/hunger.lua")
-dofile(minetest.get_modpath("default").."/torches.lua")
 
+if load_more then
+	dofile(minetest.get_modpath("default").."/tools.lua")
+	dofile(minetest.get_modpath("default").."/food.lua")
+	dofile(minetest.get_modpath("default").."/growing.lua")
+	dofile(minetest.get_modpath("default").."/intweak.lua")
+	dofile(minetest.get_modpath("default").."/craftitems.lua")
+	dofile(minetest.get_modpath("default").."/crafting.lua")
+	dofile(minetest.get_modpath("default").."/trees.lua")
+	dofile(minetest.get_modpath("default").."/jungle.lua")
+	dofile(minetest.get_modpath("default").."/conifers.lua")
+	dofile(minetest.get_modpath("default").."/player.lua")
+	dofile(minetest.get_modpath("default").."/armor.lua")
+	dofile(minetest.get_modpath("default").."/hud.lua")
+	dofile(minetest.get_modpath("default").."/hunger.lua")
+	dofile(minetest.get_modpath("default").."/torches.lua")
+end

mods/default/jungle.lua

@@ -20,10 +20,6 @@ local np_snow = {
 	persist = 0.5
 }
 
--- Stuff
-
-rainforest = {}
-
 -- Nodes
 
 --[[minetest.register_node("rainforest:vine", {
@@ -46,44 +42,41 @@ local grow_jungletree = default.grow_jungletree
 -- On generated function
 local snow_value = SNOW_START/2+3
 
+local c_grass = minetest.get_content_id("default:dirt_with_grass")
+local c_jgrass = {}
+c_jgrass[1] = minetest.get_content_id("default:junglegrass")
+c_jgrass[2] = minetest.get_content_id("default:junglegrass_small")
+local c_tree = minetest.get_content_id("default:tree")
+local c_leaves = minetest.get_content_id("default:leaves")
+local c_apple = minetest.get_content_id("default:apple")
+local c_air = minetest.get_content_id("air")
+
 minetest.register_on_generated(function(minp, maxp, seed)
 	if minp.y ~= -32 then
 		return
 	end
 
-	if minp.y >= snow_value then-- or maxp.y >= SNOW_START then
+	if minp.y >= snow_value then
 		return
 	end
 
-	--local t1 = os.clock()
 	local x1 = maxp.x
 	local y1 = maxp.y
 	local z1 = maxp.z
 	local x0 = minp.x
 	local y0 = minp.y
 	local z0 = minp.z
-	
+
-	--print ("[rainforest] chunk minp ("..x0.." "..y0.." "..z0..")")
-	
 	local vm, emin, emax = minetest.get_mapgen_object("voxelmanip")
 	local area = VoxelArea:new{MinEdge=emin, MaxEdge=emax}
 	local data = vm:get_data()
-	
+
-	local c_grass = minetest.get_content_id("default:dirt_with_grass")
-	local c_jgrass = {}
-	c_jgrass[1] = minetest.get_content_id("default:junglegrass")
-	c_jgrass[2] = minetest.get_content_id("default:junglegrass_small")
-	local c_tree = minetest.get_content_id("default:tree")
-	local c_leaves = minetest.get_content_id("default:leaves")
-	local c_apple = minetest.get_content_id("default:apple")
-	local c_air = minetest.get_content_id("air")
-	
 	local sidelen = x1 - x0 + 1
 	local chulens = {x=sidelen, y=sidelen, z=sidelen}
 	local minposxz = {x=x0, y=z0}
-	
+
 	local nvals_snow = minetest.get_perlin_map(np_snow, chulens):get2dMap_flat(minposxz)
-	
+
 	local nixz = 1 -- 2D noise index
 	for z = z0, z1 do
 	for x = x0, x1 do
@@ -112,11 +105,9 @@ minetest.register_on_generated(function(minp, maxp, seed)
 		nixz = nixz + 1 -- increment 2D noise index
 	end
 	end
-	
+
 	vm:set_data(data)
 	vm:set_lighting({day=0, night=0})
 	vm:calc_lighting()
 	vm:write_to_map(data)
-	--local chugent = math.ceil((os.clock() - t1) * 1000)
-	--print ("[rainforest] "..chugent.." ms")
 end)

mods/default/mapgen.lua

@@ -285,7 +285,6 @@ function default.generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume
 	local pr = PseudoRandom(seed)
 	local num_chunks = math.floor(chunks_per_volume * volume)
 	local inverse_chance = math.floor(chunk_size*chunk_size*chunk_size / ore_per_chunk)
-	--print("generate_ore num_chunks: "..dump(num_chunks))
 	for i=1,num_chunks do
 		local y0 = pr:next(y_min, y_max-chunk_size+1)
 		if y0 >= height_min and y0 <= height_max then
@@ -309,7 +308,6 @@ function default.generate_ore(name, wherein, minp, maxp, seed, chunks_per_volume
 			end
 		end
 	end
-	--print("generate_ore done")
 end
 
 function default.make_papyrus(pos, size)

mods/default/nodes.lua

@@ -116,7 +116,6 @@ minetest.register_node("default:dirt_with_snow", {
 	tiles = {"default_snow.png", "default_dirt.png", "default_dirt.png^default_snow_side.png"},
 	is_ground_content = true,
 	groups = {crumbly=3},
-	--drop = 'default:dirt',
 	drop = {
 		items = {
 			{items = {'default:snow'},rarity = 1.2},
@@ -340,7 +339,6 @@ minetest.register_alias("junglesapling", "default:junglesapling")
 minetest.register_node("default:leaves", {
 	description = "Leaves",
 	drawtype = "allfaces_optional",
-	--visual_scale = 1.3,
 	waving = 1,
 	tiles = {"default_leaves.png"},
 	paramtype = "light",
@@ -425,9 +423,6 @@ minetest.register_node("default:ladder", {
 	climbable = true,
 	selection_box = {
 		type = "wallmounted",
-		--wall_top = = <default>
-		--wall_bottom = = <default>
-		--wall_side = = <default>
 	},
 	groups = {choppy=2,oddly_breakable_by_hand=3,flammable=2},
 	legacy_wallmounted = true,
@@ -591,21 +586,16 @@ minetest.register_node("default:sign_wall", {
 	walkable = false,
 	selection_box = {
 		type = "wallmounted",
-		--wall_top = <default>
-		--wall_bottom = <default>
-		--wall_side = <default>
 	},
 	groups = {choppy=2,dig_immediate=2,attached_node=1},
 	legacy_wallmounted = true,
 	sounds = default.node_sound_defaults(),
 	on_construct = function(pos)
-		--local n = minetest.get_node(pos)
 		local meta = minetest.get_meta(pos)
 		meta:set_string("formspec", "field[text;;${text}]")
 		meta:set_string("infotext", "\"\"")
 	end,
 	on_receive_fields = function(pos, formname, fields, sender)
-		--print("Sign at "..minetest.pos_to_string(pos).." got "..dump(fields))
 		local meta = minetest.get_meta(pos)
 		fields.text = fields.text or ""
 		print((sender:get_player_name() or "").." wrote \""..fields.text..
@@ -999,7 +989,7 @@ minetest.register_abm({
 					meta:get_float("fuel_totaltime") * 100)
 			for i=0, 0.4, 0.1 do
 				local dpos = default.facedir_to_dir(node.param2)
-				default.add_fire({x=pos.x+dpos.x, y=pos.y-0.52, z=pos.z+dpos.z}, 2-percent*0.01)--facedir auslesen
+				default.add_fire({x=pos.x+dpos.x, y=pos.y-0.52, z=pos.z+dpos.z}, 2-percent*0.01)
 			end
 			meta:set_string("infotext","Furnace active: "..percent.."%")
 			swap_node(pos,"default:furnace_active")
@@ -1174,12 +1164,10 @@ minetest.register_node("default:ice", {
 	description = "Ice",
 	tiles = {"default_ice.png"},
 	is_ground_content = true,
-	--use_texture_alpha = true,
 	inventory_image = minetest.inventorycube("default_ice.png"),
 	drawtype = "glasslike",
 	paramtype = "light",
 	groups = {cracky=3},
-	--alpha = WATER_ALPHA,
 	sounds = default.node_sound_glass_defaults(),
 })
 

mods/default/plants.lua

@@ -222,7 +222,6 @@ for i=1,8 do
 end
 
 minetest.register_node("default:wild_wheat", {
-		--drawtype = "nodebox",
 		drawtype = "plantlike",
 		tiles = {"default_wheat_7.png"},
 		paramtype = "light",

mods/default/player.lua

@@ -51,8 +51,6 @@ model_def = {
 ]]
 
 default.player = {}
---default.player.armor = {}
-
 
 -- Player animation blending
 -- Note: This is currently broken due to a bug in Irrlicht, leave at 0
@@ -161,22 +159,19 @@ local function get_wielded(player, txtures)
 	end
 	txtures[3] = i_txt
 	txtures[4] = b_txt
-	--print(dump(i_txt))
 	return txtures, update
 end
 
 function default.player_set_textures(player, textures)
 	local name = player:get_player_name()
 	if not textures then
-		--local name = player:get_player_name()
 		textures = player_textures[name]
 	else
 		player_wielded[name] = ""
 	end
 	local new_textures = get_wielded(player, textures)
 	player_textures[name] = new_textures
-	--print(dump(new_textures))
+	player:set_properties({textures = new_textures})
-	player:set_properties({textures = new_textures,})
 end
 
 function default.player_set_animation(player, anim_name, speed)
@@ -270,9 +265,7 @@ minetest.register_globalstep(function(dtime)
 			end
 
 			-- Apply animations based on what the player is doing
-			if player:get_hp() == 0 then
+			if walking then
-				player_set_animation(player, "lay")
-			elseif walking then
 				if player_sneak[name] ~= controls.sneak then
 					player_anim[name] = nil
 					player_sneak[name] = controls.sneak

mods/default/sounds.lua

@@ -25,8 +25,6 @@ function default.node_sound_dirt_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
 			{name="", gain=0.5}
-	--table.dug = table.dug or
-	--		{name="default_dirt_break", gain=0.5}
 	default.node_sound_defaults(table)
 	return table
 end
@@ -35,8 +33,6 @@ function default.node_sound_sand_defaults(table)
 	table = table or {}
 	table.footstep = table.footstep or
 			{name="default_grass_footstep", gain=0.25}
-	--table.dug = table.dug or
-	--		{name="default_dirt_break", gain=0.25}
 	table.dug = table.dug or
 			{name="default_grass_footstep.2", gain=0.25}
 	default.node_sound_defaults(table)

mods/default/tools.lua

@@ -1,22 +1,5 @@
 -- mods/default/tools.lua
 
--- The hand
-minetest.register_item(":", {
-	type = "none",
-	wield_image = "wieldhand.png",
-	wield_scale = {x=1,y=1,z=2.5},
-	tool_capabilities = {
-		full_punch_interval = 0.9,
-		max_drop_level = 0,
-		groupcaps = {
-			crumbly = {times={[2]=3.00, [3]=0.70}, uses=0, maxlevel=1},
-			snappy = {times={[3]=0.40}, uses=0, maxlevel=1},
-			oddly_breakable_by_hand = {times={[1]=6.70,[2]=4.00,[3]=1.40,[4]=30.00}, uses=0, maxlevel=3}
-		},
-		damage_groups = {fleshy=1},
-	}
-})
-
 --
 -- Picks
 --
@@ -389,9 +372,11 @@ minetest.register_tool("default:hoe_diamond", {
 	end,
 })
 
---armor
+--
--- Regisiter Head Armor
+-- Armor
+--
 
+-- Head Armor
 minetest.register_tool("default:armor_helmet_wood", {
 	description = "Wood Helmet",
 	inventory_image = "default_armor_inv_helmet_wood.png",
@@ -420,8 +405,7 @@ minetest.register_tool("default:armor_helmet_diamond", {
 	wear = 0,
 })
 
--- Regisiter Torso Armor
+-- Torso Armor
-
 minetest.register_tool("default:armor_chestplate_wood", {
 	description = "Wood Chestplate",
 	inventory_image = "default_armor_inv_chestplate_wood.png",
@@ -450,8 +434,7 @@ minetest.register_tool("default:armor_chestplate_diamond", {
 	wear = 0,
 })
 
--- Regisiter Leg Armor
+-- Leg Armor
-
 minetest.register_tool("default:armor_leggings_wood", {
 	description = "Wood Leggings",
 	inventory_image = "default_armor_inv_leggings_wood.png",
@@ -480,8 +463,7 @@ minetest.register_tool("default:armor_leggings_diamond", {
 	wear = 0,
 })
 
--- Regisiter Boots
+-- Boots
-
 minetest.register_tool("default:armor_boots_wood", {
 	description = "Wood Boots",
 	inventory_image = "default_armor_inv_boots_wood.png",
@@ -511,8 +493,7 @@ minetest.register_tool("default:armor_boots_diamond", {
 })
 
 
--- Register Craft Recipies  default:armor_helmet_wood
+-- Register Craft Recipies
-
 local craft_ingreds = {
 	wood = "group:wood",
 	steel = "default:steel_ingot",
@@ -553,5 +534,3 @@ for k, v in pairs(craft_ingreds) do
 		},
 	})
 end
-
-

mods/default/torches.lua

@@ -1,6 +1,5 @@
 --torches = {}
 
-
 function check_attached_node_fdir(p, n)
 	local def = minetest.registered_nodes[n.name]
 	local d = {x=0, y=0, z=0}

mods/default/trees.lua

@@ -5,11 +5,6 @@ local c_leaves = minetest.get_content_id("default:leaves")
 local c_apple = minetest.get_content_id("default:apple")
 
 function default.grow_tree(data, a, pos, is_apple_tree, seed)
-        --[[
-                NOTE: Tree-placing code is currently duplicated in the engine
-                and in games that have saplings; both are deprecated but not
-                replaced yet
-        ]]--
         local pr = PseudoRandom(seed)
         local th = pr:next(4, 5)
         local x, y, z = pos.x, pos.y, pos.z
@@ -153,4 +148,3 @@ function default.grow_conifer(x, y, z, area, data)
 	local vi = area:index(x, y+top-2, z)
 	data[vi] = c_needles
 end
-