Overhauled Magic and Umbran tree generation, added new Magic Leaf/Sap…

…ling textures
Glitchfiend · Nov 28, 2023 · c7ca7f3 · c7ca7f3
1 parent d9132cf
commit c7ca7f3
Show file tree

Hide file tree

Showing 25 changed files with 609 additions and 36 deletions.
diff --git a/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924 b/src/generated/resources/.cache/103d9f3f36b01595f1aa5172191e60eff02e6924
@@ -1,4 +1,4 @@
-// 1.20.2	2023-11-27T00:34:24.626857	Registries
+// 1.20.2	2023-11-27T18:37:14.4728628	Registries
 a09ddf53150a7fcf8767a311dd5cf040fa2e9221 data/biomesoplenty/damage_type/bramble.json
 2d0eab2cc85c4c6397fdc41dd0cedefbc4a7a150 data/biomesoplenty/damage_type/fumarole.json
 b8dc803c8b669f1676bca4cf741dd201cf95119e data/biomesoplenty/worldgen/biome/aspen_forest.json
@@ -33,7 +33,7 @@ f03c569b7022ac8e8bff07ea7aa86e4d9b44e017 data/biomesoplenty/worldgen/biome/marsh
 720c0d07ae063e27eef09fde77687496afffbb6d data/biomesoplenty/worldgen/biome/mediterranean_forest.json
 4f7d2a54b4eb3089e102a66e882d3a83d8e3c2dd data/biomesoplenty/worldgen/biome/moor.json
 db3fa7b84f20c42269e21304b79dddbefe1ae15d data/biomesoplenty/worldgen/biome/muskeg.json
-bca42ba7340cda6333d240e88311f9b60865bee5 data/biomesoplenty/worldgen/biome/mystic_grove.json
+cd76f720c7dcfd56cdaa5dba0e106cc6635ebca7 data/biomesoplenty/worldgen/biome/mystic_grove.json
 2fbdefd52c85777803d3cbed2b56142859f377f4 data/biomesoplenty/worldgen/biome/old_growth_dead_forest.json
 6dccb4534ce310c171dce7c0d4052e1d8aa9fb8c data/biomesoplenty/worldgen/biome/old_growth_woodland.json
 c46a887c298443a7db55164200e36e23d9bfa2f0 data/biomesoplenty/worldgen/biome/ominous_woods.json
@@ -75,7 +75,7 @@ d5b35b4d78f4ece7de470e07042aa6b0d37b967f data/biomesoplenty/worldgen/configured_
 9e764721494e61fc108e60fa5e2b3c44158b736f data/biomesoplenty/worldgen/configured_feature/big_flowering_oak_tree.json
 6daca73a676ee4d50214f10ac4edcd280e7e5f41 data/biomesoplenty/worldgen/configured_feature/big_hellbark_tree.json
 79724649599f043d4a030a7f56968e793c3fbcfb data/biomesoplenty/worldgen/configured_feature/big_jacaranda_tree.json
-d8f898c01f52e2d8f378d8a4005a044a83cd8194 data/biomesoplenty/worldgen/configured_feature/big_magic_tree.json
+edc6ab0a206cbce687a98cdeefa62b7b59817435 data/biomesoplenty/worldgen/configured_feature/big_magic_tree.json
 d49b8c41ec1593cbc50b100564c17893bbf19109 data/biomesoplenty/worldgen/configured_feature/big_oak_tree.json
 04c894dd5c8f20e547ad7d73029bd4010d878964 data/biomesoplenty/worldgen/configured_feature/big_orange_maple_tree.json
 5de30280c59be0ab1b3afa9d6d1f8bddf0f7740e data/biomesoplenty/worldgen/configured_feature/big_origin_tree.json
