gg.easy.airship 0.1.2137 → 0.1.2139

package/Runtime/Code/Player/Character/MovementSystems/Character/Structures/CharacterSnapshotData.cs

@@ -2,8 +2,7 @@ using System;
 using Assets.Luau;
 using Code.Network.StateSystem;
 using Code.Network.StateSystem.Structures;
-using Code.Player.Character.Net;
-using Mirror.BouncyCastle.Asn1.X9;
+using Mirror;
 using UnityEngine;
 
 namespace Code.Player.Character.MovementSystems.Character
@@ -11,24 +10,23 @@ namespace Code.Player.Character.MovementSystems.Character
     [LuauAPI]
     public class CharacterSnapshotData : StateSnapshot
     {
-        public Vector3 position;
-        public Vector3 velocity;
-        public Vector3 lookVector;
-        
-        public float currentSpeed;
-        public float speedModifier = 1; // Not used yet
         public bool inputDisabled;
         public bool isFlying;
         public bool isSprinting;
-        public int jumpCount;
         public bool airborneFromImpulse;
-        public bool alreadyJumped; //Only lets the character jump once until the jump key is released
-        
+        public bool alreadyJumped;
         public bool isCrouching;
         public bool prevStepUp;
         public bool isGrounded;
+        
+        public Vector3 position;
+        public Vector3 velocity;
+        public Vector3 lookVector;
+        
+        public float currentSpeed;
+        public float speedModifier = 1; // Not used yet
+        public byte jumpCount;
         public CharacterState state = CharacterState.Idle;
-        public CharacterState prevState = CharacterState.Idle;
         public float timeSinceBecameGrounded;
         public float timeSinceWasGrounded;
         public float timeSinceJump;
@@ -73,7 +71,6 @@ namespace Code.Player.Character.MovementSystems.Character
             if (isGrounded != other.isGrounded)
                 message += $"prevGrounded: {isGrounded} != {other.isGrounded}\n";
             if (state != other.state) message += $"state: {state} != {other.state}\n";
-            if (prevState != other.prevState) message += $"prevState: {prevState} != {other.prevState}\n";
             
             var same =  this.lastProcessedCommand == other.lastProcessedCommand && this.position == other.position &&
                         this.velocity == other.velocity && this.currentSpeed == other.currentSpeed && this.speedModifier == other.speedModifier &&
@@ -82,8 +79,7 @@ namespace Code.Player.Character.MovementSystems.Character
                         airborneFromImpulse == other.airborneFromImpulse &&
                         alreadyJumped == other.alreadyJumped
                         && isCrouching == other.isCrouching && prevStepUp == other.prevStepUp &&
-                        isGrounded == other.isGrounded && state == other.state
-                        && prevState == other.prevState;
+                        isGrounded == other.isGrounded && state == other.state;
 
             if (same)
             {
@@ -110,7 +106,6 @@ namespace Code.Player.Character.MovementSystems.Character
             this.timeSinceJump = copySnapshot.timeSinceJump;
             this.timeSinceWasGrounded = copySnapshot.timeSinceWasGrounded;
             this.timeSinceBecameGrounded = copySnapshot.timeSinceBecameGrounded;
-            this.prevState = copySnapshot.prevState;
             this.state = copySnapshot.state;
             this.isGrounded = copySnapshot.isGrounded;
             this.prevStepUp = copySnapshot.prevStepUp;
@@ -133,7 +128,7 @@ namespace Code.Player.Character.MovementSystems.Character
 
         public override string ToString()
         {
-            return "Pos: " + this.position + " Vel: " + velocity;
+            return "Last cmd#" + this.lastProcessedCommand + " time: " + this.time + "Pos: " + this.position + " Vel: " + velocity;
         }
 
         public override object Clone()
@@ -149,8 +144,7 @@ namespace Code.Player.Character.MovementSystems.Character
                 timeSinceJump = timeSinceJump,
                 timeSinceWasGrounded = timeSinceWasGrounded,
                 timeSinceBecameGrounded = timeSinceBecameGrounded,
-                prevState = prevState,
-                state = state,
+                state = state, 
                 isGrounded = isGrounded,
                 prevStepUp = prevStepUp,
                 isCrouching = isCrouching,
@@ -169,4 +163,79 @@ namespace Code.Player.Character.MovementSystems.Character
             };
         }
     }
