Decided that ScriptTemplates should simply contain all templates, inc…

…luding mods.
malforge · Jan 4, 2025 · 1e57585 · 1e57585
1 parent 445c181
commit 1e57585
Show file tree

Hide file tree

Showing 54 changed files with 16 additions and 750 deletions.
diff --git a/Source/MDK-Complete.slnx b/Source/MDK-Complete.slnx
@@ -26,19 +26,19 @@
     </Project>
   </Folder>
   <Folder Name="/Templates/">
-    <Project Path="Templates\content\0_Script\PbScript.csproj">
+    <Project Path="ScriptTemplates\ScriptTemplates.csproj" Type="Classic C#" />
+    <Project Path="ScriptTemplates\content\0_Script\PbScript.csproj">
       <Configuration Solution="Debug|x64" Project="Debug|x64" />
       <Configuration Solution="Release|x64" Project="Release|x64" />
     </Project>
-    <Project Path="Templates\content\1_Mod\ModProject.csproj">
+    <Project Path="ScriptTemplates\content\1_Mod\ModProject.csproj">
       <Configuration Solution="Debug|x64" Project="Debug|x64" />
       <Configuration Solution="Release|x64" Project="Release|x64" />
     </Project>
-    <Project Path="Templates\content\2_Mixin\MixinProject.shproj">
+    <Project Path="ScriptTemplates\content\2_Mixin\MixinProject.shproj">
       <Configuration Solution="Debug|x64" Project="Debug|Any CPU" />
       <Configuration Solution="Release|x64" Project="Release|Any CPU" />
     </Project>
-    <Project Path="Templates\Templates.csproj" Type="Classic C#" />
   </Folder>
   <Project Path="Mdk.CheckDotNet\Mdk.CheckDotNet.csproj" Type="Classic C#">
     <Configuration Solution="Debug|x64" Project="Debug|Any CPU" />

diff --git a/Source/ModTemplates/ModTemplates.csproj b/Source/ModTemplates/ModTemplates.csproj
diff --git a/Source/ModTemplates/PackageVersion.txt b/Source/ModTemplates/PackageVersion.txt
diff --git a/Source/ModTemplates/README.md b/Source/ModTemplates/README.md
diff --git a/Source/ModTemplates/ReleaseNotes.txt b/Source/ModTemplates/ReleaseNotes.txt
diff --git a/Source/ModTemplates/UpdatePackageReferences.ps1 b/Source/ModTemplates/UpdatePackageReferences.ps1
diff --git a/Source/ModTemplates/content/0_Mod/ModProject.csproj b/Source/ModTemplates/content/0_Mod/ModProject.csproj
diff --git a/Source/ModTemplates/description.txt b/Source/ModTemplates/description.txt
diff --git a/Source/ScriptTemplates/PackageVersion.txt b/Source/ScriptTemplates/PackageVersion.txt
@@ -1 +1 @@
-2.0.22
+2.1.0
diff --git a/Source/ScriptTemplates/README.md b/Source/ScriptTemplates/README.md
@@ -1,5 +1,5 @@
-This template sets up a project for scripting in Space Engineers using the MDK2 toolkits. It will automatically
-add the required nuget packages.
+These templates sets up projects for scripting or modding in Space Engineers using the MDK2 toolkits. It 
+will automatically add the required nuget packages.
 
 Please remember that you need the Space Engineers game installed on your computer to use the MDK2 toolkits.
 

diff --git a/Source/ScriptTemplates/ReleaseNotes.txt b/Source/ScriptTemplates/ReleaseNotes.txt
@@ -1,3 +1,6 @@
+v.2.1.0
+ - Added mod template. Renamed the mixin to MDK Mixin because it can be used for both mods and scripts.
+
 v.2.0.22
  - Updated the package versions in the template.
 

diff --git a/Source/ScriptTemplates/UpdatePackageReferences.ps1 b/Source/ScriptTemplates/UpdatePackageReferences.ps1
@@ -2,6 +2,7 @@
 $pbPackagerVersionFile = "../Mdk.CommandLine/PackageVersion.txt"
 $referencesVersionFile = "../Mdk.References/PackageVersion.txt"
 $pbAnalyzersVersionFile = "../Mdk.PbAnalyzers/PackageVersion.txt"
+$modAnalyzersVersionFile = "../Mdk.ModAnalyzers/PackageVersion.txt"
 
 # Path to the .csproj file (relative to the ScriptTemplates project)
 $projectFile = "content/0_Script/PbScript.csproj"
