Upgrade for current VRChat SDK on alpha

.config/dotnet-tools.json

@@ -0,0 +1,12 @@
+{
+  "version": 1,
+  "isRoot": true,
+  "tools": {
+    "tktco.udonsharplinter": {
+      "version": "0.3.1",
+      "commands": [
+        "udonsharp-lint"
+      ]
+    }
+  }
+}

.github/workflows/check.yml

@@ -0,0 +1,39 @@
+name: Check
+
+on:
+  push:
+  pull_request:
+
+jobs:
+  static-checks:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+      - uses: actions/setup-node@v4
+        with:
+          node-version: "22"
+      - uses: reviewdog/action-actionlint@v1
+        with:
+          fail_level: error
+      - name: Run static checks
+        run: bash scripts/run-static-checks.sh
+
+  udonsharp-lint:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: |
+            8.0.x
+            6.0.x
+      - name: Restore dotnet tools
+        run: dotnet tool restore
+      - name: Run UdonSharp Linter
+        run: dotnet tool run udonsharp-lint Packages

.github/workflows/lint.yml

@@ -0,0 +1,23 @@
+name: UdonSharp Lint
+
+on:
+  push:
+  pull_request:
+
+permissions:
+  contents: read
+
+jobs:
+  lint:
+    runs-on: ubuntu-latest
+    env:
+      DOTNET_ROLL_FORWARD: LatestMajor
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: "8.x"
+      - name: Install UdonSharp Linter
+        run: dotnet tool restore
+      - name: Run UdonSharp Linter
+        run: dotnet tool run udonsharp-lint Packages

.github/workflows/release.yml

@@ -4,10 +4,10 @@ jobs:
   release:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
