diff --git a/bedroom.lua b/bedroom.lua index 816bbd3..57649a6 100644 --- a/bedroom.lua +++ b/bedroom.lua @@ -222,8 +222,8 @@ local rgb_colors = { ["yellow"] = "#FFFF00", ["magenta"] = "#FF00FF", ["cyan"] = "#00FFFF", - ["darkgreen"] = "#008000", - ["darkgrey"] = "#808080", + ["dark_green"] = "#008000", + ["dark_grey"] = "#808080", ["grey"] = "#C0C0C0", ["brown"] = "#A52A2A", ["orange"] = "#FF4500", diff --git a/init.lua b/init.lua index 8799c93..5a26bfb 100644 --- a/init.lua +++ b/init.lua @@ -1,6 +1,7 @@ cabs_table = {} local modpath = minetest.get_modpath("luxury_decor") +dofile(modpath.."/materials.lua") dofile(modpath.."/bedroom.lua") dofile(modpath.."/chairs.lua") dofile(modpath.."/tables.lua") @@ -10,4 +11,4 @@ dofile(modpath.."/music.lua") dofile(modpath.."/redecorating.lua") dofile(modpath.."/shelves.lua") dofile(modpath.."/living_room.lua") -dofile(modpath.."/materials.lua") + diff --git a/kitchen_furniture.lua b/kitchen_furniture.lua index 3b3bdcc..daa247f 100644 --- a/kitchen_furniture.lua +++ b/kitchen_furniture.lua @@ -1707,3 +1707,117 @@ minetest.register_node("luxury_decor:cooker", { on_rightclick = function (pos, node, clicker, itemstack, pointed_thing)]] }) + +minetest.register_craftitem("luxury_decor:wooden_drawer", { + description = "Wooden Drawer", + inventory_image = "wooden_drawer.png", + stack_max = 99 +}) + +minetest.register_craft({ + output = "luxury_decor:wooden_drawer", + recipe = { + {"luxury_decor:wooden_board", "luxury_decor:wooden_board", ""}, + {"luxury_decor:wooden_board", "", ""}, + {"default:stick", "", ""} + } +}) + +minetest.register_craft({ + output = "luxury_decor:kitchen_wooden_cabinet_1", + recipe = { + {"luxury_decor:wooden_board", "luxury_decor:wooden_drawer", ""}, + {"luxury_decor:wooden_board", "luxury_decor:wooden_drawer", ""}, + {"luxury_decor:wooden_board", "", ""} + } +}) + +minetest.register_craft({ + output = "luxury_decor:kitchen_wooden_cabinet_with_door_1", + recipe = { + {"luxury_decor:wooden_board", "luxury_decor:wooden_board", ""}, + {"luxury_decor:wooden_board", "", ""}, + {"luxury_decor:wooden_board", "", ""} + } +}) + +minetest.register_craft({ + output = "luxury_decor:kitchen_wooden_cabinet_with_door_and_drawer_1", + recipe = { + {"luxury_decor:wooden_board", "luxury_decor:wooden_drawer", ""}, + {"luxury_decor:wooden_board", "luxury_decor:wooden_board", ""}, + {"luxury_decor:wooden_board", "", ""} + } +}) + +minetest.register_craft({ + output = "luxury_decor:kitchen_wooden_cabinet_with_two_doors_1", + recipe = { + {"luxury_decor:wooden_board", "luxury_decor:wooden_board", ""}, + {"luxury_decor:wooden_board", "luxury_decor:wooden_board", ""}, + {"luxury_decor:wooden_board", "", ""} + } +}) + +minetest.register_craft({ + output = "luxury_decor:kitchen_wooden_cabinet_with_two_doors_and_drawer_1", + recipe = { + {"luxury_decor:wooden_board", "luxury_decor:wooden_board", ""}, + {"luxury_decor:wooden_board", "luxury_decor:wooden_board", ""}, + {"luxury_decor:wooden_board", "luxury_decor:wooden_drawer", ""} + } +}) + +minetest.register_craft({ + output = "luxury_decor:kitchen_wooden_half_cabinet_1", + recipe = { + {"luxury_decor:wooden_board", "luxury_decor:wooden_drawer", ""}, + {"luxury_decor:wooden_board", "", ""}, + {"", "", ""} + } +}) + +minetest.register_craft({ + output = "luxury_decor:kitchen_wooden_threedrawer_cabinet_1", + recipe = { + {"luxury_decor:wooden_board", "luxury_decor:wooden_drawer", ""}, + {"luxury_decor:wooden_board", "luxury_decor:wooden_drawer", ""}, + {"luxury_decor:wooden_board", "luxury_decor:wooden_drawer", ""} + } +}) + +minetest.register_craft({ + output = "luxury_decor:kitchen_wooden_cabinet_with_sink_1", + recipe = { + {"luxury_decor:wooden_board", "luxury_decor:siphon", "dye:grey"}, + {"luxury_decor:wooden_board", "luxury_decor:plastic_sheet", ""}, + {"luxury_decor:wooden_board", "default:steel_ingot", ""} + } +}) + +minetest.register_craft({ + output = "luxury_decor:fridge_closed", + recipe = { + {"default:steelblock", "luxury_decor:plastic_sheet", "luxury_decor:plastic_sheet"}, + {"luxury_decor:brass_ingot", "luxury_decor:plastic_sheet", ""}, + {"dye:dark_grey", "", ""} + } +}) + +minetest.register_craft({ + output = "luxury_decor:kitchen_tap_off", + recipe = { + {"luxury_decor:plastic_sheet", "luxury_decor:brass_ingot", ""}, + {"default:steel_ingot", "", ""}, + {"", "", ""} + } +}) + +minetest.register_craft({ + output = "luxury_decor:cooker", + recipe = { + {"default:steel_ingot", "luxury_decor:plastic_sheet", "xpanes:pane_flat"}, + {"default:steel_ingot", "luxury_decor:plastic_sheet", ""}, + {"default:steel_ingot", "luxury_decor:brass_stick", ""} + } +}) diff --git a/lighting.lua b/lighting.lua index 71cd175..28abf79 100644 --- a/lighting.lua +++ b/lighting.lua @@ -160,3 +160,30 @@ minetest.register_node("luxury_decor:wall_glass_lamp_on", { minetest.set_node(pos, {name="luxury_decor:wall_glass_lamp_off", param2 = node.param2}) end }) + +minetest.register_craft({ + output = "luxury_decor:iron_chandelier", + recipe = { + {"luxury_decor:brass_ingot", "luxury_decor:brass_ingot", "luxury_decor:brass_ingot"}, + {"luxury_decor:brass_ingot", "luxury_decor:brass_ingot", "dye:grey"}, + {"luxury_decor:wax_lump", "luxury_decor:wax_lump", ""} + } +}) + +minetest.register_craft({ + output = "luxury_decor:luxury_desk_lamp_off", + recipe = { + {"luxury_decor:jungle_wooden_plank", "wool:white", ""}, + {"luxury_decor:jungle_wooden_plank", "luxury_decor:incandescent_bulb", ""}, + {"luxury_decor:jungle_wooden_plank", "luxury_decor:brass_ingot", ""} + } +}) + +minetest.register_craft({ + output = "luxury_decor:wall_glass_lamp_off", + recipe = { + {"default:glass", "default:glass", ""}, + {"luxury_decor:brass_ingot", "dye:orange", ""}, + {"luxury_decor:incandescent_bulb", "", ""} + } +}) diff --git a/living_room.lua b/living_room.lua index 1ef4cc8..384787a 100644 --- a/living_room.lua +++ b/living_room.lua @@ -547,6 +547,15 @@ for color, rgb_color in pairs(sofas_rgb_colors) do return itemstack end }) + + minetest.register_craft({ + output = "luxury_decor:simple_"..color.."_armchair_with_"..pillow_color.."_pillow", + recipe = { + {"luxury_decor:wooden_board", "wool:white", "dye:"..color}, + {"luxury_decor:wooden_board", "wool:white", "dye:"..pillow_color}, + {"default:stick", "", ""} + } + }) end end @@ -801,6 +810,17 @@ for ind, sofa_count in pairs({"1", "2", "3", "4", "5"}) do end end }) + + if sofa_count == "1" then + minetest.register_craft({ + output = "luxury_decor:simple_"..sofa_count.."_"..color.."_sofa", + recipe = { + {"luxury_decor:wooden_board", "luxury_decor:wooden_board", "wool:white"}, + {"luxury_decor:wooden_board", "dye:"..color, "dye:grey"}, + {"default:stick", "luxury_decor:brass_stick", ""} + } + }) + end end end @@ -879,6 +899,36 @@ for ind, footstool_type in pairs({"small", "middle", "long"}) do end }) + + if footstool_type == "small" then + minetest.register_craft({ + output = "luxury_decor:simple_"..color.."_"..footstool_type.."_footstool", + recipe = { + {"luxury_decor:wooden_board", "wool:white", "dye:"..color}, + {"", "", ""}, + {"", "", ""} + } + }) + elseif footstool_type == "middle" then + minetest.register_craft({ + output = "luxury_decor:simple_"..color.."_"..footstool_type.."_footstool", + recipe = { + {"luxury_decor:wooden_board", "wool:white", "dye:"..color}, + {"luxury_decor:wooden_plank", "farming:string", "farming:string"}, + {"", "", ""} + } + }) + + elseif footstool_type == "long" then + minetest.register_craft({ + output = "luxury_decor:simple_"..color.."_"..footstool_type.."_footstool", + recipe = { + {"luxury_decor:wooden_board", "wool:white", "dye:"..color}, + {"luxury_decor:wooden_board", "wool:white", "dye:"..color}, + {"luxury_decor:wooden_plank", "", ""} + } + }) + end end end @@ -914,8 +964,15 @@ minetest.register_node("luxury_decor:simple_wooden_wall_clock", { }, sounds = default.node_sound_wood_defaults() }) - - + +minetest.register_craft({ + output = "luxury_decor:simple_wooden_wall_clock", + recipe = { + {"luxury_decor:jungle_wooden_board", "luxury_decor:jungle_wooden_board", ""}, + {"luxury_decor:jungle_wooden_plank", "luxury_decor:brass_stick", "luxury_decor:dial"}, + {"default:copper_ingot", "default:steel_ingot", ""} + } +}) diff --git a/materials.lua b/materials.lua index c6cd3c9..9ab7c61 100644 --- a/materials.lua +++ b/materials.lua @@ -34,6 +34,115 @@ minetest.register_craft({ } }) +minetest.register_craftitem("luxury_decor:bucket_oil", { + description = "Bucket Oil", + inventory_image = "bucket_oil.png", + stack_max = 99 +}) + +minetest.register_node("luxury_decor:oil_source", { + description = "Oil Source", + drawtype = "liquid", + tiles = {"oil_source.png"}, + alpha = 160, + paramtype = "light", + walkable = false, + pointable = false, + diggable = false, + buildable_to = true, + is_ground_content = false, + drop = "", + drowning = 1, + liquidtype = "source", + liquid_alternative_flowing = "luxury_decor:oil_flowing", + liquid_alternative_source = "luxury_decor:oil_source", + liquid_viscosity = 5, + liquid_range = 5, + damage_per_second = 1, + post_effect_color = {a = 103, r = 30, g = 60, b = 90}, + groups = {water = 3, liquid = 3, cools_lava = 1}, + on_rightclick = function (pos, node, player, itemstack, pointed_thing) + if itemstack:get_name() == "bucket:bucket_empty" then + minetest.remove_node(pos) + itemstack:take_item() + local stack = ItemStack("luxury_decor:bucket_oil") + local inv = player:get_inventory() + inv:set_stack("main", 1, stack) + stack:add_item("luxury_decor:bucket_oil") + return itemstack + end + end +}) + +minetest.register_node("luxury_decor:oil_flowing", { + description = "Flowing Oil", + drawtype = "flowingliquid", + tiles = {"oil_source.png"}, + special_tiles = { + { + name = "oil_source_animated.png", + backface_culling = false, + animation = { + type = "vertical_frames", + aspect_w = 16, + aspect_h = 16, + length = 5, + }, + }, + { + name = "oil_source_animated.png", + backface_culling = true, + animation = { + type = "vertical_frames", + aspect_w = 16, + aspect_h = 16, + length = 5, + }, + }, + }, + alpha = 160, + paramtype = "light", + paramtype2 = "flowingliquid", + walkable = false, + pointable = false, + diggable = false, + buildable_to = true, + is_ground_content = false, + drop = "", + drowning = 1, + liquidtype = "flowing", + liquid_alternative_flowing = "luxury_decor:oil_flowing", + liquid_alternative_source = "luxury_decor:oil_source", + liquid_viscosity = 5, + post_effect_color = {a = 103, r = 30, g = 60, b = 90}, + groups = {water = 3, liquid = 3, not_in_creative_inventory = 1, + cools_lava = 1}, + on_rightclick = function (pos, node, player, itemstack, pointed_thing) + if itemstack:get_name() == "bucket:bucket_empty" then + minetest.remove_node(pos) + itemstack:take_item() + local stack = ItemStack("luxury_decor:bucket_oil") + local inv = player:get_inventory() + inv:set_stack("main", 1, stack) + stack:add_item("luxury_decor:bucket_oil") + return itemstack + end + end +}) + + +minetest.register_craftitem("luxury_decor:paraffin_cake", { + description = "Paraffin Cake", + inventory_image = "paraffin.png", + stack_max = 99 +}) + +minetest.register_craftitem("luxury_decor:wax_lump", { + description = "Wax Lump", + inventory_image = "wax_lump.png", + stack_max = 99 +}) + minetest.register_craftitem("luxury_decor:brass_ingot", { description = "Brass Ingot", inventory_image = "brass_ingot.png", @@ -81,6 +190,49 @@ minetest.register_craftitem("luxury_decor:pine_wooden_board", { inventory_image = "pine_board.png", stack_max = 99 }) + +minetest.register_craftitem("luxury_decor:plastic_sheet", { + description = "Plastic Sheet", + inventory_image = "plastic_sheet.png", + stack_max = 99 +}) + +minetest.register_craftitem("luxury_decor:incandescent_bulb", { + description = "Incandescent Bulb", + inventory_image = "incandescent_bulb.png", + stack_max = 99 +}) + +minetest.register_craftitem("luxury_decor:wolfram_lump", { + description = "Wolfram Lump", + inventory_image = "wolfram_lump.png", + stack_max = 99 +}) + +minetest.register_craftitem("luxury_decor:wolfram_ingot", { + description = "Wolfram Ingot", + inventory_image = "wolfram_ingot.png", + stack_max = 99 +}) + +minetest.register_craftitem("luxury_decor:wolfram_wire_reel", { + description = "Wolfram Wire Reel", + inventory_image = "wolfram_wire_reel.png", + stack_max = 99 +}) + +minetest.register_craftitem("luxury_decor:dial", { + description = "Dial", + inventory_image = "dial.png", + stack_max = 99 +}) + +minetest.register_craftitem("luxury_decor:siphon", { + description = "Siphon", + inventory_image = "siphon.png", + stack_max = 99 +}) + minetest.register_node("luxury_decor:zinc_ore", { description = "Zinc Ore", tiles = {"default_stone.png^mineral_zinc.png"}, @@ -99,6 +251,24 @@ minetest.register_node("luxury_decor:zinc_ore", { end }) +minetest.register_node("luxury_decor:wolfram_ore", { + description = "Wolfram Ore", + tiles = {"default_stone.png^mineral_wolfram.png"}, + is_ground_content = true, + paramtype = "light", + light_source = 2, + groups = {cracky=3.5, oddly_breakable_by_hand=1}, + sounds = default.node_sound_defaults(), + after_dig_node = function(pos, node, player) + local random_items_amount_to_give = math.random(4) + + local stack = ItemStack("luxury_decor:wolfram_lump") + for give_item = 1, random_items_amount_to_give do + stack:add_item("luxury_decor:wolfram_lump") + end + end +}) + minetest.register_ore({ ore_type = "scatter", ore = "luxury_decor:zinc_ore", @@ -110,6 +280,71 @@ minetest.register_ore({ height_max = -125 }) +minetest.register_ore({ + ore_type = "scatter", + ore = "luxury_decor:wolfram_ore", + wherein = "default:stone", + clust_scarcity = 200, + clust_num_ores = 4, + clust_size = 2, + height_min = -31000, + height_max = -150 +}) + +minetest.register_ore({ + ore_type = "scatter", + ore = "luxury_decor:oil_source", + wherein = "default:stone", + clust_scarcity = 400, + clust_num_ores = 3, + clust_size = 1, + height_min = -31000, + height_max = -25 +}) + +minetest.register_craft({ + type = "cooking", + output = "luxury_decor:paraffin_cake 2", + recipe = "bucket:bucket_oil", + cooktime = 15--[[, + replacements = {"bucket:bucket_empty"}]] +}) + +minetest.register_craft({ + type = "cooking", + output = "luxury_decor:wax_lump", + recipe = "bucket:paraffin_cake", + cooktime = 8 +}) + +minetest.register_craft({ + type = "cooking", + output = "luxury_decor:plastic_sheet", + recipe = "default:leaves" +}) + +minetest.register_craft({ + output = "luxury_decor:incandescent_bulb 3", + recipe = { + {"luxury_decor:plastic_sheet", "luxury_decor:wolfram_wire_reel", ""}, + {"luxury_decor:plastic_sheet", "default:steel_ingot", ""}, + {"", "", ""} + } +}) + +minetest.register_craft({ + type = "cooking", + output = "luxury_decor:wolfram_ingot", + recipe = "luxury_decor:wolfram_lump", + cooktime = 18 +}) + +minetest.register_craft({ + type = "shapeless", + output = "luxury_decor:wolfram_wire_reel", + recipe = {"luxury_decor:wolfram_ingot"} +}) + minetest.register_craft({ type = "shapeless", output = "luxury_decor:brass_stick 3", @@ -177,3 +412,21 @@ minetest.register_craft({ {"", "luxury_decor:saw"} } }) + +minetest.register_craft({ + output = "luxury_decor:siphon", + recipe = { + {"luxury_decor:plastic_sheet", "luxury_decor:plastic_sheet", ""}, + {"default:copper_ingot", "", ""}, + {"", "", ""} + } +}) + +minetest.register_craft({ + output = "luxury_decor:dial 2", + recipe = { + {"luxury_decor:plastic_sheet", "dye:black", ""}, + {"luxury_decor:brass_stick", "", ""}, + {"dye:yellow", "", ""} + } +}) diff --git a/models/blend.tar.gz b/models/blend.tar.gz new file mode 100644 index 0000000..58407dc Binary files /dev/null and b/models/blend.tar.gz differ diff --git a/models/cooker.blend b/models/cooker.blend deleted file mode 100644 index 0727fd1..0000000 Binary files a/models/cooker.blend and /dev/null differ diff --git a/models/cooker_opened.blend b/models/cooker_opened.blend deleted file mode 100644 index 52aa6c6..0000000 Binary files a/models/cooker_opened.blend and /dev/null differ diff --git a/models/decorative_wooden_chair.blend b/models/decorative_wooden_chair.blend deleted file mode 100644 index e326235..0000000 Binary files a/models/decorative_wooden_chair.blend and /dev/null differ diff --git a/models/fridge_closed.blend b/models/fridge_closed.blend deleted file mode 100644 index 43075b0..0000000 Binary files a/models/fridge_closed.blend and /dev/null differ diff --git a/models/fridge_opened.blend b/models/fridge_opened.blend deleted file mode 100644 index 49629e2..0000000 Binary files a/models/fridge_opened.blend and /dev/null differ diff --git a/models/glass_vase.blend b/models/glass_vase.blend deleted file mode 100644 index ff406c1..0000000 Binary files a/models/glass_vase.blend and /dev/null differ diff --git a/models/glass_vase1.blend b/models/glass_vase1.blend deleted file mode 100644 index 72c796f..0000000 Binary files a/models/glass_vase1.blend and /dev/null differ diff --git a/models/glass_vase1.blend1 b/models/glass_vase1.blend1 deleted file mode 100644 index e52a088..0000000 Binary files a/models/glass_vase1.blend1 and /dev/null differ diff --git a/models/grand_piano.blend b/models/grand_piano.blend deleted file mode 100644 index 3cc758c..0000000 Binary files a/models/grand_piano.blend and /dev/null differ diff --git a/models/grand_piano.blend1 b/models/grand_piano.blend1 deleted file mode 100644 index a3ce9cc..0000000 Binary files a/models/grand_piano.blend1 and /dev/null differ diff --git a/models/grand_piano_opened.blend b/models/grand_piano_opened.blend deleted file mode 100644 index 36637ca..0000000 Binary files a/models/grand_piano_opened.blend and /dev/null differ diff --git a/models/grand_piano_opened.blend1 b/models/grand_piano_opened.blend1 deleted file mode 100644 index 1a9790a..0000000 Binary files a/models/grand_piano_opened.blend1 and /dev/null differ diff --git a/models/iron_chandelier.blend b/models/iron_chandelier.blend deleted file mode 100644 index 9de5deb..0000000 Binary files a/models/iron_chandelier.blend and /dev/null differ diff --git a/models/kitchen_table1.blend b/models/kitchen_table1.blend deleted file mode 100644 index 0361f3f..0000000 Binary files a/models/kitchen_table1.blend and /dev/null differ diff --git a/models/kitchen_table2.blend b/models/kitchen_table2.blend deleted file mode 100644 index a0a9c0b..0000000 Binary files a/models/kitchen_table2.blend and /dev/null differ diff --git a/models/kitchen_table3.blend b/models/kitchen_table3.blend deleted file mode 100644 index 32e985e..0000000 Binary files a/models/kitchen_table3.blend and /dev/null differ diff --git a/models/kitchen_table4.blend b/models/kitchen_table4.blend deleted file mode 100644 index 5f2c352..0000000 Binary files a/models/kitchen_table4.blend and /dev/null differ diff --git a/models/kitchen_table5.blend b/models/kitchen_table5.blend deleted file mode 100644 index 8bc7fb7..0000000 Binary files a/models/kitchen_table5.blend and /dev/null differ diff --git a/models/kitchen_tap_off.blend b/models/kitchen_tap_off.blend deleted file mode 100644 index 3f0680a..0000000 Binary files a/models/kitchen_tap_off.blend and /dev/null differ diff --git a/models/kitchen_tap_on.blend b/models/kitchen_tap_on.blend deleted file mode 100644 index 6bb90c9..0000000 Binary files a/models/kitchen_tap_on.blend and /dev/null differ diff --git a/models/kitchen_three_boxes_wooden_cabinet_1.blend b/models/kitchen_three_boxes_wooden_cabinet_1.blend deleted file mode 100644 index 48a68db..0000000 Binary files a/models/kitchen_three_boxes_wooden_cabinet_1.blend and /dev/null differ diff --git a/models/kitchen_three_boxes_wooden_cabinet_1.blend1 b/models/kitchen_three_boxes_wooden_cabinet_1.blend1 deleted file mode 100644 index bd2747c..0000000 Binary files a/models/kitchen_three_boxes_wooden_cabinet_1.blend1 and /dev/null differ diff --git a/models/kitchen_wardrobe.blend b/models/kitchen_wardrobe.blend deleted file mode 100644 index 1104f87..0000000 Binary files a/models/kitchen_wardrobe.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet.blend b/models/kitchen_wooden_cabinet.blend deleted file mode 100644 index f5da205..0000000 Binary files a/models/kitchen_wooden_cabinet.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet2.blend b/models/kitchen_wooden_cabinet2.blend deleted file mode 100644 index 797da62..0000000 Binary files a/models/kitchen_wooden_cabinet2.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet3.blend b/models/kitchen_wooden_cabinet3.blend deleted file mode 100644 index cf5c91f..0000000 Binary files a/models/kitchen_wooden_cabinet3.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet4.blend b/models/kitchen_wooden_cabinet4.blend deleted file mode 100644 index c88478f..0000000 Binary files a/models/kitchen_wooden_cabinet4.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_1.blend b/models/kitchen_wooden_cabinet_1.blend deleted file mode 100644 index 5445fa8..0000000 Binary files a/models/kitchen_wooden_cabinet_1.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_2.blend b/models/kitchen_wooden_cabinet_2.blend deleted file mode 100644 index aad03ed..0000000 Binary files a/models/kitchen_wooden_cabinet_2.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_3.blend b/models/kitchen_wooden_cabinet_3.blend deleted file mode 100644 index 34fd5dd..0000000 Binary files a/models/kitchen_wooden_cabinet_3.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_4.blend b/models/kitchen_wooden_cabinet_4.blend deleted file mode 100644 index 5888960..0000000 Binary files a/models/kitchen_wooden_cabinet_4.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_box.blend b/models/kitchen_wooden_cabinet_box.blend deleted file mode 100644 index ed5db92..0000000 Binary files a/models/kitchen_wooden_cabinet_box.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_box2.blend b/models/kitchen_wooden_cabinet_box2.blend deleted file mode 100644 index 262c6da..0000000 Binary files a/models/kitchen_wooden_cabinet_box2.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_box2.blend1 b/models/kitchen_wooden_cabinet_box2.blend1 deleted file mode 100644 index f43d36c..0000000 Binary files a/models/kitchen_wooden_cabinet_box2.blend1 and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_door.blend b/models/kitchen_wooden_cabinet_door.blend deleted file mode 100644 index bf8731b..0000000 Binary files a/models/kitchen_wooden_cabinet_door.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_with_door_1.blend b/models/kitchen_wooden_cabinet_with_door_1.blend deleted file mode 100644 index 4af9587..0000000 Binary files a/models/kitchen_wooden_cabinet_with_door_1.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_with_door_2.blend b/models/kitchen_wooden_cabinet_with_door_2.blend deleted file mode 100644 index 9fef616..0000000 Binary files a/models/kitchen_wooden_cabinet_with_door_2.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_with_door_and_drawer_1.blend b/models/kitchen_wooden_cabinet_with_door_and_drawer_1.blend deleted file mode 100644 index ddf6ebe..0000000 Binary files a/models/kitchen_wooden_cabinet_with_door_and_drawer_1.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_with_door_and_drawer_2.blend b/models/kitchen_wooden_cabinet_with_door_and_drawer_2.blend deleted file mode 100644 index d374f0e..0000000 Binary files a/models/kitchen_wooden_cabinet_with_door_and_drawer_2.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_with_door_and_drawer_3.blend b/models/kitchen_wooden_cabinet_with_door_and_drawer_3.blend deleted file mode 100644 index 4ca1ee6..0000000 Binary files a/models/kitchen_wooden_cabinet_with_door_and_drawer_3.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_with_door_and_drawer_4.blend b/models/kitchen_wooden_cabinet_with_door_and_drawer_4.blend deleted file mode 100644 index d791fd0..0000000 Binary files a/models/kitchen_wooden_cabinet_with_door_and_drawer_4.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_with_sink_1.blend b/models/kitchen_wooden_cabinet_with_sink_1.blend deleted file mode 100644 index f6d16e5..0000000 Binary files a/models/kitchen_wooden_cabinet_with_sink_1.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_with_sink_2.blend b/models/kitchen_wooden_cabinet_with_sink_2.blend deleted file mode 100644 index 31cdd0f..0000000 Binary files a/models/kitchen_wooden_cabinet_with_sink_2.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_with_two_doors_1.blend b/models/kitchen_wooden_cabinet_with_two_doors_1.blend deleted file mode 100644 index 8894e6a..0000000 Binary files a/models/kitchen_wooden_cabinet_with_two_doors_1.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_with_two_doors_2.blend b/models/kitchen_wooden_cabinet_with_two_doors_2.blend deleted file mode 100644 index d002a0d..0000000 Binary files a/models/kitchen_wooden_cabinet_with_two_doors_2.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_with_two_doors_and_drawer_1.blend b/models/kitchen_wooden_cabinet_with_two_doors_and_drawer_1.blend deleted file mode 100644 index 25f93f3..0000000 Binary files a/models/kitchen_wooden_cabinet_with_two_doors_and_drawer_1.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_with_two_doors_and_drawer_2.blend b/models/kitchen_wooden_cabinet_with_two_doors_and_drawer_2.blend deleted file mode 100644 index 05878f9..0000000 Binary files a/models/kitchen_wooden_cabinet_with_two_doors_and_drawer_2.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_with_two_doors_and_drawer_3.blend b/models/kitchen_wooden_cabinet_with_two_doors_and_drawer_3.blend deleted file mode 100644 index 3782a71..0000000 Binary files a/models/kitchen_wooden_cabinet_with_two_doors_and_drawer_3.blend and /dev/null differ diff --git a/models/kitchen_wooden_cabinet_with_two_doors_and_drawer_4.blend b/models/kitchen_wooden_cabinet_with_two_doors_and_drawer_4.blend deleted file mode 100644 index 97a741c..0000000 Binary files a/models/kitchen_wooden_cabinet_with_two_doors_and_drawer_4.blend and /dev/null differ diff --git a/models/kitchen_wooden_chair.blend b/models/kitchen_wooden_chair.blend deleted file mode 100644 index 3a94b53..0000000 Binary files a/models/kitchen_wooden_chair.blend and /dev/null differ diff --git a/models/kitchen_wooden_cuisine.blend b/models/kitchen_wooden_cuisine.blend deleted file mode 100644 index ff209a7..0000000 Binary files a/models/kitchen_wooden_cuisine.blend and /dev/null differ diff --git a/models/kitchen_wooden_half_cabinet_1.blend b/models/kitchen_wooden_half_cabinet_1.blend deleted file mode 100644 index 8e2131f..0000000 Binary files a/models/kitchen_wooden_half_cabinet_1.blend and /dev/null differ diff --git a/models/kitchen_wooden_half_cabinet_2.blend b/models/kitchen_wooden_half_cabinet_2.blend deleted file mode 100644 index 06c6525..0000000 Binary files a/models/kitchen_wooden_half_cabinet_2.blend and /dev/null differ diff --git a/models/kitchen_wooden_table.blend b/models/kitchen_wooden_table.blend deleted file mode 100644 index adf0391..0000000 Binary files a/models/kitchen_wooden_table.blend and /dev/null differ diff --git a/models/kitchen_wooden_threedrawer_cabinet_1.blend b/models/kitchen_wooden_threedrawer_cabinet_1.blend deleted file mode 100644 index b321e0a..0000000 Binary files a/models/kitchen_wooden_threedrawer_cabinet_1.blend and /dev/null differ diff --git a/models/kitchen_wooden_threedrawer_cabinet_2.blend b/models/kitchen_wooden_threedrawer_cabinet_2.blend deleted file mode 100644 index e63e8a7..0000000 Binary files a/models/kitchen_wooden_threedrawer_cabinet_2.blend and /dev/null differ diff --git a/models/kitchen_wooden_threedrawer_cabinet_3.blend b/models/kitchen_wooden_threedrawer_cabinet_3.blend deleted file mode 100644 index d5698a6..0000000 Binary files a/models/kitchen_wooden_threedrawer_cabinet_3.blend and /dev/null differ diff --git a/models/kitchen_wooden_threedrawer_cabinet_4.blend b/models/kitchen_wooden_threedrawer_cabinet_4.blend deleted file mode 100644 index b2d760e..0000000 Binary files a/models/kitchen_wooden_threedrawer_cabinet_4.blend and /dev/null differ diff --git a/models/kitchen_wooden_threedrawer_cabinet_5.blend b/models/kitchen_wooden_threedrawer_cabinet_5.blend deleted file mode 100644 index 54a0cda..0000000 Binary files a/models/kitchen_wooden_threedrawer_cabinet_5.blend and /dev/null differ diff --git a/models/kitchen_wooden_threedrawer_cabinet_6.blend b/models/kitchen_wooden_threedrawer_cabinet_6.blend deleted file mode 100644 index bdd052f..0000000 Binary files a/models/kitchen_wooden_threedrawer_cabinet_6.blend and /dev/null differ diff --git a/models/kitchen_wooden_threedrawer_cabinet_7.blend b/models/kitchen_wooden_threedrawer_cabinet_7.blend deleted file mode 100644 index 61f27ab..0000000 Binary files a/models/kitchen_wooden_threedrawer_cabinet_7.blend and /dev/null differ diff --git a/models/kitchen_wooden_threedrawer_cabinet_8.blend b/models/kitchen_wooden_threedrawer_cabinet_8.blend deleted file mode 100644 index 774e1cf..0000000 Binary files a/models/kitchen_wooden_threedrawer_cabinet_8.blend and /dev/null differ diff --git a/models/luxury_desk_lamp.blend b/models/luxury_desk_lamp.blend deleted file mode 100644 index 8645c4b..0000000 Binary files a/models/luxury_desk_lamp.blend and /dev/null differ diff --git a/models/luxury_double_bed.blend b/models/luxury_double_bed.blend deleted file mode 100644 index 05776e1..0000000 Binary files a/models/luxury_double_bed.blend and /dev/null differ diff --git a/models/luxury_double_bed.blend11 b/models/luxury_double_bed.blend11 deleted file mode 100644 index aa7ddc6..0000000 Binary files a/models/luxury_double_bed.blend11 and /dev/null differ diff --git a/models/luxury_double_bed.blend111 b/models/luxury_double_bed.blend111 deleted file mode 100644 index 33716df..0000000 Binary files a/models/luxury_double_bed.blend111 and /dev/null differ diff --git a/models/luxury_double_bed.blend1111 b/models/luxury_double_bed.blend1111 deleted file mode 100644 index 817edc7..0000000 Binary files a/models/luxury_double_bed.blend1111 and /dev/null differ diff --git a/models/luxury_flowerpot.blend b/models/luxury_flowerpot.blend deleted file mode 100644 index e0b7567..0000000 Binary files a/models/luxury_flowerpot.blend and /dev/null differ diff --git a/models/luxury_metallic_table.blend b/models/luxury_metallic_table.blend deleted file mode 100644 index 39d76aa..0000000 Binary files a/models/luxury_metallic_table.blend and /dev/null differ diff --git a/models/luxury_wall_clock.blend b/models/luxury_wall_clock.blend deleted file mode 100644 index 42399e8..0000000 Binary files a/models/luxury_wall_clock.blend and /dev/null differ diff --git a/models/luxury_wooden_chair_with_cushion.blend b/models/luxury_wooden_chair_with_cushion.blend deleted file mode 100644 index 254323a..0000000 Binary files a/models/luxury_wooden_chair_with_cushion.blend and /dev/null differ diff --git a/models/round_wooden_chair.blend b/models/round_wooden_chair.blend deleted file mode 100644 index bdc90f4..0000000 Binary files a/models/round_wooden_chair.blend and /dev/null differ diff --git a/models/royal_double_bed.blend b/models/royal_double_bed.blend deleted file mode 100644 index da7fde9..0000000 Binary files a/models/royal_double_bed.blend and /dev/null differ diff --git a/models/royal_single_bed.blend b/models/royal_single_bed.blend deleted file mode 100644 index 1b00d2c..0000000 Binary files a/models/royal_single_bed.blend and /dev/null differ diff --git a/models/simple_armchair.blend b/models/simple_armchair.blend deleted file mode 100644 index 1cacb7d..0000000 Binary files a/models/simple_armchair.blend and /dev/null differ diff --git a/models/simple_corner_1_sofa.blend b/models/simple_corner_1_sofa.blend deleted file mode 100644 index fed159c..0000000 Binary files a/models/simple_corner_1_sofa.blend and /dev/null differ diff --git a/models/simple_corner_1_sofa.blend1 b/models/simple_corner_1_sofa.blend1 deleted file mode 100644 index 743b69a..0000000 Binary files a/models/simple_corner_1_sofa.blend1 and /dev/null differ diff --git a/models/simple_corner_2_sofa.blend b/models/simple_corner_2_sofa.blend deleted file mode 100644 index 42611da..0000000 Binary files a/models/simple_corner_2_sofa.blend and /dev/null differ diff --git a/models/simple_corner_2_sofa.blend1 b/models/simple_corner_2_sofa.blend1 deleted file mode 100644 index 345eea4..0000000 Binary files a/models/simple_corner_2_sofa.blend1 and /dev/null differ diff --git a/models/simple_corner_sofa_1.blend1 b/models/simple_corner_sofa_1.blend1 deleted file mode 100644 index 98dc2cd..0000000 Binary files a/models/simple_corner_sofa_1.blend1 and /dev/null differ diff --git a/models/simple_corner_sofa_2.blend1 b/models/simple_corner_sofa_2.blend1 deleted file mode 100644 index 23658a0..0000000 Binary files a/models/simple_corner_sofa_2.blend1 and /dev/null differ diff --git a/models/simple_flowerpot.blend b/models/simple_flowerpot.blend deleted file mode 100644 index e216973..0000000 Binary files a/models/simple_flowerpot.blend and /dev/null differ diff --git a/models/simple_long_footstool.blend b/models/simple_long_footstool.blend deleted file mode 100644 index 5d3237d..0000000 Binary files a/models/simple_long_footstool.blend and /dev/null differ diff --git a/models/simple_long_sofa.blend b/models/simple_long_sofa.blend deleted file mode 100644 index 1f60eaa..0000000 Binary files a/models/simple_long_sofa.blend and /dev/null differ diff --git a/models/simple_long_sofa.blend1 b/models/simple_long_sofa.blend1 deleted file mode 100644 index 9d360e9..0000000 Binary files a/models/simple_long_sofa.blend1 and /dev/null differ diff --git a/models/simple_middle_footstool.blend b/models/simple_middle_footstool.blend deleted file mode 100644 index f844ee8..0000000 Binary files a/models/simple_middle_footstool.blend and /dev/null differ diff --git a/models/simple_middle_sofa.blend b/models/simple_middle_sofa.blend deleted file mode 100644 index 790a9bc..0000000 Binary files a/models/simple_middle_sofa.blend and /dev/null differ diff --git a/models/simple_middle_sofa.blend1 b/models/simple_middle_sofa.blend1 deleted file mode 100644 index 66b5480..0000000 Binary files a/models/simple_middle_sofa.blend1 and /dev/null differ diff --git a/models/simple_small_footstool.blend b/models/simple_small_footstool.blend deleted file mode 100644 index 3bc7a72..0000000 Binary files a/models/simple_small_footstool.blend and /dev/null differ diff --git a/models/simple_small_footstool1.blend b/models/simple_small_footstool1.blend deleted file mode 100644 index 3bc7a72..0000000 Binary files a/models/simple_small_footstool1.blend and /dev/null differ diff --git a/models/simple_small_sofa.blend1 b/models/simple_small_sofa.blend1 deleted file mode 100644 index 545a0d0..0000000 Binary files a/models/simple_small_sofa.blend1 and /dev/null differ diff --git a/models/simple_sofa_1.blend b/models/simple_sofa_1.blend deleted file mode 100644 index 275352d..0000000 Binary files a/models/simple_sofa_1.blend and /dev/null differ diff --git a/models/simple_sofa_1.mtl b/models/simple_sofa_1.mtl index cd0eef5..aee6be6 100644 --- a/models/simple_sofa_1.mtl +++ b/models/simple_sofa_1.mtl @@ -10,4 +10,4 @@ Ke 0.000000 0.000000 0.000000 Ni 1.000000 d 1.000000 illum 2 -map_Kd /home/andrey/opt/minetest/mods/luxury_decor/textures/simple_sofa.png +map_Kd /home/andrey/opt/minetest_5.0.0-rc2/mods/luxury_decor/textures/simple_sofa.png diff --git a/models/simple_sofa_2.blend b/models/simple_sofa_2.blend deleted file mode 100644 index 06a1869..0000000 Binary files a/models/simple_sofa_2.blend and /dev/null differ diff --git a/models/simple_sofa_2.mtl b/models/simple_sofa_2.mtl index 25ec4ac..a26b1df 100644 --- a/models/simple_sofa_2.mtl +++ b/models/simple_sofa_2.mtl @@ -10,4 +10,4 @@ Ke 0.000000 0.000000 0.000000 Ni 1.000000 d 1.000000 illum 2 -map_Kd /home/andrey/opt/minetest/mods/luxury_decor/textures/simple_sofa.png +map_Kd /home/andrey/opt/minetest_5.0.0-rc2/mods/luxury_decor/textures/simple_sofa.png diff --git a/models/simple_sofa_3.blend b/models/simple_sofa_3.blend deleted file mode 100644 index 385420b..0000000 Binary files a/models/simple_sofa_3.blend and /dev/null differ diff --git a/models/simple_sofa_3.mtl b/models/simple_sofa_3.mtl index 8ebddfc..156361a 100644 --- a/models/simple_sofa_3.mtl +++ b/models/simple_sofa_3.mtl @@ -10,4 +10,4 @@ Ke 0.000000 0.000000 0.000000 Ni 1.000000 d 1.000000 illum 2 -map_Kd /home/andrey/opt/minetest/mods/luxury_decor/textures/simple_sofa.png +map_Kd /home/andrey/opt/minetest_5.0.0-rc2/mods/luxury_decor/textures/simple_sofa.png diff --git a/models/simple_sofa_4.blend b/models/simple_sofa_4.blend deleted file mode 100644 index 9860ea4..0000000 Binary files a/models/simple_sofa_4.blend and /dev/null differ diff --git a/models/simple_sofa_4.mtl b/models/simple_sofa_4.mtl index f1117e2..665682f 100644 --- a/models/simple_sofa_4.mtl +++ b/models/simple_sofa_4.mtl @@ -10,4 +10,4 @@ Ke 0.000000 0.000000 0.000000 Ni 1.000000 d 1.000000 illum 2 -map_Kd /home/andrey/opt/minetest/mods/luxury_decor/textures/simple_sofa.png +map_Kd /home/andrey/opt/minetest_5.0.0-rc2/mods/luxury_decor/textures/simple_sofa.png diff --git a/models/simple_sofa_5.blend b/models/simple_sofa_5.blend deleted file mode 100644 index fadafa0..0000000 Binary files a/models/simple_sofa_5.blend and /dev/null differ diff --git a/models/simple_sofa_5.mtl b/models/simple_sofa_5.mtl index f5a5b9a..a16025a 100644 --- a/models/simple_sofa_5.mtl +++ b/models/simple_sofa_5.mtl @@ -10,4 +10,4 @@ Ke 0.000000 0.000000 0.000000 Ni 1.000000 d 1.000000 illum 2 -map_Kd /home/andrey/opt/minetest/mods/luxury_decor/textures/simple_sofa.png +map_Kd /home/andrey/opt/minetest_5.0.0-rc2/mods/luxury_decor/textures/simple_sofa.png diff --git a/models/simple_wooden_bedside_table_1.blend b/models/simple_wooden_bedside_table_1.blend deleted file mode 100644 index c0f4cfc..0000000 Binary files a/models/simple_wooden_bedside_table_1.blend and /dev/null differ diff --git a/models/simple_wooden_bedside_table_2.blend b/models/simple_wooden_bedside_table_2.blend deleted file mode 100644 index 8c1dc2d..0000000 Binary files a/models/simple_wooden_bedside_table_2.blend and /dev/null differ diff --git a/models/simple_wooden_bedside_table_3.blend b/models/simple_wooden_bedside_table_3.blend deleted file mode 100644 index 7243b90..0000000 Binary files a/models/simple_wooden_bedside_table_3.blend and /dev/null differ diff --git a/models/simple_wooden_bedside_table_4.blend b/models/simple_wooden_bedside_table_4.blend deleted file mode 100644 index 694a081..0000000 Binary files a/models/simple_wooden_bedside_table_4.blend and /dev/null differ diff --git a/models/simple_wooden_bedside_table_5.blend b/models/simple_wooden_bedside_table_5.blend deleted file mode 100644 index 5ba4e6b..0000000 Binary files a/models/simple_wooden_bedside_table_5.blend and /dev/null differ diff --git a/models/simple_wooden_bedside_table_6.blend b/models/simple_wooden_bedside_table_6.blend deleted file mode 100644 index 23c59c9..0000000 Binary files a/models/simple_wooden_bedside_table_6.blend and /dev/null differ diff --git a/models/simple_wooden_bedside_table_7.blend b/models/simple_wooden_bedside_table_7.blend deleted file mode 100644 index 62fb250..0000000 Binary files a/models/simple_wooden_bedside_table_7.blend and /dev/null differ diff --git a/models/simple_wooden_bedside_table_8.blend b/models/simple_wooden_bedside_table_8.blend deleted file mode 100644 index ccd0894..0000000 Binary files a/models/simple_wooden_bedside_table_8.blend and /dev/null differ diff --git a/models/simple_wooden_table.blend b/models/simple_wooden_table.blend deleted file mode 100644 index 6f98288..0000000 Binary files a/models/simple_wooden_table.blend and /dev/null differ diff --git a/models/simple_wooden_table.blend1 b/models/simple_wooden_table.blend1 deleted file mode 100644 index 0f9a458..0000000 Binary files a/models/simple_wooden_table.blend1 and /dev/null differ diff --git a/models/simple_wooden_wall_clock.blend b/models/simple_wooden_wall_clock.blend deleted file mode 100644 index 71dbc6f..0000000 Binary files a/models/simple_wooden_wall_clock.blend and /dev/null differ diff --git a/models/wall_glass_lamp.b3d b/models/wall_glass_lamp.b3d index 7dd79b5..212a96b 100644 Binary files a/models/wall_glass_lamp.b3d and b/models/wall_glass_lamp.b3d differ diff --git a/models/wall_glass_lamp.blend b/models/wall_glass_lamp.blend deleted file mode 100644 index a86f741..0000000 Binary files a/models/wall_glass_lamp.blend and /dev/null differ diff --git a/models/wall_wooden_shelf.blend b/models/wall_wooden_shelf.blend deleted file mode 100644 index 3b78c10..0000000 Binary files a/models/wall_wooden_shelf.blend and /dev/null differ diff --git a/models/wall_wooden_shelf.blend1 b/models/wall_wooden_shelf.blend1 deleted file mode 100644 index 9bbf287..0000000 Binary files a/models/wall_wooden_shelf.blend1 and /dev/null differ diff --git a/music.lua b/music.lua index 0685b83..610b16b 100644 --- a/music.lua +++ b/music.lua @@ -39,6 +39,7 @@ minetest.register_node("luxury_decor:grand_piano_opened", { paramtype = "light", paramtype2 = "facedir", groups = {choppy = 3, not_in_creative_inventory=1}, + drop = "luxury_decor:grand_piano", drawtype = "mesh", collision_box = { type = "fixed", @@ -60,3 +61,12 @@ minetest.register_node("luxury_decor:grand_piano_opened", { minetest.set_node(pos, {name="luxury_decor:grand_piano", param1=node.param1, param2=node.param2}) end }) + +minetest.register_craft({ + output = "luxury_decor:grand_piano", + recipe = { + {"luxury_decor:plastic_sheet", "luxury_decor:brass_stick", "dye:black"}, + {"luxury_decor:plastic_sheet", "luxury_decor:plastic_sheet", "dye:black"}, + {"luxury_decor:plastic_sheet", "luxury_decor:wolfram_ingot", "default:steel_ingot"} + } +}) diff --git a/redecorating.lua b/redecorating.lua index 91337a0..9e214bc 100644 --- a/redecorating.lua +++ b/redecorating.lua @@ -81,3 +81,20 @@ minetest.register_node("luxury_decor:luxury_flowerpot", { sounds = default.node_sound_wood_defaults() }) +minetest.register_craft({ + output = "luxury_decor:simple_flowerpot", + recipe = { + {"default:clay_lump", "default:clay_lump", "dye:brown"}, + {"default:clay_lump", "default:dirt", ""}, + {"default:clay_lump", "", ""} + } +}) + +minetest.register_craft({ + output = "luxury_decor:luxury_flowerpot", + recipe = { + {"default:clay_lump", "default:clay_lump", "dye:red"}, + {"default:clay_lump", "default:dirt", "default:copper_ingot"}, + {"default:clay_lump", "", ""} + } +}) diff --git a/shelves.lua b/shelves.lua index 0811067..1c9dc63 100644 --- a/shelves.lua +++ b/shelves.lua @@ -1,4 +1,4 @@ -local wood_sorts = {"wooden", "jungle"} +local wood_sorts = {"", "jungle_"} for num, shelf_sort in ipairs({"bright", "dark"}) do minetest.register_node("luxury_decor:closed_"..shelf_sort.."_wooden_shelf", { description = "Closed ".. string.upper(string.sub(shelf_sort, 1, 1)) .. string.sub(shelf_sort, 2) .. " Wooden Shelf", @@ -77,8 +77,8 @@ for num, shelf_sort in ipairs({"bright", "dark"}) do minetest.register_craft({ output = "luxury_decor:closed_" .. shelf_sort .. "_wooden_shelf", recipe = { - {"luxury_decor:" .. wood_sorts[num] .. "_wooden_board", "luxury_decor:" .. wood_sorts[num] .. "_wooden_board", ""}, - {"luxury_decor:" .. wood_sorts[num] .. "_wooden_board", "luxury_decor:" .. wood_sorts[num] .. "_wooden_board", ""}, + {"luxury_decor:" .. wood_sorts[num] .. "wooden_board", "luxury_decor:" .. wood_sorts[num] .. "wooden_board", ""}, + {"luxury_decor:" .. wood_sorts[num] .. "wooden_board", "luxury_decor:" .. wood_sorts[num] .. "wooden_board", ""}, {"", "", ""} } }) @@ -86,17 +86,17 @@ for num, shelf_sort in ipairs({"bright", "dark"}) do minetest.register_craft({ output = "luxury_decor:closed_" .. shelf_sort .. "_wooden_shelf_with_back", recipe = { - {"luxury_decor:" .. wood_sorts[num] .. "_wooden_board", "luxury_decor:" .. wood_sorts[num] .. "_wooden_board", ""}, - {"luxury_decor:" .. wood_sorts[num] .. "_wooden_board", "luxury_decor:" .. wood_sorts[num] .. "_wooden_board", ""}, - {"luxury_decor:" .. wood_sorts[num] .. "_wooden_board", "", ""} + {"luxury_decor:" .. wood_sorts[num] .. "wooden_board", "luxury_decor:" .. wood_sorts[num] .. "wooden_board", ""}, + {"luxury_decor:" .. wood_sorts[num] .. "wooden_board", "luxury_decor:" .. wood_sorts[num] .. "wooden_board", ""}, + {"luxury_decor:" .. wood_sorts[num] .. "wooden_board", "", ""} } }) minetest.register_craft({ output = "luxury_decor:" .. shelf_sort .. "_wall_wooden_shelf", recipe = { - {"luxury_decor:" .. wood_sorts[num] .. "_wooden_plank", "luxury_decor:saw", ""}, - {"luxury_decor:" .. wood_sorts[num] .. "_wooden_plank", "", ""}, + {"luxury_decor:" .. wood_sorts[num] .. "wooden_plank", "luxury_decor:saw", ""}, + {"luxury_decor:" .. wood_sorts[num] .. "wooden_plank", "", ""}, {"", "", ""} }, replacements = { @@ -109,8 +109,8 @@ for num, shelf_sort in ipairs({"bright", "dark"}) do minetest.register_craft({ output = "luxury_decor:" .. shelf_sort .. "_wall_wooden_shelf 2", recipe = { - {"luxury_decor:" .. wood_sorts[num] .. "_wooden_board", "luxury_decor:saw", ""}, - {"luxury_decor:" .. wood_sorts[num] .. "_wooden_board", "", ""}, + {"luxury_decor:" .. wood_sorts[num] .. "wooden_board", "luxury_decor:saw", ""}, + {"luxury_decor:" .. wood_sorts[num] .. "wooden_board", "", ""}, {"", "", ""} }, replacements = { diff --git a/tables.lua b/tables.lua index 10676fe..be1dab0 100644 --- a/tables.lua +++ b/tables.lua @@ -192,7 +192,7 @@ minetest.register_craft({ output = "luxury_decor:luxury_metallic_table", recipe = { {"luxury_decor:jungle_wooden_plank", "luxury_decor:jungle_wooden_plank", "luxury_decor:jungle_wooden_plank"}, - {"default:copper_ingot", "", "default:copper_ingot"}, + {"luxury_decor:brass_stick", "", "luxury_decor:brass_stick"}, {"", "", ""} } }) diff --git a/textures/bucket_oil.png b/textures/bucket_oil.png new file mode 100755 index 0000000..7d9f7f2 Binary files /dev/null and b/textures/bucket_oil.png differ diff --git a/textures/dial.png b/textures/dial.png new file mode 100644 index 0000000..fc4d957 Binary files /dev/null and b/textures/dial.png differ diff --git a/textures/incandescent_bulb.png b/textures/incandescent_bulb.png new file mode 100644 index 0000000..bb3c46c Binary files /dev/null and b/textures/incandescent_bulb.png differ diff --git a/textures/mineral_wolfram.png b/textures/mineral_wolfram.png new file mode 100644 index 0000000..8a923fb Binary files /dev/null and b/textures/mineral_wolfram.png differ diff --git a/textures/oil_source.png b/textures/oil_source.png new file mode 100644 index 0000000..48b22a1 Binary files /dev/null and b/textures/oil_source.png differ diff --git a/textures/oil_source_animated.png b/textures/oil_source_animated.png new file mode 100644 index 0000000..b0e3766 Binary files /dev/null and b/textures/oil_source_animated.png differ diff --git a/textures/paraffin.png b/textures/paraffin.png new file mode 100644 index 0000000..8d3439d Binary files /dev/null and b/textures/paraffin.png differ diff --git a/textures/plastic_sheet.png b/textures/plastic_sheet.png new file mode 100644 index 0000000..1dcf519 Binary files /dev/null and b/textures/plastic_sheet.png differ diff --git a/textures/siphon.png b/textures/siphon.png new file mode 100644 index 0000000..9102845 Binary files /dev/null and b/textures/siphon.png differ diff --git a/textures/wax_lump.png b/textures/wax_lump.png new file mode 100644 index 0000000..526fba4 Binary files /dev/null and b/textures/wax_lump.png differ diff --git a/textures/wolfram_ingot.png b/textures/wolfram_ingot.png new file mode 100644 index 0000000..57fb977 Binary files /dev/null and b/textures/wolfram_ingot.png differ diff --git a/textures/wolfram_lump.png b/textures/wolfram_lump.png new file mode 100644 index 0000000..3e9b72d Binary files /dev/null and b/textures/wolfram_lump.png differ diff --git a/textures/wolfram_wire_reel.png b/textures/wolfram_wire_reel.png new file mode 100644 index 0000000..a741d12 Binary files /dev/null and b/textures/wolfram_wire_reel.png differ diff --git a/textures/wooden_drawer.png b/textures/wooden_drawer.png index 985e516..225f34c 100644 Binary files a/textures/wooden_drawer.png and b/textures/wooden_drawer.png differ