get started on group support

.luacheckrc

@@ -4,6 +4,9 @@ globals = {
 }
 
 read_globals = {
+	string = {fields = {"split"}},
+    table = {fields = {"copy", "getn"}},
+
 	"default",
 	"mcl_sounds",
 	"ks_sounds",

init.lua

@@ -12,6 +12,8 @@ xcompat.materials = dofile(modpath .. "/src/materials.lua")
 xcompat.textures = dofile(modpath .. "/src/textures.lua")
 xcompat.functions = dofile(modpath .. "/src/functions.lua")
 
+dofile(modpath .. "/src/groups.lua")
+
 local function validate_sound(key)
     if key and xcompat.sounds[key] then
         return true

src/commands.lua

@@ -66,11 +66,11 @@ minetest.register_chatcommand("xcompat_test_sounds", {
         for gameid, game_sounds in pairs(sounds) do
             for sound, _ in pairs(reference_sounds) do
                 if not game_sounds[sound] then
-                    minetest.chat_send_player(name, "Missing sound: "..sound.." in game: "..gameid)
+                    minetest.chat_send_player(name, "Missing material: "..sound.." in game: "..gameid)
                 end
             end
         end
 
         minetest.chat_send_player(name, "Sounds test complete")
     end
-})
+})

src/groups.lua

@@ -0,0 +1,26 @@
+local function on_mods_loaded()
+    for name, def in pairs(minetest.registered_nodes) do
+        if def.groups and def.groups.xcompat_autohandle_groups and def.groups.xcompat_autohandle_groups==1 then
+            local groups = table.copy(def.groups)
+
+            groups.xcompat_autohandle_groups = nil
+            groups.xcompat_was_handled = 1
+
+            minetest.override_item(name, {
+                groups = groups
+            })
+        end
+    end
+
+    --todo: override minetest.register_node to handle groups registered after this point
+end
+
+--sticking it at the front so that our overrides are applied first
+table.insert(minetest.registered_on_mods_loaded, 1, on_mods_loaded)
+
+--test node, delete before merge
+minetest.register_node("xcompat:groups_test", {
+    description = "xCompat Groups test",
+    groups = {xcompat_autohandle_groups=1},
+    tiles = {xcompat.textures.gravel},
+})

src/materials/farlands_reloaded.lua

