Commit 0cd8bd77 authored by tenplus1's avatar tenplus1

remove homedecor_i18n and merged into homedecor_common, fixed meseon global error

parent 8b78caf7
local S = homedecor_i18n.gettext
local S = homedecor.gettext
if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then
minetest.register_alias("building_blocks:slab_tar", "stairs:slab_Tar")
......
default
homedecor_i18n
homedecor_common
moreblocks?
gloopblocks?
stairs?
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local modpath = minetest.get_modpath("building_blocks")
dofile(modpath.."/alias.lua")
dofile(modpath.."/node_stairs.lua")
dofile(modpath.."/others.lua")
dofile(modpath.."/recipes.lua")
\ No newline at end of file
dofile(modpath.."/recipes.lua")
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local stairs_groups_names = {"cracky","choppy","flammable","crumbly","snappy"}
......@@ -33,7 +33,7 @@ local function building_blocks_stairs(nodename, def)
("%s Slab"):format(def.description),
def.sounds
)
end
end
end
end
......
local S = homedecor_i18n.gettext
local S = homedecor.gettext
minetest.register_craftitem("building_blocks:sticks", {
description = S("Small bundle of sticks"),
......@@ -20,4 +20,4 @@ minetest.register_tool("building_blocks:knife", {
fleshy={times={[2]=5.50, [3]=2.80}, uses=100, maxlevel=1}
}
},
})
\ No newline at end of file
})
local S = homedecor_i18n.gettext
local S = homedecor.gettext
if minetest.get_modpath("moreblocks") then
minetest.register_craft({
......
local S = homedecor_i18n.gettext
local S = homedecor.gettext
-- Amiga 500 lookalike
computer.register("computer:shefriendSOO", {
......
default
homedecor_i18n
homedecor_common
......@@ -2,7 +2,7 @@
-- This file defines some items in order to not have to depend on other mods.
local S = homedecor_i18n.gettext
local S = homedecor.gettext
if (not minetest.get_modpath("homedecor")) then
......
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local shapes = {
{ { x = {0, 1, 0, 1}, y = {0, 0, 1, 1} } },
......@@ -231,7 +231,7 @@ local function step(pos, fields)
local scr = { formsize, background,
t.boardstring, t.previewstring,
draw_shape(t.cur, t.x, t.y, t.rot, boardx, boardy),
"label[3.8,0.1;"..S("Next...").."]label[3.8,2.7;"..S("Score: "),
"label[3.8,0.1;"..S("Next...").."]label[3.8,2.7;"..S("Score: "),
t.score, close, buttons }
......
default
homedecor_i18n
default
homedecor_common
local S = homedecor_i18n.gettext
local S = homedecor.gettext
screwdriver = screwdriver or {}
......
......@@ -2,5 +2,4 @@ homedecor_common
default
basic_materials
unifieddyes
homedecor_i18n
building_blocks
local S = homedecor_i18n.gettext
local S = homedecor.gettext
minetest.register_node(":homedecor:bathroom_tiles_dark", {
description = S("Bathroom/kitchen tiles (dark)"),
......@@ -115,9 +115,6 @@ homedecor.register("medicine_cabinet_open", {
-- "Sanitation" related
local S = homedecor_i18n.gettext
local toilet_sbox = {
type = "fixed",
fixed = { -6/16, -8/16, -8/16, 6/16, 9/16, 8/16 },
......
......@@ -2,5 +2,4 @@ homedecor_common
default
basic_materials
unifieddyes
homedecor_i18n
creative
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local function N_(x) return x end
......
homedecor_common
default
unifieddyes
homedecor_i18n
creative
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local function N_(x) return x end
......
homedecor_common
default
basic_materials
homedecor_i18n
building_blocks?
-- Nodes that would affect the local temperature e.g. fans, heater, A/C
local S = homedecor_i18n.gettext
local S = homedecor.gettext
homedecor.register("air_conditioner", {
description = S("Air Conditioner"),
......
......@@ -2,5 +2,4 @@ homedecor_common
default
basic_materials
dye
homedecor_i18n
building_blocks?
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local clock_sbox = {
type = "fixed",
......
homedecor_common
default
homedecor_i18n
local S = homedecor_i18n.gettext
local S = homedecor.gettext
minetest.register_node(":homedecor:cobweb_corner", {
description = S("Cobweb"),
......
-- crafts for common items that are used by more than one home decor component
local S = homedecor_i18n.gettext
local S = homedecor.gettext
-- items
......
default
homedecor_i18n
creative
building_blocks?
local S = homedecor_i18n.gettext
local S = homedecor.gettext
-- vectors to place one node next to or behind another
......
-- This code supplies an oven/stove. Basically it's just a copy of the default furnace with different textures.
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local function swap_node(pos, name)
local node = minetest.get_node(pos)
......
......@@ -3,11 +3,14 @@
local modpath = minetest.get_modpath("homedecor_common")
local S = homedecor_i18n.gettext
homedecor = {}
homedecor.modpath = modpath
-- Intllib support
homedecor.gettext, homedecor.ngettext = dofile(modpath.."/intllib.lua")
local S = homedecor.gettext
-- Determine if the item being pointed at is the underside of a node (e.g a ceiling)
function homedecor.find_ceiling(itemstack, placer, pointed_thing)
-- most of this is copied from the rotate-and-place function in builtin
......
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local default_can_dig = function(pos,player)
local meta = minetest.get_meta(pos)
......
......@@ -2,6 +2,5 @@ homedecor_common
default
basic_materials
dye
homedecor_i18n
doors
mesecons?
-- Node definitions for Homedecor doors
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local function N_(x) return x end
local m_rules = mesecon and mesecon.rules and mesecon.rules.pplate
local m_rules
if minetest.global_exists("mesecon") then
m_rules = mesecon and mesecon.rules and mesecon.rules.pplate
end
-- doors
......
homedecor_common
default
basic_materials
homedecor_i18n
local S = homedecor_i18n.gettext
local S = homedecor.gettext
homedecor.register("power_outlet", {
description = S("Power Outlet"),
......
homedecor_common
default
basic_materials
homedecor_i18n
moreblocks?
-- Various home electronics
local S = homedecor_i18n.gettext
local S = homedecor.gettext
homedecor.register("speaker", {
description = S("Large Stereo Speaker"),
......
homedecor_common
default
dye
homedecor_i18n
creative
moreblocks?
building_blocks?
......
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local function N_(x) return x end
......
......@@ -2,5 +2,4 @@ homedecor_common
default
basic_materials
dye
homedecor_i18n
signs_lib?
......@@ -14,7 +14,7 @@ if signs_modpath then
sign_post_model = signs_lib.sign_post_model.nodebox
end
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local materials = {
{ S("brass"), "brass" },
......
homedecor_common
default
dye
homedecor_i18n
local S = homedecor_i18n.gettext
local S = homedecor.gettext
homedecor.register("coatrack_wallmount", {
tiles = { homedecor.plain_wood },
......
homedecor_common
default
unifieddyes
homedecor_i18n
wool
moreblocks?
technic?
......
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local table_colors = {
{ "", S("Table"), homedecor.plain_wood },
......
homedecor_common
default
homedecor_i18n
creative
local S = homedecor_i18n.gettext
local S = homedecor.gettext
homedecor.register("bars", {
description = S("Bars"),
......
......@@ -2,7 +2,6 @@ homedecor_common
default
basic_materials
dye
homedecor_i18n
creative
currency?
bucket?
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local cutlery_cbox = {
type = "fixed",
......
-- This file intentionally left blank.
homedecor_i18n = { }
local MP = minetest.get_modpath(minetest.get_current_modname())
homedecor_i18n.gettext, homedecor_i18n.ngettext = dofile(MP.."/intllib.lua")
......@@ -2,7 +2,6 @@ homedecor_common
default
basic_materials
dye
homedecor_i18n
moreblocks?
building_blocks?
technic?
......
-- This file supplies Kitchen stuff like refrigerators, sinks, etc.
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local function N_(x) return x end
......@@ -138,8 +138,6 @@ homedecor.register("dishwasher_"..m, {
})
end
local S = homedecor_i18n.gettext
local cabinet_sides = "(default_wood.png^[transformR90)^homedecor_kitchen_cabinet_bevel.png"
local cabinet_bottom = "(default_wood.png^[colorize:#000000:100)^(homedecor_kitchen_cabinet_bevel.png^[colorize:#46321580)"
......
homedecor_common
default
basic_materials
homedecor_i18n
bucket?
......@@ -2,7 +2,6 @@ homedecor_common
default
basic_materials
unifieddyes
homedecor_i18n
creative
moreblocks?
building_blocks?
......
-- This file supplies glowlights
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local glowlight_nodebox = {
half = homedecor.nodebox.slab_y(1/2),
......
......@@ -2,7 +2,6 @@ homedecor_common
default
basic_materials
unifieddyes
homedecor_i18n
building_blocks?
technic?
bucket?
......@@ -7,7 +7,7 @@
-- The code for ovens, nightstands, refrigerators are basically modified
-- copies of the code for chests and furnaces.
local S = homedecor_i18n.gettext
local S = homedecor.gettext
homedecor.register("ceiling_paint", {
description = S("Textured Ceiling Paint"),
......@@ -470,7 +470,7 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do
}
if side ~= "horizontal" then
def.groups.not_in_creative_inventory = 1
def.groups.not_in_creative_inventory = 1
end
if name == "wood" then
......@@ -489,7 +489,7 @@ for _, side in ipairs({"diagonal_left", "diagonal_right", "horizontal"}) do
homedecor.white_wood
}
def2.inventory_image = "homedecor_banister_wood_colored_inv.png"
def2.groups.not_in_creative_inventory = 1
def2.groups.not_in_creative_inventory = 1
unifieddyes.generate_split_palette_nodes(nn, def2, "homedecor:banister_"..name.."_horizontal")
end
......@@ -630,7 +630,7 @@ homedecor.register("dartboard", {
--
-- Mostly my own code; overall template borrowed from game default
local S = homedecor_i18n.gettext
local S = homedecor.gettext
minetest.register_craft( {
output = "homedecor:flower_pot_terracotta",
......
......@@ -2,6 +2,5 @@ homedecor_common
default
basic_materials
dye
homedecor_i18n
moreblocks?
building_blocks?
local S = homedecor_i18n.gettext
local S = homedecor.gettext
homedecor.register("filing_cabinet", {
description = S("Filing cabinet"),
......
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local pframe_cbox = {
type = "fixed",
......
homedecor_common
default
dye
homedecor_i18n
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local function N_(x) return x end
......
homedecor_common
default
basic_materials
homedecor_i18n
local S = homedecor_i18n.gettext
local S = homedecor.gettext
-- Various kinds of tables
......
......@@ -2,4 +2,3 @@ homedecor_common
default
basic_materials
dye
homedecor_i18n
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local tg_cbox = {
type = "fixed",
......
......@@ -2,5 +2,4 @@ homedecor_common
default
basic_materials
unifieddyes
homedecor_i18n
building_blocks?
local S = homedecor_i18n.gettext
local S = homedecor.gettext
homedecor.register("window_quartered", {
description = S("Window (quartered)"),
......
default
homedecor_i18n
homedecor_common
screwdriver?
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local inbox = {}
local screwdriver = rawget(_G, "screwdriver") or {}
......
default
homedecor_i18n
homedecor_common
mesecons_mvps?
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local tmp = {}
screwdriver = screwdriver or {}
......@@ -299,4 +299,4 @@ minetest.register_craft({
if minetest.get_modpath("mesecons_mvps") then
mesecon.register_mvps_stopper("itemframes:frame")
mesecon.register_mvps_stopper("itemframes:pedestal")
end
\ No newline at end of file
end
wool
bucket
homedecor_i18n
homedecor_common
unifieddyes
local S = homedecor_i18n.gettext
local S = homedecor.gettext
lavalamp = {}
......
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local armchair_cbox = {
type = "fixed",
fixed = {
......
local S = homedecor_i18n.gettext
local S = homedecor.gettext
minetest.register_alias("lrfurn:coffeetable_back", "lrfurn:coffeetable")
minetest.register_alias("lrfurn:coffeetable_front", "air")
......
default
wool
homedecor_i18n
homedecor_common
unifieddyes
local S = homedecor_i18n.gettext
local S = homedecor.gettext
minetest.register_node("lrfurn:endtable", {
description = S("End Table"),
......
local S = homedecor_i18n.gettext
local S = homedecor.gettext
lrfurn = {}
screwdriver = screwdriver or {}
......
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local longsofa_cbox = {
type = "wallmounted",
......
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local sofa_cbox = {
type = "wallmounted",
......
default
homedecor_i18n
homedecor_common
homedecor_electronics
local S = homedecor_i18n.gettext
local S = homedecor.gettext
screwdriver = screwdriver or {}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment