From 31c3da28b57864665702dea6b18d5507415469fd Mon Sep 17 00:00:00 2001
From: Gareth Parker <blackfireweb@gmail.com>
Date: Fri, 10 May 2024 18:31:40 +0100
Subject: [PATCH 1/5] Add support for Parent="" (#45)

---
 CHANGELOG.md                                  |  3 +
 README.md                                     |  2 +
 .../References/RimworldReferenceProvider.cs   | 22 ++++--
 .../RimworldXMLItemProvider.cs                | 56 ++++++++++---
 .../SymbolScope/RimworldSymbolScope.cs        | 79 ++++++++++++++++---
 5 files changed, 136 insertions(+), 26 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51f246f..3bf051c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+## 2024.2
+* Adds support for [Parent=""] attributes
+
 ## 2024.1.7
  * Solved some incompatibilities for ReSharper
 
diff --git a/README.md b/README.md
index 2a5257b..b44ead2 100644
--- a/README.md
+++ b/README.md
@@ -19,12 +19,14 @@ into the definitions on which the XML sits.
    * Autocomplete DefNames when using `DefDatabase<Def>.GetNamed()`
    * Autocomplete DefNames when creating fields in `[DefOf]` classes
    * Autocomplete certain values for properties with fixed options (Such as Altitude Layer, boolean and directions)
+   * Autocompletion for `Parent=""` attributes
  * Use `Ctrl+Click` to go references
    * When using them on DefTypes, just to the C# class for that Def
    * When using them on XML Properties, jump to the C# definition for that property
    * When using them on DefName references, jump to the XML definition for that DefName
    * When using them on certain XML values, jump to the C# definition for that value
    * When using them on `[DefOf]` fields, or `DefDatabase<Def>.GetNamed()` calls, jump to the XML definition for that DefName
+   * When using them on `Parent=""` attributes, jump to the XML definition for that parent
  * Read the values in `Class=""` attributes to fetch the correct class to autocomplete from, such as in comps
  * Support for Custom Def Classes (Such as `<MyMod.CustomThingDef>`)
  * A Rimworld Run Configuration
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/References/RimworldReferenceProvider.cs b/src/dotnet/ReSharperPlugin.RimworldDev/References/RimworldReferenceProvider.cs
index f3f43bc..d24c37e 100644
--- a/src/dotnet/ReSharperPlugin.RimworldDev/References/RimworldReferenceProvider.cs
+++ b/src/dotnet/ReSharperPlugin.RimworldDev/References/RimworldReferenceProvider.cs
@@ -50,6 +50,12 @@ public ReferenceCollection GetReferences(ITreeNode element, ReferenceCollection
             element.Parent.GetText().StartsWith("<defName>"))
             return GetReferenceForDeclaredElement(element, oldReferences);
 
+        if (element.Parent != null && element.NodeType.ToString() == "STRING" &&
+            (element.Parent.GetText().StartsWith("Name") || element.Parent.GetText().StartsWith("ParentName")))
+        {
+            return GetReferenceForDeclaredElement(element, oldReferences);
+        }
+
         if (element.NodeType.ToString() == "TEXT") return GetReferencesForText(element, oldReferences);
         if (element is not XmlIdentifier identifier) return new ReferenceCollection();
         if (element.GetSourceFile() is not { } sourceFile) return new ReferenceCollection();
@@ -129,7 +135,6 @@ private ReferenceCollection GetReferencesForText(ITreeNode element, ReferenceCol
         if (classContext == null) return new ReferenceCollection();
 
         var rimworldSymbolScope = ScopeHelper.RimworldScope;
-        var allSymbolScopes = ScopeHelper.AllScopes;
 
         if (classContext.GetType().Name == "Enum")
         {
@@ -137,7 +142,6 @@ private ReferenceCollection GetReferencesForText(ITreeNode element, ReferenceCol
             var col = new ReferenceCollection(new RimworldXmlReference(@class, element));
 
             return col;
-            // return new ReferenceCollection();
         }
 
         if (!ScopeHelper.ExtendsFromVerseDef(classContext.GetClrName().FullName))
@@ -169,15 +173,21 @@ private ReferenceCollection GetReferencesForText(ITreeNode element, ReferenceCol
     private ReferenceCollection GetReferenceForDeclaredElement(ITreeNode element, ReferenceCollection oldReferences)
     {
         // We're currently in a text node inside a <defName> inside another ThingDef node. We want to get that node
-        var defTypeName = element.Parent?.Parent?
+        // Alternatively, we may be in a string node inside a Name Attribute, so we need to go a step further
+        var parentTag = element.Parent?.Parent;
+        if (parentTag is not XmlTag && parentTag?.Parent is XmlTag) parentTag = parentTag.Parent;
+
+        if (parentTag is null) return new ReferenceCollection();
+        
+        var defTypeName = parentTag
             // And then get the TagHeader (<ThingDef>) of that node
             .Children().FirstOrDefault(childElement => childElement is XmlTagHeaderNode)?
             // And then get the text that provides the ID of that node (ThingDef)
             .Children().FirstOrDefault(childElement => childElement is XmlIdentifier)?.GetText();
 
-        if (defTypeName is null) new ReferenceCollection();
-
-        var defName = element.GetText();
+        if (defTypeName is null) return new ReferenceCollection();
+        
+        var defName = element.GetText().Trim('"');
 
         var xmlSymbolTable = element.GetSolution().GetComponent<RimworldSymbolScope>();
 
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/RimworldXMLItemProvider.cs b/src/dotnet/ReSharperPlugin.RimworldDev/RimworldXMLItemProvider.cs
index 97f58e3..d6e935f 100644
--- a/src/dotnet/ReSharperPlugin.RimworldDev/RimworldXMLItemProvider.cs
+++ b/src/dotnet/ReSharperPlugin.RimworldDev/RimworldXMLItemProvider.cs
@@ -48,6 +48,11 @@ protected override bool IsAvailable(RimworldXmlCodeCompletionContext context)
         if (context.TreeNode is XmlTagEndToken && context.TreeNode.PrevSibling is XmlIdentifier &&
             context.TreeNode.PrevSibling.PrevSibling?.GetText() != "</") return true;
 
+        if (context.TreeNode is XmlValueToken &&
+            context.TreeNode.Parent is XmlAttribute attribute &&
+            attribute.AttributeName == "ParentName"
+           ) return true;
+
         return false;
     }
 
@@ -79,7 +84,6 @@ protected override bool AddLookupItems(RimworldXmlCodeCompletionContext context,
         if (context.TreeNode is XmlFloatingTextToken && context.TreeNode.NodeType.ToString() == "TEXT")
         {
             AddTextLookupItems(context, collector);
-            var a = 1 + 1;
             return base.AddLookupItems(context, collector);
         }
 
@@ -90,6 +94,15 @@ protected override bool AddLookupItems(RimworldXmlCodeCompletionContext context,
             return base.AddLookupItems(context, collector);
         }
 
+        if (context.TreeNode is XmlValueToken &&
+            context.TreeNode.Parent is XmlAttribute attribute &&
+            attribute.AttributeName == "ParentName"
+           )
+        {
+            AddParentNameItems(context, collector);
+            return base.AddLookupItems(context, collector);
+        }
+
         /**
          * <Defs>
          *  <{CARET HERE
@@ -125,6 +138,33 @@ protected override bool AddLookupItems(RimworldXmlCodeCompletionContext context,
         return base.AddLookupItems(context, collector);
     }
 
+    protected void AddParentNameItems(RimworldXmlCodeCompletionContext context, IItemsCollector collector)
+    {
+        if (context.TreeNode?.Parent is not XmlAttribute attribute) return;
+        if (attribute.Parent is not XmlTagHeaderNode defTag) return;
+
+        var defClassName = defTag.ContainerName;
+        var defClass = ScopeHelper.GetScopeForClass(defClassName);
+        
+        var xmlSymbolTable = context.TreeNode!.GetSolution().GetSolution().GetComponent<RimworldSymbolScope>();
+
+        var keys = xmlSymbolTable.GetDefsByType(defClassName);
+
+        foreach (var key in keys)
+        {
+            if (!xmlSymbolTable.IsDefAbstract(key)) continue;
+            
+            var defType = key.Split('/').First();
+            var defName = key.Split('/').Last();
+
+            var item = xmlSymbolTable.GetTagByDef(defType, defName);
+
+            var lookup = LookupFactory.CreateDeclaredElementLookupItem(context, defName,
+                new DeclaredElementInstance(new XMLTagDeclaredElement(item, defType, defName, false)));
+            collector.Add(lookup);
+        }
+    }
+
     protected void AddTextLookupItems(RimworldXmlCodeCompletionContext context, IItemsCollector collector)
     {
         var hierarchy = GetHierarchy(context.TreeNode);
@@ -197,8 +237,6 @@ protected void AddTextLookupItems(RimworldXmlCodeCompletionContext context, IIte
                 new DeclaredElementInstance(new XMLTagDeclaredElement(item, defType, defName, false)));
             collector.Add(lookup);
         }
-
-        return;
     }
 
     protected void AddThingDefClasses(RimworldXmlCodeCompletionContext context, IItemsCollector collector,
@@ -296,7 +334,7 @@ public static List<IField> GetAllPublicFields(ITypeElement desiredClass, ISymbol
                     .FirstOrDefault(attribute => attribute.GetClrName().FullName == "Verse.LoadAliasAttribute");
 
                 if (loadAliasAttributes != null) return true;
-                
+
                 return false;
             })
             .Select(member => member.Member)
@@ -499,18 +537,18 @@ attribute is MetadataAttributeInstance
                 );
 
                 if (loadAliasAttribute == null) continue;
-                
+
                 var writer = new StringWriter(new StringBuilder());
-                ((MetadataAttributeInstance) loadAliasAttribute).Dump(writer, "");
+                ((MetadataAttributeInstance)loadAliasAttribute).Dump(writer, "");
                 writer.Close();
 
                 var match = Regex.Match(writer.ToString(), "Arguments: \"(.*?)\"");
                 if (match.Groups.Count < 2) continue;
-                
-                
+
+
                 collector.Add(LookupFactory.CreateDeclaredElementLookupItem(context, match.Groups[1].Value,
                     new DeclaredElementInstance(field), true, false, QualifierKind.NONE));
-                
+
                 continue;
             }
 
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/SymbolScope/RimworldSymbolScope.cs b/src/dotnet/ReSharperPlugin.RimworldDev/SymbolScope/RimworldSymbolScope.cs
index d63eed7..f3b434a 100644
--- a/src/dotnet/ReSharperPlugin.RimworldDev/SymbolScope/RimworldSymbolScope.cs
+++ b/src/dotnet/ReSharperPlugin.RimworldDev/SymbolScope/RimworldSymbolScope.cs
@@ -3,6 +3,7 @@
 using JetBrains;
 using JetBrains.Annotations;
 using JetBrains.Application.Parts;
+using JetBrains.Application.Parts;
 using JetBrains.Application.Threading;
 using JetBrains.Collections;
 using JetBrains.Lifetimes;
@@ -15,15 +16,28 @@
 using JetBrains.ReSharper.Psi.Resolve;
 using JetBrains.ReSharper.Psi.Tree;
 using JetBrains.ReSharper.Psi.Util;
+using JetBrains.ReSharper.Psi.Xml.Impl.Tree;
 using JetBrains.ReSharper.Psi.Xml.Tree;
 using ReSharperPlugin.RimworldDev.TypeDeclaration;
 
 namespace ReSharperPlugin.RimworldDev.SymbolScope;
 
+public struct DefTag
+{
+    public DefTag(ITreeNode treeNode, bool isAbstract = false)
+    {
+        TreeNode = treeNode;
+        IsAbstract = isAbstract;
+    }
+
+    public ITreeNode TreeNode { get; }
+    public bool IsAbstract { get; }
+}
+
 [PsiComponent(Instantiation.ContainerAsyncPrimaryThread)]
 public class RimworldSymbolScope : SimpleICache<List<RimworldXmlDefSymbol>>
 {
-    private Dictionary<string, ITreeNode> DefTags = new();
+    private Dictionary<string, DefTag> DefTags = new();
     private Dictionary<string, string> ExtraDefTagNames = new();
     private Dictionary<string, XMLTagDeclaredElement> _declaredElements = new();
     private SymbolTable _symbolTable;
@@ -58,7 +72,12 @@ public ITreeNode GetTagByDef(string defId)
         if (!DefTags.ContainsKey(defId))
             return null;
 
-        return DefTags[defId];
+        return DefTags[defId].TreeNode;
+    }
+
+    public bool IsDefAbstract(string defId)
+    {
+        return DefTags.ContainsKey(defId) && DefTags[defId].IsAbstract;
     }
 
     public DefNameValue GetDefName(DefNameValue value) =>
@@ -88,15 +107,33 @@ public override object Build(IPsiSourceFile sourceFile, bool isStartup)
         var tags = xmlFile.GetNestedTags<IXmlTag>("Defs/*").Where(tag =>
         {
             var defNameTag = tag.GetNestedTags<IXmlTag>("defName").FirstOrDefault();
-            return defNameTag is not null;
+            if (defNameTag is not null) return true;
+
+            var nameAttribute = tag.GetAttribute("Name");
+            return nameAttribute is not null;
         });
 
         List<RimworldXmlDefSymbol> defs = new();
 
         foreach (var tag in tags)
         {
-            var defName = tag.GetNestedTags<IXmlTag>("defName").FirstOrDefault()?.InnerText;
-            var defNameTag = tag.GetNestedTags<IXmlTag>("defName").FirstOrDefault().Children().ElementAt(1);
+            var defName = tag
+                              .GetNestedTags<IXmlTag>("defName")
+                              .FirstOrDefault()?.InnerText ??
+                          tag
+                              .GetAttribute("Name")?
+                              .Children()
+                              .FirstOrDefault(element => element is IXmlValueToken)?
+                              .GetUnquotedText();
+            
+            var defNameTag = tag.GetNestedTags<IXmlTag>("defName").
+                                 FirstOrDefault()?.
+                                 Children().
+                                 ElementAt(1) ??
+                             tag.GetAttribute("Name")?.
+                                 Children().
+                                 FirstOrDefault(element => element is IXmlValueToken);
+            
             if (defName is null) continue;
 
             defs.Add(new RimworldXmlDefSymbol(defNameTag, defName, tag.GetTagName()));
@@ -132,12 +169,27 @@ private void AddToLocalCache(IPsiSourceFile sourceFile, [CanBeNull] List<Rimworl
         cacheItem?.ForEach(item =>
         {
             var matchingDefTag = xmlFile
-                .GetNestedTags<IXmlTag>("Defs/*/defName").FirstOrDefault(tag =>
-                    tag.Children().ElementAt(1).GetTreeStartOffset().Offset == item.DocumentOffset);
-
+                                     .GetNestedTags<IXmlTag>("Defs/*/defName").FirstOrDefault(tag =>
+                                         tag.Children().ElementAt(1).GetTreeStartOffset().Offset ==
+                                         item.DocumentOffset) ??
+                                 xmlFile
+                                     .GetNestedTags<IXmlTag>("Defs/*")
+                                     .FirstOrDefault(tag =>
+                                         tag.GetAttribute("Name")?
+                                             .Children()
+                                             .FirstOrDefault(element => element is IXmlValueToken)?
+                                             .GetTreeStartOffset().Offset == item.DocumentOffset
+                                     )?
+                                     .GetAttribute("Name")?
+                                     .Children()
+                                     .FirstOrDefault(element => element is IXmlValueToken);
+            
             if (matchingDefTag is null) return;
 
-            var xmlTag = matchingDefTag.Children().ElementAt(1);
+            // If the DefName is in a [Name=""] Attribute, it'll be matched to a XmlValueToken, which doesn't have any
+            // children. Otherwise, it'll be matched to the XmlTag for <defName>, where we want the first child as the
+            // string value
+            var xmlTag = matchingDefTag is IXmlValueToken ? matchingDefTag : matchingDefTag.Children().ElementAt(1);
 
             AddDefTagToList(item, xmlTag);
         });
@@ -168,10 +220,15 @@ void AddDefTagToList(RimworldXmlDefSymbol item, ITreeNode xmlTag)
                     }
                 }
 
