1
0
forked from MTSR/moreblocks

Optional dependency on default mod (#182)

This commit is contained in:
Buckaroo Banzai 2021-08-26 20:46:07 +02:00 committed by GitHub
parent 1f1959ba54
commit e8d219f108
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 121 additions and 90 deletions

View File

@ -363,9 +363,15 @@ function circular_saw.on_metadata_inventory_take(
-- The recycle field plays no role here since it is processed immediately. -- The recycle field plays no role here since it is processed immediately.
end end
local has_default_mod = minetest.get_modpath("default")
function circular_saw.on_construct(pos) function circular_saw.on_construct(pos)
local meta = minetest.get_meta(pos) local meta = minetest.get_meta(pos)
local fancy_inv = default.gui_bg..default.gui_bg_img..default.gui_slots local fancy_inv = ""
if has_default_mod then
-- prepend background and slot styles from default if available
fancy_inv = default.gui_bg..default.gui_bg_img..default.gui_slots
end
meta:set_string( meta:set_string(
"formspec", "size[11,10]"..fancy_inv.. "formspec", "size[11,10]"..fancy_inv..
"label[0,0;" ..F(S("Input\nmaterial")).. "]" .. "label[0,0;" ..F(S("Input\nmaterial")).. "]" ..
@ -437,7 +443,7 @@ minetest.register_node("moreblocks:circular_saw", {
sunlight_propagates = true, sunlight_propagates = true,
paramtype2 = "facedir", paramtype2 = "facedir",
groups = {choppy = 2,oddly_breakable_by_hand = 2}, groups = {choppy = 2,oddly_breakable_by_hand = 2},
sounds = default.node_sound_wood_defaults(), sounds = moreblocks.node_sound_wood_defaults(),
on_construct = circular_saw.on_construct, on_construct = circular_saw.on_construct,
can_dig = circular_saw.can_dig, can_dig = circular_saw.can_dig,
-- Set the owner of this circular saw. -- Set the owner of this circular saw.

View File

@ -17,9 +17,13 @@ moreblocks.S = S
moreblocks.NS = NS moreblocks.NS = NS
dofile(modpath .. "/config.lua") dofile(modpath .. "/config.lua")
dofile(modpath .. "/sounds.lua")
dofile(modpath .. "/circular_saw.lua") dofile(modpath .. "/circular_saw.lua")
dofile(modpath .. "/stairsplus/init.lua") dofile(modpath .. "/stairsplus/init.lua")
if minetest.get_modpath("default") then
dofile(modpath .. "/nodes.lua") dofile(modpath .. "/nodes.lua")
dofile(modpath .. "/redefinitions.lua") dofile(modpath .. "/redefinitions.lua")
dofile(modpath .. "/crafting.lua") dofile(modpath .. "/crafting.lua")
dofile(modpath .. "/aliases.lua") dofile(modpath .. "/aliases.lua")
end

View File

@ -1,5 +1,4 @@
name = moreblocks name = moreblocks
description = Adds various miscellaneous blocks to the game. description = Adds various miscellaneous blocks to the game.
depends = default optional_depends = default,intllib,stairs,farming,wool,basic_materials
optional_depends = intllib,stairs,farming,wool,basic_materials
min_minetest_version = 5.0.0 min_minetest_version = 5.0.0

View File

@ -7,15 +7,15 @@ Licensed under the zlib license. See LICENSE.md for more information.
local S = moreblocks.S local S = moreblocks.S
local sound_dirt = default.node_sound_dirt_defaults() local sound_dirt = moreblocks.node_sound_dirt_defaults()
local sound_wood = default.node_sound_wood_defaults() local sound_wood = moreblocks.node_sound_wood_defaults()
local sound_stone = default.node_sound_stone_defaults() local sound_stone = moreblocks.node_sound_stone_defaults()
local sound_glass = default.node_sound_glass_defaults() local sound_glass = moreblocks.node_sound_glass_defaults()
local sound_leaves = default.node_sound_leaves_defaults() local sound_leaves = moreblocks.node_sound_leaves_defaults()
-- Don't break on 0.4.14 and earlier. -- Don't break on 0.4.14 and earlier.
local sound_metal = (default.node_sound_metal_defaults local sound_metal = (moreblocks.node_sound_metal_defaults
and default.node_sound_metal_defaults() or sound_stone) and moreblocks.node_sound_metal_defaults() or sound_stone)
local function tile_tiles(name) local function tile_tiles(name)
local tex = "moreblocks_" ..name.. ".png" local tex = "moreblocks_" ..name.. ".png"

20
sounds.lua Normal file
View File

@ -0,0 +1,20 @@
--[[
More Blocks: sound definitions
Copyright © 2011-2021 Hugo Locurcio and contributors.
Licensed under the zlib license. See LICENSE.md for more information.
--]]
local has_default_mod = minetest.get_modpath("default")
for _, sound in ipairs({"dirt", "wood", "stone", "metal", "glass", "leaves"}) do
-- use sound-function from default if available
-- otherwise fall back to a no-op function (no sounds)
local sound_function_name = "node_sound_" .. sound .. "_defaults"
if has_default_mod then
-- use default sounds
moreblocks[sound_function_name] = default[sound_function_name]
else
-- no-op
moreblocks[sound_function_name] = function() end
end
end

View File

@ -10,7 +10,7 @@
description = "Wooden", description = "Wooden",
tiles = {"default_wood.png"}, tiles = {"default_wood.png"},
groups = {oddly_breakabe_by_hand=1}, groups = {oddly_breakabe_by_hand=1},
sounds = default.node_sound_wood_defaults(), sounds = moreblocks.node_sound_wood_defaults(),
}) })
``` ```
The following register only a particular type of microblock. The following register only a particular type of microblock.

View File

@ -69,7 +69,7 @@ local function register_custom_subset(subset, modname, subname, recipeitem, grou
description = description, description = description,
drop = drop, drop = drop,
light_source = light, light_source = light,
sounds = default.node_sound_stone_defaults(), sounds = moreblocks.node_sound_stone_defaults(),
}) })
end end

