Changes Red Bottlebrush from tree to bush

And converts Waratah bush from acacia stem to default stem.

mods/australia_modpack/australia/biome_eastern_coasts.lua

@@ -122,7 +122,7 @@ register_rivergrass(4)
 -- Waratah
 aus.register_plant({
 	nodes = {
-		stem =    "default:acacia_bush_stem",
+		stem =    "default:bush_stem",
 		leaves =  "australia:waratah_leaves",
 		air =     "air",
 		ignore =  "ignore",

mods/australia_modpack/australia/biome_victorian_forests.lua

@@ -140,6 +140,27 @@ end
 register_rivergrass(5)
 register_rivergrass(4)
 
+-- Red Bottlebrush
+aus.register_plant({
+	nodes = {
+		stem =    "default:bush_stem",
+		leaves =  "australia:red_bottlebrush_leaves",
+		air =     "air",
+		ignore =  "ignore",
+	},
+	cover =     0.01,
+	density =   0.0025,
+	priority =  50,
+	check = function(t, pos)
+		return t.v2 > 0 and t.v2 < 0.02 and pos.y >= 5 and pos.y <= 100 and table.contains({"victorian_forests"}, t.biome)
+	end,
+	grow = function(nodes, pos, data, area)
+		local height =  1
+		local radius =  math_random(2, 3)
+		aus.make_bush(pos, data, area, height, radius, nodes.stem, nodes.leaves, nodes.air, nodes.ignore)
+	end,
+})
+
 -- Snow
 minetest.register_decoration({
 	deco_type =   "simple",
@@ -374,27 +395,6 @@ aus.register_plant({
 	end,
 })
 
--- Red Bottlebrush
-aus.register_plant({
-	nodes = {
-		trunk =   "australia:red_bottlebrush_tree",
-		leaves =  "australia:red_bottlebrush_leaves",
-		air =     "air",
-		ignore =  "ignore",
-	},
-	cover =     0.01,
-	density =   0.0025,
-	priority =  50,
-	check = function(t, pos)
-		return t.v2 > 0 and t.v2 < 0.02 and pos.y >= 5 and pos.y <= 100 and table.contains({"victorian_forests"}, t.biome)
-	end,
-	grow = function(nodes, pos, data, area)
-		local height =  math_random(2, 3)
-		local radius =  math_random(2, 3)
-		aus.make_tree(pos, data, area, height, radius, nodes.trunk, nodes.leaves, nodes.air, nodes.ignore)
-	end,
-})
-
 -- River Red Gum
 aus.register_plant({
 	nodes = {

mods/australia_modpack/australia/nodes_plants.lua

@@ -165,7 +165,7 @@ minetest.register_node("australia:flame_grevillea_sapling", {
 			-- minp, maxp to be checked, relative to sapling pos
 			-- minp_relative.y = 1 because sapling pos has been checked
 			{x = -3, y = 1, z = -3},
-			{x = 3, y = 6, z = 3},
+			{x = 3, y = 4, z = 3},
 			-- maximum interval of interior volume check
 			4)
 		return itemstack
@@ -373,6 +373,58 @@ minetest.register_node("australia:pink_mulla_mulla", {
 	},
 })
 
+-- Red Bottlebrush
+minetest.register_node("australia:red_bottlebrush_leaves", {
+	description = "Red Bottlebrush Leaves",
+	drawtype = "allfaces_optional",
+	waving = 1,
+	tiles = {"aus_red_bottlebrush_leaves.png"},
+	paramtype = "light",
+	groups = {snappy = 3, leafdecay = 3, flammable = 2, leaves = 1},
+	drop = {
+		max_items = 1,
+		items = {
+			{items = {"australia:red_bottlebrush_sapling"}, rarity = 10,},
+			{items = {"australia:red_bottlebrush_leaves"},}
+		}
+	},
+	sounds = default.node_sound_leaves_defaults(),
+	after_place_node = default.after_place_leaves,
+})
+
+minetest.register_node("australia:red_bottlebrush_sapling", {
+	description = "Red Bottlebrush Sapling",
+	drawtype = "plantlike",
+	visual_scale = 1.0,
+	tiles = {"aus_melaleuca_sapling.png"},
+	inventory_image = "aus_melaleuca_sapling.png",
+	wield_image = "aus_melaleuca_sapling.png",
+	paramtype = "light",
+	sunlight_propagates = true,
+	walkable = false,
+	on_timer = aus.grow_sapling,
+	selection_box = {
+		type = "fixed",
+		fixed = {-5/16, -8/16, -5/16, 5/16, 11/32, 5/16}
+	},
+	groups = {snappy = 2, dig_immediate = 2, flammable = 2, attached_node = 1, sapling = 1},
+	sounds = default.node_sound_leaves_defaults(),
+	on_construct = function(pos)
+		minetest.get_node_timer(pos):start(math.random(2400,4800))
+	end,
+	on_place = function(itemstack, placer, pointed_thing)
+		itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
+			"australia:red_bottlebrush_sapling",
+			-- minp, maxp to be checked, relative to sapling pos
+			-- minp_relative.y = 1 because sapling pos has been checked
+			{x = -3, y = 1, z = -3},
+			{x = 3, y = 4, z = 3},
+			-- maximum interval of interior volume check
+			4)
+		return itemstack
+	end,
+})
+
 -- Silver Daisy
 minetest.register_node("australia:silver_daisy", {
 	description = "Silver Daisy",
@@ -481,7 +533,7 @@ minetest.register_node("australia:waratah_sapling", {
 			-- minp, maxp to be checked, relative to sapling pos
 			-- minp_relative.y = 1 because sapling pos has been checked
 			{x = -3, y = 1, z = -3},
-			{x = 3, y = 6, z = 3},
+			{x = 3, y = 3, z = 3},
 			-- maximum interval of interior volume check
 			4)
 		return itemstack

mods/australia_modpack/australia/nodes_trees.lua

@@ -2402,85 +2402,6 @@ minetest.register_node("australia:quandong", {
 	end,
 })
 
--- Red Bottlebrush
-minetest.register_node("australia:red_bottlebrush_tree", {
-	description = "Red Bottlebrush Tree",
-	tiles = {
-		"aus_red_bottlebrush_tree_top.png",
-		"aus_red_bottlebrush_tree_top.png",
-		"aus_red_bottlebrush_tree.png"
-	},
-	paramtype2 = "facedir",
-	paramtype = "light",
-	drawtype = "nodebox",
-	is_ground_content = false,
-	node_box = {
-		type = "fixed",
-		fixed = {-5/32, -8/16, -5/32, 5/32, 8/16, 5/32},
-	},
-	selection_box = {
-		type = "fixed",
-		fixed = {-5/32, -8/16, -5/32, 5/32, 8/16, 5/32},
-	},
-	drop = 'default:stick 4',
-	groups = {tree = 1, choppy = 3, oddly_breakable_by_hand = 1, flammable = 2},
-	sounds = default.node_sound_wood_defaults(),
-	on_place = minetest.rotate_node
-})
-
-minetest.register_node("australia:red_bottlebrush_leaves", {
-	description = "Red Bottlebrush Leaves",
-	drawtype = "allfaces_optional",
-	waving = 1,
-	visual_scale = 1.0,
-	tiles = {"aus_red_bottlebrush_leaves.png"},
-	paramtype = "light",
-	is_ground_content = false,
-	groups = {snappy = 3, leafdecay = 5, flammable = 2, leaves = 1},
-	drop = {
-		max_items = 1,
-		items = {
-			{items = {"australia:red_bottlebrush_sapling"}, rarity = 20,},
-			{items = {"australia:red_bottlebrush_leaves"},}
-		}
-	},
-	sounds = default.node_sound_leaves_defaults(),
-	after_place_node = default.after_place_leaves,
-})
-
-minetest.register_node("australia:red_bottlebrush_sapling", {
-	description = "Red Bottlebrush Sapling",
-	drawtype = "plantlike",
-	visual_scale = 1.0,
-	tiles = {"aus_melaleuca_sapling.png"},
-	inventory_image = "aus_melaleuca_sapling.png",
-	wield_image = "aus_melaleuca_sapling.png",
-	paramtype = "light",
-	sunlight_propagates = true,
-	walkable = false,
-	on_timer = aus.grow_sapling,
-	selection_box = {
-		type = "fixed",
-		fixed = {-5/16, -8/16, -5/16, 5/16, 11/32, 5/16}
-	},
-	groups = {snappy = 2, dig_immediate = 2, flammable = 2, attached_node = 1, sapling = 1},
-	sounds = default.node_sound_leaves_defaults(),
-	on_construct = function(pos)
-		minetest.get_node_timer(pos):start(math.random(2400,4800))
-	end,
-	on_place = function(itemstack, placer, pointed_thing)
-		itemstack = default.sapling_on_place(itemstack, placer, pointed_thing,
-			"australia:red_bottlebrush_sapling",
-			-- minp, maxp to be checked, relative to sapling pos
-			-- minp_relative.y = 1 because sapling pos has been checked
-			{x = -3, y = 1, z = -3},
-			{x = 3, y = 6, z = 3},
-			-- maximum interval of interior volume check
-			4)
-		return itemstack
-	end,
-})
-
 -- River Oak
 minetest.register_node("australia:river_oak_tree", {
 	description = "River Oak Tree",

mods/australia_modpack/australia/trees.lua

@@ -1263,10 +1263,10 @@ end
 -- Red Bottlebrush
 function aus.grow_red_bottlebrush(pos)
 	-- individual parameters
-	local height = math_random(2, 3)
+	local height = 1
 	local radius = math_random(2, 3)
 	-- voxelmanip stuff
-	local trunk = minetest.get_content_id("australia:red_bottlebrush_tree")
+	local stem = minetest.get_content_id("default:bush_stem")
 	local leaves = minetest.get_content_id("australia:red_bottlebrush_leaves")
 	local air = minetest.get_content_id("air")
 	local ignore = minetest.get_content_id("ignore")
@@ -1277,7 +1277,7 @@ function aus.grow_red_bottlebrush(pos)
 	)
 	local area = VoxelArea:new({MinEdge = minp, MaxEdge = maxp})
 	local data = vm:get_data()
-	aus.make_tree(pos, data, area, height, radius, trunk, leaves, air, ignore)
+	aus.make_bush(pos, data, area, height, radius, stem, leaves, air, ignore)
 	vm:set_data(data)
 	vm:write_to_map()
 	vm:update_map()
@@ -1617,7 +1617,7 @@ function aus.grow_waratah(pos)
 	local height = 1
 	local radius = math_random(1, 2)
 	-- voxelmanip stuff
-	local stem = minetest.get_content_id("default:acacia_bush_stem")
+	local stem = minetest.get_content_id("default:bush_stem")
 	local leaves = minetest.get_content_id("australia:waratah_leaves")
 	local air = minetest.get_content_id("air")
 	local ignore = minetest.get_content_id("ignore")