gg.easy.airship 0.1.2112 → 0.1.2113

package/Editor/AutoSceneRedirect.cs

@@ -1,4 +1,5 @@
 using System;
+using Code.State;
 using Editor.Packages;
 using UnityEditor;
 using UnityEditor.SceneManagement;
@@ -63,7 +64,6 @@ public class AutoSceneRedirect {
                 Debug.Log("An Airship Core update is available. Not updating may result in unexpected behaviour.");
             }
         }
-
         if (state != PlayModeStateChange.ExitingEditMode) return;
         
         var sceneName = SceneManager.GetActiveScene().name;
@@ -71,9 +71,9 @@ public class AutoSceneRedirect {
         if (gameConfig == null) return;
 
         if (Array.Find(gameConfig.gameScenes, obj => ((SceneAsset)obj).name == sceneName) != null) {
-            ServerBootstrap.editorStartingSceneIntent = sceneName;
+            EditorSessionState.SetString("AirshipEditorStartingSceneName", sceneName);
         } else {
-            ServerBootstrap.editorStartingSceneIntent = "";
+            EditorSessionState.SetString("AirshipEditorStartingSceneName", "");
         }
     }
 }

package/Editor/CreateAssetBundles.cs

@@ -315,10 +315,10 @@ public static class CreateAssetBundles {
 					.Select((s) => AssetDatabase.GetAssetPath((SceneAsset)s))
 					.Where((path) => !(path.EndsWith(".lua") || path.EndsWith(".json~")))
 					.ToArray();
-				Debug.Log("Including scenes: ");
-				foreach (var p in assetPaths) {
-					Debug.Log("  - " + p);
-				}
+				// Debug.Log("Including scenes: ");
+				// foreach (var p in assetPaths) {
+				// 	Debug.Log("  - " + p);
+				// }
 				var addressableNames = assetPaths.Select((p) => p.ToLower())
 					.ToArray();
 				var build = new AssetBundleBuild() {
@@ -343,10 +343,10 @@ public static class CreateAssetBundles {
 					.Where((path) => !path.ToLower().Contains("editor/"))
 					.Where((p) => !AssetDatabase.IsValidFolder(p))
 					.ToArray();
-				Debug.Log("Resources:");
-				foreach (var path in assetPaths) {
-					Debug.Log("  - " + path);
-				}
+				// Debug.Log("Resources:");
+				// foreach (var path in assetPaths) {
+				// 	Debug.Log("  - " + path);
+				// }
 				var addressableNames = assetPaths
 					.Select((p) => p.ToLower())
 					.ToArray();
@@ -367,6 +367,8 @@ public static class CreateAssetBundles {
 			{
 				GraphicsDeviceType.OpenGLES3
 			});
+		} else {
+			PlayerSettings.SetUseDefaultGraphicsAPIs(buildTarget, true);
 		}
 
 		var buildTargetGroup = BuildPipeline.GetBuildTargetGroup(buildTarget);
@@ -384,13 +386,13 @@ public static class CreateAssetBundles {
 		buildParams.BundleCompression = BuildCompression.LZ4;
 		var buildContent = new BundleBuildContent(builds);
 
-		Debug.Log("Additional files:");
-		foreach (var pair in buildContent.AdditionalFiles) {
-			Debug.Log(pair.Key + ":");
-			foreach (var p in pair.Value) {
-				Debug.Log("  - " + p.fileAlias);
-			}
-		}
+		// Debug.Log("Additional files:");
+		// foreach (var pair in buildContent.AdditionalFiles) {
+		// 	Debug.Log(pair.Key + ":");
+		// 	foreach (var p in pair.Value) {
+		// 		Debug.Log("  - " + p.fileAlias);
+		// 	}
+		// }
 
 		ContentPipeline.BuildCallbacks.PostPackingCallback = (parameters, data, arg3) => {
 			return ReturnCode.Success;
@@ -407,9 +409,9 @@ public static class CreateAssetBundles {
 			return false;
 		}
 
-		Debug.Log("----------------------");
-		Debug.Log("Airship Build Report");
-		Debug.Log("----------------------");
+		// Debug.Log("----------------------");
+		// Debug.Log("Airship Build Report");
+		// Debug.Log("----------------------");
 		// {
 		// 	Debug.Log("Serialized Files:");
 		// 	foreach (var pair in result.WriteResults) {
@@ -449,6 +451,7 @@ public static class CreateAssetBundles {
 		// }
 
 		Debug.Log($"[Editor]: Finished building {platform} asset bundles in {sw.Elapsed.TotalSeconds} seconds.");
+
 		return true;
 	}
 

package/Editor/Packages/AirshipPackagesWindow.cs

@@ -382,10 +382,17 @@ namespace Editor.Packages {
 
             List<AirshipPlatform> platforms = new() {
                 AirshipPlatform.iOS,
-                AirshipPlatform.Mac,
-                AirshipPlatform.Windows,
                 AirshipPlatform.Android,
             };
+            // We want to end up on our editor machine's platform
+#if UNITY_EDITOR_OSX
+            platforms.Add(AirshipPlatform.Windows);
+            platforms.Add(AirshipPlatform.Mac);
+#else
+		platforms.Add(AirshipPlatform.Mac);
+		platforms.Add(AirshipPlatform.Windows);
+#endif
+
             // Uncomment to just build iOS
             if (isCoreMaterials) {
                 platforms.Clear();
@@ -733,7 +740,7 @@ namespace Editor.Packages {
             }
 
             var android = ModuleUtil.IsModuleInstalled(BuildTarget.Android);
-            if (!iOS) {
+            if (!android) {
                 Debug.LogError("Android Build Support module not found.");
             }
             return mac && windows && iOS && android;

package/Editor/Publish/Deploy.cs

@@ -42,20 +42,21 @@ public class Deploy {
 		// NetworkPrefabManager.WriteAllCollections();
 		// Sort the current platform first to speed up build time
 		List<AirshipPlatform> platforms = new();
-		var gameConfig = GameConfig.Load();
-		if (gameConfig.supportsMobile) {
-			platforms.Add(AirshipPlatform.iOS);
-			platforms.Add(AirshipPlatform.Android);
-		}
 
-		// We want to end up on our editor machine's platform
 #if UNITY_EDITOR_OSX
 		platforms.Add(AirshipPlatform.Windows);
 		platforms.Add(AirshipPlatform.Mac);
 #else
-		platforms.Add(AirshipPlatform.Mac);
 		platforms.Add(AirshipPlatform.Windows);
+		platforms.Add(AirshipPlatform.Mac);
 #endif
+
+		var gameConfig = GameConfig.Load();
+		if (gameConfig.supportsMobile) {
+			platforms.Add(AirshipPlatform.iOS);
+			platforms.Add(AirshipPlatform.Android);
+		}
+
 		EditorCoroutines.Execute((BuildAndDeploy(platforms.ToArray(), false)));
 	}
 
@@ -262,6 +263,8 @@ public class Deploy {
 				Debug.Log("Cancelled publish.");
 				yield break;
 			}
+
+			yield return null;
 		}
 
 		if (EditorIntegrationsConfig.instance.buildWithoutUpload) {
@@ -445,6 +448,9 @@ public class Deploy {
 			}
 		}
 
+		// Switch back to starting build target
+		EditorUserBuildSettings.SwitchActiveBuildTarget(startingBuildGroup, startingBuildTarget);
+
 		var slug = activeDeployTarget.slug;
 		if (slug == null) {
 			slug = activeDeployTarget.id;
@@ -463,8 +469,6 @@ public class Deploy {
 		}
 
 		if (shouldResumeTypescriptWatch) TypescriptCompilationService.StartCompilerServices();
-		// Switch back to starting build target
-		// EditorUserBuildSettings.SwitchActiveBuildTarget(startingBuildGroup, startingBuildTarget);
 	}
 	
 	private static IEnumerator UploadSingleGameFile(string url, string filePath, AirshipPlatform? platform, bool absolutePath = false) {

package/Runtime/Code/AirAssetBundle/AirAssetBundle.cs

@@ -79,9 +79,9 @@ namespace Code.AirAssetBundle {
 
             AssetBundle bundle = DownloadHandlerAssetBundle.GetContent(req);
             // Uncomment to list all assets inside the bundle.
-            foreach (var asset in bundle.GetAllAssetNames()) {
-                Debug.Log("  - " + asset);
-            }
+            // foreach (var asset in bundle.GetAllAssetNames()) {
+            //     Debug.Log("  - " + asset);
+            // }
             var loadReq = bundle.LoadAssetAsync<AirAssetBundle>("_AirAssetBundle");
             await loadReq;
             var airAssetBundle = (AirAssetBundle) loadReq.asset;

package/Runtime/Code/Analytics/AnalyticsForwarder.cs

@@ -1,9 +1,9 @@
 using System.Collections.Generic;
 using System.Linq;
 using Code.Bundles;
-using Code.Platform.Shared;
 using Code.Platform.Server;
 using Code.Platform.Client;
+using Code.Platform.Shared;
 using UnityEngine;
 
 namespace Code.Analytics {
@@ -32,7 +32,7 @@ namespace Code.Analytics {
             AnalyticsServiceServerBackend.SendServerAnalytics(message).ContinueWith((t) => {
                 isAlreadySending = false;
                 if (!t.Result.success) {
-                    Debug.LogError("airship-analytics-forwarder - Failed to send error analytics: " + t.Result.error);
+                    Debug.LogWarning("airship-analytics-forwarder - Failed to send error analytics: " + t.Result.error);
                 }
             });
 #endif
@@ -53,7 +53,7 @@ namespace Code.Analytics {
             AnalyticsServiceClient.SendClientAnalytics(message).ContinueWith((t) => {
                 isAlreadySending = false;
                 if (!t.Result.success) {
-                    Debug.LogError("airship-analytics-forwarder - Failed to send error analytics: " + t.Result.error);
+                    Debug.LogWarning("airship-analytics-forwarder - Failed to send error analytics: " + t.Result.error);
                 }
             });
 #endif

package/Runtime/Code/Bootstrap/ClientBundleLoader.cs

@@ -67,6 +67,8 @@ namespace Code.Bootstrap {
         private List<LuauScriptsDto> scriptsDtos = new();
         private string scriptsHash;
 
+        private int setupClientSessionCounter = 0;
+
         /// <summary>
         /// Client downloads and combines all LuauScriptDto objects into this single dto.
         /// This is then serialized to disk as a cache.
@@ -154,6 +156,8 @@ namespace Code.Bootstrap {
         /// 5. Receive SceneMessage
         /// 6. NetworkClient.Ready()
         public async void SetupClient() {
+            this.setupClientSessionCounter++;
+            var session = this.setupClientSessionCounter;
             this.scriptsReady = false;
             this.packagesReady = false;
             this.isFinishedPreparing = false;
@@ -196,7 +200,7 @@ namespace Code.Bootstrap {
                 }
 
                 if (data.final) {
-                    print("scripts hash: " + data.hash);
+                    // print("scripts hash: " + data.hash);
                     try {
                         var writer = new NetworkWriter();
                         writer.WriteLuauScriptsDto(data.scriptsDto);
@@ -218,6 +222,9 @@ namespace Code.Bootstrap {
             while (!NetworkClient.isConnected) {
                 await Awaitable.NextFrameAsync();
             }
+
+            if (this.setupClientSessionCounter != session) return;
+
             NetworkClient.Send(new GreetingMessage());
         }
 

package/Runtime/Code/Bootstrap/ServerBootstrap.cs

@@ -11,6 +11,7 @@ using Code.Bootstrap;
 using Code.GameBundle;
 using Code.Http.Internal;
 using Code.Platform.Shared;
+using Code.State;
 using JetBrains.Annotations;
 using kcp2k;
 using Mirror;
@@ -62,11 +63,6 @@ public class ServerBootstrap : MonoBehaviour
 
     private GameServer gameServer;
 
-    /// <summary>
-    /// When set, this will be used as the starting scene.
-    /// </summary>
-    public static string editorStartingSceneIntent;
-
     [NonSerialized] public bool isServerReady = false;
     public event Action OnStartLoadingGame;
     public event Action OnServerReady;
@@ -85,7 +81,7 @@ public class ServerBootstrap : MonoBehaviour
 #endif
     }
 
-	private void Start() {
+	private async void Start() {
 		if (!RunCore.IsServer()) {
 			return;
 		}
@@ -128,6 +124,11 @@ public class ServerBootstrap : MonoBehaviour
 				// print("Listening on port " + transport.port);
 				AirshipNetworkManager.singleton.StartHost();
 			} else {
+
+				// print("waiting 2 seconds...");
+				// await Awaitable.WaitForSecondsAsync(2);
+				// print("starting server.");
+
 				AirshipNetworkManager.singleton.StartServer();
 				Application.logMessageReceived += AnalyticsRecorder.RecordLogMessageToAnalytics;
 			}
@@ -192,6 +193,7 @@ public class ServerBootstrap : MonoBehaviour
 
 #if UNITY_EDITOR
 		var gameConfig = GameConfig.Load();
+		var editorStartingSceneIntent = EditorSessionState.GetString("AirshipEditorStartingSceneName");
 		if (!string.IsNullOrEmpty(editorStartingSceneIntent)) {
 			startupConfig.StartingSceneName = editorStartingSceneIntent;
 		} else {

package/Runtime/Code/Bundles/SystemRoot.cs

@@ -326,14 +326,16 @@ public class SystemRoot : Singleton<SystemRoot> {
 
 			// Shader Variant Collections
 			if (!preWarmedCoreShaders && RunCore.IsClient()) {
-// #if !UNITY_IOS && !UNITY_ANDROID
+#if !UNITY_IOS && !UNITY_ANDROID && !UNITY_EDITOR
 				preWarmedCoreShaders = true;
 				string[] collections = new[] {
 					"MainMenu",
 					// "RacingGame",
-					"BWShaderVariants 1 (Raven)",
+					// "BWShaderVariants 1 (Raven)",
 				};
+				int totalCounter = 0;
 				foreach (var collectionName in collections) {
+					onLoadingScreenStep?.Invoke($"Prewarming shaders (1)");
 					var path = $"Assets/AirshipPackages/@Easy/CoreMaterials/ShaderVariantCollections/{collectionName}.shadervariants".ToLower();
 					Debug.Log("Loading shader variant: " + collectionName);
 					if (this.coreMaterialsAssetBundle == null) {
@@ -354,13 +356,15 @@ public class SystemRoot : Singleton<SystemRoot> {
 						int step = 1;
 						while (!col.WarmUpProgressively(step)) {
 							variantCounter += step;
+							totalCounter += step;
+							onLoadingScreenStep?.Invoke($"Prewarming shaders ({totalCounter + 1})");
 							Debug.Log($"Prewarm in progress ({collectionName}): {variantCounter}");
 							yield return null;
 						}
 						Debug.Log("Prewarmed " + collectionName + " in " + st.ElapsedMilliseconds + "ms");
 					}
 				}
-// #endif
+#endif
 			}
 		} else {
 			if (NetworkClient.isConnected) {

package/Runtime/Code/Luau/AirshipComponent.cs

@@ -105,6 +105,15 @@ public class AirshipComponent : MonoBehaviour {
 		}
 		
 #if !UNITY_EDITOR || AIRSHIP_PLAYER
+		if (LuauScript.AssetBridge == null) {
+			Debug.LogError("Cannot start script: AssetBridge not yet initialized", gameObject);
+			return;
+		}
+		if (ReferenceEquals(script, null)) {
+			Debug.LogError($"Cannot start script: 'script' property is null (GameObject: {gameObject.name})", gameObject);
+			return;
+		}
+		
 		// Grab the script from code.zip at runtime
 		var runtimeScript = LuauScript.AssetBridge.GetBinaryFileFromLuaPath<AirshipScript>(script.m_path.ToLower());
 		if (runtimeScript) {

package/Runtime/Code/Network/AirshipNetworkManager.cs

@@ -116,8 +116,14 @@ public class AirshipNetworkManager : NetworkManager {
         await ao;
 
         var scene = SceneManager.GetSceneByName(sceneName);
+        if (!scene.IsValid()) {
+            scene = SceneManager.GetSceneByPath(sceneName);
+        }
+        
         if (scene.IsValid() && scene.isLoaded) {
             SceneManager.SetActiveScene(scene);
+        } else {
+            Debug.LogWarning($"SetSceneActiveOnceLoaded \"{sceneName}\" failed to be set as active scene");
         }
     }
 

package/Runtime/Code/Player/Accessories/AccessoryBuilder.cs

@@ -173,6 +173,7 @@ public class AccessoryBuilder : MonoBehaviour {
             }
 
             if (Application.isPlaying) {
+                lod.rootTransform.gameObject.SetActive(false);
                 Destroy(lod.rootTransform.gameObject);
             } else {
                 DestroyImmediate(lod.rootTransform.gameObject);
@@ -184,6 +185,7 @@ public class AccessoryBuilder : MonoBehaviour {
         }
 
         if (Application.isPlaying) {
+            activeAccessory.rootTransform.gameObject.SetActive(false);
             Destroy(activeAccessory.rootTransform.gameObject);
         } else {
             DestroyImmediate(activeAccessory.rootTransform.gameObject);

package/Runtime/Code/Player/Character/MovementSystem/CharacterMovement.cs

@@ -203,7 +203,7 @@ public class CharacterMovement : NetworkBehaviour {
         //Only the owner can control
         hasMovementAuth = isOwned || (isServer && (netIdentity.connectionToClient == null || isServerAuth));
 
-        //Have to manualy control the flow of data
+        //Have to manually control the flow of data
         if (networkTransform) {
             if (isServerOnly) {
                 networkTransform.syncDirection

package/Runtime/Code/Player/PlayerManagerBridge.cs

@@ -73,11 +73,18 @@ namespace Code.Player {
 			this.serverBootstrap = FindFirstObjectByType<ServerBootstrap>();
 		}
 
-		private void Start() {
+		private async void Start() {
+			// print("PlayerManagerBridge.start");
+
+			// print("PlayerManagerBridge: server is ready.");
 			if (RunCore.IsServer()) {
+				while (!serverBootstrap.isServerReady) {
+					await Awaitable.NextFrameAsync();
+				}
 				foreach (var connection in NetworkServer.connections.Values) {
 					NetworkServer_OnConnected(connection);
 				}
+
 				NetworkServer.OnConnectedEvent += NetworkServer_OnConnected;
 
 				if (this.serverBootstrap && this.serverBootstrap.IsAgonesEnvironment())
@@ -189,6 +196,7 @@ namespace Code.Player {
 			}
 
 			while (!conn.isAuthenticated || !conn.isReady) {
+				// print($"Waiting for {conn.connectionId} to be ready.");
 				await Awaitable.NextFrameAsync();
 			}
 
@@ -207,7 +215,7 @@ namespace Code.Player {
 				Debug.Log("Missing UserData for " + conn);
 #endif
 			}
-			NetworkServer.Spawn(go, conn);
+			// NetworkServer.Spawn(go, conn);
 			NetworkServer.AddPlayerForConnection(conn, go);
 
 			var playerInfoDto = playerInfo.BuildDto();
@@ -216,6 +224,10 @@ namespace Code.Player {
 			OnPlayerAdded?.Invoke(playerInfoDto);
 			playerChanged?.Invoke(playerInfoDto, (object)true);
 
+			if (RunCore.IsServer() && !RunCore.IsClient()) {
+				Debug.Log(playerInfo.username + " joined the server.");
+			}
+
 			if (this.agones) {
 				await this.agones.AppendListValue(AGONES_PLAYERS_LIST_NAME, $"{playerInfo.userId}");
 			}

package/Runtime/Code/RemoteConsole/ServerConsole.cs

@@ -87,7 +87,7 @@ namespace Code.RemoteConsole {
                         stackTrace = stackTrace,
                         time = time,
                     };
-                    NetworkServer.SendToAll(packet);
+                    NetworkServer.SendToAll(packet, Channels.Reliable, true);
                 }
             }
         }

package/Runtime/Code/VoxelWorld/Editor/BuildTools/MirrorPlacementMod.cs

@@ -11,7 +11,7 @@ public class MirrorPlacementMod : VoxelPlacementModifier {
     }
     
     public override string GetName() {
-        return "Mirror";
+        return "Flip";
     }
 
     public override void OnPlaceVoxels(VoxelWorld world, HashSet<Vector3Int> positions) {

package/Runtime/Code/VoxelWorld/Editor/SelectionZone.cs

@@ -397,7 +397,6 @@ public class SelectionZoneEditor : UnityEditor.Editor
         {
             return;
         }
-        VoxelEditManager voxelEditManager = VoxelEditManager.Instance;
 
         //Add Copy Button
         if (GUILayout.Button("Fill"))
@@ -428,7 +427,7 @@ public class SelectionZoneEditor : UnityEditor.Editor
                         }
                     }
                 }
-                voxelEditManager.AddEdits(cube.voxelWorld, edits, "Fill Voxels");
+                VoxelEditManager.AddEdits(cube.voxelWorld, edits, "Fill Voxels");
             }
         }
 
@@ -463,7 +462,7 @@ public class SelectionZoneEditor : UnityEditor.Editor
                         }
                     }
                 }
-                voxelEditManager.AddEdits(cube.voxelWorld, edits, "Replace Voxels");
+                VoxelEditManager.AddEdits(cube.voxelWorld, edits, "Replace Voxels");
             }
         }
 
@@ -504,7 +503,7 @@ public class SelectionZoneEditor : UnityEditor.Editor
                             {
                                 List<VoxelEditAction.EditInfo> edits = new();
                                 edits.Add(new VoxelEditAction.EditInfo(new Vector3Int(x, y, z), data, 0));
-                                voxelEditManager.AddEdits(cube.voxelWorld, edits, "Cut Voxels");
+                                VoxelEditManager.AddEdits(cube.voxelWorld, edits, "Cut Voxels");
                             }
                         }
                     }
@@ -585,7 +584,7 @@ public class SelectionZoneEditor : UnityEditor.Editor
                             }
                         }
                     }
-                    voxelEditManager.AddEdits(cube.voxelWorld, edits, "Paste Voxels");
+                    VoxelEditManager.AddEdits(cube.voxelWorld, edits, "Paste Voxels");
                 }
 
                 //resize the box to whatever we pasted

package/Runtime/Code/VoxelWorld/Editor/VoxelWorldEditor.cs

@@ -41,14 +41,14 @@ public class VoxelEditAction {
 public class VoxelEditMarker : ScriptableObject {
     public VoxelEditAction lastAction;
 }
-public class VoxelEditManager : Singleton<VoxelEditManager> {
-    public Dictionary<string, VoxelPlacementModifier> placementModifiers = new();
-    public bool buildModsEnabled = false;
-    VoxelEditMarker undoObject;
-    public List<VoxelEditAction> edits = new List<VoxelEditAction>();
-    public List<VoxelEditAction> redos = new List<VoxelEditAction>();
-
-    private HashSet<Vector3Int> WriteVoxel(VoxelWorld world, Vector3Int position, ushort num) {
+public class VoxelEditManager {
+    public static Dictionary<string, VoxelPlacementModifier> placementModifiers = new();
+    public static bool buildModsEnabled = false;
+    static VoxelEditMarker undoObject;
+    public static List<VoxelEditAction> edits = new List<VoxelEditAction>();
+    public static List<VoxelEditAction> redos = new List<VoxelEditAction>();
+
+    private static HashSet<Vector3Int> WriteVoxel(VoxelWorld world, Vector3Int position, ushort num) {
         var positionSet = new HashSet<Vector3Int>() { position };
         if (buildModsEnabled) {
             foreach (var (id, modifier) in placementModifiers) {
@@ -62,7 +62,7 @@ public class VoxelEditManager : Singleton<VoxelEditManager> {
         return positionSet;
     }
     
-    public HashSet<Vector3Int> ColorVoxel(VoxelWorld world, Vector3Int position, Color col) {
+    public static HashSet<Vector3Int> ColorVoxel(VoxelWorld world, Vector3Int position, Color col) {
         var positionSet = new HashSet<Vector3Int>() { position };
         if (buildModsEnabled) {
             foreach (var (id, modifier) in placementModifiers) {
@@ -76,7 +76,7 @@ public class VoxelEditManager : Singleton<VoxelEditManager> {
         return positionSet;
     }
         
-    public void AddEdit(VoxelWorld world, Vector3Int position, ushort oldValue, ushort newValue, string name) {
+    public static void AddEdit(VoxelWorld world, Vector3Int position, ushort oldValue, ushort newValue, string name) {
         VoxelEditAction edit = new VoxelEditAction();
         edit.CreateSingleEdit(world, position, oldValue, newValue);
         edits.Add(edit);
@@ -99,7 +99,7 @@ public class VoxelEditManager : Singleton<VoxelEditManager> {
         world.hasUnsavedChanges = true; 
     }
 
-    public void AddEdits(VoxelWorld world, List<EditInfo> editInfos, string name) {
+    public static void AddEdits(VoxelWorld world, List<EditInfo> editInfos, string name) {
         VoxelEditAction edit = new VoxelEditAction();
         edit.CreateMultiEdit(world, editInfos);
         edits.Add(edit);
@@ -129,11 +129,9 @@ public class VoxelEditManager : Singleton<VoxelEditManager> {
     //Constructor
     public VoxelEditManager() {
         Undo.undoRedoEvent += UndoRedoEvent;
-       
     }
     
-    public void UndoRedoEvent(in UndoRedoInfo info) {
-
+    public static void UndoRedoEvent(in UndoRedoInfo info) {
         if (info.isRedo == false) {
             if (edits.Count > 0) {
                 VoxelEditAction edit = edits[edits.Count - 1];
@@ -152,8 +150,7 @@ public class VoxelEditManager : Singleton<VoxelEditManager> {
 
                 redos.Add(edit);
             }
-        }
-        else {
+        } else {
             if (redos.Count > 0) {
                 VoxelEditAction edit = redos[redos.Count - 1];
                 redos.RemoveAt(redos.Count - 1);
@@ -167,16 +164,12 @@ public class VoxelEditManager : Singleton<VoxelEditManager> {
                     }
                     currentWorld.hasUnsavedChanges = true;
                 }
-
                 edits.Add(edit);
             }
         }
-        
     }
 }
 
-
-
 [CustomEditor(typeof(VoxelWorld))]
 public class VoxelWorldEditor : UnityEditor.Editor {
     private static readonly string DefaultBlockDefinesPath = "Assets/Bundles/@Easy/Survival/Shared/Resources/VoxelWorld/SurvivalBlockDefines.xml";
@@ -416,13 +409,13 @@ public class VoxelWorldEditor : UnityEditor.Editor {
         }
 
         EditorGUILayout.LabelField("Build Mods", EditorStyles.boldLabel);
-        VoxelEditManager.Instance.buildModsEnabled =
-            GUILayout.Toggle(VoxelEditManager.Instance.buildModsEnabled, "Enabled");
+        VoxelEditManager.buildModsEnabled =
+            GUILayout.Toggle(VoxelEditManager.buildModsEnabled, "Enabled");
         // placementModsOpen = EditorGUILayout.Foldout(placementModsOpen, "Build Mods");
         // if (placementModsOpen) {
-        GUI.enabled = VoxelEditManager.Instance.buildModsEnabled;
+        GUI.enabled = VoxelEditManager.buildModsEnabled;
         EditorGUI.indentLevel++;
-        var enabledMods = VoxelEditManager.Instance.placementModifiers;
+        var enabledMods = VoxelEditManager.placementModifiers;
         foreach (var placementMod in allPlacementModifiers) {
             var modName = placementMod.GetName();
             var modEnabledOld = enabledMods.ContainsKey(modName);
@@ -437,7 +430,7 @@ public class VoxelWorldEditor : UnityEditor.Editor {
             EditorGUI.indentLevel++;
             placementMod.OnInspectorGUI();
             EditorGUI.indentLevel--;
-            GUI.enabled = VoxelEditManager.Instance.buildModsEnabled;
+            GUI.enabled = VoxelEditManager.buildModsEnabled;
         }
         EditorGUI.indentLevel--;
         GUI.enabled = true;
@@ -704,10 +697,8 @@ public class VoxelWorldEditor : UnityEditor.Editor {
                         Vector3Int voxelPos = lastPos;
                         ushort oldValue =
                             world.GetVoxelAt(voxelPos); // Assuming you have a method to get the voxel value
-                             
-                        VoxelEditManager voxelEditManager = VoxelEditManager.Instance;
 
-                        voxelEditManager.AddEdit(world, voxelPos, oldValue, 0, "Delete Voxel");
+                        VoxelEditManager.AddEdit(world, voxelPos, oldValue, 0, "Delete Voxel");
 
                         if (leftControlDown == false) {
                             //Refresh the gizmo like we just moved the mouse here
@@ -728,15 +719,13 @@ public class VoxelWorldEditor : UnityEditor.Editor {
                             world.GetVoxelAt(voxelPos); // Assuming you have a method to get the voxel value
                         ushort newValue = (ushort)world.selectedBlockIndex;
 
-                        VoxelEditManager voxelEditManager = VoxelEditManager.Instance;
-
                         var def = world.voxelBlocks.GetBlock(newValue);
 
                         if (def.definition.rotatedPlacement) {
                             newValue = (ushort)VoxelWorld.SetVoxelFlippedBits(newValue, (int)placementFlip);
                         } 
 
-                        voxelEditManager.AddEdit(world, voxelPos, oldValue, newValue,
+                        VoxelEditManager.AddEdit(world, voxelPos, oldValue, newValue,
                             "Add Voxel " + def.definition.name);
 
                          
@@ -772,7 +761,7 @@ public class VoxelWorldEditor : UnityEditor.Editor {
                         if (oldColor.r == 0) colIncr = 1; // If just being lightly painted to mark as receiving color
                         newCol = new Color32((byte) (Math.Min(oldColor.r + colIncr, 255)), oldColor.g, oldColor.b, oldColor.a);
                     }
-                    VoxelEditManager.Instance.ColorVoxel(world, voxelPos, newCol);
+                    VoxelEditManager.ColorVoxel(world, voxelPos, newCol);
                 }
             }
         }
@@ -789,7 +778,7 @@ public class VoxelWorldEditor : UnityEditor.Editor {
                     if (oldBlockId > 0) {
                         var edits = new List<EditInfo>();
                         PaintBucket(world, edits, lastPos, oldValue, (ushort) world.selectedBlockIndex, new HashSet<Vector3>());
-                        VoxelEditManager.Instance.AddEdits(world, edits, "Paint Bucket");
+                        VoxelEditManager.AddEdits(world, edits, "Paint Bucket");
                     }
                 }
             }
@@ -816,12 +805,10 @@ public class VoxelWorldEditor : UnityEditor.Editor {
                     flipBits %= 8;
                     newValue = (ushort)VoxelWorld.SetVoxelFlippedBits(newValue, flipBits);
 
-                    VoxelEditManager voxelEditManager = VoxelEditManager.Instance;
-
                     var def = world.voxelBlocks.GetBlock(newValue);
 
                     //newValue = (ushort)VoxelWorld.SetVoxelFlippedBits(newValue, 0x04  );
-                    voxelEditManager.AddEdit(world, lastPos, oldValue, newValue, "Flip Voxel " + def.definition.name);
+                    VoxelEditManager.AddEdit(world, lastPos, oldValue, newValue, "Flip Voxel " + def.definition.name);
                 }
                 //Refresh the view
                 UpdateHandlePosition(world);

package/Runtime/Resources/Img/spinner-third-sharp-solid.png.meta

@@ -6,7 +6,7 @@ TextureImporter:
   serializedVersion: 13
   mipmaps:
     mipMapMode: 0
-    enableMipMap: 1
+    enableMipMap: 0
     sRGBTexture: 1
     linearTexture: 0
     fadeOut: 0

package/ThirdParty/Mirror/Core/NetworkClient.cs

@@ -666,8 +666,8 @@ namespace Mirror
 
             if (prefabs.ContainsKey(prefab.assetId))
             {
-                GameObject existingPrefab = prefabs[prefab.assetId];
-                Debug.LogWarning($"Replacing existing prefab with assetId '{prefab.assetId}'. Old prefab '{existingPrefab.name}', New prefab '{prefab.name}'");
+                // GameObject existingPrefab = prefabs[prefab.assetId];
+                // Debug.LogWarning($"Replacing existing prefab with assetId '{prefab.assetId}'. Old prefab '{existingPrefab.name}', New prefab '{prefab.name}'");
             }
 
             if (spawnHandlers.ContainsKey(prefab.assetId) || unspawnHandlers.ContainsKey(prefab.assetId))

package/ThirdParty/Mirror/Core/NetworkMessages.cs

@@ -90,6 +90,7 @@ namespace Mirror
         public static void Pack<T>(T message, NetworkWriter writer)
             where T : struct, NetworkMessage
         {
+            // Debug.Log($"Packing msgId={NetworkMessageId<T>.Id}");
             writer.WriteUShort(NetworkMessageId<T>.Id);
             writer.Write(message);
         }

package/ThirdParty/Mirror/Core/NetworkServer.cs

@@ -924,6 +924,8 @@ namespace Mirror
             NetworkMessages.Lookup[msgType] = typeof(T);
 
             handlers[msgType] = NetworkMessages.WrapHandler(handler, requireAuthentication, exceptionsDisconnect);
+
+            // Debug.Log($"Registered handler id={msgType}");
         }
 
         /// <summary>Register a handler for message type T. Most should require authentication.</summary>
@@ -941,6 +943,7 @@ namespace Mirror
             NetworkMessages.Lookup[msgType] = typeof(T);
 
             handlers[msgType] = NetworkMessages.WrapHandler(handler, requireAuthentication, exceptionsDisconnect);
+            // Debug.Log($"Registered handler id={msgType}");
         }
 
         /// <summary>Replace a handler for message type T. Most should require authentication.</summary>

package/ThirdParty/UiRoundedCorners/ImageWithRoundedCorners.cs

@@ -67,7 +67,7 @@ namespace Nobi.UiRoundedCorners {
 				if (shader == null) return;
 				
 				material = new Material(shader) {
-					hideFlags = HideFlags.DontSave
+					// hideFlags = HideFlags.DontSave
 				};
 			}
 

package/ThirdParty/UniVoice/Runtime/ChatroomAgent.cs

@@ -151,7 +151,7 @@ namespace Adrenak.UniVoice {
 
         void Log(string tag, string msg) {
             if (!Application.isEditor) {
-                Debug.Log($"[{tag}] {msg}");
+                // Debug.Log($"[{tag}] {msg}");
             }
         }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gg.easy.airship",
-  "version": "0.1.2112",
+  "version": "0.1.2113",
   "displayName": "Airship",
   "unity": "2021.3",
   "unityRelease": "12f1",