Clean up

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,39 +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",
-})
-
-minetest.register_craftitem(":cooked_rat", {
-	description = "Cooked rat",
-	inventory_image = "cooked_rat.png",
-	on_use = minetest.item_eat(6),
-})
-
-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/init.lua

@@ -82,4 +82,5 @@ dofile(minetest.get_modpath("default").."/mapgen.lua")
 dofile(minetest.get_modpath("default").."/minerals.lua")
 dofile(minetest.get_modpath("default").."/player.lua")
 dofile(minetest.get_modpath("default").."/trees.lua")
+dofile(minetest.get_modpath("default").."/aliases.lua")
 

mods/default/mapgen.lua

@@ -256,7 +256,7 @@ function make_dead_tree(pos, size)
 		if minetest.registered_nodes[nn] and
 		   minetest.registered_nodes[nn].buildable_to then
 			minetest.after(0.2,function()
-			  minetest.set_node(p, {name="default:dead_tree"})
+			  minetest.swap_node(p, {name="default:dead_tree"})
 			end)
 		else
 			return
@@ -350,7 +350,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 		    local nn = minetest.get_node(p)
 		    p.y = p.y-1
 		    if nn and nn.name == "air" and n and n.name and n.name == "default:sand" then
-		     minetest.set_node(p, {name="default:mineralsand"})
+		     minetest.swap_node(p, {name="default:mineralsand"})
 		    end
 		   end
 		  end
@@ -396,7 +396,7 @@ minetest.register_on_generated(function(minp, maxp, seed)
 						nn = minetest.get_node({x=x,y=ground_y,z=z}).name
 						-- If desert sand, add dry shrub
 						if nn == "default:dry_dirt" then
-							minetest.set_node(p,{name="default:dry_shrub"})
+							minetest.swap_node(p,{name="default:dry_shrub"})
 						end
 					end
 				end

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,24 +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")

mods/legacy/depends.txt

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

mods/ruins/init.lua

@@ -86,7 +86,7 @@ local function ground(pos)
 		cnt = cnt+1
 		if cnt > 25 then break end
 		if cnt>math.random(2,4) then mat = "stone"end
-		minetest.set_node(p2, {name="default:"..mat})
+		minetest.swap_node(p2, {name="default:"..mat})
 		p2.y = p2.y-1
 	end
 end
@@ -115,7 +115,7 @@ local function keller(pp, size)
 			if yi < w_h then
 				minetest.remove_node(p)
 			else
-				minetest.set_node(p, {name="default:water_source"})
+				minetest.swap_node(p, {name="default:water_source"})
 			end
 		end
 	end
@@ -135,7 +135,7 @@ if math.random(1,10) > 8 then wood = true end
 		for zi = 0,size.z do
 			if yi == 0 then
 				local p = {x=pos.x+xi, y=pos.y, z=pos.z+zi}
-				minetest.set_node(p, {name="default:"..material[math.random(1,2)]})
+				minetest.swap_node(p, {name="default:"..material[math.random(1,2)]})
 				minetest.after(1,ground,p)--(p)
 			else
 				if xi < 1 or xi > size.x-1 or zi<1 or zi>size.z-1 then
@@ -145,7 +145,7 @@ if math.random(1,10) > 8 then wood = true end
 						if yi == 2 and math.random(1,10) == 3 then new = "glass" end
 						local n = minetest.get_node_or_nil({x=pos.x+xi, y=pos.y+yi-1, z=pos.z+zi})
 						if n and n.name ~= "air" then
-							minetest.set_node({x=pos.x+xi, y=pos.y+yi, z=pos.z+zi}, {name="default:"..new})
+							minetest.swap_node({x=pos.x+xi, y=pos.y+yi, z=pos.z+zi}, {name="default:"..new})
 						end
 					end
 				else
@@ -167,7 +167,7 @@ local function make_grave(pos)
 	minetest.add_node(pos, {name="bones:bones", param2=param2})
 	fill_grave({x=pos.x,y=pos.y,z=pos.z})
 	pos.y = pos.y+1
-	minetest.set_node(pos, {name="bones:gravestone", param2=param2})
+	minetest.swap_node(pos, {name="bones:gravestone", param2=param2})
 end
 
 

mods/vessels/README.txt

@@ -1,45 +0,0 @@
-Minetest 0.4 mod: vessels
-==========================
-
-Crafts
--------
-Glass bottle (yields 10)
-
-   G - G
-   G - G
-   - G -
-
-Drinking Glass (yields 14)
-
-   G - G
-   G - G
-   G G G
-
-Heavy Steel Bottle (yields 5)
-
-   S - S
-   S - S
-   - S -
-
-License of source code:
------------------------
-Copyright (C) 2012 Vanessa Ezekowitz
-Version 2012-09-02
-Modifications by 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)
---------------------------------------
-WTFPL
-
-Authors of media files
------------------------
-Unless specifically noted,
-Copyright (C) 2012 Vanessa Ezekowitz
-

