From 62582b6abb075dff7984fbcd6bf2651bac86e2c0 Mon Sep 17 00:00:00 2001
From: Starbeamrainbowlabs <sbrl@starbeamrainbowlabs.com>
Date: Thu, 12 Aug 2021 01:09:24 +0100
Subject: [PATCH] Update sapling alias compatibility

---
 CHANGELOG.md                                   |  1 +
 worldeditadditions/lib/compat/saplingnames.lua | 10 ++++++++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 961aa03..2446d10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -21,6 +21,7 @@ Note to self: See the bottom of this file for the release template text.
  - `//airapply`: Improve error handling, fix safe_region node counter
  - `//floodfill`: Fix crash caused by internal refactoring of the `Queue` data structure
  - `//spop`: Fix wording in displayed message
+ - Sapling aliases: Correct alias of `default:sapling` from `oak` to `apple` (since it produces apples), and `moretrees:apple_tree_sapling_ongen` from `apple` to `apple_moretrees`
 
 
 ## v1.12: The selection tools update (26th June 2021)
diff --git a/worldeditadditions/lib/compat/saplingnames.lua b/worldeditadditions/lib/compat/saplingnames.lua
index 15e9ea2..2938597 100644
--- a/worldeditadditions/lib/compat/saplingnames.lua
+++ b/worldeditadditions/lib/compat/saplingnames.lua
@@ -16,7 +16,7 @@ Alternatively, you can register support in your mod directly. Do that by adding
 
 if minetest.get_modpath("default") then
 	worldeditadditions.register_sapling_alias_many({
-		{ "default:sapling", "oak" },
+		{ "default:sapling", "apple" },
 		{ "default:bush_sapling", "bush" },
 		{ "default:pine_sapling", "pine" },
 		{ "default:pine_bush_sapling", "pine_bush" },
@@ -40,7 +40,7 @@ if minetest.get_modpath("moretrees") then
 		{ "moretrees:willow_sapling_ongen", "willow_moretrees" },
 		{ "moretrees:poplar_sapling_ongen", "poplar" },
 		{ "moretrees:poplar_small_sapling_ongen", "poplar_small" },
-		{ "moretrees:apple_tree_sapling_ongen", "apple" },
+		{ "moretrees:apple_tree_sapling_ongen", "apple_moretrees" },
 		{ "moretrees:birch_sapling_ongen", "birch_moretrees" },
 		{ "moretrees:palm_sapling_ongen", "palm_moretrees" },
 		{ "moretrees:date_palm_sapling_ongen", "palm_date" },
@@ -110,6 +110,12 @@ end
 if minetest.get_modpath("palm") then
 	worldeditadditions.register_sapling_alias("palm:sapling", "palm")
 end
+if minetest.get_modpath("plumtree") then
+	worldeditadditions.register_sapling_alias("plumtree:sapling", "plum")
+end
+if minetest.get_modpath("hollytree") then
+	worldeditadditions.register_sapling_alias("hollytree:sapling", "holly")
+end
 if minetest.get_modpath("pomegranate") then
 	worldeditadditions.register_sapling_alias("pomegranate:sapling", "pomegranate")
 end