From ea7b04a7123bf18eb3fa5d70bea4673fc8229dbb Mon Sep 17 00:00:00 2001 From: BlockMen Date: Tue, 24 Feb 2015 21:44:21 +0100 Subject: [PATCH] Use only red and white wool for beds --- mods/beds/beds.lua | 21 ++------------------- mods/beds/spawns.lua | 16 ++++++++-------- 2 files changed, 10 insertions(+), 27 deletions(-) diff --git a/mods/beds/beds.lua b/mods/beds/beds.lua index 531b55d..acff444 100644 --- a/mods/beds/beds.lua +++ b/mods/beds/beds.lua @@ -42,7 +42,7 @@ beds.register_bed("beds:fancy_bed", { }, selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5}, recipe = { - {"group:wool", "group:wool", "group:stick"}, + {"wool:red", "wool:white", "group:stick"}, {"group:wood", "group:wood", "group:wood"}, }, }) @@ -76,7 +76,7 @@ beds.register_bed("beds:bed", { }, selectionbox = {-0.5, -0.5, -0.5, 0.5, 0.06, 1.5}, recipe = { - {"group:wool", "group:wool", "group:wool"}, + {"wool:red", "wool:red", "wool:white"}, {"group:wood", "group:wood", "group:wood"} }, @@ -84,21 +84,4 @@ beds.register_bed("beds:bed", { -- aliases for PA's beds mod minetest.register_alias("beds:bed_bottom_red", "beds:bed_bottom") -minetest.register_alias("beds:bed_bottom_orange", "beds:bed_bottom") -minetest.register_alias("beds:bed_bottom_yellow", "beds:bed_bottom") -minetest.register_alias("beds:bed_bottom_green", "beds:bed_bottom") -minetest.register_alias("beds:bed_bottom_blue", "beds:bed_bottom") -minetest.register_alias("beds:bed_bottom_violet", "beds:bed_bottom") -minetest.register_alias("beds:bed_bottom_black", "beds:bed_bottom") -minetest.register_alias("beds:bed_bottom_grey", "beds:bed_bottom") -minetest.register_alias("beds:bed_bottom_white", "beds:bed_bottom") - minetest.register_alias("beds:bed_top_red", "beds:bed_top") -minetest.register_alias("beds:bed_top_orange", "beds:bed_top") -minetest.register_alias("beds:bed_top_yellow", "beds:bed_top") -minetest.register_alias("beds:bed_top_green", "beds:bed_top") -minetest.register_alias("beds:bed_top_blue", "beds:bed_top") -minetest.register_alias("beds:bed_top_violet", "beds:bed_top") -minetest.register_alias("beds:bed_top_black", "beds:bed_top") -minetest.register_alias("beds:bed_top_grey", "beds:bed_top") -minetest.register_alias("beds:bed_top_white", "beds:bed_top") diff --git a/mods/beds/spawns.lua b/mods/beds/spawns.lua index 5fcf1b9..39da21c 100644 --- a/mods/beds/spawns.lua +++ b/mods/beds/spawns.lua @@ -16,14 +16,14 @@ function beds.read_spawns() local input = io.open(file, "r") if input and not bkwd then repeat - local x = input:read("*n") - if x == nil then - break - end - local y = input:read("*n") - local z = input:read("*n") - local name = input:read("*l") - spawns[name:sub(2)] = {x = x, y = y, z = z} + local x = input:read("*n") + if x == nil then + break + end + local y = input:read("*n") + local z = input:read("*n") + local name = input:read("*l") + spawns[name:sub(2)] = {x = x, y = y, z = z} until input:read(0) == nil io.close(input) elseif input and bkwd then