remove homedecor_i18n and merged into homedecor_common, fixed meseon global error

This commit is contained in:
TenPlus1 2019-04-21 16:25:21 +01:00
parent 8b78caf7c6
commit 0cd8bd7780
95 changed files with 74 additions and 107 deletions

View File

@ -1,4 +1,4 @@
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")

View File

@ -1,5 +1,5 @@
default
homedecor_i18n
homedecor_common
moreblocks?
gloopblocks?
stairs?

View File

@ -1,4 +1,4 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local modpath = minetest.get_modpath("building_blocks")
dofile(modpath.."/alias.lua")

View File

@ -1,4 +1,4 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local stairs_groups_names = {"cracky","choppy","flammable","crumbly","snappy"}

View File

@ -1,4 +1,4 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
minetest.register_craftitem("building_blocks:sticks", {
description = S("Small bundle of sticks"),

View File

@ -1,4 +1,4 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
if minetest.get_modpath("moreblocks") then
minetest.register_craft({

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
-- Amiga 500 lookalike
computer.register("computer:shefriendSOO", {

View File

@ -1,2 +1,2 @@
default
homedecor_i18n
homedecor_common

View File

@ -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

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local shapes = {
{ { x = {0, 1, 0, 1}, y = {0, 0, 1, 1} } },

View File

@ -1,2 +1,2 @@
default
homedecor_i18n
homedecor_common

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
screwdriver = screwdriver or {}

View File

@ -2,5 +2,4 @@ homedecor_common
default
basic_materials
unifieddyes
homedecor_i18n
building_blocks

View File

@ -1,5 +1,5 @@
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 },

View File

@ -2,5 +2,4 @@ homedecor_common
default
basic_materials
unifieddyes
homedecor_i18n
creative

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local function N_(x) return x end

View File

@ -1,6 +1,5 @@
homedecor_common
default
unifieddyes
homedecor_i18n
creative

View File

@ -1,4 +1,4 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local function N_(x) return x end

View File

@ -1,5 +1,4 @@
homedecor_common
default
basic_materials
homedecor_i18n
building_blocks?

View File

@ -1,6 +1,6 @@
-- 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"),

View File

@ -2,5 +2,4 @@ homedecor_common
default
basic_materials
dye
homedecor_i18n
building_blocks?

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local clock_sbox = {
type = "fixed",

View File

@ -1,3 +1,2 @@
homedecor_common
default
homedecor_i18n

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
minetest.register_node(":homedecor:cobweb_corner", {
description = S("Cobweb"),

View File

@ -1,6 +1,6 @@
-- crafts for common items that are used by more than one home decor component
local S = homedecor_i18n.gettext
local S = homedecor.gettext
-- items

View File

@ -1,4 +1,3 @@
default
homedecor_i18n
creative
building_blocks?

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
-- vectors to place one node next to or behind another

View File

@ -1,6 +1,6 @@
-- 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)

View File

@ -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

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local default_can_dig = function(pos,player)
local meta = minetest.get_meta(pos)

View File

@ -2,6 +2,5 @@ homedecor_common
default
basic_materials
dye
homedecor_i18n
doors
mesecons?

View File

@ -1,10 +1,13 @@
-- 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

View File

@ -1,4 +1,3 @@
homedecor_common
default
basic_materials
homedecor_i18n

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
homedecor.register("power_outlet", {
description = S("Power Outlet"),

View File

@ -1,5 +1,4 @@
homedecor_common
default
basic_materials
homedecor_i18n
moreblocks?

View File

@ -1,6 +1,6 @@
-- Various home electronics
local S = homedecor_i18n.gettext
local S = homedecor.gettext
homedecor.register("speaker", {
description = S("Large Stereo Speaker"),

View File

@ -1,7 +1,6 @@
homedecor_common
default
dye
homedecor_i18n
creative
moreblocks?
building_blocks?

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local function N_(x) return x end

View File

@ -2,5 +2,4 @@ homedecor_common
default
basic_materials
dye
homedecor_i18n
signs_lib?

View File

@ -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" },

View File

@ -1,4 +1,3 @@
homedecor_common
default
dye
homedecor_i18n

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
homedecor.register("coatrack_wallmount", {
tiles = { homedecor.plain_wood },

View File

@ -1,7 +1,6 @@
homedecor_common
default
unifieddyes
homedecor_i18n
wool
moreblocks?
technic?

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local table_colors = {
{ "", S("Table"), homedecor.plain_wood },

View File

@ -1,4 +1,3 @@
homedecor_common
default
homedecor_i18n
creative

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
homedecor.register("bars", {
description = S("Bars"),

View File

@ -2,7 +2,6 @@ homedecor_common
default
basic_materials
dye
homedecor_i18n
creative
currency?
bucket?

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local cutlery_cbox = {
type = "fixed",

View File

@ -1 +0,0 @@
intllib?

View File

@ -1,7 +0,0 @@
-- 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")

View File

@ -2,7 +2,6 @@ homedecor_common
default
basic_materials
dye
homedecor_i18n
moreblocks?
building_blocks?
technic?

View File

@ -1,6 +1,6 @@
-- 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)"

View File

@ -1,5 +1,4 @@
homedecor_common
default
basic_materials
homedecor_i18n
bucket?

View File

@ -2,7 +2,6 @@ homedecor_common
default
basic_materials
unifieddyes
homedecor_i18n
creative
moreblocks?
building_blocks?

View File

@ -1,6 +1,6 @@
-- This file supplies glowlights
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local glowlight_nodebox = {
half = homedecor.nodebox.slab_y(1/2),

View File

@ -2,7 +2,6 @@ homedecor_common
default
basic_materials
unifieddyes
homedecor_i18n
building_blocks?
technic?
bucket?

View File

@ -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"),
@ -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",

View File

@ -2,6 +2,5 @@ homedecor_common
default
basic_materials
dye
homedecor_i18n
moreblocks?
building_blocks?

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
homedecor.register("filing_cabinet", {
description = S("Filing cabinet"),

View File

@ -1,4 +1,3 @@
homedecor_common
default
dye
homedecor_i18n

View File

@ -1,4 +1,4 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local pframe_cbox = {
type = "fixed",

View File

@ -1,4 +1,3 @@
homedecor_common
default
dye
homedecor_i18n

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local function N_(x) return x end

View File

@ -1,4 +1,3 @@
homedecor_common
default
basic_materials
homedecor_i18n

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
-- Various kinds of tables

View File

@ -2,4 +2,3 @@ homedecor_common
default
basic_materials
dye
homedecor_i18n

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local tg_cbox = {
type = "fixed",

View File

@ -2,5 +2,4 @@ homedecor_common
default
basic_materials
unifieddyes
homedecor_i18n
building_blocks?

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
homedecor.register("window_quartered", {
description = S("Window (quartered)"),

View File

@ -1,3 +1,3 @@
default
homedecor_i18n
homedecor_common
screwdriver?

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local inbox = {}
local screwdriver = rawget(_G, "screwdriver") or {}

View File

@ -1,3 +1,3 @@
default
homedecor_i18n
homedecor_common
mesecons_mvps?

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local tmp = {}
screwdriver = screwdriver or {}

View File

@ -1,4 +1,4 @@
wool
bucket
homedecor_i18n
homedecor_common
unifieddyes

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
lavalamp = {}

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local armchair_cbox = {
type = "fixed",
fixed = {

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
minetest.register_alias("lrfurn:coffeetable_back", "lrfurn:coffeetable")
minetest.register_alias("lrfurn:coffeetable_front", "air")

View File

@ -1,4 +1,4 @@
default
wool
homedecor_i18n
homedecor_common
unifieddyes

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
minetest.register_node("lrfurn:endtable", {
description = S("End Table"),

View File

@ -1,4 +1,4 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
lrfurn = {}
screwdriver = screwdriver or {}

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local longsofa_cbox = {
type = "wallmounted",

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
local sofa_cbox = {
type = "wallmounted",

View File

@ -1,3 +1,3 @@
default
homedecor_i18n
homedecor_common
homedecor_electronics

View File

@ -1,5 +1,5 @@
local S = homedecor_i18n.gettext
local S = homedecor.gettext
screwdriver = screwdriver or {}