Bram
/
MineClone2
1
0
Fork 0
Code Pull Requests Activity

Merge pull request 'Add "cobble" group.' (#2174) from cobble_group into master 

Reviewed-on: https://git.minetest.land/MineClone2/MineClone2/pulls/2174
Reviewed-by: MysticTempest <mystictempest@noreply.git.minetest.land>
Reviewed-by: cora <cora@noreply.git.minetest.land>
bonemeal
cora 2022-05-04 23:05:01 +00:00
parent b13835dd6f f1a494ea62
commit dab80c45fd
7 changed files with 21 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
GROUPS.md
View File

@ -102,6 +102,7 @@ Please read <http://minecraft.gamepedia.com/Breaking> to learn how digging times
* `water_bucket=1`: Bucket containing a liquid of group “water” * `water_bucket=1`: Bucket containing a liquid of group “water”
* `enchantability=X`: How good the enchantments are the item gets (1 equals book) * `enchantability=X`: How good the enchantments are the item gets (1 equals book)
* `enchanted=1`: The item is already enchanted, meaning that it can't be enchanted using an enchanting table * `enchanted=1`: The item is already enchanted, meaning that it can't be enchanted using an enchanting table
* `cobble=1`: Cobblestone of any kind
### Material groups ### Material groups

2
mods/ITEMS/mcl_brewing/init.lua
View File

@ -959,7 +959,7 @@ minetest.register_craft({
output = "mcl_brewing:stand_000", output = "mcl_brewing:stand_000",
recipe = { recipe = {
{ "", "mcl_mobitems:blaze_rod", "" }, { "", "mcl_mobitems:blaze_rod", "" },
{ "mcl_core:cobble", "mcl_core:cobble", "mcl_core:cobble" }, { "group:cobble", "group:cobble", "group:cobble" },
} }
}) })

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

