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

Limited network transmitter usage to 1000 RS/t, fixes #487

Browse Source
This commit is contained in:
Raoul Van den Berge
2016-10-20 19:10:01 +02:00
parent db0d1c2dd2
commit a187bf92b7
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -16,6 +16,7 @@
- Stack upgrade in Importer / Exporter in fluid mode and Fluid Interface now transfers 64 buckets at once (raoulvdberge) - 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) - 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) - 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 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 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) - Fixed Interface being stuck when item isn't accepted in storage (InusualZ)

5
src/main/java/com/raoulvdberge/refinedstorage/tile/TileNetworkTransmitter.java
View File

@@ -109,7 +109,10 @@ public class TileNetworkTransmitter extends TileNode {
@Override @Override
public int getEnergyUsage() { 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() { public ItemHandlerBasic getNetworkCard() {