From 1fe01325571e28c83bc2004ecad273fb8b79692a Mon Sep 17 00:00:00 2001 From: OneEyeMaker Date: Fri, 17 Jun 2016 20:01:39 +0300 Subject: [PATCH] Added config options for wireless energy devices. --- .../common/handler/BalanceConfigHandler.java | 92 ++++++++++++++++++- .../energynet/TileEnergyRelay.java | 13 ++- .../energynet/TileEnergyTransceiver.java | 14 ++- .../energynet/TileRemoteEnergyBase.java | 53 +++-------- .../TileWirelessEnergyTransceiver.java | 23 +++-- 5 files changed, 141 insertions(+), 54 deletions(-) diff --git a/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java b/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java index 136690bf..ce7c2d5a 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/handler/BalanceConfigHandler.java @@ -104,6 +104,26 @@ public class BalanceConfigHandler public static int grinderExternalEnergyBufferSize = 100000; public static int grinderMaxReceive = 32000; public static int grinderEnergyPerKill = 1000; + public static int energyRelayBasicStorage = 50000; + public static int energyRelayAdvancedStorage = 4550000; + public static int energyRelayBasicMaxReceive = 50000; + public static int energyRelayAdvancedMaxReceive = 4550000; + public static int energyRelayBasicMaxExtract = 50000; + public static int energyRelayAdvancedMaxExtract = 4550000; + public static int energyTransceiverBasicStorage = 50000; + public static int energyTransceiverAdvancedStorage = 10000000; + public static int energyTransceiverBasicMaxReceive = 50000; + public static int energyTransceiverAdvancedMaxReceive = 10000000; + public static int energyTransceiverBasicMaxExtract = 50000; + public static int energyTransceiverAdvancedMaxExtract = 10000000; + public static int energyWirelessTransceiverBasicStorage = 50000; + public static int energyWirelessTransceiverAdvancedStorage = 4550000; + public static int energyWirelessTransceiverBasicMaxReceive = 50000; + public static int energyWirelessTransceiverAdvancedMaxReceive = 4550000; + public static int energyWirelessTransceiverBasicMaxExtract = 50000; + public static int energyWirelessTransceiverAdvancedMaxExtract = 4550000; + public static int energyWirelessTransceiverBasicMaxSend = 5000; + public static int energyWirelessTransceiverAdvancedMaxSend = 50000; public static int wyvernArmorMaxCapacityUpgradePoints = 50; public static int wyvernArmorMaxUpgrades = 3; public static int wyvernArmorMaxUpgradePoints = 50; @@ -142,6 +162,8 @@ public class BalanceConfigHandler public static Block energyStorageStructureOuterBlock = null; public static int energyStorageStructureOuterBlockMetadata = 0; public static boolean grinderShouldUseLooting = false; + public static int energyDeviceBasicLinkingRange = 25; + public static int energyDeviceAdvancedLinkingRange = 50; private static Configuration config; public static void init(File modConfigurationDirectory) @@ -295,6 +317,64 @@ public class BalanceConfigHandler grinderEnergyPerKill = getInteger("energy.machines", "Mob Grinder: Amount of energy required to kill entity (RF)", grinderEnergyPerKill); + energyRelayBasicStorage = + getInteger("energy.machines", "Energy Relay: Energy buffer size (RF)", energyRelayBasicStorage); + energyRelayAdvancedStorage = + getInteger("energy.machines", "Advanced Energy Relay: Energy buffer size (RF)", energyRelayAdvancedStorage); + energyRelayBasicMaxReceive = getInteger("energy.machines", "Energy Relay: Maximum energy reception rate (RF/t)", + energyRelayBasicMaxReceive); + energyRelayAdvancedMaxReceive = + getInteger("energy.machines", "Advanced Energy Relay: Maximum energy reception rate (RF/t)", + energyRelayAdvancedMaxReceive); + energyRelayBasicMaxExtract = + getInteger("energy.machines", "Energy Relay: Maximum energy extraction rate (RF/t)", + energyRelayBasicMaxExtract); + energyRelayAdvancedMaxExtract = + getInteger("energy.machines", "Advanced Energy Relay: Maximum energy extraction rate (RF/t)", + energyRelayAdvancedMaxExtract); + energyTransceiverBasicStorage = + getInteger("energy.machines", "Energy Transceiver: Energy buffer size (RF)", energyTransceiverBasicStorage); + energyTransceiverAdvancedStorage = + getInteger("energy.machines", "Advanced Energy Transceiver: Energy buffer size (RF)", + energyTransceiverAdvancedStorage); + energyTransceiverBasicMaxReceive = + getInteger("energy.machines", "Energy Transceiver: Maximum energy reception rate (RF/t)", + energyTransceiverBasicMaxReceive); + energyTransceiverAdvancedMaxReceive = + getInteger("energy.machines", "Advanced Energy Transceiver: Maximum energy reception rate (RF/t)", + energyTransceiverAdvancedMaxReceive); + energyTransceiverBasicMaxExtract = + getInteger("energy.machines", "Energy Transceiver: Maximum energy extraction rate (RF/t)", + energyTransceiverBasicMaxExtract); + energyTransceiverAdvancedMaxExtract = + getInteger("energy.machines", "Advanced Energy Transceiver: Maximum energy extraction rate (RF/t)", + energyTransceiverAdvancedMaxExtract); + energyWirelessTransceiverBasicStorage = + getInteger("energy.machines", "Wireless Energy Transceiver: Energy buffer size (RF)", + energyWirelessTransceiverBasicStorage); + energyWirelessTransceiverAdvancedStorage = + getInteger("energy.machines", "Advanced Wireless Energy Transceiver: Energy buffer size (RF)", + energyWirelessTransceiverAdvancedStorage); + energyWirelessTransceiverBasicMaxReceive = + getInteger("energy.machines", "Wireless Energy Transceiver: Maximum energy reception rate (RF/t)", + energyWirelessTransceiverBasicMaxReceive); + energyWirelessTransceiverAdvancedMaxReceive = + getInteger("energy.machines", "Advanced Wireless Energy Transceiver: Maximum energy reception rate (RF/t)", + energyWirelessTransceiverAdvancedMaxReceive); + energyWirelessTransceiverBasicMaxExtract = + getInteger("energy.machines", "Wireless Energy Transceiver: Maximum energy extraction rate (RF/t)", + energyWirelessTransceiverBasicMaxExtract); + energyWirelessTransceiverAdvancedMaxExtract = + getInteger("energy.machines", "Advanced Wireless Energy Transceiver: Maximum energy extraction rate (RF/t)", + energyWirelessTransceiverAdvancedMaxExtract); + energyWirelessTransceiverBasicMaxSend = getInteger("energy.machines", + "Wireless Energy Transceiver: Maximum energy sending rate " + + "for each linked device (RF/t)", + energyWirelessTransceiverBasicMaxSend); + energyWirelessTransceiverAdvancedMaxSend = getInteger("energy.machines", + "Advanced Wireless Energy Transceiver: Maximum energy " + + "sending rate for each linked device (RF/t)", + energyWirelessTransceiverAdvancedMaxSend); wyvernArmorMaxCapacityUpgradePoints = (int) Math.floor((double) (Integer.MAX_VALUE - wyvernArmorBaseStorage) / (double) Math.max(wyvernArmorStoragePerUpgrade, 1)) * EnumUpgrade.RF_CAPACITY.pointConversion; @@ -437,6 +517,12 @@ public class BalanceConfigHandler Math.max(Math.min(draconicCapacitorMaxUpgradePoints, draconicCapacitorMaxCapacityUpgradePoints), 0); grinderShouldUseLooting = getBoolean("tweaks.machines", "Mob Grinder: Use Looting enchantment", grinderShouldUseLooting); + energyDeviceBasicLinkingRange = + getInteger("tweaks.machines", "Energy Device (Relay/Transceiver): Linking range", + energyDeviceBasicLinkingRange, 8, 32); + energyDeviceAdvancedLinkingRange = + getInteger("tweaks.machines", "Advanced Energy Device (Relay/Transceiver): Linking range", + energyDeviceAdvancedLinkingRange, 16, 64); if (config.hasChanged()) { config.save(); @@ -456,14 +542,16 @@ public class BalanceConfigHandler energyStorageStructureBlockMetadata = getInteger("tweaks.machines", "Multiblock Energy Storage: Metadata of main block of structure", energyStorageStructureBlockMetadata, - "WARNING! Changing of this value will replace blocks of all existing Energy Storage Multiblocks!"); + "WARNING! Changing of this value will replace blocks of all existing Energy Storage " + + "Multiblocks!"); energyStorageStructureOuterBlock = getBlock("tweaks.machines", "Multiblock Energy Storage: Outer block of structure", ModBlocks.draconiumBlock, "WARNING! Changing of this value will replace blocks of all existing Energy Storage Multiblocks!"); energyStorageStructureOuterBlockMetadata = getInteger("tweaks.machines", "Multiblock Energy Storage: Metadata of outer block of structure", energyStorageStructureBlockMetadata, - "WARNING! Changing of this value will replace blocks of all existing Energy Storage Multiblocks!"); + "WARNING! Changing of this value will replace blocks of all existing Energy Storage " + + "Multiblocks!"); if (config.hasChanged()) { config.save(); diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyRelay.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyRelay.java index 33003f8c..bb13e4ec 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyRelay.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyRelay.java @@ -2,6 +2,7 @@ package com.brandon3055.draconicevolution.common.tileentities.energynet; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyField; +import com.brandon3055.draconicevolution.common.handler.BalanceConfigHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.nbt.NBTTagCompound; @@ -24,17 +25,23 @@ public class TileEnergyRelay extends TileRemoteEnergyBase { @Override public int getCap() { - return 50000 + (powerTier * 4500000); + return powerTier == 0 ? + BalanceConfigHandler.energyRelayBasicStorage : + BalanceConfigHandler.energyRelayAdvancedStorage; } @Override public int getRec() { - return 50000 + (powerTier * 4500000); + return powerTier == 0 ? + BalanceConfigHandler.energyRelayBasicMaxReceive : + BalanceConfigHandler.energyRelayAdvancedMaxReceive; } @Override public int getExt() { - return 50000 + (powerTier * 4500000); + return powerTier == 0 ? + BalanceConfigHandler.energyRelayBasicMaxExtract : + BalanceConfigHandler.energyRelayAdvancedMaxExtract; } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyTransceiver.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyTransceiver.java index e4d312c3..559ad4f2 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyTransceiver.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileEnergyTransceiver.java @@ -4,6 +4,7 @@ import cofh.api.energy.IEnergyProvider; import cofh.api.energy.IEnergyReceiver; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyField; +import com.brandon3055.draconicevolution.common.handler.BalanceConfigHandler; import com.brandon3055.draconicevolution.common.items.tools.Wrench; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -48,6 +49,7 @@ public class TileEnergyTransceiver extends TileRemoteEnergyBase { } } else if (input && adjacentTile instanceof IEnergyProvider) { IEnergyProvider handler = (IEnergyProvider) adjacentTile; + storage.receiveEnergy(handler.extractEnergy(direction.getOpposite(), storage.receiveEnergy(storage.getMaxExtract(), true), false), false); if (transferBoost) { for (int i = 0; i < 4; i++) storage.receiveEnergy(handler.extractEnergy(direction.getOpposite(), storage.receiveEnergy(storage.getMaxExtract(), true), false), false); @@ -104,17 +106,23 @@ public class TileEnergyTransceiver extends TileRemoteEnergyBase { @Override public int getCap() { - return powerTier == 0 ? 50000 : 10000000; + return powerTier == 0 ? + BalanceConfigHandler.energyTransceiverBasicStorage : + BalanceConfigHandler.energyTransceiverAdvancedStorage; } @Override public int getRec() { - return powerTier == 0 ? 50000 : 10000000; + return powerTier == 0 ? + BalanceConfigHandler.energyTransceiverBasicMaxReceive : + BalanceConfigHandler.energyTransceiverAdvancedMaxReceive; } @Override public int getExt() { - return powerTier == 0 ? 50000 : 10000000; + return powerTier == 0 ? + BalanceConfigHandler.energyTransceiverBasicMaxExtract : + BalanceConfigHandler.energyTransceiverAdvancedMaxExtract; } @Override diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileRemoteEnergyBase.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileRemoteEnergyBase.java index 61f23455..61661432 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileRemoteEnergyBase.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileRemoteEnergyBase.java @@ -1,14 +1,19 @@ package com.brandon3055.draconicevolution.common.tileentities.energynet; +import java.util.ArrayList; +import java.util.List; + import com.brandon3055.brandonscore.common.utills.DataUtills; import com.brandon3055.brandonscore.common.utills.ItemNBTHelper; import com.brandon3055.brandonscore.common.utills.Utills; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.common.ModItems; +import com.brandon3055.draconicevolution.common.handler.BalanceConfigHandler; import com.brandon3055.draconicevolution.common.items.tools.Wrench; import com.brandon3055.draconicevolution.common.lib.References; import com.brandon3055.draconicevolution.common.tileentities.TileObjectSync; -import com.brandon3055.draconicevolution.common.utills.*; +import com.brandon3055.draconicevolution.common.utills.EnergyStorage; +import com.brandon3055.draconicevolution.common.utills.LogHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; @@ -22,9 +27,6 @@ import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.ChatComponentTranslation; import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; -import java.util.List; - /** * Created by Brandon on 10/02/2015. */ @@ -56,27 +58,18 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe @Override public void updateEntity() { tick++; - //worldObj.theProfiler.startSection("DE REB"); updateLinkedDevices(); - if (linkedDevices.size() == 0) detectAndSendChanges(-1); - - if (worldObj.isRemote && inView > 0) --inView; - //worldObj.theProfiler.endSection(); + if (linkedDevices.size() == 0) { + detectAndSendChanges(-1); + } + if (worldObj.isRemote && inView > 0) { + --inView; + } } //**********Distribution Logic********** private void updateLinkedDevices() { - boolean inView = false; -// if (worldObj.isRemote) -// { -// MovingObjectPosition mop = Minecraft.getMinecraft().thePlayer.rayTrace(5, 0); -// if (mop != null && mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK && mop.blockX == xCoord && mop.blockY == yCoord && mop.blockZ == zCoord) inView = true;//todo remove -// } - - - if (inView) LogHelper.info("######Start#######"); - for (LinkedEnergyDevice device : linkedDevices) { if (!device.isValid(worldObj)) { if (worldObj.getChunkFromBlockCoords(device.xCoord, device.zCoord).isChunkLoaded) { @@ -100,37 +93,21 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe rType = 1; else rType = 0; } - if (inView) LogHelper.info(device.energyFlow); device.beam = DraconicEvolution.proxy.energyBeam(worldObj, getBeamX(), getBeamY(), getBeamZ(), remoteTile.getBeamX(), remoteTile.getBeamY(), remoteTile.getBeamZ(), (int) device.energyFlow, getPowerTier() == 1, device.beam, true, rType); } else { - int transferCap = storage.getMaxExtract(); - double difference = getCapacity() - remoteTile.getCapacity(); - - - int energyToEqual = (int) (((difference / 100D) * (double) remoteTile.getStorage().getMaxEnergyStored()) / 2.1D); - - double maxFlow = Math.min(energyToEqual, Math.min(transferCap, remoteTile.getStorage().getMaxEnergyStored() - remoteTile.getStorage().getEnergyStored())); + double energyToEqual = Math.round(difference / 100D * (double) remoteTile.getStorage().getMaxEnergyStored() / 2.01D); + double maxFlow = Math.min(energyToEqual, (double) Math.min(storage.getMaxExtract(), remoteTile.getStorage().getMaxEnergyStored() - remoteTile.getStorage().getEnergyStored())); device.energyFlow = getFlow(getCapacity(), remoteTile.getCapacity()); int flow = (int) ((device.energyFlow / 100D) * maxFlow); - - int transfered = storage.extractEnergy(remoteTile.getStorage().receiveEnergy(storage.extractEnergy(flow, true), false), false); - if (inView) LogHelper.info(transfered); device.energyFlow = Math.min(((double) transfered / 10000D) * 100D, 100D); - //LogHelper.info("dif:" + difference + " flow:" + getFlow(getCapacity(), remoteTile.getCapacity()) + " EtoE:" + energyToEqual + " tfrd:" + transfered + " X:" + xCoord + " lCap:" + getCapacity() + " rCap:" + remoteTile.getCapacity() + " strd:" + storage.getEnergyStored() + " T:" + type + " mxflw:" + maxFlow); - - //LogHelper.info(flow + " " + transfered + " " + getEnergyStored(ForgeDirection.UNKNOWN)); - //if (device.energyFlow > 0)LogHelper.info(device.energyFlow + " " + transfered); - //if (device.energyFlow == 0) LogHelper.info(device.getEnergyTile(worldObj));//todo clean up detectAndSendChanges(linkedDevices.indexOf(device)); - if (inView) LogHelper.info(device.energyFlow); } } - if (inView) LogHelper.info("#######END########"); } protected void detectAndSendChanges(int index) { @@ -267,7 +244,7 @@ public abstract class TileRemoteEnergyBase extends TileObjectSync implements IRe @Override public boolean handleBinding(EntityPlayer player, int x, int y, int z, boolean callOther) { - int range = (powerTier + 1) * 25; + int range = powerTier == 0 ? BalanceConfigHandler.energyDeviceBasicLinkingRange : BalanceConfigHandler.energyDeviceAdvancedLinkingRange; IRemoteEnergyHandler tile = worldObj.getTileEntity(x, y, z) instanceof IRemoteEnergyHandler ? (IRemoteEnergyHandler) worldObj.getTileEntity(x, y, z) : null; if (tile == null || (x == xCoord && y == yCoord && z == zCoord)) { diff --git a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileWirelessEnergyTransceiver.java b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileWirelessEnergyTransceiver.java index f705ee18..8661a9f6 100644 --- a/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileWirelessEnergyTransceiver.java +++ b/src/main/java/com/brandon3055/draconicevolution/common/tileentities/energynet/TileWirelessEnergyTransceiver.java @@ -1,12 +1,16 @@ package com.brandon3055.draconicevolution.common.tileentities.energynet; +import java.util.ArrayList; +import java.util.List; + import cofh.api.energy.IEnergyReceiver; +import com.brandon3055.brandonscore.common.utills.Utills; import com.brandon3055.draconicevolution.DraconicEvolution; import com.brandon3055.draconicevolution.client.render.particle.ParticleEnergyField; import com.brandon3055.draconicevolution.client.render.particle.Particles; +import com.brandon3055.draconicevolution.common.handler.BalanceConfigHandler; import com.brandon3055.draconicevolution.common.items.tools.Wrench; import com.brandon3055.draconicevolution.common.lib.References; -import com.brandon3055.brandonscore.common.utills.Utills; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.player.EntityPlayer; @@ -16,9 +20,6 @@ import net.minecraft.util.ChatComponentText; import net.minecraft.util.ChatComponentTranslation; import net.minecraftforge.common.util.ForgeDirection; -import java.util.ArrayList; -import java.util.List; - /** * Created by Brandon on 10/02/2015. */ @@ -40,17 +41,23 @@ public class TileWirelessEnergyTransceiver extends TileRemoteEnergyBase { @Override public int getCap() { - return 50000 + (powerTier * 4500000); + return powerTier == 0 ? + BalanceConfigHandler.energyWirelessTransceiverBasicStorage : + BalanceConfigHandler.energyWirelessTransceiverAdvancedStorage; } @Override public int getRec() { - return 50000 + (powerTier * 4500000); + return powerTier == 0 ? + BalanceConfigHandler.energyWirelessTransceiverBasicMaxReceive : + BalanceConfigHandler.energyWirelessTransceiverAdvancedMaxReceive; } @Override public int getExt() { - return 50000 + (powerTier * 4500000); + return powerTier == 0 ? + BalanceConfigHandler.energyWirelessTransceiverBasicMaxExtract : + BalanceConfigHandler.energyWirelessTransceiverAdvancedMaxExtract; } @Override @@ -77,7 +84,7 @@ public class TileWirelessEnergyTransceiver extends TileRemoteEnergyBase { break; } - int sent = receiver.receiveEnergy(worldObj, storage.extractEnergy(receiver.receiveEnergy(worldObj, powerTier == 0 ? 5000 : 50000, true), false), false); + int sent = receiver.receiveEnergy(worldObj, storage.extractEnergy(receiver.receiveEnergy(worldObj, powerTier == 0 ? BalanceConfigHandler.energyWirelessTransceiverBasicMaxSend : BalanceConfigHandler.energyWirelessTransceiverAdvancedMaxSend, true), false), false); sent = (sent / 20);