More clean up

minetest.conf

@@ -1,21 +1,18 @@
-remove_items = 0
-mg_flags = trees, caves, v6_biome_blend, v6_jungles
+# mapgen stuff
+mg_flags = trees, caves
+mgv6_freq_desert = 0.65
 
 #physics
-
 movement_liquid_sink = 25
 movement_speed_jump = 6.2
 
 movement_liquid_fluidity = 0.8
 movement_liquid_fluidity_smooth = 2
 
-#remove the line below if having trouble
-num_emerge_threads = 
-
-#liquid_loop_max = 2000
-liquid_update = 0.5
-
 
+#other
+remove_items = 1800
 selectionbox_color = (8,8,8)
 
-mgv6_freq_desert = 0.65
+#!remove the line below if having trouble
+num_emerge_threads = 

mods/default/README.txt

@@ -43,10 +43,6 @@ Cisoun's WTFPL texture pack:
   default_wool_*.png
 
 VanessaE (WTFPL):
-  default_nc_back.png
-  default_nc_front.png
-  default_nc_rb.png
-  default_nc_side.png
   default_desert_sand.png
   default_flour.png
   default_cotton_1.png
@@ -67,9 +63,6 @@ Calinou (CC BY-SA):
 philipbenr (GPLv3):
   default_brick.png
 
-MirceaKitsune (WTFPL):
-  character.x
-
 PilzAdam (WTFPL):
   default_junglesapling.png
   default_obsidian_glass.png
@@ -91,8 +84,9 @@ Splizard (CC BY-SA 3.0):
 Zeg9 (CC BY-SA 3.0):
   default_coal_block.png
 
-BlockMen (CC-BY 3.0):
-  character.png (based on Jordach's texture)[CC-BY-SA 3.0]
+BlockMen (CC-BY 3.0):  
+  character.x (based on stu's 3d armor model)
+  character.png (based on Jordach's texture) [CC-BY-SA 3.0]
   default_tool_*.png
   door_steel_*.png
   default_cobble.png

mods/default/aliases.lua

@@ -1,9 +1,5 @@
--- legacy (Minetest 0.4 mod)
--- Provides as much backwards-compatibility as feasible
-
---
--- Aliases to support loading 0.3 and old 0.4 worlds and inventories
---
+-- aliases (Minetest 0.4 mod)
+-- Provides alias for most default items
 
 minetest.register_alias("stone", "default:stone")
 minetest.register_alias("stone_with_coal", "default:stone_with_coal")
@@ -69,40 +65,3 @@ minetest.register_alias("lump_of_iron", "default:iron_lump")
 minetest.register_alias("lump_of_clay", "default:clay_lump")
 minetest.register_alias("steel_ingot", "default:steel_ingot")
 minetest.register_alias("clay_brick", "default:clay_brick")
-minetest.register_alias("scorched_stuff", "default:scorched_stuff")
-
---
--- Old items
---
-
-minetest.register_craftitem(":rat", {
-	description = "Rat",
-	inventory_image = "rat.png",
-	groups = {not_in_creative_inventory=1},
-})
-
-minetest.register_craftitem(":cooked_rat", {
-	description = "Cooked rat",
-	inventory_image = "cooked_rat.png",
-	groups = {not_in_creative_inventory=1},
-})
-
-minetest.register_craftitem(":firefly", {
-	description = "Firefly",
-	inventory_image = "firefly.png",
-	groups = {not_in_creative_inventory=1},
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "cooked_rat",
-	recipe = "rat",
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "scorched_stuff",
-	recipe = "cooked_rat",
-})
-
--- END

mods/default/hud.lua

@@ -239,8 +239,6 @@ minetest.register_on_joinplayer(function(player)
 	end
 	default.hud.armor[name] = 0
 	default.hud.armor_out[name] = 0
-	local air = player:get_breath()
-	default.hud.air[name] = air
 	minetest.after(0.1, function()
 		hide_builtin(player)
 		custom_hud(player)

mods/default/init.lua

@@ -27,6 +27,7 @@ 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").."/mapgen.lua")
+dofile(minetest.get_modpath("default").."/aliases.lua")
 
 if load_more then
 	dofile(minetest.get_modpath("default").."/tools.lua")

mods/default/player.lua

@@ -277,7 +277,7 @@ minetest.register_globalstep(function(dtime)
 				end
 			elseif controls.LMB then
 				player_set_animation(player, "mine")
-			else
+			elseif default.hud.health[name] > 0 then
 				player_set_animation(player, "stand", animation_speed_mod)
 			end
 
@@ -296,17 +296,19 @@ end)
 --
 
 local tool_cap = {
-		full_punch_interval = 1.0,
-		max_drop_level = 0,
-		groupcaps = {
-			fleshy = {times={[2]=2.00, [3]=1.00}, uses=0, maxlevel=1},
-			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]=7.00,[2]=4.00,[3]=1.40}, uses=0, maxlevel=3},
-		}
+	full_punch_interval = 1.0,
+	max_drop_level = 0,
+	groupcaps = {
+		fleshy = {times={[2]=2.00, [3]=1.00}, uses=0, maxlevel=1},
+		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]=7.00,[2]=4.00,[3]=1.40}, uses=0, maxlevel=3},
 	}
+}
+
 if minetest.setting_getbool("creative_mode") then
