From 1b77ab017b5dcbe2f925433f459c1753ef4512c4 Mon Sep 17 00:00:00 2001
From: TheRealWormbo <github@wormbo.de>
Date: Tue, 19 Sep 2023 20:25:48 +0200
Subject: [PATCH] Increase Gourmaryllis internal buffer size

Adjusts internal buffer size of Gourmaryllis to allow food with maximum supported hunger restoration value to still fully benefit from maximum streak bonus.
---
 .../generating/GourmaryllisBlockEntity.java   | 25 +++++++++++++++----
 web/changelog.md                              |  1 +
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/Xplat/src/main/java/vazkii/botania/common/block/flower/generating/GourmaryllisBlockEntity.java b/Xplat/src/main/java/vazkii/botania/common/block/flower/generating/GourmaryllisBlockEntity.java
index ff46162bb6..d23981f860 100644
--- a/Xplat/src/main/java/vazkii/botania/common/block/flower/generating/GourmaryllisBlockEntity.java
+++ b/Xplat/src/main/java/vazkii/botania/common/block/flower/generating/GourmaryllisBlockEntity.java
@@ -40,6 +40,10 @@ public class GourmaryllisBlockEntity extends GeneratingFlowerBlockEntity {
 	public static final String TAG_STREAK_LENGTH = "streakLength";
 	private static final int RANGE = 1;
 	private static final double[] STREAK_MULTIPLIERS = { 0, 1, 1.3, 1.5, 1.6, 1.7, 1.75, 1.8 };
+	private static final int MAX_FOOD_VALUE = 12;
+	private static final int FOOD_COOLDOWN_FACTOR = 10;
+	private static final int FOOD_MANA_FACTOR = 70;
+	private static final int MAX_MANA = getDigestingMana(MAX_FOOD_VALUE, STREAK_MULTIPLIERS[STREAK_MULTIPLIERS.length - 1]);
 
 	private int cooldown = 0;
 	private int digestingMana = 0;
@@ -130,10 +134,9 @@ public void tickFlower() {
 				if (cooldown <= 0) {
 					streakLength = Math.min(streakLength + 1, processFood(stack));
 
-					int val = Math.min(12, stack.getItem().getFoodProperties().getNutrition());
-					digestingMana = val * val * 70;
-					digestingMana *= getMultiplierForStreak(streakLength);
-					cooldown = val * 10;
+					int val = getFoodValue(stack);
+					digestingMana = getDigestingMana(val, getMultiplierForStreak(streakLength));
+					cooldown = getCooldown(val);
 					//Usage of vanilla sound event: Subtitle is "Eating", generic sounds are meant to be reused.
 					item.playSound(SoundEvents.GENERIC_EAT, 0.2F, 0.6F);
 					sync();
@@ -145,6 +148,18 @@ public void tickFlower() {
 		}
 	}
 
+	private static int getCooldown(int foodValue) {
+		return foodValue * FOOD_COOLDOWN_FACTOR;
+	}
+
+	private static int getDigestingMana(int foodValue, double streakFactor) {
+		return (int) (foodValue * foodValue * FOOD_MANA_FACTOR * streakFactor);
+	}
+
+	private static int getFoodValue(ItemStack stack) {
+		return Math.min(MAX_FOOD_VALUE, stack.getItem().getFoodProperties().getNutrition());
+	}
+
 	@Override
 	public void writeToPacketNBT(CompoundTag cmp) {
 		super.writeToPacketNBT(cmp);
@@ -180,7 +195,7 @@ public RadiusDescriptor getRadius() {
 
 	@Override
 	public int getMaxMana() {
-		return 9000;
+		return MAX_MANA;
 	}
 
 	@Override
diff --git a/web/changelog.md b/web/changelog.md
index 02a8542445..6f23efa150 100644
--- a/web/changelog.md
+++ b/web/changelog.md
@@ -22,6 +22,7 @@ and start a new "Upcoming" section.
 * Add: Manufactory Halo shows active status in its icon (Wormbo)
 * Add: Tuff now convertable by Marimorphosis
 * Change: Key of the King's Law no longer hurts items or most other nonliving entities
+* Change: The internal mana buffer of the Gourmaryllis is now large enough to benefit from streak bonus even with very nutritious food like Rabbit Stew or high quality modded foods (it still caps the food value at 12 points or 6 haunches)
 * Change: Removed desu gun and its associated advancement. The reference has overstayed its welcome.
 * Fix: Ender Air emission not being mentioned in Pure Daisy entry (Wormbo)