Chicken egg timer reduction via Drum of the Gathering

- if more than 30 seconds remaining to next egg, the excess time is reduced by 50% (e.g. 1 minute remaining becomes 45 seconds remaining)
- if less than 10 seconds remaining, chicken gets startled and lays its egg prematurely
- nothing happens between 10 and 30 seconds remaining

Xplat/src/main/java/vazkii/botania/common/block/mana/DrumBlock.java

@@ -14,6 +14,7 @@
 import net.minecraft.world.effect.MobEffect;
 import net.minecraft.world.entity.Mob;
 import net.minecraft.world.entity.Shearable;
+import net.minecraft.world.entity.animal.Chicken;
 import net.minecraft.world.entity.animal.MushroomCow;
 import net.minecraft.world.entity.item.ItemEntity;
 import net.minecraft.world.item.Item;
@@ -39,6 +40,7 @@
 import vazkii.botania.common.item.BotaniaItems;
 import vazkii.botania.common.item.HornItem;
 import vazkii.botania.common.lib.BotaniaTags;
+import vazkii.botania.mixin.LivingEntityAccessor;
 import vazkii.botania.mixin.MushroomCowAccessor;
 
 import java.util.ArrayList;
@@ -49,6 +51,8 @@ public class DrumBlock extends BotaniaWaterloggedBlock {
 
 	public static final int MAX_NUM_SHEARED = 4;
 	public static final int GATHER_RANGE = 10;
+	public static final int MINIMUM_REMAINING_EGG_TIME = 600;
+	public static final int STARTLED_EGG_TIME = 200;
 
 	public enum Variant {
 		WILD,
@@ -76,6 +80,9 @@ public static void gatherProduce(Level world, BlockPos pos) {
 		List<Shearable> shearables = new ArrayList<>();
 
 		for (Mob mob : mobs) {
+			if (mob instanceof Chicken chicken && !chicken.isBaby() && !chicken.isChickenJockey()) {
+				speedUpEggLaying(chicken);
+			}
 			if (mob.getType().is(BotaniaTags.Entities.DRUM_MILKABLE) && !mob.isBaby()) {
 				convertNearby(mob, Items.BUCKET, Items.MILK_BUCKET);
 			}
@@ -103,6 +110,16 @@ public static void gatherProduce(Level world, BlockPos pos) {
 		}
 	}
 
+	private static void speedUpEggLaying(Chicken chicken) {
+		if (chicken.eggTime > MINIMUM_REMAINING_EGG_TIME) {
+			int reducibleEggTime = chicken.eggTime - MINIMUM_REMAINING_EGG_TIME;
+			chicken.eggTime = MINIMUM_REMAINING_EGG_TIME + reducibleEggTime / 2;
+		} else if (chicken.eggTime < STARTLED_EGG_TIME && chicken.eggTime > 1) {
+			chicken.eggTime = 1;
+			((LivingEntityAccessor) chicken).botania_playHurtSound(chicken.damageSources().magic());
+		}
+	}
+
 	private static void convertNearby(Mob mob, Item from, Item to) {
 		Level world = mob.level();
 		List<ItemEntity> fromEntities = world.getEntitiesOfClass(ItemEntity.class, mob.getBoundingBox(),

Xplat/src/main/java/vazkii/botania/mixin/LivingEntityAccessor.java

@@ -8,13 +8,18 @@
  */
 package vazkii.botania.mixin;
 
+import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.LivingEntity;
 
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.gen.Accessor;
+import org.spongepowered.asm.mixin.gen.Invoker;
 
 @Mixin(LivingEntity.class)
 public interface LivingEntityAccessor {
 	@Accessor
 	void setUseItemRemaining(int ticks);
+
+	@Invoker("playHurtSound")
+	void botania_playHurtSound(DamageSource damageSource);
 }

web/changelog.md

@@ -24,6 +24,7 @@ and start a new "Upcoming" section.
 * Add: Native EMI support on Forge
 * Add: Missing slab recombination recipes for quartz and corporea variants
 * Add: The Lexica Botania can be put into chiseled bookshelves and onto lecterns (Note: reading it from a lectern does not currently grant the advancement)
+* Add: Drum of the Gathering reduces the time until chickens lay their next egg, but only to a certain degree
 * Change: Elementium Axe is now treated as a weapon regarding durability damage from attacking things
 * Change: Various Botania blocks finally make noteblocks use the instrument you would likely expect
   * blocks made from Livingwood or Dreamwood (except drums) -> bass