@@ -1,81 +1,81 @@
 local materials = {
-    apple_leaves = "fl_trees:apple_leaves",
-    apple_log = "fl_trees:apple_trunk",
-    apple_planks = "fl_trees:apple_plank",
-    axe_bronze = "fl_tools:bronze_axe",
-    axe_diamond = "fl_tools:diamond_axe",
+    sand = "fl_stone:sand",
+    sandstone = "fl_stone:sandstone",
+    gravel = "fl_topsoil:gravel",
+    flint = "fl_topsoil:flint",
+    copper_ingot = "fl_ores:copper_ingot",
+    steel_ingot = "fl_ores:iron_ingot",
+    gold_ingot = "fl_ores:gold_ingot",
+    tin_ingot = "fl_ores:tin_ingot",
+    copper_block = "fl_ores:copper_block",
+    steel_block = "fl_ores:iron_block",
+    gold_block = "fl_ores:gold_block",
+    tin_block = "fl_ores:tin_block",
     axe_steel = "fl_tools:steel_axe",
+    axe_diamond = "fl_tools:diamond_axe",
+    axe_bronze = "fl_tools:bronze_axe",
     axe_stone = "fl_tools:stone_axe",
     axe_wood = "fl_tools:wood_axe",
-    birch_leaves = "fl_trees:aspen_leaves",
-    birch_log = "fl_trees:aspen_trunk",
-    birch_planks = "fl_trees:aspen_plank",
-    book = "",
-    bowl = "",
-    brick = "",
-    chest = "fl_storage:wood_chest",
-    clay_lump = "fl_bricks:clay_lump",
-    coal_lump = "fl_ores:coal_ore",
-    cobble = "fl_stone:stone_rubble",
-    copper_block = "fl_ores:copper_block",
-    copper_ingot = "fl_ores:copper_ingot",
-    desert_sand = "fl_stone:desert_sand",
-    desert_stone = "fl_stone:desert_stone",
-    diamond = "fl_ores:diamond",
-    dirt = "fl_stone:dirt",
-    dirt_with_grass = "fl_topsoil:dirt_with_grass",
-    dye_black = "fl_dyes:black_dye",
-    dye_blue = "fl_dyes:blue_dye",
-    dye_brown = "fl_dyes:brown_dye",
-    dye_cyan = "fl_dyes:cyan_dye",
-    dye_dark_green = "fl_dyes:dark_green_dye",
-    dye_dark_grey = "fl_dyes:dark_grey_dye",
-    dye_green = "fl_dyes:green_dye",
-    dye_grey = "fl_dyes:grey_dye",
-    dye_orange = "fl_dyes:orange_dye",
-    dye_pink = "fl_dyes:pink_dye",
-    dye_red = "fl_dyes:red_dye",
-    dye_violet = "fl_dyes:violet_dye",
-    dye_white = "fl_dyes:white_dye",
-    dye_yellow = "fl_dyes:yellow_dye",
-    empty_bucket = "fl_bucket:bucket",
-    flint = "fl_topsoil:flint",
-    glass = "fl_glass:framed_glass",
-    glass_block = "fl_glass:framed_glass",
-    glass_bottle = "fl_bottles:bottle",
-    gold_block = "fl_ores:gold_block",
-    gold_ingot = "fl_ores:gold_ingot",
-    gravel = "fl_topsoil:gravel",
-    iron_lump = "fl_ores:iron_ore",
-    jungle_leaves = "fl_trees:jungletree_leaves",
+    pick_steel = "fl_tools:steel_pick",
     mese = "fl_ores:iron_ingot",
     mese_crystal = "fl_ores:iron_ingot",
     mese_crystal_fragment = "fl_ores:iron_ingot",
-    obsidian_glass = "",
-    paper = "",
-    pick_steel = "fl_tools:steel_pick",
-    sand = "fl_stone:sand",
-    sandstone = "fl_stone:sandstone",
-    silicon = "mesecons_materials:silicon",
+    torch = "fl_light_sources:torch",
+    diamond = "fl_ores:diamond",
+    clay_lump = "fl_bricks:clay_lump",
+    water_bucket = "fl_bucket:bucket_water",
+    empty_bucket = "fl_bucket:bucket",
+    dye_dark_grey = "fl_dyes:dark_grey_dye",
+    dye_black = "fl_dyes:black_dye",
+    dye_white = "fl_dyes:white_dye",
+    dye_green = "fl_dyes:green_dye",
+    dye_red = "fl_dyes:red_dye",
+    dye_yellow = "fl_dyes:yellow_dye",
+    dye_brown = "fl_dyes:brown_dye",
+    dye_blue = "fl_dyes:blue_dye",
+    dye_violet = "fl_dyes:violet_dye",
+    dye_grey = "fl_dyes:grey_dye",
+    dye_dark_green = "fl_dyes:dark_green_dye",
+    dye_orange = "fl_dyes:orange_dye",
+    dye_pink = "fl_dyes:pink_dye",
+    dye_cyan = "fl_dyes:cyan_dye",
     silver_ingot = "fl_ores:iron_ingot",
+    silicon = "mesecons_materials:silicon",
+    string = "fl_plantlife:oxeye_daisy",
+    paper = "",
+    book = "",
+    iron_lump = "fl_ores:iron_ore",
+    wool_grey = "",
+    wool_green = "",
+    wool_dark_green = "",
+    wool_brown = "",
+    wool_black = "",
+    wool_white = "",
     slab_stone = "fl_stone:stone_slab",
     slab_wood = "fl_trees:apple_plank_slab",
-    steel_block = "fl_ores:iron_block",
-    steel_ingot = "fl_ores:iron_ingot",
+    glass = "fl_glass:framed_glass",
+    glass_block = "fl_glass:framed_glass",
+    glass_bottle = "fl_bottles:bottle",
+    coal_lump = "fl_ores:coal_ore",
     stone = "fl_stone:stone",
-    string = "fl_plantlife:oxeye_daisy",
-    tin_block = "fl_ores:tin_block",
-    tin_ingot = "fl_ores:tin_ingot",
-    torch = "fl_light_sources:torch",
-    water_bucket = "fl_bucket:bucket_water",
-    water_flowing = "fl_liquids:water_flowing",
+    desert_stone = "fl_stone:desert_stone",
+    desert_sand = "fl_stone:desert_sand",
+    chest = "fl_storage:wood_chest",
+    cobble = "fl_stone:stone_rubble",
+    brick = "",
+    obsidian_glass = "",
     water_source = "fl_liquids:water_source",
-    wool_black = "",
-    wool_brown = "",
-    wool_dark_green = "",
-    wool_green = "",
-    wool_grey = "",
-    wool_white = "",
+    water_flowing = "fl_liquids:water_flowing",
+    dirt = "fl_stone:dirt",
+    dirt_with_grass = "fl_topsoil:dirt_with_grass",
+    apple_leaves = "fl_trees:apple_leaves",
+    apple_log = "fl_trees:apple_trunk",
+    apple_planks = "fl_trees:apple_plank",
+    birch_leaves = "fl_trees:aspen_leaves",
+    birch_log = "fl_trees:aspen_trunk",
+    birch_planks = "fl_trees:aspen_plank",
+    jungle_leaves = "fl_trees:jungletree_leaves",
+    bowl = "",
 }
 
 if minetest.get_modpath("basic_materials") then

