diff --git a/src/main/java/li/cil/oc2/common/Constants.java b/src/main/java/li/cil/oc2/common/Constants.java index be7c24e3..e675a5b8 100644 --- a/src/main/java/li/cil/oc2/common/Constants.java +++ b/src/main/java/li/cil/oc2/common/Constants.java @@ -5,6 +5,8 @@ public final class Constants { public static final int MEGABYTE = 1024 * KILOBYTE; public static final int GIGABYTE = 1024 * MEGABYTE; + public static final int TICK_SECONDS = 20; + /////////////////////////////////////////////////////////////////// public static final String BLOCK_ENTITY_TAG_NAME_IN_ITEM = "BlockEntityTag"; diff --git a/src/main/java/li/cil/oc2/common/bus/AbstractDeviceBusController.java b/src/main/java/li/cil/oc2/common/bus/AbstractDeviceBusController.java index aa791d6d..83315ed2 100644 --- a/src/main/java/li/cil/oc2/common/bus/AbstractDeviceBusController.java +++ b/src/main/java/li/cil/oc2/common/bus/AbstractDeviceBusController.java @@ -3,6 +3,7 @@ package li.cil.oc2.common.bus; import li.cil.oc2.api.bus.DeviceBusController; import li.cil.oc2.api.bus.DeviceBusElement; import li.cil.oc2.api.bus.device.Device; +import li.cil.oc2.common.Constants; import net.minecraftforge.common.util.LazyOptional; import java.util.*; @@ -21,9 +22,8 @@ public abstract class AbstractDeviceBusController implements DeviceBusController /////////////////////////////////////////////////////////////////// private static final int MAX_BUS_ELEMENT_COUNT = 128; - private static final int TICKS_PER_SECOND = 20; - private static final int INCOMPLETE_RETRY_INTERVAL = 10 * TICKS_PER_SECOND; - private static final int BAD_CONFIGURATION_RETRY_INTERVAL = 5 * TICKS_PER_SECOND; + private static final int INCOMPLETE_RETRY_INTERVAL = 10 * Constants.TICK_SECONDS; + private static final int BAD_CONFIGURATION_RETRY_INTERVAL = 5 * Constants.TICK_SECONDS; /////////////////////////////////////////////////////////////////// diff --git a/src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java b/src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java index bd04e164..86449ca0 100644 --- a/src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java +++ b/src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java @@ -82,7 +82,7 @@ public final class ComputerTileEntity extends AbstractTileEntity implements ITic private static final String RUN_STATE_TAG_NAME = "runState"; private static final String BOOT_ERROR_TAG_NAME = "bootError"; - private static final int DEVICE_LOAD_RETRY_INTERVAL = 10 * 20; // In ticks. + private static final int DEVICE_LOAD_RETRY_INTERVAL = 10 * Constants.TICK_SECONDS; private static final int MEMORY_SLOTS = 4; private static final int HARD_DRIVE_SLOTS = 4;