From 8f97d79dc57979b714b3463f8ba4d94da8bffe42 Mon Sep 17 00:00:00 2001 From: Minetest dedicated server Date: Sat, 29 Jun 2024 04:09:16 +0000 Subject: Remove xcompat dependency --- signs/crafts.lua | 63 ---------------- signs/init.lua | 1 - signs/mod.conf | 2 +- signs_api/init.lua | 2 +- signs_api/mod.conf | 2 +- signs_road/crafts.lua | 204 -------------------------------------------------- signs_road/init.lua | 1 - signs_road/mod.conf | 2 +- 8 files changed, 4 insertions(+), 273 deletions(-) delete mode 100644 signs/crafts.lua delete mode 100644 signs_road/crafts.lua diff --git a/signs/crafts.lua b/signs/crafts.lua deleted file mode 100644 index 3267c19..0000000 --- a/signs/crafts.lua +++ /dev/null @@ -1,63 +0,0 @@ -local mat = xcompat.materials - -minetest.register_craft({ - output = 'signs:wooden_right_sign', - recipe = { - {'group:wood', 'group:wood', 'group:wood'}, - {'group:wood', 'group:wood', mat.dye_black}, - {'', '', ''}, - } -}) - -minetest.register_craft({ - output = 'signs:wooden_right_sign', - type = 'shapeless', - recipe = { 'signs:wooden_long_sign' } -}) - -minetest.register_craft({ - output = 'signs:wooden_long_sign', - recipe = { - {'group:wood', mat.dye_black, 'group:wood'}, - {'group:wood', 'group:wood', 'group:wood'}, - {'', '', ''}, - } -}) - -minetest.register_craft({ - output = 'signs:wooden_long_sign', - type = 'shapeless', - recipe = { 'signs:wooden_right_sign' } -}) - -minetest.register_craft({ - output = 'signs:wooden_sign', - recipe = { - {'', mat.dye_black, ''}, - {'group:wood', 'group:wood', 'group:wood'}, - {'group:wood', 'group:wood', 'group:wood'}, - } -}) - -minetest.register_craft({ - output = 'signs:paper_poster', - recipe = { - {mat.paper, mat.paper, mat.dye_black}, - {mat.paper, mat.paper, ''}, - {mat.paper, mat.paper, ''}, - } -}) - -minetest.register_craft({ - output = 'signs:label_small', - recipe = { - {mat.paper, mat.dye_black}, - } -}) - -minetest.register_craft({ - output = 'signs:label_medium', - recipe = { - {mat.paper, mat.paper, mat.dye_black}, - } -}) diff --git a/signs/init.lua b/signs/init.lua index b2870c8..c4ae41e 100644 --- a/signs/init.lua +++ b/signs/init.lua @@ -27,7 +27,6 @@ signs.S = minetest.get_translator(signs.name) dofile(signs.path.."/common.lua") dofile(signs.path.."/nodes.lua") -dofile(signs.path.."/crafts.lua") dofile(signs.path.."/compatibility.lua") diff --git a/signs/mod.conf b/signs/mod.conf index 39dde18..eb39342 100644 --- a/signs/mod.conf +++ b/signs/mod.conf @@ -1,4 +1,4 @@ name = signs title = Signs description = Basic signs and posters with text display using signs_api -depends = signs_api, xcompat +depends = signs_api diff --git a/signs_api/init.lua b/signs_api/init.lua index ef3b81c..c452960 100644 --- a/signs_api/init.lua +++ b/signs_api/init.lua @@ -170,7 +170,7 @@ function signs_api.register_sign(mod, name, model) }, groups = {choppy=2, dig_immediate=2, not_blocking_trains=1, display_api=1,signs_api_formspec_lbm=1}, is_ground_content = false, - sounds = xcompat.sounds.node_sound_default(), + sounds = {}, display_entities = { ["signs:display_text"] = { on_display_update = font_api.on_display_update, diff --git a/signs_api/mod.conf b/signs_api/mod.conf index 55ffb0a..a59246b 100644 --- a/signs_api/mod.conf +++ b/signs_api/mod.conf @@ -1,4 +1,4 @@ name = signs_api title = Signs API description = A library providing various helper functions for registereing signs with text display -depends = display_api, font_api, xcompat +depends = display_api, font_api diff --git a/signs_road/crafts.lua b/signs_road/crafts.lua deleted file mode 100644 index f888916..0000000 --- a/signs_road/crafts.lua +++ /dev/null @@ -1,204 +0,0 @@ ---[[ - signs_road mod for Minetest - Various road signs with text displayed - on. - (c) Pierre-Yves Rollo - - This file is part of signs_road. - - signs_road is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - signs_road is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with signs_road. If not, see . ---]] - -local mat = xcompat.materials - --- Standard rectangle signs - -minetest.register_craft({ - output = 'signs_road:white_sign 2', - recipe = { - {mat.dye_white, mat.dye_black, ''}, - {mat.steel_ingot, mat.steel_ingot, mat.steel_ingot}, - {'', '', ''}, - } -}) - -minetest.register_craft({ - output = 'signs_road:blue_sign 2', - recipe = { - {mat.dye_blue, mat.dye_white, ''}, - {mat.steel_ingot, mat.steel_ingot, mat.steel_ingot}, - {'', '', ''}, - } -}) - -minetest.register_craft({ - output = 'signs_road:green_sign 2', - recipe = { - {mat.dye_green, mat.dye_white, ''}, - {mat.steel_ingot, mat.steel_ingot, mat.steel_ingot}, - {'', '', ''}, - } -}) - -minetest.register_craft({ - output = 'signs_road:yellow_sign 2', - recipe = { - {mat.dye_yellow, mat.dye_black, ''}, - {mat.steel_ingot, mat.steel_ingot, mat.steel_ingot}, - {'', '', ''}, - } -}) - -minetest.register_craft({ - output = 'signs_road:red_sign 2', - recipe = { - {mat.dye_red, mat.dye_white, ''}, - {mat.steel_ingot, mat.steel_ingot, mat.steel_ingot}, - {'', '', ''}, - } -}) - --- Standard direction signs - -minetest.register_craft({ - output = 'signs_road:black_right_sign 2', - recipe = { - {mat.dye_black, mat.dye_white, mat.steel_ingot}, - {mat.steel_ingot, mat.steel_ingot, ''}, - {'', '', ''}, - } -}) - -minetest.register_craft({ - output = 'signs_road:white_right_sign 2', - recipe = { - {mat.dye_white, mat.dye_black, mat.steel_ingot}, - {mat.steel_ingot, mat.steel_ingot, ''}, - {'', '', ''}, - } -}) - -minetest.register_craft({ - output = 'signs_road:blue_right_sign 2', - recipe = { - {mat.dye_blue, mat.dye_white, mat.steel_ingot}, - {mat.steel_ingot, mat.steel_ingot, ''}, - {'', '', ''}, - } -}) - -minetest.register_craft({ - output = 'signs_road:green_right_sign 2', - recipe = { - {mat.dye_green, mat.dye_white, mat.steel_ingot}, - {mat.steel_ingot, mat.steel_ingot, ''}, - {'', '', ''}, - } -}) - -minetest.register_craft({ - output = 'signs_road:yellow_right_sign 2', - recipe = { - {mat.dye_yellow, mat.dye_black, mat.steel_ingot}, - {mat.steel_ingot, mat.steel_ingot, ''}, - {'', '', ''}, - } -}) - -minetest.register_craft({ - output = 'signs_road:red_right_sign 2', - recipe = { - {mat.dye_red, mat.dye_white, mat.steel_ingot}, - {mat.steel_ingot, mat.steel_ingot, ''}, - {'', '', ''}, - } -}) - --- Transform Rectangle <-> Direction - -minetest.register_craft({ - type = 'shapeless', output = 'signs_road:white_right_sign', - recipe = {'signs_road:white_sign'}, -}) - -minetest.register_craft({ - type = 'shapeless', output = 'signs_road:white_sign', - recipe = {'signs_road:white_right_sign'}, -}) - -minetest.register_craft({ - type = 'shapeless', output = 'signs_road:blue_right_sign', - recipe = {'signs_road:blue_sign'}, -}) - -minetest.register_craft({ - type = 'shapeless', output = 'signs_road:blue_sign', - recipe = {'signs_road:blue_right_sign'}, -}) - -minetest.register_craft({ - type = 'shapeless', output = 'signs_road:green_right_sign', - recipe = {'signs_road:green_sign'}, -}) - -minetest.register_craft({ - type = 'shapeless', output = 'signs_road:green_sign', - recipe = {'signs_road:green_right_sign'}, -}) - -minetest.register_craft({ - type = 'shapeless', output = 'signs_road:yellow_right_sign', - recipe = {'signs_road:yellow_sign'}, -}) - -minetest.register_craft({ - type = 'shapeless', output = 'signs_road:yellow_sign', - recipe = {'signs_road:yellow_right_sign'}, -}) - -minetest.register_craft({ - type = 'shapeless', output = 'signs_road:red_right_sign', - recipe = {'signs_road:red_sign'}, -}) - -minetest.register_craft({ - type = 'shapeless', output = 'signs_road:red_sign', - recipe = {'signs_road:red_right_sign'}, -}) - --- Various signs - -minetest.register_craft({ - output = 'signs_road:blue_street_sign 4', - recipe = { - {mat.dye_blue, mat.dye_white, mat.dye_blue}, - {mat.steel_ingot, mat.steel_ingot, mat.steel_ingot}, - {mat.steel_ingot, mat.steel_ingot, mat.steel_ingot}, - } -}) - -minetest.register_craft({ - output = 'signs_road:red_street_sign 2', - recipe = { - {mat.dye_white, mat.dye_red, mat.dye_black}, - {mat.steel_ingot, mat.steel_ingot, mat.steel_ingot}, - {'', '', ''}, - } -}) - -minetest.register_craft({ - type = "shapeless", - output = 'signs_road:large_street_sign', - recipe = {'signs_road:white_street_sign', 'signs_road:white_street_sign', - 'signs_road:white_street_sign', 'signs_road:white_street_sign'}, -}) diff --git a/signs_road/init.lua b/signs_road/init.lua index 67991ae..aa7046c 100644 --- a/signs_road/init.lua +++ b/signs_road/init.lua @@ -27,7 +27,6 @@ signs_road.path = minetest.get_modpath(signs_road.name) signs_road.S = minetest.get_translator(signs_road.name) dofile(signs_road.path.."/nodes.lua") -dofile(signs_road.path.."/crafts.lua") dofile(signs_road.path.."/compatibility.lua") diff --git a/signs_road/mod.conf b/signs_road/mod.conf index 920a3f4..6daf941 100644 --- a/signs_road/mod.conf +++ b/signs_road/mod.conf @@ -1,4 +1,4 @@ name = signs_road title = Signs Road description = Various road signs with text display using signs_api -depends = signs_api, xcompat +depends = signs_api -- cgit v1.2.3