Skip to content

Commit 6add0ad

Browse files
committed
Replace xz with lz4
1 parent b2e26ac commit 6add0ad

5 files changed

Lines changed: 10 additions & 13 deletions

File tree

common/build.gradle

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
import org.apache.tools.ant.taskdefs.condition.Os
2-
import org.tukaani.xz.LZMA2Options
3-
import org.tukaani.xz.XZOutputStream
2+
import net.jpountz.lz4.LZ4FrameOutputStream
43

54
import java.nio.file.Files
65

76
buildscript {
87
dependencies {
9-
classpath 'org.tukaani:xz:1.10'
8+
classpath 'at.yawk.lz4:lz4-java:1.11.0'
109
}
1110
}
1211

@@ -185,7 +184,7 @@ tasks.register('copyRustNativesDev', Copy) {
185184
}
186185
tasks.register('packRustNatives', Tar) {
187186
group = 'rust'
188-
archiveFile.set file("${nativesDir}/sable_rapier_binaries.tar.xz")
187+
archiveFile.set file("${nativesDir}/sable_rapier_binaries.tar.l4z")
189188
into nativesDir
190189

191190
mustRunAfter copyRustNatives, copyRustNativesDev
@@ -197,7 +196,7 @@ tasks.register('packRustNatives', Tar) {
197196
doLast {
198197
byte[] bytes = Files.readAllBytes(getArchiveFile().get().asFile.toPath())
199198
try (var f = new FileOutputStream(getArchiveFile().get().asFile)) {
200-
try (var x = new XZOutputStream(f, new LZMA2Options(LZMA2Options.PRESET_MAX))) {
199+
try (var x = new LZ4FrameOutputStream(f, LZ4FrameOutputStream.BLOCKSIZE.SIZE_4MB, bytes.length, LZ4FrameOutputStream.FLG.Bits.BLOCK_INDEPENDENCE)) {
201200
x.write(bytes)
202201
}
203202
}

common/src/main/java/dev/ryanhcode/sable/physics/impl/rapier/Rapier3D.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,9 @@
66
import dev.ryanhcode.sable.api.physics.mass.MassData;
77
import dev.ryanhcode.sable.mixinterface.physics.ServerLevelSceneExtension;
88
import dev.ryanhcode.sable.physics.impl.rapier.collider.RapierVoxelColliderData;
9+
import net.jpountz.lz4.LZ4Factory;
10+
import net.jpountz.lz4.LZ4FrameInputStream;
11+
import net.jpountz.xxhash.XXHashFactory;
912
import net.minecraft.Util;
1013
import net.minecraft.Util.OS;
1114
import net.minecraft.server.level.ServerLevel;
@@ -64,17 +67,17 @@ private static String getNativeName() {
6467

6568
private static void loadLibrary() {
6669
final String nativeName = getNativeName();
67-
try (final InputStream is = Rapier3D.class.getResourceAsStream("/natives/" + LIB_NAME + "/sable_rapier_binaries.tar.xz")) {
70+
try (final InputStream is = Rapier3D.class.getResourceAsStream("/natives/" + LIB_NAME + "/sable_rapier_binaries.tar.l4z")) {
6871
if (is == null) {
69-
throw new FileNotFoundException("sable_rapier_binaries.tar.xz");
72+
throw new FileNotFoundException("sable_rapier_binaries.tar.l4z");
7073
}
7174

7275
final Path dir = Paths.get(NATIVE_DIR);
7376
if (!Files.exists(dir)) {
7477
Files.createDirectories(dir);
7578
}
7679

77-
try (final XZInputStream is2 = new XZInputStream(is);
80+
try (final LZ4FrameInputStream is2 = new LZ4FrameInputStream(is);
7881
final TarArchiveInputStream ti = new TarArchiveInputStream(is2)) {
7982

8083
TarArchiveEntry entry;
Binary file not shown.

fabric/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ dependencies {
2929
modCompileOnly("foundry.imguimc:imguimc-fabric-${project.minecraft_version}:${project.imguimc_version}")
3030

3131
include(modApi("fuzs.forgeconfigapiport:forgeconfigapiport-fabric:${forgeconfigapiport_version}")) //source: https://github.com/Fuzss/forgeconfigapiport-fabric
32-
include(implementation('org.tukaani:xz:1.10'))
3332
}
3433

3534
loom {

neoforge/build.gradle

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,6 @@ dependencies {
7272
}
7373
}
7474

75-
additionalRuntimeClasspath("org.tukaani:xz:1.10")
76-
jarJar(implementation("org.tukaani:xz:1.10"))
77-
78-
7975
compileOnly "maven.modrinth:distanthorizons:$rootProject.distant_horizons_version"
8076
compileOnly "maven.modrinth:backpacks-for-dummies:$rootProject.backpacks_for_dummies_version"
8177

0 commit comments

Comments
 (0)