From d5252358d1f2a4b41c2aa9e3a082a916fa4f54c3 Mon Sep 17 00:00:00 2001 From: Wuzzy Date: Sun, 29 Mar 2020 01:09:54 +0100 Subject: [PATCH] Move all chests into hades_chests mod --- mods/craftguide/init.lua | 5 +- mods/default/chests.lua | 140 --------------------- mods/default/crafting.lua | 33 ----- mods/default/init.lua | 2 - mods/hades_chests/ReadMe.txt | 4 + mods/{kerova => hades_chests}/depends.txt | 0 mods/{kerova => hades_chests}/init.lua | 121 ++++++++++++++---- mods/hades_chests/mod.conf | 2 + .../textures/default_chest_front.png | Bin .../textures/default_chest_lock.png | Bin .../textures/default_chest_side.png | Bin .../textures/default_chest_top.png | Bin .../textures/hades_chests_chestui.png} | Bin .../textures/kerova_chest_black.png | Bin .../textures/kerova_chest_blue.png | Bin .../textures/kerova_chest_cyan.png | Bin .../textures/kerova_chest_dark_green.png | Bin .../textures/kerova_chest_dark_grey.png | Bin .../textures/kerova_chest_front_black.png | Bin .../textures/kerova_chest_front_blue.png | Bin .../textures/kerova_chest_front_cyan.png | Bin .../textures/kerova_chest_front_dark_green.png | Bin .../textures/kerova_chest_front_dark_grey.png | Bin .../textures/kerova_chest_front_green.png | Bin .../textures/kerova_chest_front_grey.png | Bin .../textures/kerova_chest_front_magenta.png | Bin .../textures/kerova_chest_front_orange.png | Bin .../textures/kerova_chest_front_pink.png | Bin .../textures/kerova_chest_front_red.png | Bin .../textures/kerova_chest_front_violet.png | Bin .../textures/kerova_chest_front_white.png | Bin .../textures/kerova_chest_front_yellow.png | Bin .../textures/kerova_chest_green.png | Bin .../textures/kerova_chest_grey.png | Bin .../textures/kerova_chest_lock_black.png | Bin .../textures/kerova_chest_lock_blue.png | Bin .../textures/kerova_chest_lock_cyan.png | Bin .../textures/kerova_chest_lock_dark_green.png | Bin .../textures/kerova_chest_lock_dark_grey.png | Bin .../textures/kerova_chest_lock_green.png | Bin .../textures/kerova_chest_lock_grey.png | Bin .../textures/kerova_chest_lock_magenta.png | Bin .../textures/kerova_chest_lock_orange.png | Bin .../textures/kerova_chest_lock_pink.png | Bin .../textures/kerova_chest_lock_red.png | Bin .../textures/kerova_chest_lock_violet.png | Bin .../textures/kerova_chest_lock_white.png | Bin .../textures/kerova_chest_lock_yellow.png | Bin .../textures/kerova_chest_magenta.png | Bin .../textures/kerova_chest_orange.png | Bin .../textures/kerova_chest_pink.png | Bin .../textures/kerova_chest_red.png | Bin .../textures/kerova_chest_top_black.png | Bin .../textures/kerova_chest_top_blue.png | Bin .../textures/kerova_chest_top_cyan.png | Bin .../textures/kerova_chest_top_dark_green.png | Bin .../textures/kerova_chest_top_dark_grey.png | Bin .../textures/kerova_chest_top_green.png | Bin .../textures/kerova_chest_top_grey.png | Bin .../textures/kerova_chest_top_magenta.png | Bin .../textures/kerova_chest_top_orange.png | Bin .../textures/kerova_chest_top_pink.png | Bin .../textures/kerova_chest_top_red.png | Bin .../textures/kerova_chest_top_violet.png | Bin .../textures/kerova_chest_top_white.png | Bin .../textures/kerova_chest_top_yellow.png | Bin .../textures/kerova_chest_violet.png | Bin .../textures/kerova_chest_white.png | Bin .../textures/kerova_chest_yellow.png | Bin mods/kerova/ReadMe.txt | 11 -- mods/mesecons/mesecons_mvps/init.lua | 1 - mods/mesecons/mesecons_noteblock/init.lua | 2 +- mods/pipeworks/compat.lua | 10 +- mods/pipeworks/deployer.lua | 2 +- 74 files changed, 113 insertions(+), 220 deletions(-) delete mode 100644 mods/default/chests.lua create mode 100644 mods/hades_chests/ReadMe.txt rename mods/{kerova => hades_chests}/depends.txt (100%) rename mods/{kerova => hades_chests}/init.lua (56%) create mode 100644 mods/hades_chests/mod.conf rename mods/{default => hades_chests}/textures/default_chest_front.png (100%) rename mods/{default => hades_chests}/textures/default_chest_lock.png (100%) rename mods/{default => hades_chests}/textures/default_chest_side.png (100%) rename mods/{default => hades_chests}/textures/default_chest_top.png (100%) rename mods/{default/textures/chestui.png => hades_chests/textures/hades_chests_chestui.png} (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_black.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_blue.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_cyan.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_dark_green.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_dark_grey.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_front_black.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_front_blue.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_front_cyan.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_front_dark_green.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_front_dark_grey.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_front_green.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_front_grey.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_front_magenta.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_front_orange.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_front_pink.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_front_red.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_front_violet.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_front_white.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_front_yellow.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_green.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_grey.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_lock_black.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_lock_blue.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_lock_cyan.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_lock_dark_green.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_lock_dark_grey.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_lock_green.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_lock_grey.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_lock_magenta.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_lock_orange.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_lock_pink.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_lock_red.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_lock_violet.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_lock_white.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_lock_yellow.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_magenta.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_orange.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_pink.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_red.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_top_black.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_top_blue.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_top_cyan.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_top_dark_green.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_top_dark_grey.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_top_green.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_top_grey.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_top_magenta.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_top_orange.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_top_pink.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_top_red.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_top_violet.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_top_white.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_top_yellow.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_violet.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_white.png (100%) rename mods/{kerova => hades_chests}/textures/kerova_chest_yellow.png (100%) delete mode 100644 mods/kerova/ReadMe.txt diff --git a/mods/craftguide/init.lua b/mods/craftguide/init.lua index e9abed1..c2e4980 100644 --- a/mods/craftguide/init.lua +++ b/mods/craftguide/init.lua @@ -18,8 +18,9 @@ local group_stereotypes = { flower = "flowers:dandelion_yellow", window_wood = "windows:windows_wood", vines = "vines:vine", - chest = "default:chest", - locked_chest = "default:chest_locked", + chest = "hades_chests:chest", + unlocked_chest = "hades_chests:chest", + locked_chest = "hades_chests:chest_locked", stone = "default:cobble", fence_wood = "hades_fences:fence_wood", claybricks = "default:brick", diff --git a/mods/default/chests.lua b/mods/default/chests.lua deleted file mode 100644 index f8e3283..0000000 --- a/mods/default/chests.lua +++ /dev/null @@ -1,140 +0,0 @@ -default.chest_formspec = - "size[8,9]".. - "list[current_name;main;0,0;8,4;]".. - "list[current_player;main;0,5;8,4;]".. - "listring[]".. - "background[-0.5,-0.65;9,10.35;".."chestui.png".."]" - -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;]".. - "listring[]".. - "background[-0.5,-0.65;9,10.35;".."chestui.png".."]" - return formspec -end - -minetest.register_node("default:chest", { - description = "Chest", - tiles = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png", - "default_chest_side.png", "default_chest_side.png", "default_chest_front.png"}, - paramtype2 = "facedir", - groups = {choppy=2,oddly_breakable_by_hand=2, chest=1}, - legacy_facedir_simple = true, - is_ground_content = false, - sounds = default.node_sound_wood_defaults(), - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("formspec",default.chest_formspec) - meta:set_string("infotext", "Chest") - local inv = meta:get_inventory() - inv:set_size("main", 8*4) - end, - can_dig = function(pos,player) - local meta = minetest.get_meta(pos); - local inv = meta:get_inventory() - return inv:is_empty("main") - 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 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 chest at "..minetest.pos_to_string(pos)) - end, -}) - -local function has_locked_chest_privilege(meta, player) - if player:get_player_name() ~= meta:get_string("owner") then - return false - end - return true -end - -minetest.register_node("default:chest_locked", { - description = "Locked Chest", - tiles = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png", - "default_chest_side.png", "default_chest_side.png", "default_chest_lock.png"}, - paramtype2 = "facedir", - groups = {choppy=2,oddly_breakable_by_hand=2, locked_chest=1}, - 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) - meta:set_string("owner", placer:get_player_name() or "") - meta:set_string("infotext", "Locked Chest (owned by ".. - meta:get_string("owner")..")") - end, - on_construct = function(pos) - local meta = minetest.get_meta(pos) - meta:set_string("infotext", "Locked Chest") - meta:set_string("owner", "") - local inv = meta:get_inventory() - inv:set_size("main", 8*4) - end, - can_dig = function(pos,player) - local meta = minetest.get_meta(pos); - local inv = meta:get_inventory() - return inv:is_empty("main") and has_locked_chest_privilege(meta, player) - end, - 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 - end, - 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() - end, - 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)) - end, - on_metadata_inventory_take = function(pos, listname, index, stack, player) - minetest.log("action", player:get_player_name().. - " takes stuff from locked chest at "..minetest.pos_to_string(pos)) - end, - on_rightclick = function(pos, node, clicker) - local meta = minetest.get_meta(pos) - if has_locked_chest_privilege(meta, clicker) then - minetest.show_formspec( - clicker:get_player_name(), - "default:chest_locked", - default.get_locked_chest_formspec(pos) - ) - end - end, -}) - diff --git a/mods/default/crafting.lua b/mods/default/crafting.lua index 7865061..fde93df 100644 --- a/mods/default/crafting.lua +++ b/mods/default/crafting.lua @@ -260,25 +260,6 @@ minetest.register_craft({ }) -minetest.register_craft({ - output = 'default:chest', - recipe = { - {'group:wood', 'group:wood', 'group:wood'}, - {'group:wood', '', 'group:wood'}, - {'group:wood', 'group:wood', 'group:wood'}, - } -}) - - -minetest.register_craft({ - output = 'default:chest_locked', - recipe = { - {'group:wood', 'group:wood', 'group:wood'}, - {'group:wood', 'default:steel_ingot', 'group:wood'}, - {'group:wood', 'group:wood', 'group:wood'}, - } -}) - minetest.register_craft({ output = 'default:furnace', @@ -1029,20 +1010,6 @@ minetest.register_craft({ }) -minetest.register_craft({ - type = "fuel", - recipe = "default:chest", - burntime = 20, -}) - - -minetest.register_craft({ - type = "fuel", - recipe = "default:chest_locked", - burntime = 20, -}) - - minetest.register_craft({ type = "fuel", diff --git a/mods/default/init.lua b/mods/default/init.lua index cfc3320..0ebd768 100644 --- a/mods/default/init.lua +++ b/mods/default/init.lua @@ -9,7 +9,6 @@ default = {} -- GUI related stuff default.gui_inventory_bg_img = "background[5,5;1,1;inventory.png;true]" -default.gui_chest_bg_img = "background[5,5;1,1;chestui.png;true]" function default.get_hotbar_bg(x,y) local out = "" @@ -37,7 +36,6 @@ dofile(minetest.get_modpath("default").."/simple_nodes.lua") dofile(minetest.get_modpath("default").."/tools.lua") dofile(minetest.get_modpath("default").."/plants.lua") dofile(minetest.get_modpath("default").."/furnaces.lua") -dofile(minetest.get_modpath("default").."/chests.lua") dofile(minetest.get_modpath("default").."/ladders.lua") dofile(minetest.get_modpath("default").."/deco.lua") dofile(minetest.get_modpath("default").."/craftitems.lua") diff --git a/mods/hades_chests/ReadMe.txt b/mods/hades_chests/ReadMe.txt new file mode 100644 index 0000000..9cdae5b --- /dev/null +++ b/mods/hades_chests/ReadMe.txt @@ -0,0 +1,4 @@ +This mod adds chests and locked chests in many colors! + +Based on the Kerova mod (heavily reduced!) by AndromedaKerova (aka RommieKerova, Rommie, Andromeda) (rommiekerova@gmail.com) +License: MIT License diff --git a/mods/kerova/depends.txt b/mods/hades_chests/depends.txt similarity index 100% rename from mods/kerova/depends.txt rename to mods/hades_chests/depends.txt diff --git a/mods/kerova/init.lua b/mods/hades_chests/init.lua similarity index 56% rename from mods/kerova/init.lua rename to mods/hades_chests/init.lua index eb3ecf9..4ba43c9 100644 --- a/mods/kerova/init.lua +++ b/mods/hades_chests/init.lua @@ -1,12 +1,20 @@ ---[[ -Kerova Mod -By AndromedaKerova (AKA; RommieKerova, Rommie, Andromeda) (rommiekerova@gmail.com) -License: WTFPL -Version: 1.2 - is a reduced version only with colored chests.. code deleted by Glunggi :D ---]] +local chest_formspec = + "size[8,9]".. + "list[current_name;main;0,0;8,4;]".. + "list[current_player;main;0,5;8,4;]".. + "listring[]".. + "background[-0.5,-0.65;9,10.35;".."hades_chests_chestui.png".."]" -local chest_formspec = default.chest_formspec -local get_locked_chest_formspec = default.get_locked_chest_formspec +local function 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;]".. + "listring[]".. + "background[-0.5,-0.65;9,10.35;".."hades_chests_chestui.png".."]" + return formspec +end local function has_locked_chest_privilege(meta, player) if player:get_player_name() ~= meta:get_string("owner") then @@ -16,6 +24,7 @@ local function has_locked_chest_privilege(meta, player) end local chests = { + { "", "Chest", "Locked Chest" }, { "white", "White Chest", "White Locked Chest" }, { "grey", "Grey Chest", "Grey Locked Chest" }, { "dark_grey", "Dark Grey Chest", "Dark Grey Locked Chest" }, @@ -38,13 +47,30 @@ for c=1, #chests do local sub = chests[c][1] local desc_unlocked = chests[c][2] local desc_locked = chests[c][3] +local tiles_unlocked, tiles_locked +local itemstring_unlocked, itemstring_locked +if sub == "" then + itemstring_unlocked = "hades_chests:chest" + itemstring_locked = "hades_chests:chest_locked" + tiles_unlocked = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png", + "default_chest_side.png", "default_chest_side.png", "default_chest_front.png"} + tiles_locked = {"default_chest_top.png", "default_chest_top.png", "default_chest_side.png", + "default_chest_side.png", "default_chest_side.png", "default_chest_lock.png"} +else + itemstring_unlocked = "hades_chests:chest_"..sub + itemstring_locked = "hades_chests:chest_"..sub.."_locked" + tiles_unlocked = {"kerova_chest_top_"..sub..".png", "kerova_chest_top_"..sub..".png", "kerova_chest_"..sub..".png", + "kerova_chest_"..sub..".png", "kerova_chest_"..sub..".png", "kerova_chest_front_"..sub..".png"} + tiles_locked = {"kerova_chest_top_"..sub..".png", "kerova_chest_top_"..sub..".png", "kerova_chest_"..sub..".png", + "kerova_chest_"..sub..".png", "kerova_chest_"..sub..".png", "kerova_chest_lock_"..sub..".png"} +end -minetest.register_node("kerova:chest_"..sub, { + +minetest.register_node(itemstring_unlocked, { description = desc_unlocked, - tiles = {"kerova_chest_top_"..sub..".png", "kerova_chest_top_"..sub..".png", "kerova_chest_"..sub..".png", - "kerova_chest_"..sub..".png", "kerova_chest_"..sub..".png", "kerova_chest_front_"..sub..".png"}, + tiles = tiles_unlocked, paramtype2 = "facedir", - groups = {choppy=2,oddly_breakable_by_hand=2, chest=1}, + groups = {choppy=2,oddly_breakable_by_hand=2, chest=1, unlocked_chest=1}, legacy_facedir_simple = true, sounds = default.node_sound_wood_defaults(), on_construct = function(pos) @@ -72,12 +98,11 @@ minetest.register_node("kerova:chest_"..sub, { " takes stuff from chest at "..minetest.pos_to_string(pos)) end, }) -minetest.register_node("kerova:chest_"..sub.."_locked", { +minetest.register_node(itemstring_locked, { description = desc_locked, - tiles = {"kerova_chest_top_"..sub..".png", "kerova_chest_top_"..sub..".png", "kerova_chest_"..sub..".png", - "kerova_chest_"..sub..".png", "kerova_chest_"..sub..".png", "kerova_chest_lock_"..sub..".png"}, + tiles = tiles_locked, paramtype2 = "facedir", - groups = {choppy=2,oddly_breakable_by_hand=2, locked_chest=1}, + groups = {choppy=2,oddly_breakable_by_hand=2, chest=2, locked_chest=1}, legacy_facedir_simple = true, is_ground_content = false, sounds = default.node_sound_wood_defaults(), @@ -134,26 +159,74 @@ minetest.register_node("kerova:chest_"..sub.."_locked", { if has_locked_chest_privilege(meta, clicker) then minetest.show_formspec( clicker:get_player_name(), - "default:chest_locked", + "hades_chests:chest_locked", get_locked_chest_formspec(pos) ) end end, }) +if sub ~= "" then + minetest.register_craft({ + type = "shapeless", + output = itemstring_unlocked, + recipe = { "group:unlocked_chest", "dye:"..sub }, + }) + minetest.register_craft({ + type = "shapeless", + output = itemstring_locked, + recipe = { itemstring_unlocked, "default:steel_ingot" }, + }) + minetest.register_craft({ + type = "shapeless", + output = itemstring_locked, + recipe = { "group:locked_chest", "dye:"..sub }, + }) + minetest.register_craft({ + output = itemstring_unlocked, + recipe = { + {'hades_trees:colwood_'..sub, 'hades_trees:colwood_'..sub, 'hades_trees:colwood_'..sub}, + {'hades_trees:colwood_'..sub, '', 'hades_trees:colwood_'..sub}, + {'hades_trees:colwood_'..sub, 'hades_trees:colwood_'..sub, 'hades_trees:colwood_'..sub}, + } + }) + minetest.register_craft({ + output = itemstring_locked, + recipe = { + {'hades_trees:colwood_'..sub, 'hades_trees:colwood_'..sub, 'hades_trees:colwood_'..sub}, + {'hades_trees:colwood_'..sub, 'default:steel_ingot', 'hades_trees:colwood_'..sub}, + {'hades_trees:colwood_'..sub, 'hades_trees:colwood_'..sub, 'hades_trees:colwood_'..sub}, + } + }) +end + +end + minetest.register_craft({ - output = "kerova:chest_"..sub, + output = 'hades_chests:chest', recipe = { - {"dye:"..sub}, - {"group:chest"}, + {'group:wood', 'group:wood', 'group:wood'}, + {'group:wood', '', 'group:wood'}, + {'group:wood', 'group:wood', 'group:wood'}, } }) + +minetest.register_craft({ + type = "shapeless", + output = 'hades_chests:chest_locked', + recipe = {"hades_chests:chest", "default:steel_ingot"}, +}) minetest.register_craft({ - output = "kerova:chest_"..sub.."_locked", + output = 'hades_chests:chest_locked', recipe = { - {"dye:"..sub}, - {"group:locked_chest"}, + {'group:wood', 'group:wood', 'group:wood'}, + {'group:wood', 'default:steel_ingot', 'group:wood'}, + {'group:wood', 'group:wood', 'group:wood'}, } }) -end +minetest.register_craft({ + type = "fuel", + recipe = "group:chest", + burntime = 20, +}) diff --git a/mods/hades_chests/mod.conf b/mods/hades_chests/mod.conf new file mode 100644 index 0000000..ed32b58 --- /dev/null +++ b/mods/hades_chests/mod.conf @@ -0,0 +1,2 @@ +name = hades_chests +depends = default diff --git a/mods/default/textures/default_chest_front.png b/mods/hades_chests/textures/default_chest_front.png similarity index 100% rename from mods/default/textures/default_chest_front.png rename to mods/hades_chests/textures/default_chest_front.png diff --git a/mods/default/textures/default_chest_lock.png b/mods/hades_chests/textures/default_chest_lock.png similarity index 100% rename from mods/default/textures/default_chest_lock.png rename to mods/hades_chests/textures/default_chest_lock.png diff --git a/mods/default/textures/default_chest_side.png b/mods/hades_chests/textures/default_chest_side.png similarity index 100% rename from mods/default/textures/default_chest_side.png rename to mods/hades_chests/textures/default_chest_side.png diff --git a/mods/default/textures/default_chest_top.png b/mods/hades_chests/textures/default_chest_top.png similarity index 100% rename from mods/default/textures/default_chest_top.png rename to mods/hades_chests/textures/default_chest_top.png diff --git a/mods/default/textures/chestui.png b/mods/hades_chests/textures/hades_chests_chestui.png similarity index 100% rename from mods/default/textures/chestui.png rename to mods/hades_chests/textures/hades_chests_chestui.png diff --git a/mods/kerova/textures/kerova_chest_black.png b/mods/hades_chests/textures/kerova_chest_black.png similarity index 100% rename from mods/kerova/textures/kerova_chest_black.png rename to mods/hades_chests/textures/kerova_chest_black.png diff --git a/mods/kerova/textures/kerova_chest_blue.png b/mods/hades_chests/textures/kerova_chest_blue.png similarity index 100% rename from mods/kerova/textures/kerova_chest_blue.png rename to mods/hades_chests/textures/kerova_chest_blue.png diff --git a/mods/kerova/textures/kerova_chest_cyan.png b/mods/hades_chests/textures/kerova_chest_cyan.png similarity index 100% rename from mods/kerova/textures/kerova_chest_cyan.png rename to mods/hades_chests/textures/kerova_chest_cyan.png diff --git a/mods/kerova/textures/kerova_chest_dark_green.png b/mods/hades_chests/textures/kerova_chest_dark_green.png similarity index 100% rename from mods/kerova/textures/kerova_chest_dark_green.png rename to mods/hades_chests/textures/kerova_chest_dark_green.png diff --git a/mods/kerova/textures/kerova_chest_dark_grey.png b/mods/hades_chests/textures/kerova_chest_dark_grey.png similarity index 100% rename from mods/kerova/textures/kerova_chest_dark_grey.png rename to mods/hades_chests/textures/kerova_chest_dark_grey.png diff --git a/mods/kerova/textures/kerova_chest_front_black.png b/mods/hades_chests/textures/kerova_chest_front_black.png similarity index 100% rename from mods/kerova/textures/kerova_chest_front_black.png rename to mods/hades_chests/textures/kerova_chest_front_black.png diff --git a/mods/kerova/textures/kerova_chest_front_blue.png b/mods/hades_chests/textures/kerova_chest_front_blue.png similarity index 100% rename from mods/kerova/textures/kerova_chest_front_blue.png rename to mods/hades_chests/textures/kerova_chest_front_blue.png diff --git a/mods/kerova/textures/kerova_chest_front_cyan.png b/mods/hades_chests/textures/kerova_chest_front_cyan.png similarity index 100% rename from mods/kerova/textures/kerova_chest_front_cyan.png rename to mods/hades_chests/textures/kerova_chest_front_cyan.png diff --git a/mods/kerova/textures/kerova_chest_front_dark_green.png b/mods/hades_chests/textures/kerova_chest_front_dark_green.png similarity index 100% rename from mods/kerova/textures/kerova_chest_front_dark_green.png rename to mods/hades_chests/textures/kerova_chest_front_dark_green.png diff --git a/mods/kerova/textures/kerova_chest_front_dark_grey.png b/mods/hades_chests/textures/kerova_chest_front_dark_grey.png similarity index 100% rename from mods/kerova/textures/kerova_chest_front_dark_grey.png rename to mods/hades_chests/textures/kerova_chest_front_dark_grey.png diff --git a/mods/kerova/textures/kerova_chest_front_green.png b/mods/hades_chests/textures/kerova_chest_front_green.png similarity index 100% rename from mods/kerova/textures/kerova_chest_front_green.png rename to mods/hades_chests/textures/kerova_chest_front_green.png diff --git a/mods/kerova/textures/kerova_chest_front_grey.png b/mods/hades_chests/textures/kerova_chest_front_grey.png similarity index 100% rename from mods/kerova/textures/kerova_chest_front_grey.png rename to mods/hades_chests/textures/kerova_chest_front_grey.png diff --git a/mods/kerova/textures/kerova_chest_front_magenta.png b/mods/hades_chests/textures/kerova_chest_front_magenta.png similarity index 100% rename from mods/kerova/textures/kerova_chest_front_magenta.png rename to mods/hades_chests/textures/kerova_chest_front_magenta.png diff --git a/mods/kerova/textures/kerova_chest_front_orange.png b/mods/hades_chests/textures/kerova_chest_front_orange.png similarity index 100% rename from mods/kerova/textures/kerova_chest_front_orange.png rename to mods/hades_chests/textures/kerova_chest_front_orange.png diff --git a/mods/kerova/textures/kerova_chest_front_pink.png b/mods/hades_chests/textures/kerova_chest_front_pink.png similarity index 100% rename from mods/kerova/textures/kerova_chest_front_pink.png rename to mods/hades_chests/textures/kerova_chest_front_pink.png diff --git a/mods/kerova/textures/kerova_chest_front_red.png b/mods/hades_chests/textures/kerova_chest_front_red.png similarity index 100% rename from mods/kerova/textures/kerova_chest_front_red.png rename to mods/hades_chests/textures/kerova_chest_front_red.png diff --git a/mods/kerova/textures/kerova_chest_front_violet.png b/mods/hades_chests/textures/kerova_chest_front_violet.png similarity index 100% rename from mods/kerova/textures/kerova_chest_front_violet.png rename to mods/hades_chests/textures/kerova_chest_front_violet.png diff --git a/mods/kerova/textures/kerova_chest_front_white.png b/mods/hades_chests/textures/kerova_chest_front_white.png similarity index 100% rename from mods/kerova/textures/kerova_chest_front_white.png rename to mods/hades_chests/textures/kerova_chest_front_white.png diff --git a/mods/kerova/textures/kerova_chest_front_yellow.png b/mods/hades_chests/textures/kerova_chest_front_yellow.png similarity index 100% rename from mods/kerova/textures/kerova_chest_front_yellow.png rename to mods/hades_chests/textures/kerova_chest_front_yellow.png diff --git a/mods/kerova/textures/kerova_chest_green.png b/mods/hades_chests/textures/kerova_chest_green.png similarity index 100% rename from mods/kerova/textures/kerova_chest_green.png rename to mods/hades_chests/textures/kerova_chest_green.png diff --git a/mods/kerova/textures/kerova_chest_grey.png b/mods/hades_chests/textures/kerova_chest_grey.png similarity index 100% rename from mods/kerova/textures/kerova_chest_grey.png rename to mods/hades_chests/textures/kerova_chest_grey.png diff --git a/mods/kerova/textures/kerova_chest_lock_black.png b/mods/hades_chests/textures/kerova_chest_lock_black.png similarity index 100% rename from mods/kerova/textures/kerova_chest_lock_black.png rename to mods/hades_chests/textures/kerova_chest_lock_black.png diff --git a/mods/kerova/textures/kerova_chest_lock_blue.png b/mods/hades_chests/textures/kerova_chest_lock_blue.png similarity index 100% rename from mods/kerova/textures/kerova_chest_lock_blue.png rename to mods/hades_chests/textures/kerova_chest_lock_blue.png diff --git a/mods/kerova/textures/kerova_chest_lock_cyan.png b/mods/hades_chests/textures/kerova_chest_lock_cyan.png similarity index 100% rename from mods/kerova/textures/kerova_chest_lock_cyan.png rename to mods/hades_chests/textures/kerova_chest_lock_cyan.png diff --git a/mods/kerova/textures/kerova_chest_lock_dark_green.png b/mods/hades_chests/textures/kerova_chest_lock_dark_green.png similarity index 100% rename from mods/kerova/textures/kerova_chest_lock_dark_green.png rename to mods/hades_chests/textures/kerova_chest_lock_dark_green.png diff --git a/mods/kerova/textures/kerova_chest_lock_dark_grey.png b/mods/hades_chests/textures/kerova_chest_lock_dark_grey.png similarity index 100% rename from mods/kerova/textures/kerova_chest_lock_dark_grey.png rename to mods/hades_chests/textures/kerova_chest_lock_dark_grey.png diff --git a/mods/kerova/textures/kerova_chest_lock_green.png b/mods/hades_chests/textures/kerova_chest_lock_green.png similarity index 100% rename from mods/kerova/textures/kerova_chest_lock_green.png rename to mods/hades_chests/textures/kerova_chest_lock_green.png diff --git a/mods/kerova/textures/kerova_chest_lock_grey.png b/mods/hades_chests/textures/kerova_chest_lock_grey.png similarity index 100% rename from mods/kerova/textures/kerova_chest_lock_grey.png rename to mods/hades_chests/textures/kerova_chest_lock_grey.png diff --git a/mods/kerova/textures/kerova_chest_lock_magenta.png b/mods/hades_chests/textures/kerova_chest_lock_magenta.png similarity index 100% rename from mods/kerova/textures/kerova_chest_lock_magenta.png rename to mods/hades_chests/textures/kerova_chest_lock_magenta.png diff --git a/mods/kerova/textures/kerova_chest_lock_orange.png b/mods/hades_chests/textures/kerova_chest_lock_orange.png similarity index 100% rename from mods/kerova/textures/kerova_chest_lock_orange.png rename to mods/hades_chests/textures/kerova_chest_lock_orange.png diff --git a/mods/kerova/textures/kerova_chest_lock_pink.png b/mods/hades_chests/textures/kerova_chest_lock_pink.png similarity index 100% rename from mods/kerova/textures/kerova_chest_lock_pink.png rename to mods/hades_chests/textures/kerova_chest_lock_pink.png diff --git a/mods/kerova/textures/kerova_chest_lock_red.png b/mods/hades_chests/textures/kerova_chest_lock_red.png similarity index 100% rename from mods/kerova/textures/kerova_chest_lock_red.png rename to mods/hades_chests/textures/kerova_chest_lock_red.png diff --git a/mods/kerova/textures/kerova_chest_lock_violet.png b/mods/hades_chests/textures/kerova_chest_lock_violet.png similarity index 100% rename from mods/kerova/textures/kerova_chest_lock_violet.png rename to mods/hades_chests/textures/kerova_chest_lock_violet.png diff --git a/mods/kerova/textures/kerova_chest_lock_white.png b/mods/hades_chests/textures/kerova_chest_lock_white.png similarity index 100% rename from mods/kerova/textures/kerova_chest_lock_white.png rename to mods/hades_chests/textures/kerova_chest_lock_white.png diff --git a/mods/kerova/textures/kerova_chest_lock_yellow.png b/mods/hades_chests/textures/kerova_chest_lock_yellow.png similarity index 100% rename from mods/kerova/textures/kerova_chest_lock_yellow.png rename to mods/hades_chests/textures/kerova_chest_lock_yellow.png diff --git a/mods/kerova/textures/kerova_chest_magenta.png b/mods/hades_chests/textures/kerova_chest_magenta.png similarity index 100% rename from mods/kerova/textures/kerova_chest_magenta.png rename to mods/hades_chests/textures/kerova_chest_magenta.png diff --git a/mods/kerova/textures/kerova_chest_orange.png b/mods/hades_chests/textures/kerova_chest_orange.png similarity index 100% rename from mods/kerova/textures/kerova_chest_orange.png rename to mods/hades_chests/textures/kerova_chest_orange.png diff --git a/mods/kerova/textures/kerova_chest_pink.png b/mods/hades_chests/textures/kerova_chest_pink.png similarity index 100% rename from mods/kerova/textures/kerova_chest_pink.png rename to mods/hades_chests/textures/kerova_chest_pink.png diff --git a/mods/kerova/textures/kerova_chest_red.png b/mods/hades_chests/textures/kerova_chest_red.png similarity index 100% rename from mods/kerova/textures/kerova_chest_red.png rename to mods/hades_chests/textures/kerova_chest_red.png diff --git a/mods/kerova/textures/kerova_chest_top_black.png b/mods/hades_chests/textures/kerova_chest_top_black.png similarity index 100% rename from mods/kerova/textures/kerova_chest_top_black.png rename to mods/hades_chests/textures/kerova_chest_top_black.png diff --git a/mods/kerova/textures/kerova_chest_top_blue.png b/mods/hades_chests/textures/kerova_chest_top_blue.png similarity index 100% rename from mods/kerova/textures/kerova_chest_top_blue.png rename to mods/hades_chests/textures/kerova_chest_top_blue.png diff --git a/mods/kerova/textures/kerova_chest_top_cyan.png b/mods/hades_chests/textures/kerova_chest_top_cyan.png similarity index 100% rename from mods/kerova/textures/kerova_chest_top_cyan.png rename to mods/hades_chests/textures/kerova_chest_top_cyan.png diff --git a/mods/kerova/textures/kerova_chest_top_dark_green.png b/mods/hades_chests/textures/kerova_chest_top_dark_green.png similarity index 100% rename from mods/kerova/textures/kerova_chest_top_dark_green.png rename to mods/hades_chests/textures/kerova_chest_top_dark_green.png diff --git a/mods/kerova/textures/kerova_chest_top_dark_grey.png b/mods/hades_chests/textures/kerova_chest_top_dark_grey.png similarity index 100% rename from mods/kerova/textures/kerova_chest_top_dark_grey.png rename to mods/hades_chests/textures/kerova_chest_top_dark_grey.png diff --git a/mods/kerova/textures/kerova_chest_top_green.png b/mods/hades_chests/textures/kerova_chest_top_green.png similarity index 100% rename from mods/kerova/textures/kerova_chest_top_green.png rename to mods/hades_chests/textures/kerova_chest_top_green.png diff --git a/mods/kerova/textures/kerova_chest_top_grey.png b/mods/hades_chests/textures/kerova_chest_top_grey.png similarity index 100% rename from mods/kerova/textures/kerova_chest_top_grey.png rename to mods/hades_chests/textures/kerova_chest_top_grey.png diff --git a/mods/kerova/textures/kerova_chest_top_magenta.png b/mods/hades_chests/textures/kerova_chest_top_magenta.png similarity index 100% rename from mods/kerova/textures/kerova_chest_top_magenta.png rename to mods/hades_chests/textures/kerova_chest_top_magenta.png diff --git a/mods/kerova/textures/kerova_chest_top_orange.png b/mods/hades_chests/textures/kerova_chest_top_orange.png similarity index 100% rename from mods/kerova/textures/kerova_chest_top_orange.png rename to mods/hades_chests/textures/kerova_chest_top_orange.png diff --git a/mods/kerova/textures/kerova_chest_top_pink.png b/mods/hades_chests/textures/kerova_chest_top_pink.png similarity index 100% rename from mods/kerova/textures/kerova_chest_top_pink.png rename to mods/hades_chests/textures/kerova_chest_top_pink.png diff --git a/mods/kerova/textures/kerova_chest_top_red.png b/mods/hades_chests/textures/kerova_chest_top_red.png similarity index 100% rename from mods/kerova/textures/kerova_chest_top_red.png rename to mods/hades_chests/textures/kerova_chest_top_red.png diff --git a/mods/kerova/textures/kerova_chest_top_violet.png b/mods/hades_chests/textures/kerova_chest_top_violet.png similarity index 100% rename from mods/kerova/textures/kerova_chest_top_violet.png rename to mods/hades_chests/textures/kerova_chest_top_violet.png diff --git a/mods/kerova/textures/kerova_chest_top_white.png b/mods/hades_chests/textures/kerova_chest_top_white.png similarity index 100% rename from mods/kerova/textures/kerova_chest_top_white.png rename to mods/hades_chests/textures/kerova_chest_top_white.png diff --git a/mods/kerova/textures/kerova_chest_top_yellow.png b/mods/hades_chests/textures/kerova_chest_top_yellow.png similarity index 100% rename from mods/kerova/textures/kerova_chest_top_yellow.png rename to mods/hades_chests/textures/kerova_chest_top_yellow.png diff --git a/mods/kerova/textures/kerova_chest_violet.png b/mods/hades_chests/textures/kerova_chest_violet.png similarity index 100% rename from mods/kerova/textures/kerova_chest_violet.png rename to mods/hades_chests/textures/kerova_chest_violet.png diff --git a/mods/kerova/textures/kerova_chest_white.png b/mods/hades_chests/textures/kerova_chest_white.png similarity index 100% rename from mods/kerova/textures/kerova_chest_white.png rename to mods/hades_chests/textures/kerova_chest_white.png diff --git a/mods/kerova/textures/kerova_chest_yellow.png b/mods/hades_chests/textures/kerova_chest_yellow.png similarity index 100% rename from mods/kerova/textures/kerova_chest_yellow.png rename to mods/hades_chests/textures/kerova_chest_yellow.png diff --git a/mods/kerova/ReadMe.txt b/mods/kerova/ReadMe.txt deleted file mode 100644 index 741be7a..0000000 --- a/mods/kerova/ReadMe.txt +++ /dev/null @@ -1,11 +0,0 @@ --- Modified for Dives Ruris in 2015 by Glünggi --- only chests --- code chances cause of compatibility - -Kerova Mod -By AndromedaKerova (AKA; RommieKerova, Rommie, Andromeda) (rommiekerova@gmail.com) -HEAVILY REDUCED VERSION FOR HADES REVISITED! -License: WTFPL - -Contains: -Colored chests and locked chests. diff --git a/mods/mesecons/mesecons_mvps/init.lua b/mods/mesecons/mesecons_mvps/init.lua index 1549b12..20a35ba 100644 --- a/mods/mesecons/mesecons_mvps/init.lua +++ b/mods/mesecons/mesecons_mvps/init.lua @@ -234,5 +234,4 @@ function mesecon:mvps_move_objects(pos, dir, nodestack) end end -mesecon:register_mvps_stopper("default:chest_locked") mesecon:register_mvps_stopper("default:furnace") diff --git a/mods/mesecons/mesecons_noteblock/init.lua b/mods/mesecons/mesecons_noteblock/init.lua index 1faf1d7..b2a2858 100644 --- a/mods/mesecons/mesecons_noteblock/init.lua +++ b/mods/mesecons/mesecons_noteblock/init.lua @@ -65,7 +65,7 @@ mesecon.noteblock_play = function (pos, param2) if block_below_name == "default:stone" then soundname="mesecons_noteblock_kick" end - if block_below_name == "default:chest" then + if block_below_name == "hades_chests:chest" then soundname="mesecons_noteblock_snare" end if block_below_name == "hades_trees:tree" then diff --git a/mods/pipeworks/compat.lua b/mods/pipeworks/compat.lua index e68fa78..569894f 100644 --- a/mods/pipeworks/compat.lua +++ b/mods/pipeworks/compat.lua @@ -91,7 +91,7 @@ local furnace_active = pipeworks.clone_node("default:furnace_active") minetest.register_node(":default:furnace_active", furnace_active) -local chest = pipeworks.clone_node("default:chest") +local chest = pipeworks.clone_node("hades_chests:chest") chest.tiles[1] = "default_chest_top.png^pipeworks_tube_connection_wooden.png" chest.tiles[2] = "default_chest_top.png^pipeworks_tube_connection_wooden.png" chest.tiles[3] = "default_chest_side.png^pipeworks_tube_connection_wooden.png" @@ -121,10 +121,10 @@ local chest = pipeworks.clone_node("default:chest") pipeworks.scan_for_tube_objects(pos) end -minetest.register_node(":default:chest", chest) +minetest.register_node(":hades_chests:chest", chest) -local chest_locked = pipeworks.clone_node("default:chest_locked") +local chest_locked = pipeworks.clone_node("hades_chests:chest_locked") chest_locked.tiles[1] = "default_chest_top.png^pipeworks_tube_connection_wooden.png" chest_locked.tiles[2] = "default_chest_top.png^pipeworks_tube_connection_wooden.png" chest_locked.tiles[3] = "default_chest_side.png^pipeworks_tube_connection_wooden.png" @@ -146,7 +146,7 @@ local chest_locked = pipeworks.clone_node("default:chest_locked") end, connect_sides = {left=1, right=1, back=1, front=1, bottom=1, top=1} } - local old_after_place = minetest.registered_nodes["default:chest_locked"].after_place_node + local old_after_place = minetest.registered_nodes["hades_chests:chest_locked"].after_place_node chest_locked.after_place_node = function(pos, placer) pipeworks.scan_for_tube_objects(pos) old_after_place(pos, placer) @@ -155,4 +155,4 @@ local chest_locked = pipeworks.clone_node("default:chest_locked") pipeworks.scan_for_tube_objects(pos) end -minetest.register_node(":default:chest_locked", chest_locked) +minetest.register_node(":hades_chests:chest_locked", chest_locked) diff --git a/mods/pipeworks/deployer.lua b/mods/pipeworks/deployer.lua index 7afc227..84e3097 100644 --- a/mods/pipeworks/deployer.lua +++ b/mods/pipeworks/deployer.lua @@ -6,7 +6,7 @@ minetest.register_alias("technic:deployer_on", "pipeworks:deployer_on") minetest.register_craft({ output = 'pipeworks:deployer_off 1', recipe = { - {'group:wood', 'default:chest','group:wood'}, + {'group:wood', 'group:chest','group:wood'}, {'default:stone', 'mesecons:piston','default:stone'}, {'default:stone', 'mesecons:mesecon','default:stone'}, } -- 2.11.4.GIT