-tool_cap = {	full_punch_interval = 0.5,
+	tool_cap = {
+		full_punch_interval = 0.5,
 		max_drop_level = 3,
 		groupcaps = {
 			crumbly = {times={[1]=0.3, [2]=0.3, [3]=0.3}, uses=0, maxlevel=3},
@@ -319,11 +321,9 @@ tool_cap = {	full_punch_interval = 0.5,
 	}
 end
 
-minetest.after(0, function()
-	minetest.register_item(":", {
-		type = "none",
-		wield_image = "wieldhand.png",
-		wield_scale = {x=0.9,y=1,z=3.2},
-		tool_capabilities = tool_cap,
-	})
-end)
+minetest.register_item(":", {
+	type = "none",
+	wield_image = "wieldhand.png",
+	wield_scale = {x=0.9,y=1,z=3.2},
+	tool_capabilities = tool_cap,
+})

mods/external_legacy/README.txt

@@ -1,18 +0,0 @@
-Minetest 0.4 mod: external_legacy
-=================================
-
-License of source code:
------------------------
-Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU Lesser General Public License as published by
-the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-http://www.gnu.org/licenses/lgpl-2.1.html
-
-License of media (textures and sounds)
---------------------------------------
-Attribution-ShareAlike 3.0 Unported (CC BY-SA 3.0)                                 
-http://creativecommons.org/licenses/by-sa/3.0/

mods/external_legacy/init.lua

@@ -1,56 +0,0 @@
--- Minetest 0.4 mod: external_legacy
--- See README.txt for licensing and other information.
-
--- Aliases to support moreores' ores
-minetest.register_alias("moreores:mineral_gold", "default:stone_with_gold")
-minetest.register_alias("moreores:gold_block", "default:goldblock")
-minetest.register_alias("moreores:gold_lump", "default:gold_lump")
-minetest.register_alias("moreores:gold_ingot", "default:gold_ingot")
-minetest.register_alias("moreores:mineral_copper", "default:stone_with_copper")
-minetest.register_alias("moreores:copper_lump", "default:copper_lump")
-minetest.register_alias("moreores:copper_ingot", "default:copper_ingot")
-minetest.register_alias("moreores:copper_block", "default:copperblock")
-minetest.register_alias("moreores:bronze_ingot", "default:bronze_ingot")
-minetest.register_alias("moreores:bronze_block", "default:bronzeblock")
-
--- Aliases for the diamonds mod by InfinityProject
-minetest.register_alias("diamonds:diamond_in_ground", "default:stone_with_diamond")
-minetest.register_alias("diamonds:block", "default:diamondblock")
-minetest.register_alias("diamonds:sword", "default:sword_diamond")
-minetest.register_alias("diamonds:pick", "default:pick_diamond")
-minetest.register_alias("diamonds:shovel", "default:shovel_diamond")
-minetest.register_alias("diamonds:axe", "default:axe_diamond")
-minetest.register_alias("diamonds:diamond", "default:diamond")
-minetest.register_alias("diamonds:ingot", "default:diamond")
-
--- Aliases for the farming mod by PilzAdam
-minetest.register_alias("farming:soil", "default:soil")
-minetest.register_alias("farming:soil_wet", "default:soil_wet")
-minetest.register_alias("farming:wheat_1", "default:wheat_1")
-minetest.register_alias("farming:wheat_2", "default:wheat_2")
-minetest.register_alias("farming:wheat_3", "default:wheat_3")
-minetest.register_alias("farming:wheat_4", "default:wheat_4")
-minetest.register_alias("farming:wheat_5", "default:wheat_5")
-minetest.register_alias("farming:wheat_6", "default:wheat_6")
-minetest.register_alias("farming:wheat_7", "default:wheat_7")
-minetest.register_alias("farming:wheat_8", "default:wheat_8")
-minetest.register_alias("farming:cotton_1", "default:cotton_1")
-minetest.register_alias("farming:cotton_2", "default:cotton_2")
-minetest.register_alias("farming:cotton_3", "default:cotton_3")
-minetest.register_alias("farming:cotton_4", "default:cotton_4")
-minetest.register_alias("farming:cotton_5", "default:cotton_5")
-minetest.register_alias("farming:cotton_6", "default:cotton_6")
-minetest.register_alias("farming:cotton_7", "default:cotton_7")
-minetest.register_alias("farming:cotton_8", "default:cotton_8")
-minetest.register_alias("farming:seed_wheat", "default:seed_wheat")
-minetest.register_alias("farming:wheat", "default:wheat")
-minetest.register_alias("farming:flour", "default:flour")
-minetest.register_alias("farming:bread", "default:bread")
-minetest.register_alias("farming:seed_cotton", "default:seed_cotton")
-minetest.register_alias("farming:string", "default:string")
-minetest.register_alias("farming:hoe_wood", "default:hoe_wood")
-minetest.register_alias("farming:hoe_stone", "default:hoe_stone")
-minetest.register_alias("farming:hoe_steel", "default:hoe_steel")
-minetest.register_alias("farming:hoe_bronze", "default:hoe_bronze")
-minetest.register_alias("farming:hoe_mese", "default:hoe_mese")
-minetest.register_alias("farming:hoe_diamond", "default:hoe_diamond")

mods/legacy/depends.txt

@@ -1,2 +0,0 @@
-default
-