From e56e056c5dcf58faaed1b739be346e411ae261fe Mon Sep 17 00:00:00 2001 From: Gabriel Eiseman Date: Fri, 14 Jul 2023 16:05:06 -0400 Subject: [PATCH 1/7] Fixed production modifiers to be additive --- src/main/java/magicbees/item/types/HiveFrameType.java | 6 +++--- .../java/magicbees/tileentity/TileEntityMagicApiary.java | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/magicbees/item/types/HiveFrameType.java b/src/main/java/magicbees/item/types/HiveFrameType.java index 247ac53..831ffa7 100644 --- a/src/main/java/magicbees/item/types/HiveFrameType.java +++ b/src/main/java/magicbees/item/types/HiveFrameType.java @@ -10,9 +10,9 @@ public enum HiveFrameType implements IBeeModifier { 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); + 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/tileentity/TileEntityMagicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index 4dad701..d690374 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 = 1.8f;// was 1.8x, now "remains" as +1.8 } return mod; } From befd485d397a98f0b428733e555e341c8ee17338 Mon Sep 17 00:00:00 2001 From: Gabriel Eiseman Date: Fri, 14 Jul 2023 17:55:48 -0400 Subject: [PATCH 2/7] Fixed blood magic oblivion-like frames to actually prevent production --- .../magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java | 2 +- .../main/utils/compat/bloodmagic/ItemFrenziedFrame.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) 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..1f4055f 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemBloodFrame.java @@ -44,7 +44,7 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame { @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return 0; + return -9001f; } @Override 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..63f2fd1 100644 --- a/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java +++ b/src/main/java/magicbees/main/utils/compat/bloodmagic/ItemFrenziedFrame.java @@ -44,7 +44,7 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { @Override public float getProductionModifier(IBeeGenome genome, float currentModifier) { - return 0; + return -9001f; } @Override From bde910d708794b301cd2dd9307c853b07a9c4fa8 Mon Sep 17 00:00:00 2001 From: Gabriel Eiseman Date: Mon, 17 Jul 2023 12:42:29 -0400 Subject: [PATCH 3/7] Nerf the actual production modifiers for frames and the magic apiary --- src/main/java/magicbees/item/types/HiveFrameType.java | 8 ++++---- .../java/magicbees/tileentity/TileEntityMagicApiary.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/magicbees/item/types/HiveFrameType.java b/src/main/java/magicbees/item/types/HiveFrameType.java index 831ffa7..4adeed8 100644 --- a/src/main/java/magicbees/item/types/HiveFrameType.java +++ b/src/main/java/magicbees/item/types/HiveFrameType.java @@ -6,10 +6,10 @@ 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), + MAGIC("Magic", 240, 1f, 1f, 1f, 1.1f, 0.6f),// production was 2x, now +1.1 (slightly less nerfed than other frames due to being a pain) + RESILIENT("Resilient", 800, 1f, 1f, 1f, 1.2f, 0.5f),// production was 2x, now +1.2 + 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 +1.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 diff --git a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index d690374..4f85071 100644 --- a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -660,7 +660,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory public float getProductionModifier(IBeeGenome genome, float currentModifier) { float mod = -0.1f;// was 0.9x, now -0.1 if (magicApiary.isProductionBoosted()) { - mod = 1.8f;// was 1.8x, now "remains" as +1.8 + mod = 1.4f;// was 1.8x, now +1.4, only nerfed slightly because it forces botania } return mod; } From 137784f76dd688e8dd5fd869b63c86438aee3808 Mon Sep 17 00:00:00 2001 From: Gabriel Eiseman Date: Mon, 17 Jul 2023 12:42:29 -0400 Subject: [PATCH 4/7] Nerf the actual production modifiers for frames and the magic apiary --- src/main/java/magicbees/item/types/HiveFrameType.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/main/java/magicbees/item/types/HiveFrameType.java b/src/main/java/magicbees/item/types/HiveFrameType.java index 4adeed8..69ee5e5 100644 --- a/src/main/java/magicbees/item/types/HiveFrameType.java +++ b/src/main/java/magicbees/item/types/HiveFrameType.java @@ -6,10 +6,11 @@ import magicbees.main.utils.LocalizationManager; public enum HiveFrameType implements IBeeModifier { - MAGIC("Magic", 240, 1f, 1f, 1f, 1.1f, 0.6f),// production was 2x, now +1.1 (slightly less nerfed than other frames due to being a pain) - RESILIENT("Resilient", 800, 1f, 1f, 1f, 1.2f, 0.5f),// production was 2x, now +1.2 - 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 +1.2 + MAGIC("Magic", 240, 1f, 1f, 1f, 1.1f, 0.6f), // production was 2x, now +1.1 (slightly less nerfed than other frames + // due to being a pain) + RESILIENT("Resilient", 800, 1f, 1f, 1f, 1.2f, 0.5f), // production was 2x, now +1.2 + 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 +1.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 From 991c4fff5e723c00073ca85f7813a8596da5bbf2 Mon Sep 17 00:00:00 2001 From: Gabriel Eiseman Date: Tue, 18 Jul 2023 09:44:01 -0400 Subject: [PATCH 5/7] Fully normalize positive frames to -1 --- .../java/magicbees/item/types/HiveFrameType.java | 5 ++--- .../utils/compat/bloodmagic/ItemBloodBaseFrame.java | 12 ++++++------ .../main/utils/compat/bloodmagic/ItemBloodFrame.java | 8 ++++---- .../utils/compat/bloodmagic/ItemFrenziedFrame.java | 8 ++++---- .../magicbees/tileentity/TileEntityMagicApiary.java | 2 +- 5 files changed, 17 insertions(+), 18 deletions(-) diff --git a/src/main/java/magicbees/item/types/HiveFrameType.java b/src/main/java/magicbees/item/types/HiveFrameType.java index 69ee5e5..e0e75e5 100644 --- a/src/main/java/magicbees/item/types/HiveFrameType.java +++ b/src/main/java/magicbees/item/types/HiveFrameType.java @@ -6,9 +6,8 @@ import magicbees.main.utils.LocalizationManager; public enum HiveFrameType implements IBeeModifier { - MAGIC("Magic", 240, 1f, 1f, 1f, 1.1f, 0.6f), // production was 2x, now +1.1 (slightly less nerfed than other frames - // due to being a pain) - RESILIENT("Resilient", 800, 1f, 1f, 1f, 1.2f, 0.5f), // production was 2x, now +1.2 + 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 +1.2 NECROTIC("Necrotic", 280, 1f, 1f, 0.3f, -0.25f, 1.2f), // production was 0.75x, now -0.25 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 1f4055f..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 @@ -49,12 +49,12 @@ public class ItemBloodFrame extends EnergyItems implements IHiveFrame { @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 63f2fd1..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 @@ -49,12 +49,12 @@ public class ItemFrenziedFrame extends EnergyItems implements IHiveFrame { @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 4f85071..b450850 100644 --- a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -660,7 +660,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory public float getProductionModifier(IBeeGenome genome, float currentModifier) { float mod = -0.1f;// was 0.9x, now -0.1 if (magicApiary.isProductionBoosted()) { - mod = 1.4f;// was 1.8x, now +1.4, only nerfed slightly because it forces botania + mod = 1.8f;// was 1.8x, now +1.8 } return mod; } From 5ca5c11fc91f02684787fea8b15b73f9b9455d75 Mon Sep 17 00:00:00 2001 From: hacatu Date: Tue, 18 Jul 2023 15:45:18 +0000 Subject: [PATCH 6/7] Update magic apiary Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com> --- src/main/java/magicbees/tileentity/TileEntityMagicApiary.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java index b450850..d348461 100644 --- a/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java +++ b/src/main/java/magicbees/tileentity/TileEntityMagicApiary.java @@ -660,7 +660,7 @@ public class TileEntityMagicApiary extends TileEntity implements ISidedInventory public float getProductionModifier(IBeeGenome genome, float currentModifier) { float mod = -0.1f;// was 0.9x, now -0.1 if (magicApiary.isProductionBoosted()) { - mod = 1.8f;// was 1.8x, now +1.8 + mod = 0.8f;// was 1.8x, now +0.8 } return mod; } From dcf47bb39356c6c4b6c1679c844a0d3e4c5314f6 Mon Sep 17 00:00:00 2001 From: hacatu Date: Tue, 18 Jul 2023 16:00:35 +0000 Subject: [PATCH 7/7] Fix comment Co-authored-by: Jakub <53441451+kuba6000@users.noreply.github.com> --- src/main/java/magicbees/item/types/HiveFrameType.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/magicbees/item/types/HiveFrameType.java b/src/main/java/magicbees/item/types/HiveFrameType.java index e0e75e5..affb979 100644 --- a/src/main/java/magicbees/item/types/HiveFrameType.java +++ b/src/main/java/magicbees/item/types/HiveFrameType.java @@ -9,7 +9,7 @@ public enum HiveFrameType implements IBeeModifier { 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 +1.2 + 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