From 1cbb124ba02df6840e9b82d88253be2a9e0e24a8 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sun, 21 May 2023 17:47:51 -0500 Subject: [PATCH 1/4] fix unit tests and add data compression --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 9eb0f18a5..041c2ad5d 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 9eb0f18a52b6d50e74fadf89abbdf68a0e337413 +Subproject commit 041c2ad5d7d9138a4d99c738b639da363b277378 From baa11f481e2441fbd58f0d653e7282d58f76ed49 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sun, 21 May 2023 18:41:48 -0500 Subject: [PATCH 2/4] improve a couple batch generator error messages --- .../wrappers/worldGeneration/BatchGenerationEnvironment.java | 4 ++-- coreSubProjects | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java index 5fc2adef8..4a6094ab2 100644 --- a/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java +++ b/common/src/main/java/com/seibel/lod/common/wrappers/worldGeneration/BatchGenerationEnvironment.java @@ -312,7 +312,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv } catch (Exception e) { - LOAD_LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e); + LOAD_LOGGER.error("DistantHorizons: Couldn't load or make chunk "+chunkPos+". Error: "+e.getMessage(), e); } if (chunkData == null) @@ -330,7 +330,7 @@ public final class BatchGenerationEnvironment extends AbstractBatchGenerationEnv } catch (Exception e) { - LOAD_LOGGER.error("DistantHorizons: Couldn't load chunk {}", chunkPos, e); + LOAD_LOGGER.error("DistantHorizons: Couldn't load or make chunk "+chunkPos+". Returning an empty chunk. Error: "+e.getMessage(), e); return new ProtoChunk(chunkPos, UpgradeData.EMPTY #if POST_MC_1_17_1 , level #endif #if POST_MC_1_18_1 , level.registryAccess().registryOrThrow(Registry.BIOME_REGISTRY), null #endif diff --git a/coreSubProjects b/coreSubProjects index 041c2ad5d..c539a3f3b 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 041c2ad5d7d9138a4d99c738b639da363b277378 +Subproject commit c539a3f3be7f58650ae405c5624d0ad110dfea90 From ea0a98c9f07acc8cd49fecf75aabdb6d231fe3c4 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 22 May 2023 07:18:21 -0500 Subject: [PATCH 3/4] Fix a crash if transparency is disabled --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index c539a3f3b..42fc173ae 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit c539a3f3be7f58650ae405c5624d0ad110dfea90 +Subproject commit 42fc173ae2a59aa0c10e849ddc40a39ca3f2eaf4 From ac939a5e955900e61ddcc2efee71acb93b2e209b Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 22 May 2023 07:49:46 -0500 Subject: [PATCH 4/4] drop fixed thread pools to 1 for easier testing --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 42fc173ae..749491b52 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 42fc173ae2a59aa0c10e849ddc40a39ca3f2eaf4 +Subproject commit 749491b52051d0d914c538fd65c65c2fa2bd02ff