View File

@ -15,7 +15,7 @@ local function register_micro(modname, subname, recipeitem, groups, images, desc
description = description, description = description,
drop = drop, drop = drop,
light_source = light, light_source = light,
sounds = default.node_sound_stone_defaults(), sounds = moreblocks.node_sound_stone_defaults(),
}) })
end end

View File

@ -15,7 +15,7 @@ local function register_panel(modname, subname, recipeitem, groups, images, desc
description = description, description = description,
drop = drop, drop = drop,
light_source = light, light_source = light,
sounds = default.node_sound_stone_defaults(), sounds = moreblocks.node_sound_stone_defaults(),
}) })
end end

View File

@ -6,6 +6,7 @@ Licensed under the zlib license. See LICENSE.md for more information.
--]] --]]
-- default registrations -- default registrations
if minetest.get_modpath("default") then
local default_nodes = { -- Default stairs/slabs/panels/microblocks: local default_nodes = { -- Default stairs/slabs/panels/microblocks:
"stone", "stone",
"stone_block", "stone_block",
@ -76,6 +77,7 @@ for _, name in pairs(default_nodes) do
minetest.register_alias_force("stairs:stair_inner_" .. name, mod .. ":stair_" .. name .. "_inner") minetest.register_alias_force("stairs:stair_inner_" .. name, mod .. ":stair_" .. name .. "_inner")
minetest.register_alias_force("stairs:slab_" .. name, mod .. ":slab_" .. name) minetest.register_alias_force("stairs:slab_" .. name, mod .. ":slab_" .. name)
end end
end
-- farming registrations -- farming registrations
if minetest.get_modpath("farming") then if minetest.get_modpath("farming") then
@ -118,7 +120,7 @@ if minetest.get_modpath("basic_materials") then
description = "Concrete", description = "Concrete",
tiles = {"basic_materials_concrete_block.png",}, tiles = {"basic_materials_concrete_block.png",},
groups = {cracky=1, level=2, concrete=1}, groups = {cracky=1, level=2, concrete=1},
sounds = default.node_sound_stone_defaults(), sounds = moreblocks.node_sound_stone_defaults(),
}) })
minetest.register_alias("prefab:concrete_stair","technic:stair_concrete") minetest.register_alias("prefab:concrete_stair","technic:stair_concrete")
@ -128,7 +130,7 @@ if minetest.get_modpath("basic_materials") then
description = "Cement", description = "Cement",
tiles = {"basic_materials_cement_block.png"}, tiles = {"basic_materials_cement_block.png"},
groups = {cracky=2, not_in_creative_inventory=1}, groups = {cracky=2, not_in_creative_inventory=1},
sounds = default.node_sound_stone_defaults(), sounds = moreblocks.node_sound_stone_defaults(),
sunlight_propagates = true, sunlight_propagates = true,
}) })

View File

@ -15,7 +15,7 @@ local function register_slab(modname, subname, recipeitem, groups, images, descr
description = description, description = description,
drop = drop, drop = drop,
light_source = light, light_source = light,
sounds = default.node_sound_stone_defaults(), sounds = moreblocks.node_sound_stone_defaults(),
}) })
end end

View File

@ -15,7 +15,7 @@ local function register_slope(modname, subname, recipeitem, groups, images, desc
description = description, description = description,
drop = drop, drop = drop,
light_source = light, light_source = light,
sounds = default.node_sound_stone_defaults(), sounds = moreblocks.node_sound_stone_defaults(),
}) })
end end

View File

@ -15,7 +15,7 @@ local function register_stair(modname, subname, recipeitem, groups, images, desc
description = description, description = description,
drop = drop, drop = drop,
light_source = light, light_source = light,
sounds = default.node_sound_stone_defaults(), sounds = moreblocks.node_sound_stone_defaults(),
}) })
end end