Skip to content

Commit c577fd1

Browse files
committed
fix(client): replace broken hollowcube debug-CRT windows natives with static-CRT rebuild
1 parent 69cd5f7 commit c577fd1

4 files changed

Lines changed: 10 additions & 15 deletions

File tree

.github/workflows/release.yml

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -56,17 +56,19 @@ jobs:
5656
- name: Install vendored libs to mavenLocal
5757
shell: bash
5858
run: |
59-
for spec in "com/miry/miry:libs/miry-1.0-SNAPSHOT.jar" "fr/mrqsdf/BbModelReader:libs/BbModelReader-1.0-SNAPSHOT.jar"; do
60-
IFS=: read -r coords jar <<< "$spec"
59+
for spec in "com/miry/miry:libs/miry-1.0-SNAPSHOT.jar:1.0-SNAPSHOT" \
60+
"fr/mrqsdf/BbModelReader:libs/BbModelReader-1.0-SNAPSHOT.jar:1.0-SNAPSHOT" \
61+
"moud/vendored/luau-natives-windows-x64:libs/luau-natives-windows-x64-1.0.0-moud.jar:1.0.0"; do
62+
IFS=: read -r coords jar version <<< "$spec"
6163
group="${coords%/*}"
6264
artifact="${coords##*/}"
63-
dest="$HOME/.m2/repository/${coords}/1.0-SNAPSHOT"
65+
dest="$HOME/.m2/repository/${coords}/${version}"
6466
mkdir -p "$dest"
65-
cp "$jar" "$dest/${artifact}-1.0-SNAPSHOT.jar"
66-
cat > "$dest/${artifact}-1.0-SNAPSHOT.pom" <<POMEOF
67+
cp "$jar" "$dest/${artifact}-${version}.jar"
68+
cat > "$dest/${artifact}-${version}.pom" <<POMEOF
6769
<?xml version="1.0" encoding="UTF-8"?>
6870
<project xmlns="http://maven.apache.org/POM/4.0.0"><modelVersion>4.0.0</modelVersion>
69-
<groupId>${group//\//.}</groupId><artifactId>${artifact}</artifactId><version>1.0-SNAPSHOT</version>
71+
<groupId>${group//\//.}</groupId><artifactId>${artifact}</artifactId><version>${version}</version>
7072
</project>
7173
POMEOF
7274
done

client-fabric/build.gradle

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,11 +69,10 @@ dependencies {
6969

7070
if (luauEnabled.get()) {
7171
include implementation("dev.hollowcube:luau:${luauVersion.get()}")
72-
// Bundle every supported Luau native so the client works on any host OS,
73-
// regardless of which platform builds the release jar.
74-
for (String variant : ['linux-x64', 'windows-x64', 'macos-x64', 'macos-arm64']) {
72+
for (String variant : ['linux-x64', 'macos-x64', 'macos-arm64']) {
7573
include runtimeOnly("dev.hollowcube:luau-natives-${variant}:${luauVersion.get()}")
7674
}
75+
include runtimeOnly("moud.vendored:luau-natives-windows-x64:1.0.0")
7776
}
7877
}
7978

client-fabric/src/main/java/com/moud/client/fabric/scripting/LuauRuntime.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,6 @@ static void closeState(Object state) {
100100

101101
LuauRuntime() {
102102
try {
103-
try {
104-
net.hollowcube.luau.util.NativeLibraryLoader.loadLibrary("globalref");
105-
net.hollowcube.luau.util.NativeLibraryLoader.loadLibrary("compiler");
106-
} catch (Throwable ignored) {
107-
}
108-
109103
Class<?> stateClass = Class.forName(LUA_STATE_CLASS);
110104
Class<?> funcClass = Class.forName(LUA_FUNC_CLASS);
111105
Class<?> compilerClass = Class.forName(LUA_COMPILER_CLASS);
844 KB
Binary file not shown.

0 commit comments

Comments
 (0)