Merge remote branch 'upstream/master' into use_get_ground_level

gemstones/init.lua

@@ -24,7 +24,7 @@ register_gem = function( gemtype, max_clusters, min_depth, basetime, durability,
 	-- Gems/lumps --
 	gemname     = "gemstones:gem_" .. gemtype
 	gemtex      = "gemstones_gem_" .. gemtype .. ".png"
-	craftname   = 'craft "' .. gemname .. '"'
+	craftname   = gemname
 
 	-- Solid block --
 	blockname   = "gemstones:block_" .. gemtype
@@ -53,16 +53,15 @@ register_gem = function( gemtype, max_clusters, min_depth, basetime, durability,
 		inventory_image       = minetest.inventorycube( mineraltex ),
 		is_ground_content     = true,
 		material              = minetest.digprop_stonelike(1.0),
-		dug_item              = craftname .. ' 1',
-		extra_dug_item        = craftname .. ' 1',
-		extra_dug_item_rarity = 20,
+		drop                  = craftname .. ' 1',
+
 	} )
 
 	-- Solid block --
 	minetest.register_node( blockname, {
 		--drawtype              = "glasslike",
 		tile_images           = { blocktex },
-		inventory_image       = minetest.inventorycube( blocktex ),
+		inventory_image       = blocktex,
 		--alpha                 = 200,
 		is_ground_content     = true,
 		material              = minetest.digprop_glasslike(3.0),
@@ -73,7 +72,7 @@ register_gem = function( gemtype, max_clusters, min_depth, basetime, durability,
 
 	-- Crafting blocks --
 	minetest.register_craft( {
-		output                = 'node "' .. blockname .. '" 1',
+		output                = blockname .. ' 1',
 		recipe = {
 			                { craftname,craftname,craftname },
 			                { craftname,craftname,craftname },
@@ -84,7 +83,7 @@ register_gem = function( gemtype, max_clusters, min_depth, basetime, durability,
 	minetest.register_craft( {
 		output                = craftname .. ' 9',
 		recipe = {
-			                { 'node "' .. blockname .. '"' },
+			                { blockname .. '"' },
 		},
 	} )
 end
@@ -155,4 +154,4 @@ register_gem( "sapphire", 50, 5, 1.2, 500, { sword_time = 1 } )
 
 ---- Was loaded? ---------------------------------------------------------------
 -- Just to be sure, may remove if you like.
-print( "Loaded: Gemstones, by ZLovesPancakes" )
+print( " ++ loaded : Gemstones, by ZLovesPancakes" )

zlpdoors/depends.txt

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

zlpdoors/init.lua

@@ -0,0 +1,211 @@
+--------------------------------------------------------------------------------
+--    Doors
+--------------------------------------------------------------------------------
+--    This mod adds 'minecraftlike' doors to the game
+--
+--    (c) 2011 Fernando Zapata
+--    Code licensed under GNU GPLv3
+--    Content licensed under CC BY-SA 3.0
+--
+--    2012-01-08    11:03:57
+--------------------------------------------------------------------------------
+
+local WALLMX = 3
+local WALLMZ = 5
+local WALLPX = 2
+local WALLPZ = 4
+
+--------------------------------------------------------------------------------
+
+minetest.register_node( 'zlpdoors:door', {
+	description         = 'Door',
+	drawtype            = 'signlike',
+	tile_images         = { 'door_door.png' },
+	inventory_image     = 'door_door.png',
+	wield_image         = 'door_door.png',
+	paramtype2          = 'wallmounted',
+	selection_box       = { type = 'wallmounted' },
+	material            = minetest.digprop_constanttime(1.0),
+})
+
+minetest.register_craft( {
+	output              = 'zlpdoors:door',
+	recipe = {
+		{ 'default:wood', 'default:wood' },
+		{ 'default:wood', 'default:wood' },
+		{ 'default:wood', 'default:wood' },
+	},
+})
+
+minetest.register_craft({
+	type = 'fuel',
+	recipe = 'zlpdoors:door',
+	burntime = 30,
+})
+
+minetest.register_node( 'zlpdoors:door_a_c', {
+	Description         = 'Top Closed Door',
+	drawtype            = 'signlike',
+	tile_images         = { 'door_door_a.png' },
+	inventory_image     = 'door_door_a.png',
+	paramtype           = 'light',
+	paramtype2          = 'wallmounted',
+	walkable            = true,
+	selection_box       = { type = "wallmounted", },
+	material            = minetest.digprop_constanttime(1.0),
+	legacy_wallmounted  = true,
+	drop                = 'zlpdoors:door',
+})
+
+minetest.register_node( 'zlpdoors:door_b_c', {
+	Description         = 'Bottom Closed Door',
+	drawtype            = 'signlike',
+	tile_images         = { 'door_door_b.png' },
+	inventory_image     = 'door_door_b.png',
+	paramtype           = 'light',
+	paramtype2          = 'wallmounted',
+	walkable            = true,
+	selection_box       = { type = "wallmounted", },
+	material            = minetest.digprop_constanttime(1.0),
+	legacy_wallmounted  = true,
+	drop                = 'zlpdoors:door',
+})
+
+minetest.register_node( 'zlpdoors:door_a_o', {
+	Description         = 'Top Open Door',
+	drawtype            = 'signlike',
+	tile_images         = { 'door_door_a_r.png' },
+	inventory_image     = 'door_door_a_r.png',
+	paramtype           = 'light',
+	paramtype2          = 'wallmounted',
+	walkable            = false,
+	selection_box       = { type = "wallmounted", },
+	material            = minetest.digprop_constanttime(1.0),
+	legacy_wallmounted  = true,
+	drop                = 'zlpdoors:door',
+})
+
+minetest.register_node( 'zlpdoors:door_b_o', {
+	Description         = 'Bottom Open Door',
+	drawtype            = 'signlike',
+	tile_images         = { 'door_door_b_r.png' },
+	inventory_image     = 'door_door_b_r.png',
+	paramtype           = 'light',
+	paramtype2          = 'wallmounted',
+	walkable            = false,
+	selection_box       = { type = "wallmounted", },
+	material            = minetest.digprop_constanttime(1.0),
+	legacy_wallmounted  = true,
+	drop                = 'zlpdoors:door',
+})
+
+--------------------------------------------------------------------------------
+
+local round = function( n )
+	if n >= 0 then
+		return math.floor( n + 0.5 )
+	else
+		return math.ceil( n - 0.5 )
+	end
+end
+
+local on_door_placed = function( pos, node, placer )
+	if node.name ~= 'zlpdoors:door' then return end
+
+	upos = { x = pos.x, y = pos.y - 1, z = pos.z }
+	apos = { x = pos.x, y = pos.y + 1, z = pos.z }
+	und = minetest.env:get_node( upos )
+	abv = minetest.env:get_node( apos )
+
+	dir = placer:get_look_dir()
+
+	if     round( dir.x ) == 1  then
+		newparam = WALLPX
+	elseif round( dir.x ) == -1 then
+		newparam = WALLMX
+	elseif round( dir.z ) == 1  then
+		newparam = WALLPZ
+	elseif round( dir.z ) == -1 then
+		newparam = WALLMZ
+	end
+
+	if und.name == 'air' then
+		minetest.env:add_node( pos,  { name = 'zlpdoors:door_a_c', param2 = newparam } )
+		minetest.env:add_node( upos, { name = 'zlpdoors:door_b_c', param2 = newparam } )
+	elseif abv.name == 'air' then
+		minetest.env:add_node( pos,  { name = 'zlpdoors:door_b_c', param2 = newparam } )
+		minetest.env:add_node( apos, { name = 'zlpdoors:door_a_c', param2 = newparam } )
+	else
+		minetest.env:remove_node( pos )
+		placer:get_inventory():add_item( "main", 'zlpdoors:door' )
+		minetest.chat_send_player( placer:get_player_name(), 'not enough space' )
+	end
+end
+
+local on_door_punched = function( pos, node, puncher )
+	if string.find( node.name, 'zlpdoors:door' ) == nil then return end
+
+	upos = { x = pos.x, y = pos.y - 1, z = pos.z }
+	apos = { x = pos.x, y = pos.y + 1, z = pos.z }
+
+	if string.find( node.name, '_c', -2 ) ~= nil then
+		if     node.param2 == WALLPX then
+			newparam = WALLMZ
+		elseif node.param2 == WALLMZ then
+			newparam = WALLMX
+		elseif node.param2 == WALLMX then
+			newparam = WALLPZ
+		elseif node.param2 == WALLPZ then
+			newparam = WALLPX
+		end
+	elseif string.find( node.name, '_o', -2 ) ~= nil then
+		if     node.param2 == WALLMZ then
+			newparam = WALLPX
+		elseif node.param2 == WALLMX then
+			newparam = WALLMZ
+		elseif node.param2 == WALLPZ then
+			newparam = WALLMX
+		elseif node.param2 == WALLPX then
+			newparam = WALLPZ
+		end
+	end
+
+	if ( node.name == 'zlpdoors:door_a_c' ) then
+		minetest.env:add_node( pos,  { name = 'zlpdoors:door_a_o', param2 = newparam } )
+		minetest.env:add_node( upos, { name = 'zlpdoors:door_b_o', param2 = newparam } )
+
+	elseif ( node.name == 'zlpdoors:door_b_c' ) then
+		minetest.env:add_node( pos,  { name = 'zlpdoors:door_b_o', param2 = newparam } )
+		minetest.env:add_node( apos, { name = 'zlpdoors:door_a_o', param2 = newparam } )
+
+	elseif ( node.name == 'zlpdoors:door_a_o' ) then
+		minetest.env:add_node( pos,  { name = 'zlpdoors:door_a_c', param2 = newparam } )
+		minetest.env:add_node( upos, { name = 'zlpdoors:door_b_c', param2 = newparam } )
+
+	elseif ( node.name == 'zlpdoors:door_b_o' ) then
+		minetest.env:add_node( pos,  { name = 'zlpdoors:door_b_c', param2 = newparam } )
+		minetest.env:add_node( apos, { name = 'zlpdoors:door_a_c', param2 = newparam } )
+
+	end
+end
+
+local on_door_digged = function( pos, node, digger )
+	upos = { x = pos.x, y = pos.y - 1, z = pos.z }
+	apos = { x = pos.x, y = pos.y + 1, z = pos.z }
+
+	if ( node.name == 'zlpdoors:door_a_c' ) or ( node.name == 'zlpdoors:door_a_o' ) then
+		minetest.env:remove_node( upos )
+	elseif ( node.name == 'zlpdoors:door_b_c' ) or ( node.name == 'zlpdoors:door_b_o' ) then
+		minetest.env:remove_node( apos )
+	end
+end
+
+--------------------------------------------------------------------------------
+
+minetest.register_on_placenode( on_door_placed )
+minetest.register_on_punchnode( on_door_punched )
+minetest.register_on_dignode( on_door_digged )
+
+--------------------------------------------------------------------------------
+
+print( ' ++ loaded : Doors by ZLovesPancakes' )