diff --git a/computers/README.txt b/computers/README.txt index f7fccde..8686ee0 100644 --- a/computers/README.txt +++ b/computers/README.txt @@ -47,3 +47,5 @@ Thanks to all the people in the forums and the #minetest IRC channel for See also: http://minetest.net/ + +license WTFPL https://github.com/minetest-mods/computer/blob/master/README.txt#L36-L38 diff --git a/computers/computers.lua b/computers/computers.lua index c1a7d1a..6596d77 100644 --- a/computers/computers.lua +++ b/computers/computers.lua @@ -80,7 +80,7 @@ minetest.register_node("computers:piepad", { walkable = false, groups = {oddly_breakable_by_hand=2}, selection_box = {type = "wallmounted"}, - sounds = default.node_sound_wood_defaults() + sounds = default and default.node_sound_wood_defaults() or nil }) -- Commodore 64 lookalike @@ -173,7 +173,7 @@ minetest.register_node("computers:router", { paramtype2 = "facedir", walkable = false, groups = {snappy=3}, - sound = default.node_sound_wood_defaults(), + sound = default and default.node_sound_wood_defaults() or nil, drawtype = "nodebox", node_box = { type = "fixed", @@ -201,7 +201,7 @@ minetest.register_node("computers:tower", { paramtype = "light", paramtype2 = "facedir", groups = {snappy=3}, - sound = default.node_sound_wood_defaults(), + sound = default and default.node_sound_wood_defaults() or nil, selection_box = pct_cbox, collision_box = pct_cbox }) @@ -230,7 +230,7 @@ minetest.register_node("computers:server", { type = "fixed", 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) node.name = "computers:server_on" minetest.set_node(pos, node) @@ -269,7 +269,7 @@ minetest.register_node("computers:server_on", { type = "fixed", 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', on_rightclick = function(pos, node, clicker, itemstack) node.name = "computers:server" @@ -289,7 +289,7 @@ minetest.register_node("computers:printer", { paramtype2 = "facedir", walkable = true, groups = {snappy=3}, - sound = default.node_sound_wood_defaults(), + sound = default and default.node_sound_wood_defaults() or nil, drawtype = "nodebox", node_box = { type = "fixed", diff --git a/computers/init.lua b/computers/init.lua index c017277..3bdfd9b 100644 --- a/computers/init.lua +++ b/computers/init.lua @@ -93,6 +93,7 @@ end local MODPATH = minetest.get_modpath("computers") dofile(MODPATH.."/computers.lua") -dofile(MODPATH.."/recipes.lua") dofile(MODPATH.."/gaming.lua") dofile(MODPATH.."/aliases.lua") + +if minetest.get_modpath("default") and minetest.get_modpath("basic_materials") then dofile(MODPATH.."/recipes.lua") end \ No newline at end of file diff --git a/computers/mod.conf b/computers/mod.conf index 64381f0..77e5d97 100644 --- a/computers/mod.conf +++ b/computers/mod.conf @@ -1,3 +1,2 @@ name = computers -depends = default, basic_materials -optional_depends = screwdriver +optional_depends = screwdriver, default, basic_materials diff --git a/home_workshop_misc/init.lua b/home_workshop_misc/init.lua index 855d5ce..8e80a8b 100644 --- a/home_workshop_misc/init.lua +++ b/home_workshop_misc/init.lua @@ -76,7 +76,7 @@ minetest.register_node("home_workshop_misc:beer_mug", { paramtype2 = "facedir", groups = { snappy=3, oddly_breakable_by_hand=3 }, walkable = false, - sounds = default.node_sound_glass_defaults(), + sounds = default and default.node_sound_glass_defaults() or nil, selection_box = beer_cbox, on_use = function(itemstack, user, pointed_thing) if not minetest.is_creative_enabled(user:get_player_name()) then @@ -96,7 +96,7 @@ else end 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_bottom", "home_workshop_misc:tool_cabinet") diff --git a/home_workshop_misc/mod.conf b/home_workshop_misc/mod.conf index 8549a3f..b3958bb 100644 --- a/home_workshop_misc/mod.conf +++ b/home_workshop_misc/mod.conf @@ -1,3 +1,2 @@ name = home_workshop_misc -depends = default -optional_depends = currency, screwdriver, homedecor_common +optional_depends = currency, screwdriver, homedecor_common, default