@@ -178,7 +178,7 @@ bccd849ed1fd3f32daad2b1f705c30f834c20f96 data/biomesoplenty/worldgen/configured_
 e6c40fcb31d153fc2379756e7f97f99cd816a51f data/biomesoplenty/worldgen/configured_feature/large_fumarole.json
 a8aa7c8ae1c6881f8951d829a780767d266906cc data/biomesoplenty/worldgen/configured_feature/large_rose_quartz.json
 863215c984d1e63a8021b3117febf08233b183d4 data/biomesoplenty/worldgen/configured_feature/lava_lake_volcano.json
-cbf357d01e5e843837ea1b2a6f1a2d1525a685be data/biomesoplenty/worldgen/configured_feature/magic_tree.json
+bedf4220d0a9a4c61aaaef6c2b228da620cc38cc data/biomesoplenty/worldgen/configured_feature/magic_tree.json
 647617b685cbd6cdbb5b44aa89a28f06d9525d54 data/biomesoplenty/worldgen/configured_feature/mahogany_tree.json
 6b40860f0e9a088d066a68e06f0f38529cc13c27 data/biomesoplenty/worldgen/configured_feature/mangrove_twiglet_tree.json
 225cec36fb7e434d76ecbf6fae24646df1203c62 data/biomesoplenty/worldgen/configured_feature/maple_twiglet_tree.json
@@ -258,7 +258,7 @@ aefd7e01e58dfc77b03fb8b552483d826d5695bb data/biomesoplenty/worldgen/configured_
 42fcfc1dc3d24d9e7336ed91af903f7eeb97edb1 data/biomesoplenty/worldgen/configured_feature/tall_spruce_tree.json
 b48440fe4a0cf0efdf35cd32d746772b45afda08 data/biomesoplenty/worldgen/configured_feature/tall_spruce_tree_bees.json
 79eb5cea0a0423add5ff9d17797f60dc279d74c2 data/biomesoplenty/worldgen/configured_feature/tall_twiglet_tree.json
-deef5c2930855fd7e0ed024f0ac8aed966ff7dcb data/biomesoplenty/worldgen/configured_feature/tall_umbran_tree.json
+55cac49cd61cd3a2391e3c1da3bc4ff3ce4c11c8 data/biomesoplenty/worldgen/configured_feature/tall_umbran_tree.json
 d3a2bce6cff46fd0c26097cd1f904a6fd5b001d1 data/biomesoplenty/worldgen/configured_feature/thin_bamboo.json
 af8cdae336ba410701a356288fdd72fd03a80586 data/biomesoplenty/worldgen/configured_feature/toadstool_normal.json
 cf39ea65f0f723b4ef342e35c9eab27fc8a87c8d data/biomesoplenty/worldgen/configured_feature/trees_aspen_forest.json
@@ -279,7 +279,7 @@ d6dd1c0f2df75191098f1c740f68a15eb30ea75e data/biomesoplenty/worldgen/configured_
 5889f8d18aa98f2749e21a9b1989d48f1216f350 data/biomesoplenty/worldgen/configured_feature/trees_lush_desert.json
 73bc4d46f326c6189d391ecf8fda48a1af980bfb data/biomesoplenty/worldgen/configured_feature/trees_maple_forest.json
 4454b47782000d92e8ac72bae03ca931cf4aa72e data/biomesoplenty/worldgen/configured_feature/trees_muskeg.json
-236cbc7ba1dcc8d0cc3d79c2dbeaf4d5061f5d85 data/biomesoplenty/worldgen/configured_feature/trees_mystic_grove.json
+2f7915d875a1f202a092774c0e528b42ec2a87ee data/biomesoplenty/worldgen/configured_feature/trees_mystic_grove.json
 2503ef988f6e20ae77e503df120341a92737e931 data/biomesoplenty/worldgen/configured_feature/trees_old_growth_dead_forest.json
 ddafbf756b3bc45e737b408e809f228c7eb0fe35 data/biomesoplenty/worldgen/configured_feature/trees_ominous_woods.json
 e8e9a83490371e89b0db83132670f9ea7f08cff7 data/biomesoplenty/worldgen/configured_feature/trees_orchard.json
