From 36602926dd96ab4379e264872040eec536fb80ed Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Wed, 9 Aug 2017 11:50:44 -0700 Subject: [PATCH] Customizable Quantum Entangloporter energy transfer rate --- src/main/java/mekanism/common/CommonProxy.java | 3 ++- src/main/java/mekanism/common/config/MekanismConfig.java | 1 + .../common/content/entangloporter/InventoryFrequency.java | 3 ++- src/main/java/mekanism/common/network/PacketConfigSync.java | 2 ++ 4 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/java/mekanism/common/CommonProxy.java b/src/main/java/mekanism/common/CommonProxy.java index 632b7dc30..05fae208d 100644 --- a/src/main/java/mekanism/common/CommonProxy.java +++ b/src/main/java/mekanism/common/CommonProxy.java @@ -282,7 +282,8 @@ public class CommonProxy implements IGuiProvider general.allowTransmitterAlloyUpgrade = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowTransmitterAlloyUpgrade", true).getBoolean(); general.allowChunkloading = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowChunkloading", true).getBoolean(); general.allowProtection = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "AllowProtection", true).getBoolean(); - general.portableTeleporterDelay = 100;//Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "PortableTeleporterDelay", 0).getInt(); + general.portableTeleporterDelay = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "PortableTeleporterDelay", 0).getInt(); + general.quantumEntangloporterEnergyTransfer = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "QuantumEntangloporterEnergyTransfer", 16000000D).getDouble(); general.blacklistIC2 = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistIC2Power", false).getBoolean(); general.blacklistRF = Mekanism.configuration.get(Configuration.CATEGORY_GENERAL, "BlacklistRFPower", false).getBoolean(); diff --git a/src/main/java/mekanism/common/config/MekanismConfig.java b/src/main/java/mekanism/common/config/MekanismConfig.java index 967e8873a..542cf08d1 100644 --- a/src/main/java/mekanism/common/config/MekanismConfig.java +++ b/src/main/java/mekanism/common/config/MekanismConfig.java @@ -73,6 +73,7 @@ public class MekanismConfig public static boolean allowChunkloading; public static boolean allowProtection = true; public static int portableTeleporterDelay; + public static double quantumEntangloporterEnergyTransfer; } public static class client diff --git a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java index 13e08906a..1dabbf7a5 100644 --- a/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java +++ b/src/main/java/mekanism/common/content/entangloporter/InventoryFrequency.java @@ -9,6 +9,7 @@ import mekanism.api.gas.GasStack; import mekanism.api.gas.GasTank; import mekanism.common.PacketHandler; import mekanism.common.Tier; +import mekanism.common.config.MekanismConfig.general; import mekanism.common.frequency.Frequency; import mekanism.common.util.InventoryUtils; import net.minecraft.item.ItemStack; @@ -24,7 +25,7 @@ public class InventoryFrequency extends Frequency { public static final String ENTANGLOPORTER = "Entangloporter"; - public static final double MAX_ENERGY = 1000000; + public static final double MAX_ENERGY = general.quantumEntangloporterEnergyTransfer; public static final int FLUID_TANK_SIZE = Tier.FluidTankTier.ULTIMATE.output; public static final int GAS_TANK_SIZE = Tier.GasTankTier.ULTIMATE.output; diff --git a/src/main/java/mekanism/common/network/PacketConfigSync.java b/src/main/java/mekanism/common/network/PacketConfigSync.java index 37f2659fd..fc53b1f9b 100644 --- a/src/main/java/mekanism/common/network/PacketConfigSync.java +++ b/src/main/java/mekanism/common/network/PacketConfigSync.java @@ -81,6 +81,7 @@ public class PacketConfigSync implements IMessageHandler