From 05c0f030cbdabdccbdcf42e1b1742a2ca2d544ad Mon Sep 17 00:00:00 2001 From: James Seibel Date: Fri, 26 Apr 2024 07:33:26 -0500 Subject: [PATCH] Fix issues with compressors not appearing at runtime --- build.gradle | 9 +++++++-- coreSubProjects | 2 +- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 541da4b92..ea46a49c7 100644 --- a/build.gradle +++ b/build.gradle @@ -199,13 +199,15 @@ subprojects { p -> // NightConfig (includes Toml & Json) - // needs to be here and in core to prevent compiler errors + // needs to be here and in core to prevent runtime/compiler errors forgeShadowMe("com.electronwill.night-config:toml:${rootProject.nightconfig_version}") forgeShadowMe("com.electronwill.night-config:json:${rootProject.nightconfig_version}") // Compression - // needs to be here and in core to prevent compiler errors + // needs to be here and in core to prevent runtime/compiler errors forgeShadowMe("org.lz4:lz4-java:${rootProject.lz4_version}") // LZ4 + forgeShadowMe("com.github.luben:zstd-jni:${rootProject.zstd_version}") // Zstd + forgeShadowMe("org.tukaani:xz:${rootProject.xz_version}") // LZMA // Remember, for lwjgl dependencies that arent included in Minecraft, you need to also need to add it to the ShadowJar thing @@ -277,7 +279,10 @@ subprojects { p -> // Compression (LZ4) relocate "net.jpountz", "${librariesLocation}.jpountz" + relocate "com.github.luben", "${librariesLocation}.github.luben" + relocate "org.tukaani", "${librariesLocation}.tukaani" + // night config relocate "com.electronwill.nightconfig", "${librariesLocation}.electronwill.nightconfig" mergeServiceFiles() diff --git a/coreSubProjects b/coreSubProjects index 614884c29..7470455e5 160000 --- a/coreSubProjects +++ b/coreSubProjects @@ -1 +1 @@ -Subproject commit 614884c29e34e5708160e17a93b6646f38c5ad9d +Subproject commit 7470455e50bd45f16ea019982744c03bcb815471