Jika/oc2r
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Pulled TPS constant into constants class for general use.

Browse Source
This commit is contained in:
Florian Nücke
2021-01-08 19:20:33 +01:00
parent 4f0a7cb24b
commit 99d86c9f6e
3 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/li/cil/oc2/common/Constants.java
View File

@@ -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";

6
src/main/java/li/cil/oc2/common/bus/AbstractDeviceBusController.java
View File

@@ -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;
///////////////////////////////////////////////////////////////////

2
src/main/java/li/cil/oc2/common/tileentity/ComputerTileEntity.java
View File

@@ -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;