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

Improved logs related to chunk reloading issues

Browse source
This commit is contained in:
LemADEC 2021-03-18 23:46:05 +01:00
parent 8d4cb3625d
commit 2668c279c7
5 changed files with 31 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/main/java/cr0s/warpdrive/block/TileEntityAbstractBase.java
View file

@ -77,6 +77,13 @@ public abstract class TileEntityAbstractBase extends TileEntity implements IBloc
return;
}
if (WarpDrive.isDev && this instanceof TileEntityAbstractMachine) {
WarpDrive.logger.info(String.format("%s onConstructed at %d", this, world.getWorldTime()));
if (Commons.throttleMe("onConstructed")) {
new Exception().printStackTrace(WarpDrive.printStreamInfo);
}
}
// immediately retrieve tier, we need it to connect energy conduits and save the world before the first tick
final Block block = getBlockType();
if (block instanceof IBlockBase) {
@ -285,7 +292,9 @@ public abstract class TileEntityAbstractBase extends TileEntity implements IBloc
onConstructed();
WarpDrive.logger.error(String.format("%s Tile entity was used before being loaded! this is a forge issue.",
this ));
new RuntimeException().printStackTrace(WarpDrive.printStreamError);
if (Commons.throttleMe("TileEntityAbstractBase.getTierIndex")) {
new RuntimeException().printStackTrace(WarpDrive.printStreamInfo);
}
}
return enumTier.getIndex();
}

8
src/main/java/cr0s/warpdrive/block/TileEntityAbstractMachine.java
View file

@ -115,6 +115,14 @@ public abstract class TileEntityAbstractMachine extends TileEntityAbstractInterf
}
public void markDirtyAssembly() {
if (WarpDrive.isDev) {
WarpDrive.logger.info(String.format("%s markDirtyAssembly at %d", this, world.getWorldTime()));
if (Commons.throttleMe("markDirtyAssembly")) {
new Exception().printStackTrace(WarpDrive.printStreamInfo);
}
}
isDirtyAssembly = true;
}

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

@ -259,6 +259,7 @@ public class WarpDriveConfig {
public static boolean LOGGING_XML_PREPROCESSOR = false;
public static boolean LOGGING_RENDERING = false;
public static boolean LOGGING_CHUNK_HANDLER = false;
public static boolean LOGGING_CHUNK_RELOADING = true;
public static boolean LOGGING_CHUNK_LOADING = true;
public static boolean LOGGING_ENTITY_FX = false;
public static boolean LOGGING_CLIENT_SYNCHRONIZATION = false;
@ -992,6 +993,7 @@ public class WarpDriveConfig {
LOGGING_XML_PREPROCESSOR = config.get("logging", "enable_XML_preprocessor_logs", LOGGING_XML_PREPROCESSOR, "Save XML preprocessor results as output*.xml file, enable it to debug your XML configuration files").getBoolean(false);
LOGGING_RENDERING = config.get("logging", "enable_rendering_logs", LOGGING_RENDERING, "Detailed rendering logs to help debug the mod.").getBoolean(false);
LOGGING_CHUNK_HANDLER = config.get("logging", "enable_chunk_handler_logs", LOGGING_CHUNK_HANDLER, "Detailed chunk data logs to help debug the mod.").getBoolean(false);
LOGGING_CHUNK_RELOADING = config.get("logging", "enable_chunk_reloading_logs", LOGGING_CHUNK_RELOADING, "Report in logs when a chunk is reloaded shortly after being unloaded, usually associated with server lag.").getBoolean(false);
LOGGING_CHUNK_LOADING = config.get("logging", "enable_chunk_loading_logs", LOGGING_CHUNK_LOADING, "Chunk loading logs, enable it to report chunk loaders updates").getBoolean(false);
LOGGING_ENTITY_FX = config.get("logging", "enable_entity_fx_logs", LOGGING_ENTITY_FX, "EntityFX logs, enable it to dump entityFX registry updates").getBoolean(false);
LOGGING_GRAVITY = config.get("logging", "enable_gravity_logs", LOGGING_GRAVITY, "Gravity logs, enable it before reporting fall damage and related issues").getBoolean(false);

13
src/main/java/cr0s/warpdrive/data/ChunkData.java
View file

@ -25,7 +25,7 @@ public class ChunkData {
private static final String TAG_AIR_SEGMENT_DATA = "data";
private static final String TAG_AIR_SEGMENT_DELAY = "delay";
private static final String TAG_AIR_SEGMENT_Y = "y";
private static final long RELOAD_DELAY_MIN_MS = 100;
private static final long RELOAD_DELAY_MIN_MS = 10000;
private static final long LOAD_UNLOAD_DELAY_MIN_MS = 1000;
private static final long SAVE_SAVE_DELAY_MIN_MS = 100;
@ -54,19 +54,22 @@ public class ChunkData {
timeUnloaded = 0L;
}
public void load(final NBTTagCompound tagCompoundChunk) {
public void load(@Nonnull final NBTTagCompound tagCompoundChunk, @Nonnull final World world) {
// check consistency
assert !isLoaded;
// detects fast reloading
final long time = System.currentTimeMillis();
if ( WarpDriveConfig.LOGGING_CHUNK_HANDLER
if ( WarpDriveConfig.LOGGING_CHUNK_RELOADING
&& timeUnloaded != 0L
&& time - timeUnloaded < RELOAD_DELAY_MIN_MS ) {
WarpDrive.logger.warn(String.format("Chunk %s (%d %d %d) is reloading after only %d ms",
WarpDrive.logger.warn(String.format("Chunk %s %s is reloading after only %d ms",
chunkCoordIntPair,
getChunkPosition().getX(), getChunkPosition().getY(), getChunkPosition().getZ(),
Commons.format(world, getChunkPosition()),
time - timeUnloaded));
if (Commons.throttleMe("ChunkData.ChunkReloading")) {
new RuntimeException().printStackTrace(WarpDrive.printStreamInfo);
}
}
// load defaults

6
src/main/java/cr0s/warpdrive/event/ChunkHandler.java
View file

@ -91,7 +91,7 @@ public class ChunkHandler {
assert chunkData != null;
// (world can load a non-generated chunk, or the chunk be regenerated, so we reset only as needed)
if (!chunkData.isLoaded()) {
chunkData.load(new NBTTagCompound());
chunkData.load(new NBTTagCompound(), world);
}
}
@ -107,7 +107,7 @@ public class ChunkHandler {
final ChunkData chunkData = getChunkData(event.getWorld().isRemote, event.getWorld().provider.getDimension(), event.getChunk().x, event.getChunk().z, true);
assert chunkData != null;
chunkData.load(event.getData());
chunkData.load(event.getData(), event.getWorld());
}
// (called after data loading, or before a late generation, or on client side)
@ -123,7 +123,7 @@ public class ChunkHandler {
final ChunkData chunkData = getChunkData(event.getWorld().isRemote, event.getWorld().provider.getDimension(), event.getChunk().x, event.getChunk().z, true);
assert chunkData != null;
if (!chunkData.isLoaded()) {
chunkData.load(new NBTTagCompound());
chunkData.load(new NBTTagCompound(), event.getWorld());
}
}
/*