Skip to content

Make singleink storage check ink acceptance more #907

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

Merged
imreallybadatnames merged 1 commit into from
Jun 14, 2026
+5 −13
Merged

Make singleink storage check ink acceptance more #907

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
11 changes: 1 addition & 10 deletions src/main/java/de/dafuqs/spectrum/api/energy/storage/FixedSingleInkStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,5 @@ public FixedSingleInkStorage(long maxEnergy, InkColor color, long amount) {
public boolean accepts(InkColor color) {
return this.storedColor == color;
}

@Override
public long getRoom(InkColor color) {
if (this.storedColor == color) {
return this.maxEnergy - this.storedEnergy;
} else {
return 0;
}
}


}
7 changes: 4 additions & 3 deletions src/main/java/de/dafuqs/spectrum/api/energy/storage/SingleInkStorage.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,10 +41,11 @@ public boolean accepts(InkColor color) {

@Override
public long addEnergy(InkColor color, long amount) {
if (color != storedColor && this.storedEnergy != 0)
if (color != storedColor && this.storedEnergy != 0 || !this.accepts(color))
return amount;
if (this.storedEnergy == 0)
if (this.storedEnergy == 0) {
this.storedColor = color;
}
long resultingAmount = this.storedEnergy + amount;
this.storedEnergy = resultingAmount;
if (resultingAmount > this.maxEnergy) {
Expand Down Expand Up @@ -138,7 +139,7 @@ public void addTooltip(List<Component> tooltip) {

@Override
public long getRoom(InkColor color) {
if (this.storedEnergy == 0 || this.storedColor == color) {
if (this.accepts(color)) {
return this.maxEnergy - this.storedEnergy;
} else {
return 0;
Expand Down
Loading