Tweak some textures, new chest texture
[oweals/minetest_game.git] / mods / default / nodes.lua
index 2bb6ddd3459650a1c56f05e78bf0b191b44327a1..34f2917168f2a2577e8113a719ed454cfe4aef3a 100644 (file)
@@ -15,7 +15,7 @@ minetest.register_node("default:desert_stone", {
        tiles = {"default_desert_stone.png"},
        is_ground_content = true,
        groups = {cracky=3, stone=1},
-       drop = 'default:desert_stone',
+       drop = 'default:desert_cobble',
        legacy_mineral = true,
        sounds = default.node_sound_stone_defaults(),
 })
@@ -120,7 +120,6 @@ minetest.register_node("default:dirt_with_snow", {
                footstep = {name="default_snow_footstep", gain=0.25},
        }),
 })
-minetest.register_alias("dirt_with_snow", "default:dirt_with_snow")
 
 minetest.register_node("default:dirt", {
        description = "Dirt",
@@ -130,6 +129,42 @@ minetest.register_node("default:dirt", {
        sounds = default.node_sound_dirt_defaults(),
 })
 
+minetest.register_abm({
+       nodenames = {"default:dirt"},
+       interval = 2,
+       chance = 200,
+       action = function(pos, node)
+               local above = {x=pos.x, y=pos.y+1, z=pos.z}
+               local name = minetest.get_node(above).name
+               local nodedef = minetest.registered_nodes[name]
+               if nodedef and (nodedef.sunlight_propagates or nodedef.paramtype == "light")
+                               and nodedef.liquidtype == "none"
+                               and (minetest.get_node_light(above) or 0) >= 13 then
+                       if name == "default:snow" or name == "default:snowblock" then
+                               minetest.set_node(pos, {name = "default:dirt_with_snow"})
+                       else
+                               minetest.set_node(pos, {name = "default:dirt_with_grass"})
+                       end
+               end
+       end
+})
+
+minetest.register_abm({
+       nodenames = {"default:dirt_with_grass"},
+       interval = 2,
+       chance = 20,
+       action = function(pos, node)
+               local above = {x=pos.x, y=pos.y+1, z=pos.z}
+               local name = minetest.get_node(above).name
+               local nodedef = minetest.registered_nodes[name]
+               if name ~= "ignore" and nodedef
+                               and not ((nodedef.sunlight_propagates or nodedef.paramtype == "light")
+                               and nodedef.liquidtype == "none") then
+                       minetest.set_node(pos, {name = "default:dirt"})
+               end
+       end
+})
+
 minetest.register_node("default:sand", {
        description = "Sand",
        tiles = {"default_sand.png"},
@@ -185,6 +220,7 @@ minetest.register_node("default:clay", {
 minetest.register_node("default:brick", {
        description = "Brick Block",
        tiles = {"default_brick.png"},
+       is_ground_content = false,
        groups = {cracky=3},
        sounds = default.node_sound_stone_defaults(),
 })
@@ -192,15 +228,21 @@ minetest.register_node("default:brick", {
 minetest.register_node("default:tree", {
        description = "Tree",
        tiles = {"default_tree_top.png", "default_tree_top.png", "default_tree.png"},
+       paramtype2 = "facedir",
+       is_ground_content = false,
        groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
        sounds = default.node_sound_wood_defaults(),
+       on_place = minetest.rotate_node
 })
 
 minetest.register_node("default:jungletree", {
        description = "Jungle Tree",
        tiles = {"default_jungletree_top.png", "default_jungletree_top.png", "default_jungletree.png"},
+       paramtype2 = "facedir",
+       is_ground_content = false,
        groups = {tree=1,choppy=2,oddly_breakable_by_hand=1,flammable=2},
        sounds = default.node_sound_wood_defaults(),
+       on_place = minetest.rotate_node
 })
 
 minetest.register_node("default:junglewood", {
@@ -213,9 +255,11 @@ minetest.register_node("default:junglewood", {
 minetest.register_node("default:jungleleaves", {
        description = "Jungle Leaves",
        drawtype = "allfaces_optional",
+       waving = 1,
        visual_scale = 1.3,
        tiles = {"default_jungleleaves.png"},
        paramtype = "light",
+       is_ground_content = false,
        groups = {snappy=3, leafdecay=3, flammable=2, leaves=1},
        drop = {
                max_items = 1,
@@ -251,13 +295,11 @@ minetest.register_node("default:junglesapling", {
        groups = {snappy=2,dig_immediate=3,flammable=2,attached_node=1},
        sounds = default.node_sound_leaves_defaults(),
 })
--- aliases for tree growing abm in content_abm.cpp
-minetest.register_alias("sapling", "default:sapling")
-minetest.register_alias("junglesapling", "default:junglesapling")
 
 minetest.register_node("default:junglegrass", {
        description = "Jungle Grass",
        drawtype = "plantlike",
+       waving = 1,
        visual_scale = 1.3,
        tiles = {"default_junglegrass.png"},
        inventory_image = "default_junglegrass.png",
@@ -277,9 +319,11 @@ minetest.register_node("default:junglegrass", {
 minetest.register_node("default:leaves", {
        description = "Leaves",
        drawtype = "allfaces_optional",
+       waving = 1,
        visual_scale = 1.3,
        tiles = {"default_leaves.png"},
        paramtype = "light",
+       is_ground_content = false,
        groups = {snappy=3, leafdecay=3, flammable=2, leaves=1},
        drop = {
                max_items = 1,
@@ -302,9 +346,14 @@ minetest.register_node("default:leaves", {
 minetest.register_node("default:cactus", {
        description = "Cactus",
        tiles = {"default_cactus_top.png", "default_cactus_top.png", "default_cactus_side.png"},
+       paramtype2 = "facedir",
        is_ground_content = true,
        groups = {snappy=1,choppy=3,flammable=2},
        sounds = default.node_sound_wood_defaults(),
+       on_place = minetest.rotate_node,
+       after_dig_node = function(pos, node, metadata, digger)
+               default.dig_up(pos, node, digger)
+       end,
 })
 
 minetest.register_node("default:papyrus", {
@@ -322,33 +371,100 @@ minetest.register_node("default:papyrus", {
        },
        groups = {snappy=3,flammable=2},
        sounds = default.node_sound_leaves_defaults(),
+       after_dig_node = function(pos, node, metadata, digger)
+               default.dig_up(pos, node, digger)
+       end,
 })
 
+default.bookshelf_formspec =
+       "size[8,7;]"..
+       default.gui_bg..
+       default.gui_bg_img..
+       default.gui_slots..
+       "list[context;books;0,0.3;8,2;]"..
+       "list[current_player;main;0,2.85;8,1;]"..
+       "list[current_player;main;0,4.08;8,3;8]"..
+       default.get_hotbar_bg(0,2.85)
+
 minetest.register_node("default:bookshelf", {
        description = "Bookshelf",
        tiles = {"default_wood.png", "default_wood.png", "default_bookshelf.png"},
+       is_ground_content = false,
        groups = {choppy=3,oddly_breakable_by_hand=2,flammable=3},
        sounds = default.node_sound_wood_defaults(),
+       on_construct = function(pos)
+               local meta = minetest.env:get_meta(pos)
+               meta:set_string("formspec", default.bookshelf_formspec)
+               local inv = meta:get_inventory()
+               inv:set_size("books", 8*2)
+       end,
+       can_dig = function(pos,player)
+               local meta = minetest.env:get_meta(pos);
+               local inv = meta:get_inventory()
+               return inv:is_empty("books")
+       end,
+
+       allow_metadata_inventory_put = function(pos, listname, index, stack, player)
+               local meta = minetest.env:get_meta(pos)
+               local inv = meta:get_inventory()
+               if listname == "books" then
+                       if stack:get_name() == "default:book" then
+                               return 1
+                       else
+                               return 0
+                       end
+               end
+       end,
+
+       allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
+               local meta = minetest.env:get_meta(pos)
+               local inv = meta:get_inventory()
+               local stack = inv:get_stack(from_list, from_index)
+               local to_stack = inv:get_stack(to_list, to_index)
+               if to_list == "books" then
+                       if stack:get_name() == "default:book" and to_stack:is_empty() then
+                               return 1
+                       else
+                               return 0
+                       end
+               end
+       end,
+
+       on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
+               minetest.log("action", player:get_player_name()..
+                          " moves stuff in bookshelf at "..minetest.pos_to_string(pos))
+       end,
+       on_metadata_inventory_put = function(pos, listname, index, stack, player)
+               minetest.log("action", player:get_player_name()..
+                          " moves stuff to bookshelf at "..minetest.pos_to_string(pos))
+       end,
+       on_metadata_inventory_take = function(pos, listname, index, stack, player)
+               minetest.log("action", player:get_player_name()..
+                          " takes stuff from bookshelf at "..minetest.pos_to_string(pos))
+       end,
 })
 
 minetest.register_node("default:glass", {
        description = "Glass",
-       drawtype = "glasslike",
-       tiles = {"default_glass.png"},
+       drawtype = "glasslike_framed_optional",
+       tiles = {"default_glass.png", "default_glass_detail.png"},
        inventory_image = minetest.inventorycube("default_glass.png"),
        paramtype = "light",
        sunlight_propagates = true,
+       is_ground_content = false,
        groups = {cracky=3,oddly_breakable_by_hand=3},
        sounds = default.node_sound_glass_defaults(),
 })
 
+local fence_texture = "default_fence_overlay.png^default_wood.png^default_fence_overlay.png^[makealpha:255,126,126"
 minetest.register_node("default:fence_wood", {
        description = "Wooden Fence",
        drawtype = "fencelike",
        tiles = {"default_wood.png"},
-       inventory_image = "default_fence.png",
-       wield_image = "default_fence.png",
+       inventory_image = fence_texture,
+       wield_image = fence_texture,
        paramtype = "light",
+       is_ground_content = false,
        selection_box = {
                type = "fixed",
                fixed = {-1/7, -1/2, -1/7, 1/7, 1/2, 1/7},
@@ -365,6 +481,7 @@ minetest.register_node("default:rail", {
        wield_image = "default_rail.png",
        paramtype = "light",
        walkable = false,
+       is_ground_content = false,
        selection_box = {
                type = "fixed",
                 -- but how to specify the dimensions for curved and sideways rails?
@@ -383,6 +500,7 @@ minetest.register_node("default:ladder", {
        paramtype2 = "wallmounted",
        walkable = false,
        climbable = true,
+       is_ground_content = false,
        selection_box = {
                type = "wallmounted",
                --wall_top = = <default>
@@ -433,6 +551,7 @@ minetest.register_node("default:water_flowing", {
        diggable = false,
        buildable_to = true,
        drop = "",
+       drowning = 1,
        liquidtype = "flowing",
        liquid_alternative_flowing = "default:water_flowing",
        liquid_alternative_source = "default:water_source",
@@ -464,6 +583,7 @@ minetest.register_node("default:water_source", {
        diggable = false,
        buildable_to = true,
        drop = "",
+       drowning = 1,
        liquidtype = "source",
        liquid_alternative_flowing = "default:water_flowing",
        liquid_alternative_source = "default:water_source",
@@ -498,6 +618,7 @@ minetest.register_node("default:lava_flowing", {
        diggable = false,
        buildable_to = true,
        drop = "",
+       drowning = 1,
        liquidtype = "flowing",
        liquid_alternative_flowing = "default:lava_flowing",
        liquid_alternative_source = "default:lava_source",
@@ -530,6 +651,7 @@ minetest.register_node("default:lava_source", {
        diggable = false,
        buildable_to = true,
        drop = "",
+       drowning = 1,
        liquidtype = "source",
        liquid_alternative_flowing = "default:lava_flowing",
        liquid_alternative_source = "default:lava_source",
@@ -554,6 +676,7 @@ minetest.register_node("default:torch", {
        paramtype = "light",
        paramtype2 = "wallmounted",
        sunlight_propagates = true,
+       is_ground_content = false,
        walkable = false,
        light_source = LIGHT_MAX-1,
        selection_box = {
@@ -576,6 +699,7 @@ minetest.register_node("default:sign_wall", {
        paramtype = "light",
        paramtype2 = "wallmounted",
        sunlight_propagates = true,
+       is_ground_content = false,
        walkable = false,
        selection_box = {
                type = "wallmounted",
@@ -594,9 +718,13 @@ minetest.register_node("default:sign_wall", {
        end,
        on_receive_fields = function(pos, formname, fields, sender)
                --print("Sign at "..minetest.pos_to_string(pos).." got "..dump(fields))
+               if minetest.is_protected(pos, sender:get_player_name()) then
+                       minetest.record_protection_violation(pos, sender:get_player_name())
+                       return
+               end
                local meta = minetest.get_meta(pos)
-               fields.text = fields.text or ""
-               print((sender:get_player_name() or "").." wrote \""..fields.text..
+               if not fields.text then return end
+               minetest.log("action", (sender:get_player_name() or "").." wrote \""..fields.text..
                                "\" to sign at "..minetest.pos_to_string(pos))
                meta:set_string("text", fields.text)
                meta:set_string("infotext", '"'..fields.text..'"')
@@ -605,16 +733,26 @@ minetest.register_node("default:sign_wall", {
 
 default.chest_formspec = 
        "size[8,9]"..
-       "list[current_name;main;0,0;8,4;]"..
-       "list[current_player;main;0,5;8,4;]"
+       default.gui_bg..
+       default.gui_bg_img..
+       default.gui_slots..
+       "list[current_name;main;0,0.3;8,4;]"..
+       "list[current_player;main;0,4.85;8,1;]"..
+       "list[current_player;main;0,6.08;8,3;8]"..
+       default.get_hotbar_bg(0,4.85)
 
 function default.get_locked_chest_formspec(pos)
        local spos = pos.x .. "," .. pos.y .. "," ..pos.z
        local formspec =
                "size[8,9]"..
-               "list[nodemeta:".. spos .. ";main;0,0;8,4;]"..
-               "list[current_player;main;0,5;8,4;]"
-       return formspec
+               default.gui_bg..
+               default.gui_bg_img..
+               default.gui_slots..
+               "list[nodemeta:".. spos .. ";main;0,0.3;8,4;]"..
+               "list[current_player;main;0,4.85;8,1;]"..
+               "list[current_player;main;0,6.08;8,3;8]"..
+               default.get_hotbar_bg(0,4.85)
+ return formspec
 end
 
 
@@ -625,6 +763,7 @@ minetest.register_node("default:chest", {
        paramtype2 = "facedir",
        groups = {choppy=2,oddly_breakable_by_hand=2},
        legacy_facedir_simple = true,
+       is_ground_content = false,
        sounds = default.node_sound_wood_defaults(),
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
@@ -666,6 +805,7 @@ minetest.register_node("default:chest_locked", {
        paramtype2 = "facedir",
        groups = {choppy=2,oddly_breakable_by_hand=2},
        legacy_facedir_simple = true,
+       is_ground_content = false,
        sounds = default.node_sound_wood_defaults(),
        after_place_node = function(pos, placer)
                local meta = minetest.get_meta(pos)
@@ -688,10 +828,6 @@ minetest.register_node("default:chest_locked", {
        allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
                local meta = minetest.get_meta(pos)
                if not has_locked_chest_privilege(meta, player) then
-                       minetest.log("action", player:get_player_name()..
-                                       " tried to access a locked chest belonging to "..
-                                       meta:get_string("owner").." at "..
-                                       minetest.pos_to_string(pos))
                        return 0
                end
                return count
@@ -699,10 +835,6 @@ minetest.register_node("default:chest_locked", {
     allow_metadata_inventory_put = function(pos, listname, index, stack, player)
                local meta = minetest.get_meta(pos)
                if not has_locked_chest_privilege(meta, player) then
-                       minetest.log("action", player:get_player_name()..
-                                       " tried to access a locked chest belonging to "..
-                                       meta:get_string("owner").." at "..
-                                       minetest.pos_to_string(pos))
                        return 0
                end
                return stack:get_count()
@@ -710,18 +842,10 @@ minetest.register_node("default:chest_locked", {
     allow_metadata_inventory_take = function(pos, listname, index, stack, player)
                local meta = minetest.get_meta(pos)
                if not has_locked_chest_privilege(meta, player) then
-                       minetest.log("action", player:get_player_name()..
-                                       " tried to access a locked chest belonging to "..
-                                       meta:get_string("owner").." at "..
-                                       minetest.pos_to_string(pos))
                        return 0
                end
                return stack:get_count()
        end,
-       on_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
-               minetest.log("action", player:get_player_name()..
-                               " moves stuff in locked chest at "..minetest.pos_to_string(pos))
-       end,
     on_metadata_inventory_put = function(pos, listname, index, stack, player)
                minetest.log("action", player:get_player_name()..
                                " moves stuff to locked chest at "..minetest.pos_to_string(pos))
@@ -742,25 +866,54 @@ minetest.register_node("default:chest_locked", {
        end,
 })
 
+function default.furnace_active(pos, percent, item_percent)
+    local formspec = 
+       "size[8,8.5]"..
+       default.gui_bg..
+       default.gui_bg_img..
+       default.gui_slots..
+       "list[current_name;src;2.75,0.5;1,1;]"..
+       "list[current_name;fuel;2.75,2.5;1,1;]"..
+       "image[2.75,1.5;1,1;default_furnace_fire_bg.png^[lowpart:"..
+       (100-percent)..":default_furnace_fire_fg.png]"..
+        "image[3.75,1.5;1,1;gui_furnace_arrow_bg.png^[lowpart:"..
+        (item_percent*100)..":gui_furnace_arrow_fg.png^[transformR270]"..
+       "list[current_name;dst;4.75,0.96;2,2;]"..
+       "list[current_player;main;0,4.25;8,1;]"..
+       "list[current_player;main;0,5.5;8,3;8]"..
+       default.get_hotbar_bg(0,4.25)
+    return formspec
+  end
+
 function default.get_furnace_active_formspec(pos, percent)
-       local formspec =
-               "size[8,9]"..
-               "image[2,2;1,1;default_furnace_fire_bg.png^[lowpart:"..
-               (100-percent)..":default_furnace_fire_fg.png]"..
-               "list[current_name;fuel;2,3;1,1;]"..
-               "list[current_name;src;2,1;1,1;]"..
-               "list[current_name;dst;5,1;2,2;]"..
-               "list[current_player;main;0,5;8,4;]"
-       return formspec
+       local meta = minetest.get_meta(pos)local inv = meta:get_inventory()
+       local srclist = inv:get_list("src")
+       local cooked = nil
+       local aftercooked = nil
+       if srclist then
+               cooked, aftercooked = minetest.get_craft_result({method = "cooking", width = 1, items = srclist})
+       end
+       local item_percent = 0
+       if cooked then
+               item_percent = meta:get_float("src_time")/cooked.time
+       end
+       
+        return default.furnace_active(pos, percent, item_percent)
 end
 
 default.furnace_inactive_formspec =
-       "size[8,9]"..
-       "image[2,2;1,1;default_furnace_fire_bg.png]"..
-       "list[current_name;fuel;2,3;1,1;]"..
-       "list[current_name;src;2,1;1,1;]"..
-       "list[current_name;dst;5,1;2,2;]"..
-       "list[current_player;main;0,5;8,4;]"
+       "size[8,8.5]"..
+       default.gui_bg..
+       default.gui_bg_img..
+       default.gui_slots..
+       "list[current_name;src;2.75,0.5;1,1;]"..
+       "list[current_name;fuel;2.75,2.5;1,1;]"..
+       "image[2.75,1.5;1,1;default_furnace_fire_bg.png]"..
+       "image[3.75,1.5;1,1;gui_furnace_arrow_bg.png^[transformR270]"..
+       "list[current_name;dst;4.75,0.96;2,2;]"..
+       "list[current_player;main;0,4.25;8,1;]"..
+       "list[current_player;main;0,5.5;8,3;8]"..
+       default.get_hotbar_bg(0,4.25)
 
 minetest.register_node("default:furnace", {
        description = "Furnace",
@@ -769,6 +922,7 @@ minetest.register_node("default:furnace", {
        paramtype2 = "facedir",
        groups = {cracky=2},
        legacy_facedir_simple = true,
+       is_ground_content = false,
        sounds = default.node_sound_stone_defaults(),
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
@@ -792,6 +946,9 @@ minetest.register_node("default:furnace", {
                return true
        end,
        allow_metadata_inventory_put = function(pos, listname, index, stack, player)
+               if minetest.is_protected(pos, player:get_player_name()) then
+                       return 0
+               end
                local meta = minetest.get_meta(pos)
                local inv = meta:get_inventory()
                if listname == "fuel" then
@@ -810,6 +967,9 @@ minetest.register_node("default:furnace", {
                end
        end,
        allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
+               if minetest.is_protected(pos, player:get_player_name()) then
+                       return 0
+               end
                local meta = minetest.get_meta(pos)
                local inv = meta:get_inventory()
                local stack = inv:get_stack(from_list, from_index)
@@ -828,17 +988,39 @@ minetest.register_node("default:furnace", {
                        return 0
                end
        end,
+       allow_metadata_inventory_take = function(pos, listname, index, stack, player)
+               if minetest.is_protected(pos, player:get_player_name()) then
+                       return 0
+               end
+               return stack:get_count()
+       end,
 })
 
 minetest.register_node("default:furnace_active", {
        description = "Furnace",
-       tiles = {"default_furnace_top.png", "default_furnace_bottom.png", "default_furnace_side.png",
-               "default_furnace_side.png", "default_furnace_side.png", "default_furnace_front_active.png"},
+       tiles = {
+               "default_furnace_top.png",
+               "default_furnace_bottom.png",
+               "default_furnace_side.png",
+               "default_furnace_side.png",
+               "default_furnace_side.png",
+               {
+                       image = "default_furnace_front_active.png",
+                       backface_culling = false,
+                       animation = {
+                               type = "vertical_frames",
+                               aspect_w = 16,
+                               aspect_h = 16,
+                               length = 1.5
+                       },
+               }
+       },
        paramtype2 = "facedir",
        light_source = 8,
        drop = "default:furnace",
        groups = {cracky=2, not_in_creative_inventory=1,hot=1},
        legacy_facedir_simple = true,
+       is_ground_content = false,
        sounds = default.node_sound_stone_defaults(),
        on_construct = function(pos)
                local meta = minetest.get_meta(pos)
@@ -862,6 +1044,9 @@ minetest.register_node("default:furnace_active", {
                return true
        end,
        allow_metadata_inventory_put = function(pos, listname, index, stack, player)
+               if minetest.is_protected(pos, player:get_player_name()) then
+                       return 0
+               end
                local meta = minetest.get_meta(pos)
                local inv = meta:get_inventory()
                if listname == "fuel" then
@@ -880,6 +1065,9 @@ minetest.register_node("default:furnace_active", {
                end
        end,
        allow_metadata_inventory_move = function(pos, from_list, from_index, to_list, to_index, count, player)
+               if minetest.is_protected(pos, player:get_player_name()) then
+                       return 0
+               end
                local meta = minetest.get_meta(pos)
                local inv = meta:get_inventory()
                local stack = inv:get_stack(from_list, from_index)
@@ -898,20 +1086,21 @@ minetest.register_node("default:furnace_active", {
                        return 0
                end
        end,
+       allow_metadata_inventory_take = function(pos, listname, index, stack, player)
+               if minetest.is_protected(pos, player:get_player_name()) then
+                       return 0
+               end
+               return stack:get_count()
+       end,
 })
 
-function hacky_swap_node(pos,name)
+local function swap_node(pos,name)
        local node = minetest.get_node(pos)
-       local meta = minetest.get_meta(pos)
-       local meta0 = meta:to_table()
        if node.name == name then
                return
        end
        node.name = name
-       local meta0 = meta:to_table()
-       minetest.set_node(pos,node)
-       meta = minetest.get_meta(pos)
-       meta:from_table(meta0)
+       minetest.swap_node(pos,node)
 end
 
 minetest.register_abm({
@@ -955,7 +1144,7 @@ minetest.register_abm({
                                        -- take stuff from "src" list
                                        inv:set_stack("src", 1, aftercooked.items[1])
                                else
-                                       print("Could not insert '"..cooked.item:to_string().."'")
+                                       --print("Could not insert '"..cooked.item:to_string().."'")
                                end
                                meta:set_string("src_time", 0)
                        end
@@ -965,7 +1154,7 @@ minetest.register_abm({
                        local percent = math.floor(meta:get_float("fuel_time") /
                                        meta:get_float("fuel_totaltime") * 100)
                        meta:set_string("infotext","Furnace active: "..percent.."%")
-                       hacky_swap_node(pos,"default:furnace_active")
+                       swap_node(pos,"default:furnace_active")
                        meta:set_string("formspec",default.get_furnace_active_formspec(pos, percent))
                        return
                end
@@ -983,9 +1172,9 @@ minetest.register_abm({
                        fuel, afterfuel = minetest.get_craft_result({method = "fuel", width = 1, items = fuellist})
                end
 
-               if fuel.time <= 0 then
+               if not fuel or fuel.time <= 0 then
                        meta:set_string("infotext","Furnace out of fuel")
-                       hacky_swap_node(pos,"default:furnace")
+                       swap_node(pos,"default:furnace")
                        meta:set_string("formspec", default.furnace_inactive_formspec)
                        return
                end
@@ -993,7 +1182,7 @@ minetest.register_abm({
                if cooked.item:is_empty() then
                        if was_active then
                                meta:set_string("infotext","Furnace is empty")
-                               hacky_swap_node(pos,"default:furnace")
+                               swap_node(pos,"default:furnace")
                                meta:set_string("formspec", default.furnace_inactive_formspec)
                        end
                        return
@@ -1014,6 +1203,14 @@ minetest.register_node("default:cobble", {
        sounds = default.node_sound_stone_defaults(),
 })
 
+minetest.register_node("default:desert_cobble", {
+       description = "Desert Cobblestone",
+       tiles = {"default_desert_cobble.png"},
+       is_ground_content = true,
+       groups = {cracky=3, stone=2},
+       sounds = default.node_sound_stone_defaults(),
+})
+
 minetest.register_node("default:mossycobble", {
        description = "Mossy Cobblestone",
        tiles = {"default_mossycobble.png"},
@@ -1084,6 +1281,7 @@ minetest.register_node("default:obsidian_glass", {
        drawtype = "glasslike",
        tiles = {"default_obsidian_glass.png"},
        paramtype = "light",
+       is_ground_content = false,
        sunlight_propagates = true,
        sounds = default.node_sound_glass_defaults(),
        groups = {cracky=3,oddly_breakable_by_hand=3},
@@ -1103,14 +1301,18 @@ minetest.register_node("default:nyancat", {
                "default_nc_side.png", "default_nc_back.png", "default_nc_front.png"},
        paramtype2 = "facedir",
        groups = {cracky=2},
+       is_ground_content = false,
        legacy_facedir_simple = true,
        sounds = default.node_sound_defaults(),
 })
 
 minetest.register_node("default:nyancat_rainbow", {
        description = "Nyan Cat Rainbow",
-       tiles = {"default_nc_rb.png"},
+       tiles = {"default_nc_rb.png^[transformR90", "default_nc_rb.png^[transformR90",
+               "default_nc_rb.png", "default_nc_rb.png"},
+       paramtype2 = "facedir",
        groups = {cracky=2},
+       is_ground_content = false,
        sounds = default.node_sound_defaults(),
 })
 
@@ -1123,6 +1325,7 @@ minetest.register_node("default:sapling", {
        wield_image = "default_sapling.png",
        paramtype = "light",
        walkable = false,
+       is_ground_content = true,
        selection_box = {
                type = "fixed",
                fixed = {-0.3, -0.5, -0.3, 0.3, 0.35, 0.3}
@@ -1140,6 +1343,7 @@ minetest.register_node("default:apple", {
        paramtype = "light",
        sunlight_propagates = true,
        walkable = false,
+       is_ground_content = true,
        selection_box = {
                type = "fixed",
                fixed = {-0.2, -0.5, -0.2, 0.2, 0, 0.2}
@@ -1157,12 +1361,14 @@ minetest.register_node("default:apple", {
 minetest.register_node("default:dry_shrub", {
        description = "Dry Shrub",
        drawtype = "plantlike",
+       waving = 1,
        visual_scale = 1.0,
        tiles = {"default_dry_shrub.png"},
        inventory_image = "default_dry_shrub.png",
        wield_image = "default_dry_shrub.png",
        paramtype = "light",
        walkable = false,
+       is_ground_content = true,
        buildable_to = true,
        groups = {snappy=3,flammable=3,attached_node=1},
        sounds = default.node_sound_leaves_defaults(),
@@ -1175,12 +1381,14 @@ minetest.register_node("default:dry_shrub", {
 minetest.register_node("default:grass_1", {
        description = "Grass",
        drawtype = "plantlike",
+       waving = 1,
        tiles = {"default_grass_1.png"},
        -- use a bigger inventory image
        inventory_image = "default_grass_3.png",
        wield_image = "default_grass_3.png",
        paramtype = "light",
        walkable = false,
+       is_ground_content = true,
        buildable_to = true,
        groups = {snappy=3,flammable=3,flora=1,attached_node=1},
        sounds = default.node_sound_leaves_defaults(),
@@ -1196,80 +1404,27 @@ minetest.register_node("default:grass_1", {
        end,
 })
 
-minetest.register_node("default:grass_2", {
-       description = "Grass",
-       drawtype = "plantlike",
-       tiles = {"default_grass_2.png"},
-       inventory_image = "default_grass_2.png",
-       wield_image = "default_grass_2.png",
-       paramtype = "light",
-       walkable = false,
-       buildable_to = true,
-       is_ground_content = true,
-       drop = "default:grass_1",
-       groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
-       sounds = default.node_sound_leaves_defaults(),
-       selection_box = {
-               type = "fixed",
-               fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-       },
-})
-minetest.register_node("default:grass_3", {
-       description = "Grass",
-       drawtype = "plantlike",
-       tiles = {"default_grass_3.png"},
-       inventory_image = "default_grass_3.png",
-       wield_image = "default_grass_3.png",
-       paramtype = "light",
-       walkable = false,
-       buildable_to = true,
-       is_ground_content = true,
-       drop = "default:grass_1",
-       groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
-       sounds = default.node_sound_leaves_defaults(),
-       selection_box = {
-               type = "fixed",
-               fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-       },
-})
-
-minetest.register_node("default:grass_4", {
-       description = "Grass",
-       drawtype = "plantlike",
-       tiles = {"default_grass_4.png"},
-       inventory_image = "default_grass_4.png",
-       wield_image = "default_grass_4.png",
-       paramtype = "light",
-       walkable = false,
-       buildable_to = true,
-       is_ground_content = true,
-       drop = "default:grass_1",
-       groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
-       sounds = default.node_sound_leaves_defaults(),
-       selection_box = {
-               type = "fixed",
-               fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-       },
-})
-
-minetest.register_node("default:grass_5", {
-       description = "Grass",
-       drawtype = "plantlike",
-       tiles = {"default_grass_5.png"},
-       inventory_image = "default_grass_5.png",
-       wield_image = "default_grass_5.png",
-       paramtype = "light",
-       walkable = false,
-       buildable_to = true,
-       is_ground_content = true,
-       drop = "default:grass_1",
-       groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
-       sounds = default.node_sound_leaves_defaults(),
-       selection_box = {
-               type = "fixed",
-               fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
-       },
-})
+for i=2,5 do
+       minetest.register_node("default:grass_"..i, {
+               description = "Grass",
+               drawtype = "plantlike",
+               waving = 1,
+               tiles = {"default_grass_"..i..".png"},
+               inventory_image = "default_grass_"..i..".png",
+               wield_image = "default_grass_"..i..".png",
+               paramtype = "light",
+               walkable = false,
+               buildable_to = true,
+               is_ground_content = true,
+               drop = "default:grass_1",
+               groups = {snappy=3,flammable=3,flora=1,attached_node=1,not_in_creative_inventory=1},
+               sounds = default.node_sound_leaves_defaults(),
+               selection_box = {
+                       type = "fixed",
+                       fixed = {-0.5, -0.5, -0.5, 0.5, -5/16, 0.5},
+               },
+       })
+end
 
 minetest.register_node("default:ice", {
        description = "Ice",
@@ -1289,7 +1444,7 @@ minetest.register_node("default:snow", {
        is_ground_content = true,
        paramtype = "light",
        buildable_to = true,
-       leveled = 1,
+       leveled = 7,
        drawtype = "nodebox",
        freezemelt = "default:water_flowing",
        node_box = {