mirror of
https://github.com/Sokomine/cottages.git
synced 2024-09-27 06:50:33 +02:00
if moreblocks is installed, don't register the three separate "roof"
items rather, alias them to the equivalents in moreblocks instead. don't register cottages straw or wool anymore, alias them to farming straw and white wool.
This commit is contained in:
parent
9cee087886
commit
524de7d302
|
@ -1,8 +1,8 @@
|
||||||
default?
|
default?
|
||||||
farming
|
farming
|
||||||
|
wool
|
||||||
stairs?
|
stairs?
|
||||||
homedecor?
|
homedecor?
|
||||||
intllib?
|
intllib?
|
||||||
trees?
|
trees?
|
||||||
wool?
|
|
||||||
moreblocks?
|
moreblocks?
|
||||||
|
|
10
init.lua
10
init.lua
|
@ -61,7 +61,15 @@ dofile(minetest.get_modpath("cottages").."/nodes_straw.lua");
|
||||||
dofile(minetest.get_modpath("cottages").."/nodes_anvil.lua");
|
dofile(minetest.get_modpath("cottages").."/nodes_anvil.lua");
|
||||||
dofile(minetest.get_modpath("cottages").."/nodes_doorlike.lua");
|
dofile(minetest.get_modpath("cottages").."/nodes_doorlike.lua");
|
||||||
dofile(minetest.get_modpath("cottages").."/nodes_fences.lua");
|
dofile(minetest.get_modpath("cottages").."/nodes_fences.lua");
|
||||||
dofile(minetest.get_modpath("cottages").."/nodes_roof.lua");
|
|
||||||
|
if not minetest.get_modpath("moreblocks") then
|
||||||
|
dofile(minetest.get_modpath("cottages").."/nodes_roof.lua");
|
||||||
|
else
|
||||||
|
minetest.register_alias("cottages:roof_straw", "moreblocks:stair_straw_alt")
|
||||||
|
minetest.register_alias("cottages:roof_connector_straw", "moreblocks:stair_straw")
|
||||||
|
minetest.register_alias("cottages:roof_flat_straw", "moreblocks:slab_straw")
|
||||||
|
end
|
||||||
|
|
||||||
dofile(minetest.get_modpath("cottages").."/nodes_barrel.lua");
|
dofile(minetest.get_modpath("cottages").."/nodes_barrel.lua");
|
||||||
--dofile(minetest.get_modpath("cottages").."/nodes_chests.lua");
|
--dofile(minetest.get_modpath("cottages").."/nodes_chests.lua");
|
||||||
|
|
||||||
|
|
|
@ -179,13 +179,8 @@ minetest.register_node("cottages:wool_tent", {
|
||||||
})
|
})
|
||||||
|
|
||||||
-- a fallback for cases in which there is no wool
|
-- a fallback for cases in which there is no wool
|
||||||
minetest.register_node("cottages:wool", {
|
|
||||||
description = "Wool",
|
|
||||||
tiles = {"cottages_wool.png"},
|
|
||||||
is_ground_content = false,
|
|
||||||
groups = {snappy=2,choppy=2,oddly_breakable_by_hand=3,flammable=3,wool=1},
|
|
||||||
})
|
|
||||||
|
|
||||||
|
minetest.register_alias("cottages:wool", "wool:white")
|
||||||
|
|
||||||
---------------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------------
|
||||||
-- crafting receipes
|
-- crafting receipes
|
||||||
|
@ -263,10 +258,3 @@ minetest.register_craft({
|
||||||
{"",cottages.craftitem_stick}
|
{"",cottages.craftitem_stick}
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
minetest.register_craft({
|
|
||||||
output = "cottages:wool",
|
|
||||||
recipe = {
|
|
||||||
{"cottages:wool_tent", "cottages:wool_tent"}
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
|
@ -147,9 +147,9 @@ end -- of cottages.register_roof( name, tiles, basic_material )
|
||||||
-- add the diffrent roof types
|
-- add the diffrent roof types
|
||||||
---------------------------------------------------------------------------------------
|
---------------------------------------------------------------------------------------
|
||||||
cottages.register_roof( 'straw',
|
cottages.register_roof( 'straw',
|
||||||
{"cottages_darkage_straw.png","cottages_darkage_straw.png",
|
{"farming_straw.png","farming_straw.png",
|
||||||
"cottages_darkage_straw.png","cottages_darkage_straw.png",
|
"farming_straw.png","farming_straw.png",
|
||||||
"cottages_darkage_straw.png","cottages_darkage_straw.png"},
|
"farming_straw.png","farming_straw.png"},
|
||||||
'cottages:straw_mat', nil );
|
'cottages:straw_mat', nil );
|
||||||
cottages.register_roof( 'reet',
|
cottages.register_roof( 'reet',
|
||||||
{"cottages_reet.png","cottages_reet.png",
|
{"cottages_reet.png","cottages_reet.png",
|
||||||
|
|
|
@ -24,9 +24,9 @@ end
|
||||||
minetest.register_node("cottages:straw_mat", {
|
minetest.register_node("cottages:straw_mat", {
|
||||||
description = S("layer of straw"),
|
description = S("layer of straw"),
|
||||||
drawtype = 'nodebox',
|
drawtype = 'nodebox',
|
||||||
tiles = { 'cottages_darkage_straw.png' }, -- done by VanessaE
|
tiles = { 'farming_straw.png' }, -- done by VanessaE
|
||||||
wield_image = 'cottages_darkage_straw.png',
|
wield_image = 'farming_straw.png',
|
||||||
inventory_image = 'cottages_darkage_straw.png',
|
inventory_image = 'farming_straw.png',
|
||||||
sunlight_propagates = true,
|
sunlight_propagates = true,
|
||||||
paramtype = 'light',
|
paramtype = 'light',
|
||||||
paramtype2 = "facedir",
|
paramtype2 = "facedir",
|
||||||
|
@ -76,16 +76,8 @@ minetest.register_node("cottages:straw_bale", {
|
||||||
})
|
})
|
||||||
|
|
||||||
-- just straw
|
-- just straw
|
||||||
minetest.register_node("cottages:straw", {
|
|
||||||
drawtype = "normal",
|
|
||||||
description = S("straw"),
|
|
||||||
tiles = {"cottages_darkage_straw.png"},
|
|
||||||
groups = {snappy=3,choppy=3,oddly_breakable_by_hand=3,flammable=3},
|
|
||||||
sounds = default.node_sound_wood_defaults(),
|
|
||||||
-- the bale is slightly smaller than a full node
|
|
||||||
is_ground_content = false,
|
|
||||||
})
|
|
||||||
|
|
||||||
|
minetest.register_alias("cottages:straw", "farming:straw")
|
||||||
|
|
||||||
local cottages_formspec_treshing_floor =
|
local cottages_formspec_treshing_floor =
|
||||||
"size[8,8]"..
|
"size[8,8]"..
|
||||||
|
@ -243,7 +235,7 @@ minetest.register_node("cottages:threshing_floor", {
|
||||||
end
|
end
|
||||||
|
|
||||||
local overlay1 = "^farming_wheat.png";
|
local overlay1 = "^farming_wheat.png";
|
||||||
local overlay2 = "^cottages_darkage_straw.png";
|
local overlay2 = "^farming_straw.png";
|
||||||
local overlay3 = "^"..cottages.texture_wheat_seed;
|
local overlay3 = "^"..cottages.texture_wheat_seed;
|
||||||
|
|
||||||
-- this can be enlarged by a multiplicator if desired
|
-- this can be enlarged by a multiplicator if desired
|
||||||
|
|
Binary file not shown.
Before Width: | Height: | Size: 852 B |
Binary file not shown.
Before Width: | Height: | Size: 306 B |
Loading…
Reference in New Issue
Block a user