Anvilcraft/WarpDrive
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Code cleanup

Browse source
This commit is contained in:
LemADEC 2017-01-28 03:18:34 +01:00
parent 8889b72799
commit e498631166
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/cr0s/warpdrive/block/movement/TileEntityShipCore.java
View file

@ -78,7 +78,7 @@ public class TileEntityShipCore extends TileEntityAbstractEnergy implements ISta
protected int randomWarmupAddition = 0;
private int chestTeleportUpdateTicks = 0;
private final int registryUpdateInterval_ticks = 20 * WarpDriveConfig.SHIP_CORE_REGISTRY_UPDATE_INTERVAL_SECONDS;
private final int registryUpdateInterval_ticks = 20 * WarpDriveConfig.STARMAP_REGISTRY_UPDATE_INTERVAL_SECONDS;
private int registryUpdateTicks = 0;
private int bootTicks = 20;
private static final int logInterval_ticks = 20 * 60;
@ -1229,7 +1229,7 @@ public class TileEntityShipCore extends TileEntityAbstractEnergy implements ISta
}
@Override
public void onBlockUpdatedInArea(VectorI vector) {
public void onBlockUpdatedInArea(final VectorI vector, final Block block, final int metadata) {
// no operation
}

8
src/main/java/cr0s/warpdrive/config/WarpDriveConfig.java
View file

@ -116,8 +116,9 @@ public class WarpDriveConfig {
public static boolean LOGGING_FORCEFIELD_REGISTRY = false;
public static boolean LOGGING_ACCELERATOR = false;
// Planets
// Starmap
public static Planet[] PLANETS = null;
public static int STARMAP_REGISTRY_UPDATE_INTERVAL_SECONDS = 10;
// Space generator
public static int SPACE_GENERATOR_Y_MIN_CENTER = 55;
@ -143,7 +144,6 @@ public class WarpDriveConfig {
public static int SHIP_SHORTJUMP_WARMUP_SECONDS = 10;
public static int SHIP_LONGJUMP_WARMUP_SECONDS = 30;
public static int SHIP_WARMUP_RANDOM_TICKS = 60;
public static int SHIP_CORE_REGISTRY_UPDATE_INTERVAL_SECONDS = 10;
public static int SHIP_CONTROLLER_UPDATE_INTERVAL_SECONDS = 2;
public static int SHIP_CORE_ISOLATION_UPDATE_INTERVAL_SECONDS = 10;
public static String[] SHIP_VOLUME_UNLIMITED_PLAYERNAMES = { "notch", "someone" };
@ -439,6 +439,8 @@ public class WarpDriveConfig {
// FIXME: check planets aren't overlapping
// We're not checking invalid dimension id, so they can be pre-allocated (see MystCraft)
}
STARMAP_REGISTRY_UPDATE_INTERVAL_SECONDS = clamp(0, 300,
config.get("starmap", "registry_update_interval", STARMAP_REGISTRY_UPDATE_INTERVAL_SECONDS, "(measured in seconds)").getInt());
// Ship
SHIP_MAX_ENERGY_STORED = clamp(0, Integer.MAX_VALUE,
@ -484,8 +486,6 @@ public class WarpDriveConfig {
SHIP_SUMMON_MAX_RANGE = config.get("ship", "summon_max_range", SHIP_SUMMON_MAX_RANGE, "Maximum range from which players can be summoned (measured in blocks), set to -1 for unlimited range").getInt();
SHIP_SUMMON_ACROSS_DIMENSIONS = config.get("ship", "summon_across_dimensions", false, "Enable summoning players from another dimension").getBoolean(false);
SHIP_CORE_REGISTRY_UPDATE_INTERVAL_SECONDS = clamp(0, 300,
config.get("ship", "core_registry_update_interval", SHIP_CORE_REGISTRY_UPDATE_INTERVAL_SECONDS, "(measured in seconds)").getInt());
SHIP_CORE_ISOLATION_UPDATE_INTERVAL_SECONDS = clamp(0, 300,
config.get("ship", "core_isolation_update_interval", SHIP_CORE_ISOLATION_UPDATE_INTERVAL_SECONDS, "(measured in seconds)").getInt());
SHIP_CONTROLLER_UPDATE_INTERVAL_SECONDS = clamp(0, 300,