Merge remote-tracking branch 'origin/1.21.1' into 26.1

This commit is contained in:
embeddedt 2026-04-22 19:09:27 -04:00
commit 564d607db1
No known key found for this signature in database
GPG Key ID: A69433EC199B5613
2 changed files with 6 additions and 4 deletions

View File

@ -87,7 +87,9 @@ public abstract class LevelChunkMixin extends ChunkAccess {
BlockEntity blockEntity = this.getBlockEntity(pos.immutable(), LevelChunk.EntityCreationType.IMMEDIATE);
String blockName = state.getBlock().toString();
if (blockEntity != null) {
ModernFix.LOGGER.warn("Created missing block entity for {} at {}", blockName, pos.toShortString());
if (ModernFix.LOGGER.isDebugEnabled()) {
ModernFix.LOGGER.debug("Created missing block entity for {} at {}", blockName, pos.toShortString());
}
} else {
ModernFix.LOGGER.error("Block entity is missing for {} at {}, but could not be created", blockName, pos.toShortString());
}

View File

@ -78,8 +78,8 @@ public class ModernFixMixinPlugin implements IMixinConfigPlugin {
while(true) {
try {
Thread.sleep(60000);
logger.error("------ DEBUG THREAD DUMP (occurs every 60 seconds) ------");
logger.error(ThreadDumper.obtainThreadDump());
logger.info("------ DEBUG THREAD DUMP (occurs every 60 seconds) ------");
logger.info(ThreadDumper.obtainThreadDump());
} catch(InterruptedException | RuntimeException e) {}
}
}
@ -300,4 +300,4 @@ public class ModernFixMixinPlugin implements IMixinConfigPlugin {
}
});
}
}
}