R3944Realms/ExDeorum
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed Crucible bug where pending solids could be converted to another fluid while tank was empty

Browse Source 
Closes #180
This commit is contained in:
thedarkcolour 2026-05-31 17:28:33 -07:00
parent 3a532ff569
commit fecf69353e
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
changelog.md
View File

@ -1,5 +1,7 @@
## Ex Deorum 3.11 ## Ex Deorum 3.11
- Fixed End Cakes crashing fake players (#178) - Fixed End Cakes crashing fake players (#178)
- Fixed Compressed Sieves not allowing simultaneous insertion of material even when Simultaneous Compressed Sieve Usage was enabled
- Fixed Crucible bug where pending solids could be converted to another fluid while tank was empty (#180)
## Ex Deorum 3.10 ## Ex Deorum 3.10
- Now requires KubeJS 7.2 to fix incompatibility (#158) - Now requires KubeJS 7.2 to fix incompatibility (#158)

21
src/main/java/thedarkcolour/exdeorum/blockentity/AbstractCrucibleBlockEntity.java
View File

@ -208,10 +208,11 @@ public abstract class AbstractCrucibleBlockEntity extends ETankBlockEntity {
} }
var result = recipe.getResult(); var result = recipe.getResult();
var contained = this.tank.getFluid(); var contained = this.tank.getFluid();
var hadPendingSolids = this.solids > 0;
shrinkAction.accept(item); shrinkAction.accept(item);
this.solids = (short) Math.min(this.solids + result.getAmount(), MAX_SOLIDS); this.solids = (short) Math.min(this.solids + result.getAmount(), MAX_SOLIDS);
if (contained.isEmpty()) { if (contained.isEmpty() && !hadPendingSolids) {
this.fluid = result.getFluid(); this.fluid = result.getFluid();
updateLight(this.level, this.worldPosition, this.fluid); updateLight(this.level, this.worldPosition, this.fluid);
} }
@ -242,7 +243,7 @@ public abstract class AbstractCrucibleBlockEntity extends ETankBlockEntity {
var result = recipe.getResult(); var result = recipe.getResult();
var contained = this.tank.getFluid(); var contained = this.tank.getFluid();
if (FluidStack.isSameFluidSameComponents(result, contained) || contained.isEmpty()) { if (FluidStack.isSameFluidSameComponents(result, contained) || (contained.isEmpty() && canAddToPendingFluid(result))) {
return result.getAmount() + this.solids <= MAX_SOLIDS ? InsertionResult.YES : InsertionResult.FULL; return result.getAmount() + this.solids <= MAX_SOLIDS ? InsertionResult.YES : InsertionResult.FULL;
} }
} }
@ -250,6 +251,10 @@ public abstract class AbstractCrucibleBlockEntity extends ETankBlockEntity {
return InsertionResult.NO; return InsertionResult.NO;
} }
private boolean canAddToPendingFluid(FluidStack result) {
return this.solids == 0 || this.fluid == null || result.getFluid() == this.fluid;
}
public abstract int getMeltingRate(); public abstract int getMeltingRate();
public int getSolids() { public int getSolids() {
@ -304,7 +309,7 @@ public abstract class AbstractCrucibleBlockEntity extends ETankBlockEntity {
} }
} }
private static class FluidHandler extends FluidHelper { private class FluidHandler extends FluidHelper {
public FluidHandler() { public FluidHandler() {
super(MAX_FLUID_CAPACITY); super(MAX_FLUID_CAPACITY);
} }
@ -313,6 +318,16 @@ public abstract class AbstractCrucibleBlockEntity extends ETankBlockEntity {
public boolean isFluidValid(FluidStack stack) { public boolean isFluidValid(FluidStack stack) {
return false; return false;
} }
@Override
protected void onContentsChanged() {
if (this.fluid.isEmpty() && AbstractCrucibleBlockEntity.this.solids == 0) {
AbstractCrucibleBlockEntity.this.fluid = null;
}
updateLight(AbstractCrucibleBlockEntity.this.level, AbstractCrucibleBlockEntity.this.worldPosition, this.fluid.getFluid());
AbstractCrucibleBlockEntity.this.markUpdated();
}
} }
// inner class // inner class