+
+    public static class CharacterSnapshotDataSerializer {
+        public static void WriteCharacterSnapshotData(this NetworkWriter writer, CharacterSnapshotData value) {
+            byte bools = 0;
+            SetBit(ref bools, 0, value.inputDisabled);
+            SetBit(ref bools, 1, value.isFlying);
+            SetBit(ref bools, 2, value.isSprinting);
+            SetBit(ref bools, 3, value.airborneFromImpulse);
+            SetBit(ref bools, 4, value.alreadyJumped);
+            SetBit(ref bools, 5, value.isCrouching);
+            SetBit(ref bools, 6, value.prevStepUp);
+            SetBit(ref bools, 7, value.isGrounded);
+            writer.Write(bools);
+            
+            writer.WriteInt(value.customData.dataSize);
+            writer.WriteBytes(value.customData.data, 0, value.customData.data.Length);
+            
+            writer.Write(value.time);
+            writer.Write(value.lastProcessedCommand);
+            writer.Write(value.position);
+            writer.Write(value.velocity);
+            writer.Write((short)(value.lookVector.x * 1000f));
+            writer.Write((short)(value.lookVector.y * 1000f));
+            writer.Write((short)(value.lookVector.z * 1000f));
+            writer.Write(value.currentSpeed);
+            // This makes our max speed modifier 65.535 with a 0.001 precision.
+            writer.Write((ushort) Math.Clamp(value.speedModifier * 1000f, 0, ushort.MaxValue));
+            writer.Write((byte) Math.Min(Math.Floor(value.timeSinceJump / Time.fixedDeltaTime), 255));
+            writer.Write((byte) Math.Min(Math.Floor(value.timeSinceWasGrounded / Time.fixedDeltaTime), 255));
+            writer.Write((byte) Math.Min(Math.Floor(value.timeSinceBecameGrounded / Time.fixedDeltaTime), 255));
+            writer.Write((byte) value.state);
+            writer.Write(value.jumpCount);
+        }
+
+        public static CharacterSnapshotData ReadCharacterSnapshotData(this NetworkReader reader) {
+            var bools = reader.Read<byte>();
+            var customDataSize = reader.ReadInt();
+            var customDataArray = reader.ReadBytes(customDataSize);
+            var customData = new BinaryBlob(customDataArray);
+            return new CharacterSnapshotData() {
+                inputDisabled = GetBit(bools, 0),
+                isFlying = GetBit(bools, 1),
+                isSprinting = GetBit(bools, 2),
+                airborneFromImpulse = GetBit(bools, 3),
+                alreadyJumped = GetBit(bools, 4),
+                isCrouching = GetBit(bools, 5),
+                prevStepUp = GetBit(bools, 6),
+                isGrounded = GetBit(bools, 7),
+                
+                time = reader.Read<double>(),
+                lastProcessedCommand = reader.Read<int>(),
+                position = reader.Read<Vector3>(),
+                velocity = reader.Read<Vector3>(),
+                lookVector = new Vector3(reader.Read<short>() / 1000f, reader.Read<short>() / 1000f, reader.Read<short>() / 1000f),
+                currentSpeed = reader.Read<float>(),
+                speedModifier = reader.Read<ushort>() / 1000f,
+                timeSinceJump = reader.Read<byte>() * Time.fixedDeltaTime,
+                timeSinceWasGrounded = reader.Read<byte>() * Time.fixedDeltaTime,
+                timeSinceBecameGrounded = reader.Read<byte>() * Time.fixedDeltaTime,
+                state = (CharacterState) reader.Read<byte>(),
+                jumpCount = reader.Read<byte>(),
+                customData = customData,
+            };
+        }
+        
+        private static bool GetBit(byte bools, int bit) => (bools & (1 << bit)) != 0;
+
+        private static void SetBit(ref byte bools, int bit, bool value)
+        {
+            if (value)
+                bools |= (byte)(1 << bit);
+            else
+                bools &= (byte)~(1 << bit);
+        }
+    }
 }

package/Runtime/Code/Player/PlayerInfo.cs

@@ -10,6 +10,7 @@ public class PlayerInfoDto {
 	public string userId;
 	public string username;
 	public string profileImageId;
+	public string orgRoleName;
 	public GameObject gameObject;
 }
 