@@ -303,7 +303,7 @@ dd5eb0fd54a251be891fbc78f154d84bfb8384d9 data/biomesoplenty/worldgen/configured_
 72f38b89e0e2177248a21bd9301e376260fd6c48 data/biomesoplenty/worldgen/configured_feature/tress_mediterranean_forest.json
 2100469f9a8ff1d1abcedcbed887cefa81341634 data/biomesoplenty/worldgen/configured_feature/twiglet_tree.json
 ff9e093ec1d22c4f0bbac4df9489766fda98d48f data/biomesoplenty/worldgen/configured_feature/twiglet_tree_volcano.json
-3623e7f2a56441d56a3f36fe7f7a2944e34baec8 data/biomesoplenty/worldgen/configured_feature/umbran_tree.json
+f572efd5b07a06438c34e060d4a32bf5e7608aed data/biomesoplenty/worldgen/configured_feature/umbran_tree.json
 5001bf980f9da425fe5d93fcc34f614d8d14d0fe data/biomesoplenty/worldgen/configured_feature/undergrowth_flowers.json
 c089be4ad226d6e009849b0746e9cdaaa554e357 data/biomesoplenty/worldgen/configured_feature/wasteland_grass.json
 94d9ca631042b0643762b7d777a3c5f07f101452 data/biomesoplenty/worldgen/configured_feature/water_lake.json
@@ -567,7 +567,7 @@ b4fe6b6e47c2a605e7a3ac56544f53b7b01be919 data/biomesoplenty/worldgen/placed_feat
 980e47b6844316bb0fb170d687f12b3ef6924702 data/biomesoplenty/worldgen/placed_feature/trees_maple_forest.json
 4a9a91dcdc955306b05a70f504b7326bd10e5581 data/biomesoplenty/worldgen/placed_feature/trees_mediterranean_forest.json
 49812f9dd6be5ebcac01c67917de11e17a842699 data/biomesoplenty/worldgen/placed_feature/trees_muskeg.json
-eebaa88d61839f35bf59b4d2cd0d3a45a49a5493 data/biomesoplenty/worldgen/placed_feature/trees_mystic_grove.json
+9ef311cea091d529b11c5c20b5c155cc784a748d data/biomesoplenty/worldgen/placed_feature/trees_mystic_grove.json
 fe07b22d36731cb4483426e50177b2f790b5a833 data/biomesoplenty/worldgen/placed_feature/trees_old_growth_dead_forest.json
 9c35a48a14e47d0dc6ec87412e654f89fe286391 data/biomesoplenty/worldgen/placed_feature/trees_ominous_woods.json
 c95347ce4edad5d078f8d3643e33411bcfeac38a data/biomesoplenty/worldgen/placed_feature/trees_orchard.json

diff --git a/src/generated/resources/data/biomesoplenty/worldgen/biome/mystic_grove.json b/src/generated/resources/data/biomesoplenty/worldgen/biome/mystic_grove.json
@@ -23,12 +23,6 @@
       "replace_current_music": false,
       "sound": "minecraft:music.overworld.cherry_grove"
     },
-    "particle": {
-      "options": {
-        "type": "minecraft:end_rod"
-      },
-      "probability": 1.1532552E-4
-    },
     "sky_color": 11202559,
     "water_color": 10239972,
     "water_fog_color": 3015987

