Merge pull request #37 from KSP2Community/dev

0.10.0 Indexer Changes

.github/workflows/on-release.yml

@@ -76,3 +76,35 @@ jobs:
           version: ${{ env.version }}
           zipball: ${{ env.zip }}
           changelog: ./changelog.md
+
+      - name: Update mod topic 
+        uses: Kerbalight/ksp2-forum-post-action@latest
+        with:
+          username: ${{ secrets.FORUM_USER }}
+          password: ${{ secrets.FORUM_PASSWORD }}
+          forum_topic_url: https://forum.kerbalspaceprogram.com/topic/221179-093-patch-manager/
+          forum_topic_title: '[{version}] Patch Manager'
+          spacedock_url: https://spacedock.info/mod/3482/Patch%20Manager
+          version: ${{ env.version }}
+          swinfo_path: 'plugin_template/swinfo.json'
+          changelog: ./changelog.md
+
+      - name: Prepare content for discord
+        shell: bash
+        run: |
+          echo -e "## Release v${version}\n" > ./content.md
+          cat ./changelog.md >> ./content.md
+          {
+            echo 'discord_message<<EOF'
+            cat ./content.md
+            echo EOF
+          } >> "$GITHUB_ENV"
+
+      - name: Publish update to Discord
+        uses: tsickert/[email protected]
+        with:
+          webhook-url: ${{ secrets.DISCORD_WEBHOOK }}
+          content: ${{ env.discord_message }}
+          thread-id: '1171826066692776028'
+          username: "Patch Manager"
+          avatar-url: "https://spacedock.info/content/cheese3660_103715/Patch_Manager/thumb_Patch_Manager-1703507804.jpg"

plugin_template/swinfo.json

@@ -5,7 +5,7 @@
   "name": "Patch Manager",
   "description": "A mod for generic patching needs similar to KSP 1's Module Manager.",
   "source": "https://github.com/KSP2Community/PatchManager",
-  "version": "0.9.4",
+  "version": "0.10.0",
   "version_check": "https://raw.githubusercontent.com/KSP2Community/PatchManager/main/plugin_template/swinfo.json",
   "ksp2_version": {
     "min": "0.2.0",

src/PatchManager.Parts/Modifiables/PartModifiable.cs

@@ -2,6 +2,7 @@
 using PatchManager.Parts.Selectables;
 using PatchManager.SassyPatching;
 using PatchManager.SassyPatching.Modifiables;
+using Enumerable = UniLinq.Enumerable;
 
 namespace PatchManager.Parts.Modifiables;
 
@@ -14,63 +15,25 @@ public sealed class PartModifiable : CustomJTokenModifiable
     internal PartModifiable(PartSelectable selectable) : base(selectable.JObject["data"],selectable.SetModified)
     {
         _selectable = selectable;
-        CustomIndexAdaptors = new();
-        CustomElementAdaptors = new();
-        CustomClassAdaptors = new()
-        {
-            ["resourceContainers"] = ResourceContainerClassAdapter,
-            ["attachNodes"] = AttachNodesClassAdaptor
-        };
-    }
-
-
-    private static bool ResourceContainerClassAdapter(JToken resourceContainer, string className) =>
-        resourceContainer.Contains("name") && (string)resourceContainer["name"] == className;
-
-    private static bool AttachNodesClassAdaptor(JToken attachNode, string className) =>
-        attachNode.Contains("nodeID") && (string)attachNode["nodeID"] == className;
-
-    private static JToken ModuleElementAdaptor(JToken module, string elementName)
-    {
-        var moduleData = module["ModuleData"];
-        return moduleData.FirstOrDefault(data => (string)data["Name"] == elementName);
-    }
-
-    private static JToken ModuleIndexAdaptor(JToken module, ulong index)
-    {
-        return module["ModuleData"][(int)index];
     }
 
     /// <inheritdoc />
-    protected override bool CustomFieldAdaptor(string fieldName, out JToken field, out Func<JToken, string, bool> classAdaptor, out Func<JToken, ulong, JToken> indexAdaptor,
-        out Func<JToken, string, JToken> elementAdaptor)
+    public override DataValue GetFieldValue(string fieldName)
     {
-        classAdaptor = null;
-        elementAdaptor = null;
-        indexAdaptor = null;
-        field = null;
         var repl = fieldName.Replace("PartComponent", "");
-        foreach (var module in JToken["serializedPartModules"])
+        if (JToken is not JObject jObject)
+            return DataValue.Null;
+        if(!jObject.ContainsKey("serializedPartModules"))
+            return DataValue.Null;
+        foreach (var module in jObject["serializedPartModules"])
         {
-            if (((string)module["Name"]).Replace("PartComponent", "") != repl) continue;
-            classAdaptor = null; // As modules have a weird childing system, so we can't easily just do this w/ our custom json adapter
-            elementAdaptor = ModuleElementAdaptor;
-            indexAdaptor = ModuleIndexAdaptor;
-            field = module;
-            return true;
+            if (module is not JObject moduleObject)continue;
+            if (moduleObject.ContainsKey("Name") && ((string)moduleObject["Name"])!.Replace("PartComponent", "") == repl)
+                return DataValue.FromJToken(module);
         }
-        return false;
+        return DataValue.Null;
     }
 
-    /// <inheritdoc />
-    protected override Dictionary<string, Func<JToken, string, bool>> CustomClassAdaptors { get; }
-
-    /// <inheritdoc />
-    protected override Dictionary<string, Func<JToken, ulong, JToken>> CustomIndexAdaptors { get; }
-
-    /// <inheritdoc />
-    protected override Dictionary<string, Func<JToken, string, JToken>> CustomElementAdaptors { get; }
-
     /// <inheritdoc />
     public override void Set(DataValue dataValue)
     {