e
/
Mineclonia
forked from Mineclonia/Mineclonia
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of https://git.minetest.land/Wuzzy/MineClone2 into burning_objects

This commit is contained in:
Lizzy Fleckenstein 2021-01-04 11:45:06 +01:00
parent 10d6ca4107 c36dc16527
commit cfa6937df4
4 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mods/ENTITIES/mcl_item_entity/init.lua
View File

@ -331,7 +331,7 @@ function minetest.handle_node_drops(pos, drops, digger)
end end
else else
-- Fixed Behavior -- Fixed Behavior
local drop = get_fortune_drops(fortune_drops, fortune_level) local drop = get_fortune_drops(fortune_drop, fortune_level)
drops = get_drops(drop, tool:get_name(), dug_node.param2, nodedef.paramtype2) drops = get_drops(drop, tool:get_name(), dug_node.param2, nodedef.paramtype2)
end end
end end

2
mods/ITEMS/REDSTONE/mcl_observers/init.lua
View File

@ -24,7 +24,7 @@ local rules_up = {{ x = 0, y = -1, z = 0, spread = true }}
function mcl_observers.observer_activate(pos) function mcl_observers.observer_activate(pos)
minetest.after(mcl_vars.redstone_tick, function(pos) minetest.after(mcl_vars.redstone_tick, function(pos)
node = minetest.get_node(pos) local node = minetest.get_node(pos)
if not node then if not node then
return return
end end

7
mods/ITEMS/mcl_core/functions.lua
View File

@ -1450,10 +1450,11 @@ end
-- * tiles: Optional custom tiles -- * tiles: Optional custom tiles
-- * sounds: Optional custom sounds -- * sounds: Optional custom sounds
-- * clear_colorization: Optional. If true, will clear all paramtype2="color" related node def. fields -- * clear_colorization: Optional. If true, will clear all paramtype2="color" related node def. fields
-- * desc: Item description
-- --
-- The snowable nodes also MUST have _mcl_snowed defined to contain the name -- The snowable nodes also MUST have _mcl_snowed defined to contain the name
-- of the snowed node. -- of the snowed node.
mcl_core.register_snowed_node = function(itemstring_snowed, itemstring_clear, tiles, sounds, clear_colorization) mcl_core.register_snowed_node = function(itemstring_snowed, itemstring_clear, tiles, sounds, clear_colorization, desc)
local def = table.copy(minetest.registered_nodes[itemstring_clear]) local def = table.copy(minetest.registered_nodes[itemstring_clear])
local create_doc_alias local create_doc_alias
if def.description then if def.description then
@ -1462,7 +1463,7 @@ mcl_core.register_snowed_node = function(itemstring_snowed, itemstring_clear, ti
create_doc_alias = false create_doc_alias = false
end end
-- Just some group clearing -- Just some group clearing
def.description = nil def.description = desc
def._doc_items_longdesc = nil def._doc_items_longdesc = nil
def._doc_items_usagehelp = nil def._doc_items_usagehelp = nil
def._doc_items_create_entry = false def._doc_items_create_entry = false
@ -1503,6 +1504,8 @@ mcl_core.register_snowed_node = function(itemstring_snowed, itemstring_clear, ti
def.sounds = sounds def.sounds = sounds
end end
def._mcl_silk_touch_drop = {itemstring_clear}
-- Register stuff -- Register stuff
minetest.register_node(itemstring_snowed, def) minetest.register_node(itemstring_snowed, def)

8
mods/ITEMS/mcl_core/nodes_base.lua
View File

@ -380,7 +380,7 @@ minetest.register_node("mcl_core:dirt_with_grass", {
_mcl_hardness = 0.6, _mcl_hardness = 0.6,
_mcl_silk_touch_drop = true, _mcl_silk_touch_drop = true,
}) })
mcl_core.register_snowed_node("mcl_core:dirt_with_grass_snow", "mcl_core:dirt_with_grass", nil, nil, true) mcl_core.register_snowed_node("mcl_core:dirt_with_grass_snow", "mcl_core:dirt_with_grass", nil, nil, true, S("Dirt with Snow"))
minetest.register_node("mcl_core:grass_path", { minetest.register_node("mcl_core:grass_path", {
tiles = {"mcl_core_grass_path_top.png", "default_dirt.png", "mcl_core_grass_path_side.png"}, tiles = {"mcl_core_grass_path_top.png", "default_dirt.png", "mcl_core_grass_path_side.png"},
@ -424,7 +424,7 @@ minetest.register_node("mcl_core:mycelium", {
_mcl_hardness = 0.6, _mcl_hardness = 0.6,
_mcl_silk_touch_drop = true, _mcl_silk_touch_drop = true,
}) })
mcl_core.register_snowed_node("mcl_core:mycelium_snow", "mcl_core:mycelium") mcl_core.register_snowed_node("mcl_core:mycelium_snow", "mcl_core:mycelium", nil, nil, false, S("Mycelium with Snow"))
minetest.register_node("mcl_core:podzol", { minetest.register_node("mcl_core:podzol", {
description = S("Podzol"), description = S("Podzol"),
@ -441,7 +441,7 @@ minetest.register_node("mcl_core:podzol", {
_mcl_hardness = 0.6, _mcl_hardness = 0.6,
_mcl_silk_touch_drop = true, _mcl_silk_touch_drop = true,
}) })
mcl_core.register_snowed_node("mcl_core:podzol_snow", "mcl_core:podzol") mcl_core.register_snowed_node("mcl_core:podzol_snow", "mcl_core:podzol", nil, nil, false, S("Podzol with Snow"))
minetest.register_node("mcl_core:dirt", { minetest.register_node("mcl_core:dirt", {
description = S("Dirt"), description = S("Dirt"),
@ -503,7 +503,7 @@ minetest.register_node("mcl_core:gravel", {
{items = {'mcl_core:gravel'}} {items = {'mcl_core:gravel'}}
} }
}, },
[3] = "mcl_core:flint" [3] = "mcl_core:flint",
}, },
}) })