minetest-mods/castle_masonry-cd2025
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MineClonia / Voxelibre Stonecutter support (#27)

Browse Source 
Use new mcl_stairs API
Fix mcl_core:ice to mcl_core:packed_ice
This commit is contained in:
Github is a non-free platform owned by Microsoft. Reasonable alternatives exist, such as Gitea, Sourcehut. We need a federated, mastodon-like forge based on ForgeFed. See: https://forgefed.org 2024-11-15 21:20:21 +01:00 committed by GitHub
parent 3e04d6f00c
commit 1728e52a66
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
arrow_slits.lua
View File

@ -14,6 +14,7 @@ castle_masonry.register_arrowslit = function(material)
groups = composition_def.groups,
_mcl_hardness = composition_def._mcl_hardness or 0.8,
_mcl_blast_resistance = composition_def._mcl_blast_resistance or 1,
_mcl_stonecutter_recipes = {material.composition_material or material.craft_material},
sounds = composition_def.sounds,
paramtype = "light",
paramtype2 = "facedir",
@ -37,6 +38,7 @@ castle_masonry.register_arrowslit = function(material)
groups = composition_def.groups,
_mcl_hardness = composition_def._mcl_hardness or 0.8,
_mcl_blast_resistance = composition_def._mcl_blast_resistance or 1,
_mcl_stonecutter_recipes = {material.composition_material or material.craft_material},
sounds = composition_def.sounds,
paramtype = "light",
paramtype2 = "facedir",
@ -64,6 +66,7 @@ castle_masonry.register_arrowslit = function(material)
groups = composition_def.groups,
_mcl_hardness = composition_def._mcl_hardness or 0.8,
_mcl_blast_resistance = composition_def._mcl_blast_resistance or 1,
_mcl_stonecutter_recipes = {material.composition_material or material.craft_material},
sounds = composition_def.sounds,
paramtype = "light",
paramtype2 = "facedir",
@ -89,6 +92,7 @@ castle_masonry.register_arrowslit = function(material)
groups = composition_def.groups,
_mcl_hardness = composition_def._mcl_hardness or 0.8,
_mcl_blast_resistance = composition_def._mcl_blast_resistance or 1,
_mcl_stonecutter_recipes = {material.composition_material or material.craft_material},
sounds = composition_def.sounds,
paramtype = "light",
paramtype2 = "facedir",

2
init.lua
View File

@ -71,7 +71,7 @@ if minetest.get_modpath("mcl_core") then
register_material({name="cobble", desc=S("Cobble"), craft_material="group:cobble", composition_material="mcl_core:cobble"}, true)
register_material({name="stonebrick", desc=S("Stonebrick"), craft_material="mcl_core:stonebrick"}, true)
register_material({name="stone", desc=S("Stone"), craft_material="group:stone", composition_material="mcl_core:stone"}, true)
register_material({name="ice", desc=S("Ice"), craft_material="mcl_core:ice"})
register_material({name="ice", desc=S("Ice"), craft_material="mcl_core:packed_ice"})
register_material({name="snow", desc=S("Snow"), craft_material="mcl_core:snowblock"})
register_material({name="sandstone", desc=S("Sandstone"), craft_material="mcl_core:sandstone"}, true)
register_material({name="redsandstone", desc=S("Red Sandstone"), craft_material="mcl_core:redsandstone"}, true)

2
murder_holes.lua
View File

@ -15,6 +15,7 @@ castle_masonry.register_murderhole = function(material)
groups = composition_def.groups,
_mcl_hardness = composition_def._mcl_hardness or 0.8,
_mcl_blast_resistance = composition_def._mcl_blast_resistance or 1,
_mcl_stonecutter_recipes = {material.composition_material or material.craft_material},
sounds = composition_def.sounds,
paramtype = "light",
paramtype2 = "facedir",
@ -36,6 +37,7 @@ castle_masonry.register_murderhole = function(material)
groups = composition_def.groups,
_mcl_hardness = composition_def._mcl_hardness or 0.8,
_mcl_blast_resistance = composition_def._mcl_blast_resistance or 1,
_mcl_stonecutter_recipes = {material.composition_material or material.craft_material},
sounds = composition_def.sounds,
paramtype = "light",
paramtype2 = "facedir",

17
paving.lua
View File

@ -11,7 +11,7 @@ minetest.register_node("castle_masonry:pavement_brick", {
description = S("Paving Stone"),
drawtype = "normal",
tiles = {"castle_pavement_brick.png"},
groups = {cracky=2, pickaxey=2},
groups = {cracky=2, pickaxey=2, stonecuttable=1},
_mcl_hardness = 1,
_mcl_blast_resistance = 1,
paramtype = "light",
@ -37,13 +37,14 @@ if minetest.get_modpath("moreblocks") then
})
stairsplus:register_alias_all("castle", "pavement_brick", "castle_masonry", "pavement_brick")
elseif minetest.get_modpath("mcl_stairs") then
mcl_stairs.register_stair_and_slab("pavement_brick", "castle_masonry:pavement_brick",
{pickaxey=2},
{"castle_pavement_brick.png"},
S("Castle Pavement Stair"),
S("Castle Pavement Slab"),
castle_masonry.sounds.node_sound_stone_defaults()
)
mcl_stairs.register_stair_and_slab("pavement_brick", {
baseitem = "castle_masonry:pavement_brick",
description = S("Castle Pavement"),
groups = {pickaxey=2, stonecuttable=1},
overrides = {
_mcl_stonecutter_recipes = {"castle_masonry:pavement_brick"}
},
})
elseif minetest.get_modpath("stairs") then
stairs.register_stair_and_slab("pavement_brick", "castle_masonry:pavement_brick",
{cracky=2},

8
pillars.lua
View File

@ -20,6 +20,7 @@ castle_masonry.register_pillar = function(material)
groups = crossbrace_connectable_groups,
_mcl_hardness = composition_def._mcl_hardness or 0.8,
_mcl_blast_resistance = composition_def._mcl_blast_resistance or 1,
_mcl_stonecutter_recipes = {material.composition_material or material.craft_material},
sounds = composition_def.sounds,
paramtype = "light",
paramtype2 = "facedir",
@ -40,6 +41,7 @@ castle_masonry.register_pillar = function(material)
groups = composition_def.groups,
_mcl_hardness = composition_def._mcl_hardness or 0.8,
_mcl_blast_resistance = composition_def._mcl_blast_resistance or 1,
_mcl_stonecutter_recipes = {material.composition_material or material.craft_material},
sounds = composition_def.sounds,
paramtype = "light",
paramtype2 = "facedir",
@ -60,6 +62,7 @@ castle_masonry.register_pillar = function(material)
groups = crossbrace_connectable_groups,
_mcl_hardness = composition_def._mcl_hardness or 0.8,
_mcl_blast_resistance = composition_def._mcl_blast_resistance or 1,
_mcl_stonecutter_recipes = {material.composition_material or material.craft_material},
sounds = composition_def.sounds,
paramtype = "light",
paramtype2 = "facedir",
@ -80,6 +83,7 @@ castle_masonry.register_pillar = function(material)
groups = composition_def.groups,
_mcl_hardness = composition_def._mcl_hardness or 0.8,
_mcl_blast_resistance = composition_def._mcl_blast_resistance or 1,
_mcl_stonecutter_recipes = {material.composition_material or material.craft_material},
sounds = composition_def.sounds,
paramtype = "light",
paramtype2 = "facedir",
@ -100,6 +104,7 @@ castle_masonry.register_pillar = function(material)
groups = crossbrace_connectable_groups,
_mcl_hardness = composition_def._mcl_hardness or 0.8,
_mcl_blast_resistance = composition_def._mcl_blast_resistance or 1,
_mcl_stonecutter_recipes = {material.composition_material or material.craft_material},
sounds = composition_def.sounds,
paramtype = "light",
paramtype2 = "facedir",
@ -118,6 +123,7 @@ castle_masonry.register_pillar = function(material)
groups = composition_def.groups,
_mcl_hardness = composition_def._mcl_hardness or 0.8,
_mcl_blast_resistance = composition_def._mcl_blast_resistance or 1,
_mcl_stonecutter_recipes = {material.composition_material or material.craft_material},
sounds = composition_def.sounds,
paramtype = "light",
paramtype2 = "facedir",
@ -137,6 +143,7 @@ castle_masonry.register_pillar = function(material)
groups = composition_def.groups,
_mcl_hardness = composition_def._mcl_hardness or 0.8,
_mcl_blast_resistance = composition_def._mcl_blast_resistance or 1,
_mcl_stonecutter_recipes = {material.composition_material or material.craft_material},
sounds = composition_def.sounds,
paramtype = "light",
paramtype2 = "facedir",
@ -163,6 +170,7 @@ castle_masonry.register_pillar = function(material)
groups = composition_def.groups,
_mcl_hardness = composition_def._mcl_hardness or 0.8,
_mcl_blast_resistance = composition_def._mcl_blast_resistance or 1,
_mcl_stonecutter_recipes = {material.composition_material or material.craft_material},
sounds = composition_def.sounds,
paramtype = "light",
paramtype2 = "facedir",

53
stone_wall.lua
View File

@ -20,7 +20,7 @@ minetest.register_node("castle_masonry:stonewall", {
tiles = {"castle_stonewall.png"},
paramtype = "light",
drop = "castle_masonry:stonewall",
groups = {cracky=3, pickaxey=1},
groups = {cracky=3, pickaxey=1, stonecuttable=1},
_mcl_hardness = 1,
_mcl_blast_resistance = 1,
sunlight_propagates = false,
@ -32,7 +32,7 @@ minetest.register_node("castle_masonry:rubble", {
drawtype = "normal",
tiles = {"castle_rubble.png"},
paramtype = "light",
groups = {crumbly=3, shovely=1, falling_node=1},
groups = {crumbly=3, shovely=1, falling_node=1, stonecuttable=1},
_mcl_hardness = 0.8,
_mcl_blast_resistance = 1,
sounds = castle_masonry.sounds.node_sound_gravel_defaults(),
@ -75,6 +75,7 @@ minetest.register_node("castle_masonry:stonewall_corner", {
groups = {cracky=3, pickaxey=1},
_mcl_hardness = 1,
_mcl_blast_resistance = 1,
_mcl_stonecutter_recipes = {"castle_masonry:stonewall"},
sounds = castle_masonry.sounds.node_sound_stone_defaults(),
})
@ -109,21 +110,22 @@ if minetest.get_modpath("moreblocks") then
stairsplus:register_alias_all("castle", "rubble", "castle_masonry", "rubble")
elseif minetest.get_modpath("mcl_stairs") then
mcl_stairs.register_stair_and_slab("stonewall", "castle_masonry:stonewall",
{pickaxey=1},
{"castle_stonewall.png"},
S("Castle Stonewall Stair"),
S("Castle Stonewall Slab"),
castle_masonry.sounds.node_sound_stone_defaults()
)
mcl_stairs.register_stair_and_slab("rubble", "castle_masonry:rubble",
{shovely=1},
{"castle_rubble.png"},
S("Castle Rubble Stair"),
S("Castle Rubble Slab"),
castle_masonry.sounds.node_sound_gravel_defaults()
)
mcl_stairs.register_stair_and_slab("stonewall", {
baseitem = "castle_masonry:stonewall",
description = S("Castle StoneWall"),
groups = {pickaxey=1, stonecuttable=1},
overrides = {
_mcl_stonecutter_recipes = {"castle_masonry:stonewall"}
},
})
mcl_stairs.register_stair_and_slab("rubble", {
baseitem = "castle_masonry:rubble",
description = S("Castle Rubble"),
groups = {shovely=1, stonecuttable=1},
overrides = {
_mcl_stonecutter_recipes = {"castle_masonry:rubble"}
},
})
elseif minetest.get_modpath("stairs") then
stairs.register_stair_and_slab("stonewall", "castle_masonry:stonewall",
{cracky=3, pickaxey=1},
@ -148,7 +150,7 @@ minetest.register_node("castle_masonry:dungeon_stone", {
description = S("Dungeon Stone"),
drawtype = "normal",
tiles = {"castle_dungeon_stone.png"},
groups = {cracky=2, pickaxey=2},
groups = {cracky=2, pickaxey=2, stonecuttable=1},
_mcl_hardness = 1,
_mcl_blast_resistance = 1,
paramtype = "light",
@ -183,13 +185,14 @@ if minetest.get_modpath("moreblocks") then
stairsplus:register_alias_all("castle", "dungeon_stone", "castle_masonry", "dungeon_stone")
elseif minetest.get_modpath("mcl_stairs") then
mcl_stairs.register_stair_and_slab("dungeon_stone", "castle_masonry:dungeon_stone",
{pickaxey=2},
{"castle_dungeon_stone.png"},
S("Dungeon Stone Stair"),
S("Dungeon Stone Slab"),
castle_masonry.sounds.node_sound_stone_defaults()
)
mcl_stairs.register_stair_and_slab("dungeon_stone", {
baseitem = "castle_masonry:dungeon_stone",
description = S("Dungeon Stone"),
groups = {pickaxey=2, stonecuttable=1},
overrides = {
_mcl_stonecutter_recipes = {"castle_masonry:dungeon_stone"}
},
})
elseif minetest.get_modpath("stairs") then
stairs.register_stair_and_slab("dungeon_stone", "castle_masonry:dungeon_stone",
{cracky=2, pickaxey=2},