ready to upload and merge back

dooly123 · Dec 20, 2024 · 31def36 · 31def36
1 parent 8168175
commit 31def36
Show file tree

Hide file tree

Showing 32 changed files with 128 additions and 1,293 deletions.
diff --git a/Basis Server Export/BasisNetworkCore/bin/Release/BasisNetworkCore.2.10.1.nupkg b/Basis Server Export/BasisNetworkCore/bin/Release/BasisNetworkCore.2.10.1.nupkg
diff --git a/Basis Server Export/BasisNetworkCore/bin/Release/net9.0/BasisNetworkCore.dll b/Basis Server Export/BasisNetworkCore/bin/Release/net9.0/BasisNetworkCore.dll
diff --git a/Basis Server Export/BasisNetworkCore/bin/Release/netstandard2.1/BasisNetworkCore.dll b/Basis Server Export/BasisNetworkCore/bin/Release/netstandard2.1/BasisNetworkCore.dll
diff --git a/Basis Server Export/BasisNetworkServer/bin/Release/BasisNetworkServer.2.10.1.nupkg b/Basis Server Export/BasisNetworkServer/bin/Release/BasisNetworkServer.2.10.1.nupkg
diff --git a/Basis Server Export/BasisNetworkServer/bin/Release/net9.0/BasisNetworkCore.dll b/Basis Server Export/BasisNetworkServer/bin/Release/net9.0/BasisNetworkCore.dll
diff --git a/Basis Server Export/BasisNetworkServer/bin/Release/net9.0/BasisNetworkServer.dll b/Basis Server Export/BasisNetworkServer/bin/Release/net9.0/BasisNetworkServer.dll
diff --git a/Basis Server Export/BasisNetworkServer/bin/Release/netstandard2.1/BasisNetworkCore.dll b/Basis Server Export/BasisNetworkServer/bin/Release/netstandard2.1/BasisNetworkCore.dll
diff --git a/Basis Server Export/BasisNetworkServer/bin/Release/netstandard2.1/BasisNetworkServer.dll b/Basis Server Export/BasisNetworkServer/bin/Release/netstandard2.1/BasisNetworkServer.dll
diff --git a/Basis Server/.vs/BasisNetworkServer/DesignTimeBuild/.dtbcache.v2 b/Basis Server/.vs/BasisNetworkServer/DesignTimeBuild/.dtbcache.v2
diff --git a/Basis Server/.vs/BasisNetworkServer/v17/.futdcache.v2 b/Basis Server/.vs/BasisNetworkServer/v17/.futdcache.v2
diff --git a/Basis Server/.vs/BasisNetworkServer/v17/DocumentLayout.backup.json b/Basis Server/.vs/BasisNetworkServer/v17/DocumentLayout.backup.json
@@ -2,6 +2,10 @@
   "Version": 1,
   "WorkspaceRootPath": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\",
   "Documents": [
+    {
+      "AbsoluteMoniker": "D:0:0:{7828CBD0-B57F-4C02-AD19-A0E015A5DD70}|BasisNetworkCore\\BasisNetworkCore.csproj|c:\\users\\doola\\onedrive\\documents\\github\\basis foundation\\basis unity\\basis server\\basisnetworkcore\\serializable\\serveravatarchangemessage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{7828CBD0-B57F-4C02-AD19-A0E015A5DD70}|BasisNetworkCore\\BasisNetworkCore.csproj|solutionrelative:basisnetworkcore\\serializable\\serveravatarchangemessage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+    },
     {
       "AbsoluteMoniker": "D:0:0:{7828CBD0-B57F-4C02-AD19-A0E015A5DD70}|BasisNetworkCore\\BasisNetworkCore.csproj|c:\\users\\doola\\onedrive\\documents\\github\\basis foundation\\basis unity\\basis server\\basisnetworkcore\\serializable\\avatardatamessage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{7828CBD0-B57F-4C02-AD19-A0E015A5DD70}|BasisNetworkCore\\BasisNetworkCore.csproj|solutionrelative:basisnetworkcore\\serializable\\avatardatamessage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
@@ -10,10 +14,6 @@
       "AbsoluteMoniker": "D:0:0:{51F765C5-646F-4F9E-B212-416E93E2E562}|BasisNetworkServer\\BasisNetworkServer.csproj|c:\\users\\doola\\onedrive\\documents\\github\\basis foundation\\basis unity\\basis server\\basisnetworkserver\\basisnetworking\\basisnetworkinggeneric.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{51F765C5-646F-4F9E-B212-416E93E2E562}|BasisNetworkServer\\BasisNetworkServer.csproj|solutionrelative:basisnetworkserver\\basisnetworking\\basisnetworkinggeneric.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
-    {
-      "AbsoluteMoniker": "D:0:0:{7828CBD0-B57F-4C02-AD19-A0E015A5DD70}|BasisNetworkCore\\BasisNetworkCore.csproj|c:\\users\\doola\\onedrive\\documents\\github\\basis foundation\\basis unity\\basis server\\basisnetworkcore\\serializable\\serveravatarchangemessage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
-      "RelativeMoniker": "D:0:0:{7828CBD0-B57F-4C02-AD19-A0E015A5DD70}|BasisNetworkCore\\BasisNetworkCore.csproj|solutionrelative:basisnetworkcore\\serializable\\serveravatarchangemessage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
-    },
     {
       "AbsoluteMoniker": "D:0:0:{51F765C5-646F-4F9E-B212-416E93E2E562}|BasisNetworkServer\\BasisNetworkServer.csproj|c:\\users\\doola\\onedrive\\documents\\github\\basis foundation\\basis unity\\basis server\\basisnetworkserver\\basisnetworkserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{51F765C5-646F-4F9E-B212-416E93E2E562}|BasisNetworkServer\\BasisNetworkServer.csproj|solutionrelative:basisnetworkserver\\basisnetworkserver.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
@@ -26,11 +26,11 @@
       "DocumentGroups": [
         {
           "DockedWidth": 1124,
-          "SelectedChildIndex": 1,
+          "SelectedChildIndex": 3,
           "Children": [
             {
               "$type": "Document",
-              "DocumentIndex": 1,
+              "DocumentIndex": 2,
               "Title": "BasisNetworkingGeneric.cs",
               "DocumentMoniker": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\BasisNetworkServer\\BasisNetworking\\BasisNetworkingGeneric.cs",
               "RelativeDocumentMoniker": "BasisNetworkServer\\BasisNetworking\\BasisNetworkingGeneric.cs",
@@ -43,7 +43,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 0,
+              "DocumentIndex": 1,
               "Title": "AvatarDataMessage.cs",
               "DocumentMoniker": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\BasisNetworkCore\\Serializable\\AvatarDataMessage.cs",
               "RelativeDocumentMoniker": "BasisNetworkCore\\Serializable\\AvatarDataMessage.cs",
@@ -69,13 +69,13 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 2,
+              "DocumentIndex": 0,
               "Title": "ServerAvatarChangeMessage.cs",
               "DocumentMoniker": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\BasisNetworkCore\\Serializable\\ServerAvatarChangeMessage.cs",
               "RelativeDocumentMoniker": "BasisNetworkCore\\Serializable\\ServerAvatarChangeMessage.cs",
               "ToolTip": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\BasisNetworkCore\\Serializable\\ServerAvatarChangeMessage.cs",
               "RelativeToolTip": "BasisNetworkCore\\Serializable\\ServerAvatarChangeMessage.cs",
-              "ViewState": "AgIAAAEAAAAAAAAAAAAcwA8AAAAJAAAAAAAAAA==",
+              "ViewState": "AgIAAAIAAAAAAAAAAAAAAAsAAAA6AAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
               "WhenOpened": "2024-12-19T18:35:22.486Z",
               "EditorCaption": ""

diff --git a/Basis Server/.vs/BasisNetworkServer/v17/DocumentLayout.json b/Basis Server/.vs/BasisNetworkServer/v17/DocumentLayout.json
@@ -2,6 +2,10 @@
   "Version": 1,
   "WorkspaceRootPath": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\",
   "Documents": [
+    {
+      "AbsoluteMoniker": "D:0:0:{7828CBD0-B57F-4C02-AD19-A0E015A5DD70}|BasisNetworkCore\\BasisNetworkCore.csproj|c:\\users\\doola\\onedrive\\documents\\github\\basis foundation\\basis unity\\basis server\\basisnetworkcore\\basisnetworkversion.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{7828CBD0-B57F-4C02-AD19-A0E015A5DD70}|BasisNetworkCore\\BasisNetworkCore.csproj|solutionrelative:basisnetworkcore\\basisnetworkversion.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+    },
     {
       "AbsoluteMoniker": "D:0:0:{7828CBD0-B57F-4C02-AD19-A0E015A5DD70}|BasisNetworkCore\\BasisNetworkCore.csproj|c:\\users\\doola\\onedrive\\documents\\github\\basis foundation\\basis unity\\basis server\\basisnetworkcore\\serializable\\serveravatarchangemessage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{7828CBD0-B57F-4C02-AD19-A0E015A5DD70}|BasisNetworkCore\\BasisNetworkCore.csproj|solutionrelative:basisnetworkcore\\serializable\\serveravatarchangemessage.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
@@ -26,11 +30,24 @@
       "DocumentGroups": [
         {
           "DockedWidth": 1124,
-          "SelectedChildIndex": 3,
+          "SelectedChildIndex": 0,
           "Children": [
             {
               "$type": "Document",
-              "DocumentIndex": 2,
+              "DocumentIndex": 0,
+              "Title": "BasisNetworkVersion.cs",
+              "DocumentMoniker": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\BasisNetworkCore\\BasisNetworkVersion.cs",
+              "RelativeDocumentMoniker": "BasisNetworkCore\\BasisNetworkVersion.cs",
+              "ToolTip": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\BasisNetworkCore\\BasisNetworkVersion.cs",
+              "RelativeToolTip": "BasisNetworkCore\\BasisNetworkVersion.cs",
+              "ViewState": "AgIAAAAAAAAAAAAAAAAAAAYAAAABAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2024-12-20T07:58:01.967Z",
+              "EditorCaption": ""
+            },
+            {
+              "$type": "Document",
+              "DocumentIndex": 3,
               "Title": "BasisNetworkingGeneric.cs",
               "DocumentMoniker": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\BasisNetworkServer\\BasisNetworking\\BasisNetworkingGeneric.cs",
               "RelativeDocumentMoniker": "BasisNetworkServer\\BasisNetworking\\BasisNetworkingGeneric.cs",
@@ -43,7 +60,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 1,
+              "DocumentIndex": 2,
               "Title": "AvatarDataMessage.cs",
               "DocumentMoniker": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\BasisNetworkCore\\Serializable\\AvatarDataMessage.cs",
               "RelativeDocumentMoniker": "BasisNetworkCore\\Serializable\\AvatarDataMessage.cs",
@@ -56,7 +73,7 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 3,
+              "DocumentIndex": 4,
               "Title": "BasisNetworkServer.cs",
               "DocumentMoniker": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\BasisNetworkServer\\BasisNetworkServer.cs",
               "RelativeDocumentMoniker": "BasisNetworkServer\\BasisNetworkServer.cs",
@@ -69,13 +86,13 @@
             },
             {
               "$type": "Document",
-              "DocumentIndex": 0,
+              "DocumentIndex": 1,
               "Title": "ServerAvatarChangeMessage.cs",
               "DocumentMoniker": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\BasisNetworkCore\\Serializable\\ServerAvatarChangeMessage.cs",
               "RelativeDocumentMoniker": "BasisNetworkCore\\Serializable\\ServerAvatarChangeMessage.cs",
               "ToolTip": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis Server\\BasisNetworkCore\\Serializable\\ServerAvatarChangeMessage.cs",
               "RelativeToolTip": "BasisNetworkCore\\Serializable\\ServerAvatarChangeMessage.cs",
-              "ViewState": "AgIAAAIAAAAAAAAAAAAAAAsAAAA6AAAAAAAAAA==",
+              "ViewState": "AgIAAAIAAAAAAAAAAAAqwAQAAAArAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
               "WhenOpened": "2024-12-19T18:35:22.486Z",
               "EditorCaption": ""

diff --git a/Basis Server/BasisNetworkCore/BasisNetworkVersion.cs b/Basis Server/BasisNetworkCore/BasisNetworkVersion.cs
@@ -1,7 +1,7 @@
-namespace Basis.Network.Core
+namespace Basis.Network.Core
 {
     public class BasisNetworkVersion
     {
-        public static ushort ServerVersion = 1;
+        public static ushort ServerVersion = 2;
     }
-}
+}
diff --git a/Basis Server/BasisServerConsole/bin/Release/net9.0/BasisNetworkConsole.dll b/Basis Server/BasisServerConsole/bin/Release/net9.0/BasisNetworkConsole.dll
diff --git a/Basis Server/BasisServerConsole/bin/Release/net9.0/BasisNetworkConsole.exe b/Basis Server/BasisServerConsole/bin/Release/net9.0/BasisNetworkConsole.exe
diff --git a/Basis Server/BasisServerConsole/bin/Release/net9.0/BasisNetworkCore.dll b/Basis Server/BasisServerConsole/bin/Release/net9.0/BasisNetworkCore.dll
diff --git a/Basis Server/BasisServerConsole/bin/Release/net9.0/BasisNetworkServer.dll b/Basis Server/BasisServerConsole/bin/Release/net9.0/BasisNetworkServer.dll
diff --git a/Basis/.vs/Basis/v17/DocumentLayout.backup.json b/Basis/.vs/Basis/v17/DocumentLayout.backup.json
@@ -7,7 +7,7 @@
       "RelativeMoniker": "D:0:0:{72CD38CC-2981-5503-74FE-DD863B4B317F}|Basis.csproj|solutionrelative:packages\\basis framework\\networking\\handles\\basisnetworkgenericmessages.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{72CD38CC-2981-5503-74FE-DD863B4B317F}|Basis.csproj|c:\\users\\doola\\onedrive\\documents\\github\\basis foundation\\basis unity\\basis\\packages\\basis framework\\networking\\basisnetworksendbase.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "AbsoluteMoniker": "D:0:0:{72CD38CC-2981-5503-74FE-DD863B4B317F}|Basis.csproj|C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis\\packages\\basis framework\\networking\\basisnetworksendbase.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{72CD38CC-2981-5503-74FE-DD863B4B317F}|Basis.csproj|solutionrelative:packages\\basis framework\\networking\\basisnetworksendbase.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
@@ -19,11 +19,11 @@
       "RelativeMoniker": "D:0:0:{67CDD50F-E4A4-B576-49C7-8239FAAC440F}|Basis.Player.csproj|solutionrelative:packages\\basis framework\\players\\basisplayer.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{72CD38CC-2981-5503-74FE-DD863B4B317F}|Basis.csproj|c:\\users\\doola\\onedrive\\documents\\github\\basis foundation\\basis unity\\basis\\packages\\basis framework\\networking\\basisnetworkmanagement.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "AbsoluteMoniker": "D:0:0:{72CD38CC-2981-5503-74FE-DD863B4B317F}|Basis.csproj|C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis\\packages\\basis framework\\networking\\basisnetworkmanagement.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{72CD38CC-2981-5503-74FE-DD863B4B317F}|Basis.csproj|solutionrelative:packages\\basis framework\\networking\\basisnetworkmanagement.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     },
     {
-      "AbsoluteMoniker": "D:0:0:{72CD38CC-2981-5503-74FE-DD863B4B317F}|Basis.csproj|c:\\users\\doola\\onedrive\\documents\\github\\basis foundation\\basis unity\\basis\\packages\\basis framework\\bundle management\\basisloadhandler.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "AbsoluteMoniker": "D:0:0:{72CD38CC-2981-5503-74FE-DD863B4B317F}|Basis.csproj|C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis\\packages\\basis framework\\bundle management\\basisloadhandler.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
       "RelativeMoniker": "D:0:0:{72CD38CC-2981-5503-74FE-DD863B4B317F}|Basis.csproj|solutionrelative:packages\\basis framework\\bundle management\\basisloadhandler.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
     }
   ],
@@ -44,7 +44,7 @@
               "RelativeDocumentMoniker": "Packages\\Basis Framework\\Networking\\Handles\\BasisNetworkGenericMessages.cs",
               "ToolTip": "C:\\Users\\doola\\OneDrive\\Documents\\Github\\Basis Foundation\\Basis Unity\\Basis\\Packages\\Basis Framework\\Networking\\Handles\\BasisNetworkGenericMessages.cs",
               "RelativeToolTip": "Packages\\Basis Framework\\Networking\\Handles\\BasisNetworkGenericMessages.cs",
-              "ViewState": "AgIAACkAAAAAAAAAAAAIwDUAAAAuAAAAAAAAAA==",
+              "ViewState": "AgIAACkAAAAAAAAAAAAIwDIAAABiAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
               "WhenOpened": "2024-12-20T07:43:23.962Z",
               "EditorCaption": ""
@@ -59,8 +59,7 @@
               "RelativeToolTip": "Packages\\Basis Framework\\Networking\\BasisNetworkSendBase.cs",
               "ViewState": "AgIAADEAAAAAAAAAAAAwwEcAAAA+AAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2024-12-20T07:40:49.162Z",
-              "EditorCaption": ""
+              "WhenOpened": "2024-12-20T07:40:49.162Z"
             },
             {
               "$type": "Document",
@@ -72,8 +71,7 @@
               "RelativeToolTip": "Packages\\Basis Framework\\Networking\\BasisNetworkManagement.cs",
               "ViewState": "AgIAAFMAAAAAAAAAAAAwwBEAAAAXAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2024-12-20T07:37:39.587Z",
-              "EditorCaption": ""
+              "WhenOpened": "2024-12-20T07:37:39.587Z"
             },
             {
               "$type": "Document",
@@ -85,8 +83,7 @@
               "RelativeToolTip": "Packages\\Basis Framework\\Bundle Management\\BasisLoadhandler.cs",
               "ViewState": "AgIAADsAAAAAAAAAAAAmwEcAAAANAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2024-12-20T07:18:44.083Z",
-              "EditorCaption": ""
+              "WhenOpened": "2024-12-20T07:18:44.083Z"
             },
             {
               "$type": "Document",
@@ -98,8 +95,7 @@
               "RelativeToolTip": "Packages\\basistests\\BasisTestRoundTrip.cs",
               "ViewState": "AgIAAAAAAAAAAAAAAAAAABcAAAAIAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2024-12-20T06:42:50.353Z",
-              "EditorCaption": ""
+              "WhenOpened": "2024-12-20T06:42:50.353Z"
             },
             {
               "$type": "Document",
@@ -111,8 +107,7 @@
               "RelativeToolTip": "Packages\\Basis Framework\\Players\\BasisPlayer.cs",
               "ViewState": "AgIAAAAAAAAAAAAAAAAAAA0AAAAaAAAAAAAAAA==",
               "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
-              "WhenOpened": "2024-12-20T06:13:23.987Z",
-              "EditorCaption": ""
+              "WhenOpened": "2024-12-20T06:13:23.987Z"
             }
           ]
         }