diff --git a/1.3/Assemblies/RJW_PlasticSurgeries.dll b/1.3/Assemblies/RJW_PlasticSurgeries.dll index 0186651..2761384 100644 Binary files a/1.3/Assemblies/RJW_PlasticSurgeries.dll and b/1.3/Assemblies/RJW_PlasticSurgeries.dll differ diff --git a/1.4/Assemblies/RJW_PlasticSurgeries.dll b/1.4/Assemblies/RJW_PlasticSurgeries.dll index 2954131..512eb3e 100644 Binary files a/1.4/Assemblies/RJW_PlasticSurgeries.dll and b/1.4/Assemblies/RJW_PlasticSurgeries.dll differ diff --git a/1.5/Assemblies/RJW_PlasticSurgeries.dll b/1.5/Assemblies/RJW_PlasticSurgeries.dll new file mode 100644 index 0000000..717f787 Binary files /dev/null and b/1.5/Assemblies/RJW_PlasticSurgeries.dll differ diff --git a/Source/RJW_PlasticSurgeries/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Beautify.xml b/1.5/Defs/Recipe_Surgery/Recipes_Surgery_Beautify.xml similarity index 100% rename from Source/RJW_PlasticSurgeries/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Beautify.xml rename to 1.5/Defs/Recipe_Surgery/Recipes_Surgery_Beautify.xml diff --git a/Source/RJW_PlasticSurgeries/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Mammoplasty.xml b/1.5/Defs/Recipe_Surgery/Recipes_Surgery_Mammoplasty.xml similarity index 100% rename from Source/RJW_PlasticSurgeries/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Mammoplasty.xml rename to 1.5/Defs/Recipe_Surgery/Recipes_Surgery_Mammoplasty.xml diff --git a/Source/RJW_PlasticSurgeries/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Penoplasty.xml b/1.5/Defs/Recipe_Surgery/Recipes_Surgery_Penoplasty.xml similarity index 100% rename from Source/RJW_PlasticSurgeries/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Penoplasty.xml rename to 1.5/Defs/Recipe_Surgery/Recipes_Surgery_Penoplasty.xml diff --git a/Source/RJW_PlasticSurgeries/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Sphinctoplasty.xml b/1.5/Defs/Recipe_Surgery/Recipes_Surgery_Sphinctoplasty.xml similarity index 100% rename from Source/RJW_PlasticSurgeries/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Sphinctoplasty.xml rename to 1.5/Defs/Recipe_Surgery/Recipes_Surgery_Sphinctoplasty.xml diff --git a/Source/RJW_PlasticSurgeries/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Vaginoplasty.xml b/1.5/Defs/Recipe_Surgery/Recipes_Surgery_Vaginoplasty.xml similarity index 100% rename from Source/RJW_PlasticSurgeries/1.3/Defs/Recipe_Surgery/Recipes_Surgery_Vaginoplasty.xml rename to 1.5/Defs/Recipe_Surgery/Recipes_Surgery_Vaginoplasty.xml diff --git a/About/About.xml b/About/About.xml index dfd4a34..55aab1b 100644 --- a/About/About.xml +++ b/About/About.xml @@ -6,6 +6,7 @@
  • 1.3
  • 1.4
    • +
  • 1.5
    •  Stardust3D.RJW.PlasticSurgeries Surgically alter pawn's genitals. @@ -21,16 +22,10 @@ steam://url/CommunityFilePage/2009463077 https://github.com/pardeike/HarmonyRimWorld/releases/latest -
  • Ludeon.RimWorld
  • rim.job.world
    • -
  • NuttySquabble.Dyspareunia
  • LustLicentia.RJWLabs
    •  \ No newline at end of file diff --git a/About/Manifest.xml b/About/Manifest.xml index c35b410..cb4e292 100644 --- a/About/Manifest.xml +++ b/About/Manifest.xml @@ -2,5 +2,5 @@ RJW PlasticSurgeries - 5390.0.1.6 + 5400.0.1.8 \ No newline at end of file diff --git a/Source/RJW_PlasticSurgeries/1.5/Recipe_Plastic_Surgery.cs b/Source/RJW_PlasticSurgeries/1.5/Recipe_Plastic_Surgery.cs new file mode 100644 index 0000000..0277836 --- /dev/null +++ b/Source/RJW_PlasticSurgeries/1.5/Recipe_Plastic_Surgery.cs @@ -0,0 +1,53 @@ +using System.Collections.Generic; +using RimWorld; +using rjw; +using Verse; + +namespace RJW_PlasticSurgeries +{ + public abstract class Recipe_Plastic_Surgery : Recipe_Surgery + { + protected readonly bool HasLicentia = ModLister.HasActiveModWithName("RimJobWorld - Licentia Labs"); + + public override IEnumerable GetPartsToApplyOn(Pawn pawn, RecipeDef recipe) + { + var part = GetPartCandidate(pawn); + if (part != null) + { + var hediffs = Genital_Helper.get_PartsHediffList(pawn, part); + if (HasPart(pawn, hediffs)) yield return part; + } + } + + protected abstract BodyPartRecord GetPartCandidate(Pawn pawn); + protected abstract bool HasPart(Pawn pawn, List hediffs); + + public override void ApplyOnPawn(Pawn pawn, BodyPartRecord part, Pawn billDoer, List ingredients, + Bill bill) + { + if (billDoer != null) + { + TaleRecorder.RecordTale(TaleDefOf.DidSurgery, billDoer, pawn); + SurgeryResult(pawn); + } + } + + protected abstract void SurgeryResult(Pawn pawn); + + protected void SurgeryX(Pawn pawn, float severity, bool damagePart = false) + { + GetHediffs(pawn).ForEach(hed => + { + hed.Severity = severity; + if (damagePart && HasLicentia) + { + var (type, damage) = GetLicentiaDamage(); + LicentiaLabs.DamageHelper.ApplyDamage(pawn, hed.Part, type, damage); + } + }); + } + + protected abstract List GetHediffs(Pawn pawn); + protected abstract (HediffDef, float) GetLicentiaDamage(); + } +} \ No newline at end of file diff --git a/Source/RJW_PlasticSurgeries/1.5/Recipe_Surgery_Beautify.cs b/Source/RJW_PlasticSurgeries/1.5/Recipe_Surgery_Beautify.cs new file mode 100644 index 0000000..bdf4023 --- /dev/null +++ b/Source/RJW_PlasticSurgeries/1.5/Recipe_Surgery_Beautify.cs @@ -0,0 +1,61 @@ +using System.Collections.Generic; +using RimWorld; +using Verse; +using static rjw.VanillaTraitDefOf; + +namespace RJW_PlasticSurgeries +{ + /// + public abstract class Recipe_Surgery_Beautify : Recipe_Surgery + { + /// + public override IEnumerable GetPartsToApplyOn(Pawn pawn, RecipeDef recipe) + { + if (!pawn.story.traits.HasTrait(Beauty) || + pawn.story.traits.HasTrait(Beauty) && pawn.story.traits.GetTrait(Beauty).Degree < 2) + yield return pawn.RaceProps.body.corePart; + } + + /// + public override void ApplyOnPawn(Pawn pawn, BodyPartRecord part, Pawn billDoer, List ingredients, + Bill bill) + { + if (billDoer != null) + { + TaleRecorder.RecordTale(TaleDefOf.DidSurgery, billDoer, pawn); + SurgeryResult(pawn); + } + } + + /// + /// + /// + /// + public abstract void SurgeryResult(Pawn pawn); + + /// + /// Setts the severity of the Beautiful trait for the selected pawn. + /// If the trait doesn't exist in the pawns traits, it will be added. + /// + /// the pawn to modify + /// the new severity of the pawn's Beautiful trait + protected void SurgeryX(Pawn pawn, int severity) + { + if (pawn.story.traits.HasTrait(Beauty)) + { + pawn.story.traits.allTraits.FindAll(t => Beauty.ConflictsWith(t)) + .ForEach(t => pawn.story.traits.RemoveTrait(t)); + pawn.story.traits.RemoveTrait(pawn.story.traits.allTraits.Find(t => t.def == Beauty)); + } + + pawn.story.traits.GainTrait(new Trait(Beauty, severity)); + } + } + + /// + public class Recipe_Surgery_Beautify_Beautiful : Recipe_Surgery_Beautify + { + /// + public override void SurgeryResult(Pawn pawn) => SurgeryX(pawn, 2); + } +} \ No newline at end of file diff --git a/Source/RJW_PlasticSurgeries/1.5/VanillaTraitDefOf.cs b/Source/RJW_PlasticSurgeries/1.5/VanillaTraitDefOf.cs new file mode 100644 index 0000000..918c7ca --- /dev/null +++ b/Source/RJW_PlasticSurgeries/1.5/VanillaTraitDefOf.cs @@ -0,0 +1,26 @@ +using Verse; +using RimWorld; + +namespace rjw +{ + [DefOf] + public static class VanillaTraitDefOf + { + public static TraitDef Tough; + + public static TraitDef Nerves; + + public static TraitDef Beauty; + + public static TraitDef TooSmart; + + public static TraitDef NaturalMood; + + public static TraitDef Cannibal; + + static VanillaTraitDefOf() + { + DefOfHelper.EnsureInitializedInCtor(typeof(VanillaTraitDefOf)); + } + } +} \ No newline at end of file diff --git a/Source/RJW_PlasticSurgeries/About/About.xml b/Source/RJW_PlasticSurgeries/About/About.xml index dfd4a34..55aab1b 100644 --- a/Source/RJW_PlasticSurgeries/About/About.xml +++ b/Source/RJW_PlasticSurgeries/About/About.xml @@ -6,6 +6,7 @@
  • 1.3
  • 1.4
    • +
  • 1.5
    •  Stardust3D.RJW.PlasticSurgeries Surgically alter pawn's genitals. @@ -21,16 +22,10 @@ steam://url/CommunityFilePage/2009463077 https://github.com/pardeike/HarmonyRimWorld/releases/latest -
  • Ludeon.RimWorld
  • rim.job.world
    • -
  • NuttySquabble.Dyspareunia
  • LustLicentia.RJWLabs
    •  \ No newline at end of file diff --git a/Source/RJW_PlasticSurgeries/About/Manifest.xml b/Source/RJW_PlasticSurgeries/About/Manifest.xml index c35b410..cb4e292 100644 --- a/Source/RJW_PlasticSurgeries/About/Manifest.xml +++ b/Source/RJW_PlasticSurgeries/About/Manifest.xml @@ -2,5 +2,5 @@ RJW PlasticSurgeries - 5390.0.1.6 + 5400.0.1.8 \ No newline at end of file diff --git a/Source/RJW_PlasticSurgeries/1.4/Defs/Recipe_Surgery/Recipes_Surgery_Beautify.xml b/Source/RJW_PlasticSurgeries/Defs/Recipe_Surgery/Recipes_Surgery_Beautify.xml similarity index 100% rename from Source/RJW_PlasticSurgeries/1.4/Defs/Recipe_Surgery/Recipes_Surgery_Beautify.xml rename to Source/RJW_PlasticSurgeries/Defs/Recipe_Surgery/Recipes_Surgery_Beautify.xml diff --git a/Source/RJW_PlasticSurgeries/1.4/Defs/Recipe_Surgery/Recipes_Surgery_Mammoplasty.xml b/Source/RJW_PlasticSurgeries/Defs/Recipe_Surgery/Recipes_Surgery_Mammoplasty.xml similarity index 100% rename from Source/RJW_PlasticSurgeries/1.4/Defs/Recipe_Surgery/Recipes_Surgery_Mammoplasty.xml rename to Source/RJW_PlasticSurgeries/Defs/Recipe_Surgery/Recipes_Surgery_Mammoplasty.xml diff --git a/Source/RJW_PlasticSurgeries/1.4/Defs/Recipe_Surgery/Recipes_Surgery_Penoplasty.xml b/Source/RJW_PlasticSurgeries/Defs/Recipe_Surgery/Recipes_Surgery_Penoplasty.xml similarity index 100% rename from Source/RJW_PlasticSurgeries/1.4/Defs/Recipe_Surgery/Recipes_Surgery_Penoplasty.xml rename to Source/RJW_PlasticSurgeries/Defs/Recipe_Surgery/Recipes_Surgery_Penoplasty.xml diff --git a/Source/RJW_PlasticSurgeries/1.4/Defs/Recipe_Surgery/Recipes_Surgery_Sphinctoplasty.xml b/Source/RJW_PlasticSurgeries/Defs/Recipe_Surgery/Recipes_Surgery_Sphinctoplasty.xml similarity index 100% rename from Source/RJW_PlasticSurgeries/1.4/Defs/Recipe_Surgery/Recipes_Surgery_Sphinctoplasty.xml rename to Source/RJW_PlasticSurgeries/Defs/Recipe_Surgery/Recipes_Surgery_Sphinctoplasty.xml diff --git a/Source/RJW_PlasticSurgeries/1.4/Defs/Recipe_Surgery/Recipes_Surgery_Vaginoplasty.xml b/Source/RJW_PlasticSurgeries/Defs/Recipe_Surgery/Recipes_Surgery_Vaginoplasty.xml similarity index 100% rename from Source/RJW_PlasticSurgeries/1.4/Defs/Recipe_Surgery/Recipes_Surgery_Vaginoplasty.xml rename to Source/RJW_PlasticSurgeries/Defs/Recipe_Surgery/Recipes_Surgery_Vaginoplasty.xml diff --git a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.3.csproj b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.3.csproj index e82420f..71b95a0 100644 --- a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.3.csproj +++ b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.3.csproj @@ -8,15 +8,15 @@ Properties RJW_PlasticSurgeries RJW_PlasticSurgeries - net48 + net472 512 11 ©2024 Stardust3D Stardust3D - 5390.0.1.6 - 5390.0.1.6 + 5400.0.1.8 + 5400.0.1.8 true RJW_PlasticSurgeries.snk Surgically alter pawn's genitals. @@ -36,9 +36,6 @@ - - ..\..\..\dyspareunia\1.3\Assemblies\Dyspareunia.dll - ..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll diff --git a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.4.csproj b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.4.csproj index 8da69ff..ea6ba56 100644 --- a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.4.csproj +++ b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.4.csproj @@ -8,15 +8,15 @@ Properties RJW_PlasticSurgeries RJW_PlasticSurgeries - net48 + net472 512 11 ©2024 Stardust3D Stardust3D - 5390.0.1.6 - 5390.0.1.6 + 5400.0.1.8 + 5400.0.1.8 true RJW_PlasticSurgeries.snk Surgically alter pawn's genitals. @@ -36,9 +36,6 @@ - - ..\..\..\dyspareunia\1.4\Assemblies\Dyspareunia.dll - ..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll diff --git a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.5.csproj b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.5.csproj index 0aa915d..8961655 100644 --- a/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.5.csproj +++ b/Source/RJW_PlasticSurgeries/RJW_PlasticSurgeries_1.5.csproj @@ -8,21 +8,21 @@ Properties RJW_PlasticSurgeries RJW_PlasticSurgeries - net48 + net472 512 11 ©2024 Stardust3D Stardust3D - 5390.0.1.6 - 5390.0.1.6 + 5400.0.1.8 + 5400.0.1.8 true RJW_PlasticSurgeries.snk Surgically alter pawn's genitals. - bin\Release\1.4\ + bin\Release\1.5\ @@ -32,13 +32,10 @@ - + - - ..\..\..\dyspareunia\1.5\Assemblies\Dyspareunia.dll - ..\..\..\licentia-labs\Assemblies\LicentiaLabs.dll @@ -49,10 +46,11 @@ + + - diff --git a/Source/RJW_PlasticSurgeries/Recipe_Plastic_Surgery.cs b/Source/RJW_PlasticSurgeries/Recipe_Plastic_Surgery.cs index 829a5b4..0277836 100644 --- a/Source/RJW_PlasticSurgeries/Recipe_Plastic_Surgery.cs +++ b/Source/RJW_PlasticSurgeries/Recipe_Plastic_Surgery.cs @@ -1,15 +1,12 @@ using System.Collections.Generic; -using Dyspareunia; using RimWorld; using rjw; using Verse; -using DamageDefOf = Dyspareunia.DamageDefOf; namespace RJW_PlasticSurgeries { public abstract class Recipe_Plastic_Surgery : Recipe_Surgery { - protected readonly bool HasDyspareunia = ModLister.HasActiveModWithName("Dyspareunia"); protected readonly bool HasLicentia = ModLister.HasActiveModWithName("RimJobWorld - Licentia Labs"); public override IEnumerable GetPartsToApplyOn(Pawn pawn, RecipeDef recipe) @@ -37,17 +34,11 @@ namespace RJW_PlasticSurgeries protected abstract void SurgeryResult(Pawn pawn); - private static void DamageHediff(Hediff hed) - { - PenetrationUtility.AddDamageHediff(DamageDefOf.SexStretch, 0.5f, hed, null); - } - protected void SurgeryX(Pawn pawn, float severity, bool damagePart = false) { GetHediffs(pawn).ForEach(hed => { hed.Severity = severity; - if (damagePart && HasDyspareunia) DamageHediff(hed); if (damagePart && HasLicentia) { var (type, damage) = GetLicentiaDamage(); diff --git a/Source/RJW_PlasticSurgeries/Recipe_Surgery_Penoplasty.cs b/Source/RJW_PlasticSurgeries/Recipe_Surgery_Penoplasty.cs index 3e11c72..3a2408b 100644 --- a/Source/RJW_PlasticSurgeries/Recipe_Surgery_Penoplasty.cs +++ b/Source/RJW_PlasticSurgeries/Recipe_Surgery_Penoplasty.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using LicentiaLabs; using rjw; using Verse; @@ -23,8 +24,15 @@ namespace RJW_PlasticSurgeries return pawn.GetGenitalsList().FindAll(Genital_Helper.is_penis); } - protected override (HediffDef, float) GetLicentiaDamage() => - (Licentia.HediffDefs.StretchTear, 0.2f); + protected override (HediffDef, float) GetLicentiaDamage() + { + if (HasLicentia) + { + return (Licentia.HediffDefs.StretchTear, 0.2f); + } + + throw new NotSupportedException(); + } } public class Recipe_Surgery_Penoplasty_Micro : Recipe_Surgery_Penoplasty diff --git a/Source/RJW_PlasticSurgeries/Recipe_Surgery_Sphinctoplasty.cs b/Source/RJW_PlasticSurgeries/Recipe_Surgery_Sphinctoplasty.cs index 796268f..fbbd9ae 100644 --- a/Source/RJW_PlasticSurgeries/Recipe_Surgery_Sphinctoplasty.cs +++ b/Source/RJW_PlasticSurgeries/Recipe_Surgery_Sphinctoplasty.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using LicentiaLabs; using rjw; using Verse; @@ -21,9 +22,16 @@ namespace RJW_PlasticSurgeries { return pawn.GetAnusList(); } - - protected override (HediffDef, float) GetLicentiaDamage() => - (Licentia.HediffDefs.StretchTear, 0.2f); + + protected override (HediffDef, float) GetLicentiaDamage() + { + if (HasLicentia) + { + return (Licentia.HediffDefs.StretchTear, 0.2f); + } + + throw new NotSupportedException(); + } } public class Recipe_Surgery_Sphinctoplasty_Micro : Recipe_Surgery_Sphinctoplasty diff --git a/Source/RJW_PlasticSurgeries/Recipe_Surgery_Vaginoplasty.cs b/Source/RJW_PlasticSurgeries/Recipe_Surgery_Vaginoplasty.cs index 68a7803..33f13fc 100644 --- a/Source/RJW_PlasticSurgeries/Recipe_Surgery_Vaginoplasty.cs +++ b/Source/RJW_PlasticSurgeries/Recipe_Surgery_Vaginoplasty.cs @@ -1,4 +1,5 @@ -using System.Collections.Generic; +using System; +using System.Collections.Generic; using LicentiaLabs; using rjw; using Verse; @@ -21,9 +22,16 @@ namespace RJW_PlasticSurgeries { return pawn.GetGenitalsList().FindAll(Genital_Helper.is_vagina); } - - protected override (HediffDef, float) GetLicentiaDamage() => - (Licentia.HediffDefs.StretchTear, 0.2f); + + protected override (HediffDef, float) GetLicentiaDamage() + { + if (HasLicentia) + { + return (Licentia.HediffDefs.StretchTear, 0.2f); + } + + throw new NotSupportedException(); + } } public class Recipe_Surgery_Vaginoplasty_Micro : Recipe_Surgery_Vaginoplasty diff --git a/Source/build.gradle.kts b/Source/build.gradle.kts index 46daea1..8e3c668 100644 --- a/Source/build.gradle.kts +++ b/Source/build.gradle.kts @@ -1,17 +1,9 @@ -/* - * This file was generated by the Gradle "init" task. - * - * This is a general purpose Gradle build. - * Learn more about Gradle by exploring our samples at https://docs.gradle.org/7.3/samples - * This project uses @Incubating APIs which are subject to change. - */ - plugins { alias(libs.plugins.msbuild) alias(libs.plugins.versions) } -version = "5390.0.1.6" +version = "5400.0.1.8" val friendlyName = "rjw-plasticsurgeries" tasks.register("buildC#_1.3") { @@ -52,7 +44,7 @@ tasks.register("buildC#_1.5") { tasks.register("sign_1.3") { dependsOn("buildC#_1.3") - workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net48") + workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net472") executable = "H:\\Windows Kits\\10\\bin\\10.0.22621.0\\x64\\signtool.exe" args = listOf( "sign", @@ -70,7 +62,7 @@ tasks.register("sign_1.3") { tasks.register("sign_1.4") { dependsOn("buildC#_1.4") - workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.4/net48") + workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.4/net472") executable = "H:\\Windows Kits\\10\\bin\\10.0.22621.0\\x64\\signtool.exe" args = listOf( "sign", @@ -88,7 +80,7 @@ tasks.register("sign_1.4") { tasks.register("sign_1.5") { dependsOn("buildC#_1.5") - workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.5/net48") + workingDir = project.projectDir.resolve("${rootProject.name}/bin/Release/1.5/net472") executable = "H:\\Windows Kits\\10\\bin\\10.0.22621.0\\x64\\signtool.exe" args = listOf( "sign", @@ -105,7 +97,7 @@ tasks.register("sign_1.5") { } tasks.register("copy") { - dependsOn("copy_1.3", "copy_1.4", "copy_about") + dependsOn("copy_1.3", "copy_1.4", "copy_1.5", "copy_about") } tasks.register("copy_about") { @@ -115,40 +107,67 @@ tasks.register("copy_about") { tasks.register("copy_1.3") { dependsOn("copyDll_1.3") - from(project.projectDir.resolve("${rootProject.name}/1.3")) + dependsOn("copyDefs_1.3") + + from(project.projectDir.resolve("${rootProject.name}/1.3")){ + exclude("**/*.cs") + } into(project.projectDir.parentFile.resolve("1.3")) } tasks.register("copy_1.4") { dependsOn("copyDll_1.4") - from(project.projectDir.resolve("${rootProject.name}/1.4")) + dependsOn("copyDefs_1.4") + + from(project.projectDir.resolve("${rootProject.name}/1.4")){ + exclude("**/*.cs") + } into(project.projectDir.parentFile.resolve("1.4")) } tasks.register("copy_1.5") { dependsOn("copyDll_1.5") - from(project.projectDir.resolve("${rootProject.name}/1.5")) + dependsOn("copyDefs_1.5") + + from(project.projectDir.resolve("${rootProject.name}/1.5")){ + exclude("**/*.cs") + } into(project.projectDir.parentFile.resolve("1.5")) } tasks.register("copyDll_1.3") { dependsOn("sign_1.3") - from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net48/${rootProject.name}.dll")) + from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.3/net472/${rootProject.name}.dll")) into(project.projectDir.parentFile.resolve("1.3/Assemblies")) } tasks.register("copyDll_1.4") { dependsOn("sign_1.4") - from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.4/net48/${rootProject.name}.dll")) + from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.4/net472/${rootProject.name}.dll")) into(project.projectDir.parentFile.resolve("1.4/Assemblies")) } tasks.register("copyDll_1.5") { dependsOn("sign_1.5") - from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.5/net48/${rootProject.name}.dll")) + from(project.projectDir.resolve("${rootProject.name}/bin/Release/1.5/net472/${rootProject.name}.dll")) into(project.projectDir.parentFile.resolve("1.5/Assemblies")) } +tasks.register("copyDefs_1.3") { + from(project.projectDir.resolve("${rootProject.name}/Defs")) + into(project.projectDir.parentFile.resolve("1.3/Defs")) +} + +tasks.register("copyDefs_1.4") { + from(project.projectDir.resolve("${rootProject.name}/Defs")) + into(project.projectDir.parentFile.resolve("1.4/Defs")) +} + +tasks.register("copyDefs_1.5") { + from(project.projectDir.resolve("${rootProject.name}/Defs")) + into(project.projectDir.parentFile.resolve("1.5/Defs")) +} + tasks.register("buildZip") { dependsOn("clean", ":copy") into("$friendlyName/1.3") { @@ -169,6 +188,7 @@ tasks.register("buildZip") { into("$friendlyName/Source/${rootProject.name}") { from(project.projectDir.parentFile.resolve("Source/${rootProject.name}")) excludes.add("**/obj/**") + excludes.add("**/bin/**") } } diff --git a/Source/global.json b/Source/global.json index 1bcf6c0..2ddda36 100644 --- a/Source/global.json +++ b/Source/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "6.0.0", + "version": "8.0.0", "rollForward": "latestMinor", "allowPrerelease": false } diff --git a/Source/gradle/wrapper/gradle-wrapper.properties b/Source/gradle/wrapper/gradle-wrapper.properties index b82aa23..a441313 100644 --- a/Source/gradle/wrapper/gradle-wrapper.properties +++ b/Source/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.7-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/Source/gradlew b/Source/gradlew index 1aa94a4..b740cf1 100644 --- a/Source/gradlew +++ b/Source/gradlew @@ -55,7 +55,7 @@ # Darwin, MinGW, and NonStop. # # (3) This script is generated from the Groovy template -# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt # within the Gradle project. # # You can find Gradle at https://github.com/gradle/gradle/.