Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 4 additions & 5 deletions common/build.gradle
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
import org.apache.tools.ant.taskdefs.condition.Os
import org.tukaani.xz.LZMA2Options
import org.tukaani.xz.XZOutputStream
import net.jpountz.lz4.LZ4FrameOutputStream

import java.nio.file.Files

buildscript {
dependencies {
classpath 'org.tukaani:xz:1.10'
classpath 'at.yawk.lz4:lz4-java:1.11.0'
}
}

Expand Down Expand Up @@ -185,7 +184,7 @@ tasks.register('copyRustNativesDev', Copy) {
}
tasks.register('packRustNatives', Tar) {
group = 'rust'
archiveFile.set file("${nativesDir}/sable_rapier_binaries.tar.xz")
archiveFile.set file("${nativesDir}/sable_rapier_binaries.tar.l4z")
into nativesDir

mustRunAfter copyRustNatives, copyRustNativesDev
Expand All @@ -197,7 +196,7 @@ tasks.register('packRustNatives', Tar) {
doLast {
byte[] bytes = Files.readAllBytes(getArchiveFile().get().asFile.toPath())
try (var f = new FileOutputStream(getArchiveFile().get().asFile)) {
try (var x = new XZOutputStream(f, new LZMA2Options(LZMA2Options.PRESET_MAX))) {
try (var x = new LZ4FrameOutputStream(f, LZ4FrameOutputStream.BLOCKSIZE.SIZE_4MB, bytes.length, LZ4FrameOutputStream.FLG.Bits.BLOCK_INDEPENDENCE)) {
x.write(bytes)
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
import dev.ryanhcode.sable.api.physics.mass.MassData;
import dev.ryanhcode.sable.mixinterface.physics.ServerLevelSceneExtension;
import dev.ryanhcode.sable.physics.impl.rapier.collider.RapierVoxelColliderData;
import net.jpountz.lz4.LZ4Factory;
import net.jpountz.lz4.LZ4FrameInputStream;
import net.jpountz.xxhash.XXHashFactory;
import net.minecraft.Util;
import net.minecraft.Util.OS;
import net.minecraft.server.level.ServerLevel;
Expand Down Expand Up @@ -64,17 +67,17 @@ private static String getNativeName() {

private static void loadLibrary() {
final String nativeName = getNativeName();
try (final InputStream is = Rapier3D.class.getResourceAsStream("/natives/" + LIB_NAME + "/sable_rapier_binaries.tar.xz")) {
try (final InputStream is = Rapier3D.class.getResourceAsStream("/natives/" + LIB_NAME + "/sable_rapier_binaries.tar.l4z")) {
if (is == null) {
throw new FileNotFoundException("sable_rapier_binaries.tar.xz");
throw new FileNotFoundException("sable_rapier_binaries.tar.l4z");
}

final Path dir = Paths.get(NATIVE_DIR);
if (!Files.exists(dir)) {
Files.createDirectories(dir);
}

try (final XZInputStream is2 = new XZInputStream(is);
try (final LZ4FrameInputStream is2 = new LZ4FrameInputStream(is);
final TarArchiveInputStream ti = new TarArchiveInputStream(is2)) {

TarArchiveEntry entry;
Expand Down
Binary file not shown.
1 change: 0 additions & 1 deletion fabric/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ dependencies {
modCompileOnly("foundry.imguimc:imguimc-fabric-${project.minecraft_version}:${project.imguimc_version}")

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

loom {
Expand Down
4 changes: 0 additions & 4 deletions neoforge/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -72,10 +72,6 @@ dependencies {
}
}

additionalRuntimeClasspath("org.tukaani:xz:1.10")
jarJar(implementation("org.tukaani:xz:1.10"))


compileOnly "maven.modrinth:distanthorizons:$rootProject.distant_horizons_version"
compileOnly "maven.modrinth:backpacks-for-dummies:$rootProject.backpacks_for_dummies_version"

Expand Down