From 0dbf065fa00813df166d62367c9a4d27acca5ccb Mon Sep 17 00:00:00 2001 From: Unknown Date: Sun, 6 Oct 2019 23:53:09 +0200 Subject: [PATCH] Fixed force field projector energy storage regression --- .../block/forcefield/TileEntityForceFieldProjector.java | 3 +-- src/main/java/cr0s/warpdrive/config/WarpDriveConfig.java | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/main/java/cr0s/warpdrive/block/forcefield/TileEntityForceFieldProjector.java b/src/main/java/cr0s/warpdrive/block/forcefield/TileEntityForceFieldProjector.java index 799dc3f6..be537546 100644 --- a/src/main/java/cr0s/warpdrive/block/forcefield/TileEntityForceFieldProjector.java +++ b/src/main/java/cr0s/warpdrive/block/forcefield/TileEntityForceFieldProjector.java @@ -58,7 +58,6 @@ import net.minecraftforge.fml.common.Optional; public class TileEntityForceFieldProjector extends TileEntityAbstractForceField { - private static final int PROJECTOR_MAX_ENERGY_STORED = 30000; private static final int PROJECTOR_COOLDOWN_TICKS = 300; public static final int PROJECTOR_PROJECTION_UPDATE_TICKS = 8; private static final int PROJECTOR_SETUP_TICKS = 20; @@ -132,7 +131,7 @@ public class TileEntityForceFieldProjector extends TileEntityAbstractForceField protected void onConstructed() { super.onConstructed(); - energy_setParameters(PROJECTOR_MAX_ENERGY_STORED * (1 + 2 * enumTier.getIndex()), 4096, 0, + energy_setParameters(WarpDriveConfig.FORCE_FIELD_PROJECTOR_MAX_ENERGY_STORED_BY_TIER[enumTier.getIndex()], 4096, 0, "EV", 2, "EV", 0); } diff --git a/src/main/java/cr0s/warpdrive/config/WarpDriveConfig.java b/src/main/java/cr0s/warpdrive/config/WarpDriveConfig.java index b308cdb7..b7b4bc35 100644 --- a/src/main/java/cr0s/warpdrive/config/WarpDriveConfig.java +++ b/src/main/java/cr0s/warpdrive/config/WarpDriveConfig.java @@ -510,6 +510,9 @@ public class WarpDriveConfig { public static float[] ENAN_REACTOR_EXPLOSION_STRENGTH_MIN_BY_TIER = { 4.0F, 4.0F, 5.0F, 6.0F }; public static float[] ENAN_REACTOR_EXPLOSION_STRENGTH_MAX_BY_TIER = { 7.0F, 7.0F, 9.0F, 11.0F }; + // Enantiomorphic power reactor + public static int[] FORCE_FIELD_PROJECTOR_MAX_ENERGY_STORED_BY_TIER = { 20000000, 30000, 90000, 150000 }; // 30000 * (1 + 2 * tier) + // Subspace capacitor public static int[] CAPACITOR_MAX_ENERGY_STORED_BY_TIER = { 20000000, 800000, 4000000, 20000000 }; public static String[] CAPACITOR_IC2_SINK_TIER_NAME_BY_TIER = { "MaxV", "MV", "HV", "EV" };