src/materials/hades_revisited.lua

@@ -1,85 +1,88 @@
 local materials = {
-    apple_leaves = "hades_trees:leaves",
-    apple_log = "hades_trees:tree",
-    apple_planks = "hades_trees:wood",
-    axe_bronze = "hades_core:axe_bronze",
-    axe_diamond = "hades_core:axe_diamond",
+    sand = "hades_core:fertile_sand",
+    sandstone = "hades_core:sandstone",
+    gravel = "hades_core:gravel",
+    flint = "",
+    copper_ingot = "hades_core:copper_ingot",
+    steel_ingot = "hades_core:steel_ingot",
+    gold_ingot = "hades_core:gold_ingot",
+    tin_ingot = "hades_core:tin_ingot",
+    silver_ingot = "--unknown--",
+    copper_block = "hades_core:copperblock",
+    steel_block = "hades_core:steelblock",
+    gold_block = "hades_core:goldblock",
+    tin_block = "hades_core:tinblock",
     axe_steel = "hades_core:axe_steel",
+    axe_diamond = "hades_core:axe_diamond",
+    axe_bronze = "hades_core:axe_bronze",
     axe_stone = "hades_core:axe_stone",
     axe_wood = "hades_core:axe_wood",
-    birch_leaves = "hades_core:birch_leaves",
-    birch_log = "hades_trees:birch_tree",
-    birch_planks = "hades_trees:cream_wood",
-    book = "hades_core:book",
-    -- hades has no bowl but you get plate on eat so makes most sense.
-    bowl = "hades_food:plate",
-    brick = "hades_core:brick",
-    chest = "hades_chests:chest";
-    clay_brick = "hades_core:clay_brick",
-    clay_lump = "hades_core:clay_lump",
-    coal_lump = "hades_core:coal_lump",
-    cobble = "hades_core:cobble",
-    copper_block = "hades_core:copperblock",
-    copper_ingot = "hades_core:copper_ingot",
-    desert_sand = "hades_core:volcanic_sand",
-    desert_stone = "hades_core:stone_baked",
-    diamond = "hades_core:diamond",
-    dirt = "hades_core:dirt",
-    dirt_with_grass = "hades_core:dirt_with_grass",
-    dye_black = "dye:black",
-    dye_blue = "dye:blue",
-    dye_brown = "dye:brown",
-    dye_cyan = "dye:cyan",
-    dye_dark_green = "dye:dark_green",
-    dye_dark_grey = "dye:dark_grey",
-    dye_green = "dye:green",
-    dye_grey = "dye:grey",
-    dye_orange = "dye:orange",
-    dye_pink = "dye:pink",
-    dye_red = "dye:red",
-    dye_violet = "dye:violet",
-    dye_white = "dye:white",
-    dye_yellow = "dye:yellow",
-    empty_bucket = "hades_core:fertile_sand",
-    flint = "",
-    glass = "hades_core:glass",
-    glass_block = "hades_core:glass",
-    glass_bottle = "vessels:glass_bottle",
-    gold_block = "hades_core:goldblock",
-    gold_ingot = "hades_core:gold_ingot",
-    gravel = "hades_core:gravel",
-    iron_lump = "hades_core:iron_lump",
-    jungle_leaves = "hades_trees:jungle_leaves",
+    pick_steel = "hades_core:pick_steel",
     mese = "hades_core:mese",
     mese_crystal = "hades_core:mese_crystal",
     mese_crystal_fragment = "hades_core:mese_crystal_fragment",
-    obsidian_glass = "hades_core:obsidian_glass",
-    paper = "hades_core:paper",
-    pick_steel = "hades_core:pick_steel",
-    sand = "hades_core:fertile_sand",
-    sandstone = "hades_core:sandstone",
+    torch = "hades_torches:torch",
+    diamond = "hades_core:diamond",
+    clay_lump = "hades_core:clay_lump",
+    clay_brick = "hades_core:clay_brick",
+
+    --[[
+        Since hades doesnt have buckets or water for the user,
+        using dirt from near water to pull the water out
+    ]]
+    water_bucket = "hades_core:dirt",
+    empty_bucket = "hades_core:fertile_sand",
+    dye_dark_grey = "dye:dark_grey",
+    dye_black = "dye:black",
+    dye_white = "dye:white",
+    dye_green = "dye:green",
+    dye_red = "dye:red",
+    dye_yellow = "dye:yellow",
+    dye_brown = "dye:brown",
+    dye_blue = "dye:blue",
+    dye_violet = "dye:violet",
+    dye_grey = "dye:grey",
+    dye_dark_green = "dye:dark_green",
+    dye_orange = "dye:orange",
+    dye_pink = "dye:pink",
+    dye_cyan = "dye:cyan",
     silicon = "hades_materials:silicon",
-    silver_ingot = "--unknown--",
+    string = "hades_farming:string",
+    paper = "hades_core:paper",
+    book = "hades_core:book",
+    iron_lump = "hades_core:iron_lump",
+    wool_grey = "wool:grey",
+    wool_green = "wool:green",
+    wool_dark_green = "wool:dark_green",
+    wool_brown = "wool:brown",
+    wool_black = "wool:black",
+    wool_white = "wool:white",
     slab_stone = "stairs:slab_stone",
     slab_wood = "stairs:slab_wood",
-    steel_block = "hades_core:steelblock",
-    steel_ingot = "hades_core:steel_ingot",
+    glass = "hades_core:glass",
+    glass_block = "hades_core:glass",
+    glass_bottle = "vessels:glass_bottle",
+    obsidian_glass = "hades_core:obsidian_glass",
+    coal_lump = "hades_core:coal_lump",
     stone = "hades_core:stone",
-    string = "hades_farming:string",
-    tin_block = "hades_core:tinblock",
-    tin_ingot = "hades_core:tin_ingot",
-    torch = "hades_torches:torch",
-    -- Since hades doesnt have buckets or water for the user,
-    -- using dirt from near water to pull the water out
-    water_bucket = "hades_core:dirt",
-    water_flowing = "hades_core:water_flowing",
+    desert_stone = "hades_core:stone_baked",
+    desert_sand = "hades_core:volcanic_sand",
+    chest = "hades_chests:chest";
+    cobble = "hades_core:cobble",
+    brick = "hades_core:brick",
     water_source = "hades_core:water_source",
-    wool_black = "wool:black",
-    wool_brown = "wool:brown",
-    wool_dark_green = "wool:dark_green",
-    wool_green = "wool:green",
-    wool_grey = "wool:grey",
-    wool_white = "wool:white",
+    water_flowing = "hades_core:water_flowing",
+    dirt = "hades_core:dirt",
+    dirt_with_grass = "hades_core:dirt_with_grass",
+    apple_leaves = "hades_trees:leaves",
+    apple_log = "hades_trees:tree",
+    apple_planks = "hades_trees:wood",
+    birch_leaves = "hades_core:birch_leaves",
+    birch_log = "hades_trees:birch_tree",
+    birch_planks = "hades_trees:cream_wood",
+    jungle_leaves = "hades_trees:jungle_leaves",
+--hades has no bowl but you get plate on eat so makes most sense?
+    bowl = "hades_food:plate",
 }
 
 if minetest.get_modpath("hades_bucket") then

