diff --git a/mods/ITEMS/mcl_bamboo/README.md b/mods/ITEMS/mcl_bamboo/README.md index c251321ac..b1f91e641 100644 --- a/mods/ITEMS/mcl_bamboo/README.md +++ b/mods/ITEMS/mcl_bamboo/README.md @@ -3,16 +3,13 @@ mcl_bamboo 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 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. -* 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 diff --git a/mods/ITEMS/mcl_bamboo/bamboo_base.lua b/mods/ITEMS/mcl_bamboo/bamboo_base.lua index 4c67a48c5..152acd710 100644 --- a/mods/ITEMS/mcl_bamboo/bamboo_base.lua +++ b/mods/ITEMS/mcl_bamboo/bamboo_base.lua @@ -301,7 +301,7 @@ minetest.register_node("mcl_bamboo:bamboo_block", bamboo_block_def) local bamboo_stripped_block = table.copy(bamboo_block_def) bamboo_stripped_block.on_rightclick = nil 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"} minetest.register_node("mcl_bamboo:bamboo_block_stripped", bamboo_stripped_block) minetest.register_node("mcl_bamboo:bamboo_plank", { diff --git a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_block.png b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_block.png index 0bbbd9041..3512e1b4e 100644 Binary files a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_block.png and b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_block.png differ diff --git a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_block_stripped.png b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_block_stripped.png index f949e51bc..2d7332a10 100644 Binary files a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_block_stripped.png and b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_block_stripped.png differ diff --git a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_bottom.png b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_bottom.png index 7ec05ed73..05b6c73b3 100644 Binary files a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_bottom.png and b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_bottom.png differ diff --git a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_bottom_stripped.png b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_bottom_stripped.png new file mode 100644 index 000000000..e204dc9e0 Binary files /dev/null and b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_bottom_stripped.png differ diff --git a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_plank.png b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_plank.png index 86653c192..05b7598b6 100644 Binary files a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_plank.png and b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_plank.png differ diff --git a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_plank_mosaic.png b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_plank_mosaic.png index 5d449369d..e47f54508 100644 Binary files a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_plank_mosaic.png and b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_plank_mosaic.png differ diff --git a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_sign.png b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_sign.png index d688ae002..e87c5a014 100644 Binary files a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_sign.png and b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_sign.png differ diff --git a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_sign_wield.png b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_sign_wield.png index f442f20ea..02f6c083f 100644 Binary files a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_sign_wield.png and b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_bamboo_sign_wield.png differ diff --git a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_bottom.png b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_bottom.png index c50693b64..47e43f3ae 100644 Binary files a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_bottom.png and b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_bottom.png differ diff --git a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_bottom_alt.png b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_bottom_alt.png index c50693b64..f4b0d8a7d 100644 Binary files a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_bottom_alt.png and b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_bottom_alt.png differ diff --git a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_top.png b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_top.png index e8cbcf666..0b3676c57 100644 Binary files a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_top.png and b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_top.png differ diff --git a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_top_alt.png b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_top_alt.png index 8e183256a..8b56ac5d9 100644 Binary files a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_top_alt.png and b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_top_alt.png differ diff --git a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_wield.png b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_wield.png index 8c9daefc5..8850749f8 100644 Binary files a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_wield.png and b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_door_wield.png differ diff --git a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_fence_bamboo.png b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_fence_bamboo.png index 21adb1720..0b1527c8d 100644 Binary files a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_fence_bamboo.png and b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_fence_bamboo.png differ diff --git a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_fence_gate_bamboo.png b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_fence_gate_bamboo.png index 3b32b4cc8..0b1527c8d 100644 Binary files a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_fence_gate_bamboo.png and b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_fence_gate_bamboo.png differ diff --git a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_scaffolding_bottom.png b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_scaffolding_bottom.png index e222d6fe5..959400fea 100644 Binary files a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_scaffolding_bottom.png and b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_scaffolding_bottom.png differ diff --git a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_scaffolding_top.png b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_scaffolding_top.png index 3eb6e9959..3ed40ee1d 100644 Binary files a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_scaffolding_top.png and b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_scaffolding_top.png differ diff --git a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_trapdoor_side.png b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_trapdoor_side.png index 37d10c55b..95626a364 100644 Binary files a/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_trapdoor_side.png and b/mods/ITEMS/mcl_bamboo/textures/mcl_bamboo_trapdoor_side.png differ diff --git a/mods/MAPGEN/mcl_biomes/init.lua b/mods/MAPGEN/mcl_biomes/init.lua index 14725c59d..c692e2bff 100644 --- a/mods/MAPGEN/mcl_biomes/init.lua +++ b/mods/MAPGEN/mcl_biomes/init.lua @@ -3545,7 +3545,7 @@ local function register_decorations() place_on = {"group:grass_block_no_snow", "mcl_core:dirt"}, sidelen = 80, fill_ratio = 0.004, - biomes = {"Jungle", "JungleM","BambooJungle", "BambooJungleM"}, + biomes = {"Jungle", "JungleM"}, y_min = 1, y_max = mcl_vars.mg_overworld_max, schematic = mod_mcl_core .. "/schematics/mcl_core_oak_classic.mts", @@ -4459,7 +4459,7 @@ local function register_decorations() end 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 local function register_large_flower(name, biomes, seed, offset, flower_forest_offset) @@ -4545,7 +4545,7 @@ local function register_decorations() octaves = 4, persist = 0.6, }, - biomes = {"Jungle", "BambooJungle"}, + biomes = {"Jungle", }, y_min = 3, y_max = mcl_vars.mg_overworld_max, schematic = mod_mcl_core .. "/schematics/mcl_core_jungle_bush_oak_leaves_2.mts", @@ -4581,7 +4581,7 @@ local function register_decorations() octaves = 4, persist = 0.6, }, - biomes = {"JungleEdge", "JungleEdgeM","BambooJungleEdge", "BambooJungleEdgeM"}, + biomes = {"JungleEdge", "JungleEdgeM", "BambooJungleEdgeM"}, y_min = 3, y_max = mcl_vars.mg_overworld_max, 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, decoration = "mcl_bamboo:bamboo", height = 9, - max_height = 12, + max_height = 10, flags = "place_center_x, place_center_z", 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({ deco_type = "simple",