fixes to maple, paperbark and cinnamon

Author: supermassimo

src/generated/resources/data/dtphc2/loot_table/trees/leaves/dragon_fruit.json

@@ -24,7 +24,7 @@ public boolean run(BlockState blockState, LevelAccessor world, BlockPos pos, Dir
                 finished = true;
                 return false;
             }
-            for(Direction face : Direction.Plane.HORIZONTAL) { //Check all sides of this block
+            for(Direction face : Direction.Plane.HORIZONTAL.shuffledCopy(world.getRandom())) { //Check all sides of this block
                 BlockPos offPos = pos.relative(face);
                 BlockState state = world.getBlockState(offPos);
                 if(state.getBlock() == DTPHC2Blocks.MAPLE_SPILE_BUCKET_BLOCK.get()) { //Found a bucket

src/main/java/maxhyper/dtphc2/genfeatures/DripSyrupNode.java

@@ -18,14 +18,11 @@
 import javax.annotation.Nonnull;
 import java.awt.*;
 
-import static net.minecraft.util.Mth.clamp;
-
 public class SyrupGenFeature extends GenFeature {
 
     private static final ConfigurationProperty<Float> BASE_SYRUP_CHANCE = ConfigurationProperty.floatProperty("base_syrup_chance");
     private static final ConfigurationProperty<Float> OUT_OF_SEASON_SYRUP_CHANCE = ConfigurationProperty.floatProperty("out_of_season_syrup_chance");
-    private static final ConfigurationProperty<Float> SEASONAL_OFFSET = ConfigurationProperty.floatProperty("seasonal_offset");
-    private static final ConfigurationProperty<Float> SEASONAL_RANGE = ConfigurationProperty.floatProperty("seasonal_range");
+    public static final ConfigurationProperty<Float> SEASONAL_OFFSET = ConfigurationProperty.floatProperty("seasonal_offset");
     private static final ConfigurationProperty<Item> SYRUP_ITEM = ConfigurationProperty.item("syrup_item");
     private static final ConfigurationProperty<String> TINT = ConfigurationProperty.string("tint");
 
@@ -35,7 +32,7 @@ public SyrupGenFeature(ResourceLocation registryName) {
 
     @Override
     protected void registerProperties() {
-        this.register(BASE_SYRUP_CHANCE, OUT_OF_SEASON_SYRUP_CHANCE, SYRUP_ITEM, SEASONAL_OFFSET, SEASONAL_RANGE, TINT);
+        this.register(BASE_SYRUP_CHANCE, OUT_OF_SEASON_SYRUP_CHANCE, SYRUP_ITEM, SEASONAL_OFFSET, TINT);
     }
 
     @Nonnull
@@ -46,7 +43,6 @@ public GenFeatureConfiguration createDefaultConfiguration() {
                 .with(OUT_OF_SEASON_SYRUP_CHANCE, 0.001F)
                 .with(SYRUP_ITEM, Items.AIR)
                 .with(SEASONAL_OFFSET, 3.5F)
-                .with(SEASONAL_RANGE, 1.0F)
                 .with(TINT, "#FF00FF");//ugly purple to show that its missing
     }
 
@@ -70,16 +66,17 @@ public boolean postGrow(@Nonnull GenFeatureConfiguration configuration, @Nonnull
 
     //Update syrup extract rate depending on seasons
     public double getSyrupChance(LevelContext world, BlockPos pos, GenFeatureConfiguration config) {
-        Float season = SeasonHelper.getSeasonValue(world, pos);
-        float offset = config.get(SEASONAL_OFFSET);
-        float range = config.get(SEASONAL_RANGE);
-        ConfigurationProperty<Float> chanceProp = (season == null || SeasonHelper.isSeasonBetween(season,  offset, offset + range)) ? BASE_SYRUP_CHANCE : OUT_OF_SEASON_SYRUP_CHANCE;
-        float chance = config.get(chanceProp);
-        return clamp(chance, 0.0f, 1.0f);
+        float factor = seasonalFruitProductionFactor(world, pos, config);
+        return Math.max(factor * config.get(BASE_SYRUP_CHANCE), config.get(OUT_OF_SEASON_SYRUP_CHANCE));
     }
 
     private void dripSyrup(LevelAccessor world, BlockPos rootPos) {
         TreeHelper.startAnalysisFromRoot(world, rootPos, new MapSignal(new DripSyrupNode()));
     }
 
+    public float seasonalFruitProductionFactor(LevelContext levelContext, BlockPos pos, GenFeatureConfiguration config) {
+        float season = SeasonHelper.getSeasonValue(levelContext, pos);
+        return config.getAsOptional(SEASONAL_OFFSET).isPresent() ? SeasonHelper.globalSeasonalFruitProductionFactor(levelContext, new BlockPos(0,(int)(season*64),-1), -config.get(SEASONAL_OFFSET), true) : 1.0F;
+    }
+
 }

src/main/java/maxhyper/dtphc2/genfeatures/SyrupGenFeature.java

@@ -35,8 +35,9 @@ public static void registerSpeciesAppliers(PropertyAppliers<Species, JsonElement
                         GenOnExtraSoilSpecies::setExtraSoil)
                 .register("log_drop_item", FruitLogSpecies.class, Item.class, FruitLogSpecies::setDropItem)
                 //.register("log_drop_item", FruitLogSpecies.class, ResourceLocation.class, FruitLogSpecies::setDropItem)
-                .register("log_drop_multiplier", FruitLogSpecies.class, Float.class, FruitLogSpecies::setMultiplier)
-                .register("log_drop_fake_log", FruitLogSpecies.class, Item.class, FruitLogSpecies::setFakeLog);
+                .register("log_drop_item_multiplier", FruitLogSpecies.class, Float.class, FruitLogSpecies::setItemMultiplier)
+                .register("log_drop_fake_log", FruitLogSpecies.class, Item.class, FruitLogSpecies::setFakeLog)
+                .register("log_drop_fake_log_multiplier", FruitLogSpecies.class, Float.class, FruitLogSpecies::setFakeLogMultiplier);
     }
 
 //    public static void registerFruitAppliers(PropertyAppliers<Fruit, JsonElement> appliers) {

src/main/java/maxhyper/dtphc2/init/RegisterJSONAppliers.java

@@ -24,14 +24,13 @@ public FruitVineItem(FruitVineBlock pBlock, Properties pProperties) {
 
     @Override
     public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
-        super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
         Level level = context.level();
         if (level == null) return;
         if (SeasonHelper.getSeasonValue(LevelContext.create(level), BlockPos.ZERO) == null) return;
         int flags = getSeasonalTooltipFlags(level);
 
         if (flags != 0) {
-            tooltipComponents.add(Component.literal("desc.dynamictrees.seasonal.fertile_seasons").append(":"));
+            tooltipComponents.add(Component.translatable("desc.dynamictrees.seasonal.fertile_seasons").append(":"));
 
             if ((flags & 15) == 15) {
                 tooltipComponents.add(Component.literal(" ").append(Component.translatable("desc.sereneseasons.year_round").withStyle(ChatFormatting.LIGHT_PURPLE)));
@@ -50,6 +49,7 @@ public void appendHoverText(ItemStack stack, TooltipContext context, List<Compon
                 }
             }
         }
+        super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
     }
 
     public int getSeasonalTooltipFlags(final Level world) {

src/main/java/maxhyper/dtphc2/items/FruitVineItem.java

@@ -1,26 +1,39 @@
 package maxhyper.dtphc2.trees;
 
+import com.dtteam.dynamictrees.api.registry.RegistryHandler;
 import com.dtteam.dynamictrees.api.registry.TypedRegistry;
+import com.dtteam.dynamictrees.api.worldgen.LevelContext;
 import com.dtteam.dynamictrees.block.leaves.LeavesProperties;
+import com.dtteam.dynamictrees.item.Seed;
 import com.dtteam.dynamictrees.systems.nodemapper.NetVolumeNode;
+import com.dtteam.dynamictrees.systems.season.SeasonHelper;
 import com.dtteam.dynamictrees.tree.family.Family;
 import com.dtteam.dynamictrees.tree.species.Species;
+import maxhyper.dtphc2.genfeatures.SyrupGenFeature;
+import net.minecraft.ChatFormatting;
+import net.minecraft.core.BlockPos;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.Items;
+import net.minecraft.world.item.TooltipFlag;
+import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.Blocks;
 
 import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicReference;
 
 public class FruitLogSpecies extends Species {
 
     public static final TypedRegistry.EntryType<Species> TYPE = createDefaultType(FruitLogSpecies::new);
 
     //private ResourceLocation dropItemLoc = new ResourceLocation("air");
     private Item dropItem = null;
-    private float multiplier = 1;
+    private float item_multiplier = 1;
+    private float fake_log_multiplier = 1;
     private Item fakeLog = Items.AIR;
 
     public FruitLogSpecies(ResourceLocation name, Family family, LeavesProperties leavesProperties) {
@@ -44,7 +57,7 @@ public LogsAndSticks getLogsAndSticks(NetVolumeNode.Volume volume, boolean silkT
             }
         } else {
             if (dropItem != Items.AIR) {
-                int itemVol = (int)(vol * multiplier);
+                int itemVol = (int)(vol * item_multiplier);
                 ItemStack stack = new ItemStack(dropItem);
                 while (itemVol > 0) {
                     ItemStack drop = stack.copy();
@@ -54,7 +67,7 @@ public LogsAndSticks getLogsAndSticks(NetVolumeNode.Volume volume, boolean silkT
                 }
             }
             if (fakeLog != Items.AIR){
-                int logVol = vol;
+                int logVol = (int)(vol * fake_log_multiplier);
                 ItemStack logStack = new ItemStack(fakeLog);
                 while (logVol > 0) {
                     ItemStack drop = logStack.copy();
@@ -74,11 +87,90 @@ public void setDropItem(Item item) {
         this.dropItem = item;
     }
 
-    public void setMultiplier(float multiplier) {
-        this.multiplier = multiplier;
+    public void setItemMultiplier(float multiplier) {
+        this.item_multiplier = multiplier;
+    }
+
+    public void setFakeLogMultiplier(float multiplier) {
+        this.fake_log_multiplier = multiplier;
     }
 
     public void setFakeLog(Item fakeLog) {
         this.fakeLog = fakeLog;
     }
+
+    //Appends seasonal hover text to trees that use the Syrup gen feature (maple trees).
+    @Override
+    public Species generateSeed() {
+        return this.shouldGenerateSeed() && this.seed == null ? this.setSeed(RegistryHandler.addItem(this.getSeedName(), () -> new Seed(this){
+            @Override
+            public void appendHoverText(ItemStack stack, TooltipContext context, List<Component> tooltipComponents, TooltipFlag tooltipFlag) {
+                Level level = context.level();
+                if (level == null) return;
+                if (SeasonHelper.getSeasonValue(LevelContext.create(level), BlockPos.ZERO) == null) return;
+                int flags = getSeasonalTooltipFlags(LevelContext.create(level));
+
+                if (flags != 0) {
+                    tooltipComponents.add(Component.translatable("desc.dynamictrees.seasonal.fertile_seasons").append(":"));
+
+                    if ((flags & 15) == 15) {
+                        tooltipComponents.add(Component.literal(" ").append(Component.translatable("desc.sereneseasons.year_round").withStyle(ChatFormatting.LIGHT_PURPLE)));
+                    } else {
+                        if ((flags & 1) != 0) {
+                            tooltipComponents.add(Component.literal(" ").append(Component.translatable("desc.sereneseasons.spring").withStyle(ChatFormatting.GREEN)));
+                        }
+                        if ((flags & 2) != 0) {
+                            tooltipComponents.add(Component.literal(" ").append(Component.translatable("desc.sereneseasons.summer").withStyle(ChatFormatting.YELLOW)));
+                        }
+                        if ((flags & 4) != 0) {
+                            tooltipComponents.add(Component.literal(" ").append(Component.translatable("desc.sereneseasons.autumn").withStyle(ChatFormatting.GOLD)));
+                        }
+                        if ((flags & 8) != 0) {
+                            tooltipComponents.add(Component.literal(" ").append(Component.translatable("desc.sereneseasons.winter").withStyle(ChatFormatting.AQUA)));
+                        }
+                    }
+                }
+                super.appendHoverText(stack, context, tooltipComponents, tooltipFlag);
+            }
+
+            public int getSeasonalTooltipFlags(LevelContext levelContext) {
+                final float seasonStart = 1f / 6;
+                final float seasonEnd = 1 - 1f / 6;
+                final float threshold = 0.75f;
+
+                AtomicReference<Float> seasonOffset = new AtomicReference<>();
+                AtomicBoolean found = new AtomicBoolean(false);
+                getSpecies().getGenFeatures().forEach(gf->{
+                    if (gf.getGenFeature() instanceof SyrupGenFeature){
+                        seasonOffset.set(gf.get(SyrupGenFeature.SEASONAL_OFFSET));
+                        found.set(true);
+                    }
+                });
+                if (!found.get()) return 0;
+
+                int seasonFlags = 0;
+
+                for(int i = 0; i < 4; ++i) {
+                    boolean isValidSeason = false;
+                    if (seasonOffset.get() != null) {
+                        float prod1 = SeasonHelper.globalSeasonalFruitProductionFactor(levelContext, new BlockPos(0, (int)(((float)i + seasonStart - seasonOffset.get()) * 64.0F), 0), true);
+                        float prod2 = SeasonHelper.globalSeasonalFruitProductionFactor(levelContext, new BlockPos(0, (int)(((float)i + seasonEnd - seasonOffset.get()) * 64.0F), 0), true);
+                        if (Math.min(prod1, prod2) > threshold) {
+                            isValidSeason = true;
+                        }
+                    } else {
+                        isValidSeason = true;
+                    }
+
+                    if (isValidSeason) {
+                        seasonFlags |= 1 << i;
+                    }
+                }
+
+                return seasonFlags;
+
+            }
+
+        })) : this;
+    }
 }

src/main/java/maxhyper/dtphc2/trees/FruitLogSpecies.java

@@ -50,18 +50,19 @@ public void stripBranch(BlockState state, Level world, BlockPos pos, Player play
             }
 
             @Override
-            public void tick(BlockState state, ServerLevel world, BlockPos pos, RandomSource rand) {
+            protected void randomTick(BlockState state, ServerLevel level, BlockPos pos, RandomSource rand) {
                 if (rand.nextFloat() < barkRegrowChance && isStrippedBranch()){
-                    int radius = TreeHelper.getRadius(world, pos);
-                    int radiusDown = TreeHelper.isBranch(world.getBlockState(pos.below())) ? TreeHelper.getRadius(world, pos.below()) : getMaxRadius();
-                    this.getFamily().getBranch().ifPresent(branch -> branch.setRadius(world, pos,
+                    int radius = TreeHelper.getRadius(level, pos);
+                    int radiusDown = TreeHelper.isBranch(level.getBlockState(pos.below())) ? TreeHelper.getRadius(level, pos.below()) : getMaxRadius();
+                    this.getFamily().getBranch().ifPresent(branch -> branch.setRadius(level, pos,
                                     Math.min(radiusDown, radius + (Services.CONFIG.getBoolConfig(IConfigHelper.ENABLE_STRIP_RADIUS_REDUCTION) ? 1 : 0)),
                                     null
                             )
                     );
                 }
-                super.tick(state, world, pos, rand);
+                super.randomTick(state, level, pos, rand);
             }
+
         };
         if (this.isFireProof()) branch.setFireSpreadSpeed(0).setFlammability(0);
         return branch;

src/main/java/maxhyper/dtphc2/trees/PaperbarkFamily.java

@@ -38,27 +38,6 @@
                 }
               ],
               "name": "minecraft:jungle_leaves"
-            },
-            {
-              "type": "dynamictrees:seed_item",
-              "conditions": [
-                {
-                  "condition": "minecraft:survives_explosion"
-                },
-                {
-                  "chances": [
-                    0.015625,
-                    0.03125,
-                    0.046875,
-                    0.0625
-                  ],
-                  "condition": "minecraft:table_bonus",
-                  "enchantment": "minecraft:fortune"
-                },
-                {
-                  "condition": "dynamictrees:seasonal_seed_drop_chance"
-                }
-              ]
             }
           ]
         }