Update to support Rider 2026.1

.gitignore

@@ -12,6 +12,7 @@ output
 *.user
 *.sln.docstates
 *.cache
+.kotlin
 
 # IDEs
 /.idea/*.iml
@@ -21,4 +22,11 @@ output
 .idea/shelf
 .vs
 _ReSharper*
-_dotTrace*
+_dotTrace*
+
+# Nuget
+packages/
+**/NuGetLocks/*
+
+# Example Mod
+example-mod/.idea

CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 2025.1.7
+ * Adds support for Rider 2026.1
+
 ## 2025.1.6
  * Update the Rimworld Mod Template to support 1.6 by default
 

Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
   <PropertyGroup>
-    <SdkVersion>2025.3.*</SdkVersion>
+    <SdkVersion>2026.1.*</SdkVersion>
 
     <Title>Rimworld Development Environment</Title>
     <Description>Bring the intelligence of your IDE to Rimworld XML files. Use information backed by Rimworlds DLL file to autocomplete your XML, Ctrl+Click into the C# that your XML gets translated into and see what options you have when adding items in your mods!</Description>

build.gradle.kts

@@ -1,15 +1,13 @@
 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
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
 
 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("me.filippov.gradle.jvm.wrapper") version "0.14.0"
+    id("org.jetbrains.intellij.platform") version "2.14.0"     // https://github.com/JetBrains/gradle-intellij-plugin/releases
+    id("me.filippov.gradle.jvm.wrapper") version "0.16.0"
 }
 
 
@@ -57,7 +55,7 @@ apply {
 }
 
 tasks.wrapper {
-    gradleVersion = "8.8"
+    gradleVersion = "9.4.1"
     distributionType = Wrapper.DistributionType.ALL
     distributionUrl =
         "https://cache-redirector.jetbrains.com/services.gradle.org/distributions/gradle-${gradleVersion}-all.zip"
@@ -82,74 +80,28 @@ tasks.instrumentTestCode {
 }
 
 tasks.compileKotlin {
-    kotlinOptions { jvmTarget = "21" }
+    compilerOptions { jvmTarget.set(JvmTarget.JVM_21) }
 }
 
-val setBuildTool by tasks.registering {
-    doLast {
-        extra["executable"] = "dotnet"
-        var args = mutableListOf("msbuild")
-
-        if (isWindows) {
-            val stdout = ByteArrayOutputStream()
-            exec {
-                executable("${rootDir}\\tools\\vswhere.exe")
-                args("-latest", "-property", "installationPath", "-products", "*")
-                standardOutput = stdout
-                workingDir(rootDir)
-            }
-
-            val vsWhereDirectory = stdout.toString().trim()
-            if (vsWhereDirectory.isNotEmpty()) {
-                val files = FileNameFinder().getFileNames("${vsWhereDirectory}\\MSBuild", "**/MSBuild.exe")
-                extra["executable"] = files.get(0)
-                args = mutableListOf("/v:minimal")
-            } else {
-                val directory = "${System.getProperty("user.home")}\\AppData\\Local\\Programs\\Rider\\tools\\MSBuild"
-                if (directory.isNotEmpty()) {
-                    val files = FileNameFinder().getFileNames(directory, "Current/Bin/MSBuild.exe")
-                    extra["executable"] = files.get(0)
-                    args = mutableListOf("/v:minimal")
-                }
-            }
-        }
-
-        args.add(DotnetSolution)
-        args.add("/p:Configuration=${BuildConfiguration}")
-        args.add("/p:HostFullIdentifier=")
-        extra["args"] = args
-    }
+val compileDotNet by tasks.registering(Exec::class) {
+    executable("dotnet")
+    workingDir(rootDir)
+    args("build", "--consoleLoggerParameters:ErrorsOnly", "--configuration", "Release")
 }
 