+                var isAbstract = xmlTag is IXmlValueToken && 
+                                  xmlTag.Parent?.Parent is XmlTagHeaderNode defTypeTag && 
+                                  defTypeTag.GetAttribute("Abstract") is {} attribute && 
+                                  attribute.UnquotedValue.ToLower() == "true";
+
                 if (!DefTags.ContainsKey($"{item.DefType}/{item.DefName}"))
-                    DefTags.Add($"{item.DefType}/{item.DefName}", xmlTag);
+                    DefTags.Add($"{item.DefType}/{item.DefName}", new DefTag(xmlTag, isAbstract));
                 else
-                    DefTags[$"{item.DefType}/{item.DefName}"] = xmlTag;
+                    DefTags[$"{item.DefType}/{item.DefName}"] = new DefTag(xmlTag, isAbstract);
             }
         }
     }

From 2591d70d128310608bb23120839e8d4ec726cc4d Mon Sep 17 00:00:00 2001
From: Gareth <blackfireweb@gmail.com>
Date: Fri, 10 May 2024 18:33:12 +0100
Subject: [PATCH 2/5] Change the version

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index d6599b7..a24c4ab 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,7 @@
 DotnetPluginId=ReSharperPlugin.RimworldDev
 DotnetSolution=ReSharperPlugin.RimworldDev.sln
 RiderPluginId=com.jetbrains.rider.plugins.rimworlddev
-PluginVersion=2024.1.7
+PluginVersion=2024.2
 
 BuildConfiguration=Release
 

From 56a54b061629ea19526a1b434393b0316b1b5fab Mon Sep 17 00:00:00 2001
From: Gareth Parker <blackfireweb@gmail.com>
Date: Fri, 9 May 2025 21:50:43 +0100
Subject: [PATCH 3/5] Make the template more modular (#47)

* Make the template more modular

* Adds the feature to the changelog

* Let the AssemblyPath be auto-filled again and fetch it from our centralized ScopeHelper
---
 CHANGELOG.md                                  |   3 +-
 .../.template.config/template.json            |  83 ++++++++++--
 .../TemplateParameters/ModAuthorParameter.cs  |  38 ------
 .../RimworldDLLParameter.cs                   | 127 +++++-------------
 4 files changed, 111 insertions(+), 140 deletions(-)
 delete mode 100644 src/dotnet/ReSharperPlugin.RimworldDev/TemplateParameters/ModAuthorParameter.cs

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3bf051c..04c312e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,7 +1,8 @@
 # Changelog
 
 ## 2024.2
-* Adds support for [Parent=""] attributes
+ * Adds support for [Parent=""] attributes
+ * Makes the New Mod template modular, allowing you to select the components you want included in your mod
 
 ## 2024.1.7
  * Solved some incompatibilities for ReSharper
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/.template.config/template.json b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/.template.config/template.json
index 99bcb8d..3e4e45e 100644
--- a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/.template.config/template.json
+++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/.template.config/template.json
@@ -41,6 +41,38 @@
       "isRequired": "false",
       "defaultValue": ""
     },
+    "PublisherPlus": {
+      "type": "parameter",
+      "datatype": "bool",
+      "displayName": "Include a PublisherPlus config",
+      "description": "If enabled, a PublisherPlus config file will be included in the mod",
+      "isRequired": "false",
+      "defaultValue": "true"
+    },
+    "CSharp": {
+      "type": "parameter",
+      "datatype": "bool",
+      "displayName": "Add a C# Project and Sources",
+      "description": "If enabled, this mod will be created with a .sln file, Sources folder and a csproj file",
+      "isRequired": "false",
+      "defaultValue": "true"
+    },
+    "XML": {
+      "type": "parameter",
+      "datatype": "bool",
+      "displayName": "Add a Defs folder with a starting XML file",
+      "description": "If enabled, this mod will be created with a Defs folder and a starting XML file",
+      "isRequired": "false",
+      "defaultValue": "true"
+    },
+    "Languages": {
+      "type": "parameter",
+      "datatype": "bool",
+      "displayName": "Add a Languages folder",
+      "description": "If enabled, this mod will be created with a Languages folder with a starting English.xml file",
+      "isRequired": "false",
+      "defaultValue": "true"
+    },
     "AssemblyDir": {
       "type": "derived",
       "valueSource": "RimworldDLL",
@@ -64,11 +96,22 @@
         {
           "type": "conditional",
           "configuration": {
-            "if": [ "<!--#if" ],
-            "else": [ "#else", "<!--#else" ],
-            "elseif": [ "#elseif", "<!--#elseif" ],
-            "endif": [ "#endif", "<!--#endif" ],
-            "trim" : "true",
+            "if": [
+              "<!--#if"
+            ],
+            "else": [
+              "#else",
+              "<!--#else"
+            ],
+            "elseif": [
+              "#elseif",
+              "<!--#elseif"
+            ],
+            "endif": [
+              "#endif",
+              "<!--#endif"
+            ],
+            "trim": "true",
             "wholeLine": "true"
           }
         }
@@ -82,6 +125,28 @@
       "replacement": "$1"
     }
   },
