Merge pull request #3 from mt-mods/mtg_removal

mtg dep removal
This commit is contained in:
wsor4035 2021-12-26 13:00:07 -05:00 committed by GitHub
commit 2058c58738
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
9 changed files with 25 additions and 22 deletions

View File

@ -1,6 +1,7 @@
 
Decorative Computers Mod for Minetest Decorative Computers Mod for Minetest
by Diego Martínez <kaeza@users.sf.net> by Diego Martínez <kaeza@users.sf.net> and contributors
license [MIT](https://spdx.org/licenses/MIT.html)
How to install: How to install:
Unzip the archive an place it in minetest-base-directory/mods/minetest/ Unzip the archive an place it in minetest-base-directory/mods/minetest/
@ -46,4 +47,4 @@ Thanks to all the people in the forums and the #minetest IRC channel for
was you ;) ). was you ;) ).
See also: See also:
http://minetest.net/ http://minetest.net/

View File

@ -80,7 +80,7 @@ minetest.register_node("computers:piepad", {
walkable = false, walkable = false,
groups = {oddly_breakable_by_hand=2}, groups = {oddly_breakable_by_hand=2},
selection_box = {type = "wallmounted"}, selection_box = {type = "wallmounted"},
sounds = default.node_sound_wood_defaults() sounds = default and default.node_sound_wood_defaults() or nil
}) })
-- Commodore 64 lookalike -- Commodore 64 lookalike
@ -173,7 +173,7 @@ minetest.register_node("computers:router", {
paramtype2 = "facedir", paramtype2 = "facedir",
walkable = false, walkable = false,
groups = {snappy=3}, groups = {snappy=3},
sound = default.node_sound_wood_defaults(), sound = default and default.node_sound_wood_defaults() or nil,
drawtype = "nodebox", drawtype = "nodebox",
node_box = { node_box = {
type = "fixed", type = "fixed",
@ -201,7 +201,7 @@ minetest.register_node("computers:tower", {
paramtype = "light", paramtype = "light",
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {snappy=3}, groups = {snappy=3},
sound = default.node_sound_wood_defaults(), sound = default and default.node_sound_wood_defaults() or nil,
selection_box = pct_cbox, selection_box = pct_cbox,
collision_box = pct_cbox collision_box = pct_cbox
}) })
@ -230,7 +230,7 @@ minetest.register_node("computers:server", {
type = "fixed", type = "fixed",
fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375} fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375}
}, },
sounds = default.node_sound_wood_defaults(), sounds = default and default.node_sound_wood_defaults() or nil,
on_rightclick = function(pos, node, clicker, itemstack) on_rightclick = function(pos, node, clicker, itemstack)
node.name = "computers:server_on" node.name = "computers:server_on"
minetest.set_node(pos, node) minetest.set_node(pos, node)
@ -269,7 +269,7 @@ minetest.register_node("computers:server_on", {
type = "fixed", type = "fixed",
fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375} fixed = {-0.5, -0.5, -0.25, 0.5, 1.125, 0.4375}
}, },
sounds = default.node_sound_wood_defaults(), sounds = default and default.node_sound_wood_defaults() or nil,
drop = 'computers:server', drop = 'computers:server',
on_rightclick = function(pos, node, clicker, itemstack) on_rightclick = function(pos, node, clicker, itemstack)
node.name = "computers:server" node.name = "computers:server"
@ -289,7 +289,7 @@ minetest.register_node("computers:printer", {
paramtype2 = "facedir", paramtype2 = "facedir",
walkable = true, walkable = true,
groups = {snappy=3}, groups = {snappy=3},
sound = default.node_sound_wood_defaults(), sound = default and default.node_sound_wood_defaults() or nil,
drawtype = "nodebox", drawtype = "nodebox",
node_box = { node_box = {
type = "fixed", type = "fixed",

View File

@ -298,8 +298,7 @@ local function step(pos, fields)
t.score, close, buttons } t.score, close, buttons }
meta:set_string("formspec", concat(scr) meta:set_string("formspec", concat(scr))
..default.gui_bg..default.gui_bg_img..default.gui_slots)
meta:set_string("tetris", minetest.serialize(t)) meta:set_string("tetris", minetest.serialize(t))
end end
@ -326,8 +325,7 @@ minetest.register_node("computers:tetris_arcade", {
on_construct = function(pos) on_construct = function(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
meta:set_string("formspec", formsize meta:set_string("formspec", formsize
.."button[2,2.5;2,2;new;"..minetest.formspec_escape(S("New Game")).."]" .."button[2,2.5;2,2;new;"..minetest.formspec_escape(S("New Game")).."]")
..default.gui_bg..default.gui_bg_img..default.gui_slots)
end, end,
on_timer = function(pos) on_timer = function(pos)
return step(pos, nil) return step(pos, nil)

View File

@ -93,6 +93,9 @@ end
local MODPATH = minetest.get_modpath("computers") local MODPATH = minetest.get_modpath("computers")
dofile(MODPATH.."/computers.lua") dofile(MODPATH.."/computers.lua")
dofile(MODPATH.."/recipes.lua")
dofile(MODPATH.."/gaming.lua") dofile(MODPATH.."/gaming.lua")
dofile(MODPATH.."/aliases.lua") dofile(MODPATH.."/aliases.lua")
if minetest.get_modpath("default") and minetest.get_modpath("basic_materials") then
dofile(MODPATH.."/recipes.lua")
end

View File

@ -1,3 +1,2 @@
name = computers name = computers
depends = default, basic_materials optional_depends = screwdriver, default, basic_materials
optional_depends = screwdriver

View File

@ -17,7 +17,7 @@ minetest.register_node("home_workshop_machines:3dprinter_bedflinger", {
paramtype = "light", paramtype = "light",
walkable = true, walkable = true,
groups = {snappy=3, ud_param2_colorable = 1}, groups = {snappy=3, ud_param2_colorable = 1},
sound = default.node_sound_wood_defaults(), sound = default and default.node_sound_wood_defaults() or nil,
drawtype = "mesh", drawtype = "mesh",
mesh = "home_workshop_machines_3dprinter_bedflinger.obj", mesh = "home_workshop_machines_3dprinter_bedflinger.obj",
paramtype2 = "colorwallmounted", paramtype2 = "colorwallmounted",
@ -47,7 +47,7 @@ minetest.register_node("home_workshop_machines:3dprinter_corexy", {
paramtype = "light", paramtype = "light",
walkable = true, walkable = true,
groups = {snappy=3, ud_param2_colorable = 1}, groups = {snappy=3, ud_param2_colorable = 1},
sound = default.node_sound_wood_defaults(), sound = default and default.node_sound_wood_defaults() or nil,
drawtype = "mesh", drawtype = "mesh",
mesh = "home_workshop_machines_3dprinter_corexy.obj", mesh = "home_workshop_machines_3dprinter_corexy.obj",
paramtype2 = "colorwallmounted", paramtype2 = "colorwallmounted",

View File

@ -1,3 +1,4 @@
name = home_workshop_machines name = home_workshop_machines
depends = default, unifieddyes depends = unifieddyes
optional_depends = default
optional_depends = screwdriver optional_depends = screwdriver

View File

@ -76,7 +76,7 @@ minetest.register_node("home_workshop_misc:beer_mug", {
paramtype2 = "facedir", paramtype2 = "facedir",
groups = { snappy=3, oddly_breakable_by_hand=3 }, groups = { snappy=3, oddly_breakable_by_hand=3 },
walkable = false, walkable = false,
sounds = default.node_sound_glass_defaults(), sounds = default and default.node_sound_glass_defaults() or nil,
selection_box = beer_cbox, selection_box = beer_cbox,
on_use = function(itemstack, user, pointed_thing) on_use = function(itemstack, user, pointed_thing)
if not minetest.is_creative_enabled(user:get_player_name()) then if not minetest.is_creative_enabled(user:get_player_name()) then
@ -96,7 +96,9 @@ else
end end
local MODPATH = minetest.get_modpath("home_workshop_misc") local MODPATH = minetest.get_modpath("home_workshop_misc")
dofile(MODPATH.."/crafts.lua") if minetest.get_modpath("default") and minetest.get_modpath("basic_materials") then
dofile(MODPATH.."/crafts.lua")
end
minetest.register_alias("homedecor:tool_cabinet", "home_workshop_misc:tool_cabinet") minetest.register_alias("homedecor:tool_cabinet", "home_workshop_misc:tool_cabinet")
minetest.register_alias("homedecor:tool_cabinet_bottom", "home_workshop_misc:tool_cabinet") minetest.register_alias("homedecor:tool_cabinet_bottom", "home_workshop_misc:tool_cabinet")

View File

@ -1,3 +1,2 @@
name = home_workshop_misc name = home_workshop_misc
depends = default optional_depends = currency, screwdriver, homedecor_common, default
optional_depends = currency, screwdriver, homedecor_common