From dbc84cc0f32b64376ef3044f771a0a16ac95580d Mon Sep 17 00:00:00 2001 From: James Seibel Date: Fri, 3 Nov 2023 19:43:00 -0500 Subject: [PATCH 1/9] Add invalid fullData ID handling --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 0b3958eb5..4b8f27ed7 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 0b3958eb58386e76fd380e161cc22e251ad113b0 +Subproject commit 4b8f27ed78c4440d4cc76b66433d4deb30bfdaa0 From 34565992ea51119ad1f4945a1253097fba50f0e2 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 4 Nov 2023 15:42:16 -0500 Subject: [PATCH 2/9] Only log broken BlockState and Biomes deserializations once --- .../common/wrappers/block/BiomeWrapper.java | 10 +++++++++- .../common/wrappers/block/BlockStateWrapper.java | 16 +++++++++++++--- 2 files changed, 22 insertions(+), 4 deletions(-) diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java index ff03efcab..63fd98561 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BiomeWrapper.java @@ -20,6 +20,7 @@ package com.seibel.distanthorizons.common.wrappers.block; import java.io.IOException; +import java.util.HashSet; import java.util.Objects; import java.util.concurrent.ConcurrentHashMap; import java.util.concurrent.ConcurrentMap; @@ -74,6 +75,9 @@ public class BiomeWrapper implements IBiomeWrapper public static final String EMPTY_STRING = "EMPTY"; public static final BiomeWrapper EMPTY_WRAPPER = new BiomeWrapper(null, null); + /** keep track of broken biomes so we don't log every time */ + private static final HashSet BrokenResourceLocationStrings = new HashSet<>(); + // properties // @@ -266,7 +270,11 @@ public class BiomeWrapper implements IBiomeWrapper if (!success) { - LOGGER.warn("Unable to deserialize biome from string: [" + resourceLocationString + "]"); + if (!BrokenResourceLocationStrings.contains(resourceLocationString)) + { + BrokenResourceLocationStrings.add(resourceLocationString); + LOGGER.warn("Unable to deserialize biome from string: [" + resourceLocationString + "]"); + } return EMPTY_WRAPPER; } diff --git a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java index 87fcfc854..ccd1e4fe2 100644 --- a/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java +++ b/common/src/main/java/com/seibel/distanthorizons/common/wrappers/block/BlockStateWrapper.java @@ -67,9 +67,11 @@ public class BlockStateWrapper implements IBlockStateWrapper // TODO: Make this changeable through the config public static final String[] RENDERER_IGNORED_BLOCKS_RESOURCE_LOCATIONS = { AIR_STRING, "minecraft:barrier", "minecraft:structure_void", "minecraft:light", "minecraft:tripwire" }; - public static HashSet rendererIgnoredBlocks = null; + /** keep track of broken blocks so we don't log every time */ + private static final HashSet BrokenResourceLocations = new HashSet<>(); + // properties // @@ -347,7 +349,11 @@ public class BlockStateWrapper implements IBlockStateWrapper if (block == null) { // shouldn't normally happen, but here to make the compiler happy - LOGGER.warn("Unable to find BlockState with the resourceLocation [" + resourceLocation + "] and properties: [" + blockStatePropertiesString + "]. Air will be used instead, some data may be lost."); + if (!BrokenResourceLocations.contains(resourceLocation)) + { + BrokenResourceLocations.add(resourceLocation); + LOGGER.warn("Unable to find BlockState with the resourceLocation [" + resourceLocation + "] and properties: [" + blockStatePropertiesString + "]. Air will be used instead, some data may be lost."); + } return AIR; } @@ -374,7 +380,11 @@ public class BlockStateWrapper implements IBlockStateWrapper if (blockStatePropertiesString != null) { // we should have found a blockstate, but didn't - LOGGER.warn("Unable to find BlockState for Block [" + resourceLocation + "] with properties: [" + blockStatePropertiesString + "]. Using the default block state."); + if (!BrokenResourceLocations.contains(resourceLocation)) + { + BrokenResourceLocations.add(resourceLocation); + LOGGER.warn("Unable to find BlockState for Block [" + resourceLocation + "] with properties: [" + blockStatePropertiesString + "]. Using the default block state."); + } } foundState = block.defaultBlockState(); From 924b2b7e8e66f8ee738c1439d0811896661deea6 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sat, 4 Nov 2023 15:42:32 -0500 Subject: [PATCH 3/9] Update coreSubProjects --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 4b8f27ed7..d07a28532 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 4b8f27ed78c4440d4cc76b66433d4deb30bfdaa0 +Subproject commit d07a2853239e4ff1a9e04793a9a4fc054248cd42 From 3a782a1c4b9fa507e482f55198c7792dd415ae0c Mon Sep 17 00:00:00 2001 From: coolGi Date: Sun, 5 Nov 2023 17:19:16 +1030 Subject: [PATCH 4/9] Fixed forge 1.16 & 1.17 --- .../com/seibel/distanthorizons/forge/ForgeClientProxy.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java index 831a9e028..c96b8ce10 100644 --- a/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java +++ b/forge/src/main/java/com/seibel/distanthorizons/forge/ForgeClientProxy.java @@ -46,8 +46,6 @@ import net.minecraftforge.event.level.LevelEvent; #if POST_MC_1_18_2 import net.minecraftforge.client.event.RenderLevelStageEvent; -#else -import net.minecraftforge.client.event.RenderBlockOverlayEvent; #endif import net.minecraftforge.event.entity.player.PlayerInteractEvent; import net.minecraft.world.level.chunk.ChunkAccess; @@ -303,7 +301,7 @@ public class ForgeClientProxy #if POST_MC_1_18_2 public void afterLevelRenderEvent(RenderLevelStageEvent event) #else - public void afterLevelRenderEvent(RenderBlockOverlayEvent event) + public void afterLevelRenderEvent(TickEvent.RenderTickEvent event) #endif { #if POST_MC_1_20_1 @@ -313,7 +311,7 @@ public class ForgeClientProxy #else // FIXME: Is this the correct location for 1.16 & 1.17??? // I couldnt find anything for rendering after the level, so is rendering after overlays ok? - if (event.getOverlayType() == RenderBlockOverlayEvent.OverlayType.BLOCK) + if (event.type.equals(TickEvent.RenderTickEvent.Type.WORLD)) #endif { try From 48452e6fe72310c54d1bc79ec414df7f569492d9 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Sun, 5 Nov 2023 15:54:23 -0600 Subject: [PATCH 5/9] Fix some chunks not updating --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index d07a28532..3daa0eb6c 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit d07a2853239e4ff1a9e04793a9a4fc054248cd42 +Subproject commit 3daa0eb6ce7fc8adb1787423fedf8323c238035c From 734edeaba9e89afef8ba5eb96668d6a811169cd7 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Mon, 6 Nov 2023 07:49:06 -0600 Subject: [PATCH 6/9] Fix transparent water when transparency is disabled --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 3daa0eb6c..0a8847cdc 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 3daa0eb6ce7fc8adb1787423fedf8323c238035c +Subproject commit 0a8847cdc068addbeb09083143e1e8e9572ee976 From 55df8daa355a5331adad7f211cff30b00e5089fe Mon Sep 17 00:00:00 2001 From: coolGi Date: Wed, 8 Nov 2023 01:26:32 +1030 Subject: [PATCH 7/9] Added key detection through the new test screen --- build.gradle | 2 +- coreSubProjects | 2 +- gradle.properties | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 45f6fc5ba..3d152fce7 100644 --- a/build.gradle +++ b/build.gradle @@ -234,7 +234,7 @@ subprojects { p -> //forgeShadowMe("io.netty:netty-all:${rootProject.netty_version}") // Remember, for lwjgl dependencies that arent included in Minecraft, you need to also need to add it to the ShadowJar thing - forgeShadowMe("org.lwjgl:lwjgl-jawt:3.2.2") { + forgeShadowMe("org.lwjgl:lwjgl-jawt:${rootProject.lwjgl_version}") { exclude group: "org.lwjgl", module: "lwjgl" // This module is imported by Minecraft so exclude it } diff --git a/coreSubProjects b/coreSubProjects index 0a8847cdc..e90daa8e5 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 0a8847cdc068addbeb09083143e1e8e9572ee976 +Subproject commit e90daa8e5b123008514b631463a54e838d133d48 diff --git a/gradle.properties b/gradle.properties index d03773735..74344b113 100644 --- a/gradle.properties +++ b/gradle.properties @@ -27,7 +27,7 @@ sqlite_jdbc_version=3.43.0.0 # Minecraft related libaries (included in MC's jar) log4j_version=2.20.0 netty_version=4.1.94.Final -lwjgl_version=3.2.3 +lwjgl_version=3.3.1 joml_version=1.10.2 From 424429bff1e49be7b95e39e9a3471d91746ac439 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Wed, 8 Nov 2023 19:42:43 -0600 Subject: [PATCH 8/9] Minor core refactor --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index e90daa8e5..2eae46271 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit e90daa8e5b123008514b631463a54e838d133d48 +Subproject commit 2eae46271bc0acb99148e6006a6e094c5c1ca987 From 946aff24afe54d201a742994233cc869cecd1248 Mon Sep 17 00:00:00 2001 From: James Seibel Date: Fri, 10 Nov 2023 07:02:58 -0600 Subject: [PATCH 9/9] Update coreSubProjects --- coreSubProjects | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/coreSubProjects b/coreSubProjects index 2eae46271..8e46ce07e 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 2eae46271bc0acb99148e6006a6e094c5c1ca987 +Subproject commit 8e46ce07e0a4812b1810dab15cc7854b76a02d75