@@ -19,6 +20,7 @@ public class PlayerInfo : NetworkBehaviour {
 	[SyncVar] public string username;
 	[SyncVar] public int connectionId;
 	[SyncVar] public string profileImageId;
+	[SyncVar] public string orgRoleName;
 	public AudioSource voiceChatAudioSource;
 
 	private void Start() {
@@ -26,13 +28,14 @@ public class PlayerInfo : NetworkBehaviour {
 		PlayerManagerBridge.Instance.AddPlayer(this);
 	}
 
-	public void Init(int connectionId, string userId, string username, string profileImageId) {
+	public void Init(int connectionId, string userId, string username, string profileImageId, string orgRoleName) {
 		this.gameObject.name = "Player_" + username;
 		this.connectionId = connectionId;
 		this.userId = userId;
 		this.username = username;
 		this.profileImageId = profileImageId;
-
+		this.orgRoleName = orgRoleName;
+		
 		this.InitVoiceChat();
 	}
 
@@ -74,6 +77,7 @@ public class PlayerInfo : NetworkBehaviour {
 			userId = this.userId,
 			username = this.username,
 			profileImageId = this.profileImageId,
+			orgRoleName = this.orgRoleName,
 			gameObject = this.gameObject,
 		};
 	}

package/Runtime/Code/Player/PlayerManagerBridge.cs

@@ -28,7 +28,7 @@ namespace Code.Player {
 		public PlayerInfo localPlayer;
 		public bool localPlayerReady = false;
 
-		private List<PlayerInfo> players = new();
+		public List<PlayerInfo> players = new();
 
 		private int botPlayerIdCounter = 1;
 
@@ -175,7 +175,7 @@ namespace Code.Player {
 			var go = Instantiate(this.playerPrefab, Instance.transform.parent);
 
 			var playerInfo = go.GetComponent<PlayerInfo>();
-			playerInfo.Init(connectionId, userId, username, profilePictureId);
+			playerInfo.Init(connectionId, userId, username, profilePictureId, string.Empty);
 
 			// var identity = go.GetComponent<NetworkIdentity>();
 			NetworkServer.Spawn(go);
@@ -210,7 +210,7 @@ namespace Code.Player {
 // #if UNITY_SERVER || true
 // 				Debug.Log($"Initializing Player as {userData.username} owned by " + conn);
 // #endif
-				playerInfo.Init(conn.connectionId, userData.uid, userData.username, userData.profileImageId);
+				playerInfo.Init(conn.connectionId, userData.uid, userData.username, userData.profileImageId, userData.orgRoleName);
 			} else {
 #if UNITY_SERVER || true
 				Debug.Log("Missing UserData for " + conn);

package/Runtime/Code/Player/UserData.cs

@@ -3,5 +3,6 @@ public class UserData
     public string uid;
     public string username;
     public string profileImageId;
+    public string orgRoleName;
     public string fullTransferPacket;
 }

package/Runtime/Code/TSCodeGen/TypeGenerator.cs

@@ -334,7 +334,8 @@ public class TypeGenerator : MonoBehaviour
             "\\.MonoBehaviour$",
             "\\.InternalCameraScreenshotRecorder$",
             "\\.OcclusionCam$",
-            "\\.AirshipUniVoiceNetwork$"
+            "\\.AirshipUniVoiceNetwork$",
+            "\\.ServerConsole$",
         };
         
         var options = new TypeScriptOptions

package/Runtime/Code/VoxelWorld/VoxelWorld.cs

@@ -343,23 +343,6 @@ public partial class VoxelWorld : MonoBehaviour {
         return affectedChunk;
     }
 
-    public void WriteVoxelGroupAtTS(object blob, bool priority) {
-        var data = ((BinaryBlob)blob).GetDictionary();
-        Vector3[] positions = new Vector3[data.Count]; ;
-        double[] nums = new double[data.Count];
-
-        // Parse binaryblob
-        int i = 0;
-        foreach (var kvp in data) {
-            var values = kvp.Value as Dictionary<object, object>;
-            positions[i] = (Vector3)values["pos"];
-            nums[i] = Convert.ToDouble((byte)values["blockId"]);
-            i++;
-        }
-
-        this.WriteVoxelGroupAt(positions, nums, priority);
-    }
-
     public ushort[] BulkReadVoxels(Vector3[] positions) {
         var result = new ushort[positions.Length];
         for (var i = 0; i < positions.Length; i++) {

package/Runtime/Plugins/Mac/LuauPlugin.bundle/Contents/Info.plist

@@ -3,7 +3,7 @@
 <plist version="1.0">
 <dict>
 	<key>BuildMachineOSBuild</key>
-	<string>23H527</string>
+	<string>23H626</string>
 	<key>CFBundleDevelopmentRegion</key>
 	<string>en</string>
 	<key>CFBundleExecutable</key>

package/package.json

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

package/Runtime/Code/RemoteConsole/Airship.RemoteConsole.asmdef

@@ -1,26 +0,0 @@
-{
-    "name": "Airship.RemoteConsole",
-    "rootNamespace": "",
-    "references": [
-        "GUID:7c88a4a7926ee5145ad2dfa06f454c67",
-        "GUID:8db43d2f2329593428db90e3b3a6034c",
-        "GUID:3b7e0a4d14cc4c4b98380d63986903e1",
-        "GUID:5a902c5989fd2e74c9e7050e78d83db3",
-        "GameKit.Dependencies",
-        "GameKit.Utilities",
-        "GUID:894a6cc6ed5cd2645bb542978cbed6a9",
-        "GUID:33b0850c3f930a440abe6b01a9898921",
-        "GUID:103be11cab738ef4d849a96eca5df2eb",
-        "GUID:30817c1a0e6d646d99c048fc403f5979",
-        "GUID:325984b52e4128546bc7558552f8b1d2"
-    ],
-    "includePlatforms": [],
-    "excludePlatforms": [],
-    "allowUnsafeCode": false,
-    "overrideReferences": false,
-    "precompiledReferences": [],
-    "autoReferenced": true,
-    "defineConstraints": [],
-    "versionDefines": [],
-    "noEngineReferences": false
-}

package/Runtime/Code/RemoteConsole/Airship.RemoteConsole.asmdef.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: 35d89efae802460782fb13c0912a2c45
-timeCreated: 1688947058

package/Runtime/Code/RemoteConsole.meta

@@ -1,3 +0,0 @@
-fileFormatVersion: 2
-guid: dce635ecf77446489a0b657fac1d3bf9
-timeCreated: 1688947007