main into multiplayer

.config/dotnet-tools.json

@@ -7,6 +7,12 @@
       "commands": [
         "dotnet-format"
       ]
+    },
+    "jetbrains.resharper.globaltools": {
+      "version": "2026.1.4",
+      "commands": [
+        "jb"
+      ]
     }
   }
 }

.editorconfig

@@ -112,3 +112,9 @@ dotnet_diagnostic.SA1128.severity = none # allow public ClassName : this() witho
 dotnet_diagnostic.SA1101.severity = none # disable obligatory this.fieldName
 dotnet_diagnostic.SA1401.severity = error # fields always private
 dotnet_diagnostic.SA1503.severity = none # allow no braces
+dotnet_diagnostic.SA1134.severity = none # allow [attributes] private OneLineWithField
+dotnet_diagnostic.SA1127.severity = none # generic type constrains must be on the new line
+dotnet_diagnostic.SA1611.severity = none # all ctor args must be documented
+dotnet_diagnostic.SA1117.severity = none # allow arguments to be wrapped, not chopped
+dotnet_diagnostic.SA1130.severity = none # allow = delegate {}; syntax, not only lambda
+

.gitattributes

@@ -4,3 +4,20 @@
 *.jpeg filter=lfs diff=lfs merge=lfs -text
 *.psd filter=lfs diff=lfs merge=lfs -text
 *.sh text eol=lf