-val compileDotNet by tasks.registering {
-    dependsOn(setBuildTool)
-    doLast {
-        val executable: String by setBuildTool.get().extra
-        val arguments = (setBuildTool.get().extra["args"] as List<String>).toMutableList()
-        arguments.add("/t:Restore;Rebuild")
-        exec {
-            executable(executable)
-            args(arguments)
-            workingDir(rootDir)
-        }
-    }
-}
+val buildResharperPlugin by tasks.registering(Exec::class) {
+    val arguments = mutableListOf<String>()
+    arguments.add("msbuild")
+    arguments.add(DotnetSolution)
 
-val buildResharperPlugin by tasks.registering {
-    dependsOn(setBuildTool)
-    doLast {
-        val executable: String by setBuildTool.get().extra
-        val arguments = (setBuildTool.get().extra["args"] as List<String>).toMutableList()
-        arguments.add("/t:Restore;Rebuild;Pack")
-        arguments.add("/v:minimal")
-        arguments.add("/p:PackageOutputPath=\"$rootDir/output\"")
-        arguments.add("/p:PackageVersion=$PluginVersion")
-        exec {
-            executable(executable)
-            args(arguments)
-            workingDir(rootDir)
-        }
-    }
+    arguments.add("/t:Restore;Rebuild;Pack")
+    arguments.add("/v:minimal")
+    arguments.add("/p:PackageOutputPath=\"$rootDir/output\"")
+    arguments.add("/p:PackageVersion=$PluginVersion")
+
+    executable("dotnet")
+    args(arguments)
+    workingDir(rootDir)
 }
 
 tasks.buildPlugin {
@@ -163,7 +115,11 @@ tasks.buildPlugin {
 
 dependencies {
     intellijPlatform {
-        rider(ProductVersion, useInstaller = false)
+        rider(ProductVersion)
+        {
+            useInstaller = false
+        }
+
         jetbrainsRuntime()
 
         bundledPlugin("com.intellij.resharper.unity")
@@ -176,19 +132,25 @@ intellijPlatform {
         freeArgs = listOf("-mute", "TemplateWordInPluginId")
 
         ides {
-            ide(IntelliJPlatformType.Rider, ProductVersion)
+//            ide(IntelliJPlatformType.Rider, ProductVersion)
             recommended()
         }
     }
 }
 
 tasks.runIde {
+    dependsOn(compileDotNet)
+
     // Match Rider's default heap size of 1.5Gb (default for runIde is 512Mb)
     maxHeapSize = "1500m"
 
     // Rider's backend doesn't support dynamic plugins. It might be possible to work with auto-reload of the frontend
     // part of a plugin, but there are dangers about keeping plugins in sync
     autoReload = false
+
+    argumentProviders += CommandLineArgumentProvider {
+        listOf("${rootDir}/example-mod/AshAndDust.sln")
+    }
 }
 
 tasks.prepareSandbox {
@@ -223,14 +185,10 @@ tasks.prepareSandbox {
     }
 }
 
-val testDotNet by tasks.registering {
-    doLast {
-        exec {
-            executable("dotnet")
-            args("test", DotnetSolution, "--logger", "GitHubActions")
-            workingDir(rootDir)
-        }
-    }
+val testDotNet by tasks.registering(Exec::class) {
+    executable("dotnet")
+    args("test", DotnetSolution, "--logger", "GitHubActions")
+    workingDir(rootDir)
 }
 
 tasks.publishPlugin {

example-mod/1.4/Defs/CannibalBurial/Building_CannibalFeast.xml

@@ -0,0 +1,85 @@
+<Defs>
+    <ThingDef ParentName="BuildingBase">
+        <defName>CannibalFeast</defName>
+        <label>cannibal feast</label>
+        <description>An alter upon which the dead are placed to be consumed by their friends and family</description>
+        <ideoBuildingNamerBase>NamerCannibalPlatter</ideoBuildingNamerBase>
+        <thingClass>AshAndDust.Cannibal.Buildings.CannibalFeast</thingClass>
+        <drawerType>MapMeshAndRealTime</drawerType>
+        <graphicData>
+            <graphicClass>Graphic_Multi</graphicClass>
+            <texPath>Things/Building/CannibalAltar/CannibalAltar</texPath>
+            <shaderType>CutoutComplex</shaderType>
+            <drawSize>(2.5,1.665)</drawSize>
+            <shadowData>
+                <volume>(0.8, 1 ,0.8)</volume>
+            </shadowData>
+        </graphicData>
+        <size>(3,2)</size>
+        <costStuffCount>30</costStuffCount>
+        <stuffCategories>
+            <li>Woody</li>
+            <li>Metallic</li>
+            <li>Stony</li>
+        </stuffCategories>
+        <leaveResourcesWhenKilled>false</leaveResourcesWhenKilled>
+        <defaultPlacingRot>South</defaultPlacingRot>
+        <ritualFocus>
+            <spectateDistance>1~2</spectateDistance>
+        </ritualFocus>
+        <statBases>
+            <MaxHitPoints>50</MaxHitPoints>
+            <WorkToBuild>10000</WorkToBuild>
+            <Mass>25</Mass>
+        </statBases>
+        <terrainAffordanceNeeded>Light</terrainAffordanceNeeded>
+        <passability>PassThroughOnly</passability>
+        <placeWorkers Inherit="False" />
+        <building>
+            <ai_chillDestination>false</ai_chillDestination>
+            <preventDeteriorationInside>true</preventDeteriorationInside>
+            <haulToContainerDuration>500</haulToContainerDuration>
+            <fullGraveGraphicData>
+                <texPath>Things/Building/CannibalAltar/CannibalAltar</texPath>
+                <shaderType>CutoutComplex</shaderType>
+                <graphicClass>Graphic_Multi</graphicClass>
+                <drawSize>(2.5,1.665)</drawSize>
+                <shadowData>
+                    <volume>(0.8, 1 ,0.8)</volume>
+                </shadowData>
+            </fullGraveGraphicData>
+            <fixedStorageSettings>
+                <filter>
+                    <categories>
+                        <li>Corpses</li>
+                    </categories>
+                </filter>
+            </fixedStorageSettings>
+            <defaultStorageSettings>
+                <priority>Important</priority>
+                <filter>
+                    <categories>
+                        <li>CorpsesHumanlike</li>
+                    </categories>
+                    <specialFiltersToDisallow>
+                        <li>AllowCorpsesStranger</li>
+                    </specialFiltersToDisallow>
+                </filter>
+            </defaultStorageSettings>
+            <destroySound>BuildingDestroyed_Wood_Small</destroySound>
+        </building>
+        <comps>
+            <li Class="CompProperties_AssignableToPawn">
+                <drawAssignmentOverlay>false</drawAssignmentOverlay>
+                <compClass>CompAssignableToPawn_Grave</compClass>
+            </li>
+            <li Class="AshAndDust.Utils.CompRequiresPrecept_Properties">
+                <OneOf>
+                    <li>CannibalFuneral</li>
+                </OneOf>
+            </li>
+        </comps>
+        <designationCategory>Misc</designationCategory>
+        <designationHotKey>Misc9</designationHotKey>
+    </ThingDef>
+</Defs>

example-mod/1.4/Defs/CannibalBurial/Duties.xml

@@ -0,0 +1,17 @@
+<Defs>
+    <DutyDef>
+        <defName>EatAtCannibalFuneral</defName>
+        <hook>HighPriority</hook>
+        <thinkNode Class="ThinkNode_Priority">
+            <subNodes>
+                <li Class="AshAndDust.Cannibal.Jobs.EatAtFuneralGiver" />
+            </subNodes>
+        </thinkNode>
+    </DutyDef>
+
+    <JobDef>
+        <defName>EatAtCannibalFuneral</defName>
+        <driverClass>AshAndDust.Cannibal.Jobs.EatAtFuneralDriver</driverClass>
+        <reportString>eating at TargetA.</reportString>
+    </JobDef>
+</Defs>