mirror of
https://github.com/mt-mods/homedecor_modpack.git
synced 2025-07-28 01:40:18 +02:00
Compare commits
38 Commits
stair_comp
...
fix_spear
Author | SHA1 | Date | |
---|---|---|---|
6cd70d2759 | |||
3b98245930 | |||
97d4c65230 | |||
acf17f2ba4 | |||
d667e39851 | |||
5ffdc26673 | |||
70381161fd | |||
680f8e8995 | |||
3d63271855 | |||
e0bc27c825 | |||
2814f672f0 | |||
2ba84b1e3c | |||
00d935de60 | |||
6700f2b935 | |||
6e973c3830 | |||
177a97eab3 | |||
a832b66977 | |||
df9e8aea4b | |||
99a01301a8 | |||
2ef259fa24 | |||
caaa963eaf | |||
e5866b7928 | |||
b6ecc0b95f | |||
320cd1d449 | |||
3675e9c266 | |||
3567b42c39 | |||
bd67ba2499 | |||
5612f4c884 | |||
7bcfbbca3a | |||
e372ccb4d8 | |||
5c6a994698 | |||
1eec6e3615 | |||
0753606eb0 | |||
778b5493c7 | |||
fb0ca9a15c | |||
1520d27a73 | |||
5d4c64d3b2 | |||
4eb9ffb088 |
@ -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
|
||||
|
@ -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.")
|
||||
|
||||
|
@ -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", {
|
||||
|
@ -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
|
@ -333,3 +333,5 @@ minetest.register_lbm({
|
||||
fire_particles_on(pos)
|
||||
end
|
||||
})
|
||||
|
||||
minetest.log("action", "[fake_fire] loaded.")
|
||||
|
@ -123,3 +123,6 @@ if minetest.get_modpath("doors") then
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
minetest.log("action", "[homedecor_3d_extra] loaded.")
|
||||
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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
|
||||
|
@ -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",
|
||||
|
@ -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)
|
||||
|
@ -128,3 +128,5 @@ function inbox.get_inbox_insert_formspec(pos)
|
||||
"listring[]"
|
||||
return formspec
|
||||
end
|
||||
|
||||
minetest.log("action", "[inbox] loaded.")
|
||||
|
@ -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.")
|
||||
|
@ -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.")
|
||||
|
@ -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.")
|
||||
|
@ -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.")
|
||||
|
Reference in New Issue
Block a user