+
+
+* text=auto
+
+*.cs     text eol=lf
+*.asmdef text eol=lf
+*.asmref text eol=lf
+*.json   text eol=lf
+*.yml    text eol=lf
+*.yaml   text eol=lf
+*.sh     text eol=lf
+
+*.bat text eol=crlf
+*.cmd text eol=crlf
+*.ps1 text eol=crlf
+
+/Assets/Packages/** -text

.github/workflows/build-desktop.yml

@@ -0,0 +1,40 @@
+name: Build project
+
+on:
+    pull_request:
+        branches:
+            - main
+
+jobs:
+    build-desktop:
+        name: Build for ${{ matrix.targetPlatform }}
+        runs-on: ubuntu-latest
+        strategy:
+            fail-fast: false
+            matrix:
+                targetPlatform:
+                    - StandaloneOSX # Build a macOS standalone (Intel 64-bit).
+                    - StandaloneWindows # Build a Windows standalone.
+                    - StandaloneWindows64 # Build a Windows 64-bit standalone.
+                    - StandaloneLinux64 # Build a Linux 64-bit standalone.
+        steps:
+            - uses: actions/checkout@v4
+              with:
+                  fetch-depth: 0
+                  lfs: true
+            - uses: actions/cache@v3
+              with:
+                  path: Library
+                  key: Library-${{ matrix.targetPlatform }}
+                  restore-keys: Library-
+            - uses: game-ci/unity-builder@v4
+              env:
+                  UNITY_LICENSE: ${{ secrets.UNITY_LICENSE }}
+                  UNITY_EMAIL: ${{ secrets.UNITY_EMAIL }}
+                  UNITY_PASSWORD: ${{ secrets.UNITY_PASSWORD }}
+              with:
+                  targetPlatform: ${{ matrix.targetPlatform }}
+            - uses: actions/upload-artifact@v4
+              with:
+                  name: Build-${{ matrix.targetPlatform }}
+                  path: build/${{ matrix.targetPlatform }}

.github/workflows/code-format.yml

@@ -1,88 +1,70 @@
-name: Code Quality
+name: Code format
 
 on:
-  pull_request: {}
-  workflow_dispatch: {}
+    pull_request:
+        branches:
+            - main
+    push:
+        branches:
+            - main
 
 permissions:
-  contents: read
+    contents: read
 
 jobs:
-  formatting-and-analyzers:
-    name: Formatting and analyzers
-    runs-on: windows-latest
-
-    env:
-      DOTNET_CLI_TELEMETRY_OPTOUT: "1"
-      DOTNET_NOLOGO: "1"
-      UNITY_VERSION: "6000.5.4f1"
-      RESHARPER_TOOLS_VERSION: "2026.1.4"
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v6
-
-      - name: Setup .NET
-        uses: actions/setup-dotnet@v5
-        with:
-          dotnet-version: "8.0.x"
-
-      - name: Setup Unity
-        uses: RageAgainstThePixel/unity-setup@v2.6.0
-        with:
-          unity-version: ${{ env.UNITY_VERSION }}
-
-      - name: Resolve Unity editor path
-        shell: pwsh
-        run: |
-          $candidates = @(
-            $env:UNITY_EDITOR_PATH,
-            $env:UNITY_PATH,
-            "C:\Program Files\Unity\Hub\Editor\$env:UNITY_VERSION\Editor"
-          ) | Where-Object { $_ }
-
-          $unityEditorPath = $candidates | Where-Object {
-            Test-Path (Join-Path $_ "Data\Managed\UnityEngine\UnityEngine.dll")
-          } | Select-Object -First 1
-
-          if (-not $unityEditorPath) {
-            Write-Error "Unity $env:UNITY_VERSION was not found. Install Unity on the runner or set UNITY_EDITOR_PATH to the Editor directory."
-            exit 1
-          }
-
-          "UNITY_EDITOR_PATH=$unityEditorPath" | Out-File -FilePath $env:GITHUB_ENV -Encoding utf8 -Append
-          Write-Host "UNITY_EDITOR_PATH=$unityEditorPath"
-
-      - name: Install ReSharper command line tools
-        shell: pwsh
-        run: |
-          dotnet tool install JetBrains.ReSharper.GlobalTools `
-            --tool-path .\.tools `
-            --version $env:RESHARPER_TOOLS_VERSION
-
-      - name: Run cleanup profile
-        shell: pwsh
-        run: |
-          .\.tools\jb.exe cleanupcode UnityTemplateURP.CI.sln `
-            --profile="Scitalis: Reformat Code" `
-            --settings="UnityTemplateURP.sln.DotSettings" `
-            --include="Assets/_Project/Scripts/**" `
-            --verbosity=WARN
-
-      - name: Verify no formatting diff
-        shell: pwsh
-        run: |
-          $diff = git diff --name-only -- Assets/_Project/Scripts
-
-          if ($diff) {
-            Write-Error "Code cleanup changed files. Run Rider Silent Reformat and Cleanup or jb cleanupcode locally, then commit the result."
-            $diff | ForEach-Object { Write-Host "Changed: $_" }
-            git diff -- Assets/_Project/Scripts
-            exit 1
-          }
-
-          Write-Host "Formatting check passed."
-
-      - name: Build with analyzers
-        shell: pwsh
-        run: dotnet build UnityTemplateURP.CI.sln -warnaserror -p:CI=true
+    format-check:
+        name: Rider formatting check
+        runs-on: ubuntu-latest
+        timeout-minutes: 10
+
+        steps:
+            - name: Checkout
+              uses: actions/checkout@v4
+
+            - name: Setup .NET
+              uses: actions/setup-dotnet@v4
+              with:
+                  dotnet-version: "10.0.x"
+
+            - name: Restore JetBrains tools
+              run: dotnet tool restore
+
+            - name: Run Rider formatter
+              shell: bash
+              run: |
+                  format_root="$(mktemp -d)"
+
+                  mkdir -p "$format_root/Assets/_Project"
+                  cp -a Assets/_Project/Scripts "$format_root/Assets/_Project/Scripts"
+                  cp .editorconfig "$format_root/.editorconfig"
+                  cp UnityTemplateURP.sln.DotSettings "$format_root/Rider.DotSettings"
+
+                  mapfile -d '' cs_files < <(
+                    find "$format_root/Assets/_Project/Scripts" \
+                      -type f \
+                      -name '*.cs' \
+                      -print0
+                  )
+
+                  if [ "${#cs_files[@]}" -eq 0 ]; then
+                    echo "No C# files found."
+                    exit 1
+                  fi
+
+                  dotnet tool run jb cleanupcode \
+                    "${cs_files[@]}" \
+                    --profile="Built-in: Reformat Code" \
+                    --settings="$format_root/Rider.DotSettings" \
+                    --no-updates
+
+                  rsync -a \
+                    "$format_root/Assets/_Project/Scripts/" \
+                    Assets/_Project/Scripts/
+
+            - name: Check formatting diff
+              shell: bash
+              run: |
+                  if ! git diff --exit-code -- Assets/_Project/Scripts; then
+                    echo "::error::C# formatting does not match Rider formatting rules."
+                    exit 1
+                  fi

.gitignore

@@ -12,6 +12,8 @@
 /[Uu]ser[Ss]ettings/
 *.log
 
+.codex
+
 # By default unity supports Blender asset imports, *.blend1 blender files do not need to be commited to version control.
 *.blend1
 *.blend1.meta
@@ -71,8 +73,7 @@ ExportedObj/
 *.csproj
 *.unityproj
 *.sln
-!_Project.*.csproj
-!UnityTemplateURP.CI.sln
+*.slnx
 *.suo
 *.tmp
 *.user

Assets/_Project/Scripts/Data/ObservableDictionary.cs

@@ -5,23 +5,19 @@ namespace _Project.Data
 {
     public class ObservableDictionary<TKey, TValue> : Dictionary<TKey, TValue>
     {
-        public EventHandler<TKey> ItemAdded;
-        public EventHandler<TKey> ItemRemoved;
-
-        public ObservableDictionary() : base()
-        {
-        }
+        private EventHandler<TKey> _itemAdded;
+        private EventHandler<TKey> _itemRemoved;
 
         public new void Add(TKey key, TValue value)
         {
             base.Add(key, value);
-            ItemAdded?.Invoke(null, key);
+            _itemAdded?.Invoke(null, key);
         }
 
         public new bool Remove(TKey key)
         {
             var removed = base.Remove(key);
-            if (removed) ItemRemoved(null, key);
+            if (removed) _itemRemoved(null, key);
 
             return removed;
         }

Assets/_Project/Scripts/Data/SerializeableType.cs

@@ -31,6 +31,6 @@ private static bool TryGetType(string typeString, out Type type)
         // public static implicit operator Type(SerializeableType sType) => sType.Type;
 
         // Implicit conversion from Type to SerializableType
-        //public static implicit operator SerializeableType(Type type) => new() { Type = type };
+        // public static implicit operator SerializeableType(Type type) => new() { Type = type };
     }
 }

Assets/_Project/Scripts/Data/TypeFilterAttribute.cs

@@ -1,47 +1,8 @@
 using System;
-using System.Linq;
 using UnityEngine;
 
 namespace _Project.Data
 {
-    public static class TypeFilterExtension
-    {
-        /// <summary>
-        /// Checks if a given type inherits or implements a specified base type
-        /// </summary>
-        /// <param name="type">To be checked type</param>
-        /// <param name="baseType">The ancestor type</param>
-        /// <returns>True if type implements base type</returns>
-        public static bool InheritsOrImplements(this Type type, Type baseType)
-        {
-            type = ResolveGenericType(type);
-            baseType = ResolveGenericType(baseType);
-
-            while (type != typeof(object))
-            {
-                if (baseType == type || HasAnyInterfaces(type, baseType)) return true;
-
-                type = ResolveGenericType(type.BaseType);
-                if (type == null) return false;
-            }
-
-            return false;
-        }
-
-        private static bool HasAnyInterfaces(Type type, Type interfaceType)
-        {
-            return type.GetInterfaces().Any(i => ResolveGenericType(i) == interfaceType);
-        }
-
-        private static Type ResolveGenericType(Type type)
-        {
-            if (type is not { IsGenericType: true }) return type;
-
-            var genericType = type.GetGenericTypeDefinition();
-            return genericType != type ? genericType : type;
-        }
-    }
-
     public class TypeFilterAttribute : PropertyAttribute
     {
         public TypeFilterAttribute(Type filterType)

Assets/_Project/Scripts/Data/TypeFilterExtension.cs

@@ -0,0 +1,43 @@
+using System;
+using System.Linq;
+
+namespace _Project.Data
+{
+    public static class TypeFilterExtension
+    {
+        /// <summary>
+        /// Checks if a given type inherits or implements a specified base type
+        /// </summary>
+        /// <param name="type">To be checked type</param>
+        /// <param name="baseType">The ancestor type</param>
+        /// <returns>True if type implements base type</returns>
+        public static bool InheritsOrImplements(this Type type, Type baseType)
+        {
+            type = ResolveGenericType(type);
+            baseType = ResolveGenericType(baseType);
+
+            while (type != typeof(object))
+            {
+                if (baseType == type || HasAnyInterfaces(type, baseType)) return true;
+
+                type = ResolveGenericType(type.BaseType);
+                if (type == null) return false;
+            }
+
+            return false;
+        }
+
+        private static bool HasAnyInterfaces(Type type, Type interfaceType)
+        {
+            return type.GetInterfaces().Any(i => ResolveGenericType(i) == interfaceType);
+        }
+
+        private static Type ResolveGenericType(Type type)
+        {
+            if (type is not { IsGenericType: true }) return type;
+
+            var genericType = type.GetGenericTypeDefinition();
+            return genericType != type ? genericType : type;
+        }
+    }
+}