+  "sources": [
+    {
+      "modifiers": [
+        {
+          "condition": "PublisherPlus == false",
+          "exclude": ["_PublisherPlus.xml"]
+        },
+        {
+          "condition": "CSharp == false",
+          "exclude": ["Source/**/*"]
+        },
+        {
+          "condition": "XML == false",
+          "exclude": ["Defs/**/*"]
+        },
+        {
+          "condition": "Languages == false",
+          "exclude": ["Languages/**/*"]
+        }
+      ]
+    }
+  ],
   "primaryOutputs": [
     {
       "path": "About/About.xml"
@@ -120,9 +185,11 @@
     },
     {
       "description": "Restore NuGet packages required by this project.",
-      "manualInstructions": [{
-        "text": "Run 'dotnet restore'"
-      }],
+      "manualInstructions": [
+        {
+          "text": "Run 'dotnet restore'"
+        }
+      ],
       "actionId": "210D431B-A78B-4D2F-B762-4ED3E3EA9025",
       "continueOnError": true
     }
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/TemplateParameters/ModAuthorParameter.cs b/src/dotnet/ReSharperPlugin.RimworldDev/TemplateParameters/ModAuthorParameter.cs
deleted file mode 100644
index 11a9a40..0000000
--- a/src/dotnet/ReSharperPlugin.RimworldDev/TemplateParameters/ModAuthorParameter.cs
+++ /dev/null
@@ -1,38 +0,0 @@
-// using System.Collections.Generic;
-// using JetBrains.Application;
-// using JetBrains.Rider.Backend.Features.ProjectModel.ProjectTemplates.DotNetExtensions;
-// using JetBrains.Rider.Backend.Features.ProjectModel.ProjectTemplates.DotNetTemplates;
-// using JetBrains.Rider.Model;
-//
-// namespace ReSharperPlugin.RimworldDev.TemplateParameters;
-//
-// public class ModAuthorNameParameter: DotNetTemplateParameter
-// {
-//     public ModAuthorNameParameter() : base("ModAuthor", "Mod Author Name", "Mod Author Name")
-//     {
-//     }
-//
-//     public override RdProjectTemplateContent CreateContent(DotNetProjectTemplateExpander expander, IDotNetTemplateContentFactory factory,
-//         int index, IDictionary<string, string> context)
-//     {
-//         var content = factory.CreateNextParameters(new[] {expander}, index + 1, context);
-//         var parameter = expander.TemplateInfo.GetParameter(Name);
-//         if (parameter == null)
-//         {
-//             return content;
-//         }
-//         
-//         return new RdProjectTemplateTextParameter(Name, PresentableName, null, Tooltip, RdTextParameterStyle.Text, content);
-//     }
-// }
-//
-// [ShellComponent]
-// public class UnityPathParameterProvider : IDotNetTemplateParameterProvider
-// {
-//     public int Priority => 50;
-//
-//     public IReadOnlyCollection<DotNetTemplateParameter> Get()
-//     {
-//         return new[] {new ModAuthorNameParameter()};
-//     }
-// }
\ No newline at end of file
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/TemplateParameters/RimworldDLLParameter.cs b/src/dotnet/ReSharperPlugin.RimworldDev/TemplateParameters/RimworldDLLParameter.cs
index f7ccafe..8595df3 100644
--- a/src/dotnet/ReSharperPlugin.RimworldDev/TemplateParameters/RimworldDLLParameter.cs
+++ b/src/dotnet/ReSharperPlugin.RimworldDev/TemplateParameters/RimworldDLLParameter.cs
@@ -1,93 +1,34 @@
-// using System.Collections.Generic;
-// using System.Linq;
-// using JetBrains.Application;
-// using JetBrains.Rider.Backend.Features.ProjectModel.ProjectTemplates.DotNetExtensions;
-// using JetBrains.Rider.Backend.Features.ProjectModel.ProjectTemplates.DotNetTemplates;
-// using JetBrains.Rider.Model;
-// using JetBrains.Util;
-// using Microsoft.TemplateEngine.Abstractions;
-//
-// namespace ReSharperPlugin.RimworldDev.TemplateParameters;
-//
-// public class RimworldDLLParameter : DotNetTemplateParameter
-// {
-//     public RimworldDLLParameter() : base("RimworldDLL", "Rimworld DLL", "Path to Assembly-CSharp.dll")
-//     {
-//     }
-//
-//     public override RdProjectTemplateOption CreateContent(ITemplateInfo templateInfo, ITemplateParameter templateParameter,
-//         Dictionary<string, object> context)
-//     {
-//         var locations = new List<string>
-//         {
-//             "C:\\Program Files (x86)\\Steam\\steamapps\\common\\RimWorld\\RimWorldWin64_Data\\Managed\\Assembly-CSharp.dll",
-//             "C:\\Program Files\\Steam\\steamapps\\common\\RimWorld\\RimWorldWin64_Data\\Managed\\Assembly-CSharp.dll",
-//             "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\RimWorldWin64_Data\\Managed\\Assembly-CSharp.dll",
-//             "~/.steam/steam/steamapps/common/RimWorld/RimWorldLinux_Data/Managed/Assembly-CSharp.dll"
-//         };
-//         
-//         var possiblePaths = locations
-//             .Select(location => FileSystemPath.TryParse(location)).Where(location => location.ExistsFile)
-//             .ToArray();
-//
-//         var detectedPath = possiblePaths.FirstOrDefault()?.FullPath;
-//
-//         return new RdProjectTemplateTextOption(detectedPath ?? "", Name, PresentableName, Tooltip);
-//     }
-//
-//     public override RdProjectTemplateContent CreateContent(
-//         DotNetProjectTemplateExpander expander,
-//         IDotNetTemplateContentFactory factory,
-//         int index, IDictionary<string, string> context
-//     )
-//     {
-//         var locations = new List<string>
-//         {
-//             "C:\\Program Files (x86)\\Steam\\steamapps\\common\\RimWorld\\RimWorldWin64_Data\\Managed\\Assembly-CSharp.dll",
-//             "C:\\Program Files\\Steam\\steamapps\\common\\RimWorld\\RimWorldWin64_Data\\Managed\\Assembly-CSharp.dll",
-//             "D:\\SteamLibrary\\steamapps\\common\\RimWorld\\RimWorldWin64_Data\\Managed\\Assembly-CSharp.dll",
-//             "~/.steam/steam/steamapps/common/RimWorld/RimWorldLinux_Data/Managed/Assembly-CSharp.dll"
-//         };
-//
-//         var content = factory.CreateNextParameters(new[] { expander }, index + 1, context);
-//         var parameter = expander.TemplateInfo.GetParameter(Name);
-//         if (parameter == null)
-//         {
-//             return content;
-//         }
-//
-//         var possiblePaths = locations
-//             .Select(location => FileSystemPath.TryParse(location)).Where(location => location.ExistsFile)
-//             .ToArray();
-//
-//         var options = new List<RdProjectTemplateGroupOption>();
-//
-//         foreach (var path in possiblePaths)
-//         {
-//             var optionContext = new Dictionary<string, string>(context) { { Name, path.FullPath } };
-//             var content1 = factory.CreateNextParameters(new[] { expander }, index + 1, optionContext);
-//             options.Add(new RdProjectTemplateGroupOption(path.FullPath, path.FullPath, null, content1));
-//         }
-//
-//         options.Add(new RdProjectTemplateGroupOption(
-//             "Custom",
-//             possiblePaths.Any() ? "Custom" : "Custom (Assembly-CSharp.dll not found)",
-//             null,
-//             new RdProjectTemplateTextParameter(Name, "Custom path", null, Tooltip, RdTextParameterStyle.FileChooser,
-//                 content)));
-//
-//         return new RdProjectTemplateGroupParameter(Name, PresentableName,
-//             possiblePaths.Any() ? possiblePaths.Last().FullPath : string.Empty, null, options);
-//     }
-// }
-//
-// [ShellComponent]
-// public class RimworldDLLParameterProvider : IDotNetTemplateParameterProvider
-// {
-//     public int Priority => 50;
-//
-//     public IReadOnlyCollection<DotNetTemplateParameter> Get()
-//     {
-//         return new[] { new RimworldDLLParameter() };
-//     }
-// }
\ No newline at end of file
+using System.Collections.Generic;
+using System.IO;
+using JetBrains.Application;
+using JetBrains.Rider.Backend.Features.ProjectModel.ProjectTemplates.DotNetExtensions;
+using JetBrains.Rider.Model;
+using Microsoft.TemplateEngine.Abstractions;
+
+namespace ReSharperPlugin.RimworldDev.TemplateParameters;
+
+public class RimworldDLLParameter : DotNetTemplateParameter
+{
+    public RimworldDLLParameter() : base("RimworldDLL", "Rimworld DLL", "Path to Assembly-CSharp.dll")
+    {
+    }
+
+    public override RdProjectTemplateOption CreateContent(ITemplateInfo templateInfo, ITemplateParameter templateParameter,
+        Dictionary<string, object> context)
+    {
+        var detectedPath = ScopeHelper.FindRimworldDll(Directory.GetCurrentDirectory())?.FullPath;
+        
+        return new RdProjectTemplateTextOption(detectedPath ?? "",  "string", Name, PresentableName, Tooltip);
+    }
+}
+
+[ShellComponent]
+public class RimworldDLLParameterProvider : IDotNetTemplateParameterProvider
+{
+    public int Priority => 50;
+
+    public IReadOnlyCollection<DotNetTemplateParameter> Get()
+    {
+        return new[] { new RimworldDLLParameter() };
+    }
+}
\ No newline at end of file

From 274290eca543eaed83348b0616b91cfde0708aa4 Mon Sep 17 00:00:00 2001
From: Gareth Parker <blackfireweb@gmail.com>
Date: Sun, 18 May 2025 00:59:05 +0100
Subject: [PATCH 4/5] Integrate the Remodder functionality into the Rimworld
 plugin (#67)

* Importing the code from Remodder, will need to figure out why it's not working for me

* Get the Remodder feature working
---
 CHANGELOG.md                                  |   1 +
 Directory.Build.props                         |   1 +
 README.md                                     |   5 +
 build.gradle.kts                              |  28 ++-
 gradle.properties                             |   5 +-
 gradle/libs.versions.toml                     |   2 +-
 protocol/build.gradle.kts                     |  52 +++++
 protocol/src/main/kotlin/model/rider/Model.kt |  18 ++
 settings.gradle.kts                           |  14 +-
 .../ReSharperPlugin.RimworldDev.Tests.csproj  |   2 +-
 .../ReSharperPlugin.RimworldDev.Rider.csproj  |  22 +-
 .../ReSharperPlugin.RimworldDev.csproj        |   5 +-
 .../Remodder/AssemblyHelper.cs                |  47 ++++
 .../Remodder/Decompiler.cs                    | 200 ++++++++++++++++++
 .../Remodder/IRemodderZone.cs                 |  15 ++
 .../Remodder/RemodderComponent.cs             | 128 +++++++++++
 .../RemodderProtocolModel.Generated.cs        | 113 ++++++++++
 .../RemodderProtocolModel.Generated.kt        |  81 +++++++
 .../kotlin/remodder/RemodderStateComponent.kt |  11 +
 .../remodder/RemodderToolWindowFactory.kt     | 153 ++++++++++++++
 src/rider/main/resources/META-INF/plugin.xml  |   1 +
 21 files changed, 892 insertions(+), 12 deletions(-)
 create mode 100644 protocol/build.gradle.kts
 create mode 100644 protocol/src/main/kotlin/model/rider/Model.kt
 create mode 100644 src/dotnet/ReSharperPlugin.RimworldDev/Remodder/AssemblyHelper.cs
 create mode 100644 src/dotnet/ReSharperPlugin.RimworldDev/Remodder/Decompiler.cs
 create mode 100644 src/dotnet/ReSharperPlugin.RimworldDev/Remodder/IRemodderZone.cs
 create mode 100644 src/dotnet/ReSharperPlugin.RimworldDev/Remodder/RemodderComponent.cs
 create mode 100644 src/dotnet/ReSharperPlugin.RimworldDev/RemodderProtocolModel.Generated.cs
 create mode 100644 src/rider/main/kotlin/remodder/RemodderProtocolModel.Generated.kt
 create mode 100644 src/rider/main/kotlin/remodder/RemodderStateComponent.kt
 create mode 100644 src/rider/main/kotlin/remodder/RemodderToolWindowFactory.kt

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 04c312e..7986537 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 2024.2
  * Adds support for [Parent=""] attributes
  * Makes the New Mod template modular, allowing you to select the components you want included in your mod
+ * Bundled in Zetrith's Remodder code into this plugin
 
 ## 2024.1.7
  * Solved some incompatibilities for ReSharper
diff --git a/Directory.Build.props b/Directory.Build.props
index 20c468f..066f197 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -39,6 +39,7 @@
     <PackageReference Include="JetBrains.Annotations" Version="2024.3.0" />
     <PackageReference Include="JetBrains.Lifetimes" Version="$(SdkVersion)" />
     <PackageReference Include="JetBrains.RdFramework" Version="$(SdkVersion)" />
+    <PackageReference Include="System.Diagnostics.TraceSource" Version="4.3.0" />
     <PackageReference Include="JetBrains.Rider.SDK" Version="$(SdkVersion)">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/README.md b/README.md
index b44ead2..49d2279 100644
--- a/README.md
+++ b/README.md
@@ -40,6 +40,7 @@ into the definitions on which the XML sits.
  * The ability to perform Find Usages on XML Defs
  * A "Generate" menu option to generate properties for a given XML Def
  * Includes a Rimworld Dictionary so that Rimworld terms don't get flagged as not real words by Rider
+ * Transpilation Explorer, curtesy of [Zetrith](https://github.com/Zetrith/Remodder)
 
 ## Quick Architecture For Developers
 
@@ -77,6 +78,10 @@ our own custom context provider which grabs the solution from the XML File and a
 The other is the [`RimworldXmlReference`](./src/dotnet/ReSharperPlugin.RimworldDev/References/RimworldXmlReference.cs)
 which is just a class that we have to define to hold our reference from the XML to the C#.
 
+## Acknowledgements
+The feature of exploring transpiled code is taken from Zetrith's open source plugin, [Remodder](https://github.com/Zetrith/Remodder).
+The feature would not have happened without them.
+
 ## FAQ
 
 **VS Code Plugin When?**  
diff --git a/build.gradle.kts b/build.gradle.kts
index 407f416..263698c 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -1,5 +1,7 @@
+import com.jetbrains.plugin.structure.base.utils.isFile
 import groovy.ant.FileNameFinder
 import org.apache.tools.ant.taskdefs.condition.Os
+import org.jetbrains.intellij.platform.gradle.Constants
 import org.jetbrains.intellij.platform.gradle.IntelliJPlatformType
 import java.io.ByteArrayOutputStream
 
@@ -7,7 +9,6 @@ plugins {
     id("java")
     alias(libs.plugins.kotlinJvm)
     id("org.jetbrains.intellij.platform") version "2.5.0"     // https://github.com/JetBrains/gradle-intellij-plugin/releases
-//    id("com.jetbrains.rdgen") version libs.versions.rdGen    // https://www.myget.org/feed/rd-snapshots/package/maven/com.jetbrains.rd/rd-gen
     id("me.filippov.gradle.jvm.wrapper") version "0.14.0"
 }
 
@@ -196,6 +197,14 @@ tasks.prepareSandbox {
     val dllFiles = listOf(
         "$outputFolder/${DotnetPluginId}.dll",
         "$outputFolder/${DotnetPluginId}.pdb",
+
+        // Not 100% sure why, but we manually need to include these dependencies for Remodder to work
+        "$outputFolder/0Harmony.dll",
+        "$outputFolder/AsmResolver.dll",
+        "$outputFolder/AsmResolver.DotNet.dll",
+        "$outputFolder/AsmResolver.PE.dll",
+        "$outputFolder/AsmResolver.PE.File.dll",
+        "$outputFolder/ICSharpCode.Decompiler.dll"
     )
 
     dllFiles.forEach({ f ->
@@ -243,4 +252,21 @@ tasks.patchPluginXml {
     pluginVersion.set(PluginVersion)
     changeNotes.set("<ul>\r\n$changelogText\r\n</ul>");
     untilBuild.set(provider { null })
+}
+
+val riderModel: Configuration by configurations.creating {
+    isCanBeConsumed = true
+    isCanBeResolved = false
+}
+
+artifacts {
+    add(riderModel.name, provider {
+        intellijPlatform.platformPath.resolve("lib/rd/rider-model.jar").also {
+            check(it.isFile) {
+                "rider-model.jar is not found at $riderModel"
+            }
+        }
+    }) {
+        builtBy(Constants.Tasks.INITIALIZE_INTELLIJ_PLATFORM_PLUGIN)
+    }
 }
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index a24c4ab..a32a40b 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,4 +25,7 @@ rdVersion=2025.1
 rdKotlinVersion=2.1.0
 intellijPlatformGradlePluginVersion=2.2.1
 gradleJvmWrapperVersion=0.14.0
-riderBaseVersion=2025.1
\ No newline at end of file
+riderBaseVersion=2025.1
+
+# Required to download Rider artifacts from Maven (and not "binary" releases from CDN).
+org.jetbrains.intellij.platform.buildFeature.useBinaryReleases=false
\ No newline at end of file
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index c52f4c0..ec205ef 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -1,5 +1,5 @@
 [versions]
-kotlin = "2.1.20" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
+kotlin = "2.1.10" # https://plugins.jetbrains.com/docs/intellij/using-kotlin.html#kotlin-standard-library
 rdGen = "2025.1.1" # https://github.com/JetBrains/rd/releases
 
 [libraries]
diff --git a/protocol/build.gradle.kts b/protocol/build.gradle.kts
new file mode 100644
index 0000000..2ee7928
--- /dev/null
+++ b/protocol/build.gradle.kts
@@ -0,0 +1,52 @@
+import com.jetbrains.rd.generator.gradle.RdGenTask
+
+plugins {
+    id("org.jetbrains.kotlin.jvm")
+    id("com.jetbrains.rdgen") version libs.versions.rdGen
+}
+
+dependencies {
+    implementation(libs.kotlinStdLib)
+    implementation(libs.rdGen)
+    implementation(
+            project(
+                    mapOf(
+                            "path" to ":",
+                            "configuration" to "riderModel"
+                    )
+            )
+    )
+}
+
+val DotnetPluginId: String by rootProject
+val RiderPluginId: String by rootProject
+
+rdgen {
+    val csOutput = File(rootDir, "src/dotnet/${DotnetPluginId}")
+    val ktOutput = File(rootDir, "src/rider/main/kotlin/remodder")
+
+    verbose = true
+    packages = "model.rider"
+
+    generator {
+        language = "kotlin"
+        transform = "asis"
+        root = "com.jetbrains.rider.model.nova.ide.IdeRoot"
+        namespace = "com.jetbrains.rider.model"
+        directory = "$ktOutput"
+    }
+
+    generator {
+        language = "csharp"
+        transform = "reversed"
+        root = "com.jetbrains.rider.model.nova.ide.IdeRoot"
+        namespace = "JetBrains.Rider.Model"
+        directory = "$csOutput"
+    }
+}
+
+tasks.withType<RdGenTask> {
+    val classPath = sourceSets["main"].runtimeClasspath
+    dependsOn(classPath)
+    classpath(classPath)
+}
\ No newline at end of file
diff --git a/protocol/src/main/kotlin/model/rider/Model.kt b/protocol/src/main/kotlin/model/rider/Model.kt
new file mode 100644
index 0000000..877d28d
--- /dev/null
+++ b/protocol/src/main/kotlin/model/rider/Model.kt
@@ -0,0 +1,18 @@
+package model.rider
+
+import com.jetbrains.rd.generator.nova.Ext
+import com.jetbrains.rd.generator.nova.csharp.CSharp50Generator
+import com.jetbrains.rd.generator.nova.kotlin.Kotlin11Generator
+import com.jetbrains.rd.generator.nova.*
+import com.jetbrains.rd.generator.nova.PredefinedType.*
+import com.jetbrains.rider.model.nova.ide.SolutionModel
+
+object RemodderProtocolModel : Ext(SolutionModel.Solution) {
+    init {
+        setting(CSharp50Generator.Namespace, "ReSharperPlugin.RdProtocol")
+        setting(Kotlin11Generator.Namespace, "com.jetbrains.rider.plugins.rdprotocol")
+
+        // Remote procedure on backend
+        call("decompile", array(string), array(string)).async
+    }
+}
\ No newline at end of file
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 024b8ab..4a6834b 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -35,11 +35,11 @@ pluginManagement {
 
     resolutionStrategy {
         eachPlugin {
-            when (requested.id.name) {
-                // This required to correctly rd-gen plugin resolution. May be we should switch our naming to match Gradle plugin naming convention.
-                "rdgen" -> {
-                    useModule("com.jetbrains.rd:rd-gen:${rdVersion}")
-                }
+            // Gradle has to map a plugin dependency to Maven coordinates - '{groupId}:{artifactId}:{version}'. It tries
+            // to do use '{plugin.id}:{plugin.id}.gradle.plugin:version'.
+            // This doesn't work for rdgen, so we provide some help
+            if (requested.id.id == "com.jetbrains.rdgen") {
+                useModule("com.jetbrains.rd:rd-gen:${requested.version}")
             }
         }
     }
@@ -54,4 +54,6 @@ dependencyResolutionManagement {
         maven("https://cache-redirector.jetbrains.com/dl.bintray.com/kotlin/kotlin-eap")
         maven("https://cache-redirector.jetbrains.com/myget.org.rd-snapshots.maven")
     }
-}
\ No newline at end of file
+}
+
+include(":protocol")
\ No newline at end of file
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/ReSharperPlugin.RimworldDev.Tests.csproj b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/ReSharperPlugin.RimworldDev.Tests.csproj
index 5088e5a..79c9f7b 100644
--- a/src/dotnet/ReSharperPlugin.RimworldDev.Tests/ReSharperPlugin.RimworldDev.Tests.csproj
+++ b/src/dotnet/ReSharperPlugin.RimworldDev.Tests/ReSharperPlugin.RimworldDev.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ReSharperPlugin.RimworldDev.Rider.csproj b/src/dotnet/ReSharperPlugin.RimworldDev/ReSharperPlugin.RimworldDev.Rider.csproj
index bbae16a..c78e3dc 100644
--- a/src/dotnet/ReSharperPlugin.RimworldDev/ReSharperPlugin.RimworldDev.Rider.csproj
+++ b/src/dotnet/ReSharperPlugin.RimworldDev/ReSharperPlugin.RimworldDev.Rider.csproj
@@ -8,11 +8,14 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>ReSharperPlugin.RimworldDev</AssemblyName>
     <RootNamespace>$(AssemblyName)</RootNamespace>
     <IsPackable>false</IsPackable>
     <DefineConstants>$(DefineConstants);RIDER</DefineConstants>
+    
+    <!-- This is needed to force our dependant DLLs to be present in the build folder, which we then copy over in gradle -->
+    <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
@@ -20,8 +23,15 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
 
+  <!-- These packages are used for the Remodder feature -->
   <ItemGroup>
+    <PackageReference Include="AsmResolver" Version="5.5.1" />
+    <PackageReference Include="AsmResolver.DotNet" Version="5.5.1" />
+    <PackageReference Include="ICSharpCode.Decompiler" Version="8.2.0.7535" />
+    <PackageReference Include="Krafs.Publicizer" Version="2.0.1" />
     <PackageReference Include="Lib.Harmony" Version="2.3.3" />
+    
+    <Publicize Include="0Harmony;" />
   </ItemGroup>
 
   <ItemGroup>
@@ -42,4 +52,14 @@
 
   <Import Project="Sdk.targets" Sdk="Microsoft.NET.Sdk" />
 
+  <ItemGroup>
+    <EmbeddedResource Include="*.DotSettings" />
+  </ItemGroup>
+  
+  <ItemDefinitionGroup>
+    <EmbeddedResource>
+      <Generator>JetResourceGenerator</Generator>
+    </EmbeddedResource>
+  </ItemDefinitionGroup>
+
 </Project>
\ No newline at end of file
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ReSharperPlugin.RimworldDev.csproj b/src/dotnet/ReSharperPlugin.RimworldDev/ReSharperPlugin.RimworldDev.csproj
index bd8468d..edf475a 100644
--- a/src/dotnet/ReSharperPlugin.RimworldDev/ReSharperPlugin.RimworldDev.csproj
+++ b/src/dotnet/ReSharperPlugin.RimworldDev/ReSharperPlugin.RimworldDev.csproj
@@ -8,7 +8,7 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFramework>net472</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <IsPackable>True</IsPackable>
     <DefineConstants>$(DefineConstants);RESHARPER</DefineConstants>
     <IncludeBuildOutput>false</IncludeBuildOutput>
@@ -42,6 +42,9 @@
     <Compile Remove="projectTemplates\**" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Compile Remove="Remodder\**" />
+  </ItemGroup>
 
   <ItemGroup>
     <EmbeddedResource Remove="projectTemplates\**" />
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/Remodder/AssemblyHelper.cs b/src/dotnet/ReSharperPlugin.RimworldDev/Remodder/AssemblyHelper.cs
new file mode 100644
index 0000000..28d37ae
--- /dev/null
+++ b/src/dotnet/ReSharperPlugin.RimworldDev/Remodder/AssemblyHelper.cs
@@ -0,0 +1,47 @@
+using System.IO;
+using AsmResolver;
+using AsmResolver.PE;
+using AsmResolver.PE.DotNet.Builder;
+using AsmResolver.PE.DotNet.Metadata.Strings;
+using AsmResolver.PE.DotNet.Metadata.Tables;
+using AsmResolver.PE.DotNet.Metadata.Tables.Rows;
+
+namespace ReSharperPlugin.RimworldDev.Remodder;
+
+public static class AssemblyHelper
+{
+    public static byte[] RemoveReferenceAssemblyAttribute(byte[] input)
+    {
+        var peImage = PEImage.FromBytes(input);
+        var tables = peImage.DotNetDirectory.Metadata.GetStream<TablesStream>();
+        var customAttrsTable = tables.GetTable<CustomAttributeRow>();
+        var memberRefTable = tables.GetTable<MemberReferenceRow>();
+        var typeRefTable = tables.GetTable<TypeReferenceRow>();
+        var stringsStream = peImage.DotNetDirectory.Metadata.GetStream<StringsStream>();
+    
+        for (int i = customAttrsTable.Count - 1; i >= 0; i--)
+        {
+            var r = customAttrsTable[i];
+            if ((r.Type & 0b111) == 3)
+            {
+                var ctor = memberRefTable.GetByRid(r.Type >> 3);
+                if ((ctor.Parent & 0b111) == 1)
+                {
+                    var type = typeRefTable.GetByRid(ctor.Parent >> 3);
+                    if (stringsStream.GetStringByIndex(type.Name) == "ReferenceAssemblyAttribute")
+                    {
+                        customAttrsTable.Remove(r);
+                    }
+                }
+            }
+        }
+    
+        var fileBuilder = new ManagedPEFileBuilder(EmptyErrorListener.Instance);
+        var file = fileBuilder.CreateFile(peImage);
+    
+        var stream = new MemoryStream();
+        file.Write(stream);
+    
+        return stream.ToArray();
+    }
+}
\ No newline at end of file
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/Remodder/Decompiler.cs b/src/dotnet/ReSharperPlugin.RimworldDev/Remodder/Decompiler.cs
new file mode 100644
index 0000000..a17d50d
--- /dev/null
+++ b/src/dotnet/ReSharperPlugin.RimworldDev/Remodder/Decompiler.cs
@@ -0,0 +1,200 @@
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Threading;
+using HarmonyLib;
+using ICSharpCode.Decompiler;
+using ICSharpCode.Decompiler.CSharp;
+using ICSharpCode.Decompiler.DebugInfo;
+using ICSharpCode.Decompiler.Disassembler;
+using ICSharpCode.Decompiler.Metadata;
+using ICSharpCode.Decompiler.TypeSystem;
+using Mono.Cecil;
+using Mono.Cecil.Cil;
+using MonoMod.Utils;
+
+// Taken from my old TranspilerExplorer project
+// Badly needs a rework...
+namespace ReSharperPlugin.RimworldDev.Remodder;
+
+public static class Decompiler
+{
+    const string OrigType = "OrigType";
+    const string DummyDll = "decomp.dll";
+
+    public static AttributePatch? GetTranspiler(Assembly asm, string typeName)
+    {
+        var type = asm.GetType(typeName);
+        if (type == null)
+            return null;
+        var transpiler = new Harmony("dummy").
+            CreateClassProcessor(type).patchMethods?.
+            FirstOrDefault(p => p.type == HarmonyPatchType.Transpiler);
+        return transpiler;
+    }
+
+    public static string Decompile(MethodBase orig, MethodInfo? transpiler, string[] userAsms, IDebugInfoProvider? debugInfo)
+    {
+        using var stream = new MemoryStream();
+        WriteAssembly(stream, orig, transpiler);
+        stream.Position = 0;
+
+        using var peFile = new PEFile(DummyDll, stream);
+        using var writer = new StringWriter();
+
+        var assemblyResolver = new UniversalAssemblyResolver(
+            userAsms.FirstOrDefault(), 
+            false, 
+            peFile.DetectTargetFrameworkId(), 
+            peFile.DetectRuntimePack()
+        );
+        
+        foreach (var userAsm in userAsms.Skip(1))
+        {
+            var dir = Path.GetDirectoryName(userAsm);
+            if (!string.IsNullOrEmpty(dir) && !assemblyResolver.GetSearchDirectories().Contains(dir))
+                assemblyResolver.AddSearchDirectory(Path.GetDirectoryName(userAsm));
+        }
+
+        var settings = new DecompilerSettings
+        {
+            ThrowOnAssemblyResolveErrors = false,
+            AnonymousMethods = false,
+            UseDebugSymbols = debugInfo != null
+        };
+            
+        var decompiler = new CSharpDecompiler(peFile, assemblyResolver, settings)
+        {
+            DebugInfoProvider = debugInfo,
+        };
+
+        var code = decompiler.DecompileTypeAsString(new FullTypeName(orig.DeclaringType?.Name ?? OrigType));
+
+        return code;
+    }
+
+    public static string Disasm(MethodBase orig, MethodInfo transpiler)
+    {
+        using var stream = new MemoryStream();
+        WriteAssembly(stream, orig, transpiler);
+        stream.Position = 0;
+
+        using var peFile = new PEFile(DummyDll, stream);
+        using var writer = new StringWriter();
+
+        var output = new PlainTextOutput(writer);
+        ReflectionDisassembler rd = new ReflectionDisassembler(output, CancellationToken.None);
+        rd.DetectControlStructure = false;
+        rd.DisassembleType(peFile, peFile.GetTypeDefinition(new TopLevelTypeName(orig.DeclaringType?.Name ?? OrigType)));
+
+        return writer.ToString();
+    }
+
+    static void WriteAssembly(Stream stream, MethodBase orig, MethodInfo? transpiler)
+    {
+        var patch = MethodPatcher.CreateDynamicMethod(orig, "", false);
+        var il = patch.GetILGenerator();
+        var originalVariables = MethodPatcher.DeclareOriginalLocalVariables(il, orig);
+        var copier = new MethodCopier(orig, il, originalVariables);
+        var emitter = new Emitter(il, false);
+
+        copier.AddTranspiler(transpiler ?? identityTranspiler);
+
+        var endLabels = new List<Label>();
+        _ = copier.Finalize(emitter, endLabels, out var hasReturnCode, out _);
+
+        foreach (var label in endLabels)
+            emitter.MarkLabel(label);
+
+        if (hasReturnCode)
+            emitter.Emit(System.Reflection.Emit.OpCodes.Ret);
+
+        string name = patch.GetDumpName("Cecil");
+        var module = ModuleDefinition.CreateModule(name, new ModuleParameters()
+        {
+            Kind = ModuleKind.Dll,
+            ReflectionImporterProvider = MMReflectionImporter.ProviderNoDefault
+        });
+
+        var typeDef = new TypeDefinition(
+            "",
+            orig.DeclaringType?.Name ?? OrigType,
+            Mono.Cecil.TypeAttributes.Public | Mono.Cecil.TypeAttributes.Abstract | Mono.Cecil.TypeAttributes.Sealed | Mono.Cecil.TypeAttributes.Class
+        )
+        {
+            BaseType = module.TypeSystem.Object
+        };
+
+        module.Types.Add(typeDef);
+
+        GenerateCecilMethod(patch, typeDef);
+
+        module.Write(stream);
+    }
+
+    // Copied from MonoMod.Utils.DMDCecilGenerator, edited to not load the assembly
+    static void GenerateCecilMethod(DynamicMethodDefinition dmd, TypeDefinition typeDef)
+    {
+        var def = dmd.Definition;
+        var module = typeDef.Module;
+
+        Relinker relinker = (mtp, _) => module.ImportReference(mtp);
+
+        MethodDefinition clone = new MethodDefinition(dmd.Name ?? "_" + def.Name.Replace('.', '_'), def.Attributes, module.TypeSystem.Void)
+        {
+            MethodReturnType = def.MethodReturnType,
+            Attributes = Mono.Cecil.MethodAttributes.Public | Mono.Cecil.MethodAttributes.HideBySig | Mono.Cecil.MethodAttributes.Public | Mono.Cecil.MethodAttributes.Static,
+            ImplAttributes = Mono.Cecil.MethodImplAttributes.IL | Mono.Cecil.MethodImplAttributes.Managed,
+            DeclaringType = typeDef
+        };
+
+        foreach (ParameterDefinition param in def.Parameters)
+            clone.Parameters.Add(param.Clone().Relink(relinker, clone));
+
+        clone.ReturnType = def.ReturnType.Relink(relinker, clone);
+
+        typeDef.Methods.Add(clone);
+
+        clone.HasThis = def.HasThis;
+        Mono.Cecil.Cil.MethodBody body = clone.Body = def.Body.Clone(clone);
+
+        foreach (VariableDefinition var in clone.Body.Variables)
+            var.VariableType = var.VariableType.Relink(relinker, clone);
+
+        foreach (ExceptionHandler handler in clone.Body.ExceptionHandlers)
+            if (handler.CatchType != null)
+                handler.CatchType = handler.CatchType.Relink(relinker, clone);
+
+        for (int instri = 0; instri < body.Instructions.Count(); instri++)
+        {
+            Instruction instr = body.Instructions.ElementAt(instri);
+            object operand = instr.Operand;
+
+            if (operand is ParameterDefinition param)
+                operand = clone.Parameters.ElementAt(param.Index);
+            else if (operand is IMetadataTokenProvider mtp)
+                operand = mtp.Relink(relinker, clone);
+
+            instr.Operand = operand;
+        }
+
+        clone.HasThis = false;
+
+        if (def.HasThis)
+        {
+            TypeReference type = def.DeclaringType;
+            if (type.IsValueType)
+                type = new Mono.Cecil.ByReferenceType(type);
+            clone.Parameters.Insert(0, new ParameterDefinition("<>_this", Mono.Cecil.ParameterAttributes.None, type.Relink(relinker, clone)));
+        }
+    }
+
+    private static MethodInfo identityTranspiler = AccessTools.Method(typeof(Decompiler), nameof(Transpiler));
+
+    public static IEnumerable<CodeInstruction> Transpiler(IEnumerable<CodeInstruction> insts)
+    {
+        return insts;
+    }
+}
\ No newline at end of file
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/Remodder/IRemodderZone.cs b/src/dotnet/ReSharperPlugin.RimworldDev/Remodder/IRemodderZone.cs
new file mode 100644
index 0000000..ae4ee38
--- /dev/null
+++ b/src/dotnet/ReSharperPlugin.RimworldDev/Remodder/IRemodderZone.cs
@@ -0,0 +1,15 @@
+using System.Threading.Tasks;
+using JetBrains.Application.BuildScript.Application.Zones;
+using JetBrains.Rd.Tasks;
+using JetBrains.ReSharper.Feature.Services.Daemon;
+using JetBrains.ReSharper.Psi;
+using JetBrains.ReSharper.Psi.CSharp;
+
+namespace ReSharperPlugin.RimworldDev.Remodder
+{
+    [ZoneDefinition]
+    // [ZoneDefinitionConfigurableFeature("Title", "Description", IsInProductSection: false)]
+    public interface IRemodderZone : IZone
+    {
+    }
+}
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/Remodder/RemodderComponent.cs b/src/dotnet/ReSharperPlugin.RimworldDev/Remodder/RemodderComponent.cs
new file mode 100644
index 0000000..60238d3
--- /dev/null
+++ b/src/dotnet/ReSharperPlugin.RimworldDev/Remodder/RemodderComponent.cs
@@ -0,0 +1,128 @@
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Runtime.Loader;
+using System.Threading.Tasks;
+using HarmonyLib;
+using JetBrains.Application.Parts;
+using JetBrains.ProjectModel;
+using JetBrains.ProjectModel.Impl;
+using JetBrains.Rd.Tasks;
+using JetBrains.ReSharper.Feature.Services.Protocol;
+using JetBrains.ReSharper.Resources.Shell;
+using JetBrains.Util;
+using ReSharperPlugin.RdProtocol;
+
+namespace ReSharperPlugin.RimworldDev.Remodder;
+
+[SolutionComponent(InstantiationEx.LegacyDefault)]
+public class RemodderComponent
+{
+    public RemodderComponent(ISolution solution)
+    {
+        var model = solution.GetProtocolSolution().GetRemodderProtocolModel();
+
+        model.Decompile.SetAsync((_, args) =>
+        {
+            return Task.Run(() =>
+            {
+                using (ReadLockCookie.Create())
+                {
+                    var filePath = args[0];
+                    var typeName = args[1];
+                    var userAsms = args.Skip(2).ToArray();
+
+                    var alc = new AssemblyLoadContext("Remodder ALC", true);
+
+                    try
+                    {
+                        foreach (var userAsm in userAsms)
+                            alc.LoadFromStream(PathToStream(userAsm));
+
+                        var project = solution
+                            .FindProjectItemsByLocation(VirtualFileSystemPath.Parse(filePath,
+                                InteractionContext.Local))
+                            .FirstOrDefault()?.GetProject();
+
+                        if (project == null)
+                            return ["ERROR: Can't find the file's project"];
+
+                        LoadReferenceAssemblies(alc, solution, project,
+                            userAsms.Select(path => AssemblyName.GetAssemblyName(path).Name!).ToArray());
+
+                        var projectAssembly = project.GetOutputFilePath(project.TargetFrameworkIds[0]);
+                        var a = alc.LoadFromStream(PathToStream(projectAssembly.FullPath));
+                        var transpiler = Decompiler.GetTranspiler(a, typeName);
+
+                        return transpiler != null
+                            ? DecompileOrigAndTranspiled(transpiler, userAsms)
+                            : ["ERROR: No transpiler"];
+                    }
+                    finally
+                    {
+                        alc.Unload();
+                    }
+                }
+            });
+        });
+    }
+
+    private static void LoadReferenceAssemblies(AssemblyLoadContext alc, ISolution solution, IProject project,
+        string[] asmNamesToIgnore)
+    {
+        foreach (var r in project.GetModuleReferences(project.TargetFrameworkIds[0]))
+            if (r is ProjectToAssemblyReference assemblyReference)
+            {
+                if (r.Name.Contains("System") ||
+                    r.Name.Contains("mscorlib") ||
+                    r.Name.Contains("Win32") ||
+                    r.Name.Contains("netstandard") ||
+                    r.Name.Contains("Microsoft") ||
+                    r.Name.Contains("Harmony") ||
+                    asmNamesToIgnore.Contains(r.Name))
+                    continue;
+
+                var assemblyFile = assemblyReference.ReferenceTarget.HintLocation?.FullPath;
+                if (assemblyFile != null)
+                {
+                    var assemblyBytes =
+                        AssemblyHelper.RemoveReferenceAssemblyAttribute(File.ReadAllBytes(assemblyFile));
+                    alc.LoadFromStream(new MemoryStream(assemblyBytes));
+                }
+            }
+            else if (r is GuidProjectReference guidProjectReference)
+            {
+                var referencedProject = solution.GetProjectByGuid(guidProjectReference.ReferencedProjectGuid);
+                if (referencedProject != null)
+                {
+                    var referencedProjectOutput =
+                        referencedProject.GetOutputFilePath(referencedProject.TargetFrameworkIds[0]);
+                    alc.LoadFromStream(PathToStream(referencedProjectOutput.FullPath));
+                }
+            }
+    }
+
+    private static string[] DecompileOrigAndTranspiled(AttributePatch patch, string[] userAsms)
+    {
+        var origDecomp = Decompiler.Decompile(
+            patch.info.GetOriginalMethod(),
+            null,
+            userAsms,
+            null
+        );
+
+        var decomp = Decompiler.Decompile(
+            patch.info.GetOriginalMethod(),
+            patch.info.method,
+            userAsms,
+            null
+        );
+
+        return [origDecomp, decomp];
+    }
+
+    private static MemoryStream PathToStream(string path)
+    {
+        return new MemoryStream(File.ReadAllBytes(path));
+    }
+}
\ No newline at end of file
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/RemodderProtocolModel.Generated.cs b/src/dotnet/ReSharperPlugin.RimworldDev/RemodderProtocolModel.Generated.cs
new file mode 100644
index 0000000..90e9742
--- /dev/null
+++ b/src/dotnet/ReSharperPlugin.RimworldDev/RemodderProtocolModel.Generated.cs
@@ -0,0 +1,113 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a RdGen v1.13.
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+using System;
+using System.Linq;
+using System.Collections.Generic;
+using System.Runtime.InteropServices;
+using JetBrains.Annotations;
+
+using JetBrains.Core;
+using JetBrains.Diagnostics;
+using JetBrains.Collections;
+using JetBrains.Collections.Viewable;
+using JetBrains.Lifetimes;
+using JetBrains.Serialization;
+using JetBrains.Rd;
+using JetBrains.Rd.Base;
+using JetBrains.Rd.Impl;
+using JetBrains.Rd.Tasks;
+using JetBrains.Rd.Util;
+using JetBrains.Rd.Text;
+
+
+// ReSharper disable RedundantEmptyObjectCreationArgumentList
+// ReSharper disable InconsistentNaming
+// ReSharper disable RedundantOverflowCheckingContext
+
+
+namespace ReSharperPlugin.RdProtocol
+{
+  
+  
+  /// <summary>
+  /// <p>Generated from: Model.kt:10</p>
+  /// </summary>
+  public class RemodderProtocolModel : RdExtBase
+  {
+    //fields
+    //public fields
+    [NotNull] public IRdEndpoint<string[], string[]> Decompile => _Decompile;
+    
+    //private fields
+    [NotNull] private readonly RdCall<string[], string[]> _Decompile;
+    
+    //primary constructor
+    private RemodderProtocolModel(
+      [NotNull] RdCall<string[], string[]> decompile
+    )
+    {
+      if (decompile == null) throw new ArgumentNullException("decompile");
+      
+      _Decompile = decompile;
+      _Decompile.Async = true;
+      BindableChildren.Add(new KeyValuePair<string, object>("decompile", _Decompile));
+    }
+    //secondary constructor
+    internal RemodderProtocolModel (
+    ) : this (
+      new RdCall<string[], string[]>(ReadStringArray, WriteStringArray, ReadStringArray, WriteStringArray)
+    ) {}
+    //deconstruct trait
+    //statics
+    
+    public static CtxReadDelegate<string[]> ReadStringArray = JetBrains.Rd.Impl.Serializers.ReadString.Array();
+    
+    public static  CtxWriteDelegate<string[]> WriteStringArray = JetBrains.Rd.Impl.Serializers.WriteString.Array();
+    
+    protected override long SerializationHash => 2555462534816406283L;
+    
+    protected override Action<ISerializers> Register => RegisterDeclaredTypesSerializers;
+    public static void RegisterDeclaredTypesSerializers(ISerializers serializers)
+    {
+      
+      serializers.RegisterToplevelOnce(typeof(JetBrains.Rider.Model.IdeRoot), JetBrains.Rider.Model.IdeRoot.RegisterDeclaredTypesSerializers);
+    }
+    
+    
+    //constants
+    
+    //custom body
+    //methods
+    //equals trait
+    //hash code trait
+    //pretty print
+    public override void Print(PrettyPrinter printer)
+    {
+      printer.Println("RemodderProtocolModel (");
+      using (printer.IndentCookie()) {
+        printer.Print("decompile = "); _Decompile.PrintEx(printer); printer.Println();
+      }
+      printer.Print(")");
+    }
+    //toString
+    public override string ToString()
+    {
+      var printer = new SingleLinePrettyPrinter();
+      Print(printer);
+      return printer.ToString();
+    }
+  }
+  public static class SolutionRemodderProtocolModelEx
+   {
+    public static RemodderProtocolModel GetRemodderProtocolModel(this JetBrains.Rider.Model.Solution solution)
+    {
+      return solution.GetOrCreateExtension("remodderProtocolModel", () => new RemodderProtocolModel());
+    }
+  }
+}
diff --git a/src/rider/main/kotlin/remodder/RemodderProtocolModel.Generated.kt b/src/rider/main/kotlin/remodder/RemodderProtocolModel.Generated.kt
new file mode 100644
index 0000000..05e44e8
--- /dev/null
+++ b/src/rider/main/kotlin/remodder/RemodderProtocolModel.Generated.kt
@@ -0,0 +1,81 @@
+@file:Suppress("EXPERIMENTAL_API_USAGE","EXPERIMENTAL_UNSIGNED_LITERALS","PackageDirectoryMismatch","UnusedImport","unused","LocalVariableName","CanBeVal","PropertyName","EnumEntryName","ClassName","ObjectPropertyName","UnnecessaryVariable","SpellCheckingInspection")
+package com.jetbrains.rider.plugins.rdprotocol
+
+import com.jetbrains.rd.framework.*
+import com.jetbrains.rd.framework.base.*
+import com.jetbrains.rd.framework.impl.*
+
+import com.jetbrains.rd.util.lifetime.*
+import com.jetbrains.rd.util.reactive.*
+import com.jetbrains.rd.util.string.*
+import com.jetbrains.rd.util.*
+import kotlin.time.Duration
+import kotlin.reflect.KClass
+import kotlin.jvm.JvmStatic
+
+
+
+/**
+ * #### Generated from [Model.kt:10]
+ */
+class RemodderProtocolModel private constructor(
+    private val _decompile: RdCall<Array<String>, Array<String>>
+) : RdExtBase() {
+    //companion
+    
+    companion object : ISerializersOwner {
+        
+        override fun registerSerializersCore(serializers: ISerializers)  {
+        }
+        
+        
+        
+        
+        private val __StringArraySerializer = FrameworkMarshallers.String.array()
+        
+        const val serializationHash = 2555462534816406283L
+        
+    }
+    override val serializersOwner: ISerializersOwner get() = RemodderProtocolModel
+    override val serializationHash: Long get() = RemodderProtocolModel.serializationHash
+    
+    //fields
+    val decompile: IRdCall<Array<String>, Array<String>> get() = _decompile
+    //methods
+    //initializer
+    init {
+        _decompile.async = true
+    }
+    
+    init {
+        bindableChildren.add("decompile" to _decompile)
+    }
+    
+    //secondary constructor
+    internal constructor(
+    ) : this(
+        RdCall<Array<String>, Array<String>>(__StringArraySerializer, __StringArraySerializer)
+    )
+    
+    //equals trait
+    //hash code trait
+    //pretty print
+    override fun print(printer: PrettyPrinter)  {
+        printer.println("RemodderProtocolModel (")
+        printer.indent {
+            print("decompile = "); _decompile.print(printer); println()
+        }
+        printer.print(")")
+    }
+    //deepClone
+    override fun deepClone(): RemodderProtocolModel   {
+        return RemodderProtocolModel(
+            _decompile.deepClonePolymorphic()
+        )
+    }
+    //contexts
+    //threading
+    override val extThreading: ExtThreadingKind get() = ExtThreadingKind.Default
+}
+val com.jetbrains.rd.ide.model.Solution.remodderProtocolModel get() = getOrCreateExtension("remodderProtocolModel", ::RemodderProtocolModel)
+
diff --git a/src/rider/main/kotlin/remodder/RemodderStateComponent.kt b/src/rider/main/kotlin/remodder/RemodderStateComponent.kt
new file mode 100644
index 0000000..482c5cc
--- /dev/null
+++ b/src/rider/main/kotlin/remodder/RemodderStateComponent.kt
@@ -0,0 +1,11 @@
+package RimworldDev.Rider.remodder
+
+import com.intellij.openapi.components.*
+
+@Service(Service.Level.PROJECT)
+@State(name = "RemodderSettings", storages = [Storage(StoragePathMacros.WORKSPACE_FILE)])
+class RemodderStateComponent : SimplePersistentStateComponent<RemodderState>(RemodderState())
+
+class RemodderState : BaseState() {
+    var userAssemblies by list<String>()
+}
diff --git a/src/rider/main/kotlin/remodder/RemodderToolWindowFactory.kt b/src/rider/main/kotlin/remodder/RemodderToolWindowFactory.kt
new file mode 100644
index 0000000..86b2a32
--- /dev/null
+++ b/src/rider/main/kotlin/remodder/RemodderToolWindowFactory.kt
@@ -0,0 +1,153 @@
+package RimworldDev.Rider.remodder
+
+import com.intellij.diff.DiffContentFactory
+import com.intellij.diff.DiffManager
+import com.intellij.diff.requests.SimpleDiffRequest
+import com.intellij.diff.util.DiffUserDataKeys
+import com.intellij.openapi.fileEditor.FileEditorManager
+import com.intellij.openapi.fileEditor.TextEditor
+import com.intellij.openapi.project.Project
+import com.intellij.openapi.ui.DialogBuilder
+import com.intellij.openapi.ui.Messages
+import com.intellij.openapi.wm.ToolWindow
+import com.intellij.openapi.wm.ToolWindowFactory
+import com.intellij.psi.PsiElement
+import com.intellij.psi.PsiManager
+import com.intellij.psi.impl.source.tree.LeafPsiElement
+import com.intellij.psi.util.childrenOfType
+import com.intellij.psi.util.descendantsOfType
+import com.intellij.psi.util.parentOfType
+import com.intellij.psi.util.parentsOfType
+import com.intellij.ui.CollectionListModel
+import com.intellij.ui.ToolbarDecorator
+import com.intellij.ui.components.JBList
+import com.intellij.ui.content.ContentFactory
+import com.jetbrains.rd.platform.util.toPromise
+import com.jetbrains.rider.languages.fileTypes.csharp.kotoparser.lexer.CSharpTokenType
+import com.jetbrains.rider.languages.fileTypes.csharp.psi.CSharpNamespaceDeclaration
+import com.jetbrains.rider.languages.fileTypes.csharp.psi.impl.CSharpDeclarationIdentifier
+import com.jetbrains.rider.languages.fileTypes.csharp.psi.impl.CSharpDummyDeclaration
+import com.jetbrains.rider.languages.fileTypes.csharp.psi.impl.CSharpNamespaceFileScopeHeader
+import com.jetbrains.rider.plugins.rdprotocol.remodderProtocolModel
+import com.jetbrains.rider.projectView.solution
+import java.awt.BorderLayout
+import java.awt.FlowLayout
+import javax.swing.JButton
+import javax.swing.JLabel
+import javax.swing.JPanel
+import javax.swing.JTextArea
+
+class RemodderToolWindowFactory : ToolWindowFactory {
+    private var errorMsg: String = ""
+
+    override fun createToolWindowContent(project: Project, toolWindow: ToolWindow) {
+        val diffPanel = DiffManager.getInstance().createRequestPanel(project, toolWindow.disposable, null)
+
+        val refresh = JButton("Refresh")
+        val showUserAssemblies = JButton("User assemblies")
+        val statusLabel = JLabel()
+        val errorDetails = JButton("See error")
+        errorDetails.isVisible = false
+
+        refresh.addActionListener {
+            val userAssemblies = project.getService<RemodderStateComponent>(RemodderStateComponent::class.java).state.userAssemblies
+            val editor = (FileEditorManager.getInstance(project).selectedEditor as TextEditor).editor
+            val view = PsiManager.getInstance(project).findViewProvider(editor.virtualFile)
+            val el = view?.findElementAt(editor.caretModel.offset) ?: return@addActionListener
+
+            val filePath = editor.virtualFile.path
+            val typeName = namespaceAndClassOfElement(el) ?: "<null>"
+
+            statusLabel.text = "$typeName..."
+            errorDetails.isVisible = false
+
+            project.solution.remodderProtocolModel.decompile.start(arrayOf(filePath, typeName) + userAssemblies).toPromise().then {
+                if (it.size == 1)
+                {
+                    statusLabel.text = "$typeName: ${it[0]}"
+                    errorDetails.isVisible = false
+                    return@then
+                }
+
+                val content1 = DiffContentFactory.getInstance().create(project, it[0], editor.virtualFile)
+                val content2 = DiffContentFactory.getInstance().create(project, it[1], editor.virtualFile)
+                content2.putUserData(DiffUserDataKeys.FORCE_READ_ONLY, true)
+
+                val request = SimpleDiffRequest("Original/Transpiled", content1, content2, "Original", "Transpiled")
+                diffPanel.setRequest(request)
+
+                statusLabel.text = typeName
+                errorDetails.isVisible = false
+            }.onError {
+                errorMsg = it.toString()
+                statusLabel.text = "$typeName: ERROR"
+                errorDetails.isVisible = true
+            }
+        }
+
+        errorDetails.addActionListener {
+            val errorTextArea = JTextArea()
+            errorTextArea.text = errorMsg
+            errorTextArea.isEditable = false
+
+            val dialogBuilder = DialogBuilder(project)
+            dialogBuilder.setCenterPanel(errorTextArea)
+            dialogBuilder.show()
+        }
+
+        showUserAssemblies.addActionListener {
+            val userAssemblies = project.getService<RemodderStateComponent>(RemodderStateComponent::class.java).state.userAssemblies
+            val listModel = CollectionListModel(userAssemblies, true)
+            val jbList = JBList(listModel)
+
+            val dialogBuilder = DialogBuilder(project)
+
+            dialogBuilder.setCenterPanel(jbList)
+            dialogBuilder.setNorthPanel(ToolbarDecorator.createDecorator(jbList).setAddAction {
+                val str = Messages.showInputDialog(project, "Add user assembly path", "User Assembly Path", null)
+                if (str != null)
+                    listModel.add(str)
+            }.setRemoveAction {
+                listModel.remove(jbList.selectedValue)
+            }.createPanel())
+
+            dialogBuilder.show()
+        }
+
+        val mainPanel = JPanel(BorderLayout(0, 1))
+        mainPanel.add(diffPanel.component, BorderLayout.CENTER)
+
+        val leftPanel = JPanel(FlowLayout(FlowLayout.LEFT))
+        leftPanel.add(refresh)
+        leftPanel.add(showUserAssemblies)
+        leftPanel.add(statusLabel)
+        leftPanel.add(errorDetails)
+        mainPanel.add(leftPanel, BorderLayout.NORTH)
+
+        val content = ContentFactory.getInstance().createContent(mainPanel, "Transpiler Preview", false)
+
+        toolWindow.contentManager.addContent(content)
+    }
+
+    private fun namespaceAndClassOfElement(psiElement: PsiElement): String? {
+        // Simple heuristics to get <namespace>.<class> of code under caret
+        val nsDecl = psiElement.parentOfType<CSharpNamespaceDeclaration>()
+        var nsIdent = nsDecl?.childrenOfType<CSharpDeclarationIdentifier>()?.firstOrNull()
+
+        if (nsIdent == null) {
+            nsIdent = psiElement.containingFile.
+            descendantsOfType<CSharpNamespaceFileScopeHeader>().firstOrNull()?.
+            childrenOfType<CSharpDeclarationIdentifier>()?.firstOrNull()
+        }
+
+        val classDecl = psiElement.parentsOfType<CSharpDummyDeclaration>().filter {
+            it.childrenOfType<LeafPsiElement>().any { it.elementType == CSharpTokenType.CLASS_KEYWORD }
+        }.firstOrNull()
+        val classIdent = classDecl?.childrenOfType<CSharpDeclarationIdentifier>()?.firstOrNull()
+
+        return if (nsIdent != null)
+            nsIdent.text + "." + classIdent?.text
+        else
+            classIdent?.text
+    }
+}
\ No newline at end of file
diff --git a/src/rider/main/resources/META-INF/plugin.xml b/src/rider/main/resources/META-INF/plugin.xml
index f7727ce..8d622c8 100644
--- a/src/rider/main/resources/META-INF/plugin.xml
+++ b/src/rider/main/resources/META-INF/plugin.xml
@@ -29,6 +29,7 @@ in your mods!</p>
     <backend.markup.adapterFactory language="XML" implementationClass="com.jetbrains.rider.daemon.RiderCacheAwareMarkupAdapterFactory" />
 
     <spellchecker.bundledDictionaryProvider implementation="RimworldDev.Rider.spellchecker.DictionaryProvider" />
+    <toolWindow factoryClass="RimworldDev.Rider.remodder.RemodderToolWindowFactory" id="Remodder"/>
   </extensions>
   
 </idea-plugin>

From bab1cc6ed69ec65e1b7edfc8e0ddd6ce6fc2ec00 Mon Sep 17 00:00:00 2001
From: Gareth Parker <blackfireweb@gmail.com>
Date: Sun, 22 Jun 2025 22:56:59 +0100
Subject: [PATCH 5/5] Update the template for 1.6 and throw in a quick
 implementation of using the users locally installed Harmony version for
 debugging (#70)

Update the template for 1.6 and throw in a quick implementation of using the users locally installed Harmony version for debugging (#70)
---
 .github/workflows/CI.yml                      |  17 ---
 CHANGELOG.md                                  |   2 +
 .../Source/MyRimWorldMod.csproj               |  22 +--
 src/rider/main/kotlin/helpers/ScopeHelper.kt  | 125 ++++++++++++++++++
 src/rider/main/kotlin/run/RunState.kt         |   6 +
 5 files changed, 147 insertions(+), 25 deletions(-)
 create mode 100644 src/rider/main/kotlin/helpers/ScopeHelper.kt

diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 79bc706..c16194a 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -19,14 +19,6 @@ jobs:
           distribution: 'corretto'
           java-version: '21'
           cache: 'gradle'
-      - uses: actions/cache@v4
-        with:
-          path: |
-            build/gradle-jvm
-            ~/.nuget/packages
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-Build-${{ hashFiles('gradlew.bat', 'src/dotnet/*/*.csproj', './*.props', 'gradle-wrapper.properties') }}
       - run: ./gradlew :buildPlugin --no-daemon
       - run: ./gradlew :buildResharperPlugin --no-daemon
       - uses: actions/upload-artifact@v4
@@ -46,13 +38,4 @@ jobs:
           distribution: 'corretto'
           java-version: '17'
           cache: 'gradle'
-      - uses: actions/cache@v4
-        with:
-          path: |
-            build/gradle-jvm
-            packages
-            ~/.nuget/packages
-            ~/.gradle/caches
-            ~/.gradle/wrapper
-          key: ${{ runner.os }}-Test-${{ hashFiles('gradlew.bat', 'src/dotnet/*/*.csproj', './*.props', 'gradle-wrapper.properties') }}
       - run: ./gradlew :testDotNet --no-daemon
\ No newline at end of file
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7986537..7a6fe60 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,8 @@
  * Adds support for [Parent=""] attributes
  * Makes the New Mod template modular, allowing you to select the components you want included in your mod
  * Bundled in Zetrith's Remodder code into this plugin
+ * Update the Rimworld template for 1.6
+ * Automatically detect and use the user-installed Harmony version for debugging, if available
 
 ## 2024.1.7
  * Solved some incompatibilities for ReSharper
diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj
index 2c6e5ec..0579493 100644
--- a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj
+++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj
@@ -28,15 +28,21 @@
         <ErrorReport>prompt</ErrorReport>
         <WarningLevel>4</WarningLevel>
     </PropertyGroup>
-
-    <ItemGroup>
-        <Reference Include="System"/>
-        <Reference Include="System.Core"/>
-        <Reference Include="System.Xml"/>
-    </ItemGroup>
-
+    
 <!--#if(assemblyExists)-->
     <ItemGroup>
+        <Reference Include="System">
+            <HintPath>AssemblyDir\System.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="System.Core">
+            <HintPath>AssemblyDir\System.Core.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
+        <Reference Include="System.Xml">
+            <HintPath>AssemblyDir\System.Xml.dll</HintPath>
+            <Private>False</Private>
+        </Reference>
         <Reference Include="Assembly-CSharp">
             <HintPath>Assembly-CSharp.dll</HintPath>
             <Private>False</Private>
@@ -52,7 +58,7 @@
         If that reference does not exist, it will add Krafs Rimworld Ref to the project. If it does exist, Krafs won't be added
         as a reference. This basically means that Krafs is treated as a fallback if Assembly-CSharp is not found -->
     <ItemGroup Condition="'@(Reference->WithMetadataValue('Identity', 'Assembly-CSharp')->Metadata('HintPath')->Exists())' == ''">
-        <PackageReference Include="Krafs.Rimworld.Ref" Version="1.4-*" />
+        <PackageReference Include="Krafs.Rimworld.Ref" Version="1.6.*" />
     </ItemGroup>
 
     <!-- To modify your build process, add your task inside one of the targets below and uncomment it.
diff --git a/src/rider/main/kotlin/helpers/ScopeHelper.kt b/src/rider/main/kotlin/helpers/ScopeHelper.kt
new file mode 100644
index 0000000..a486cf3
--- /dev/null
+++ b/src/rider/main/kotlin/helpers/ScopeHelper.kt
@@ -0,0 +1,125 @@
+package RimworldDev.Rider.helpers
+
+import java.io.File
+import java.nio.file.Files
+import javax.xml.parsers.DocumentBuilderFactory
+
+class ScopeHelper {
+    companion object {
+        fun getSteamLocations(): List<String> {
+            var home = System.getProperty("user.home")
+
+            var locations = mutableListOf<String>(
+                "C:\\Program Files (x86)\\Steam\\steamapps\\",
+                "C:\\Program Files\\Steam\\steamapps\\",
+                "${home}/steam/steam/steamapps/",
+                "${home}/snap/steam/common/.local/share/Steam/steamapps/",
+                "${home}/.local/share/Steam/steamapps/",
+            )
+
+            locations.addAll(File.listRoots().map {
+                "${it.path}/SteamLibrary/steamapps"
+            })
+
+            return locations.filter { location -> File(location).exists() }.map {
+                File(it).absoluteFile.toString()
+            }
+        }
+
+        fun findRimworldDirectory(): String? {
+            // @TODO: Check the user settings for the Rimworld location
+
+            var locations = mutableListOf<String>();
+            locations.addAll(getSteamLocations().filter {
+                File("${it}/common/Rimworld").exists()
+            }.map {
+                File("${it}/common/Rimworld").absolutePath.toString()
+            })
+
+            if (locations.isNotEmpty()) return locations.first()
+
+            // @TODO: Check from the current directory
+
+            return null
+        }
+
+        fun findModDirectories(): List<String> {
+            val locations = mutableListOf<String>()
+            val rimworldLocation = findRimworldDirectory()
+            if (rimworldLocation != null) {
+                var dataDirectory = File("$rimworldLocation/Data")
+                var modsDirectory = File("$rimworldLocation/Mods")
+
+                if (dataDirectory.exists()) locations.add(dataDirectory.absolutePath)
+                if (modsDirectory.exists()) locations.add(modsDirectory.absolutePath)
+            }
+
+            locations.addAll(getSteamLocations()
+                .map { "${it}/workshop/content/294100/" }
+                .filter { File(it).exists() }
+                .map { File(it).absolutePath }
+            )
+
+            return locations
+        }
+
+        fun findModLocation(id: String): String? {
+            val directoriesToCheck = findModDirectories()
+
+            val xmlReaderFactory = DocumentBuilderFactory.newInstance()
+            val builder = xmlReaderFactory.newDocumentBuilder()
+            for (directory in directoriesToCheck) {
+                for (child in File(directory).listFiles()) {
+                    if (!child.isDirectory) continue
+
+                    var aboutFile = File("${child.absolutePath}/About/About.xml")
+                    if (!aboutFile.exists()) continue
+
+                    val document = builder.parse(aboutFile)
+
+                    var a = 1 + 1
+                }
+            }
+
+            return null
+        }
+
+        fun findInstalledHarmonyDll(): String? {
+            val version = findRimworldVersion()
+            if (version == null) return null
+
+            val directoriesToCheck = findModDirectories()
+
+            val xmlReaderFactory = DocumentBuilderFactory.newInstance()
+            val builder = xmlReaderFactory.newDocumentBuilder()
+            for (directory in directoriesToCheck) {
+                for (child in File(directory).listFiles()) {
+                    if (!child.isDirectory) continue
+
+                    var aboutFile = File("${child.absolutePath}/About/About.xml")
+                    if (!aboutFile.exists()) continue
+
+                    if (child.name != "2009463077") continue
+
+                    if (File("${child.absolutePath}/${version}/Assemblies/0Harmony.dll").exists())
+                        return File("${child.absolutePath}/${version}/Assemblies/0Harmony.dll").absolutePath
+
+                    return File("${child.absolutePath}/Current/Assemblies/0Harmony.dll").absolutePath
+                }
+            }
+
+            return null
+        }
+
+        fun findRimworldVersion(): String? {
+            val directory = findRimworldDirectory()
+            if (directory == null) return null
+
+            if (!File("${directory}/Version.txt").exists()) return null
+
+            val contents = File("${directory}/Version.txt").readText()
+
+            return contents.substring(0, 3)
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/rider/main/kotlin/run/RunState.kt b/src/rider/main/kotlin/run/RunState.kt
index 8fcc73b..1615ff9 100644
--- a/src/rider/main/kotlin/run/RunState.kt
+++ b/src/rider/main/kotlin/run/RunState.kt
@@ -1,5 +1,6 @@
 package RimworldDev.Rider.run
 
+import RimworldDev.Rider.helpers.ScopeHelper
 import com.intellij.execution.ExecutionResult
 import com.intellij.execution.Executor
 import com.intellij.execution.configurations.RunProfileState
@@ -108,6 +109,11 @@ class RunState(
         currentResources.forEach {
             copyResource("/UnityDoorstop/${OS.CURRENT}/", it)
         }
+
+        val harmonyDll = ScopeHelper.findInstalledHarmonyDll()
+        if (harmonyDll != null) {
+            File(harmonyDll).copyTo(File("${rimworldDir}/Doorstop/0Harmony.dll"), true)
+        }
     }
 
     private fun removeDoorstep() {