@@ -41,8 +42,7 @@ function Update-PackageVersion {
     $packageRef = $xml.Project.ItemGroup.PackageReference | Where-Object { $_.Include -eq $packageName }
 
     if (-not $packageRef) {
-        Write-Host "Error: Package $packageName not found in the project file" -ForegroundColor Red
-        exit 1
+        return;
     }
 
     # Check if the version is different
@@ -121,6 +121,7 @@ $versionChanged = $false
 $versionChanged = $versionChanged -or (Update-PackageVersion "Mal.Mdk2.PbPackager" $pbPackagerVersionFile)
 $versionChanged = $versionChanged -or (Update-PackageVersion "Mal.Mdk2.References" $referencesVersionFile)
 $versionChanged = $versionChanged -or (Update-PackageVersion "Mal.Mdk2.PbAnalyzers" $pbAnalyzersVersionFile)
+$versionChanged = $versionChanged -or (Update-PackageVersion "Mal.Mdk2.ModAnalyzers" $modAnalyzersVersionFile)
 
 # If any package versions were updated, bump this package's version and update release notes
 if ($versionChanged) {

diff --git a/Source/ScriptTemplates/content/0_Script/.template.config/template.json b/Source/ScriptTemplates/content/0_Script/.template.config/template.json
@@ -6,7 +6,7 @@
   "description": "A script for the programmable block in the game Space Engineers by Keen Software House.",
   "identity": "Mal.Mdk2.IngameScriptTemplate",
   "shortName": "mdk2pbscript",
-  "defaultName": "Mdk.PbScript1",
+  "defaultName": "Mdk.PbScript",
   "tags": {
     "language": "C#",
     "type": "project"

diff --git a/Source/ScriptTemplates/content/1_Mixin/.template.config/template.json b/Source/ScriptTemplates/content/1_Mixin/.template.config/template.json
diff --git a/Source/ScriptTemplates/content/1_Mixin/PbMixin.projitems b/Source/ScriptTemplates/content/1_Mixin/PbMixin.projitems
diff --git a/Source/ScriptTemplates/content/1_Mixin/PbMixin.shproj b/Source/ScriptTemplates/content/1_Mixin/PbMixin.shproj
diff --git a/...s/content/0_Mod/.template.config/icon.png → ...s/content/1_Mod/.template.config/icon.png b/...s/content/0_Mod/.template.config/icon.png → ...s/content/1_Mod/.template.config/icon.png
diff --git a/...tent/0_Mod/.template.config/ide.host.json → ...tent/1_Mod/.template.config/ide.host.json b/...tent/0_Mod/.template.config/ide.host.json → ...tent/1_Mod/.template.config/ide.host.json
diff --git a/...tent/0_Mod/.template.config/template.json → ...tent/1_Mod/.template.config/template.json b/...tent/0_Mod/.template.config/template.json → ...tent/1_Mod/.template.config/template.json
diff --git a/.../content/0_Mod/Data/SBC files can go here → .../content/1_Mod/Data/SBC files can go here b/.../content/0_Mod/Data/SBC files can go here → .../content/1_Mod/Data/SBC files can go here
diff --git a/...Templates/content/1_Mod/ModProject.csproj → ...Templates/content/1_Mod/ModProject.csproj b/...Templates/content/1_Mod/ModProject.csproj → ...Templates/content/1_Mod/ModProject.csproj
diff --git a/...emplates/content/0_Mod/ModProject.mdk.ini → ...emplates/content/1_Mod/ModProject.mdk.ini b/...emplates/content/0_Mod/ModProject.mdk.ini → ...emplates/content/1_Mod/ModProject.mdk.ini
diff --git a/...es/content/0_Mod/ModProject.mdk.local.ini → ...es/content/1_Mod/ModProject.mdk.local.ini b/...es/content/0_Mod/ModProject.mdk.local.ini → ...es/content/1_Mod/ModProject.mdk.local.ini
diff --git a/.../content/0_Mod/Place your code files here → .../content/1_Mod/Place your code files here b/.../content/0_Mod/Place your code files here → .../content/1_Mod/Place your code files here
diff --git a/...content/1_Mixin/.template.config/icon.png → ...content/2_Mixin/.template.config/icon.png b/...content/1_Mixin/.template.config/icon.png → ...content/2_Mixin/.template.config/icon.png
diff --git a/...nt/1_Mixin/.template.config/ide.host.json → ...nt/2_Mixin/.template.config/ide.host.json b/...nt/1_Mixin/.template.config/ide.host.json → ...nt/2_Mixin/.template.config/ide.host.json
diff --git a/...nt/2_Mixin/.template.config/template.json → ...nt/2_Mixin/.template.config/template.json b/...nt/2_Mixin/.template.config/template.json → ...nt/2_Mixin/.template.config/template.json
diff --git a/...es/content/2_Mixin/MixinProject.projitems → ...es/content/2_Mixin/MixinProject.projitems b/...es/content/2_Mixin/MixinProject.projitems → ...es/content/2_Mixin/MixinProject.projitems
diff --git a/...lates/content/2_Mixin/MixinProject.shproj → ...lates/content/2_Mixin/MixinProject.shproj b/...lates/content/2_Mixin/MixinProject.shproj → ...lates/content/2_Mixin/MixinProject.shproj
diff --git a/Source/ScriptTemplates/description.txt b/Source/ScriptTemplates/description.txt
@@ -1,5 +1,5 @@
-This template sets up a project for scripting in Space Engineers using the MDK2 toolkits. It will automatically
-add the required nuget packages.
+These templates sets up projects for scripting or modding in Space Engineers using the MDK2 toolkits. It 
+will automatically add the required nuget packages.
 
 Please remember that you need the Space Engineers game installed on your computer to use the MDK2 toolkits.
 

diff --git a/Source/Templates/PackageVersion.txt b/Source/Templates/PackageVersion.txt