mirrors/Create
0
0
Fork 0
mirror of https://github.com/Creators-of-Create/Create.git synced 2025-03-04 06:44:40 +01:00
Code Issues Projects Releases Packages Wiki Activity

configurable factory gauge request timer

Browse source
This commit is contained in:
msbc1999 2025-03-02 20:47:28 -03:00
parent 41b6028c0b
commit c2e91fc2dc
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/main/java/com/simibubi/create/content/logistics/factoryBoard/FactoryPanelBehaviour.java
View file

@ -1,5 +1,7 @@
package com.simibubi.create.content.logistics.factoryBoard; package com.simibubi.create.content.logistics.factoryBoard;
import com.simibubi.create.infrastructure.config.AllConfigs;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collection; import java.util.Collection;
@ -84,7 +86,7 @@ public class FactoryPanelBehaviour extends FilteringBehaviour implements MenuPro
public static final BehaviourType<FactoryPanelBehaviour> TOP_RIGHT = new BehaviourType<>(); public static final BehaviourType<FactoryPanelBehaviour> TOP_RIGHT = new BehaviourType<>();
public static final BehaviourType<FactoryPanelBehaviour> BOTTOM_LEFT = new BehaviourType<>(); public static final BehaviourType<FactoryPanelBehaviour> BOTTOM_LEFT = new BehaviourType<>();
public static final BehaviourType<FactoryPanelBehaviour> BOTTOM_RIGHT = new BehaviourType<>(); public static final BehaviourType<FactoryPanelBehaviour> BOTTOM_RIGHT = new BehaviourType<>();
public static final int REQUEST_INTERVAL = 100; // public static final int REQUEST_INTERVAL = 100;
public Map<FactoryPanelPosition, FactoryPanelConnection> targetedBy; public Map<FactoryPanelPosition, FactoryPanelConnection> targetedBy;
public Map<BlockPos, FactoryPanelConnection> targetedByLinks; public Map<BlockPos, FactoryPanelConnection> targetedByLinks;
@ -386,7 +388,6 @@ public class FactoryPanelBehaviour extends FilteringBehaviour implements MenuPro
if (satisfied || promisedSatisfied || waitingForNetwork || redstonePowered) if (satisfied || promisedSatisfied || waitingForNetwork || redstonePowered)
return; return;
if (timer > 0) { if (timer > 0) {
timer = Math.min(timer, REQUEST_INTERVAL);
timer--; timer--;
return; return;
} }
@ -743,11 +744,15 @@ public class FactoryPanelBehaviour extends FilteringBehaviour implements MenuPro
} }
public void resetTimer() { public void resetTimer() {
timer = REQUEST_INTERVAL; timer = getConfigRequestIntervalInTicks();
} }
public void resetTimerSlightly() { public void resetTimerSlightly() {
timer = REQUEST_INTERVAL / 2; timer = getConfigRequestIntervalInTicks() / 2;
}
private int getConfigRequestIntervalInTicks() {
return AllConfigs.server().logistics.factoryGaugeTimer.get();
} }
private int getPromiseExpiryTimeInTicks() { private int getPromiseExpiryTimeInTicks() {
@ -818,7 +823,7 @@ public class FactoryPanelBehaviour extends FilteringBehaviour implements MenuPro
filter = FilterItemStack.of(panelTag.getCompound("Filter")); filter = FilterItemStack.of(panelTag.getCompound("Filter"));
count = panelTag.getInt("FilterAmount"); count = panelTag.getInt("FilterAmount");
upTo = panelTag.getBoolean("UpTo"); upTo = panelTag.getBoolean("UpTo");
timer = panelTag.getInt("Timer"); timer = Math.min(panelTag.getInt("Timer"), getConfigRequestIntervalInTicks());
lastReportedLevelInStorage = panelTag.getInt("LastLevel"); lastReportedLevelInStorage = panelTag.getInt("LastLevel");
lastReportedPromises = panelTag.getInt("LastPromised"); lastReportedPromises = panelTag.getInt("LastPromised");
lastReportedUnloadedLinks = panelTag.getInt("LastUnloadedLinks"); lastReportedUnloadedLinks = panelTag.getInt("LastUnloadedLinks");

2
src/main/java/com/simibubi/create/infrastructure/config/CLogistics.java
View file

@ -14,6 +14,7 @@ public class CLogistics extends ConfigBase {
public final ConfigInt vaultCapacity = i(20, 1, 2048, "vaultCapacity", Comments.vaultCapacity); public final ConfigInt vaultCapacity = i(20, 1, 2048, "vaultCapacity", Comments.vaultCapacity);
public final ConfigInt chainConveyorCapacity = i(20, 1, "chainConveyorCapacity", Comments.chainConveyorCapacity); public final ConfigInt chainConveyorCapacity = i(20, 1, "chainConveyorCapacity", Comments.chainConveyorCapacity);
public final ConfigInt brassTunnelTimer = i(10, 1, 10, "brassTunnelTimer", Comments.brassTunnelTimer); public final ConfigInt brassTunnelTimer = i(10, 1, 10, "brassTunnelTimer", Comments.brassTunnelTimer);
public final ConfigInt factoryGaugeTimer = i(100, 5, "factoryGaugeTimer", Comments.factoryGaugeTimer);
public final ConfigBool seatHostileMobs = b(true, "seatHostileMobs", Comments.seatHostileMobs); public final ConfigBool seatHostileMobs = b(true, "seatHostileMobs", Comments.seatHostileMobs);
@Override @Override
@ -34,6 +35,7 @@ public class CLogistics extends ConfigBase {
static String vaultCapacity = "The total amount of stacks a vault can hold per block in size."; static String vaultCapacity = "The total amount of stacks a vault can hold per block in size.";
static String chainConveyorCapacity = "The amount of packages a chain conveyor can carry at a time."; static String chainConveyorCapacity = "The amount of packages a chain conveyor can carry at a time.";
static String brassTunnelTimer = "The amount of ticks a brass tunnel waits between distributions."; static String brassTunnelTimer = "The amount of ticks a brass tunnel waits between distributions.";
static String factoryGaugeTimer = "The amount of ticks a factory gauge waits between requests.";
static String seatHostileMobs = "Whether hostile mobs walking near a seat will start riding it."; static String seatHostileMobs = "Whether hostile mobs walking near a seat will start riding it.";
} }