gg.easy.airship 0.1.2185 → 0.1.2186

package/Editor/Build/AirshipIOSBuildProcessor.cs

@@ -19,6 +19,7 @@ namespace Editor.Build {
             var root = plist.root;
             var buildKey = "NSCameraUsageDescription";
             root.SetString(buildKey, "Use the camera to take profile pictures.");
+            root.SetBoolean("ITSAppUsesNonExemptEncryption", false);
             root.SetBoolean("GCSupportsGameMode", true);
             File.WriteAllText(plistPath, plist.WriteToString());
 #endif

package/Editor/BuildMenu.cs

@@ -2,6 +2,8 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using Code.Bootstrap;
+using NUnit;
 using UnityEditor;
 using UnityEditor.Build;
 using UnityEditor.Build.Profile;
@@ -266,8 +268,16 @@ namespace Editor {
             ReleaseAPK,
             ReleaseAAB,
         }
+
+        public enum AndroidEnvironment {
+            Production,
+            Staging,
+        }
         
-        public static void BuildAndroidClient(AndroidBuildType buildType) {
+        public static void BuildAndroidClient(AndroidBuildType buildType, AndroidEnvironment environment) {
+#if AIRSHIP_PLAYER
+           StreamingAssets.SetCoreMaterialPlatform(AirshipPlatform.Android);
+            
             var development = buildType == AndroidBuildType.DevelopmentAPK;
             var buildApk = buildType != AndroidBuildType.ReleaseAAB;
 
@@ -279,18 +289,35 @@ namespace Editor {
             PlayerSettings.SplashScreen.show = false;
             PlayerSettings.SetScriptingBackend(NamedBuildTarget.Android, ScriptingImplementation.IL2CPP);
             PlayerSettings.Android.splitApplicationBinary = !buildApk;
-
+            PlayerSettings.Android.applicationEntry = AndroidApplicationEntry.GameActivity;
+            
+            PlayerSettings.Android.keyaliasName = environment switch {
+                AndroidEnvironment.Production => "airship",
+                AndroidEnvironment.Staging => "airship-staging",
+                _ => throw new ArgumentOutOfRangeException(nameof(environment), environment, null)
+            };
+            
+            var editorBuildScenes = new List<EditorBuildSettingsScene>();
+            foreach (var sceneName in scenes) {
+                editorBuildScenes.Add(new EditorBuildSettingsScene(sceneName, true));
+            }
+            
             BuildProfile buildProfile;
             if (development) {
                 buildProfile = AssetDatabase.LoadAssetAtPath<BuildProfile>("Assets/Settings/Build Profiles/Android Debug.asset");
             } else {
                 buildProfile = AssetDatabase.LoadAssetAtPath<BuildProfile>("Assets/Settings/Build Profiles/Android Google Play.asset");
             }
-            var options = new BuildPlayerWithProfileOptions();
-            var editorBuildScenes = new List<EditorBuildSettingsScene>();
-            foreach (var sceneName in scenes) {
-                editorBuildScenes.Add(new EditorBuildSettingsScene(sceneName, true));
+
+            var defines = new List<string>();
+            defines.Add("AIRSHIP_PLAYER");
+            if (environment == AndroidEnvironment.Staging) {
+                defines.Add("AIRSHIP_STAGING");
+                defines.Add("AIRSHIP_INTERNAL");
             }
+            buildProfile.scriptingDefines = defines.ToArray();
+            
+            var options = new BuildPlayerWithProfileOptions();
             buildProfile.overrideGlobalScenes = true;
             buildProfile.scenes = editorBuildScenes.ToArray();
             options.buildProfile = buildProfile;
@@ -298,8 +325,9 @@ namespace Editor {
             if (development) {
                 options.options = BuildOptions.Development | BuildOptions.ConnectWithProfiler;
             }
-
-            var report = BuildPipeline.BuildPlayer(options);
+        
+            var  report = BuildPipeline.BuildPlayer(options);
+            
             var summary = report.summary;
             switch (summary.result) {
                 case BuildResult.Succeeded:
@@ -319,8 +347,10 @@ namespace Editor {
 #endif
                     break;
             }
-
+            
+            StreamingAssets.ResetCoreMaterials();
             CreateAssetBundles.AddAllGameBundleScenes();
+#endif
         }
 
 #if AIRSHIP_PLAYER
@@ -354,19 +384,29 @@ namespace Editor {
             BuildIOSClient(true, true);
         }
 
-        [MenuItem("Airship/Create Binary/Client/Android (Google Play)", priority = 80)]
+        [MenuItem("Airship/Create Binary/Client/Android/Android Release (Google Play)", priority = 10)]
         public static void BuildAndroidClientMenuItem() {
-            BuildAndroidClient(AndroidBuildType.ReleaseAAB);
+            BuildAndroidClient(AndroidBuildType.ReleaseAAB, AndroidEnvironment.Production);
         }
         
-        [MenuItem("Airship/Create Binary/Client/Android (APK)", priority = 80)]
+        [MenuItem("Airship/Create Binary/Client/Android/Android APK", priority = 80)]
         public static void BuildAndroidProdAPK() {
-            BuildAndroidClient(AndroidBuildType.ReleaseAPK);
+            BuildAndroidClient(AndroidBuildType.ReleaseAPK, AndroidEnvironment.Production);
         }
 
-        [MenuItem("Airship/Create Binary/Client/Android (Development APK)", priority = 80)]
+        [MenuItem("Airship/Create Binary/Client/Android/Android APK (Development)", priority = 80)]
         public static void BuildAndroidDevelopmentClientMenuItem() {
-            BuildAndroidClient(AndroidBuildType.DevelopmentAPK);
+            BuildAndroidClient(AndroidBuildType.DevelopmentAPK, AndroidEnvironment.Production);
+        }
+        
+        [MenuItem("Airship/Create Binary/Client/Android/Android Staging APK", priority = 150)]
+        public static void BuildAndroidProdStagingAPK() {
+            BuildAndroidClient(AndroidBuildType.ReleaseAPK, AndroidEnvironment.Staging);
+        }
+
+        [MenuItem("Airship/Create Binary/Client/Android/Android Staging APK (Development)", priority = 150)]
+        public static void BuildAndroidDevelopmentStagingClientMenuItem() {
+            BuildAndroidClient(AndroidBuildType.DevelopmentAPK, AndroidEnvironment.Staging);
         }
 #endif
 

package/Editor/StreamingAssets.cs

@@ -0,0 +1,82 @@
+using System;
+using System.IO;
+using Code.Bootstrap;
+using Editor;
+using Editor.Util;
+using UnityEditor;
+using UnityEngine;
+
+#if AIRSHIP_PLAYER
+internal class StreamingAssets {
+    private static readonly string ShippedBundles = "Assets/StreamingAssets/ShippedBundles";
+    private static readonly string ShippedBundlesTmp = "Assets/StreamingAssets/ShippedBundles~";
+
+    public static readonly string CoreMaterialsAndroid = "Assets/StreamingAssets/ShippedBundles/CoreMaterials_Android";
+    public static readonly string CoreMaterialsWindows = "Assets/StreamingAssets/ShippedBundles/CoreMaterials_Windows";
+    public static readonly string CoreMaterialsIOS = "Assets/StreamingAssets/ShippedBundles/CoreMaterials_iOS";
+    public static readonly string CoreMaterialsMac = "Assets/StreamingAssets/ShippedBundles/CoreMaterials_Mac";
+
+    public static readonly string RelativeResourcesPath = "@easy/corematerials_shared/resources";
+    
+    private static void ExcludeStreamingAssetsPath(string path) {
+        var targetPath = path.Replace("StreamingAssets", "StreamingAssets~");
+        
+        if (!Directory.Exists(targetPath)) {
+            Directory.CreateDirectory(targetPath);
+        }
+        Directory.Move(path, targetPath);
+    }
+
+    private static void FixStreamingAssetsPath(string sourcePath) {
+        var resourcePath = PosixPath.Join(sourcePath, RelativeResourcesPath);
+        var excludedResourcePath = resourcePath.Replace("StreamingAssets", "StreamingAssets~");
+        if (!File.Exists(excludedResourcePath)) {
+            Debug.LogWarning($"Could not find {excludedResourcePath}");
+            return;
+        }
+        File.Move(excludedResourcePath, resourcePath);
+        AssetDatabase.ImportAsset(resourcePath);
+    }
+    
+    public static void SetCoreMaterialPlatform(AirshipPlatform platform) {
+        var platformPath = platform switch {
+            AirshipPlatform.Android => CoreMaterialsAndroid,
+            _ => throw new ArgumentOutOfRangeException(nameof(platform), platform, null)
+        };
+
+        var paths = new[] {
+            CoreMaterialsAndroid,
+            CoreMaterialsMac,
+            CoreMaterialsWindows,
+            CoreMaterialsIOS,
+        };
+
+        foreach (var path in paths) {
+            if (path == platformPath) continue;
+            var resourcePath = PosixPath.Join(path, RelativeResourcesPath);
+            if (!File.Exists(resourcePath)) {
+                Debug.LogWarning($"could not find resource path {resourcePath}");
+                continue;
+            }
+
+
+            var targetPath = resourcePath.Replace("StreamingAssets", "StreamingAssets~");
+            var targetFolder = Path.GetDirectoryName(targetPath);
+            if (!Directory.Exists(targetFolder)) {
+                Directory.CreateDirectory(targetFolder);
+            }
+            
+            File.Move(resourcePath, targetPath);
+        }
+        
+        AssetDatabase.ImportAsset("Assets/StreamingAssets", ImportAssetOptions.ImportRecursive);
+    }
+    
+    public static void ResetCoreMaterials() {
+        FixStreamingAssetsPath(CoreMaterialsAndroid);
+        FixStreamingAssetsPath(CoreMaterialsWindows);
+        FixStreamingAssetsPath(CoreMaterialsMac);
+        FixStreamingAssetsPath(CoreMaterialsIOS);
+    }
+}
+#endif

package/Editor/StreamingAssets.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 23b1ca55a86f4a8597889786fd1941ab
+timeCreated: 1758582757

package/Runtime/Code/AirshipConst.cs

@@ -6,7 +6,7 @@ using UnityEngine.Scripting;
 namespace Code {
     [LuauAPI][Preserve]
     public static class AirshipConst {
-        public const int playerVersion = 18;
+        public const int playerVersion = 19;
         public static readonly IReadOnlyList<string> playerFlags = new string[] {
             "SkipLoading",
         };

package/Runtime/Code/Auth/AuthManager.cs

@@ -136,7 +136,7 @@ public class AuthManager {
         });
 
 #if UNITY_ANDROID
-        GoogleSignIn.Configuration = new GoogleSignInConfiguration() {
+		GoogleSignIn.Configuration ??= new GoogleSignInConfiguration() {
 			RequestEmail = true,
 			RequestProfile = true,
 			RequestAuthCode = true,
@@ -144,7 +144,7 @@ public class AuthManager {
 #if UNITY_EDITOR || UNITY_STANDALONE
 			ClientSecret = clientSecret,
 #endif
-        };
+		};
 #endif
         
 #if AIRSHIP_ANDROID_DEBUG

package/Runtime/Code/Authentication/EasyAuthenticator.cs

@@ -207,6 +207,7 @@ namespace Code.Authentication {
                         username = loginMessage.editorUsername,
                         orgRoleName = "Owner",
                         profileImageId = loginMessage.editorProfileImageId,
+                        playerVersion = AirshipConst.playerVersion,
                     });
                     return await tcs.Task;
                 }
@@ -215,7 +216,8 @@ namespace Code.Authentication {
                     username = "Player" + this.connectionCounter,
                     orgRoleName = "Owner",
                     profileImageId = string.Empty,
-                    fullTransferPacket = "{}"
+                    fullTransferPacket = "{}",
+                    playerVersion = AirshipConst.playerVersion,
                 });
                 return await tcs.Task;
             }
@@ -244,7 +246,8 @@ namespace Code.Authentication {
                     username = transferData.user.username,
                     profileImageId = transferData.user.profileImageId,
                     orgRoleName = transferData.orgRoleName,
-                    fullTransferPacket = fullTransferPacket
+                    fullTransferPacket = fullTransferPacket,
+                    playerVersion = loginMessage.playerVersion,
                 });
             }).Catch((err) => {
                 var error = err as RequestException;

package/Runtime/Code/Bootstrap/AirshipEntryPoint.cs

@@ -1,8 +1,5 @@
-using System;
 using Code.Bootstrap;
-using Code.Bundles;
 using Sentry;
-using Sentry.Unity;
 using UnityEngine;
 
 
@@ -14,19 +11,6 @@ public class AirshipEntryPoint : Singleton<AirshipEntryPoint> {
 #if AIRSHIP_PLAYER
         Debug.unityLogger.logHandler = new AirshipLogHandler();
 
-        SentryUnity.Init(options => {
-#if UNITY_IOS || UNITY_ANDROID
-            options.Release = Application.version + "@" + AirshipVersion.GetVersionHash();
-#else
-            options.Release = AirshipVersion.GetVersionHash();
-#endif
-#if AIRSHIP_STAGING
-            options.Environment = "staging";
-#else
-            options.Environment = "production";
-#endif
-        });
-
         SentrySdk.ConfigureScope(scope => {
             scope.SetExtra("platform", AirshipPlatformUtil.GetLocalPlatform().ToString());
             scope.SetExtra("deviceType", DeviceBridge.GetDeviceType().ToString());

package/Runtime/Code/Bootstrap/BundleDownloader.cs

@@ -36,7 +36,7 @@ public class BundleDownloader : Singleton<BundleDownloader> {
 		[CanBeNull] BundleLoadingScreen loadingScreen = null,
 		[CanBeNull] string gameCodeZipUrl = null,
 		bool downloadCodeZipOnClient = false,
-		Action<bool> onComplete = null
+		Action<bool, string> onComplete = null
 	) {
 		try {
 			var totalSt = Stopwatch.StartNew();
@@ -47,8 +47,7 @@ public class BundleDownloader : Singleton<BundleDownloader> {
 				remoteBundleFiles.AddRange(package.GetPublicRemoteBundleFiles(cdnUrl, platform));
 			}
 
-			if (privateRemoteFiles != null)
-			{
+			if (privateRemoteFiles != null) {
 				remoteBundleFiles.AddRange(privateRemoteFiles);
 			}
 
@@ -205,12 +204,12 @@ public class BundleDownloader : Singleton<BundleDownloader> {
 						Debug.LogError(
 							$"Failed to download bundle file. Url={remoteBundleFile.Url} StatusCode={statusCode}");
 						Debug.LogError(request.webRequest.error);
-						onComplete?.Invoke(false);
+						onComplete?.Invoke(false, request.webRequest.error);
 						return false;
 					}
 				} else if (!string.IsNullOrEmpty(request.webRequest.downloadHandler.error)) {
 					Debug.LogError($"File download handler failed on bundle file {remoteBundleFile.fileName}. Error: {request.webRequest.downloadHandler.error}");
-					onComplete?.Invoke(false);
+					onComplete?.Invoke(false, request.webRequest.downloadHandler.error);
 					return false;
 				}  else {
 					var size = Math.Floor((request.webRequest.downloadedBytes / 1000000f) * 10) / 10;
@@ -220,12 +219,12 @@ public class BundleDownloader : Singleton<BundleDownloader> {
 				}
 
 				if (!success && RunCore.IsServer()) {
-					onComplete?.Invoke(false);
+					onComplete?.Invoke(false, "");
 					return false;
 				}
 
 				if (!success && RunCore.IsClient()) {
-					onComplete?.Invoke(false);
+					onComplete?.Invoke(false, "");
 					return false;
 				}
 
@@ -265,9 +264,8 @@ public class BundleDownloader : Singleton<BundleDownloader> {
 					if (loadingScreen) {
 						loadingScreen.SetError("Failed to download Main Menu scripts.");
 					}
-					if (RunCore.IsServer())
-					{
-						onComplete?.Invoke(false);
+					if (RunCore.IsServer()) {
+						onComplete?.Invoke(false, "");
 						return false;
 					}
 				} else {
@@ -294,11 +292,11 @@ public class BundleDownloader : Singleton<BundleDownloader> {
 				Debug.Log($"Unzipped code.zip in {unzipCodeSt.ElapsedMilliseconds} ms.");
 			}
 			Debug.Log($"Completed bundle downloader step in {totalSt.ElapsedMilliseconds} ms.");
-			onComplete?.Invoke(true);
+			onComplete?.Invoke(true, "");
 			return true;
 		} catch (Exception e) {
 			Debug.LogError("Failed to download bundles: " + e);
-			onComplete?.Invoke(false);
+			onComplete?.Invoke(false, e.Message);
 			return false;
 		}
 	}

package/Runtime/Code/Bootstrap/ClientBundleLoader.cs

@@ -9,6 +9,7 @@ using Code.Analytics;
 using Code.Luau.LuauAssembly.Protection;
 using Luau;
 using Mirror;
+using Sentry;
 using UnityEngine;
 using UnityEngine.SceneManagement;
 using UnityEngine.Serialization;
@@ -71,6 +72,8 @@ namespace Code.Bootstrap {
 
         private int setupClientSessionCounter = 0;
 
+        public static string CurrentGameId;
+
         /// <summary>
         /// Client downloads and combines all LuauScriptDto objects into this single dto.
         /// This is then serialized to disk as a cache.
@@ -86,6 +89,13 @@ namespace Code.Bootstrap {
             }
         }
 
+        private void OnDestroy() {
+            CurrentGameId = "";
+            SentrySdk.ConfigureScope(scope => {
+                scope.SetExtra("gameId", "");
+            });
+        }
+
         public void SetupServer() {
             NetworkServer.RegisterHandler<RequestScriptsMessage>((conn, data) => {
                 Debug.Log($"Sending {this.scriptsDtos.Count} script dtos to " + conn + " with hash " + this.scriptsHash);
@@ -170,6 +180,11 @@ namespace Code.Bootstrap {
 
             NetworkClient.RegisterHandler<InitializeGameMessage>(async data => {
                 this.initMessage = data;
+                CurrentGameId = data.startupConfig.GameBundleId;
+                SentrySdk.ConfigureScope(scope => {
+                    scope.SetExtra("gameId", CurrentGameId);
+                });
+
                 NetworkManager.networkSceneName = data.startupConfig.StartingSceneName;
 
                 StartCoroutine(this.LoadPackages(data.startupConfig));
@@ -387,10 +402,10 @@ namespace Code.Bootstrap {
                     loadingScreen,
                     null,
                     false,
-                    (success) => {
+                    (success, errorMsg) => {
                         finishedDownload = true;
                         if (!success) {
-                            loadingScreen.SetError("Failed to download game content. An error has occurred.");
+                            loadingScreen.SetError("Failed to download game content. An error has occurred: " + errorMsg);
                         }
                     }
                 );

package/Runtime/Code/Bootstrap/LuauScriptsDtoSerializer.cs

@@ -20,7 +20,7 @@ namespace Code.Bootstrap {
     }
     
     public static class LuauScriptsDtoSerializer {
-        private static Zstd.Zstd zstd = new(1024 * 4);
+        private static readonly Lazy<Zstd.Zstd> zstd = new(() => new Zstd.Zstd(1024 * 4));
         private static readonly Dictionary<string, CachedCompressedFile> compressedFileCache = new();
 
         [RuntimeInitializeOnLoadMethod(RuntimeInitializeLoadType.SubsystemRegistration)]
@@ -47,7 +47,7 @@ namespace Code.Bootstrap {
                         Profiler.BeginSample("Luau Compress");
                         var maxCompressionSize = Zstd.Zstd.GetCompressionBound(file.bytes);
                         byte[] compressedBytes = new byte[maxCompressionSize];
-                        var compressedSize = zstd.Compress(file.bytes, compressedBytes);
+                        var compressedSize = zstd.Value.Compress(file.bytes, compressedBytes);
                         writer.WriteInt(compressedSize);
                         writer.WriteBytes(compressedBytes, 0, compressedSize);
                         
@@ -81,7 +81,7 @@ namespace Code.Bootstrap {
 
                     // Decompress the bytes
                     script.bytes = new byte[Zstd.Zstd.GetDecompressionBound(compressedBytes)];
-                    zstd.Decompress(new ReadOnlySpan<byte>(compressedBytes, 0, compressedBytesLen), script.bytes);
+                    zstd.Value.Decompress(new ReadOnlySpan<byte>(compressedBytes, 0, compressedBytesLen), script.bytes);
 
                     script.airshipBehaviour = reader.ReadBool();
 

package/Runtime/Code/Bootstrap/ServerBootstrap.cs

@@ -458,14 +458,11 @@ public class ServerBootstrap : MonoBehaviour
 		bool downloadComplete = false;
 		if (!RunCore.IsEditor()) {
 			BundleDownloader.Instance.DownloadBundles(startupConfig.CdnUrl, packages.ToArray(), privateBundleFiles, null, gameCodeZipUrl, false,
-				(res) => {
-					if (!res)
-					{
+				(res, errorMsg) => {
+					if (!res) {
 						Debug.LogWarning("[Airship]: Failed to download required files. See above logs for details. Shutting down server.");
 						ShutdownDueToAssetFailure(1);
-					}
-					else
-					{
+					} else {
 						downloadComplete = true;
 					}
 				});

package/Runtime/Code/Bundles/AirshipVersion.cs

@@ -1,6 +1,7 @@
 using UnityEngine;
 
 namespace Code.Bundles {
+    [LuauAPI]
     public class AirshipVersion {
         private static string versionHash = null;
         public static string GetVersionHash() {

package/Runtime/Code/CoreUI/Login/PickUsernamePage.cs

@@ -5,6 +5,7 @@ using Code.Http.Public;
 using Code.Platform.Shared;
 using ElRaccoone.Tweens;
 using Proyecto26;
+using Sentry;
 using TMPro;
 using UnityEngine;
 using UnityEngine.SceneManagement;
@@ -107,7 +108,6 @@ public class PickUsernamePage : MonoBehaviour {
         var res = await InternalHttpManager.GetAsync(AirshipPlatformUrl.gameCoordinator +
                                                      "/users/availability?username=" + username);
         avail = res.success;
-        print("username check: " + res.data);
         if (!res.success) {
             SetResponse(this.usernameTakenText);
             Debug.LogError(res.error);
@@ -138,6 +138,9 @@ public class PickUsernamePage : MonoBehaviour {
                 username = username,
             }));
         if (res.success) {
+            SentrySdk.ConfigureScope(scope => {
+                scope.User.Username = username;
+            });
             SceneManager.LoadScene("MainMenu");
         } else {
             Debug.LogError(res.error);

package/Runtime/Code/CoreUI/MainMenu/MainMenuLoadingScreen.prefab

@@ -85,8 +85,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -0.000061035156, y: 0}
-  m_SizeDelta: {x: -59.999893, y: -40}
+  m_AnchoredPosition: {x: -0.000061035156, y: -5.5122}
+  m_SizeDelta: {x: -59.9999, y: -28.9756}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7131854604237137100
 CanvasRenderer:
@@ -161,7 +161,7 @@ MonoBehaviour:
   m_charWidthMaxAdj: 0
   m_TextWrappingMode: 1
   m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
+  m_overflowMode: 1
   m_linkedTextComponent: {fileID: 0}
   parentLinkedComponent: {fileID: 0}
   m_enableKerning: 0
@@ -1012,7 +1012,7 @@ GameObject:
   - component: {fileID: 8811223116906599597}
   - component: {fileID: 6036842439956431236}
   m_Layer: 5
-  m_Name: Text (TMP)
+  m_Name: RetryBtn
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
@@ -1034,7 +1034,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
   m_AnchorMax: {x: 0.5, y: 0}
-  m_AnchoredPosition: {x: 0, y: -57}
+  m_AnchoredPosition: {x: 0, y: -75}
   m_SizeDelta: {x: 200, y: 50}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1161445418170421426
@@ -1229,8 +1229,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -0, y: 0}
-  m_SizeDelta: {x: 521.6703, y: 103.36}
+  m_AnchoredPosition: {x: -0, y: -20.2114}
+  m_SizeDelta: {x: 521.6703, y: 143.7827}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7156213477813682496
 CanvasRenderer:

package/Runtime/Code/Luau/LuauAssembly/BinaryBlob.cs

@@ -1,31 +1,41 @@
 using System;
+using System.Runtime.InteropServices;
 using Mirror;
 using Code.Util;
-using UnityEngine;
 
 namespace Assets.Luau {
     [Serializable]
     public class BinaryBlob : IEquatable<BinaryBlob> {
+        public int dataSize;
+        public int uncompressedDataSize;
+        public byte[] data;
+        
         public BinaryBlob() {
             data = new byte[] { };
             dataSize = 0;
         }
         
         public BinaryBlob(byte[] bytes) {
-            if (bytes.Length > uint.MaxValue) {
-                throw new Exception("Length of binary blob data exceeds " + int.MaxValue + " bytes.");
-            }
             dataSize = bytes.Length;
+            uncompressedDataSize = dataSize;
             data = bytes;
         }
-        
-        public int dataSize;
-        public byte[] data;
+
+        public BinaryBlob(IntPtr nativeBinaryBlobPtr) {
+            var marshal = LuauBinaryBlobMarshal.FromIntPtr(nativeBinaryBlobPtr);
+            dataSize = (int)marshal.DataSize;
+            uncompressedDataSize = (int)marshal.UncompressedDataSize;
+            data = marshal.ReadData();
+        }
 
         public bool Equals(BinaryBlob other) {
             return this.dataSize == other?.dataSize;
         }
 
+        public bool IsCompressed() {
+            return data.Length > 0 && data[0] == 1 && dataSize < uncompressedDataSize;
+        }
+
         public byte[] CreateDiff(BinaryBlob other) {
             int length = Math.Max(other.data.Length, data.Length);
             var neededBytes = (int) Math.Ceiling(length / 8f);
@@ -82,6 +92,7 @@ namespace Assets.Luau {
             byte changedLength = bytes[0];
             if (changedLength == 0) return new BinaryBlob() {
                 dataSize = dataSize,
+                uncompressedDataSize = uncompressedDataSize,
                 data = (byte[]) data.Clone(),
             };
             
@@ -124,4 +135,25 @@ namespace Assets.Luau {
             return newBlob;
         }
     }
+
+    /// <summary>
+    /// Strictly used for marshalling BinaryBlob data only.
+    /// </summary>
+    [StructLayout(LayoutKind.Sequential)]
+    public struct LuauBinaryBlobMarshal {
+        // Ordering of these fields must match BinaryBlob struct in native LuauPlugin:
+        public readonly IntPtr Data;
+        public readonly ulong DataSize;
+        public readonly ulong UncompressedDataSize;
+
+        public static LuauBinaryBlobMarshal FromIntPtr(IntPtr ptr) {
+            return Marshal.PtrToStructure<LuauBinaryBlobMarshal>(ptr);
+        }
+
+        public byte[] ReadData() {
+            var bytes = new byte[DataSize];
+            Marshal.Copy(Data, bytes, 0, (int)DataSize);
+            return bytes;
+        }
+    }
 }

package/Runtime/Code/Luau/LuauCoreCallbacks.cs

@@ -637,9 +637,9 @@ public partial class LuauCore : MonoBehaviour {
                     case PODTYPE.POD_BINARYBLOB: {
                         if (t.IsAssignableFrom(binaryBlobType)) {
                             if (field != null) {
-                                field.SetValue(objectReference, NewBinaryBlobFromPointer(propertyData, (int)propertyDataSize));
+                                field.SetValue(objectReference, NewBinaryBlobFromPointer(propertyData));
                             } else {
-                                SetValue<BinaryBlob>(objectReference, NewBinaryBlobFromPointer(propertyData, (int)propertyDataSize), property);
+                                SetValue<BinaryBlob>(objectReference, NewBinaryBlobFromPointer(propertyData), property);
                             }
 
                             return 0;