mods/vessels/depends.txt

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

mods/vessels/init.lua

@@ -1,116 +0,0 @@
--- Minetest 0.4 mod: vessels
--- See README.txt for licensing and other information.
-
-minetest.register_node("vessels:glass_bottle", {
-	description = "Glass Bottle (empty)",
-	drawtype = "plantlike",
-	tiles = {"vessels_glass_bottle.png"},
-	inventory_image = "vessels_glass_bottle_inv.png",
-	wield_image = "vessels_glass_bottle.png",
-	paramtype = "light",
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25}
-	},
-	groups = {vessel=1,dig_immediate=3,attached_node=1},
-	sounds = default.node_sound_glass_defaults(),
-})
-
-minetest.register_craft( {
-	output = "vessels:glass_bottle 10",
-	recipe = {
-		{ "default:glass", "", "default:glass" },
-		{ "default:glass", "", "default:glass" },
-		{ "", "default:glass", "" }
-	}
-})
-
-minetest.register_node("vessels:drinking_glass", {
-	description = "Drinking Glass (empty)",
-	drawtype = "plantlike",
-	tiles = {"vessels_drinking_glass.png"},
-	inventory_image = "vessels_drinking_glass_inv.png",
-	wield_image = "vessels_drinking_glass.png",
-	paramtype = "light",
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25}
-	},
-	groups = {vessel=1,dig_immediate=3,attached_node=1},
-	sounds = default.node_sound_glass_defaults(),
-})
-
-minetest.register_craft( {
-	output = "vessels:drinking_glass 14",
-	recipe = {
-		{ "default:glass", "", "default:glass" },
-		{ "default:glass", "", "default:glass" },
-		{ "default:glass", "default:glass", "default:glass" }
-	}
-})
-
-minetest.register_node("vessels:steel_bottle", {
-	description = "Heavy Steel Bottle (empty)",
-	drawtype = "plantlike",
-	tiles = {"vessels_steel_bottle.png"},
-	inventory_image = "vessels_steel_bottle_inv.png",
-	wield_image = "vessels_steel_bottle.png",
-	paramtype = "light",
-	walkable = false,
-	selection_box = {
-		type = "fixed",
-		fixed = {-0.25, -0.5, -0.25, 0.25, 0.4, 0.25}
-	},
-	groups = {vessel=1,dig_immediate=3,attached_node=1},
-	sounds = default.node_sound_defaults(),
-})
-
-minetest.register_craft( {
-	output = "vessels:steel_bottle 5",
-	recipe = {
-		{ "default:steel_ingot", "", "default:steel_ingot" },
-		{ "default:steel_ingot", "", "default:steel_ingot" },
-		{ "", "default:steel_ingot", "" }
-	}
-})
-
-
--- Make sure we can recycle them
-
-minetest.register_craftitem("vessels:glass_fragments", {
-	description = "Pile of Glass Fragments",
-	inventory_image = "vessels_glass_fragments.png",
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "vessels:glass_fragments",
-	recipe = {
-		"vessels:glass_bottle",
-		"vessels:glass_bottle",
-	},
-})
-
-minetest.register_craft( {
-	type = "shapeless",
-	output = "vessels:glass_fragments",
-	recipe = {
-		"vessels:drinking_glass",
-		"vessels:drinking_glass",
-	},
-})
-
-minetest.register_craft({
-	type = "cooking",
-	output = "default:glass",
-	recipe = "vessels:glass_fragments",
-})
-
-minetest.register_craft( {
-	type = "cooking",
-	output = "default:steel_ingot",
-	recipe = "vessels:steel_bottle",
-})
-