Michieal
/
MineClone2
mirror of https://git.minetest.land/MineClone2/MineClone2.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request 'fix incorrect digtypes and missing sounds for some nether blocks' (#3351) from SmokeyDope/MineClone2:master into master 

Reviewed-on: MineClone2/MineClone2#3351
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
This commit is contained in:
ancientmarinerdev 2023-02-04 00:27:48 +00:00
parent cdc922d4ac 08df1fe02f
commit 58a08ea697
4 changed files with 76 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
mods/ITEMS/mcl_blackstone/init.lua
View File

@ -12,7 +12,7 @@ minetest.register_node("mcl_blackstone:blackstone", {
tiles = {"mcl_blackstone_top.png", "mcl_blackstone_top.png", "mcl_blackstone_side.png"}, tiles = {"mcl_blackstone_top.png", "mcl_blackstone_top.png", "mcl_blackstone_side.png"},
sounds = mcl_sounds.node_sound_stone_defaults(), sounds = mcl_sounds.node_sound_stone_defaults(),
is_ground_content = false, is_ground_content = false,
groups = {cracky = 3, pickaxey=2, material_stone=1, cobble=1}, groups = {cracky = 3, pickaxey=1, material_stone=1, cobble=1},
_mcl_blast_resistance = 6, _mcl_blast_resistance = 6,
_mcl_hardness = 1.5, _mcl_hardness = 1.5,
}) })
@ -21,7 +21,7 @@ minetest.register_node("mcl_blackstone:blackstone_gilded", {
tiles = {"mcl_blackstone_gilded.png"}, tiles = {"mcl_blackstone_gilded.png"},
sounds = mcl_sounds.node_sound_stone_defaults(), sounds = mcl_sounds.node_sound_stone_defaults(),
is_ground_content = false, is_ground_content = false,
groups = {cracky = 3, pickaxey=2, material_stone=1, xp=1}, groups = {cracky = 3, pickaxey=1, material_stone=1, xp=1},
drop = { drop = {
max_items = 1, max_items = 1,
items = { items = {
@ -43,7 +43,7 @@ minetest.register_node("mcl_blackstone:nether_gold", {
tiles = {"mcl_nether_gold_ore.png"}, tiles = {"mcl_nether_gold_ore.png"},
sounds = mcl_sounds.node_sound_stone_defaults(), sounds = mcl_sounds.node_sound_stone_defaults(),
is_ground_content = false, is_ground_content = false,
groups = {cracky = 3, pickaxey=2, material_stone=1, xp=1}, groups = {cracky = 3, pickaxey=1, material_stone=1, xp=1},
drop = { drop = {
max_items = 1, max_items = 1,
items = { items = {
@ -67,7 +67,7 @@ minetest.register_node("mcl_blackstone:basalt_polished", {
on_place = mcl_util.rotate_axis, on_place = mcl_util.rotate_axis,
on_rotate = on_rotate, on_rotate = on_rotate,
is_ground_content = false, is_ground_content = false,
groups = {cracky = 3, pickaxey=2, material_stone=1}, groups = {cracky = 3, pickaxey=1, material_stone=1},
_mcl_blast_resistance = 4.2, _mcl_blast_resistance = 4.2,
_mcl_hardness = 1.25, _mcl_hardness = 1.25,
}) })
@ -79,7 +79,7 @@ minetest.register_node("mcl_blackstone:basalt", {
on_place = mcl_util.rotate_axis, on_place = mcl_util.rotate_axis,
on_rotate = on_rotate, on_rotate = on_rotate,
is_ground_content = false, is_ground_content = false,
groups = {cracky = 3, pickaxey=2, material_stone=1}, groups = {cracky = 3, pickaxey=1, material_stone=1},
_mcl_blast_resistance = 4.2, _mcl_blast_resistance = 4.2,
_mcl_hardness = 1.25, _mcl_hardness = 1.25,
}) })
@ -88,7 +88,7 @@ minetest.register_node("mcl_blackstone:basalt_smooth", {
tiles = {"mcl_blackstone_basalt_smooth.png"}, tiles = {"mcl_blackstone_basalt_smooth.png"},
sounds = mcl_sounds.node_sound_stone_defaults(), sounds = mcl_sounds.node_sound_stone_defaults(),
is_ground_content = false, is_ground_content = false,
groups = {cracky = 3, pickaxey=2, material_stone=1}, groups = {cracky = 3, pickaxey=1, material_stone=1},
_mcl_blast_resistance = 4.2, _mcl_blast_resistance = 4.2,
_mcl_hardness = 1.25, _mcl_hardness = 1.25,
}) })
@ -97,7 +97,7 @@ minetest.register_node("mcl_blackstone:blackstone_polished", {
tiles = {"mcl_blackstone_polished.png"}, tiles = {"mcl_blackstone_polished.png"},
sounds = mcl_sounds.node_sound_stone_defaults(), sounds = mcl_sounds.node_sound_stone_defaults(),
is_ground_content = false, is_ground_content = false,
groups = {cracky = 3, pickaxey=2, material_stone=1}, groups = {cracky = 3, pickaxey=1, material_stone=1},
_mcl_blast_resistance = 6, _mcl_blast_resistance = 6,
_mcl_hardness = 2, _mcl_hardness = 2,
}) })
@ -106,7 +106,7 @@ minetest.register_node("mcl_blackstone:blackstone_chiseled_polished", {
tiles = {"mcl_blackstone_chiseled_polished.png"}, tiles = {"mcl_blackstone_chiseled_polished.png"},
sounds = mcl_sounds.node_sound_stone_defaults(), sounds = mcl_sounds.node_sound_stone_defaults(),
is_ground_content = false, is_ground_content = false,
groups = {cracky = 3, pickaxey=2, material_stone=1}, groups = {cracky = 3, pickaxey=1, material_stone=1},
_mcl_blast_resistance = 6, _mcl_blast_resistance = 6,
_mcl_hardness = 1.5, _mcl_hardness = 1.5,
}) })
@ -115,7 +115,7 @@ minetest.register_node("mcl_blackstone:blackstone_brick_polished", {
tiles = {"mcl_blackstone_polished_bricks.png"}, tiles = {"mcl_blackstone_polished_bricks.png"},
sounds = mcl_sounds.node_sound_stone_defaults(), sounds = mcl_sounds.node_sound_stone_defaults(),
is_ground_content = false, is_ground_content = false,
groups = {cracky = 3, pickaxey=2, material_stone=1}, groups = {cracky = 3, pickaxey=1, material_stone=1},
_mcl_blast_resistance = 6, _mcl_blast_resistance = 6,
_mcl_hardness = 1.5, _mcl_hardness = 1.5,
}) })
@ -125,7 +125,7 @@ minetest.register_node("mcl_blackstone:quartz_brick", {
sounds = mcl_sounds.node_sound_stone_defaults(), sounds = mcl_sounds.node_sound_stone_defaults(),
is_ground_content = false, is_ground_content = false,
sounds = mcl_sounds.node_sound_stone_defaults(), sounds = mcl_sounds.node_sound_stone_defaults(),
groups = {cracky = 3, pickaxey=2, material_stone=1}, groups = {cracky = 3, pickaxey=1, material_stone=1},
_mcl_blast_resistance = 0.8, _mcl_blast_resistance = 0.8,
_mcl_hardness = 0.8, _mcl_hardness = 0.8,
}) })

