dave/refinedstorage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

code style and energy usage

Browse Source
This commit is contained in:
way2muchnoise
2016-09-18 21:40:55 +02:00
parent 1e85518d14
commit c814e009ea
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/refinedstorage/RefinedStorage.java
View File

@@ -74,6 +74,7 @@ public final class RefinedStorage {
public int networkTransmitterUsage; public int networkTransmitterUsage;
public float networkTransmitterPerBlockUsage; public float networkTransmitterPerBlockUsage;
public int networkReceiverUsage; public int networkReceiverUsage;
public int diskManipulatorUsage;
public int controllerCapacity; public int controllerCapacity;
public boolean controllerUsesEnergy; public boolean controllerUsesEnergy;
@@ -128,6 +129,7 @@ public final class RefinedStorage {
networkTransmitterUsage = config.getInt("networkTransmitter", "energy", 50, 0, Integer.MAX_VALUE, "The base energy used by Network Transmitters"); networkTransmitterUsage = config.getInt("networkTransmitter", "energy", 50, 0, Integer.MAX_VALUE, "The base energy used by Network Transmitters");
networkTransmitterPerBlockUsage = config.getFloat("networkTransmitterPerBlock", "energy", 4, 0, Float.MAX_VALUE, "The additional energy per block that the Network Transmitter uses, gets rounded up"); networkTransmitterPerBlockUsage = config.getFloat("networkTransmitterPerBlock", "energy", 4, 0, Float.MAX_VALUE, "The additional energy per block that the Network Transmitter uses, gets rounded up");
networkReceiverUsage = config.getInt("networkReceiver", "energy", 15, 0, Integer.MAX_VALUE, "The energy used by Network Receivers"); networkReceiverUsage = config.getInt("networkReceiver", "energy", 15, 0, Integer.MAX_VALUE, "The energy used by Network Receivers");
diskManipulatorUsage = config.getInt("diskManipulator", "energy", 3, 0, Integer.MAX_VALUE, "The energy used by Disk Manipulators");
controllerCapacity = config.getInt("capacity", "controller", 32000, 0, Integer.MAX_VALUE, "The energy capacity of the Controller"); controllerCapacity = config.getInt("capacity", "controller", 32000, 0, Integer.MAX_VALUE, "The energy capacity of the Controller");
controllerUsesEnergy = config.getBoolean("usesEnergy", "controller", true, "Whether the Controller uses energy"); controllerUsesEnergy = config.getBoolean("usesEnergy", "controller", true, "Whether the Controller uses energy");

7
src/main/java/refinedstorage/tile/TileDiskManipulator.java
View File

@@ -11,6 +11,7 @@ import net.minecraftforge.fml.relauncher.Side;
import net.minecraftforge.items.CapabilityItemHandler; import net.minecraftforge.items.CapabilityItemHandler;
import net.minecraftforge.items.IItemHandler; import net.minecraftforge.items.IItemHandler;
import net.minecraftforge.items.ItemHandlerHelper; import net.minecraftforge.items.ItemHandlerHelper;
import refinedstorage.RefinedStorage;
import refinedstorage.apiimpl.storage.NBTStorage; import refinedstorage.apiimpl.storage.NBTStorage;
import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT; import refinedstorage.apiimpl.storage.fluid.FluidStorageNBT;
import refinedstorage.apiimpl.storage.fluid.FluidUtils; import refinedstorage.apiimpl.storage.fluid.FluidUtils;
@@ -162,12 +163,14 @@ public class TileDiskManipulator extends TileNode implements IComparable, IFilte
@Override @Override
public int getEnergyUsage() { public int getEnergyUsage() {
return 0; return RefinedStorage.INSTANCE.diskManipulatorUsage + upgrades.getEnergyUsage();
} }
@Override @Override
public void updateNode() { public void updateNode() {
if (ticks % upgrades.getSpeed() != 0) return; if (ticks % upgrades.getSpeed() != 0) {
return;
}
int slot = 0; int slot = 0;
if (type == IType.ITEMS) { if (type == IType.ITEMS) {
while (slot < itemStorages.length && itemStorages[slot] == null) { while (slot < itemStorages.length && itemStorages[slot] == null) {