Growing

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/ModPlatform.java

@@ -37,6 +37,7 @@ import com.dfsek.terra.mod.config.BiomeAdditionsSoundTemplate;
 import com.dfsek.terra.mod.config.BiomeMoodSoundTemplate;
 import com.dfsek.terra.mod.config.BiomeParticleConfigTemplate;
 import com.dfsek.terra.mod.config.EntityTypeTemplate;
+import com.dfsek.terra.mod.config.FertilizableConfig;
 import com.dfsek.terra.mod.config.MusicSoundTemplate;
 import com.dfsek.terra.mod.config.ProtoPlatformBiome;
 import com.dfsek.terra.mod.config.SoundEventTemplate;
@@ -95,7 +96,8 @@ public abstract class ModPlatform extends AbstractPlatform {
                 .registerLoader(SpawnEntry.class, SpawnEntryTemplate::new)
                 .registerLoader(SpawnTypeConfig.class, SpawnTypeConfig::new)
                 .registerLoader(SpawnSettings.class, SpawnSettingsTemplate::new)
-                .registerLoader(VillagerType.class, VillagerTypeTemplate::new);
+                .registerLoader(VillagerType.class, VillagerTypeTemplate::new)
+                .registerLoader(FertilizableConfig.class, FertilizableConfig::new);
     }
     
     private ProtoPlatformBiome parseBiome(String id, DepthTracker tracker) throws LoadException {

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/FertilizableConfig.java

@@ -0,0 +1,51 @@
+package com.dfsek.terra.mod.config;
+
+import com.dfsek.tectonic.api.config.template.annotations.Default;
+import com.dfsek.tectonic.api.config.template.annotations.Value;
+import com.dfsek.tectonic.api.config.template.object.ObjectTemplate;
+import net.minecraft.util.Identifier;
+
+import java.util.Map;
+
+import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
+import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+
+
+public class FertilizableConfig implements ObjectTemplate<FertilizableConfig> {
+    @Value("strucutres")
+    @Default
+    private ProbabilityCollection<ConfiguredStructure> structures = null;
+    
+    @Value("cooldowns")
+    @Default
+    private Map<Identifier, Double> cooldowns = null;
+    
+    @Value("can-grow")
+    @Default
+    private ConfiguredStructure canGrow = null;
+    
+    @Value("villager-fertilizable")
+    @Default
+    private Boolean villagerFertilizable = null;
+    
+    public ProbabilityCollection<ConfiguredStructure> getStructures() {
+        return structures;
+    }
+    
+    public Map<Identifier, Double> getCooldowns() {
+        return cooldowns;
+    }
+    
+    public ConfiguredStructure getCanGrow() {
+        return canGrow;
+    }
+    
+    public Boolean isVillagerFertilizable() {
+        return villagerFertilizable;
+    }
+    
+    @Override
+    public FertilizableConfig get() {
+        return this;
+    }
+}

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/config/VanillaBiomeProperties.java

@@ -20,15 +20,13 @@ import java.util.List;
 import java.util.Map;
 
 import com.dfsek.terra.api.properties.Properties;
-import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 
 
 public class VanillaBiomeProperties implements ConfigTemplate, Properties {
     
     @Value("minecraft.fertilizables")
     @Default
-    private Map<Identifier, ProbabilityCollection<ConfiguredStructure>> fertilizables = Collections.emptyMap();
+    private Map<Identifier, FertilizableConfig> fertilizables = Collections.emptyMap();
     
     @Value("minecraft.tags")
     @Default
@@ -106,7 +104,7 @@ public class VanillaBiomeProperties implements ConfigTemplate, Properties {
     @Default
     private VillagerType villagerType = null;
     
-    public Map<Identifier, ProbabilityCollection<ConfiguredStructure>> getFertilizables() {
+    public Map<Identifier, FertilizableConfig> getFertilizables() {
         return fertilizables;
     }
     

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/fix/BeeMoveGoalsUnsynchronizedRandomAccessFixMixin.java

@@ -19,7 +19,7 @@ import com.dfsek.terra.mod.CommonPlatform;
         MoveToHiveGoal.class,
         MoveToFlowerGoal.class
 })
-public class BeeMoveGoalsUnsynchronizedRandomAccessFix {
+public class BeeMoveGoalsUnsynchronizedRandomAccessFixMixin {
     @Redirect(method = "<init>",
               at = @At(value = "FIELD", target = "Lnet/minecraft/world/World;random:Lnet/minecraft/util/math/random/Random;"))
     public Random redirectRandomAccess(World instance) {

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/fix/NetherFossilOptimizationMixin.java

@@ -20,7 +20,7 @@ import com.dfsek.terra.mod.generation.MinecraftChunkGeneratorWrapper;
  * nether.
  */
 @Mixin(NetherFossilStructure.class)
-public class NetherFossilOptimization {
+public class NetherFossilOptimizationMixin {
     @Inject(method = "getStructurePosition", at = @At("HEAD"), cancellable = true)
     public void injectFossilPositions(Context context, CallbackInfoReturnable<Optional<StructurePosition>> cir) {
         if(context.chunkGenerator() instanceof MinecraftChunkGeneratorWrapper) {

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/gameplay/BoneMealItemMixin.java

@@ -0,0 +1,32 @@
+package com.dfsek.terra.mod.mixin.gameplay;
+
+
+import net.minecraft.item.BoneMealItem;
+import net.minecraft.item.ItemStack;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import com.dfsek.terra.mod.util.FertilizableUtil;
+
+
+@Mixin(BoneMealItem.class)
+public class BoneMealItemMixin {
+    private static final Identifier cooldownId = new Identifier("terra", "bone_meal_cooldown");
+    
+    @Inject(method = "useOnFertilizable", at = @At("HEAD"), cancellable = true)
+    private static void injectUseOnFertilizable(ItemStack stack, World world, BlockPos pos, CallbackInfoReturnable<Boolean> cir) {
+        if(world instanceof ServerWorld) {
+            Boolean value = FertilizableUtil.grow((ServerWorld) world, pos, world.getBlockState(pos), cooldownId);
+            stack.decrement(1);
+            if(value != null) {
+                cir.setReturnValue(value);
+            }
+        }
+    }
+}

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/gameplay/BoneMealTaskMixin.java

@@ -0,0 +1,57 @@
+package com.dfsek.terra.mod.mixin.gameplay;
+
+
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.ai.brain.task.BoneMealTask;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.registry.Registry;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Inject;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
+
+import java.util.Map;
+import java.util.Random;
+
+import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
+import com.dfsek.terra.api.util.Rotation;
+import com.dfsek.terra.api.util.vector.Vector3Int;
+import com.dfsek.terra.api.world.WritableWorld;
+import com.dfsek.terra.mod.config.FertilizableConfig;
+import com.dfsek.terra.mod.util.BiomeUtil;
+
+
+@Mixin(BoneMealTask.class)
+public class BoneMealTaskMixin {
+    
+    @Inject(method = "canBoneMeal", at = @At("HEAD"), cancellable = true)
+    public void injectCanBoneMeal(BlockPos pos, ServerWorld world, CallbackInfoReturnable<Boolean> cir) {
+        Map<Identifier, FertilizableConfig> map = BiomeUtil.TERRA_BIOME_FERTILIZABLE_MAP.get(world.getBiome(pos));
+        if(map != null) {
+            BlockState blockState = world.getBlockState(pos);
+            Block block = blockState.getBlock();
+            FertilizableConfig config = map.get(Registry.BLOCK.getId(block));
+            if(config != null) {
+                Boolean villagerFertilizable = config.isVillagerFertilizable();
+                if(villagerFertilizable != null) {
+                    if(villagerFertilizable) {
+                        ConfiguredStructure canGrow = config.getCanGrow();
+                        if(canGrow != null) {
+                            Random random = (Random) world.getRandom();
+                            cir.setReturnValue(canGrow.getStructure().get(random).generate(
+                                    Vector3Int.of(pos.getX(), pos.getY(), pos.getZ()), (WritableWorld) world, random, Rotation.NONE));
+                            return;
+                        }
+                        cir.setReturnValue(true);
+                        return;
+                    }
+                    cir.setReturnValue(false);
+                    return;
+                }
+            }
+        }
+    }
+}

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/mixin/gameplay/ServerWorldMixin.java

@@ -0,0 +1,32 @@
+package com.dfsek.terra.mod.mixin.gameplay;
+
+
+import net.minecraft.block.BlockState;
+import net.minecraft.server.world.ServerWorld;
+import net.minecraft.util.Identifier;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.random.Random;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.Redirect;
+
+import com.dfsek.terra.mod.util.FertilizableUtil;
+
+
+@Mixin(ServerWorld.class)
+public class ServerWorldMixin {
+    private static final Identifier cooldownId = new Identifier("terra", "random_cooldown");
+    
+    @Redirect(method = "tickChunk",
+              at = @At(value = "INVOKE",
+                       target = "Lnet/minecraft/block/BlockState;randomTick(Lnet/minecraft/server/world/ServerWorld;" +
+                                "Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/util/math/random/Random;)V"))
+    public void injectTickChunk(BlockState instance, ServerWorld serverWorld, BlockPos blockPos, Random random) {
+        Boolean value = FertilizableUtil.grow(serverWorld, blockPos, instance, cooldownId);
+        if(value != null) {
+            if(!value) {
+                instance.randomTick(serverWorld, blockPos, random);
+            }
+        }
+    }
+}

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/BiomeUtil.java

@@ -17,10 +17,9 @@ import java.util.Map;
 import java.util.Objects;
 
 import com.dfsek.terra.api.config.ConfigPack;
-import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
 import com.dfsek.terra.api.world.biome.Biome;
 import com.dfsek.terra.mod.CommonPlatform;
+import com.dfsek.terra.mod.config.FertilizableConfig;
 import com.dfsek.terra.mod.config.ProtoPlatformBiome;
 import com.dfsek.terra.mod.config.VanillaBiomeProperties;
 import com.dfsek.terra.mod.mixin.access.VillagerTypeAccessor;
@@ -29,7 +28,7 @@ import com.dfsek.terra.mod.mixin.access.VillagerTypeAccessor;
 public class BiomeUtil {
     private static final Logger logger = LoggerFactory.getLogger(BiomeUtil.class);
     
-    public static final Map<RegistryEntry<net.minecraft.world.biome.Biome>, Map<Identifier, ProbabilityCollection<ConfiguredStructure>>>
+    public static final Map<RegistryEntry<net.minecraft.world.biome.Biome>, Map<Identifier, FertilizableConfig>>
             TERRA_BIOME_FERTILIZABLE_MAP = new HashMap<>();
     
     public static final Map<TagKey<net.minecraft.world.biome.Biome>, List<Identifier>>

platforms/mixin-common/src/main/java/com/dfsek/terra/mod/util/FertilizableUtil.java

@@ -1,34 +1,54 @@
 package com.dfsek.terra.mod.util;
 
-import com.dfsek.terra.api.util.Rotation;
-import com.dfsek.terra.api.util.vector.Vector3Int;
-
-import com.dfsek.terra.api.world.WritableWorld;
-
+import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
 import net.minecraft.server.world.ServerWorld;
 import net.minecraft.util.Identifier;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.random.Random;
 import net.minecraft.util.registry.Registry;
 
 import java.util.Map;
+import java.util.Random;
 
 import com.dfsek.terra.api.structure.configured.ConfiguredStructure;
-import com.dfsek.terra.api.util.collection.ProbabilityCollection;
+import com.dfsek.terra.api.util.Rotation;
+import com.dfsek.terra.api.util.vector.Vector3Int;
+import com.dfsek.terra.api.world.WritableWorld;
+import com.dfsek.terra.mod.config.FertilizableConfig;
 
 
 public class FertilizableUtil {
-    public static boolean grow(ServerWorld world, Random random, BlockPos pos, BlockState state) {
-        Map<Identifier, ProbabilityCollection<ConfiguredStructure>> fertilizables =  BiomeUtil.TERRA_BIOME_FERTILIZABLE_MAP.get(world.getBiome(pos));
-        if (fertilizables != null) {
-            ProbabilityCollection<ConfiguredStructure> probabilityCollection = fertilizables.get(Registry.BLOCK.getId(state.getBlock()));
-            if (probabilityCollection != null) {
-                ConfiguredStructure structure = probabilityCollection.get((java.util.Random) random);
-                structure.getStructure().get((java.util.Random) random).generate(Vector3Int.of(pos.getX(), pos.getY(), pos.getZ()), (WritableWorld) world, (java.util.Random) random, Rotation.NONE);
+    
+    private static final Random mojankRandom = new Random();
+    
+    public static Boolean grow(ServerWorld world, BlockPos pos, BlockState state, Identifier cooldownId) {
+        return grow(world, mojankRandom, pos, state, cooldownId);
+    }
+    
+    public static Boolean grow(ServerWorld world, Random random, BlockPos pos, BlockState state, Identifier cooldownId) {
+        Map<Identifier, FertilizableConfig> map = BiomeUtil.TERRA_BIOME_FERTILIZABLE_MAP.get(world.getBiome(pos));
+        if(map != null) {
+            Block block = state.getBlock();
+            FertilizableConfig config = map.get(Registry.BLOCK.getId(block));
+            if(config != null) {
+                ConfiguredStructure canGrow = config.getCanGrow();
+                if(canGrow != null) {
+                    if(!canGrow.getStructure().get(random).generate(
+                            Vector3Int.of(pos.getX(), pos.getY(), pos.getZ()), (WritableWorld) world, random, Rotation.NONE)) {
+                        return false;
+                    }
+                }
+                Double cooldown = config.getCooldowns().get(cooldownId);
+                if(cooldown != null) {
+                    if(random.nextFloat() > cooldown) {
+                        return true;
+                    }
+                }
+                config.getStructures().get(random).getStructure().get(random).generate(
+                        Vector3Int.of(pos.getX(), pos.getY(), pos.getZ()), (WritableWorld) world, random, Rotation.NONE);
                 return true;
             }
         }
-        return false;
+        return null;
     }
 }

platforms/mixin-common/src/main/resources/terra.common.mixins.json

@@ -9,8 +9,11 @@
         "access.StateAccessor",
         "access.StructureAccessorAccessor",
         "access.VillagerTypeAccessor",
-        "fix.BeeMoveGoalsUnsynchronizedRandomAccessFix",
-        "fix.NetherFossilOptimization",
+        "fix.BeeMoveGoalsUnsynchronizedRandomAccessFixMixin",
+        "fix.NetherFossilOptimizationMixin",
+        "gameplay.BoneMealItemMixin",
+        "gameplay.BoneMealTaskMixin",
+        "gameplay.ServerWorldMixin",
         "implementations.compat.GenerationSettingsFloraFeaturesMixin",
         "implementations.terra.BiomeMixin",
         "implementations.terra.HandleImplementationMixin",