Skip to content

Commit 4f0decb

Browse files
committed
fix AEDisk keep consuming CPU on ME Bridge & fix AEDisk may not detect by ME Bridge
1 parent 1faf836 commit 4f0decb

3 files changed

Lines changed: 9 additions & 2 deletions

File tree

src/main/java/de/srendi/advancedperipherals/common/addons/ae2/disk/AEDiskCellStorage.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,8 @@ public long getUsedBytes() {
6666
if (!(mount instanceof WritableMount writableMount)) {
6767
return 0;
6868
}
69-
return writableMount.getCapacity() - this.getFreeBytes();
69+
long usedBytes = writableMount.getCapacity() - this.getFreeBytes();
70+
return usedBytes <= 0 ? 1 : usedBytes;
7071
}
7172

7273
@Override

src/main/java/de/srendi/advancedperipherals/common/addons/ae2/disk/AEDiskKey.java

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -99,4 +99,9 @@ protected Component computeDisplayName() {
9999

100100
@Override
101101
public void addDrops(long amount, List<ItemStack> drops, Level level, BlockPos pos) {}
102+
103+
@Override
104+
public String toString() {
105+
return "AEDiskKey(" + this.id + ")";
106+
}
102107
}

src/main/java/de/srendi/advancedperipherals/common/addons/computercraft/peripheral/MEBridgePeripheral.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,8 @@ public void update() {
161161
if (!needRefresh) {
162162
this.diskRescanCD--;
163163
if (this.diskRescanCD <= 0) {
164-
for (Object2LongMap.Entry<AEKey> entry : this.node.getGrid().getService(IStorageService.class).getCachedInventory()) {
164+
this.diskRescanCD = 20;
165+
for (Object2LongMap.Entry<AEKey> entry : inventory) {
165166
if (entry.getKey() instanceof AEDiskKey diskKey && !this.lastDisks.contains(diskKey)) {
166167
needRefresh = true;
167168
break;

0 commit comments

Comments
 (0)