diff --git a/CHANGELOG.md b/CHANGELOG.md index 7e1bc6ca4..c9b7bb520 100755 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,7 @@ - Stack upgrade in Importer / Exporter in fluid mode and Fluid Interface now transfers 64 buckets at once (raoulvdberge) - Detector without any filter will detect based on total items or fluids stored (raoulvdberge) - Storage disks and storage blocks now don't despawn anymore when dropped in the world (raoulvdberge) +- Limited network transmitter usage to 1000 RS/t (raoulvdberge) - Fixed resetting a stack of patterns yields 1 blank pattern (raoulvdberge) - Fixed being able to pipe items in the export slots of the Interface (InusualZ) - Fixed Interface being stuck when item isn't accepted in storage (InusualZ) diff --git a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java index ba544422a..0c3ec798e 100755 --- a/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java +++ b/src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java @@ -109,7 +109,10 @@ public class TileNetworkTransmitter extends TileNode { @Override public int getEnergyUsage() { - return RS.INSTANCE.config.networkTransmitterUsage + (isSameDimension() ? (int) Math.ceil(RS.INSTANCE.config.networkTransmitterPerBlockUsage * getDistance()) : 0) + upgrades.getEnergyUsage(); + return Math.min( + RS.INSTANCE.config.interdimensionalUpgradeUsage, + RS.INSTANCE.config.networkTransmitterUsage + (isSameDimension() ? (int) Math.ceil(RS.INSTANCE.config.networkTransmitterPerBlockUsage * getDistance()) : 0) + upgrades.getEnergyUsage() + ); } public ItemHandlerBasic getNetworkCard() {