@ -724,7 +724,7 @@ minetest.register_node("mcl_core:cobble", {
tiles = {"default_cobble.png"}, tiles = {"default_cobble.png"},
is_ground_content = false, is_ground_content = false,
stack_max = 64, stack_max = 64,
groups = {pickaxey=1, building_block=1, material_stone=1}, groups = {pickaxey=1, building_block=1, material_stone=1, cobble=1},
sounds = mcl_sounds.node_sound_stone_defaults(), sounds = mcl_sounds.node_sound_stone_defaults(),
_mcl_blast_resistance = 6, _mcl_blast_resistance = 6,
_mcl_hardness = 2, _mcl_hardness = 2,

6
mods/ITEMS/mcl_farming/hoes.lua
View File

@ -119,7 +119,7 @@ minetest.register_tool("mcl_farming:hoe_stone", {
damage_groups = { fleshy = 1, }, damage_groups = { fleshy = 1, },
punch_attack_uses = uses.stone, punch_attack_uses = uses.stone,
}, },
_repair_material = "mcl_core:cobble", _repair_material = "group:cobble",
_mcl_toollike_wield = true, _mcl_toollike_wield = true,
_mcl_diggroups = { _mcl_diggroups = {
hoey = { speed = 4, level = 3, uses = 132 } hoey = { speed = 4, level = 3, uses = 132 }
@ -129,7 +129,7 @@ minetest.register_tool("mcl_farming:hoe_stone", {
minetest.register_craft({ minetest.register_craft({
output = "mcl_farming:hoe_stone", output = "mcl_farming:hoe_stone",
recipe = { recipe = {
{"mcl_core:cobble", "mcl_core:cobble"}, {"group:cobble", "group:cobble"},
{"", "mcl_core:stick"}, {"", "mcl_core:stick"},
{"", "mcl_core:stick"} {"", "mcl_core:stick"}
} }
@ -137,7 +137,7 @@ minetest.register_craft({
minetest.register_craft({ minetest.register_craft({
output = "mcl_farming:hoe_stone", output = "mcl_farming:hoe_stone",
recipe = { recipe = {
{"mcl_core:cobble", "mcl_core:cobble"}, {"group:cobble", "group:cobble"},
{"mcl_core:stick", ""}, {"mcl_core:stick", ""},
{"mcl_core:stick", ""} {"mcl_core:stick", ""}
} }

6
mods/ITEMS/mcl_furnaces/init.lua
View File

@ -574,9 +574,9 @@ minetest.register_node("mcl_furnaces:furnace_active", {
minetest.register_craft({ minetest.register_craft({
output = "mcl_furnaces:furnace", output = "mcl_furnaces:furnace",
recipe = { recipe = {
{ "mcl_core:cobble", "mcl_core:cobble", "mcl_core:cobble" }, { "group:cobble", "group:cobble", "group:cobble" },
{ "mcl_core:cobble", "", "mcl_core:cobble" }, { "group:cobble", "", "group:cobble" },
{ "mcl_core:cobble", "mcl_core:cobble", "mcl_core:cobble" }, { "group:cobble", "group:cobble", "group:cobble" },
} }
}) })

16
mods/ITEMS/mcl_tools/crafting.lua
View File

@ -10,7 +10,7 @@ minetest.register_craft({
minetest.register_craft({ minetest.register_craft({
output = "mcl_tools:pick_stone", output = "mcl_tools:pick_stone",
recipe = { recipe = {
{"mcl_core:cobble", "mcl_core:cobble", "mcl_core:cobble"}, {"group:cobble", "group:cobble", "group:cobble"},
{"", "mcl_core:stick", ""}, {"", "mcl_core:stick", ""},
{"", "mcl_core:stick", ""}, {"", "mcl_core:stick", ""},
} }
@ -55,7 +55,7 @@ minetest.register_craft({
minetest.register_craft({ minetest.register_craft({
output = "mcl_tools:shovel_stone", output = "mcl_tools:shovel_stone",
recipe = { recipe = {
{"mcl_core:cobble"}, {"group:cobble"},
{"mcl_core:stick"}, {"mcl_core:stick"},
{"mcl_core:stick"}, {"mcl_core:stick"},
} }
@ -108,16 +108,16 @@ minetest.register_craft({
minetest.register_craft({ minetest.register_craft({
output = "mcl_tools:axe_stone", output = "mcl_tools:axe_stone",
recipe = { recipe = {
{"mcl_core:cobble", "mcl_core:cobble"}, {"group:cobble", "group:cobble"},
{"mcl_core:cobble", "mcl_core:stick"}, {"group:cobble", "mcl_core:stick"},
{"", "mcl_core:stick"}, {"", "mcl_core:stick"},
} }
}) })
minetest.register_craft({ minetest.register_craft({
output = "mcl_tools:axe_stone", output = "mcl_tools:axe_stone",
recipe = { recipe = {
{"mcl_core:cobble", "mcl_core:cobble"}, {"group:cobble", "group:cobble"},
{"mcl_core:stick", "mcl_core:cobble"}, {"mcl_core:stick", "group:cobble"},
{"mcl_core:stick", ""}, {"mcl_core:stick", ""},
} }
}) })
@ -185,8 +185,8 @@ minetest.register_craft({
minetest.register_craft({ minetest.register_craft({
output = "mcl_tools:sword_stone", output = "mcl_tools:sword_stone",
recipe = { recipe = {
{"mcl_core:cobble"}, {"group:cobble"},
{"mcl_core:cobble"}, {"group:cobble"},
{"mcl_core:stick"}, {"mcl_core:stick"},
} }
}) })

8
mods/ITEMS/mcl_tools/init.lua
View File

@ -110,7 +110,7 @@ minetest.register_tool("mcl_tools:pick_stone", {
punch_attack_uses = 66, punch_attack_uses = 66,
}, },
sound = { breaks = "default_tool_breaks" }, sound = { breaks = "default_tool_breaks" },
_repair_material = "mcl_core:cobble", _repair_material = "group:cobble",
_mcl_toollike_wield = true, _mcl_toollike_wield = true,
_mcl_diggroups = { _mcl_diggroups = {
pickaxey = { speed = 4, level = 3, uses = 132 } pickaxey = { speed = 4, level = 3, uses = 132 }
@ -283,7 +283,7 @@ minetest.register_tool("mcl_tools:shovel_stone", {
}, },
on_place = make_grass_path, on_place = make_grass_path,
sound = { breaks = "default_tool_breaks" }, sound = { breaks = "default_tool_breaks" },
_repair_material = "mcl_core:cobble", _repair_material = "group:cobble",
_mcl_toollike_wield = true, _mcl_toollike_wield = true,
_mcl_diggroups = { _mcl_diggroups = {
shovely = { speed = 4, level = 3, uses = 132 } shovely = { speed = 4, level = 3, uses = 132 }
@ -417,7 +417,7 @@ minetest.register_tool("mcl_tools:axe_stone", {
}, },
on_place = make_stripped_trunk, on_place = make_stripped_trunk,
sound = { breaks = "default_tool_breaks" }, sound = { breaks = "default_tool_breaks" },
_repair_material = "mcl_core:cobble", _repair_material = "group:cobble",
_mcl_toollike_wield = true, _mcl_toollike_wield = true,
_mcl_diggroups = { _mcl_diggroups = {
axey = { speed = 4, level = 3, uses = 132 } axey = { speed = 4, level = 3, uses = 132 }
@ -520,7 +520,7 @@ minetest.register_tool("mcl_tools:sword_stone", {
punch_attack_uses = 132, punch_attack_uses = 132,
}, },
sound = { breaks = "default_tool_breaks" }, sound = { breaks = "default_tool_breaks" },
_repair_material = "mcl_core:cobble", _repair_material = "group:cobble",
_mcl_toollike_wield = true, _mcl_toollike_wield = true,
_mcl_diggroups = { _mcl_diggroups = {
swordy = { speed = 4, level = 3, uses = 132 }, swordy = { speed = 4, level = 3, uses = 132 },