some commits in original xdecor

master
Nathaniel Freeman 2021-02-03 22:59:23 +00:00 committed by CalebJ
parent 9fb589237e
commit 5b95d9547e
7 changed files with 18 additions and 9 deletions

View File

@ -2,8 +2,9 @@ default
bucket
doors
xpanes
farming
stairs?
fire?
oresplus?
moreblocks?
mesecons_doors?
mesecons?

View File

@ -1,4 +1,4 @@
name = xdecor
depends = default, bucket, doors, xpanes
optional_depends = fire, oresplus, moreblocks, mesecons_plus, stairs
depends = default, bucket, doors, xpanes, farming
optional_depends = fire, oresplus, moreblocks, mesecons, stairs
description = A decoration mod meant to be simple and well-featured.

View File

@ -133,7 +133,7 @@ end
function enchanting.put(_, listname, _, stack)
local stackname = stack:get_name()
if listname == "mese" and stackname == "default:mese_crystal" then
if listname == "mese" and (stackname == "default:mese_crystal" or stackname == "imese:industrial_mese_crystal" or stackname == "lapis:lapis") then
return stack:get_count()
elseif listname == "tool" and allowed(stackname:match("[^:]+$")) then
return 1

View File

@ -86,6 +86,12 @@ function itemframe.rightclick(pos, node, clicker, itemstack)
meta:set_string("item", itemstring)
update_item(pos, node)
if itemstring == "" then
meta:set_string("infotext", "Item Frame (owned by " .. owner .. ")")
else
meta:set_string("infotext", itemstring.." (owned by " .. owner .. ")")
end
return itemstack
end

View File

@ -43,6 +43,8 @@ local function door_toggle(pos_actuator, pos_door, player)
local actuator = minetest.get_node(pos_actuator)
local door = doors.get(pos_door)
if not door then return end
if actuator.name:sub(-4) == "_off" then
minetest.set_node(pos_actuator,
{name = actuator.name:gsub("_off", "_on"), param2 = actuator.param2})
@ -215,4 +217,4 @@ minetest.register_craft({
{"group:stick"},
{"group:stone"}
}
})
})

View File

@ -6,7 +6,7 @@ local function register_pane(name, desc, def)
tiles = {"xdecor_" .. name .. ".png"},
drawtype = "airlike",
paramtype = "light",
textures = {"xdecor_" .. name .. ".png", "xdecor_" .. name .. ".png", "xpanes_space.png"},
textures = {"xdecor_" .. name .. ".png", "" ,"xdecor_" .. name .. ".png"},
inventory_image = "xdecor_" .. name .. ".png",
wield_image = "xdecor_" .. name .. ".png",
groups = def.groups,

View File

@ -66,9 +66,9 @@ minetest.register_craft({
minetest.register_craft({
output = "xdecor:cobweb",
recipe = {
{"farming:cotton", "", "farming:cotton"},
{"", "farming:cotton", ""},
{"farming:cotton", "", "farming:cotton"}
{"farming:string", "", "farming:string"},
{"", "farming:string", ""},
{"farming:string", "", "farming:string"}
}
})