From 22ff1f569addad5caf90b434fdffc93b7d3e12ee Mon Sep 17 00:00:00 2001 From: Gabriel Eiseman Date: Fri, 14 Jul 2023 16:00:06 -0400 Subject: [PATCH] Fixed doubled base production modifier, fixed tooltips for frames with negative modifiers --- src/main/java/forestry/apiculture/BeeHousingModifier.java | 3 ++- .../java/forestry/apiculture/EventHandlerApiculture.java | 6 ++++-- src/main/java/forestry/apiculture/genetics/Bee.java | 4 ++-- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/src/main/java/forestry/apiculture/BeeHousingModifier.java b/src/main/java/forestry/apiculture/BeeHousingModifier.java index 2156d5423..d788b8dc3 100644 --- a/src/main/java/forestry/apiculture/BeeHousingModifier.java +++ b/src/main/java/forestry/apiculture/BeeHousingModifier.java @@ -49,7 +49,8 @@ public class BeeHousingModifier implements IBeeModifier { @Override public float getProductionModifier(IBeeGenome genome, final float currentModifier) { - float modifierValue = 1.0f; + float modifierValue = 0.0f;// the "base" value of 1.0 should come from Bee.java or BeeKeepingMode.jave, that is, + // it should be set at the call site for (IBeeModifier modifier : beeHousing.getBeeModifiers()) { modifierValue += modifier.getProductionModifier(genome, modifierValue + currentModifier); } diff --git a/src/main/java/forestry/apiculture/EventHandlerApiculture.java b/src/main/java/forestry/apiculture/EventHandlerApiculture.java index 60696863d..491673399 100644 --- a/src/main/java/forestry/apiculture/EventHandlerApiculture.java +++ b/src/main/java/forestry/apiculture/EventHandlerApiculture.java @@ -84,10 +84,12 @@ public class EventHandlerApiculture { String formatted = color.toString(); // Set symbol for if this value is additive or multiplicative - if (additive) { + if (!additive) { + formatted += " x"; + } else if (value >= 0.0F) { formatted += " +"; } else { - formatted += " x"; + formatted += " "; // the "-" will be applied, but we still need a space or minecraft will crash } // trim trailing zeroes if no decimal-precision is needed diff --git a/src/main/java/forestry/apiculture/genetics/Bee.java b/src/main/java/forestry/apiculture/genetics/Bee.java index aa5e4f660..4dcad34d2 100644 --- a/src/main/java/forestry/apiculture/genetics/Bee.java +++ b/src/main/java/forestry/apiculture/genetics/Bee.java @@ -514,8 +514,8 @@ public class Bee extends IndividualLiving implements IBee { // Bee genetic speed * beehousing * beekeeping mode float speed = genome.getSpeed(); - float prodModifier = beeHousingModifier.getProductionModifier(genome, 1f) - * beeModeModifier.getProductionModifier(genome, 1f); + float prodModifier = beeHousingModifier.getProductionModifier(genome, 1f); + prodModifier += beeModeModifier.getProductionModifier(genome, prodModifier); // / Primary Products for (Map.Entry entry : primary.getProductChances().entrySet()) {