src/materials/mineclonia.lua

@@ -1,82 +1,82 @@
 --note this file handles mineclonia, mineclone2, and its rename voxelibre
 
 local materials = {
-    apple_leaves = "mcl_trees:leaves_oak",
-    apple_log = "mcl_trees:tree_oak",
-    apple_planks = "mcl_trees:wood_oak",
-    axe_bronze = "mcl_core:axe_bronze",
-    axe_diamond = "mcl_core:axe_diamond",
+    sand = "mcl_core:sand",
+    sandstone = "mcl_core:sandstone",
+    gravel = "mcl_core:gravel",
+    flint = "mcl_core:flint",
+    copper_ingot = "mcl_copper:copper_ingot",
+    steel_ingot = "mcl_core:iron_ingot",
+    gold_ingot = "mcl_core:gold_ingot",
+    tin_ingot = "mcl_core:iron_ingot",
+    copper_block = "mcl_copper:copper_block",
+    steel_block = "mcl_core:iron_block",
+    gold_block = "mcl_core:gold_block",
+    tin_block = "mcl_core:iron_block",
     axe_steel = "mcl_core:axe_steel",
+    axe_diamond = "mcl_core:axe_diamond",
+    axe_bronze = "mcl_core:axe_bronze",
     axe_stone = "mcl_core:axe_stone",
     axe_wood = "mcl_core:axe_wood",
-    birch_leaves = "mcl_trees:leaves_birch",
-    birch_log = "mcl_trees:tree_birch",
-    birch_planks = "mcl_trees:wood_birch",
-    book = "mcl_core:book",
-    bowl = "mcl_core:bowl",
-    brick = "mcl_core:brick",
-    chest = "mcl_chests:chest",
-    clay_lump = "default:clay_lump",
-    coal_lump = "mcl_core:coal",
-    cobble = "mcl_core:cobble",
-    copper_block = "mcl_copper:copper_block",
-    copper_ingot = "mcl_copper:copper_ingot",
-    desert_sand = "mcl_core:sand",
-    desert_stone = "mcl_core:redsandstone",
-    diamond = "mcl_core:diamond",
-    dirt = "mcl_core:dirt",
-    dirt_with_grass = "mcl_core:dirt_with_grass",
-    dye_black = "mcl_dyes:black",
-    dye_blue = "mcl_dyes:blue",
-    dye_brown = "mcl_dyes:brown",
-    dye_cyan = "mcl_dyes:cyan",
-    dye_dark_green = "mcl_dyes:dark_green",
-    dye_dark_grey = "mcl_dyes:dark_grey",
-    dye_green = "mcl_dyes:green",
-    dye_grey = "mcl_dyes:grey",
-    dye_orange = "mcl_dyes:orange",
-    dye_pink = "mcl_dyes:pink",
-    dye_red = "mcl_dyes:red",
-    dye_violet = "mcl_dyes:violet",
-    dye_white = "mcl_dyes:white",
-    dye_yellow = "mcl_dyes:yellow",
-    empty_bucket = "mcl_buckets:bucket_empty",
-    flint = "mcl_core:flint",
-    glass = "mcl_core:glass",
-    glass_block = "mcl_core:glass",
-    glass_bottle = "mcl_core:glass_bottle",
-    gold_block = "mcl_core:gold_block",
-    gold_ingot = "mcl_core:gold_ingot",
-    gravel = "mcl_core:gravel",
-    iron_lump = "mcl_core:stone_with_iron",
-    jungle_leaves = "mcl_trees:leaves_jungle",
+    pick_steel = "mcl_core:pick_steel",
     mese = "mesecons_torch:redstoneblock",
     mese_crystal = "mesecons:redstone",
     mese_crystal_fragment = "mcl_core:iron_ingot",
-    obsidian_glass = "",
-    paper = "mcl_core:paper",
-    pick_steel = "mcl_core:pick_steel",
-    sand = "mcl_core:sand",
-    sandstone = "mcl_core:sandstone",
+    torch = "mcl_torches:torch",
+    diamond = "mcl_core:diamond",
+    clay_lump = "default:clay_lump",
+    water_bucket = "mcl_buckets:bucket:bucket_water",
+    empty_bucket = "mcl_buckets:bucket_empty",
+    dye_dark_grey = "mcl_dyes:dark_grey",
+    dye_black = "mcl_dyes:black",
+    dye_white = "mcl_dyes:white",
+    dye_green = "mcl_dyes:green",
+    dye_red = "mcl_dyes:red",
+    dye_yellow = "mcl_dyes:yellow",
+    dye_brown = "mcl_dyes:brown",
+    dye_blue = "mcl_dyes:blue",
+    dye_violet = "mcl_dyes:violet",
+    dye_grey = "mcl_dyes:grey",
+    dye_dark_green = "mcl_dyes:dark_green",
+    dye_orange = "mcl_dyes:orange",
+    dye_pink = "mcl_dyes:pink",
+    dye_cyan = "mcl_dyes:cyan",
     silicon = "mcl_core:iron_ingot",
+    string = "mcl_mobitems:string",
+    paper = "mcl_core:paper",
+    book = "mcl_core:book",
+    iron_lump = "mcl_core:stone_with_iron",
+    wool_grey = "mcl_wool:grey",
+    wool_green = "mcl_wool:green",
+    wool_dark_green = "mcl_wool:dark_green",
+    wool_brown = "mcl_wool:brown",
+    wool_black = "mcl_wool:black",
+    wool_white = "mcl_wool:white",
     slab_stone = "mcl_stairs:slab_stone",
     slab_wood = "mcl_stairs:slab_wood",
-    steel_block = "mcl_core:iron_block",
-    steel_ingot = "mcl_core:iron_ingot",
+    glass = "mcl_core:glass",
+    glass_block = "mcl_core:glass",
+    glass_bottle = "mcl_core:glass_bottle",
+    coal_lump = "mcl_core:coal",
     stone = "mcl_core:stone",
-    string = "mcl_mobitems:string",
-    tin_block = "mcl_core:iron_block",
-    tin_ingot = "mcl_core:iron_ingot",
-    torch = "mcl_torches:torch",
-    water_bucket = "mcl_buckets:bucket:bucket_water",
-    water_flowing = "mcl_core:water_flowing",
+    desert_stone = "mcl_core:redsandstone",
+    desert_sand = "mcl_core:sand",
+    chest = "mcl_chests:chest",
+    cobble = "mcl_core:cobble",
+    brick = "mcl_core:brick",
+    obsidian_glass = "",
     water_source = "mcl_core:water_source",
-    wool_black = "mcl_wool:black",
-    wool_brown = "mcl_wool:brown",
-    wool_dark_green = "mcl_wool:dark_green",
-    wool_green = "mcl_wool:green",
-    wool_grey = "mcl_wool:grey",
-    wool_white = "mcl_wool:white",
+    water_flowing = "mcl_core:water_flowing",
+    dirt = "mcl_core:dirt",
+    dirt_with_grass = "mcl_core:dirt_with_grass",
+    apple_leaves = "mcl_trees:leaves_oak",
+    apple_log = "mcl_trees:tree_oak",
+    apple_planks = "mcl_trees:wood_oak",
+    birch_leaves = "mcl_trees:leaves_birch",
+    birch_log = "mcl_trees:tree_birch",
+    birch_planks = "mcl_trees:wood_birch",
+    jungle_leaves = "mcl_trees:leaves_jungle",
+    bowl = "mcl_core:bowl",
 }
 
