Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove obsolete mesecons integration #37

Merged
merged 1 commit into from
Oct 22, 2024
Merged

Remove obsolete mesecons integration #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions .luacheckrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,4 @@ read_globals = {
"screwdriver",
"stairs",
"stairsplus",
"mesecon",
}

globals = {
"mydoors"
}
2 changes: 1 addition & 1 deletion my_castle_doors/locked.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ local cdoor_list = { --Number , Description , Inven Image , Image
}

local function add_door(desc, img)
mydoors.register_door("my_castle_doors:"..img.."_locked", {
doors.register_door("my_castle_doors:"..img.."_locked", {
description = desc.." Locked",
inventory_image = "mydoors_"..img.."_inv.png",
groups = {choppy=2,cracky=2,door=1},
Expand Down
2 changes: 1 addition & 1 deletion my_castle_doors/unlocked.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ local cdoor_list = { --Number , Description , Inven Image , Image
}

local function add_door(desc, img)
mydoors.register_door("my_castle_doors:"..img, {
doors.register_door("my_castle_doors:"..img, {
description = desc,
inventory_image = "mydoors_"..img.."_inv.png",
groups = {choppy=2,cracky=2,door=1},
Expand Down
2 changes: 1 addition & 1 deletion my_cottage_doors/locked.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ local cdoor_list = { --Number , Description , Inven Image , Image
}

local function add_door(desc, img)
mydoors.register_door("my_cottage_doors:"..img.."_locked", {
doors.register_door("my_cottage_doors:"..img.."_locked", {
description = desc.." Locked",
inventory_image = "mycdoors_"..img.."_inv.png",
groups = {choppy=2,cracky=2,door=1},
Expand Down
2 changes: 1 addition & 1 deletion my_cottage_doors/unlocked.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ local cdoor_list = { --Number , Description , Inven Image , Image
}

local function add_door(desc, img)
mydoors.register_door("my_cottage_doors:"..img, {
doors.register_door("my_cottage_doors:"..img, {
description = desc,
inventory_image = "mycdoors_"..img.."_inv.png",
groups = {choppy=2,cracky=2,door=1},
Expand Down
2 changes: 1 addition & 1 deletion my_default_doors/locked.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ local cdoor_list = { --Number , Description , Inven Image , Image
}

local function add_door(num, desc, img, itm)
mydoors.register_door("my_default_doors:door"..num.."_locked", {
doors.register_door("my_default_doors:door"..num.."_locked", {
description = desc.." Locked",
inventory_image = "mydoors_"..img.."_inv.png",
groups = {choppy=2,cracky=2,door=1},
Expand Down
2 changes: 1 addition & 1 deletion my_default_doors/unlocked.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ local cdoor_list = { --Number , Description , Inven Image , Image
}

local function add_door(num, desc, img, itm)
mydoors.register_door("my_default_doors:door"..num, {
doors.register_door("my_default_doors:door"..num, {
description = desc,
inventory_image = "mydoors_"..img.."_inv.png",
groups = {choppy=2,cracky=2,door=1},
Expand Down
24 changes: 0 additions & 24 deletions my_door_wood/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,27 +58,3 @@ end
for _,door in ipairs(door_wood) do
add_door(unpack(door))
end

mydoors = {}

local mesecons = {effector = {
action_on = function(pos)
local door = doors.get(pos)
if door then
door:open()
end
end,
action_off = function(pos)
local door = doors.get(pos)
if door then
door:close()
end
end,
rules = minetest.global_exists("mesecon") and mesecon.rules.pplate or nil
}}

-- Helper function for mesecons support
function mydoors.register_door(name, def)
def.mesecons = mesecons
doors.register(name, def)
end
2 changes: 1 addition & 1 deletion my_door_wood/mod.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name = my_door_wood
description = Wood that is used to make doors.
depends = default
optional_depends = stairs, moreblocks, mesecons
optional_depends = stairs, moreblocks
2 changes: 1 addition & 1 deletion my_fancy_doors/locked.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ local fdoor_list = { --Number , Description , Inven Image , Image
}

local function add_door(desc, img)
mydoors.register_door("my_fancy_doors:"..img.."_locked", {
doors.register_door("my_fancy_doors:"..img.."_locked", {
description = desc.." Locked",
inventory_image = "myfdoors_"..img.."_inv.png",
groups = {choppy=2,cracky=2,door=1},
Expand Down
2 changes: 1 addition & 1 deletion my_fancy_doors/unlocked.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ local fdoor_list = { --Number , Description , Inven Image , Image
}

local function add_door(desc, img)
mydoors.register_door("my_fancy_doors:"..img, {
doors.register_door("my_fancy_doors:"..img, {
description = desc,
inventory_image = "myfdoors_"..img.."_inv.png",
groups = {choppy=2,cracky=2,door=1},
Expand Down
4 changes: 2 additions & 2 deletions my_hidden_doors/init.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ local hdoor_list = { --Number , Description , default image

local function add_door(img, desc)
-- Cannot add locked doors because the tooltip defies the purpose of being a hidden door
mydoors.register_door("my_hidden_doors:hidden_door"..img, {
doors.register_door("my_hidden_doors:hidden_door"..img, {
description = desc,
inventory_image = "mydoors_"..img.."_inv.png",
groups = {choppy=2,cracky=2,door=1},
Expand All @@ -26,7 +26,7 @@ for _,hdoor in ipairs(hdoor_list) do
add_door(unpack(hdoor))
end

mydoors.register_door("my_hidden_doors:hidden_door_grey", {
doors.register_door("my_hidden_doors:hidden_door_grey", {
description = "Grey Door",
inventory_image = "mydoors_grey_inv.png",
groups = {choppy=2,cracky=2,door=1},
Expand Down
2 changes: 1 addition & 1 deletion my_misc_doors/locked.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ local mdoor_list = { --Number , Description , Inven Image , Image
}

local function add_door(desc, img)
mydoors.register_door("my_misc_doors:"..img.."_locked", {
doors.register_door("my_misc_doors:"..img.."_locked", {
description = desc.." Locked",
inventory_image = "mymdoors_"..img.."_inv.png",
groups = {choppy=2,cracky=2,door=1},
Expand Down
2 changes: 1 addition & 1 deletion my_misc_doors/unlocked.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ local mdoor_list = { --Number , Description , Inven Image , Image
}

local function add_door(desc, img)
mydoors.register_door("my_misc_doors:"..img, {
doors.register_door("my_misc_doors:"..img, {
description = desc,
inventory_image = "mymdoors_"..img.."_inv.png",
groups = {choppy=2,cracky=2,door=1},
Expand Down
2 changes: 1 addition & 1 deletion my_old_doors/locked.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ local cdoor_list = { --Number , Description , Inven Image , Image
}

local function add_door(num, desc, img)
mydoors.register_door("my_old_doors:door"..num.."_locked", {
doors.register_door("my_old_doors:door"..num.."_locked", {
description = desc.." Locked",
inventory_image = "mydoors_"..img.."_inv.png",
groups = {choppy=2,cracky=2,door=1},
Expand Down
2 changes: 1 addition & 1 deletion my_old_doors/unlocked.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ local cdoor_list = { --Number , Description , Inven Image , Image
}

local function add_door(num, desc, img)
mydoors.register_door("my_old_doors:door"..num, {
doors.register_door("my_old_doors:door"..num, {
description = desc,
inventory_image = "mydoors_"..img.."_inv.png",
groups = {choppy=2,cracky=2,door=1},
Expand Down