Skip to content

Feature: Inherit Locked instance resetCooldown #105

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
vondraker wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Feature: Inherit Locked instance resetCooldown #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/main/java/me/contaria/seedqueue/gui/wall/SeedQueuePreview.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,6 +233,10 @@ protected void populateCooldownStart(long cooldownStart) {
}
}

protected long getCooldownStart() {
return this.cooldownStart;
}

private boolean isCooldownReady() {
return Util.getMeasuringTimeMs() - this.cooldownStart >= SeedQueue.config.resetCooldown;
}
Expand Down
27 changes: 26 additions & 1 deletion src/main/java/me/contaria/seedqueue/gui/wall/SeedQueueWallScreen.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ public class SeedQueueWallScreen extends Screen {
@Nullable
private Layout.Pos currentPos;

protected long[] positionCooldowns;
protected long benchmarkStart;
protected int benchmarkedSeeds;
protected int benchmarkGoal;
Expand All @@ -114,6 +115,9 @@ public SeedQueueWallScreen() {
protected void init() {
this.layout = Layout.createLayout();
this.mainPreviews = new SeedQueuePreview[this.layout.main.size()];
if (this.positionCooldowns == null || this.positionCooldowns.length != this.layout.main.size()) {
this.positionCooldowns = new long[this.layout.main.size()];
}
this.lockedPreviews = this.layout.locked != null ? new ArrayList<>() : null;
this.preparingPreviews = new ArrayList<>();
this.lockTextures = LockTexture.createLockTextures();
Expand Down Expand Up @@ -743,6 +747,10 @@ private void lockInstance(SeedQueuePreview instance) {
int index;
if (!this.layout.replaceLockedInstances && (index = ArrayUtils.indexOf(this.mainPreviews, instance)) != -1) {
this.blockedMainPositions.add(index);
if (this.positionCooldowns == null || this.positionCooldowns.length != this.layout.main.size()) {
this.positionCooldowns = new long[this.layout.main.size()];
}
this.positionCooldowns[index] = instance.getCooldownStart();
}
if (this.removePreview(instance)) {
this.addLockedPreview(instance);
Expand Down Expand Up @@ -813,7 +821,24 @@ private void resetAllInstances() {
for (SeedQueuePreview instance : this.mainPreviews) {
this.resetInstance(instance, false, false, playSound);
}
this.blockedMainPositions.clear();

it.unimi.dsi.fastutil.ints.IntIterator iterator = this.blockedMainPositions.iterator();
while (iterator.hasNext()) {
int i = iterator.nextInt();
if (this.isPositionCooldownReady(i)) {
iterator.remove();
if (this.positionCooldowns != null) {
this.positionCooldowns[i] = 0L;
}
}
}
}

private boolean isPositionCooldownReady(int index) {
if (this.positionCooldowns == null || this.positionCooldowns[index] == 0L || this.positionCooldowns[index] == Long.MAX_VALUE) {
return true;
}
return Util.getMeasuringTimeMs() - this.positionCooldowns[index] >= SeedQueue.config.resetCooldown;
}

private void focusReset(SeedQueuePreview instance) {
Expand Down