-return materials
+return materials

src/materials/minetest.lua

@@ -1,80 +1,80 @@
 local materials = {
-    apple_leaves = "default:leaves",
-    apple_log = "default:tree",
-    apple_planks = "default:wood",
-    axe_bronze = "default:axe_bronze",
-    axe_diamond = "default:axe_diamond",
+    sand = "default:sand",
+    sandstone = "default:sandstone",
+    gravel = "default:gravel",
+    flint = "default:flint",
+    copper_ingot = "default:copper_ingot",
+    steel_ingot = "default:steel_ingot",
+    gold_ingot = "default:gold_ingot",
+    tin_ingot = "default:tin_ingot",
+    copper_block = "default:copperblock",
+    steel_block = "default:steelblock",
+    gold_block = "default:goldblock",
+    tin_block = "default:tinblock",
     axe_steel = "default:axe_steel",
+    axe_diamond = "default:axe_diamond",
+    axe_bronze = "default:axe_bronze",
     axe_stone = "default:axe_stone",
     axe_wood = "default:axe_wood",
-    birch_leaves = "default:aspen_leaves",
-    birch_log = "default:aspen_tree",
-    birch_planks = "default:aspen_wood",
-    book = "default:book",
-    bowl = "",
-    brick = "default:brick",
-    chest = "default:chest",
-    clay_lump = "default:clay_lump",
-    coal_lump = "default:coal_lump",
-    cobble = "default:cobble",
-    copper_block = "default:copperblock",
-    copper_ingot = "default:copper_ingot",
-    desert_sand = "default:desert_sand",
-    desert_stone = "default:desert_stone",
-    diamond = "default:diamond",
-    dirt = "default:dirt",
-    dirt_with_grass = "default:dirt_with_grass",
-    dye_black = "dye:black",
-    dye_blue = "dye:blue",
-    dye_brown = "dye:brown",
-    dye_cyan = "dye:cyan",
-    dye_dark_green = "dye:dark_green",
-    dye_dark_grey = "dye:dark_grey",
-    dye_green = "dye:green",
-    dye_grey = "dye:grey",
-    dye_orange = "dye:orange",
-    dye_pink = "dye:pink",
-    dye_red = "dye:red",
-    dye_violet = "dye:violet",
-    dye_white = "dye:white",
-    dye_yellow = "dye:yellow",
-    empty_bucket = "bucket:bucket_empty",
-    flint = "default:flint",
-    glass = "default:glass",
-    glass_block = "default:glass",
-    glass_bottle = "vessels:glass_bottle",
-    gold_block = "default:goldblock",
-    gold_ingot = "default:gold_ingot",
-    gravel = "default:gravel",
-    iron_lump = "default:iron_lump",
-    jungle_leaves = "default:jungleleaves",
+    pick_steel = "default:pick_steel",
     mese = "default:mese",
     mese_crystal = "default:mese_crystal",
     mese_crystal_fragment = "default:mese_crystal_fragment",
-    obsidian_glass = "default:obsidian_glass",
-    paper = "default:paper",
-    pick_steel = "default:pick_steel",
-    sand = "default:sand",
-    sandstone = "default:sandstone",
+    torch = "default:torch",
+    diamond = "default:diamond",
+    clay_lump = "default:clay_lump",
+    water_bucket = "bucket:bucket_water",
+    empty_bucket = "bucket:bucket_empty",
+    dye_dark_grey = "dye:dark_grey",
+    dye_black = "dye:black",
+    dye_white = "dye:white",
+    dye_green = "dye:green",
+    dye_red = "dye:red",
+    dye_yellow = "dye:yellow",
+    dye_brown = "dye:brown",
+    dye_blue = "dye:blue",
+    dye_violet = "dye:violet",
+    dye_grey = "dye:grey",
+    dye_dark_green = "dye:dark_green",
+    dye_orange = "dye:orange",
+    dye_pink = "dye:pink",
+    dye_cyan = "dye:cyan",
     silicon = "mesecons_materials:silicon",
+    string = "farming:string",
+    paper = "default:paper",
+    book = "default:book",
+    iron_lump = "default:iron_lump",
+    wool_grey = "wool:grey",
+    wool_green = "wool:green",
+    wool_dark_green = "wool:dark_green",
+    wool_brown = "wool:brown",
+    wool_black = "wool:black",
+    wool_white = "wool:white",
     slab_stone = "stairs:slab_stone",
     slab_wood = "stairs:slab_wood",
-    steel_block = "default:steelblock",
-    steel_ingot = "default:steel_ingot",
+    glass = "default:glass",
+    glass_block = "default:glass",
+    glass_bottle = "vessels:glass_bottle",
+    coal_lump = "default:coal_lump",
     stone = "default:stone",
-    string = "farming:string",
-    tin_block = "default:tinblock",
-    tin_ingot = "default:tin_ingot",
-    torch = "default:torch",
-    water_bucket = "bucket:bucket_water",
-    water_flowing = "default:water_flowing",
+    desert_stone = "default:desert_stone",
+    desert_sand = "default:desert_sand",
+    chest = "default:chest",
+    cobble = "default:cobble",
+    brick = "default:brick",
+    obsidian_glass = "default:obsidian_glass",
     water_source = "default:water_source",
-    wool_black = "wool:black",
-    wool_brown = "wool:brown",
-    wool_dark_green = "wool:dark_green",
-    wool_green = "wool:green",
-    wool_grey = "wool:grey",
-    wool_white = "wool:white",
+    water_flowing = "default:water_flowing",
+    dirt = "default:dirt",
+    dirt_with_grass = "default:dirt_with_grass",
+    apple_leaves = "default:leaves",
+    apple_log = "default:tree",
+    apple_planks = "default:wood",
+    birch_leaves = "default:aspen_leaves",
+    birch_log = "default:aspen_tree",
+    birch_planks = "default:aspen_wood",
+    jungle_leaves = "default:jungleleaves",
+    bowl = "",
 }
 
 if minetest.registered_items["farming:bowl"] then