-          node-version: lts/*
+          node-version: 22.14.0
       - run: npm ci
       - run: npx semantic-release
         env:

.releaserc.yml

@@ -1,3 +1,9 @@
+branches:
+  - master
+  - main
+  - name: alpha
+    prerelease: true
+
 plugins:
   - semantic-release-gitmoji
   - "@semantic-release/npm"

Packages/com.nekometer.esnya.esnya-sf-addons-ucs/Scripts/SFEXT_UdonChips.cs

@@ -67,7 +67,7 @@ public void SFEXT_O_Explode()
 
         public void SFEXT_G_Explode()
         {
-            if (!EntityControl.LastAttacker || !EntityControl.LastAttacker.Using || Time.time - airVehicle.LastHitTime >= 5) return;
+            if (!EntityControl.LastAttacker || !EntityControl.LastAttacker.Using || Time.time - EntityControl.PilotExitTime >= 5) return;
 
             if (onKilled <= 0 || !airVehicle.Taxiing && (airVehicle.Occupied || Time.time - EntityControl.PilotExitTime < 5))
             {

Packages/com.nekometer.esnya.esnya-sf-addons-ucs/Scripts/com.nekometer.esnya.esnya-sf-addons-ucs.asmdef

@@ -2,22 +2,20 @@
     "name": "com.nekometer.esnya.esnya-sf-addons-ucs",
     "references": [
         "GUID:99835874ee819da44948776e0df4ff1d",
-        "GUID:823e7b1dbeb8b2a4c9d5014bf2a39093",
-        "GUID:30028048dda6a584cacbcdacfa19980d",
-        "GUID:5733a420a738f014796e614c37f22eca",
-        "GUID:c06a60146d220a445a50a3e2fdd223a6",
-        "GUID:80a8b162ac804404bae7b5fdc3041428",
-        "GUID:3c1bc1267eab5884ebe7f232c09ee0d9"
+        "SaccFlightAndVehicles.Runtime",
+        "InariUdonRuntime",
+        "UdonChips-fork",
+        "EsnyaSFAddons.Runtime",
+        "UdonSharp.Runtime",
+        "VRC.Udon"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],
     "allowUnsafeCode": false,
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": false,
-    "defineConstraints": [
-        "UDON"
-    ],
+    "defineConstraints": [],
     "versionDefines": [],
     "noEngineReferences": false
-}
+}

Packages/com.nekometer.esnya.esnya-sf-addons-ucs/package.json

@@ -13,13 +13,16 @@
     "name": "esnya"
   },
   "dependencies": {
-    "com.nekometer.esnya.esnya-sf-addons": "5.0.0",
-    "com.nekometer.esnya.inari-udon": "9.1.0",
-    "com.nekometer.esnya.udonchips-fork": "3.0.0",
-    "sh.orels.udontoolkit": "1.1.2"
+    "com.nekometer.esnya.esnya-sf-addons": "5.0.0-beta.49",
+    "com.nekometer.esnya.inari-udon": "https://github.com/esnya/InariUdon.git?path=/Packages/com.nekometer.esnya.inari-udon#alpha",
+    "com.nekometer.esnya.udonchips-fork": "3.0.0"
   },
   "unity": "2022.3",
   "vpmDependencies": {
-    "com.vrchat.worlds": "3.7.0"
+    "com.vrchat.worlds": "3.10.2",
+    "com.nekometer.esnya.inari-udon": ">=10.0.0-alpha",
+    "com.nekometer.esnya.esnya-sf-addons": ">=5.0.0-beta.49",
+    "com.nekometer.esnya.udonchips-fork": ">=1.0.2",
+    "io.github.sacchan-vrc.sacc-flight-and-vehicles": ">=1.8.1"
   }
 }

Packages/com.nekometer.esnya.esnya-sf-addons/Editor/ESFADebugTools.cs

@@ -75,7 +75,7 @@ private void OnGUI()
 
                 if (GUILayout.Button("Respawn"))
                 {
-                    foreach (var airVehicle in entity.GetComponentsInChildren<SaccAirVehicle>(true)) UdonSharpEditorUtility.GetBackingUdonBehaviour(airVehicle).SendCustomEvent(nameof(SaccAirVehicle.SFEXT_O_RespawnButton));
+                    entity.SendEventToExtensions("SFEXT_O_RespawnButton");
                 }
             }
 

Packages/com.nekometer.esnya.esnya-sf-addons/Editor/ESFASceneSetup.Editor.cs

@@ -0,0 +1,102 @@
+#if UNITY_EDITOR
+using System.Linq;
+using UdonSharp;
+using UnityEditor;
+using UnityEngine;
+using UnityEngine.SceneManagement;
+using SaccFlightAndVehicles;
+using VRC.SDKBase.Editor.BuildPipeline;
+
+namespace EsnyaSFAddons
+{
+    public static class ESFASceneSetupEditorUtility
+    {
+        public static void SetupAll()
+        {
+            foreach (var setup in SceneManager.GetActiveScene().GetRootGameObjects()
+                         .SelectMany(o => o.GetComponentsInChildren<ESFASceneSetup>(true)))
+            {
+                Setup(setup);
+            }
+        }
+
+        public static void Setup(ESFASceneSetup setup)
+        {
+            if (!setup) return;
+
+            var rootObjects = setup.gameObject.scene.GetRootGameObjects();
+            var killsBoard = rootObjects.SelectMany(o => o.GetComponentsInChildren<SaccScoreboard_Kills>(true)).FirstOrDefault();
+
+            foreach (var entity in rootObjects.SelectMany(o => o.GetComponentsInChildren<SaccEntity>(true)))
+            {
+                var airVehicle = entity.ExtensionUdonBehaviours.FirstOrDefault(e => e is SaccAirVehicle);
+                var extensions = setup.injectExtentions.Select(template =>
+                {
+                    var obj = Object.Instantiate(template.gameObject, entity.transform);
+                    var extension = obj.GetComponent(template.GetType()) as UdonSharpBehaviour;
+                    obj.name = template.gameObject.name;
+
+                    extension.SetProgramVariable("EntityControl", entity);
+                    extension.SetProgramVariable("AirVehicle", airVehicle);
+
+                    EditorUtility.SetDirty(extension);
+
+                    return extension;
+                });
+
+                if (killsBoard)
+                {
+                    var killTracker = entity.GetExtention(UdonSharpBehaviour.GetUdonTypeName<SAV_KillTracker>()) as SAV_KillTracker;
+                    if (killTracker)
+                    {
+                        killTracker.KillsBoard = killsBoard;
+                        EditorUtility.SetDirty(killTracker);
+                    }
+
+                    var killPenalty = entity.GetExtention(UdonSharpBehaviour.GetUdonTypeName<SFEXT_KillPenalty>()) as SFEXT_KillPenalty;
+                    if (killPenalty)
+                    {
+                        killPenalty.KillsBoard = killsBoard;
+                        EditorUtility.SetDirty(killPenalty);
+                    }
+                }
+
+                if (setup.injectExtentions.Length > 0)
+                {
+                    entity.ExtensionUdonBehaviours = entity.ExtensionUdonBehaviours.Concat(extensions).ToArray();
+                }
+
+                EditorUtility.SetDirty(entity);
+            }
+
+            foreach (var airVehicle in rootObjects.SelectMany(o => o.GetComponentsInChildren<SaccAirVehicle>(true)))
+            {
+                airVehicle.SeaLevel = setup.seaLevel;
+                airVehicle.RepeatingWorld = setup.repeatingWorld;
+                airVehicle.RepeatingWorldDistance = setup.repeatingWorldDistance;
+                EditorUtility.SetDirty(airVehicle);
+            }
+
+            var windchanger = rootObjects.Select(o => o.GetComponentInChildren<SAV_WindChanger>()).FirstOrDefault(c => c);
+            foreach (var windsock in rootObjects.SelectMany(o => o.GetComponentsInChildren<Windsock>(true)))
+            {
+                windsock.windChanger = windchanger;
+                EditorUtility.SetDirty(windsock);
+            }
+
+            Object.DestroyImmediate(setup, true);
+        }
+    }
+
+    public class ESFASceneSetupBuildCallback : IVRCSDKBuildRequestedCallback
+    {
+        public int callbackOrder => 11;
+
+        public bool OnBuildRequested(VRCSDKRequestedBuildType requestedBuildType)
+        {
+            ESFASceneSetupEditorUtility.SetupAll();
+            return true;
+        }
+    }
+}
+#endif

Packages/com.nekometer.esnya.esnya-sf-addons/Editor/ESFAUI.cs

@@ -1,3 +1,5 @@
+using System;
+using System.Linq;
 using UnityEditor;
 using UnityEngine;
 using SaccFlightAndVehicles;
@@ -6,6 +8,53 @@ namespace EsnyaSFAddons.Editor
 {
     public static class ESFAUI
     {
+        /// <summary>
+        /// Draws a dropdown popup when <paramref name="options"/> is non-empty, otherwise falls back to a plain text field.
+        /// Handles the case where the current serialized value is not present in <paramref name="options"/> by
+        /// prepending a read-only placeholder entry so the existing value is not silently overwritten.
+        /// </summary>
+        public static void StringPopupOrField(SerializedProperty property, GUIContent label, string[] options)
+        {
+            if (options == null || options.Length == 0)
+            {
+                EditorGUILayout.PropertyField(property, label);
+                return;
+            }
+
+            var current = property.stringValue ?? string.Empty;
+            var idx = Array.IndexOf(options, current);
+
+            string[] displayOptions;
+            int displayIdx;
+            if (idx >= 0)
+            {
+                displayOptions = options;
+                displayIdx = idx;
+            }
+            else
+            {
+                var placeholder = string.IsNullOrEmpty(current) ? "(none)" : $"(current) {current}";
+                displayOptions = new[] { placeholder }.Concat(options).ToArray();
+                displayIdx = 0;
+            }
+
+            EditorGUI.BeginChangeCheck();
+            var newIdx = EditorGUILayout.Popup(label, displayIdx, displayOptions.Select(s => new GUIContent(s)).ToArray());
+            if (EditorGUI.EndChangeCheck() && newIdx != displayIdx)
+            {
+                if (idx >= 0)
+                {
+                    property.stringValue = options[newIdx];
+                }
+                else if (newIdx > 0)
+                {
+                    // User selected an actual option (skip placeholder at index 0)
+                    property.stringValue = options[newIdx - 1];
+                }
+            }
+        }
+
+
         public static bool MiniButton(string label)
         {
             return GUILayout.Button(label, EditorStyles.miniButton, GUILayout.ExpandWidth(false));

Packages/com.nekometer.esnya.esnya-sf-addons/Editor/EsnyaSFAddons.Editor.asmdef

@@ -1,15 +1,15 @@
 {
     "name": "EsnyaSFAddons.Editor",
     "references": [
-        "GUID:3c1bc1267eab5884ebe7f232c09ee0d9",
-        "GUID:823e7b1dbeb8b2a4c9d5014bf2a39093",
-        "GUID:99835874ee819da44948776e0df4ff1d",
-        "GUID:30028048dda6a584cacbcdacfa19980d",
-        "GUID:80a8b162ac804404bae7b5fdc3041428",
-        "GUID:84265b35cca3905448e623ef3903f0ff",
-        "GUID:627c4d5cd580ddf41bd320e784fe8b9d",
-        "GUID:f253815156df439380cb4780773d184b",
-        "GUID:c06a60146d220a445a50a3e2fdd223a6"
+        "UdonSharp.Editor",
+        "UdonSharp.Runtime",
+        "VRC.Udon",
+        "VRC.Udon.Editor",
+        "VRC.SDKBase",
+        "VRC.SDKBase.Editor.BuildPipeline",
+        "InariUdonRuntime",
+        "SaccFlightAndVehicles.Runtime",
+        "EsnyaSFAddons.Runtime"
     ],
     "includePlatforms": [
         "Editor"
@@ -19,7 +19,7 @@
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": false,
-    "defineConstraints": ["UDONSHARP"],
+    "defineConstraints": [],
     "versionDefines": [],
     "noEngineReferences": false
-}
+}