From 55141ae996f8c9780a6835d8f21fc23a448e9250 Mon Sep 17 00:00:00 2001 From: shanebeee Date: Thu, 24 Oct 2024 07:07:57 +1100 Subject: [PATCH] #1494: TreeType - add missing pale oak trees --- .../world/level/block/grower/WorldGenTreeProvider.patch | 6 +++++- .../java/org/bukkit/craftbukkit/CraftRegionAccessor.java | 6 ++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/nms-patches/net/minecraft/world/level/block/grower/WorldGenTreeProvider.patch b/nms-patches/net/minecraft/world/level/block/grower/WorldGenTreeProvider.patch index 0a0148587..c25e86762 100644 --- a/nms-patches/net/minecraft/world/level/block/grower/WorldGenTreeProvider.patch +++ b/nms-patches/net/minecraft/world/level/block/grower/WorldGenTreeProvider.patch @@ -53,7 +53,7 @@ WorldGenFeatureConfigured worldgenfeatureconfigured1 = (WorldGenFeatureConfigured) holder1.value(); IBlockData iblockdata2 = worldserver.getFluidState(blockposition).createLegacyBlock(); -@@ -165,11 +173,62 @@ +@@ -165,11 +173,66 @@ return true; } @@ -102,6 +102,10 @@ + BlockSapling.treeType = TreeType.TALL_MANGROVE; + } else if (worldgentreeabstract == TreeFeatures.CHERRY || worldgentreeabstract == TreeFeatures.CHERRY_BEES_005) { + BlockSapling.treeType = TreeType.CHERRY; ++ } else if (worldgentreeabstract == TreeFeatures.PALE_OAK) { ++ BlockSapling.treeType = TreeType.PALE_OAK; ++ } else if (worldgentreeabstract == TreeFeatures.PALE_OAK_CREAKING) { ++ BlockSapling.treeType = TreeType.PALE_OAK_CREAKING; + } else { + throw new IllegalArgumentException("Unknown tree generator " + worldgentreeabstract); + } diff --git a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java index 2222b8a26..737ff6307 100644 --- a/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java +++ b/src/main/java/org/bukkit/craftbukkit/CraftRegionAccessor.java @@ -274,6 +274,12 @@ public abstract class CraftRegionAccessor implements RegionAccessor { case CHERRY: gen = TreeFeatures.CHERRY; break; + case PALE_OAK: + gen = TreeFeatures.PALE_OAK; + break; + case PALE_OAK_CREAKING: + gen = TreeFeatures.PALE_OAK_CREAKING; + break; case TREE: default: gen = TreeFeatures.OAK;