From 2d02cdb8a1fce7e47b3680dddcef4351cb52f743 Mon Sep 17 00:00:00 2001
From: Gareth <blackfireweb@gmail.com>
Date: Sun, 22 Jun 2025 22:04:10 +0100
Subject: [PATCH 1/4] Update the template for 1.6 and throw in a quick
 implementation of using the users locally installed Harmony version for
 debugging

---
 .../Source/MyRimWorldMod.csproj               |  20 ++-
 src/rider/main/kotlin/helpers/ScopeHelper.kt  | 125 ++++++++++++++++++
 src/rider/main/kotlin/run/RunState.kt         |   6 +
 3 files changed, 146 insertions(+), 5 deletions(-)
 create mode 100644 src/rider/main/kotlin/helpers/ScopeHelper.kt

diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj
index 2c6e5ec..6d0619e 100644
--- a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj
+++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj
@@ -30,13 +30,23 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <Reference Include="System"/>
-        <Reference Include="System.Core"/>
-        <Reference Include="System.Xml"/>
-    </ItemGroup>
 
+    </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 +62,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() {

From 7c6c68e2870cad3d2e9825714159a67a35588366 Mon Sep 17 00:00:00 2001
From: Gareth <blackfireweb@gmail.com>
Date: Sun, 22 Jun 2025 22:06:25 +0100
Subject: [PATCH 2/4] Update the changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

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

From a60cbdc1b4c6d4de2090f281c12cd3bd4577b02c Mon Sep 17 00:00:00 2001
From: Gareth <blackfireweb@gmail.com>
Date: Sun, 22 Jun 2025 22:06:57 +0100
Subject: [PATCH 3/4] Quick cleanup

---
 .../RimworldProjectTemplate/Source/MyRimWorldMod.csproj       | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj
index 6d0619e..0579493 100644
--- a/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj
+++ b/src/dotnet/ReSharperPlugin.RimworldDev/ProjectTemplates/RimworldProjectTemplate/Source/MyRimWorldMod.csproj
@@ -28,10 +28,6 @@
         <ErrorReport>prompt</ErrorReport>
         <WarningLevel>4</WarningLevel>
     </PropertyGroup>
-
-    <ItemGroup>
-
-    </ItemGroup>
     
 <!--#if(assemblyExists)-->
     <ItemGroup>

From 155a813f77566ddb5ba5d33544258c8fbd0740c9 Mon Sep 17 00:00:00 2001
From: Gareth <blackfireweb@gmail.com>
Date: Sun, 22 Jun 2025 22:40:01 +0100
Subject: [PATCH 4/4] Remove cache due to disk space issues

---
 .github/workflows/CI.yml | 17 -----------------
 1 file changed, 17 deletions(-)

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