2
mods/ITEMS/mcl_core/nodes_climb.lua
View File

@ -158,7 +158,7 @@ minetest.register_node("mcl_core:vine", {
-- If dug, also dig a “dependant” vine below it. -- If dug, also dig a “dependant” vine below it.
-- A vine is dependant if it hangs from this node and has no supporting block. -- A vine is dependant if it hangs from this node and has no supporting block.
on_dig = function(pos, node, digger) on_dig = function(pos, node, digger)
local below = {x=pos.x, y=pos.y-1, z=pos.z} local below = vector.offset(pos,0,-1,0)
local belownode = minetest.get_node(below) local belownode = minetest.get_node(below)
minetest.node_dig(pos, node, digger) minetest.node_dig(pos, node, digger)
if belownode.name == node.name and (not mcl_core.check_vines_supported(below, belownode)) then if belownode.name == node.name and (not mcl_core.check_vines_supported(below, belownode)) then

71
mods/ITEMS/mcl_crimson/init.lua
View File

@ -76,10 +76,7 @@ minetest.register_node("mcl_crimson:warped_fungus", {
walkable = false, walkable = false,
groups = {dig_immediate=3,mushroom=1,attached_node=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,enderman_takable=1,deco_block=1}, groups = {dig_immediate=3,mushroom=1,attached_node=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,enderman_takable=1,deco_block=1},
light_source = 1, light_source = 1,
--[[ selection_box = { sounds = mcl_sounds.node_sound_leaves_defaults(),
type = "fixed",
fixed = { -3/16, -0.5, -3/16, 3/16, -2/16, 3/16 },
},]]
node_placement_prediction = "", node_placement_prediction = "",
on_rightclick = function(pos, node, pointed_thing, player, itemstack) on_rightclick = function(pos, node, pointed_thing, player, itemstack)
if pointed_thing:get_wielded_item():get_name() == "mcl_bone_meal:bone_meal" then if pointed_thing:get_wielded_item():get_name() == "mcl_bone_meal:bone_meal" then
@ -112,7 +109,8 @@ minetest.register_node("mcl_crimson:twisting_vines", {
walkable = false, walkable = false,
climbable = true, climbable = true,
buildable_to = true, buildable_to = true,
groups = {dig_immediate=3,vines=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,deco_block=1, shearsy = 1}, groups = {dig_immediate=3, shearsy=1, vines=1, dig_by_water=1, destroy_by_lava_flow=1, dig_by_piston=1, deco_block=1},
sounds = mcl_sounds.node_sound_leaves_defaults(),
selection_box = { selection_box = {
type = "fixed", type = "fixed",
fixed = { -3/16, -0.5, -3/16, 3/16, 0.5, 3/16 }, fixed = { -3/16, -0.5, -3/16, 3/16, 0.5, 3/16 },
@ -129,6 +127,14 @@ minetest.register_node("mcl_crimson:twisting_vines", {
itemstack:take_item() itemstack:take_item()
end end
grow_vines(pos, 1, "mcl_crimson:twisting_vines") grow_vines(pos, 1, "mcl_crimson:twisting_vines")
local idef = itemstack:get_definition()
local itemstack, success = minetest.item_place_node(itemstack, placer, pointed_thing)
if success then
if idef.sounds and idef.sounds.place then
minetest.sound_play(idef.sounds.place, {pos=above, gain=1}, true)
end
end
elseif clicker:get_wielded_item():get_name() == "mcl_bone_meal:bone_meal" then elseif clicker:get_wielded_item():get_name() == "mcl_bone_meal:bone_meal" then
if not minetest.is_creative_enabled(clicker:get_player_name()) then if not minetest.is_creative_enabled(clicker:get_player_name()) then
itemstack:take_item() itemstack:take_item()
@ -137,6 +143,15 @@ minetest.register_node("mcl_crimson:twisting_vines", {
end end
return itemstack return itemstack
end, end,
on_dig = function(pos, node, digger)
local above = vector.offset(pos,0,1,0)
local abovenode = minetest.get_node(above)
minetest.node_dig(pos, node, digger)
if abovenode.name == node.name and (not mcl_core.check_vines_supported(above, abovenode)) then
minetest.registered_nodes[node.name].on_dig(above, node, digger)
end
end,
drop = { drop = {
max_items = 1, max_items = 1,
items = { items = {
@ -155,7 +170,8 @@ minetest.register_node("mcl_crimson:twisting_vines", {
"mcl_crimson:twisting_vines", "mcl_crimson:twisting_vines",
"mcl_crimson:twisting_vines", "mcl_crimson:twisting_vines",
}, },
_mcl_blast_resistance = 0, _mcl_blast_resistance = 0.2,
_mcl_hardness = 0.2,
}) })
minetest.register_node("mcl_crimson:weeping_vines", { minetest.register_node("mcl_crimson:weeping_vines", {
@ -168,7 +184,8 @@ minetest.register_node("mcl_crimson:weeping_vines", {
walkable = false, walkable = false,
climbable = true, climbable = true,
buildable_to = true, buildable_to = true,
groups = {dig_immediate=3,vines=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,deco_block=1, shearsy = 1}, groups = {dig_immediate=3, shearsy=1, vines=1, dig_by_water=1, destroy_by_lava_flow=1, dig_by_piston=1, deco_block=1},
sounds = mcl_sounds.node_sound_leaves_defaults(),
selection_box = { selection_box = {
type = "fixed", type = "fixed",
fixed = { -3/16, -0.5, -3/16, 3/16, 0.5, 3/16 }, fixed = { -3/16, -0.5, -3/16, 3/16, 0.5, 3/16 },
@ -185,6 +202,14 @@ minetest.register_node("mcl_crimson:weeping_vines", {
itemstack:take_item() itemstack:take_item()
end end
grow_vines(pos, 1, "mcl_crimson:weeping_vines", -1) grow_vines(pos, 1, "mcl_crimson:weeping_vines", -1)
local idef = itemstack:get_definition()
local itemstack, success = minetest.item_place_node(itemstack, placer, pointed_thing)
if success then
if idef.sounds and idef.sounds.place then
minetest.sound_play(idef.sounds.place, {pos=above, gain=1}, true)
end
end
elseif clicker:get_wielded_item():get_name() == "mcl_bone_meal:bone_meal" then elseif clicker:get_wielded_item():get_name() == "mcl_bone_meal:bone_meal" then
if not minetest.is_creative_enabled(clicker:get_player_name()) then if not minetest.is_creative_enabled(clicker:get_player_name()) then
itemstack:take_item() itemstack:take_item()
@ -193,6 +218,15 @@ minetest.register_node("mcl_crimson:weeping_vines", {
end end
return itemstack return itemstack
end, end,
on_dig = function(pos, node, digger)
local below = vector.offset(pos,0,-1,0)
local belownode = minetest.get_node(below)
minetest.node_dig(pos, node, digger)
if belownode.name == node.name and (not mcl_core.check_vines_supported(below, belownode)) then
minetest.registered_nodes[node.name].on_dig(below, node, digger)
end
end,
drop = { drop = {
max_items = 1, max_items = 1,
items = { items = {
@ -211,7 +245,8 @@ minetest.register_node("mcl_crimson:weeping_vines", {
"mcl_crimson:weeping_vines", "mcl_crimson:weeping_vines",
"mcl_crimson:weeping_vines", "mcl_crimson:weeping_vines",
}, },
_mcl_blast_resistance = 0, _mcl_blast_resistance = 0.2,
_mcl_hardness = 0.2,
}) })
minetest.register_node("mcl_crimson:nether_sprouts", { minetest.register_node("mcl_crimson:nether_sprouts", {
@ -224,6 +259,7 @@ minetest.register_node("mcl_crimson:nether_sprouts", {
walkable = false, walkable = false,
buildable_to = true, buildable_to = true,
groups = {dig_immediate=3,vines=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,deco_block=1, shearsy = 1}, groups = {dig_immediate=3,vines=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,deco_block=1, shearsy = 1},
sounds = mcl_sounds.node_sound_leaves_defaults(),
selection_box = { selection_box = {
type = "fixed", type = "fixed",
fixed = { -4/16, -0.5, -4/16, 4/16, 0, 4/16 }, fixed = { -4/16, -0.5, -4/16, 4/16, 0, 4/16 },
@ -245,6 +281,7 @@ minetest.register_node("mcl_crimson:warped_roots", {
walkable = false, walkable = false,
buildable_to = true, buildable_to = true,
groups = {dig_immediate=3,vines=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,deco_block=1, shearsy = 1}, groups = {dig_immediate=3,vines=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,deco_block=1, shearsy = 1},
sounds = mcl_sounds.node_sound_leaves_defaults(),
selection_box = { selection_box = {
type = "fixed", type = "fixed",
fixed = { -6/16, -0.5, -6/16, 6/16, -4/16, 6/16 }, fixed = { -6/16, -0.5, -6/16, 6/16, -4/16, 6/16 },
@ -264,16 +301,24 @@ mcl_flowerpots.register_potted_flower("mcl_crimson:warped_roots", {
minetest.register_node("mcl_crimson:warped_wart_block", { minetest.register_node("mcl_crimson:warped_wart_block", {
description = S("Warped Wart Block"), description = S("Warped Wart Block"),
tiles = {"warped_wart_block.png"}, tiles = {"warped_wart_block.png"},
groups = {handy = 1, hoe = 7, swordy = 1, deco_block = 1}, groups = {handy = 1, hoey = 7, swordy = 1, deco_block = 1},
_mcl_hardness = 2, _mcl_hardness = 1,
sounds = mcl_sounds.node_sound_leaves_defaults({
footstep={name="default_dirt_footstep", gain=0.7},
dug={name="default_dirt_footstep", gain=1.5},
}),
}) })
minetest.register_node("mcl_crimson:shroomlight", { minetest.register_node("mcl_crimson:shroomlight", {
description = S("Shroomlight"), description = S("Shroomlight"),
tiles = {"shroomlight.png"}, tiles = {"shroomlight.png"},
groups = {handy = 1, hoe = 7, swordy = 1, deco_block = 1}, groups = {handy = 1, hoey = 7, swordy = 1, deco_block = 1},
light_source = minetest.LIGHT_MAX, light_source = minetest.LIGHT_MAX,
_mcl_hardness = 2, _mcl_hardness = 1,
sounds = mcl_sounds.node_sound_leaves_defaults({
footstep={name="default_dirt_footstep", gain=0.7},
dug={name="default_dirt_footstep", gain=1.5},
}),
}) })
minetest.register_node("mcl_crimson:warped_hyphae", { minetest.register_node("mcl_crimson:warped_hyphae", {
@ -415,6 +460,7 @@ minetest.register_node("mcl_crimson:crimson_fungus", {
walkable = false, walkable = false,
groups = {dig_immediate=3,mushroom=1,attached_node=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,enderman_takable=1,deco_block=1}, groups = {dig_immediate=3,mushroom=1,attached_node=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,enderman_takable=1,deco_block=1},
light_source = 1, light_source = 1,
sounds = mcl_sounds.node_sound_leaves_defaults(),
selection_box = { selection_box = {
type = "fixed", type = "fixed",
fixed = { -3/16, -0.5, -3/16, 3/16, -2/16, 3/16 }, fixed = { -3/16, -0.5, -3/16, 3/16, -2/16, 3/16 },
@ -451,6 +497,7 @@ minetest.register_node("mcl_crimson:crimson_roots", {
walkable = false, walkable = false,
buildable_to = true, buildable_to = true,
groups = {dig_immediate=3,vines=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,deco_block=1, shearsy = 1}, groups = {dig_immediate=3,vines=1,dig_by_water=1,destroy_by_lava_flow=1,dig_by_piston=1,deco_block=1, shearsy = 1},
sounds = mcl_sounds.node_sound_leaves_defaults(),
selection_box = { selection_box = {
type = "fixed", type = "fixed",
fixed = { -6/16, -0.5, -6/16, 6/16, -4/16, 6/16 }, fixed = { -6/16, -0.5, -6/16, 6/16, -4/16, 6/16 },

12
mods/ITEMS/mcl_nether/init.lua
View File

@ -57,7 +57,7 @@ minetest.register_node("mcl_nether:ancient_debris", {
stack_max = 64, stack_max = 64,
tiles = {"mcl_nether_ancient_debris_top.png", "mcl_nether_ancient_debris_side.png"}, tiles = {"mcl_nether_ancient_debris_top.png", "mcl_nether_ancient_debris_side.png"},
is_ground_content = true, is_ground_content = true,
groups = {pickaxey=4, building_block=1, material_stone=1, xp=0}, groups = {pickaxey=4, building_block=1, material_stone=1, xp=0, blast_furnace_smeltable = 1},
drop = "mcl_nether:ancient_debris", drop = "mcl_nether:ancient_debris",
sounds = mcl_sounds.node_sound_stone_defaults(), sounds = mcl_sounds.node_sound_stone_defaults(),
_mcl_blast_resistance = 1200, _mcl_blast_resistance = 1200,
@ -202,7 +202,7 @@ minetest.register_node("mcl_nether:nether_wart_block", {
stack_max = 64, stack_max = 64,
tiles = {"mcl_nether_nether_wart_block.png"}, tiles = {"mcl_nether_nether_wart_block.png"},
is_ground_content = false, is_ground_content = false,
groups = {handy=1, hoey=1, building_block=1, compostability = 85}, groups = {handy=1, hoey=7, swordy=1, building_block=1, compostability = 85},
sounds = mcl_sounds.node_sound_leaves_defaults( sounds = mcl_sounds.node_sound_leaves_defaults(
{ {
footstep={name="default_dirt_footstep", gain=0.7}, footstep={name="default_dirt_footstep", gain=0.7},
@ -389,12 +389,12 @@ minetest.register_craft({
}) })
minetest.register_craft({ minetest.register_craft({
type = "shapeless",
output = "mcl_nether:netherite_ingot", output = "mcl_nether:netherite_ingot",
recipe = { recipe = {
{"mcl_nether:netherite_scrap", "mcl_nether:netherite_scrap", "mcl_nether:netherite_scrap"}, "mcl_nether:netherite_scrap", "mcl_nether:netherite_scrap", "mcl_nether:netherite_scrap",
{"mcl_nether:netherite_scrap", "mcl_core:gold_ingot", "mcl_core:gold_ingot"}, "mcl_nether:netherite_scrap", "mcl_core:gold_ingot", "mcl_core:gold_ingot",
{"mcl_core:gold_ingot", "mcl_core:gold_ingot", ""}, "mcl_core:gold_ingot", "mcl_core:gold_ingot", },
}
}) })
minetest.register_craft({ minetest.register_craft({