diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/CableNetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/CableNetworkNode.java index bf981fa01..ff61d0127 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/CableNetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/CableNetworkNode.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.node; +import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.apiimpl.network.node.cover.CoverManager; import net.minecraft.nbt.CompoundNBT; import net.minecraft.util.Direction; @@ -23,8 +24,7 @@ public class CableNetworkNode extends NetworkNode implements ICoverable { @Override public int getEnergyUsage() { - return 0; - //return RS.INSTANCE.config.cableUsage; + return RS.SERVER_CONFIG.getCable().getUsage(); } @Override diff --git a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java index 5ff91e0e3..c5a32f959 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/apiimpl/network/node/diskdrive/DiskDriveNetworkNode.java @@ -1,5 +1,6 @@ package com.raoulvdberge.refinedstorage.apiimpl.network.node.diskdrive; +import com.raoulvdberge.refinedstorage.RS; import com.raoulvdberge.refinedstorage.api.network.INetwork; import com.raoulvdberge.refinedstorage.api.storage.AccessType; import com.raoulvdberge.refinedstorage.api.storage.IStorage; @@ -8,7 +9,6 @@ import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDisk; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskContainerContext; import com.raoulvdberge.refinedstorage.api.storage.disk.IStorageDiskProvider; import com.raoulvdberge.refinedstorage.api.util.IComparer; -import com.raoulvdberge.refinedstorage.apiimpl.network.node.IStorageScreen; import com.raoulvdberge.refinedstorage.apiimpl.network.node.NetworkNode; import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheFluid; import com.raoulvdberge.refinedstorage.apiimpl.storage.StorageCacheItem; @@ -17,7 +17,6 @@ import com.raoulvdberge.refinedstorage.inventory.item.ItemHandlerBase; import com.raoulvdberge.refinedstorage.inventory.listener.ListenerNetworkNode; import com.raoulvdberge.refinedstorage.tile.DiskDriveTile; import com.raoulvdberge.refinedstorage.tile.config.*; -import com.raoulvdberge.refinedstorage.tile.data.TileDataParameter; import com.raoulvdberge.refinedstorage.util.AccessTypeUtils; import com.raoulvdberge.refinedstorage.util.StackUtils; import com.raoulvdberge.refinedstorage.util.WorldUtils; @@ -33,7 +32,7 @@ import net.minecraftforge.items.IItemHandlerModifiable; import java.util.List; import java.util.function.Predicate; -public class DiskDriveNetworkNode extends NetworkNode implements IStorageScreen, IStorageProvider, IComparable, IWhitelistBlacklist, IPrioritizable, IType, IAccessType, IStorageDiskContainerContext { +public class DiskDriveNetworkNode extends NetworkNode implements IStorageProvider, IComparable, IWhitelistBlacklist, IPrioritizable, IType, IAccessType, IStorageDiskContainerContext { public enum DiskState { NONE, NORMAL, @@ -121,22 +120,20 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageScreen, @Override public int getEnergyUsage() { - /*TODO - int usage = RS.INSTANCE.config.diskDriveUsage; + int usage = RS.SERVER_CONFIG.getDiskDrive().getUsage(); for (IStorage storage : itemDisks) { if (storage != null) { - usage += RS.INSTANCE.config.diskDrivePerDiskUsage; + usage += RS.SERVER_CONFIG.getDiskDrive().getDiskUsage(); } } for (IStorage storage : fluidDisks) { if (storage != null) { - usage += RS.INSTANCE.config.diskDrivePerDiskUsage; + usage += RS.SERVER_CONFIG.getDiskDrive().getDiskUsage(); } } - return usage;*/ - return 0; + return usage; } @Override @@ -280,51 +277,6 @@ public class DiskDriveNetworkNode extends NetworkNode implements IStorageScreen, markDirty(); } - @Override - public String getGuiTitle() { - return "block.refinedstorage:disk_drive.name"; - } - - @Override - public TileDataParameter getTypeParameter() { - return DiskDriveTile.TYPE; - } - - @Override - public TileDataParameter getRedstoneModeParameter() { - return DiskDriveTile.REDSTONE_MODE; - } - - @Override - public TileDataParameter getCompareParameter() { - return DiskDriveTile.COMPARE; - } - - @Override - public TileDataParameter getWhitelistBlacklistParameter() { - return DiskDriveTile.WHITELIST_BLACKLIST; - } - - @Override - public TileDataParameter getPriorityParameter() { - return DiskDriveTile.PRIORITY; - } - - @Override - public TileDataParameter getAccessTypeParameter() { - return DiskDriveTile.ACCESS_TYPE; - } - - @Override - public long getStored() { - return DiskDriveTile.STORED.getValue(); - } - - @Override - public long getCapacity() { - return DiskDriveTile.CAPACITY.getValue(); - } - @Override public AccessType getAccessType() { return accessType; diff --git a/src/main/java/com/raoulvdberge/refinedstorage/config/ServerConfig.java b/src/main/java/com/raoulvdberge/refinedstorage/config/ServerConfig.java index 5b117082a..8d3165679 100644 --- a/src/main/java/com/raoulvdberge/refinedstorage/config/ServerConfig.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/config/ServerConfig.java @@ -7,10 +7,14 @@ public class ServerConfig { private ForgeConfigSpec spec; private Controller controller; + private Cable cable; + private DiskDrive diskDrive; private Upgrades upgrades; public ServerConfig() { controller = new Controller(); + cable = new Cable(); + diskDrive = new DiskDrive(); upgrades = new Upgrades(); spec = builder.build(); @@ -20,6 +24,14 @@ public class ServerConfig { return controller; } + public Cable getCable() { + return cable; + } + + public DiskDrive getDiskDrive() { + return diskDrive; + } + public Upgrades getUpgrades() { return upgrades; } @@ -62,6 +74,44 @@ public class ServerConfig { } } + public class Cable { + private final ForgeConfigSpec.IntValue usage; + + public Cable() { + builder.push("cable"); + + usage = builder.comment("The energy used by the Cable").defineInRange("usage", 0, 0, Integer.MAX_VALUE); + + builder.pop(); + } + + public int getUsage() { + return usage.get(); + } + } + + public class DiskDrive { + private final ForgeConfigSpec.IntValue usage; + private final ForgeConfigSpec.IntValue diskUsage; + + public DiskDrive() { + builder.push("diskdrive"); + + usage = builder.comment("The energy used by the Disk Drive").defineInRange("usage", 0, 0, Integer.MAX_VALUE); + diskUsage = builder.comment("The energy used per disk in the Disk Drive").defineInRange("diskUsage", 1, 0, Integer.MAX_VALUE); + + builder.pop(); + } + + public int getUsage() { + return usage.get(); + } + + public int getDiskUsage() { + return diskUsage.get(); + } + } + public class Upgrades { private final ForgeConfigSpec.IntValue rangeUpgradeUsage; private final ForgeConfigSpec.IntValue speedUpgradeUsage;