Skip to content

Commit 7197322

Browse files
fix: 3.8.2 worlds changed signature of test method
1 parent b9baf33 commit 7197322

File tree

4 files changed

+16
-23
lines changed

4 files changed

+16
-23
lines changed
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "befuddledlabs.linuxvrchatsdkpatch-avatars",
33
"displayName": "Linux VRChat SDK Patch Avatars",
4-
"version": "0.1.0",
4+
"version": "0.2.0",
55
"url": "https://github.com/BefuddledLabs/LinuxVRChatSDKPatch",
66
"author": {
77
"name": "BefuddledLabs"
88
},
99
"unity": "2022.3",
1010
"description": "Patches the VRChat SDK to work properly on linux.",
1111
"vpmDependencies": {
12-
"com.vrchat.avatars": "^3.7.6",
13-
"befuddledlabs.linuxvrchatsdkpatch-base": "0.1.0"
12+
"com.vrchat.avatars": "^3.8.2",
13+
"befuddledlabs.linuxvrchatsdkpatch-base": "0.2.0"
1414
}
1515
}
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
{
22
"name": "befuddledlabs.linuxvrchatsdkpatch-base",
33
"displayName": "Linux VRChat SDK Patch Base",
4-
"version": "0.1.0",
4+
"version": "0.2.0",
55
"url": "https://github.com/BefuddledLabs/LinuxVRChatSDKPatch",
66
"author": {
77
"name": "BefuddledLabs"
88
},
99
"unity": "2022.3",
1010
"description": "Patches the VRChat SDK to work properly on linux.",
1111
"vpmDependencies": {
12-
"com.vrchat.base": "^3.7.6"
12+
"com.vrchat.base": "^3.8.2"
1313
}
1414
}

Packages/befuddledlabs.linuxvrchatsdkpatch.worlds/Editor/World.cs

Lines changed: 8 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace BefuddledLabs.LinuxVRChatSdkPatch.Worlds.Editor
1717
public static class World
1818
{
1919
[HarmonyPrefix]
20-
[HarmonyPatch(typeof(VRCWorldAssetExporter), "RunWorldTestDesktop", typeof(string), typeof(string))]
20+
[HarmonyPatch(typeof(VRCWorldAssetExporter), "RunWorldTestDesktop", typeof(string))]
2121
public static bool RunWorldTestDesktopPrefix(object[] __args)
2222
{
2323
var vrcInstallPath = SDKClientUtilities.GetSavedVRCInstallPath();
@@ -26,7 +26,7 @@ public static bool RunWorldTestDesktopPrefix(object[] __args)
2626
Debug.LogError("couldn't get VRChat path..");
2727
return true;
2828
}
29-
29+
3030
var compatDataPath = Base.Editor.Base.GetVrcCompatDataPath();
3131
if (compatDataPath == null) // Check if we could find the compatdata directory
3232
{
@@ -36,39 +36,32 @@ public static bool RunWorldTestDesktopPrefix(object[] __args)
3636

3737
// Making sure that the paths are using forward slashes
3838
var bundleFilePath = ((string)__args[0]).Replace('\\', '/');
39-
var pluginFilePath = ((string)__args[1]).Replace('\\', '/');
40-
39+
4140
bundleFilePath = UnityWebRequest.EscapeURL(bundleFilePath).Replace("+", "%20");
42-
pluginFilePath = UnityWebRequest.EscapeURL(pluginFilePath).Replace("+", "%20");
4341

4442
var args = new StringBuilder();
4543
args.Append("run ");
4644
args.Append(vrcInstallPath);
4745
args.Append(' ');
48-
46+
4947
args.Append("--url=create?roomId=");
5048
args.Append(VRC.Tools.GetRandomDigits(10)); // Random roomId
5149
args.Append("&hidden=true");
5250
args.Append("&name=BuildAndRun");
5351
args.Append("&url=file:///");
5452
args.Append(bundleFilePath);
55-
if (!string.IsNullOrEmpty(pluginFilePath))
56-
{
57-
args.Append("&pluginUrl=file:///");
58-
args.Append(pluginFilePath);
59-
}
60-
53+
6154
args.Append(" --enable-debug-gui");
6255
args.Append(" --enable-sdk-log-levels");
6356
args.Append(" --enable-udon-debug-logging");
6457
if (VRCSettings.ForceNoVR)
6558
args.Append(" --no-vr");
6659
if (VRCSettings.WatchWorlds)
6760
args.Append(" --watch-worlds");
68-
61+
6962

7063
var argsPathFixed = Regex.Replace(args.ToString(), @"file:[/\\]*", "file:///Z:/"); // The file we have is relative to / and not the "c drive" Z:/ is /
71-
64+
7265
Debug.Log(Base.Editor.Base.GetSavedProtonPath() + argsPathFixed);
7366

7467
var processStartInfo =
@@ -91,4 +84,4 @@ public static bool RunWorldTestDesktopPrefix(object[] __args)
9184
return false;
9285
}
9386
}
94-
}
87+
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"name": "befuddledlabs.linuxvrchatsdkpatch-worlds",
33
"displayName": "Linux VRChat SDK Patch Worlds",
4-
"version": "0.1.0",
4+
"version": "0.2.0",
55
"url": "https://github.com/BefuddledLabs/LinuxVRChatSDKPatch",
66
"author": {
77
"name": "BefuddledLabs"
88
},
99
"unity": "2022.3",
1010
"description": "Patches the VRChat SDK to work properly on linux.",
1111
"vpmDependencies": {
12-
"com.vrchat.worlds": "^3.7.6",
13-
"befuddledlabs.linuxvrchatsdkpatch-base": "0.1.0"
12+
"com.vrchat.worlds": "^3.8.2",
13+
"befuddledlabs.linuxvrchatsdkpatch-base": "0.2.0"
1414
}
1515
}

0 commit comments

Comments
 (0)