1
0
mirror of https://github.com/mt-mods/homedecor_modpack.git synced 2025-07-28 01:40:18 +02:00

Compare commits

..

38 Commits

Author SHA1 Message Date
6cd70d2759 Fix spears visuel bug issue nalc/nalc-server-mods#103 2022-07-21 17:58:33 +02:00
3b98245930 Merge remote-tracking branch 'upstream/master' 2022-06-25 16:49:30 +02:00
97d4c65230 remove weird, redundant loop
the removed loop was doing the same thing as the `stairsplus:register_alias_all("moreblocks", "tar", "building_blocks", "Tar")` line below, but causing a crash when using the (not yet pulled) new stairsplus API https://github.com/minetest-mods/moreblocks/pull/191
2022-06-24 18:16:49 +02:00
acf17f2ba4 Replace deprecated functions (#37) 2022-06-18 18:44:02 +10:00
d667e39851 Merge remote-tracking branch 'upstream/master' 2022-05-27 18:34:18 +02:00
5ffdc26673 fix https://github.com/mt-mods/homedecor_modpack/issues/34 2022-05-16 22:41:02 -04:00
70381161fd fix recipes broken by 546cd711
fixes #35
2022-05-14 21:49:02 +10:00
680f8e8995 Merge remote-tracking branch 'upstream/master' 2022-03-06 16:31:31 +01:00
3d63271855 Merge remote-tracking branch 'upstream/master' 2021-06-20 17:10:29 +02:00
e0bc27c825 Merge remote-tracking branch 'upstream/master' 2021-04-17 13:48:14 +02:00
2814f672f0 Merge remote-tracking branch 'upstream/master' 2021-04-04 20:59:35 +02:00
2ba84b1e3c Merge remote-tracking branch 'upstream/master' 2021-03-12 12:20:39 +01:00
00d935de60 Merge branch 'gitlab' 2021-03-02 23:45:38 +01:00
6700f2b935 Fix use_texture_alpha for homedecor:skylight_frosted 2021-03-02 23:42:06 +01:00
6e973c3830 Merge remote-tracking branch 'upstream/master' 2021-03-02 23:11:41 +01:00
177a97eab3 Merge remote-tracking branch 'upstream/master' 2021-01-31 13:39:49 +01:00
a832b66977 Merge remote-tracking branch 'upstream/master' 2021-01-29 17:42:33 +01:00
df9e8aea4b Merge remote-tracking branch 'upstream/master' 2021-01-24 12:40:06 +01:00
99a01301a8 Merge remote-tracking branch 'upstream/master' 2020-12-03 20:50:27 +01:00
2ef259fa24 Merge remote-tracking branch 'upstream/master' 2020-11-25 21:53:41 +01:00
caaa963eaf Merge remote-tracking branch 'upstream/master' 2020-10-14 21:31:35 +02:00
e5866b7928 Merge remote-tracking branch 'upstream/master' 2020-10-12 18:43:38 +02:00
b6ecc0b95f Merge remote-tracking branch 'upstream/master' 2020-10-09 19:30:42 +02:00
320cd1d449 Merge remote-tracking branch 'upstream/master' 2020-09-15 21:39:14 +02:00
3675e9c266 Merge remote-tracking branch 'upstream/master' 2020-08-19 21:23:52 +02:00
3567b42c39 Merge remote-tracking branch 'upstream/master' 2020-08-08 10:04:04 +02:00
bd67ba2499 Merge remote-tracking branch 'upstream/master' 2020-08-04 20:48:58 +02:00
5612f4c884 Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev 2020-06-16 22:26:41 +02:00
7bcfbbca3a Merge remote-tracking branch 'upstream/master' into nalc-1.2-dev 2020-02-09 21:38:24 +01:00
e372ccb4d8 Merge branch 'master' of yunohost:mtcontrib/homedecor_modpack into nalc-1.2-dev 2019-12-22 13:26:45 +01:00
5c6a994698 Merge branch 'nalc-1.2' of yunohost:nalc/homedecor_modpack into nalc-1.2 2019-05-26 19:11:29 +02:00
1eec6e3615 Merge branch 'master' into nalc-1.2 2019-05-26 19:07:00 +02:00
0753606eb0 Merge branch 'master' into nalc-1.2 2019-05-25 15:36:01 +02:00
778b5493c7 Merge branch 'master' into nalc-1.2 2019-05-09 22:11:30 +02:00
fb0ca9a15c Supprime 2 dossiers non supprimés par le merge précédent 2019-05-04 20:45:50 +02:00
1520d27a73 Merge branch 'master' into nalc-1.2 2019-05-04 19:25:15 +02:00
5d4c64d3b2 Corrige problème de stack des lampes dans inventaire après récolte.
L'auteur du mod a oublié de définir la variable drop des objets
concernés :
- homedecor:glowlight_half,
- homedecor:glowlight_quarter,
- homedecor:glowlight_small_cube,
- homedecor:standing_lamp_off,
- homedecor:desk_lamp.
2019-04-07 14:04:00 +02:00
4eb9ffb088 Ajoute messages de chargement des mods dans le journal "action" 2018-12-25 17:41:16 +01:00
16 changed files with 34 additions and 83 deletions

View File

@ -8,16 +8,9 @@ if minetest.get_modpath("moreblocks") or minetest.get_modpath("stairs") then
end
if minetest.get_modpath("moreblocks") then
minetest.register_alias_force("moreblocks:tar", "building_blocks:Tar")
stairsplus:register_alias_all("building_blocks", "tar", "building_blocks", "Tar")
stairsplus:register_alias_all("building_blocks", "marble", "building_blocks", "Marble")
for _, i in ipairs(stairsplus.shapes_list) do
local class = i[1]
local cut = i[2]
minetest.unregister_item("moreblocks:"..class.."tar"..cut)
minetest.register_alias("moreblocks:"..class.."tar"..cut, "building_blocks:"..class.."tar"..cut)
end
minetest.unregister_item("moreblocks:tar")
minetest.register_alias("moreblocks:tar", "building_blocks:Tar")
stairsplus:register_alias_all("moreblocks", "tar", "building_blocks", "Tar")
if minetest.get_modpath("gloopblocks") then

View File

@ -4,3 +4,6 @@ dofile(modpath.."/alias.lua")
dofile(modpath.."/node_stairs.lua")
dofile(modpath.."/others.lua")
dofile(modpath.."/recipes.lua")
minetest.log("action", "[building_blocks] loaded.")

View File

@ -1,9 +1,4 @@
local S = minetest.get_translator("building_blocks")
local stairs_compat
if minetest.get_modpath("stairs") and not minetest.get_modpath("moreblocks") then
stairs_compat = dofile(minetest.get_modpath("building_blocks") .. "/stairs_compat.lua")
end
local function building_blocks_stairs(nodename, def)
minetest.register_node(nodename, def)
@ -16,9 +11,6 @@ local function building_blocks_stairs(nodename, def)
minetest.register_alias("stairs:stair_inner_" .. name, mod .. ":stair_" .. name .. "_inner")
minetest.register_alias("stairs:stair_outer_" .. name, mod .. ":stair_" .. name .. "_outer")
end
if stairs_compat then
stairs_compat(nodename, def)
end
end
building_blocks_stairs("building_blocks:grate", {

View File

@ -1,54 +0,0 @@
local stairtable = {
{
"slab",
{-0.5, -0.5, -0.5, 0.5, 0, 0.5},
},
{
"stair",
{
{-0.5, -0.5, -0.5, 0.5, 0.0, 0.5},
{-0.5, 0.0, 0.0, 0.5, 0.5, 0.5},
},
},
{
"stair_inner",
{
{-0.5, -0.5, -0.5, 0.5, 0.0, 0.5},
{-0.5, 0.0, 0.0, 0.5, 0.5, 0.5},
{-0.5, 0.0, -0.5, 0.0, 0.5, 0.0},
},
},
{
"stair_outer",
{
{-0.5, -0.5, -0.5, 0.5, 0.0, 0.5},
{-0.5, 0.0, 0.0, 0.0, 0.5, 0.5},
},
},
}
local function register(name, def)
for _, sdef in pairs(stairtable) do
local split = name:split(":")
local ndef = table.copy(def)
local item_name = ":" .. sdef[1] .. "_" .. split[2]
ndef.description = def.description .. " " .. string.gsub(sdef[1], "_", " ")
ndef.paramtype, ndef.paramtype2 = "light", "facedir"
ndef.drawtype = "nodebox"
ndef.node_box = {
type = "fixed",
fixed = sdef[2],
}
minetest.register_node(split[1] .. item_name, ndef)
minetest.register_alias("stairs" .. item_name, split[1] .. item_name)
end
end
minetest.log(
"action",
"[building_blocks]: depreciated legacy support for stairs loaded, please use moreblocks for stair support"
)
return register

View File

@ -333,3 +333,5 @@ minetest.register_lbm({
fire_particles_on(pos)
end
})
minetest.log("action", "[fake_fire] loaded.")

View File

@ -123,3 +123,6 @@ if minetest.get_modpath("doors") then
end
end
minetest.log("action", "[homedecor_3d_extra] loaded.")

View File

@ -194,7 +194,7 @@ minetest.register_on_player_receive_fields(function(player, form_name, fields)
meta:set_string("infotext", fields.title)
end
minetest.log("action", S("@1 has written in a book (title: \"@2\"): \"@3\" at location @4",
player:get_player_name(), fields.title, fields.text, minetest.pos_to_string(player:getpos())))
player:get_player_name(), fields.title, fields.text, minetest.pos_to_string(player:get_pos())))
player_current_book[player_name] = nil
return true

View File

@ -47,13 +47,13 @@ local add_mesh_desk_fan_entity = function(pos)
local param2 = minetest.get_node(pos).param2
local entity = minetest.add_entity(pos, "homedecor:mesh_desk_fan")
if param2 == 0 then
entity:setyaw(3.142) -- 180 degrees
entity:set_yaw(3.142) -- 180 degrees
elseif minetest.get_node(pos).param2 == 1 then
entity:setyaw(3.142/2) -- 90 degrees
entity:set_yaw(3.142/2) -- 90 degrees
elseif minetest.get_node(pos).param2 == 3 then
entity:setyaw((-3.142/2)) -- 270 degrees
entity:set_yaw((-3.142/2)) -- 270 degrees
else
entity:setyaw(0)
entity:set_yaw(0)
end
return entity
end

View File

@ -65,6 +65,6 @@ dofile(modpath.."/water_particles.lua")
dofile(modpath.."/sit.lua")
dofile(modpath.."/crafts.lua")
if minetest.settings:get_bool("log_mod") then
if minetest.settings:get_bool("log_mods") then
minetest.log("action", "[HomeDecor API] Loaded!")
end

View File

@ -38,7 +38,7 @@ homedecor.materials = {
wool_white = "wool:white",
slab_stone = "stairs:slab_stone",
slab_wood = "stairs:slab_wood",
glass_block = "default_glass",
glass_block = "default:glass",
glass_bottle = "vessels:glass_bottle",
coal_lump = "default:coal_lump",
stone = "default:stone",

View File

@ -121,7 +121,7 @@ function homedecor.register(name, original_def)
end
if cdef.type ~= "toolrepair" and not cdef.output then
cdef.output = ":homedecor:" .. name
cdef.output = "homedecor:" .. name
end
minetest.register_craft(cdef)

View File

@ -128,3 +128,5 @@ function inbox.get_inbox_insert_formspec(pos)
"listring[]"
return formspec
end
minetest.log("action", "[inbox] loaded.")

View File

@ -241,7 +241,7 @@ for brightness_level = 0, 14 do
}
overlay = {
{ name = "homedecor_glowlight_top_glare.png", color = "white"},
"",
{ name = "homedecor_glowlight_top_glare.png", color = "white"},
{ name = sides_glare, color = "white"},
{ name = sides_glare, color = "white"},
{ name = sides_glare, color = "white"},
@ -309,7 +309,7 @@ for brightness_level = 0, 14 do
}
overlay = {
{ name = "homedecor_glowlight_top_glare.png", color = "white"},
"",
{ name = "homedecor_glowlight_top_glare.png", color = "white"},
{ name = sides_glare, color = "white"},
{ name = sides_glare, color = "white"},
{ name = sides_glare, color = "white"},
@ -378,7 +378,7 @@ for brightness_level = 0, 14 do
}
overlay = {
{ name = "homedecor_glowlight_cube_top_glare.png", color = "white"},
"",
{ name = "homedecor_glowlight_cube_top_glare.png", color = "white"},
{ name = sides_glare, color = "white"},
{ name = sides_glare, color = "white"},
{ name = sides_glare, color = "white"},
@ -1905,3 +1905,4 @@ if minetest.get_modpath("darkage") then
end
end
minetest.log("action", "[homedecor_lightning] loaded.")

View File

@ -183,4 +183,6 @@ minetest.register_alias("plasmascreen:screen6", "air")
minetest.register_alias("plasmascreen:screen5", "homedecor:tv")
minetest.register_alias("plasmascreen:stand", "homedecor:tv_stand")
minetest.register_alias("plasmascreen:tv", "homedecor:tv")
minetest.register_alias("plasmascreen:tv_off", "homedecor:tv_off")
minetest.register_alias("plasmascreen:tv_off", "homedecor:tv_off")
minetest.log("action", "[plasmascreen] loaded.")

View File

@ -121,7 +121,7 @@ function lrfurn.sit(pos, node, clicker, itemstack, pointed_thing, seats)
--seat the player
sit_pos.y = sit_pos.y-0.5
clicker:setpos(sit_pos)
clicker:set_pos(sit_pos)
return itemstack
end
@ -129,3 +129,5 @@ dofile(modpath.."/longsofas.lua")
dofile(modpath.."/sofas.lua")
dofile(modpath.."/armchairs.lua")
dofile(modpath.."/misc.lua")
minetest.log("action", "[homedecor_seating] loaded.")

View File

@ -94,6 +94,10 @@ local update_item = function(pos, node)
pos.z = pos.z + posad.z * 6.5 / 16
elseif node.name == "itemframes:pedestal" then
pos.y = pos.y + 12 / 16 + 0.33
local n = meta:get_string("item")
if string.match(n, "spears:spear_") then
pos.y = pos.y + 0.2
end
end
tmp.nodename = node.name
tmp.texture = ItemStack(meta:get_string("item")):get_name()
@ -332,3 +336,4 @@ if minetest.get_modpath("mesecons_mvps") then
mesecon.register_mvps_stopper("itemframes:pedestal")
end
minetest.log("action", "[itemframes] loaded.")