From: Perttu Ahola Date: Tue, 15 Nov 2011 06:48:24 +0000 (+0200) Subject: Modify mod and texture directory hierarchies X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=e71744b918898b98ffa5ae949fbf2a1b877b254c;p=zefram%2Fminetest%2Fminetest_engine.git Modify mod and texture directory hierarchies --- diff --git a/data/clienttextures/fontlucida.png b/data/clienttextures/fontlucida.png new file mode 100644 index 00000000..c63fa02b Binary files /dev/null and b/data/clienttextures/fontlucida.png differ diff --git a/data/clienttextures/menulogo.png b/data/clienttextures/menulogo.png new file mode 100644 index 00000000..76595c48 Binary files /dev/null and b/data/clienttextures/menulogo.png differ diff --git a/data/clienttextures/mud.png b/data/clienttextures/mud.png new file mode 100644 index 00000000..7cb9c89a Binary files /dev/null and b/data/clienttextures/mud.png differ diff --git a/data/mods/default/init.lua b/data/mods/default/init.lua new file mode 100644 index 00000000..a60979ff --- /dev/null +++ b/data/mods/default/init.lua @@ -0,0 +1,418 @@ +function basic_dump2(o) + if type(o) == "number" then + return tostring(o) + elseif type(o) == "string" then + return string.format("%q", o) + elseif type(o) == "boolean" then + return tostring(o) + elseif type(o) == "function" then + return "" + elseif type(o) == "userdata" then + return "" + elseif type(o) == "nil" then + return "nil" + else + error("cannot dump a " .. type(o)) + return nil + end +end + +function dump2(o, name, dumped) + name = name or "_" + dumped = dumped or {} + io.write(name, " = ") + if type(o) == "number" or type(o) == "string" or type(o) == "boolean" + or type(o) == "function" or type(o) == "nil" + or type(o) == "userdata" then + io.write(basic_dump2(o), "\n") + elseif type(o) == "table" then + if dumped[o] then + io.write(dumped[o], "\n") + else + dumped[o] = name + io.write("{}\n") -- new table + for k,v in pairs(o) do + local fieldname = string.format("%s[%s]", name, basic_dump2(k)) + dump2(v, fieldname, dumped) + end + end + else + error("cannot dump a " .. type(o)) + return nil + end +end + +function dump(o, dumped) + dumped = dumped or {} + if type(o) == "number" then + return tostring(o) + elseif type(o) == "string" then + return string.format("%q", o) + elseif type(o) == "table" then + if dumped[o] then + return "" + end + dumped[o] = true + local t = {} + for k,v in pairs(o) do + t[#t+1] = "" .. k .. " = " .. dump(v, dumped) + end + return "{" .. table.concat(t, ", ") .. "}" + elseif type(o) == "boolean" then + return tostring(o) + elseif type(o) == "function" then + return "" + elseif type(o) == "userdata" then + return "" + elseif type(o) == "nil" then + return "nil" + else + error("cannot dump a " .. type(o)) + return nil + end +end + +-- Textures: +-- Mods should prefix their textures with modname_, eg. given the mod +-- name "foomod", a texture could be called "foomod_superfurnace.png" +-- +-- Global functions: +-- minetest.register_entity(name, prototype_table) +-- minetest.register_globalstep(func) +-- +-- Global objects: +-- minetest.env - environment reference +-- +-- Global tables: +-- minetest.registered_entities +-- ^ List of registered entity prototypes, indexed by name +-- minetest.object_refs +-- ^ List of object references, indexed by active object id +-- minetest.luaentities +-- ^ List of lua entities, indexed by active object id +-- +-- EnvRef methods: +-- - add_node(pos, content); pos={x=num, y=num, z=num} +-- +-- ObjectRef methods: +-- - remove(): remove object (after returning from Lua) +-- - getpos(): returns {x=num, y=num, z=num} +-- - setpos(pos); pos={x=num, y=num, z=num} +-- - moveto(pos, continuous=false): interpolated move +-- - add_to_inventory(itemstring): add an item to object inventory +-- +-- Registered entities: +-- - Functions receive a "luaentity" as self: +-- - It has the member .object, which is an ObjectRef pointing to the object +-- - The original prototype stuff is visible directly via a metatable +-- + +print("omg lol") +print("minetest dump: "..dump(minetest)) + +-- Global environment step function +function on_step(dtime) + -- print("on_step") +end + +minetest.register_globalstep(on_step) + +minetest.register_tool("WPick", { + image = "tool_woodpick.png", + basetime = 2.0, + dt_weight = 0, + dt_crackiness = -0.5, + dt_crumbliness = 2, + dt_cuttability = 0, + basedurability = 30, + dd_weight = 0, + dd_crackiness = 0, + dd_crumbliness = 0, + dd_cuttability = 0, +}) +minetest.register_tool("STPick", { + image = "tool_stonepick.png", + basetime = 1.5, + dt_weight = 0, + dt_crackiness = -0.5, + dt_crumbliness = 2, + dt_cuttability = 0, + basedurability = 100, + dd_weight = 0, + dd_crackiness = 0, + dd_crumbliness = 0, + dd_cuttability = 0, +}) +minetest.register_tool("SteelPick", { + image = "tool_steelpick.png", + basetime = 1.0, + dt_weight = 0, + dt_crackiness = -0.5, + dt_crumbliness = 2, + dt_cuttability = 0, + basedurability = 333, + dd_weight = 0, + dd_crackiness = 0, + dd_crumbliness = 0, + dd_cuttability = 0, +}) +minetest.register_tool("MesePick", { + image = "tool_mesepick.png", + basetime = 0, + dt_weight = 0, + dt_crackiness = 0, + dt_crumbliness = 0, + dt_cuttability = 0, + basedurability = 1337, + dd_weight = 0, + dd_crackiness = 0, + dd_crumbliness = 0, + dd_cuttability = 0, +}) +minetest.register_tool("WShovel", { + image = "tool_woodshovel.png", + basetime = 2.0, + dt_weight = 0.5, + dt_crackiness = 2, + dt_crumbliness = -1.5, + dt_cuttability = 0.3, + basedurability = 30, + dd_weight = 0, + dd_crackiness = 0, + dd_crumbliness = 0, + dd_cuttability = 0, +}) +minetest.register_tool("STShovel", { + image = "tool_stoneshovel.png", + basetime = 1.5, + dt_weight = 0.5, + dt_crackiness = 2, + dt_crumbliness = -1.5, + dt_cuttability = 0.1, + basedurability = 100, + dd_weight = 0, + dd_crackiness = 0, + dd_crumbliness = 0, + dd_cuttability = 0, +}) +minetest.register_tool("SteelShovel", { + image = "tool_steelshovel.png", + basetime = 1.0, + dt_weight = 0.5, + dt_crackiness = 2, + dt_crumbliness = -1.5, + dt_cuttability = 0.0, + basedurability = 330, + dd_weight = 0, + dd_crackiness = 0, + dd_crumbliness = 0, + dd_cuttability = 0, +}) +minetest.register_tool("WAxe", { + image = "tool_woodaxe.png", + basetime = 2.0, + dt_weight = 0.5, + dt_crackiness = -0.2, + dt_crumbliness = 1, + dt_cuttability = -0.5, + basedurability = 30, + dd_weight = 0, + dd_crackiness = 0, + dd_crumbliness = 0, + dd_cuttability = 0, +}) +minetest.register_tool("STAxe", { + image = "tool_stoneaxe.png", + basetime = 1.5, + dt_weight = 0.5, + dt_crackiness = -0.2, + dt_crumbliness = 1, + dt_cuttability = -0.5, + basedurability = 100, + dd_weight = 0, + dd_crackiness = 0, + dd_crumbliness = 0, + dd_cuttability = 0, +}) +minetest.register_tool("SteelAxe", { + image = "tool_steelaxe.png", + basetime = 1.0, + dt_weight = 0.5, + dt_crackiness = -0.2, + dt_crumbliness = 1, + dt_cuttability = -0.5, + basedurability = 330, + dd_weight = 0, + dd_crackiness = 0, + dd_crumbliness = 0, + dd_cuttability = 0, +}) +minetest.register_tool("WSword", { + image = "tool_woodsword.png", + basetime = 3.0, + dt_weight = 3, + dt_crackiness = 0, + dt_crumbliness = 1, + dt_cuttability = -1, + basedurability = 30, + dd_weight = 0, + dd_crackiness = 0, + dd_crumbliness = 0, + dd_cuttability = 0, +}) +minetest.register_tool("STSword", { + image = "tool_stonesword.png", + basetime = 2.5, + dt_weight = 3, + dt_crackiness = 0, + dt_crumbliness = 1, + dt_cuttability = -1, + basedurability = 100, + dd_weight = 0, + dd_crackiness = 0, + dd_crumbliness = 0, + dd_cuttability = 0, +}) +minetest.register_tool("SteelSword", { + image = "tool_steelsword.png", + basetime = 2.0, + dt_weight = 3, + dt_crackiness = 0, + dt_crumbliness = 1, + dt_cuttability = -1, + basedurability = 330, + dd_weight = 0, + dd_crackiness = 0, + dd_crumbliness = 0, + dd_cuttability = 0, +}) +minetest.register_tool("", { + image = "", + basetime = 0.5, + dt_weight = 1, + dt_crackiness = 0, + dt_crumbliness = -1, + dt_cuttability = 0, + basedurability = 50, + dd_weight = 0, + dd_crackiness = 0, + dd_crumbliness = 0, + dd_cuttability = 0, +}) + +--[[ +minetest.register_tool("horribletool", { + image = "lava.png", + basetime = 2.0 + dt_weight = 0.2 + dt_crackiness = 0.2 + dt_crumbliness = 0.2 + dt_cuttability = 0.2 + basedurability = 50 + dd_weight = -5 + dd_crackiness = -5 + dd_crumbliness = -5 + dd_cuttability = -5 +}) +--]] + +local TNT = { + -- Maybe handle gravity and collision this way? dunno + physical = true, + weight = 5, + collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5}, + visual = "cube", + textures = {"tnt_top.png","tnt_bottom.png","tnt_side.png","tnt_side.png","tnt_side.png","tnt_side.png"}, + --visual = "single_sprite", + --textures = {"mese.png^[forcesingle"}, + -- Initial value for our timer + timer = 0, + -- List names of state variables, for serializing object state + state_variables = {"timer"}, +} + +-- Called periodically +function TNT:on_step(dtime) + --print("TNT:on_step()") +end + +-- Called when object is punched +function TNT:on_punch(hitter) + print("TNT:on_punch()") + self.object:remove() + hitter:add_to_inventory("CraftItem testobject1 1") +end + +-- Called when object is right-clicked +function TNT:on_rightclick(clicker) + pos = self.object:getpos() + pos = {x=pos.x, y=pos.y+0.1, z=pos.z} + self.object:moveto(pos, false) +end + +print("TNT dump: "..dump(TNT)) + +print("Registering TNT"); +minetest.register_entity("TNT", TNT) + +print("minetest.registered_entities:") +dump2(minetest.registered_entities) + +--[[ +function TNT:on_rightclick(clicker) + print("TNT:on_rightclick()") + print("self: "..dump(self)) + print("getmetatable(self): "..dump(getmetatable(self))) + print("getmetatable(getmetatable(self)): "..dump(getmetatable(getmetatable(self)))) + pos = self.object:getpos() + print("TNT:on_rightclick(): object position: "..dump(pos)) + pos = {x=pos.x+0.5+1, y=pos.y+0.5, z=pos.z+0.5} + --minetest.env:add_node(pos, 0) +end +--]] + +--[=[ + +register_block(0, { + textures = "stone.png", + makefacetype = 0, + get_dig_duration = function(env, pos, digger) + -- Check stuff like digger.current_tool + return 1.5 + end, + on_dig = function(env, pos, digger) + env:remove_node(pos) + digger.inventory.put("MaterialItem2 0"); + end, +}) + +register_block(1, { + textures = {"grass.png","mud.png","mud_grass_side.png","mud_grass_side.png","mud_grass_side.png","mud_grass_side.png"}, + makefacetype = 0, + get_dig_duration = function(env, pos, digger) + -- Check stuff like digger.current_tool + return 0.5 + end, + on_dig = function(env, pos, digger) + env:remove_node(pos) + digger.inventory.put("MaterialItem2 1"); + end, +}) + +-- Consider the "miscellaneous block namespace" to be 0xc00...0xfff = 3072...4095 +register_block(3072, { + textures = {"tnt_top.png","tnt_bottom.png","tnt_side.png","tnt_side.png","tnt_side.png","tnt_side.png"}, + makefacetype = 0, + get_dig_duration = function(env, pos, digger) + -- Cannot be dug + return nil + end, + -- on_dig = function(env, pos, digger) end, -- Not implemented + on_hit = function(env, pos, hitter) + -- Replace with TNT object, which will explode after timer, follow gravity, blink and stuff + env:add_object("tnt", pos) + env:remove_node(pos) + end, +}) +--]=] + diff --git a/data/mods/default/textures/apple.png b/data/mods/default/textures/apple.png new file mode 100644 index 00000000..9593f28f Binary files /dev/null and b/data/mods/default/textures/apple.png differ diff --git a/data/mods/default/textures/apple_iron.png b/data/mods/default/textures/apple_iron.png new file mode 100644 index 00000000..2dffdf01 Binary files /dev/null and b/data/mods/default/textures/apple_iron.png differ diff --git a/data/mods/default/textures/book.png b/data/mods/default/textures/book.png new file mode 100644 index 00000000..176fb6aa Binary files /dev/null and b/data/mods/default/textures/book.png differ diff --git a/data/mods/default/textures/bookshelf.png b/data/mods/default/textures/bookshelf.png new file mode 100644 index 00000000..5ecc50ff Binary files /dev/null and b/data/mods/default/textures/bookshelf.png differ diff --git a/data/mods/default/textures/brick.png b/data/mods/default/textures/brick.png new file mode 100644 index 00000000..32d77f34 Binary files /dev/null and b/data/mods/default/textures/brick.png differ diff --git a/data/mods/default/textures/cactus_side.png b/data/mods/default/textures/cactus_side.png new file mode 100644 index 00000000..fc479fde Binary files /dev/null and b/data/mods/default/textures/cactus_side.png differ diff --git a/data/mods/default/textures/cactus_top.png b/data/mods/default/textures/cactus_top.png new file mode 100644 index 00000000..f9e68df5 Binary files /dev/null and b/data/mods/default/textures/cactus_top.png differ diff --git a/data/mods/default/textures/chest_front.png b/data/mods/default/textures/chest_front.png new file mode 100644 index 00000000..c5628af9 Binary files /dev/null and b/data/mods/default/textures/chest_front.png differ diff --git a/data/mods/default/textures/chest_lock.png b/data/mods/default/textures/chest_lock.png new file mode 100644 index 00000000..ae038fae Binary files /dev/null and b/data/mods/default/textures/chest_lock.png differ diff --git a/data/mods/default/textures/chest_side.png b/data/mods/default/textures/chest_side.png new file mode 100644 index 00000000..916dd784 Binary files /dev/null and b/data/mods/default/textures/chest_side.png differ diff --git a/data/mods/default/textures/chest_top.png b/data/mods/default/textures/chest_top.png new file mode 100644 index 00000000..58c79674 Binary files /dev/null and b/data/mods/default/textures/chest_top.png differ diff --git a/data/mods/default/textures/clay.png b/data/mods/default/textures/clay.png new file mode 100644 index 00000000..3557429d Binary files /dev/null and b/data/mods/default/textures/clay.png differ diff --git a/data/mods/default/textures/clay_brick.png b/data/mods/default/textures/clay_brick.png new file mode 100644 index 00000000..e36648e4 Binary files /dev/null and b/data/mods/default/textures/clay_brick.png differ diff --git a/data/mods/default/textures/cloud.png b/data/mods/default/textures/cloud.png new file mode 100644 index 00000000..24091a37 Binary files /dev/null and b/data/mods/default/textures/cloud.png differ diff --git a/data/mods/default/textures/cobble.png b/data/mods/default/textures/cobble.png new file mode 100644 index 00000000..7d044741 Binary files /dev/null and b/data/mods/default/textures/cobble.png differ diff --git a/data/mods/default/textures/cooked_rat.png b/data/mods/default/textures/cooked_rat.png new file mode 100644 index 00000000..daad3be0 Binary files /dev/null and b/data/mods/default/textures/cooked_rat.png differ diff --git a/data/mods/default/textures/crack.png b/data/mods/default/textures/crack.png new file mode 100644 index 00000000..49978398 Binary files /dev/null and b/data/mods/default/textures/crack.png differ diff --git a/data/mods/default/textures/dungeon_master.png b/data/mods/default/textures/dungeon_master.png new file mode 100644 index 00000000..3457c822 Binary files /dev/null and b/data/mods/default/textures/dungeon_master.png differ diff --git a/data/mods/default/textures/fence.png b/data/mods/default/textures/fence.png new file mode 100644 index 00000000..0b99f0eb Binary files /dev/null and b/data/mods/default/textures/fence.png differ diff --git a/data/mods/default/textures/fireball.png b/data/mods/default/textures/fireball.png new file mode 100644 index 00000000..52314285 Binary files /dev/null and b/data/mods/default/textures/fireball.png differ diff --git a/data/mods/default/textures/firefly.png b/data/mods/default/textures/firefly.png new file mode 100644 index 00000000..40df7fa1 Binary files /dev/null and b/data/mods/default/textures/firefly.png differ diff --git a/data/mods/default/textures/furnace_front.png b/data/mods/default/textures/furnace_front.png new file mode 100644 index 00000000..1620a27c Binary files /dev/null and b/data/mods/default/textures/furnace_front.png differ diff --git a/data/mods/default/textures/furnace_side.png b/data/mods/default/textures/furnace_side.png new file mode 100644 index 00000000..63cb162f Binary files /dev/null and b/data/mods/default/textures/furnace_side.png differ diff --git a/data/mods/default/textures/glass.png b/data/mods/default/textures/glass.png new file mode 100644 index 00000000..8598ce67 Binary files /dev/null and b/data/mods/default/textures/glass.png differ diff --git a/data/mods/default/textures/grass.png b/data/mods/default/textures/grass.png new file mode 100644 index 00000000..3610bb2b Binary files /dev/null and b/data/mods/default/textures/grass.png differ diff --git a/data/mods/default/textures/grass_footsteps.png b/data/mods/default/textures/grass_footsteps.png new file mode 100644 index 00000000..57e063d8 Binary files /dev/null and b/data/mods/default/textures/grass_footsteps.png differ diff --git a/data/mods/default/textures/grass_side.png b/data/mods/default/textures/grass_side.png new file mode 100644 index 00000000..4f4f680b Binary files /dev/null and b/data/mods/default/textures/grass_side.png differ diff --git a/data/mods/default/textures/gravel.png b/data/mods/default/textures/gravel.png new file mode 100644 index 00000000..f08666ad Binary files /dev/null and b/data/mods/default/textures/gravel.png differ diff --git a/data/mods/default/textures/heart.png b/data/mods/default/textures/heart.png new file mode 100644 index 00000000..6bc183e0 Binary files /dev/null and b/data/mods/default/textures/heart.png differ diff --git a/data/mods/default/textures/junglegrass.png b/data/mods/default/textures/junglegrass.png new file mode 100644 index 00000000..eea87c07 Binary files /dev/null and b/data/mods/default/textures/junglegrass.png differ diff --git a/data/mods/default/textures/jungletree.png b/data/mods/default/textures/jungletree.png new file mode 100644 index 00000000..ccd20ac7 Binary files /dev/null and b/data/mods/default/textures/jungletree.png differ diff --git a/data/mods/default/textures/jungletree_top.png b/data/mods/default/textures/jungletree_top.png new file mode 100644 index 00000000..2a9b5137 Binary files /dev/null and b/data/mods/default/textures/jungletree_top.png differ diff --git a/data/mods/default/textures/ladder.png b/data/mods/default/textures/ladder.png new file mode 100644 index 00000000..11056359 Binary files /dev/null and b/data/mods/default/textures/ladder.png differ diff --git a/data/mods/default/textures/lava.png b/data/mods/default/textures/lava.png new file mode 100644 index 00000000..cb02ada1 Binary files /dev/null and b/data/mods/default/textures/lava.png differ diff --git a/data/mods/default/textures/leaves.png b/data/mods/default/textures/leaves.png new file mode 100644 index 00000000..7a25126e Binary files /dev/null and b/data/mods/default/textures/leaves.png differ diff --git a/data/mods/default/textures/lump_of_clay.png b/data/mods/default/textures/lump_of_clay.png new file mode 100644 index 00000000..be0bab9d Binary files /dev/null and b/data/mods/default/textures/lump_of_clay.png differ diff --git a/data/mods/default/textures/lump_of_coal.png b/data/mods/default/textures/lump_of_coal.png new file mode 100644 index 00000000..bad901ef Binary files /dev/null and b/data/mods/default/textures/lump_of_coal.png differ diff --git a/data/mods/default/textures/lump_of_iron.png b/data/mods/default/textures/lump_of_iron.png new file mode 100644 index 00000000..edb93101 Binary files /dev/null and b/data/mods/default/textures/lump_of_iron.png differ diff --git a/data/mods/default/textures/mese.png b/data/mods/default/textures/mese.png new file mode 100644 index 00000000..4c876cdc Binary files /dev/null and b/data/mods/default/textures/mese.png differ diff --git a/data/mods/default/textures/mineral_coal.png b/data/mods/default/textures/mineral_coal.png new file mode 100644 index 00000000..3ff9692f Binary files /dev/null and b/data/mods/default/textures/mineral_coal.png differ diff --git a/data/mods/default/textures/mineral_iron.png b/data/mods/default/textures/mineral_iron.png new file mode 100644 index 00000000..51b15d95 Binary files /dev/null and b/data/mods/default/textures/mineral_iron.png differ diff --git a/data/mods/default/textures/mossycobble.png b/data/mods/default/textures/mossycobble.png new file mode 100644 index 00000000..fad1b33f Binary files /dev/null and b/data/mods/default/textures/mossycobble.png differ diff --git a/data/mods/default/textures/mud.png b/data/mods/default/textures/mud.png new file mode 100644 index 00000000..7cb9c89a Binary files /dev/null and b/data/mods/default/textures/mud.png differ diff --git a/data/mods/default/textures/nc_back.png b/data/mods/default/textures/nc_back.png new file mode 100644 index 00000000..f09f4165 Binary files /dev/null and b/data/mods/default/textures/nc_back.png differ diff --git a/data/mods/default/textures/nc_front.png b/data/mods/default/textures/nc_front.png new file mode 100644 index 00000000..cad9edab Binary files /dev/null and b/data/mods/default/textures/nc_front.png differ diff --git a/data/mods/default/textures/nc_rb.png b/data/mods/default/textures/nc_rb.png new file mode 100644 index 00000000..7ebc9930 Binary files /dev/null and b/data/mods/default/textures/nc_rb.png differ diff --git a/data/mods/default/textures/nc_side.png b/data/mods/default/textures/nc_side.png new file mode 100644 index 00000000..f954045f Binary files /dev/null and b/data/mods/default/textures/nc_side.png differ diff --git a/data/mods/default/textures/oerkki1.png b/data/mods/default/textures/oerkki1.png new file mode 100644 index 00000000..33cbac9e Binary files /dev/null and b/data/mods/default/textures/oerkki1.png differ diff --git a/data/mods/default/textures/oerkki1_damaged.png b/data/mods/default/textures/oerkki1_damaged.png new file mode 100644 index 00000000..9b777387 Binary files /dev/null and b/data/mods/default/textures/oerkki1_damaged.png differ diff --git a/data/mods/default/textures/paper.png b/data/mods/default/textures/paper.png new file mode 100644 index 00000000..ae5c06bc Binary files /dev/null and b/data/mods/default/textures/paper.png differ diff --git a/data/mods/default/textures/papyrus.png b/data/mods/default/textures/papyrus.png new file mode 100644 index 00000000..bf0dec7f Binary files /dev/null and b/data/mods/default/textures/papyrus.png differ diff --git a/data/mods/default/textures/player.png b/data/mods/default/textures/player.png new file mode 100644 index 00000000..90adf974 Binary files /dev/null and b/data/mods/default/textures/player.png differ diff --git a/data/mods/default/textures/player_back.png b/data/mods/default/textures/player_back.png new file mode 100644 index 00000000..530aa751 Binary files /dev/null and b/data/mods/default/textures/player_back.png differ diff --git a/data/mods/default/textures/rail.png b/data/mods/default/textures/rail.png new file mode 100644 index 00000000..18176d9f Binary files /dev/null and b/data/mods/default/textures/rail.png differ diff --git a/data/mods/default/textures/rail_crossing.png b/data/mods/default/textures/rail_crossing.png new file mode 100644 index 00000000..98464057 Binary files /dev/null and b/data/mods/default/textures/rail_crossing.png differ diff --git a/data/mods/default/textures/rail_curved.png b/data/mods/default/textures/rail_curved.png new file mode 100644 index 00000000..62afa3d2 Binary files /dev/null and b/data/mods/default/textures/rail_curved.png differ diff --git a/data/mods/default/textures/rail_t_junction.png b/data/mods/default/textures/rail_t_junction.png new file mode 100644 index 00000000..9985f63c Binary files /dev/null and b/data/mods/default/textures/rail_t_junction.png differ diff --git a/data/mods/default/textures/rat.png b/data/mods/default/textures/rat.png new file mode 100644 index 00000000..d1a0e2ae Binary files /dev/null and b/data/mods/default/textures/rat.png differ diff --git a/data/mods/default/textures/sand.png b/data/mods/default/textures/sand.png new file mode 100644 index 00000000..15101a7e Binary files /dev/null and b/data/mods/default/textures/sand.png differ diff --git a/data/mods/default/textures/sandstone.png b/data/mods/default/textures/sandstone.png new file mode 100644 index 00000000..c4759b4d Binary files /dev/null and b/data/mods/default/textures/sandstone.png differ diff --git a/data/mods/default/textures/sapling.png b/data/mods/default/textures/sapling.png new file mode 100644 index 00000000..73f50230 Binary files /dev/null and b/data/mods/default/textures/sapling.png differ diff --git a/data/mods/default/textures/scorched_stuff.png b/data/mods/default/textures/scorched_stuff.png new file mode 100644 index 00000000..9ced2fbe Binary files /dev/null and b/data/mods/default/textures/scorched_stuff.png differ diff --git a/data/mods/default/textures/sign.png b/data/mods/default/textures/sign.png new file mode 100644 index 00000000..2e0b3cbe Binary files /dev/null and b/data/mods/default/textures/sign.png differ diff --git a/data/mods/default/textures/sign_back.png b/data/mods/default/textures/sign_back.png new file mode 100644 index 00000000..779e4bc2 Binary files /dev/null and b/data/mods/default/textures/sign_back.png differ diff --git a/data/mods/default/textures/sign_wall.png b/data/mods/default/textures/sign_wall.png new file mode 100644 index 00000000..06eac1ee Binary files /dev/null and b/data/mods/default/textures/sign_wall.png differ diff --git a/data/mods/default/textures/skybox1.png b/data/mods/default/textures/skybox1.png new file mode 100644 index 00000000..9801d5f4 Binary files /dev/null and b/data/mods/default/textures/skybox1.png differ diff --git a/data/mods/default/textures/skybox1_dawn.png b/data/mods/default/textures/skybox1_dawn.png new file mode 100644 index 00000000..9711c478 Binary files /dev/null and b/data/mods/default/textures/skybox1_dawn.png differ diff --git a/data/mods/default/textures/skybox1_night.png b/data/mods/default/textures/skybox1_night.png new file mode 100644 index 00000000..32e43a63 Binary files /dev/null and b/data/mods/default/textures/skybox1_night.png differ diff --git a/data/mods/default/textures/skybox2.png b/data/mods/default/textures/skybox2.png new file mode 100644 index 00000000..a8c94b4d Binary files /dev/null and b/data/mods/default/textures/skybox2.png differ diff --git a/data/mods/default/textures/skybox2_dawn.png b/data/mods/default/textures/skybox2_dawn.png new file mode 100644 index 00000000..a761dff2 Binary files /dev/null and b/data/mods/default/textures/skybox2_dawn.png differ diff --git a/data/mods/default/textures/skybox2_night.png b/data/mods/default/textures/skybox2_night.png new file mode 100644 index 00000000..beb07a9c Binary files /dev/null and b/data/mods/default/textures/skybox2_night.png differ diff --git a/data/mods/default/textures/skybox3.png b/data/mods/default/textures/skybox3.png new file mode 100644 index 00000000..2776ec71 Binary files /dev/null and b/data/mods/default/textures/skybox3.png differ diff --git a/data/mods/default/textures/skybox3_dawn.png b/data/mods/default/textures/skybox3_dawn.png new file mode 100644 index 00000000..22c8cbef Binary files /dev/null and b/data/mods/default/textures/skybox3_dawn.png differ diff --git a/data/mods/default/textures/skybox3_night.png b/data/mods/default/textures/skybox3_night.png new file mode 100644 index 00000000..bb509789 Binary files /dev/null and b/data/mods/default/textures/skybox3_night.png differ diff --git a/data/mods/default/textures/steel_block.png b/data/mods/default/textures/steel_block.png new file mode 100644 index 00000000..8e202008 Binary files /dev/null and b/data/mods/default/textures/steel_block.png differ diff --git a/data/mods/default/textures/steel_ingot.png b/data/mods/default/textures/steel_ingot.png new file mode 100644 index 00000000..f6c9414e Binary files /dev/null and b/data/mods/default/textures/steel_ingot.png differ diff --git a/data/mods/default/textures/stick.png b/data/mods/default/textures/stick.png new file mode 100644 index 00000000..2d31797f Binary files /dev/null and b/data/mods/default/textures/stick.png differ diff --git a/data/mods/default/textures/stone.png b/data/mods/default/textures/stone.png new file mode 100644 index 00000000..cad0dbe2 Binary files /dev/null and b/data/mods/default/textures/stone.png differ diff --git a/data/mods/default/textures/tnt_bottom.png b/data/mods/default/textures/tnt_bottom.png new file mode 100644 index 00000000..8ba2fca0 Binary files /dev/null and b/data/mods/default/textures/tnt_bottom.png differ diff --git a/data/mods/default/textures/tnt_side.png b/data/mods/default/textures/tnt_side.png new file mode 100644 index 00000000..d9a2bc4e Binary files /dev/null and b/data/mods/default/textures/tnt_side.png differ diff --git a/data/mods/default/textures/tnt_top.png b/data/mods/default/textures/tnt_top.png new file mode 100644 index 00000000..a84ffc9a Binary files /dev/null and b/data/mods/default/textures/tnt_top.png differ diff --git a/data/mods/default/textures/tool_mesepick.png b/data/mods/default/textures/tool_mesepick.png new file mode 100644 index 00000000..a1f3812e Binary files /dev/null and b/data/mods/default/textures/tool_mesepick.png differ diff --git a/data/mods/default/textures/tool_steelaxe.png b/data/mods/default/textures/tool_steelaxe.png new file mode 100644 index 00000000..0ad23c93 Binary files /dev/null and b/data/mods/default/textures/tool_steelaxe.png differ diff --git a/data/mods/default/textures/tool_steelpick.png b/data/mods/default/textures/tool_steelpick.png new file mode 100644 index 00000000..7982dafe Binary files /dev/null and b/data/mods/default/textures/tool_steelpick.png differ diff --git a/data/mods/default/textures/tool_steelshovel.png b/data/mods/default/textures/tool_steelshovel.png new file mode 100644 index 00000000..ed841384 Binary files /dev/null and b/data/mods/default/textures/tool_steelshovel.png differ diff --git a/data/mods/default/textures/tool_steelsword.png b/data/mods/default/textures/tool_steelsword.png new file mode 100644 index 00000000..a7458123 Binary files /dev/null and b/data/mods/default/textures/tool_steelsword.png differ diff --git a/data/mods/default/textures/tool_stoneaxe.png b/data/mods/default/textures/tool_stoneaxe.png new file mode 100644 index 00000000..698ac918 Binary files /dev/null and b/data/mods/default/textures/tool_stoneaxe.png differ diff --git a/data/mods/default/textures/tool_stonepick.png b/data/mods/default/textures/tool_stonepick.png new file mode 100644 index 00000000..b34de6f3 Binary files /dev/null and b/data/mods/default/textures/tool_stonepick.png differ diff --git a/data/mods/default/textures/tool_stoneshovel.png b/data/mods/default/textures/tool_stoneshovel.png new file mode 100644 index 00000000..ba524310 Binary files /dev/null and b/data/mods/default/textures/tool_stoneshovel.png differ diff --git a/data/mods/default/textures/tool_stonesword.png b/data/mods/default/textures/tool_stonesword.png new file mode 100644 index 00000000..8f8191f9 Binary files /dev/null and b/data/mods/default/textures/tool_stonesword.png differ diff --git a/data/mods/default/textures/tool_woodaxe.png b/data/mods/default/textures/tool_woodaxe.png new file mode 100644 index 00000000..3daa4af7 Binary files /dev/null and b/data/mods/default/textures/tool_woodaxe.png differ diff --git a/data/mods/default/textures/tool_woodpick.png b/data/mods/default/textures/tool_woodpick.png new file mode 100644 index 00000000..ea728cca Binary files /dev/null and b/data/mods/default/textures/tool_woodpick.png differ diff --git a/data/mods/default/textures/tool_woodshovel.png b/data/mods/default/textures/tool_woodshovel.png new file mode 100644 index 00000000..649ab4c3 Binary files /dev/null and b/data/mods/default/textures/tool_woodshovel.png differ diff --git a/data/mods/default/textures/tool_woodsword.png b/data/mods/default/textures/tool_woodsword.png new file mode 100644 index 00000000..d6c6be32 Binary files /dev/null and b/data/mods/default/textures/tool_woodsword.png differ diff --git a/data/mods/default/textures/torch.png b/data/mods/default/textures/torch.png new file mode 100644 index 00000000..7a953c22 Binary files /dev/null and b/data/mods/default/textures/torch.png differ diff --git a/data/mods/default/textures/torch_on_ceiling.png b/data/mods/default/textures/torch_on_ceiling.png new file mode 100644 index 00000000..6965d380 Binary files /dev/null and b/data/mods/default/textures/torch_on_ceiling.png differ diff --git a/data/mods/default/textures/torch_on_floor.png b/data/mods/default/textures/torch_on_floor.png new file mode 100644 index 00000000..76d1dd5a Binary files /dev/null and b/data/mods/default/textures/torch_on_floor.png differ diff --git a/data/mods/default/textures/tree.png b/data/mods/default/textures/tree.png new file mode 100644 index 00000000..65abfc24 Binary files /dev/null and b/data/mods/default/textures/tree.png differ diff --git a/data/mods/default/textures/tree_top.png b/data/mods/default/textures/tree_top.png new file mode 100644 index 00000000..2cdd94f8 Binary files /dev/null and b/data/mods/default/textures/tree_top.png differ diff --git a/data/mods/default/textures/treeprop.png b/data/mods/default/textures/treeprop.png new file mode 100644 index 00000000..77ea4d6d Binary files /dev/null and b/data/mods/default/textures/treeprop.png differ diff --git a/data/mods/default/textures/unknown_block.png b/data/mods/default/textures/unknown_block.png new file mode 100644 index 00000000..a27cb8ca Binary files /dev/null and b/data/mods/default/textures/unknown_block.png differ diff --git a/data/mods/default/textures/unknown_object.png b/data/mods/default/textures/unknown_object.png new file mode 100644 index 00000000..4d6a98d5 Binary files /dev/null and b/data/mods/default/textures/unknown_object.png differ diff --git a/data/mods/default/textures/water.png b/data/mods/default/textures/water.png new file mode 100644 index 00000000..e5f8cdc2 Binary files /dev/null and b/data/mods/default/textures/water.png differ diff --git a/data/mods/default/textures/wood.png b/data/mods/default/textures/wood.png new file mode 100644 index 00000000..57c1d7c1 Binary files /dev/null and b/data/mods/default/textures/wood.png differ diff --git a/data/scripts/default.lua b/data/scripts/default.lua deleted file mode 100644 index b677cefd..00000000 --- a/data/scripts/default.lua +++ /dev/null @@ -1,414 +0,0 @@ -function basic_dump2(o) - if type(o) == "number" then - return tostring(o) - elseif type(o) == "string" then - return string.format("%q", o) - elseif type(o) == "boolean" then - return tostring(o) - elseif type(o) == "function" then - return "" - elseif type(o) == "userdata" then - return "" - elseif type(o) == "nil" then - return "nil" - else - error("cannot dump a " .. type(o)) - return nil - end -end - -function dump2(o, name, dumped) - name = name or "_" - dumped = dumped or {} - io.write(name, " = ") - if type(o) == "number" or type(o) == "string" or type(o) == "boolean" - or type(o) == "function" or type(o) == "nil" - or type(o) == "userdata" then - io.write(basic_dump2(o), "\n") - elseif type(o) == "table" then - if dumped[o] then - io.write(dumped[o], "\n") - else - dumped[o] = name - io.write("{}\n") -- new table - for k,v in pairs(o) do - local fieldname = string.format("%s[%s]", name, basic_dump2(k)) - dump2(v, fieldname, dumped) - end - end - else - error("cannot dump a " .. type(o)) - return nil - end -end - -function dump(o, dumped) - dumped = dumped or {} - if type(o) == "number" then - return tostring(o) - elseif type(o) == "string" then - return string.format("%q", o) - elseif type(o) == "table" then - if dumped[o] then - return "" - end - dumped[o] = true - local t = {} - for k,v in pairs(o) do - t[#t+1] = "" .. k .. " = " .. dump(v, dumped) - end - return "{" .. table.concat(t, ", ") .. "}" - elseif type(o) == "boolean" then - return tostring(o) - elseif type(o) == "function" then - return "" - elseif type(o) == "userdata" then - return "" - elseif type(o) == "nil" then - return "nil" - else - error("cannot dump a " .. type(o)) - return nil - end -end - --- Global functions: --- minetest.register_entity(name, prototype_table) --- minetest.register_globalstep(func) --- --- Global objects: --- minetest.env - environment reference --- --- Global tables: --- minetest.registered_entities --- ^ List of registered entity prototypes, indexed by name --- minetest.object_refs --- ^ List of object references, indexed by active object id --- minetest.luaentities --- ^ List of lua entities, indexed by active object id --- --- EnvRef methods: --- - add_node(pos, content); pos={x=num, y=num, z=num} --- --- ObjectRef methods: --- - remove(): remove object (after returning from Lua) --- - getpos(): returns {x=num, y=num, z=num} --- - setpos(pos); pos={x=num, y=num, z=num} --- - moveto(pos, continuous=false): interpolated move --- - add_to_inventory(itemstring): add an item to object inventory --- --- Registered entities: --- - Functions receive a "luaentity" as self: --- - It has the member .object, which is an ObjectRef pointing to the object --- - The original prototype stuff is visible directly via a metatable --- - -print("omg lol") -print("minetest dump: "..dump(minetest)) - --- Global environment step function -function on_step(dtime) - -- print("on_step") -end - -minetest.register_globalstep(on_step) - -minetest.register_tool("WPick", { - image = "tool_woodpick.png", - basetime = 2.0, - dt_weight = 0, - dt_crackiness = -0.5, - dt_crumbliness = 2, - dt_cuttability = 0, - basedurability = 30, - dd_weight = 0, - dd_crackiness = 0, - dd_crumbliness = 0, - dd_cuttability = 0, -}) -minetest.register_tool("STPick", { - image = "tool_stonepick.png", - basetime = 1.5, - dt_weight = 0, - dt_crackiness = -0.5, - dt_crumbliness = 2, - dt_cuttability = 0, - basedurability = 100, - dd_weight = 0, - dd_crackiness = 0, - dd_crumbliness = 0, - dd_cuttability = 0, -}) -minetest.register_tool("SteelPick", { - image = "tool_steelpick.png", - basetime = 1.0, - dt_weight = 0, - dt_crackiness = -0.5, - dt_crumbliness = 2, - dt_cuttability = 0, - basedurability = 333, - dd_weight = 0, - dd_crackiness = 0, - dd_crumbliness = 0, - dd_cuttability = 0, -}) -minetest.register_tool("MesePick", { - image = "tool_mesepick.png", - basetime = 0, - dt_weight = 0, - dt_crackiness = 0, - dt_crumbliness = 0, - dt_cuttability = 0, - basedurability = 1337, - dd_weight = 0, - dd_crackiness = 0, - dd_crumbliness = 0, - dd_cuttability = 0, -}) -minetest.register_tool("WShovel", { - image = "tool_woodshovel.png", - basetime = 2.0, - dt_weight = 0.5, - dt_crackiness = 2, - dt_crumbliness = -1.5, - dt_cuttability = 0.3, - basedurability = 30, - dd_weight = 0, - dd_crackiness = 0, - dd_crumbliness = 0, - dd_cuttability = 0, -}) -minetest.register_tool("STShovel", { - image = "tool_stoneshovel.png", - basetime = 1.5, - dt_weight = 0.5, - dt_crackiness = 2, - dt_crumbliness = -1.5, - dt_cuttability = 0.1, - basedurability = 100, - dd_weight = 0, - dd_crackiness = 0, - dd_crumbliness = 0, - dd_cuttability = 0, -}) -minetest.register_tool("SteelShovel", { - image = "tool_steelshovel.png", - basetime = 1.0, - dt_weight = 0.5, - dt_crackiness = 2, - dt_crumbliness = -1.5, - dt_cuttability = 0.0, - basedurability = 330, - dd_weight = 0, - dd_crackiness = 0, - dd_crumbliness = 0, - dd_cuttability = 0, -}) -minetest.register_tool("WAxe", { - image = "tool_woodaxe.png", - basetime = 2.0, - dt_weight = 0.5, - dt_crackiness = -0.2, - dt_crumbliness = 1, - dt_cuttability = -0.5, - basedurability = 30, - dd_weight = 0, - dd_crackiness = 0, - dd_crumbliness = 0, - dd_cuttability = 0, -}) -minetest.register_tool("STAxe", { - image = "tool_stoneaxe.png", - basetime = 1.5, - dt_weight = 0.5, - dt_crackiness = -0.2, - dt_crumbliness = 1, - dt_cuttability = -0.5, - basedurability = 100, - dd_weight = 0, - dd_crackiness = 0, - dd_crumbliness = 0, - dd_cuttability = 0, -}) -minetest.register_tool("SteelAxe", { - image = "tool_steelaxe.png", - basetime = 1.0, - dt_weight = 0.5, - dt_crackiness = -0.2, - dt_crumbliness = 1, - dt_cuttability = -0.5, - basedurability = 330, - dd_weight = 0, - dd_crackiness = 0, - dd_crumbliness = 0, - dd_cuttability = 0, -}) -minetest.register_tool("WSword", { - image = "tool_woodsword.png", - basetime = 3.0, - dt_weight = 3, - dt_crackiness = 0, - dt_crumbliness = 1, - dt_cuttability = -1, - basedurability = 30, - dd_weight = 0, - dd_crackiness = 0, - dd_crumbliness = 0, - dd_cuttability = 0, -}) -minetest.register_tool("STSword", { - image = "tool_stonesword.png", - basetime = 2.5, - dt_weight = 3, - dt_crackiness = 0, - dt_crumbliness = 1, - dt_cuttability = -1, - basedurability = 100, - dd_weight = 0, - dd_crackiness = 0, - dd_crumbliness = 0, - dd_cuttability = 0, -}) -minetest.register_tool("SteelSword", { - image = "tool_steelsword.png", - basetime = 2.0, - dt_weight = 3, - dt_crackiness = 0, - dt_crumbliness = 1, - dt_cuttability = -1, - basedurability = 330, - dd_weight = 0, - dd_crackiness = 0, - dd_crumbliness = 0, - dd_cuttability = 0, -}) -minetest.register_tool("", { - image = "", - basetime = 0.5, - dt_weight = 1, - dt_crackiness = 0, - dt_crumbliness = -1, - dt_cuttability = 0, - basedurability = 50, - dd_weight = 0, - dd_crackiness = 0, - dd_crumbliness = 0, - dd_cuttability = 0, -}) - ---[[ -minetest.register_tool("horribletool", { - image = "lava.png", - basetime = 2.0 - dt_weight = 0.2 - dt_crackiness = 0.2 - dt_crumbliness = 0.2 - dt_cuttability = 0.2 - basedurability = 50 - dd_weight = -5 - dd_crackiness = -5 - dd_crumbliness = -5 - dd_cuttability = -5 -}) ---]] - -local TNT = { - -- Maybe handle gravity and collision this way? dunno - physical = true, - weight = 5, - collisionbox = {-0.5,-0.5,-0.5, 0.5,0.5,0.5}, - visual = "cube", - textures = {"tnt_top.png","tnt_bottom.png","tnt_side.png","tnt_side.png","tnt_side.png","tnt_side.png"}, - --visual = "single_sprite", - --textures = {"mese.png^[forcesingle"}, - -- Initial value for our timer - timer = 0, - -- List names of state variables, for serializing object state - state_variables = {"timer"}, -} - --- Called periodically -function TNT:on_step(dtime) - --print("TNT:on_step()") -end - --- Called when object is punched -function TNT:on_punch(hitter) - print("TNT:on_punch()") - self.object:remove() - hitter:add_to_inventory("CraftItem testobject1 1") -end - --- Called when object is right-clicked -function TNT:on_rightclick(clicker) - pos = self.object:getpos() - pos = {x=pos.x, y=pos.y+0.1, z=pos.z} - self.object:moveto(pos, false) -end - -print("TNT dump: "..dump(TNT)) - -print("Registering TNT"); -minetest.register_entity("TNT", TNT) - -print("minetest.registered_entities:") -dump2(minetest.registered_entities) - ---[[ -function TNT:on_rightclick(clicker) - print("TNT:on_rightclick()") - print("self: "..dump(self)) - print("getmetatable(self): "..dump(getmetatable(self))) - print("getmetatable(getmetatable(self)): "..dump(getmetatable(getmetatable(self)))) - pos = self.object:getpos() - print("TNT:on_rightclick(): object position: "..dump(pos)) - pos = {x=pos.x+0.5+1, y=pos.y+0.5, z=pos.z+0.5} - --minetest.env:add_node(pos, 0) -end ---]] - ---[=[ - -register_block(0, { - textures = "stone.png", - makefacetype = 0, - get_dig_duration = function(env, pos, digger) - -- Check stuff like digger.current_tool - return 1.5 - end, - on_dig = function(env, pos, digger) - env:remove_node(pos) - digger.inventory.put("MaterialItem2 0"); - end, -}) - -register_block(1, { - textures = {"grass.png","mud.png","mud_grass_side.png","mud_grass_side.png","mud_grass_side.png","mud_grass_side.png"}, - makefacetype = 0, - get_dig_duration = function(env, pos, digger) - -- Check stuff like digger.current_tool - return 0.5 - end, - on_dig = function(env, pos, digger) - env:remove_node(pos) - digger.inventory.put("MaterialItem2 1"); - end, -}) - --- Consider the "miscellaneous block namespace" to be 0xc00...0xfff = 3072...4095 -register_block(3072, { - textures = {"tnt_top.png","tnt_bottom.png","tnt_side.png","tnt_side.png","tnt_side.png","tnt_side.png"}, - makefacetype = 0, - get_dig_duration = function(env, pos, digger) - -- Cannot be dug - return nil - end, - -- on_dig = function(env, pos, digger) end, -- Not implemented - on_hit = function(env, pos, hitter) - -- Replace with TNT object, which will explode after timer, follow gravity, blink and stuff - env:add_object("tnt", pos) - env:remove_node(pos) - end, -}) ---]=] - diff --git a/data/textures/apple.png b/data/textures/apple.png deleted file mode 100644 index 9593f28f..00000000 Binary files a/data/textures/apple.png and /dev/null differ diff --git a/data/textures/apple_iron.png b/data/textures/apple_iron.png deleted file mode 100644 index 2dffdf01..00000000 Binary files a/data/textures/apple_iron.png and /dev/null differ diff --git a/data/textures/book.png b/data/textures/book.png deleted file mode 100644 index 176fb6aa..00000000 Binary files a/data/textures/book.png and /dev/null differ diff --git a/data/textures/bookshelf.png b/data/textures/bookshelf.png deleted file mode 100644 index 5ecc50ff..00000000 Binary files a/data/textures/bookshelf.png and /dev/null differ diff --git a/data/textures/brick.png b/data/textures/brick.png deleted file mode 100644 index 32d77f34..00000000 Binary files a/data/textures/brick.png and /dev/null differ diff --git a/data/textures/cactus_side.png b/data/textures/cactus_side.png deleted file mode 100644 index fc479fde..00000000 Binary files a/data/textures/cactus_side.png and /dev/null differ diff --git a/data/textures/cactus_top.png b/data/textures/cactus_top.png deleted file mode 100644 index f9e68df5..00000000 Binary files a/data/textures/cactus_top.png and /dev/null differ diff --git a/data/textures/chest_front.png b/data/textures/chest_front.png deleted file mode 100644 index c5628af9..00000000 Binary files a/data/textures/chest_front.png and /dev/null differ diff --git a/data/textures/chest_lock.png b/data/textures/chest_lock.png deleted file mode 100644 index ae038fae..00000000 Binary files a/data/textures/chest_lock.png and /dev/null differ diff --git a/data/textures/chest_side.png b/data/textures/chest_side.png deleted file mode 100644 index 916dd784..00000000 Binary files a/data/textures/chest_side.png and /dev/null differ diff --git a/data/textures/chest_top.png b/data/textures/chest_top.png deleted file mode 100644 index 58c79674..00000000 Binary files a/data/textures/chest_top.png and /dev/null differ diff --git a/data/textures/clay.png b/data/textures/clay.png deleted file mode 100644 index 3557429d..00000000 Binary files a/data/textures/clay.png and /dev/null differ diff --git a/data/textures/clay_brick.png b/data/textures/clay_brick.png deleted file mode 100644 index e36648e4..00000000 Binary files a/data/textures/clay_brick.png and /dev/null differ diff --git a/data/textures/cloud.png b/data/textures/cloud.png deleted file mode 100644 index 24091a37..00000000 Binary files a/data/textures/cloud.png and /dev/null differ diff --git a/data/textures/cobble.png b/data/textures/cobble.png deleted file mode 100644 index 7d044741..00000000 Binary files a/data/textures/cobble.png and /dev/null differ diff --git a/data/textures/cooked_rat.png b/data/textures/cooked_rat.png deleted file mode 100644 index daad3be0..00000000 Binary files a/data/textures/cooked_rat.png and /dev/null differ diff --git a/data/textures/crack.png b/data/textures/crack.png deleted file mode 100644 index 49978398..00000000 Binary files a/data/textures/crack.png and /dev/null differ diff --git a/data/textures/dungeon_master.png b/data/textures/dungeon_master.png deleted file mode 100644 index 3457c822..00000000 Binary files a/data/textures/dungeon_master.png and /dev/null differ diff --git a/data/textures/fence.png b/data/textures/fence.png deleted file mode 100644 index 0b99f0eb..00000000 Binary files a/data/textures/fence.png and /dev/null differ diff --git a/data/textures/fireball.png b/data/textures/fireball.png deleted file mode 100644 index 52314285..00000000 Binary files a/data/textures/fireball.png and /dev/null differ diff --git a/data/textures/firefly.png b/data/textures/firefly.png deleted file mode 100644 index 40df7fa1..00000000 Binary files a/data/textures/firefly.png and /dev/null differ diff --git a/data/textures/fontlucida.png b/data/textures/fontlucida.png deleted file mode 100644 index c63fa02b..00000000 Binary files a/data/textures/fontlucida.png and /dev/null differ diff --git a/data/textures/furnace_front.png b/data/textures/furnace_front.png deleted file mode 100644 index 1620a27c..00000000 Binary files a/data/textures/furnace_front.png and /dev/null differ diff --git a/data/textures/furnace_side.png b/data/textures/furnace_side.png deleted file mode 100644 index 63cb162f..00000000 Binary files a/data/textures/furnace_side.png and /dev/null differ diff --git a/data/textures/glass.png b/data/textures/glass.png deleted file mode 100644 index 8598ce67..00000000 Binary files a/data/textures/glass.png and /dev/null differ diff --git a/data/textures/grass.png b/data/textures/grass.png deleted file mode 100644 index 3610bb2b..00000000 Binary files a/data/textures/grass.png and /dev/null differ diff --git a/data/textures/grass_footsteps.png b/data/textures/grass_footsteps.png deleted file mode 100644 index 57e063d8..00000000 Binary files a/data/textures/grass_footsteps.png and /dev/null differ diff --git a/data/textures/grass_side.png b/data/textures/grass_side.png deleted file mode 100644 index 4f4f680b..00000000 Binary files a/data/textures/grass_side.png and /dev/null differ diff --git a/data/textures/gravel.png b/data/textures/gravel.png deleted file mode 100644 index f08666ad..00000000 Binary files a/data/textures/gravel.png and /dev/null differ diff --git a/data/textures/heart.png b/data/textures/heart.png deleted file mode 100644 index 6bc183e0..00000000 Binary files a/data/textures/heart.png and /dev/null differ diff --git a/data/textures/junglegrass.png b/data/textures/junglegrass.png deleted file mode 100644 index eea87c07..00000000 Binary files a/data/textures/junglegrass.png and /dev/null differ diff --git a/data/textures/jungletree.png b/data/textures/jungletree.png deleted file mode 100644 index ccd20ac7..00000000 Binary files a/data/textures/jungletree.png and /dev/null differ diff --git a/data/textures/jungletree_top.png b/data/textures/jungletree_top.png deleted file mode 100644 index 2a9b5137..00000000 Binary files a/data/textures/jungletree_top.png and /dev/null differ diff --git a/data/textures/ladder.png b/data/textures/ladder.png deleted file mode 100644 index 11056359..00000000 Binary files a/data/textures/ladder.png and /dev/null differ diff --git a/data/textures/lava.png b/data/textures/lava.png deleted file mode 100644 index cb02ada1..00000000 Binary files a/data/textures/lava.png and /dev/null differ diff --git a/data/textures/leaves.png b/data/textures/leaves.png deleted file mode 100644 index 7a25126e..00000000 Binary files a/data/textures/leaves.png and /dev/null differ diff --git a/data/textures/lump_of_clay.png b/data/textures/lump_of_clay.png deleted file mode 100644 index be0bab9d..00000000 Binary files a/data/textures/lump_of_clay.png and /dev/null differ diff --git a/data/textures/lump_of_coal.png b/data/textures/lump_of_coal.png deleted file mode 100644 index bad901ef..00000000 Binary files a/data/textures/lump_of_coal.png and /dev/null differ diff --git a/data/textures/lump_of_iron.png b/data/textures/lump_of_iron.png deleted file mode 100644 index edb93101..00000000 Binary files a/data/textures/lump_of_iron.png and /dev/null differ diff --git a/data/textures/menulogo.png b/data/textures/menulogo.png deleted file mode 100644 index 76595c48..00000000 Binary files a/data/textures/menulogo.png and /dev/null differ diff --git a/data/textures/mese.png b/data/textures/mese.png deleted file mode 100644 index 4c876cdc..00000000 Binary files a/data/textures/mese.png and /dev/null differ diff --git a/data/textures/mineral_coal.png b/data/textures/mineral_coal.png deleted file mode 100644 index 3ff9692f..00000000 Binary files a/data/textures/mineral_coal.png and /dev/null differ diff --git a/data/textures/mineral_iron.png b/data/textures/mineral_iron.png deleted file mode 100644 index 51b15d95..00000000 Binary files a/data/textures/mineral_iron.png and /dev/null differ diff --git a/data/textures/mossycobble.png b/data/textures/mossycobble.png deleted file mode 100644 index fad1b33f..00000000 Binary files a/data/textures/mossycobble.png and /dev/null differ diff --git a/data/textures/mud.png b/data/textures/mud.png deleted file mode 100644 index 7cb9c89a..00000000 Binary files a/data/textures/mud.png and /dev/null differ diff --git a/data/textures/nc_back.png b/data/textures/nc_back.png deleted file mode 100644 index f09f4165..00000000 Binary files a/data/textures/nc_back.png and /dev/null differ diff --git a/data/textures/nc_front.png b/data/textures/nc_front.png deleted file mode 100644 index cad9edab..00000000 Binary files a/data/textures/nc_front.png and /dev/null differ diff --git a/data/textures/nc_rb.png b/data/textures/nc_rb.png deleted file mode 100644 index 7ebc9930..00000000 Binary files a/data/textures/nc_rb.png and /dev/null differ diff --git a/data/textures/nc_side.png b/data/textures/nc_side.png deleted file mode 100644 index f954045f..00000000 Binary files a/data/textures/nc_side.png and /dev/null differ diff --git a/data/textures/oerkki1.png b/data/textures/oerkki1.png deleted file mode 100644 index 33cbac9e..00000000 Binary files a/data/textures/oerkki1.png and /dev/null differ diff --git a/data/textures/oerkki1_damaged.png b/data/textures/oerkki1_damaged.png deleted file mode 100644 index 9b777387..00000000 Binary files a/data/textures/oerkki1_damaged.png and /dev/null differ diff --git a/data/textures/paper.png b/data/textures/paper.png deleted file mode 100644 index ae5c06bc..00000000 Binary files a/data/textures/paper.png and /dev/null differ diff --git a/data/textures/papyrus.png b/data/textures/papyrus.png deleted file mode 100644 index bf0dec7f..00000000 Binary files a/data/textures/papyrus.png and /dev/null differ diff --git a/data/textures/player.png b/data/textures/player.png deleted file mode 100644 index 90adf974..00000000 Binary files a/data/textures/player.png and /dev/null differ diff --git a/data/textures/player_back.png b/data/textures/player_back.png deleted file mode 100644 index 530aa751..00000000 Binary files a/data/textures/player_back.png and /dev/null differ diff --git a/data/textures/rail.png b/data/textures/rail.png deleted file mode 100644 index 18176d9f..00000000 Binary files a/data/textures/rail.png and /dev/null differ diff --git a/data/textures/rail_crossing.png b/data/textures/rail_crossing.png deleted file mode 100644 index 98464057..00000000 Binary files a/data/textures/rail_crossing.png and /dev/null differ diff --git a/data/textures/rail_curved.png b/data/textures/rail_curved.png deleted file mode 100644 index 62afa3d2..00000000 Binary files a/data/textures/rail_curved.png and /dev/null differ diff --git a/data/textures/rail_t_junction.png b/data/textures/rail_t_junction.png deleted file mode 100644 index 9985f63c..00000000 Binary files a/data/textures/rail_t_junction.png and /dev/null differ diff --git a/data/textures/rat.png b/data/textures/rat.png deleted file mode 100644 index d1a0e2ae..00000000 Binary files a/data/textures/rat.png and /dev/null differ diff --git a/data/textures/sand.png b/data/textures/sand.png deleted file mode 100644 index 15101a7e..00000000 Binary files a/data/textures/sand.png and /dev/null differ diff --git a/data/textures/sandstone.png b/data/textures/sandstone.png deleted file mode 100644 index c4759b4d..00000000 Binary files a/data/textures/sandstone.png and /dev/null differ diff --git a/data/textures/sapling.png b/data/textures/sapling.png deleted file mode 100644 index 73f50230..00000000 Binary files a/data/textures/sapling.png and /dev/null differ diff --git a/data/textures/scorched_stuff.png b/data/textures/scorched_stuff.png deleted file mode 100644 index 9ced2fbe..00000000 Binary files a/data/textures/scorched_stuff.png and /dev/null differ diff --git a/data/textures/sign.png b/data/textures/sign.png deleted file mode 100644 index 2e0b3cbe..00000000 Binary files a/data/textures/sign.png and /dev/null differ diff --git a/data/textures/sign_back.png b/data/textures/sign_back.png deleted file mode 100644 index 779e4bc2..00000000 Binary files a/data/textures/sign_back.png and /dev/null differ diff --git a/data/textures/sign_wall.png b/data/textures/sign_wall.png deleted file mode 100644 index 06eac1ee..00000000 Binary files a/data/textures/sign_wall.png and /dev/null differ diff --git a/data/textures/skybox1.png b/data/textures/skybox1.png deleted file mode 100644 index 9801d5f4..00000000 Binary files a/data/textures/skybox1.png and /dev/null differ diff --git a/data/textures/skybox1_dawn.png b/data/textures/skybox1_dawn.png deleted file mode 100644 index 9711c478..00000000 Binary files a/data/textures/skybox1_dawn.png and /dev/null differ diff --git a/data/textures/skybox1_night.png b/data/textures/skybox1_night.png deleted file mode 100644 index 32e43a63..00000000 Binary files a/data/textures/skybox1_night.png and /dev/null differ diff --git a/data/textures/skybox2.png b/data/textures/skybox2.png deleted file mode 100644 index a8c94b4d..00000000 Binary files a/data/textures/skybox2.png and /dev/null differ diff --git a/data/textures/skybox2_dawn.png b/data/textures/skybox2_dawn.png deleted file mode 100644 index a761dff2..00000000 Binary files a/data/textures/skybox2_dawn.png and /dev/null differ diff --git a/data/textures/skybox2_night.png b/data/textures/skybox2_night.png deleted file mode 100644 index beb07a9c..00000000 Binary files a/data/textures/skybox2_night.png and /dev/null differ diff --git a/data/textures/skybox3.png b/data/textures/skybox3.png deleted file mode 100644 index 2776ec71..00000000 Binary files a/data/textures/skybox3.png and /dev/null differ diff --git a/data/textures/skybox3_dawn.png b/data/textures/skybox3_dawn.png deleted file mode 100644 index 22c8cbef..00000000 Binary files a/data/textures/skybox3_dawn.png and /dev/null differ diff --git a/data/textures/skybox3_night.png b/data/textures/skybox3_night.png deleted file mode 100644 index bb509789..00000000 Binary files a/data/textures/skybox3_night.png and /dev/null differ diff --git a/data/textures/steel_block.png b/data/textures/steel_block.png deleted file mode 100644 index 8e202008..00000000 Binary files a/data/textures/steel_block.png and /dev/null differ diff --git a/data/textures/steel_ingot.png b/data/textures/steel_ingot.png deleted file mode 100644 index f6c9414e..00000000 Binary files a/data/textures/steel_ingot.png and /dev/null differ diff --git a/data/textures/stick.png b/data/textures/stick.png deleted file mode 100644 index 2d31797f..00000000 Binary files a/data/textures/stick.png and /dev/null differ diff --git a/data/textures/stone.png b/data/textures/stone.png deleted file mode 100644 index cad0dbe2..00000000 Binary files a/data/textures/stone.png and /dev/null differ diff --git a/data/textures/tnt_bottom.png b/data/textures/tnt_bottom.png deleted file mode 100644 index 8ba2fca0..00000000 Binary files a/data/textures/tnt_bottom.png and /dev/null differ diff --git a/data/textures/tnt_side.png b/data/textures/tnt_side.png deleted file mode 100644 index d9a2bc4e..00000000 Binary files a/data/textures/tnt_side.png and /dev/null differ diff --git a/data/textures/tnt_top.png b/data/textures/tnt_top.png deleted file mode 100644 index a84ffc9a..00000000 Binary files a/data/textures/tnt_top.png and /dev/null differ diff --git a/data/textures/tool_mesepick.png b/data/textures/tool_mesepick.png deleted file mode 100644 index a1f3812e..00000000 Binary files a/data/textures/tool_mesepick.png and /dev/null differ diff --git a/data/textures/tool_steelaxe.png b/data/textures/tool_steelaxe.png deleted file mode 100644 index 0ad23c93..00000000 Binary files a/data/textures/tool_steelaxe.png and /dev/null differ diff --git a/data/textures/tool_steelpick.png b/data/textures/tool_steelpick.png deleted file mode 100644 index 7982dafe..00000000 Binary files a/data/textures/tool_steelpick.png and /dev/null differ diff --git a/data/textures/tool_steelshovel.png b/data/textures/tool_steelshovel.png deleted file mode 100644 index ed841384..00000000 Binary files a/data/textures/tool_steelshovel.png and /dev/null differ diff --git a/data/textures/tool_steelsword.png b/data/textures/tool_steelsword.png deleted file mode 100644 index a7458123..00000000 Binary files a/data/textures/tool_steelsword.png and /dev/null differ diff --git a/data/textures/tool_stoneaxe.png b/data/textures/tool_stoneaxe.png deleted file mode 100644 index 698ac918..00000000 Binary files a/data/textures/tool_stoneaxe.png and /dev/null differ diff --git a/data/textures/tool_stonepick.png b/data/textures/tool_stonepick.png deleted file mode 100644 index b34de6f3..00000000 Binary files a/data/textures/tool_stonepick.png and /dev/null differ diff --git a/data/textures/tool_stoneshovel.png b/data/textures/tool_stoneshovel.png deleted file mode 100644 index ba524310..00000000 Binary files a/data/textures/tool_stoneshovel.png and /dev/null differ diff --git a/data/textures/tool_stonesword.png b/data/textures/tool_stonesword.png deleted file mode 100644 index 8f8191f9..00000000 Binary files a/data/textures/tool_stonesword.png and /dev/null differ diff --git a/data/textures/tool_woodaxe.png b/data/textures/tool_woodaxe.png deleted file mode 100644 index 3daa4af7..00000000 Binary files a/data/textures/tool_woodaxe.png and /dev/null differ diff --git a/data/textures/tool_woodpick.png b/data/textures/tool_woodpick.png deleted file mode 100644 index ea728cca..00000000 Binary files a/data/textures/tool_woodpick.png and /dev/null differ diff --git a/data/textures/tool_woodshovel.png b/data/textures/tool_woodshovel.png deleted file mode 100644 index 649ab4c3..00000000 Binary files a/data/textures/tool_woodshovel.png and /dev/null differ diff --git a/data/textures/tool_woodsword.png b/data/textures/tool_woodsword.png deleted file mode 100644 index d6c6be32..00000000 Binary files a/data/textures/tool_woodsword.png and /dev/null differ diff --git a/data/textures/torch.png b/data/textures/torch.png deleted file mode 100644 index 7a953c22..00000000 Binary files a/data/textures/torch.png and /dev/null differ diff --git a/data/textures/torch_on_ceiling.png b/data/textures/torch_on_ceiling.png deleted file mode 100644 index 6965d380..00000000 Binary files a/data/textures/torch_on_ceiling.png and /dev/null differ diff --git a/data/textures/torch_on_floor.png b/data/textures/torch_on_floor.png deleted file mode 100644 index 76d1dd5a..00000000 Binary files a/data/textures/torch_on_floor.png and /dev/null differ diff --git a/data/textures/tree.png b/data/textures/tree.png deleted file mode 100644 index 65abfc24..00000000 Binary files a/data/textures/tree.png and /dev/null differ diff --git a/data/textures/tree_top.png b/data/textures/tree_top.png deleted file mode 100644 index 2cdd94f8..00000000 Binary files a/data/textures/tree_top.png and /dev/null differ diff --git a/data/textures/treeprop.png b/data/textures/treeprop.png deleted file mode 100644 index 77ea4d6d..00000000 Binary files a/data/textures/treeprop.png and /dev/null differ diff --git a/data/textures/unknown_block.png b/data/textures/unknown_block.png deleted file mode 100644 index a27cb8ca..00000000 Binary files a/data/textures/unknown_block.png and /dev/null differ diff --git a/data/textures/unknown_object.png b/data/textures/unknown_object.png deleted file mode 100644 index 4d6a98d5..00000000 Binary files a/data/textures/unknown_object.png and /dev/null differ diff --git a/data/textures/water.png b/data/textures/water.png deleted file mode 100644 index e5f8cdc2..00000000 Binary files a/data/textures/water.png and /dev/null differ diff --git a/data/textures/wood.png b/data/textures/wood.png deleted file mode 100644 index 57c1d7c1..00000000 Binary files a/data/textures/wood.png and /dev/null differ diff --git a/src/game.cpp b/src/game.cpp index 6c75863c..fc87deb2 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -256,9 +256,9 @@ void draw_hotbar(video::IVideoDriver *driver, gui::IGUIFont *font, /* Draw hearts */ + video::ITexture *heart_texture = tsrc->getTextureRaw("heart.png"); + if(heart_texture) { - video::ITexture *heart_texture = - driver->getTexture(getTexturePath("heart.png").c_str()); v2s32 p = pos + v2s32(0, -20); for(s32 i=0; i modspaths; + modspaths.push_back(porting::path_data + DIR_DELIM + "mods"); + for(core::list::Iterator i = modspaths.begin(); + i != modspaths.end(); i++){ + std::string modspath = *i; + std::vector dirlist = fs::GetDirListing(modspath); + for(u32 j=0; j