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

Merge pull request #47 from CPearl0/Add-Sieve-Interval

Browse Source 
Add sieve interval
This commit is contained in:
thedarkcolour 2024-02-04 15:50:21 -08:00 committed by GitHub
commit 6d2ed586e2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/thedarkcolour/exdeorum/blockentity/MechanicalSieveBlockEntity.java
View File

@ -83,7 +83,7 @@ public class MechanicalSieveBlockEntity extends AbstractMachineBlockEntity<Mecha
@Override @Override
protected void runMachineTick() { protected void runMachineTick() {
this.logic.sift(0.01f); this.logic.sift(0.01f, Long.MAX_VALUE);
} }
@Override @Override

5
src/main/java/thedarkcolour/exdeorum/blockentity/SieveBlockEntity.java
View File

@ -109,6 +109,7 @@ public class SieveBlockEntity extends AbstractSieveBlockEntity {
} }
} }
} else { } else {
var time = level.getGameTime();
var realPlayer = !(player instanceof FakePlayer); var realPlayer = !(player instanceof FakePlayer);
if (realPlayer && EConfig.SERVER.simultaneousSieveUsage.get()) { if (realPlayer && EConfig.SERVER.simultaneousSieveUsage.get()) {
@ -121,7 +122,7 @@ public class SieveBlockEntity extends AbstractSieveBlockEntity {
if (level.getBlockEntity(cursor) instanceof SieveBlockEntity other) { if (level.getBlockEntity(cursor) instanceof SieveBlockEntity other) {
if (!other.logic.getContents().isEmpty()) { if (!other.logic.getContents().isEmpty()) {
if (this.logic.getMesh().getItem() == other.logic.getMesh().getItem()) { if (this.logic.getMesh().getItem() == other.logic.getMesh().getItem()) {
other.logic.sift(SIEVE_INTERVAL); other.logic.sift(SIEVE_INTERVAL, time);
} }
} }
} }
@ -130,7 +131,7 @@ public class SieveBlockEntity extends AbstractSieveBlockEntity {
cursor.move(1, 0, (-2 * range) - 1); cursor.move(1, 0, (-2 * range) - 1);
} }
} else if (realPlayer || EConfig.SERVER.automatedSieves.get()) { } else if (realPlayer || EConfig.SERVER.automatedSieves.get()) {
this.logic.sift(SIEVE_INTERVAL); this.logic.sift(SIEVE_INTERVAL, time);
} }
} }
} }

10
src/main/java/thedarkcolour/exdeorum/blockentity/logic/SieveLogic.java
View File

@ -45,11 +45,14 @@ public class SieveLogic {
private float progress; private float progress;
private float efficiency; private float efficiency;
private int fortune; private int fortune;
private long lastTime = 0;
private final long minInterval;
public SieveLogic(Owner owner, boolean saveMesh, boolean mechanical) { public SieveLogic(Owner owner, boolean saveMesh, boolean mechanical) {
this.owner = owner; this.owner = owner;
this.saveMesh = saveMesh; this.saveMesh = saveMesh;
this.mechanical = mechanical; this.mechanical = mechanical;
this.minInterval = EConfig.SERVER.sieveIntervalTicks.get();
} }
public ItemStack getMesh() { public ItemStack getMesh() {
@ -71,7 +74,12 @@ public class SieveLogic {
} }
// Do not call on the client side // Do not call on the client side
public void sift(float incrementProgress) { public void sift(float incrementProgress, long time) {
if (time < this.lastTime + this.minInterval) {
return;
}
this.lastTime = time;
this.progress += incrementProgress * this.efficiency; this.progress += incrementProgress * this.efficiency;
// Need epsilon because floating point decimals suck // Need epsilon because floating point decimals suck

5
src/main/java/thedarkcolour/exdeorum/config/EConfig.java
View File

@ -135,6 +135,7 @@ public class EConfig {
public final IntValue mechanicalSieveEnergyConsumption; public final IntValue mechanicalSieveEnergyConsumption;
public final IntValue mechanicalHammerEnergyStorage; public final IntValue mechanicalHammerEnergyStorage;
public final IntValue mechanicalHammerEnergyConsumption; public final IntValue mechanicalHammerEnergyConsumption;
public final IntValue sieveIntervalTicks;
public Server(ForgeConfigSpec.Builder builder) { public Server(ForgeConfigSpec.Builder builder) {
builder.comment("Server configuration for Ex Deorum").push("server"); builder.comment("Server configuration for Ex Deorum").push("server");
@ -187,7 +188,9 @@ public class EConfig {
this.mechanicalHammerEnergyConsumption = builder this.mechanicalHammerEnergyConsumption = builder
.comment("The amount of FE/t a tick consumed by the mechanical hammer when crushing a block.") .comment("The amount of FE/t a tick consumed by the mechanical hammer when crushing a block.")
.defineInRange("mechanical_hammer_energy_consumption", 20, 0, Integer.MAX_VALUE); .defineInRange("mechanical_hammer_energy_consumption", 20, 0, Integer.MAX_VALUE);
this.sieveIntervalTicks = builder
.comment("The minimum number of ticks a player must wait between two sifting operations. Only affects sifting by hand. 0 means no limit.")
.defineInRange("sieve_interval", 1, 0, Integer.MAX_VALUE);
builder.pop(); builder.pop();
} }
} }