diff --git a/src/main/java/magicbees/item/types/HiveFrameType.java b/src/main/java/magicbees/item/types/HiveFrameType.java index 247ac53..affb979 100644 --- a/src/main/java/magicbees/item/types/HiveFrameType.java +++ b/src/main/java/magicbees/item/types/HiveFrameType.java @@ -6,13 +6,13 @@ import magicbees.main.utils.LocalizationManager; public enum HiveFrameType implements IBeeModifier { - MAGIC("Magic", 240, 1f, 1f, 1f, 2f, 0.6f), - RESILIENT("Resilient", 800, 1f, 1f, 1f, 2f, 0.5f), - GENTLE("Gentle", 200, 1f, 0.7f, 1.5f, 1.4f, 0.01f), - METABOLIC("Metabolic", 130, 1f, 1.8f, 1f, 1.2f, 1f), - NECROTIC("Necrotic", 280, 1f, 1f, 0.3f, 0.75f, 1.2f), - TEMPORAL("Temporal", 300, 1f, 1f, 2.5f, 1f, 0.8f), - OBLIVION("Oblivion", 50, 1f, 1f, 0.0001f, 0f, 1f); + MAGIC("Magic", 240, 1f, 1f, 1f, 1f, 0.6f), // production was 2x, now +1 + RESILIENT("Resilient", 800, 1f, 1f, 1f, 1f, 0.5f), // production was 2x, now +1 + GENTLE("Gentle", 200, 1f, 0.7f, 1.5f, 0.4f, 0.01f), // production was 1.4x, now +0.4 + METABOLIC("Metabolic", 130, 1f, 1.8f, 1f, 0.2f, 1f), // production was 1.2x, now +0.2 + NECROTIC("Necrotic", 280, 1f, 1f, 0.3f, -0.25f, 1.2f), // production was 0.75x, now -0.25 + TEMPORAL("Temporal", 300, 1f, 1f, 2.5f, 0f, 0.8f), // production was 1x, now +0 + OBLIVION("Oblivion", 50, 1f, 1f, 0.0001f, -9001f, 1f);// production was 0.0001x, now -9001 private final String frameName; public final int maxDamage; diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java index cce4bf0..3b80197 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodBaseFrame.java @@ -34,27 +34,27 @@ public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame { @Override public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return 1; + return 1f; } @Override public float getLifespanModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return 1; + return 1f; } @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return 2; + return 1f; } @Override public float getFloweringModifier(IBeeGenome genome, float currentModifier) { - return 1; + return 1f; } @Override public float getGeneticDecay(IBeeGenome genome, float currentModifier) { - return (float) 0.8; + return 0.8f; } @Override @@ -79,7 +79,7 @@ public class ItemBloodBaseFrame extends EnergyItems implements IHiveFrame { @Override public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { - return 1; + return 1f; } } diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java index 61879a0..4b1ff25 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java @@ -34,7 +34,7 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame { @Override public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return 1; + return 1f; } @Override @@ -44,17 +44,17 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame { @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return 0; + return -9001f; } @Override public float getFloweringModifier(IBeeGenome genome, float currentModifier) { - return 1; + return 1f; } @Override public float getGeneticDecay(IBeeGenome genome, float currentModifier) { - return 1; + return 1f; } @Override @@ -79,7 +79,7 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame { @Override public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { - return 1; + return 1f; } } diff --git a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java index fafb8fe..37fb6a2 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java @@ -34,7 +34,7 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { @Override public float getMutationModifier(IBeeGenome genome, IBeeGenome mate, float currentModifier) { - return 10; + return 10f; } @Override @@ -44,17 +44,17 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return 0; + return -9001f; } @Override public float getFloweringModifier(IBeeGenome genome, float currentModifier) { - return 0; + return 0f; } @Override public float getGeneticDecay(IBeeGenome genome, float currentModifier) { - return 10; + return 10f; } @Override @@ -79,7 +79,7 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { @Override public float getTerritoryModifier(IBeeGenome genome, float currentModifier) { - return 1; + return 1f; } } diff --git a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index 4dad701..d348461 100644 --- a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -658,9 +658,9 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) { - float mod = 0.9f; + float mod = -0.1f;// was 0.9x, now -0.1 if (magicApiary.isProductionBoosted()) { - mod = mod * 2f; + mod = 0.8f;// was 1.8x, now +0.8 } return mod; }