Merge pull request 'mcl_bamboo2_cleanup' (#3327) from mcl_bamboo2_cleanup into master

Reviewed-on: MineClone2/MineClone2#3327
Reviewed-by: ancientmarinerdev <ancientmariner_dev@proton.me>
This commit is contained in:
ancientmarinerdev 2023-01-19 21:01:08 +00:00
commit 99d09c76ae
21 changed files with 8 additions and 27 deletions

View File

@ -3,16 +3,13 @@ mcl_bamboo
This mod adds working, familiar bamboo nodes to your Mineclone 2 world. This mod adds working, familiar bamboo nodes to your Mineclone 2 world.
Code: Michieal. Original (basic) bamboo code by: Small Joker. Code: MineClone2 dev team. Original (basic) bamboo code by: Small Joker.
License for code: GPLv3. License for code: GPLv3.
License for images / textures: CC-BY-SA except where noted. License for images / textures: CC-BY-SA except where noted.
Images Created by Michieal, except for: Images Created by Nicu, except for:
* Inventory / wield image for Bamboo Stalk: created by RandomLegoBrick#8692 and is CC0. * Inventory / wield image for Bamboo Stalk: created by RandomLegoBrick#8692 and is CC0.
* The Bamboo door image, which is a variant of this image: https://www.flickr.com/photos/basheertome/5179849901/ which
is CC-BY 2.0,
Basheer Tome (2015).
Dependencies: mcl_core, mcl_sounds, mcl_tools Dependencies: mcl_core, mcl_sounds, mcl_tools

View File

@ -301,7 +301,7 @@ minetest.register_node("mcl_bamboo:bamboo_block", bamboo_block_def)
local bamboo_stripped_block = table.copy(bamboo_block_def) local bamboo_stripped_block = table.copy(bamboo_block_def)
bamboo_stripped_block.on_rightclick = nil bamboo_stripped_block.on_rightclick = nil
bamboo_stripped_block.description = S("Stripped Bamboo Block") bamboo_stripped_block.description = S("Stripped Bamboo Block")
bamboo_stripped_block.tiles = {"mcl_bamboo_bamboo_bottom.png", "mcl_bamboo_bamboo_bottom.png", bamboo_stripped_block.tiles = {"mcl_bamboo_bamboo_bottom_stripped.png", "mcl_bamboo_bamboo_bottom_stripped.png",
"mcl_bamboo_bamboo_block_stripped.png"} "mcl_bamboo_bamboo_block_stripped.png"}
minetest.register_node("mcl_bamboo:bamboo_block_stripped", bamboo_stripped_block) minetest.register_node("mcl_bamboo:bamboo_block_stripped", bamboo_stripped_block)
minetest.register_node("mcl_bamboo:bamboo_plank", { minetest.register_node("mcl_bamboo:bamboo_plank", {

Binary file not shown.

Before

Width:  |  Height:  |  Size: 375 B

After

Width:  |  Height:  |  Size: 243 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 299 B

After

Width:  |  Height:  |  Size: 234 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 425 B

After

Width:  |  Height:  |  Size: 151 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 148 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 150 B

After

Width:  |  Height:  |  Size: 338 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 165 B

After

Width:  |  Height:  |  Size: 376 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 820 B

After

Width:  |  Height:  |  Size: 1.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 247 B

After

Width:  |  Height:  |  Size: 448 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 612 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 622 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 577 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

After

Width:  |  Height:  |  Size: 567 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 485 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 235 B

After

Width:  |  Height:  |  Size: 451 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 297 B

After

Width:  |  Height:  |  Size: 451 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 187 B

After

Width:  |  Height:  |  Size: 324 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 308 B

After

Width:  |  Height:  |  Size: 662 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 463 B

After

Width:  |  Height:  |  Size: 588 B

View File

@ -3545,7 +3545,7 @@ local function register_decorations()
place_on = {"group:grass_block_no_snow", "mcl_core:dirt"}, place_on = {"group:grass_block_no_snow", "mcl_core:dirt"},
sidelen = 80, sidelen = 80,
fill_ratio = 0.004, fill_ratio = 0.004,
biomes = {"Jungle", "JungleM","BambooJungle", "BambooJungleM"}, biomes = {"Jungle", "JungleM"},
y_min = 1, y_min = 1,
y_max = mcl_vars.mg_overworld_max, y_max = mcl_vars.mg_overworld_max,
schematic = mod_mcl_core .. "/schematics/mcl_core_oak_classic.mts", schematic = mod_mcl_core .. "/schematics/mcl_core_oak_classic.mts",
@ -4459,7 +4459,7 @@ local function register_decorations()
end end
register_double_fern(0.01, 0.03, {"Jungle", "JungleM", "JungleEdge", "JungleEdgeM", "Taiga", "ColdTaiga", "MegaTaiga", "MegaSpruceTaiga", "BambooJungle", "BambooJungleM", "BambooJungleEdge", "BambooJungleEdgeM", }) register_double_fern(0.01, 0.03, {"Jungle", "JungleM", "JungleEdge", "JungleEdgeM", "Taiga", "ColdTaiga", "MegaTaiga", "MegaSpruceTaiga", "BambooJungle", "BambooJungleM", "BambooJungleEdge", "BambooJungleEdgeM", })
register_double_fern(0.15, 0.1, {"JungleM", "BambooJungleM"}) register_double_fern(0.15, 0.1, {"JungleM", "BambooJungleM", "BambooJungle"})
-- Large flowers -- Large flowers
local function register_large_flower(name, biomes, seed, offset, flower_forest_offset) local function register_large_flower(name, biomes, seed, offset, flower_forest_offset)
@ -4545,7 +4545,7 @@ local function register_decorations()
octaves = 4, octaves = 4,
persist = 0.6, persist = 0.6,
}, },
biomes = {"Jungle", "BambooJungle"}, biomes = {"Jungle", },
y_min = 3, y_min = 3,
y_max = mcl_vars.mg_overworld_max, y_max = mcl_vars.mg_overworld_max,
schematic = mod_mcl_core .. "/schematics/mcl_core_jungle_bush_oak_leaves_2.mts", schematic = mod_mcl_core .. "/schematics/mcl_core_jungle_bush_oak_leaves_2.mts",
@ -4581,7 +4581,7 @@ local function register_decorations()
octaves = 4, octaves = 4,
persist = 0.6, persist = 0.6,
}, },
biomes = {"JungleEdge", "JungleEdgeM","BambooJungleEdge", "BambooJungleEdgeM"}, biomes = {"JungleEdge", "JungleEdgeM", "BambooJungleEdgeM"},
y_min = 3, y_min = 3,
y_max = mcl_vars.mg_overworld_max, y_max = mcl_vars.mg_overworld_max,
schematic = mod_mcl_core .. "/schematics/mcl_core_jungle_bush_oak_leaves.mts", schematic = mod_mcl_core .. "/schematics/mcl_core_jungle_bush_oak_leaves.mts",
@ -4614,26 +4614,10 @@ local function register_decorations()
y_max = mcl_vars.mg_overworld_max, y_max = mcl_vars.mg_overworld_max,
decoration = "mcl_bamboo:bamboo", decoration = "mcl_bamboo:bamboo",
height = 9, height = 9,
max_height = 12, max_height = 10,
flags = "place_center_x, place_center_z", flags = "place_center_x, place_center_z",
rotation = "random", rotation = "random",
}) })
--[[
-- commenting out this section because with the new grow code, bamboo creates its own height, and therefore places it's own top.
minetest.register_decoration({
deco_type = "simple",
place_on = {"mcl_bamboo:bamboo"},
sidelen = 80,
fill_ratio = 1,
biomes = {"BambooJungle", "BambooJungleM", "BambooJungleEdge", "BambooJungleEdgeM", "Jungle", "JungleM", "JungleEdge", "JungleEdgeM"},
y_min = 1,
y_max = mcl_vars.mg_overworld_max,
decoration = "mcl_bamboo:bamboo_endcap",
height = 1,
max_height = 4,
flags = "all_floors",
})
]]
minetest.register_decoration({ minetest.register_decoration({
deco_type = "simple", deco_type = "simple",