diff --git a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_magic_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/big_magic_tree.json
@@ -1,5 +1,5 @@
 {
-  "type": "biomesoplenty:poplar_tree",
+  "type": "biomesoplenty:magic_tree",
   "config": {
     "alt_foliage_provider": {
       "type": "minecraft:simple_state_provider",

diff --git a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/magic_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/magic_tree.json
@@ -1,5 +1,5 @@
 {
-  "type": "biomesoplenty:poplar_tree",
+  "type": "biomesoplenty:magic_tree",
   "config": {
     "alt_foliage_provider": {
       "type": "minecraft:simple_state_provider",
@@ -26,7 +26,7 @@
       }
     },
     "max_height": 12,
-    "min_height": 8,
+    "min_height": 5,
     "trunk_fruit_provider": {
       "type": "minecraft:simple_state_provider",
       "state": {

diff --git a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/tall_umbran_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/tall_umbran_tree.json
@@ -1,5 +1,5 @@
 {
-  "type": "biomesoplenty:taiga_tree",
+  "type": "biomesoplenty:umbran_tree",
   "config": {
     "alt_foliage_provider": {
       "type": "minecraft:simple_state_provider",

diff --git a/...enerated/resources/data/biomesoplenty/worldgen/configured_feature/trees_mystic_grove.json b/...enerated/resources/data/biomesoplenty/worldgen/configured_feature/trees_mystic_grove.json
@@ -12,7 +12,7 @@
         "feature": "biomesoplenty:big_magic_tree"
       },
       {
-        "chance": 0.01,
+        "chance": 0.025,
         "feature": "biomesoplenty:giant_tree"
       }
     ]

diff --git a/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/umbran_tree.json b/src/generated/resources/data/biomesoplenty/worldgen/configured_feature/umbran_tree.json
@@ -1,5 +1,5 @@
 {
-  "type": "biomesoplenty:taiga_tree",
+  "type": "biomesoplenty:umbran_tree",
   "config": {
     "alt_foliage_provider": {
       "type": "minecraft:simple_state_provider",

diff --git a/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/trees_mystic_grove.json b/src/generated/resources/data/biomesoplenty/worldgen/placed_feature/trees_mystic_grove.json
@@ -7,11 +7,11 @@
         "type": "minecraft:weighted_list",
         "distribution": [
           {
-            "data": 9,
-            "weight": 9
+            "data": 5,
+            "weight": 4
           },
           {
-            "data": 10,
+            "data": 15,
             "weight": 1
           }
         ]

diff --git a/src/main/java/biomesoplenty/common/biome/BOPOverworldBiomes.java b/src/main/java/biomesoplenty/common/biome/BOPOverworldBiomes.java
@@ -876,7 +876,7 @@ public static Biome mysticGrove(HolderGetter<PlacedFeature> placedFeatureGetter,
         addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.PATCH_GRASS_12);
         addFeature(biomeBuilder, GenerationStep.Decoration.VEGETAL_DECORATION, BOPVegetationPlacements.PATCH_WATERGRASS_10);
 
-        return biomeWithColorOverridesAndParticles(true, 0.7F, 0.8F, 0x9C3FE4, 0x2E0533, 0xFFC9DA, 0x69CFDB, 0x70E0B5, 0xAAEFFF, spawnBuilder, biomeBuilder, ParticleTypes.END_ROD, 0.00011532552F, MAGICAL_MUSIC);
+        return biomeWithColorOverrides(true, 0.7F, 0.8F, 0x9C3FE4, 0x2E0533, 0xFFC9DA, 0x69CFDB, 0x70E0B5, 0xAAEFFF, spawnBuilder, biomeBuilder, MAGICAL_MUSIC);
     }
 
     public static Biome oldGrowthDeadForest(HolderGetter<PlacedFeature> placedFeatureGetter, HolderGetter<ConfiguredWorldCarver<?>> carverGetter)

diff --git a/src/main/java/biomesoplenty/common/biome/BOPRareOverworldBiomeBuilder.java b/src/main/java/biomesoplenty/common/biome/BOPRareOverworldBiomeBuilder.java
@@ -6,15 +6,12 @@
 
 import biomesoplenty.api.biome.BOPBiomes;
 import biomesoplenty.common.util.biome.BiomeUtil;
-import com.mojang.datafixers.util.Pair;
 import net.minecraft.core.Registry;
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.world.level.biome.Climate;
 
-import java.util.function.Consumer;
-
 public class BOPRareOverworldBiomeBuilder extends BOPOverworldBiomeBuilder
 {
     private final ResourceKey<Biome>[][] RARE_BIOMES_BOP = new ResourceKey[][]{
@@ -49,7 +46,7 @@ protected ResourceKey<Biome> pickMiddleBiomeBOP(Registry<Biome> biomeRegistry, i
     protected ResourceKey<Biome> pickPlateauBiomeBOP(Registry<Biome> biomeRegistry, int temperatureIndex, int humidityIndex, Climate.Parameter weirdness)
     {
         if (weirdness.max() < 0L) return BiomeUtil.biomeOrFallback(biomeRegistry, this.RARE_BIOMES_BOP[temperatureIndex][humidityIndex], this.PLATEAU_BIOMES_BOP[temperatureIndex][humidityIndex], this.PLATEAU_BIOMES[temperatureIndex][humidityIndex]);
-        else return BiomeUtil.biomeOrFallback(biomeRegistry, this.RARE_BIOMES_BOP[temperatureIndex][humidityIndex], this.PLATEAU_BIOMES_VARIANT_BOP[temperatureIndex][humidityIndex], this.PLATEAU_BIOMES_BOP[temperatureIndex][humidityIndex], this.PLATEAU_BIOMES_VARIANT[temperatureIndex][humidityIndex], this.PLATEAU_BIOMES[temperatureIndex][humidityIndex]);
+        else return BiomeUtil.biomeOrFallback(biomeRegistry, this.RARE_BIOMES_VARIANT_BOP[temperatureIndex][humidityIndex], this.RARE_BIOMES_BOP[temperatureIndex][humidityIndex], this.PLATEAU_BIOMES_VARIANT_BOP[temperatureIndex][humidityIndex], this.PLATEAU_BIOMES_BOP[temperatureIndex][humidityIndex], this.PLATEAU_BIOMES_VARIANT[temperatureIndex][humidityIndex], this.PLATEAU_BIOMES[temperatureIndex][humidityIndex]);
     }
 
     @Override
@@ -63,4 +60,16 @@ protected ResourceKey<Biome> pickSwampBiomeBOP(Registry<Biome> biomeRegistry, in
     {
         return BiomeUtil.biomeOrFallback(biomeRegistry, this.RARE_BIOMES_BOP[temperatureIndex][humidityIndex], this.SWAMP_BIOMES_BOP[temperatureIndex][humidityIndex], this.pickSwampBiomeVanilla(temperatureIndex, humidityIndex, weirdness));
     }
+
+    @Override
+    protected ResourceKey<Biome> pickBeachBiomeBOP(Registry<Biome> biomeRegistry, int temperatureIndex, int humidityIndex)
+    {
+        return BiomeUtil.biomeOrFallback(biomeRegistry, this.RARE_BIOMES_BOP[temperatureIndex][humidityIndex], this.BEACH_BIOMES_BOP[temperatureIndex][humidityIndex], this.BEACH_BIOMES[temperatureIndex][humidityIndex]);
+    }
+
+    @Override
+    protected ResourceKey<Biome> pickStonyShoresBiomeBOP(Registry<Biome> biomeRegistry, int temperatureIndex, int humidityIndex)
+    {
+        return BiomeUtil.biomeOrFallback(biomeRegistry, this.RARE_BIOMES_BOP[temperatureIndex][humidityIndex], this.STONY_SHORES_BIOMES_BOP[temperatureIndex][humidityIndex], Biomes.STONY_SHORE);
+    }
 }
diff --git a/src/main/java/biomesoplenty/common/block/MagicLeavesBlock.java b/src/main/java/biomesoplenty/common/block/MagicLeavesBlock.java
@@ -0,0 +1,37 @@
+/*******************************************************************************
+ * Copyright 2022, the Glitchfiend Team.
+ * All rights reserved.
+ ******************************************************************************/
+package biomesoplenty.common.block;
+
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
+import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.util.ParticleUtils;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.level.Level;
+import net.minecraft.world.level.block.LeavesBlock;
+import net.minecraft.world.level.block.state.BlockState;
+
+public class MagicLeavesBlock extends LeavesBlock
+{
+    public MagicLeavesBlock(Properties p_273704_)
+    {
+        super(p_273704_);
+    }
+
+    @Override
+    public void animateTick(BlockState p_272714_, Level p_272837_, BlockPos p_273218_, RandomSource p_273360_)
+    {
+        super.animateTick(p_272714_, p_272837_, p_273218_, p_273360_);
+        if (p_273360_.nextInt(20) == 0)
+        {
+            BlockPos blockpos = p_273218_.below();
+            BlockState blockstate = p_272837_.getBlockState(blockpos);
+            if (!isFaceFull(blockstate.getCollisionShape(p_272837_, blockpos), Direction.UP))
+            {
+                ParticleUtils.spawnParticleBelow(p_272837_, p_273218_, p_273360_, ParticleTypes.END_ROD);
+            }
+        }
+    }
+}
diff --git a/src/main/java/biomesoplenty/common/worldgen/feature/BOPBaseFeatures.java b/src/main/java/biomesoplenty/common/worldgen/feature/BOPBaseFeatures.java
@@ -45,6 +45,7 @@ public class BOPBaseFeatures
     public static final Feature<NoneFeatureConfiguration> INFERNO_SPLATTER = register("inferno_splatter", new InfernoSplatterFeature(NoneFeatureConfiguration.CODEC));
     public static final Feature<NoneFeatureConfiguration> LARGE_FUMAROLE = register("large_fumarole", new LargeFumaroleFeature(NoneFeatureConfiguration.CODEC));
     public static final Feature<LargeDripstoneConfiguration> LARGE_ROSE_QUARTZ = register("large_rose_quartz", new LargeRoseQuartzFeature(LargeDripstoneConfiguration.CODEC));
+    public static final BOPTreeFeature<MagicTreeConfiguration> MAGIC_TREE = register("magic_tree", new MagicTreeFeature(MagicTreeConfiguration.CODEC));
     public static final BOPTreeFeature<MahoganyTreeConfiguration> MAHOGANY_TREE = register("mahogany_tree", new MahoganyTreeFeature(MahoganyTreeConfiguration.CODEC));
     public static final Feature<NoneFeatureConfiguration> MEDIUM_GLOWSHROOM = register("medium_glowshroom", new MediumGlowshroomFeature(NoneFeatureConfiguration.CODEC));
     public static final Feature<NoneFeatureConfiguration> MOSS_SPLATTER = register("moss_splatter", new MossSplatterFeature(NoneFeatureConfiguration.CODEC));
@@ -76,6 +77,7 @@ public class BOPBaseFeatures
     public static final Feature<NoneFeatureConfiguration> STRINGY_COBWEB = register("stringy_cobweb", new StringyCobwebFeature(NoneFeatureConfiguration.CODEC));
     public static final BOPTreeFeature<TaigaTreeConfiguration> TAIGA_TREE = register("taiga_tree", new TaigaTreeFeature(TaigaTreeConfiguration.CODEC));
     public static final BOPTreeFeature<TwigletTreeConfiguration> TWIGLET_TREE = register("twiglet_tree", new TwigletTreeFeature(TwigletTreeConfiguration.CODEC));
+    public static final BOPTreeFeature<TaigaTreeConfiguration> UMBRAN_TREE = register("umbran_tree", new UmbranTreeFeature(TaigaTreeConfiguration.CODEC));
     public static final Feature<NoneFeatureConfiguration> WEBBING = register("webbing", new WebbingFeature(NoneFeatureConfiguration.CODEC));
 
     private static <C extends FeatureConfiguration, F extends Feature<C>> F register(String key, F value)

diff --git a/src/main/java/biomesoplenty/common/worldgen/feature/BOPTreeFeatures.java b/src/main/java/biomesoplenty/common/worldgen/feature/BOPTreeFeatures.java
@@ -130,11 +130,11 @@ public static void bootstrap(BootstapContext<ConfiguredFeature<?, ?>> context)
         register(context, BOPTreeFeatures.FIR_TREE_SMALL, BOPBaseFeatures.TAIGA_TREE, createFir().minHeight(5).maxHeight(11).build());
         register(context, BOPTreeFeatures.TALL_SPRUCE_TREE, BOPBaseFeatures.TAIGA_TREE, new TaigaTreeConfiguration.Builder().maxHeight(13).build());
         register(context, BOPTreeFeatures.TALL_SPRUCE_TREE_BEES, BOPBaseFeatures.TAIGA_TREE, new TaigaTreeConfiguration.Builder().maxHeight(13).decorator(new BeehiveDecorator(0.05f)).build());
-        register(context, BOPTreeFeatures.TALL_UMBRAN_TREE, BOPBaseFeatures.TAIGA_TREE, new TaigaTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.UMBRAN_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.UMBRAN_LEAVES.get())).minHeight(20).maxHeight(30).trunkWidth(2).build());
-        register(context, BOPTreeFeatures.UMBRAN_TREE, BOPBaseFeatures.TAIGA_TREE, new TaigaTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.UMBRAN_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.UMBRAN_LEAVES.get())).maxHeight(20).build());
-        register(context, BOPTreeFeatures.BIG_MAGIC_TREE, BOPBaseFeatures.POPLAR_TREE, new PoplarTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.MAGIC_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.MAGIC_LEAVES.get())).minHeight(16).maxHeight(20).build());
+        register(context, BOPTreeFeatures.TALL_UMBRAN_TREE, BOPBaseFeatures.UMBRAN_TREE, new TaigaTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.UMBRAN_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.UMBRAN_LEAVES.get())).minHeight(20).maxHeight(30).trunkWidth(2).build());
+        register(context, BOPTreeFeatures.UMBRAN_TREE, BOPBaseFeatures.UMBRAN_TREE, new TaigaTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.UMBRAN_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.UMBRAN_LEAVES.get())).maxHeight(20).build());
+        register(context, BOPTreeFeatures.BIG_MAGIC_TREE, BOPBaseFeatures.MAGIC_TREE, new MagicTreeConfiguration.Builder().minHeight(16).maxHeight(20).build());
         register(context, BOPTreeFeatures.DARK_OAK_POPLAR_TREE, BOPBaseFeatures.POPLAR_TREE, new PoplarTreeConfiguration.Builder().trunk(BlockStateProvider.simple(Blocks.DARK_OAK_LOG)).foliage(BlockStateProvider.simple(Blocks.DARK_OAK_LEAVES)).build());
-        register(context, BOPTreeFeatures.MAGIC_TREE, BOPBaseFeatures.POPLAR_TREE, new PoplarTreeConfiguration.Builder().trunk(BlockStateProvider.simple(BOPBlocks.MAGIC_LOG.get())).foliage(BlockStateProvider.simple(BOPBlocks.MAGIC_LEAVES.get())).minHeight(8).maxHeight(12).build());
+        register(context, BOPTreeFeatures.MAGIC_TREE, BOPBaseFeatures.MAGIC_TREE, new MagicTreeConfiguration.Builder().minHeight(5).maxHeight(12).build());
         register(context, BOPTreeFeatures.SPRUCE_POPLAR_TREE, BOPBaseFeatures.POPLAR_TREE, new PoplarTreeConfiguration.Builder().trunk(BlockStateProvider.simple(Blocks.SPRUCE_LOG)).foliage(BlockStateProvider.simple(Blocks.SPRUCE_LEAVES)).build());
         register(context, BOPTreeFeatures.CYPRESS_TREE, BOPBaseFeatures.CYPRESS_TREE, new CypressTreeConfiguration.Builder().build());
         register(context, BOPTreeFeatures.CYPRESS_TREE_MEDIUM, BOPBaseFeatures.CYPRESS_TREE, new CypressTreeConfiguration.Builder().minHeight(18).maxHeight(25).trunkWidth(2).build());