From 392e59573c61100ccd9580d710f3d42e351b9925 Mon Sep 17 00:00:00 2001 From: zer0Kerbal <39887717+zer0Kerbal@users.noreply.github.com> Date: Tue, 20 Jul 2021 02:18:10 -0500 Subject: [PATCH] Version 2.2.0.0 - final countdown... # Version 2.2.0.0 - final countdown... -

DO A CLEAN INSTALL: DELETE EXISTING THEN RE-INSTALL

- usual spring cleaning and automation - update folder structure - update to modern back-end automation - resolves issue #6 ## Update - recompile for KSP 1.12.x - to .NET 4.7.2 - to C# 9.0 - to Version.tt [v2.0.0.0] ## correct - changelog thank you to 7ranceaddic7 --- Changelog.cfg | 14 +- GameData/OhScrap/Changelog.cfg | 25 +- GameData/OhScrap/OhScrap.version | 16 +- .../OhScrap/Patches/FailureRepairSkill.cfg | 2 +- GameData/OhScrap/Plugins/OhScrap.xml | 99 ++++ GameData/OhScrap/Readme.htm | 523 ++---------------- GameData/OhScrap/Readme.md | 149 ----- Readme.htm | 523 ++---------------- Source/Properties/Version.cs | 34 +- Source/Properties/Version.tt | 175 +++--- json/code.json | 14 +- json/ksp.json | 12 +- json/license.json | 14 +- json/mod.json | 12 +- 14 files changed, 378 insertions(+), 1234 deletions(-) create mode 100644 GameData/OhScrap/Plugins/OhScrap.xml delete mode 100644 GameData/OhScrap/Readme.md diff --git a/Changelog.cfg b/Changelog.cfg index b29a8f4..a605f8f 100644 --- a/Changelog.cfg +++ b/Changelog.cfg @@ -2,7 +2,7 @@ KERBALCHANGELOG { showChangelog = true modName = Oy!Scrap! - license = MIT + license = Expat/MIT author = magico13, severedsolo, zer0Kerbal VERSION { @@ -16,10 +16,16 @@ KERBALCHANGELOG subChange = recompile for KSP 1.12.1 subChange = use .net 4.7.2 subChange = use C# 9.0 - subChange = update AssemblyFileVersion.tt - subChange = pull upstream changes from SeveredSolo (thank you) + subChange = update to Version.tt [v2.0.0.0] + subChange = pull upstream changes from severedsolo (thank you) + } + CHANGE + { + change = Update + subChange = usual spring cleaning and automation + subChange = folder structure + subChange = to modern back-end automation } - } VERSION { diff --git a/GameData/OhScrap/Changelog.cfg b/GameData/OhScrap/Changelog.cfg index 64495b6..a605f8f 100644 --- a/GameData/OhScrap/Changelog.cfg +++ b/GameData/OhScrap/Changelog.cfg @@ -2,9 +2,32 @@ KERBALCHANGELOG { showChangelog = true modName = Oy!Scrap! - license = MIT + license = Expat/MIT author = magico13, severedsolo, zer0Kerbal VERSION + { + version = 2.2.0.0 + versionDate = 19 JuL 2021 + versionKSP = 1.12.1 + versionName = Final Countdown... + CHANGE + { + change = Code + subChange = recompile for KSP 1.12.1 + subChange = use .net 4.7.2 + subChange = use C# 9.0 + subChange = update to Version.tt [v2.0.0.0] + subChange = pull upstream changes from severedsolo (thank you) + } + CHANGE + { + change = Update + subChange = usual spring cleaning and automation + subChange = folder structure + subChange = to modern back-end automation + } + } + VERSION { version = 2.1.1.1 versionDate = 02 Jun 2021 diff --git a/GameData/OhScrap/OhScrap.version b/GameData/OhScrap/OhScrap.version index 393aee0..199f1ed 100644 --- a/GameData/OhScrap/OhScrap.version +++ b/GameData/OhScrap/OhScrap.version @@ -6,33 +6,33 @@ "GITHUB" : { "USERNAME" : "zer0Kerbal", - "REPOSITORY" :"OhScrap", + "REPOSITORY" : "OhScrap", "ALLOW_PRE_RELEASE": false }, "VERSION" : { "MAJOR" : 2, - "MINOR" : 1, - "PATCH" : 1, - "BUILD" : 1 + "MINOR" : 2, + "PATCH" : 0, + "BUILD" : 0 }, "KSP_VERSION" : { "MAJOR" : 1, - "MINOR" : 9, + "MINOR" : 12, "PATCH" : 1 }, "KSP_VERSION_MIN" : { "MAJOR" : 1, - "MINOR" : 9, + "MINOR" : 8, "PATCH" : 0 }, "KSP_VERSION_MAX" : { "MAJOR" : 1, - "MINOR" : 11, - "PATCH" : 99 + "MINOR" : 12, + "PATCH" : 9999 }, "INSTALL_LOC" : { diff --git a/GameData/OhScrap/Patches/FailureRepairSkill.cfg b/GameData/OhScrap/Patches/FailureRepairSkill.cfg index a223535..e7eab6d 100644 --- a/GameData/OhScrap/Patches/FailureRepairSkill.cfg +++ b/GameData/OhScrap/Patches/FailureRepairSkill.cfg @@ -21,5 +21,5 @@ } } -// CC BY-NC-SA-4.0 +// GPLv2 // zer0Kerbal \ No newline at end of file diff --git a/GameData/OhScrap/Plugins/OhScrap.xml b/GameData/OhScrap/Plugins/OhScrap.xml new file mode 100644 index 0000000..8ec96b4 --- /dev/null +++ b/GameData/OhScrap/Plugins/OhScrap.xml @@ -0,0 +1,99 @@ + + + + OhScrap + + + + + Check this to see if the addon is available. If this returns false, no additional API calls should be made! + + + + + Check to see if StageRecovery is enabled. Returns false if unavailable or if user settings prevent SR from activating. + + + + + Adds a listener to the Recovery Success Event. When a vessel is recovered by StageRecovery the method will + be invoked with the Vessel; an array of floats representing the percent returned after damage, funds returned, + and science returned; and a string representing the reason for failure(SUCCESS, SPEED, or BURNUP) + + The method to invoke when the event fires + + + + Removes a listener from the Recovery Success Event + + The method to remove + + + + Adds a listener to the Recovery Failure Event. When a vessel fails to be recovered, the method will be invoked + with the Vessel; an array of floats representing the percent returned after damage, funds returned, + and science returned; and a string representing the reason for failure(SUCCESS, SPEED, or BURNUP) + + The method to invoke when the event fires + + + + Removes a listener from the Recovery Failure Event + + The method to remove + + + + Adds a listener to the OnRecoveryProcessingStart Event. When processing of the recovery status of a vessel starts + the event will fire before any serious processing occurs. + + The method to invoke when the event fires + + + + Removes a listener from the OnRecoveryProcessingStart Event + + The method to remove + + + + Adds a listener to the OnRecoveryProcessingStart Event. When processing of the recovery status of a vessel starts + the event will fire before any serious processing occurs + + The method to invoke when the event fires + + + + Removes a listener from the OnRecoveryProcessingFinish Event + + The method to remove + + + + Computes the terminal velocity at sea level on the home planet (Kerbin/Earth) for the provided parts + + The list of s to compute the terminal velocity for + The terminal velocity as a scalar (speed) + + + + Computes the terminal velocity at sea level on the home planet (Kerbin/Earth) for the provided parts + + The list of s to compute the terminal velocity for + The terminal velocity as a scalar (speed) + + + + The APIManager instance + + + + + A helper function I use since I'm bad at reflection. It's for getting the value of a MemberInfo + + + + + + + diff --git a/GameData/OhScrap/Readme.htm b/GameData/OhScrap/Readme.htm index b04caef..c55a0d6 100644 --- a/GameData/OhScrap/Readme.htm +++ b/GameData/OhScrap/Readme.htm @@ -1,453 +1,22 @@ - - - - - - - - - - - - - - + + -

Oy Scrap! (OHS) (formerly UPFM)

-

Mod Version KSP version KSP-AVC License MIT LOGO:mit
-SpaceDock CKAN GitHub Curseforge
-Validate AVC .version files

+ +

Oy Scrap! (OHS) (formerly UPFM)

+

Mod Version KSP version KSP-AVC License MIT LOGO:mit
+SpaceDock CKAN GitHub Curseforge
+Validate AVC .version files

+
+

Poor Val, she's not having a good day. There she was on her way back from orbit, and this happened:

+

A bad day for Val

+
-

Poor Val, she's not having a good day. There she was on her way back from orbit, and this happened:

-

A bad day for Val -

You see, I forgot to take her shiny new ship for a test flight before sending it to space, so the reaction wheels failed. Then her oxygen started venting into space. So she quickly burned retrograde and started her re-entry. Except that as she came into land, the parachute failed too. Like I said, not a good day.

Sound exciting? Then why don't you install Oh Scrap! today.

@@ -455,51 +24,52 @@

Oy Scrap! (OHS) (formerly UPFM)

-

Eye candy of a really awesome Static Test that someone set up on facebook

-

(used with permission):

-


-

-

Special Thanks

+

Eye candy of a really awesome Static Test that someone set up on facebook

+

####(used with permission):
+

+

Special Thanks

-

Installation Directions:

+

Installation Directions:

-

A note to CKAN USERS: -- Kerbal Changelog is not a hard dependency, in that "Oh Scrap will load just fine without it". -- However, on CKAN it is a dependency. -- When I make a serious save / mod breaking change, CKAN will happily update you without you ever seeing a changelog. This means you could happily load your save, not notice the major version number has changed, and seriously break something. I do not like this. So CKAN users must use Kerbal Changelog, because that way nobody can say they weren't warned :).

+

A note to CKAN USERS:

+
-

Changelog Summary

+

Changelog Summary

See ChangeLog for full details of mod changes

-

Requires:

+

Requires:

-

Depends:

+

Depends:

-

Recomends:

+

Recomends:

-

Suggests:

+

Suggests:

-

Supports:

+

Supports:

-

Conflicts:

+

Conflicts:

-

Replaces:

+

Replaces:

-

License

-

aka Legal Mumbo Jumbo

+

License

+

Source: GitHub
-License: License: MIT MIT-17x17.png

+License: License: MIT MIT-17x17.png

-

Original

+

Original

Download Here
Source: GitHub
-License: License: MIT MIT-17x17.png

+License: License: MIT MIT-17x17.png


-

- -

+

Be Kind: Lithobrake, not jakebrake! Keep your Module Manager up to date

-
v2.0.1.0 original: 01 Oct 2019 zed'K | updated: 12 Mar 2020 zed'K
+
v2.0.1.0 original: 01 Oct 2019 zed'K | updated: 12 Mar 2020 zed'K
- - - \ No newline at end of file diff --git a/GameData/OhScrap/Readme.md b/GameData/OhScrap/Readme.md deleted file mode 100644 index c323031..0000000 --- a/GameData/OhScrap/Readme.md +++ /dev/null @@ -1,149 +0,0 @@ - - - - -# Oy Scrap! (OHS) (formerly UPFM) -![Mod Version][SHIELD:mod:latest] ![KSP version][SHIELD:ksp] ![KSP-AVC][SHIELD:kspavc] ![License MIT][SHIELD:license] ![LOGO:mit] -![SpaceDock][SHIELD:spacedock] ![CKAN][SHIELD:ckan] ![GitHub][SHIELD:github] ![Curseforge][SHIELD:curseforge] -![Validate AVC .version files][SHIELD:avcvalid] - -> Poor Val, she's not having a good day. There she was on her way back from orbit, and this happened: -> -> ![A bad day for Val][IMG:hero:0] - -> You see, I forgot to take her shiny new ship for a test flight before sending it to space, so the reaction wheels failed. Then her oxygen started venting into space. So she quickly burned retrograde and started her re-entry. Except that as she came into land, the parachute failed too. Like I said, not a good day. - -Sound exciting? Then why don't you install Oh Scrap! today. - -Features - -- Part Failures: Parachutes, Engines, Gimbals, Resources, Batteries, Reaction Wheels, Control Surfaces - all these failures can make your day turn out like Vals. (all can be disabled or enabled through the difficulty settings menu) -- Failures follow the [bathtub curve](https://en.wikipedia.org/wiki/Bathtub_curve) - brand new untested parts are more likely to fail than pre-tested models. If you re-use a part too many times though, it will reach the end of it's shelf-life and be more prone to failure. -- Subsequent "new models" of parts become more reliable than their earlier counterparts. Ie, a part you've just researched is more likely to fail than a part that has been tried and tested many times - even if it's brand new. -- Repairs - some parts can be repaired remotely, some need an EVA. You always have a better chance of repairing a part on EVA - -### Eye candy of a really awesome Static Test that someone set up on facebook -####(used with permission): -![][IMG:hero:1] -![][IMG:hero:2] - -### Special Thanks -- [@magico13][LINK:magico13] both for ScrapYard, and helping [me] with all my questions issues while making this. -- [@severedsolo][LINK:severedsolo] -- The maintainers/authors of DangIt - most of this would never have happened without looking at your code to figure out how to make stuff work. - -#### Installation Directions: -- Use CKAN - -> ***A note to CKAN USERS:*** -> - Kerbal Changelog is not a hard dependency, in that "Oh Scrap will load just fine without it". -> - However, on CKAN it is a dependency. -> - When I make a serious save / mod breaking change, CKAN will happily update you without you ever seeing a changelog. This means you could happily load your save, not notice the major version number has changed, and seriously break something. I do not like this. So CKAN users must use Kerbal Changelog, because that way nobody can say they weren't warned :). - -### Changelog Summary -*See [ChangeLog][MOD:changelog] for full details of mod changes* - -### Requires: -- [Kerbal Space Program](https://kerbalspaceprogram.com) v1.9.1, ***may*** work on earlier versions (YMMV) -- [ScrapYard](https://forum.kerbalspaceprogram.com/index.php?/topic/178641-*) to keep track of how many times a part has been built/recovered so that is a hard dependency. (obtained separately) - -### Depends: -- [Module Manager](https://forum.kerbalspaceprogram.com/index.php?/topic/50533-*) is required if you want the mod to actually do anything. (obtained separately) - -### Recomends: -- [Kerbal Changelog](https://forum.kerbalspaceprogram.com/index.php?/topic/179207-*) -- [Kerbal Construction Time](https://forum.kerbalspaceprogram.com/index.php?/topic/182877-*) designed with this with in mind, so would recommend that mod (make sure you use the latest dev version) -- [StageRecovery](https://forum.kerbalspaceprogram.com/index.php?/topic/179306-*) If you plan to actually re-use your parts (and have them fail), you'll probably want StageRecovery too -- [KRASH](http://forum.kerbalspaceprogram.com/index.php?/topic/133082-*) - -### Suggests: -- [FAR](https://forum.kerbalspaceprogram.com/index.php?/topic/179445-*) -- [RemoteTech](http://remotetechnologiesgroup.github.io/RemoteTech/) -zer0Kerbal's Stuff -- [Docking Port Descriptions](https://github.com/zer0Kerbal/KGEx/MM-Patches/DockingPortDescriptions) -- [On Demand Fuel Cells (Refueled)](https://forum.kerbalspaceprogram.com/index.php?/topic/187625-*) -- [SimpleLife](https://forum.kerbalspaceprogram.com/index.php?/topic/191526-*) -- [MoarKerbals](https://forum.kerbalspaceprogram.com/index.php?/topic/191525-*) -- [SimpleConstruction)](https://forum.kerbalspaceprogram.com/index.php?/topic/191424-ksp-*) -- [Not So SimpleConstruction (NSSC)](https://forum.kerbalspaceprogram.com/index.php?/topic/191504-*) -- [SimpleLogistics](https://forum.kerbalspaceprogram.com/index.php?/topic/191045-*/) -- [Biomatic](https://forum.kerbalspaceprogram.com/index.php?/topic/191426-*) -- [B9StockPatches](https://forum.kerbalspaceprogram.com/index.php?/topic/190870-*) -- [DaMichel's AeroRadial](https://spacedock.info/mod/2338) -- [DaMichel's CargoBays](https://spacedock.info/mod/2339) -- [DaMichel's Fuselage](https://spacedock.info/mod/2340) -- [DaMichel's SphericalTanks](https://spacedock.info/mod/2342) - -### Supports: -- [USI MKS](http://forum.kerbalspaceprogram.com/index.php?/topic/154587-*) - -### Conflicts: -- [no known conflights (NKC)]() - -### Replaces: -- [none]() - - - -### License -#### aka Legal Mumbo Jumbo -Source: [GitHub](https://github.com/zer0Kerbal/OhScrap) -License: ![License: MIT](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/zer0Kerbal/OhScrap/master/json/license.json?style=plastic) ![MIT-17x17.png](https://i.postimg.cc/bvjfsMP5/MIT-17x17.png)
- -- ***All bundled mods are distributed under their own licenses***
-- ***All art assets (textures, models, animations) are distributed under their own licenses*** - -### Original -Download [Here](https://github.com/zer0Kerbal/OhScrap/releases/latest/) -Source: [GitHub](https://github.com/zer0Kerbal/OhScrap/releases/latest/ "GitHub") -License: ![License: MIT](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/zer0Kerbal/OhScrap/master/json/license.json?style=plastic) ![MIT-17x17.png](https://i.postimg.cc/bvjfsMP5/MIT-17x17.png) - -*** - - - - - -*Be Kind: Lithobrake, not jakebrake! Keep your Module Manager up to date* - -###### v2.0.1.0 original: 01 Oct 2019 zed'K | updated: 12 Mar 2020 zed'K - -[MOD:license]: https://github.com/zer0Kerbal/OhScrap/blob/master/LICENSE -[MOD:contributing]: https://github.com/zer0Kerbal/OhScrap/blob/master/.github/CONTRIBUTING.md -[MOD:issues]: https://github.com/zer0Kerbal/OhScrap/issues -[MOD:wiki]: https://github.com/zer0Kerbal/OhScrap/ -[MOD:known]: https://github.com/zer0Kerbal/OhScrap/wiki/Known-Issues -[MOD:forum]: https://forum.kerbalspaceprogram.com/index.php?/topic/178641-* -[MOD:spacedock]: https://spacedock.info/mod/2364 -[MOD:github:repo]: https://github.com/zer0Kerbal/OhScrap/ -[MOD:github:releases]: https://github.com/zer0Kerbal/OhScrap/releases/latest -[MOD:curseforge]: https://www.curseforge.com/kerbal/ksp-mods/scrapyard -[MOD:changelog]: https://github.com/zer0Kerbal/OhScrap/Changelog.cfg - -[SHIELD:mod:latest]: https://img.shields.io/github/v/release/zer0Kerbal/OhScrap?include_prereleases?style=plastic -[SHIELD:mod]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/zer0Kerbal/OhScrap/master/json/mod.json -[SHIELD:ksp]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/zer0Kerbal/OhScrap/master/json/ksp.json -[SHIELD:license]: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/zer0Kerbal/OhScrap/master/json/license.json -[LOGO:mit]: https://i.postimg.cc/bvjfsMP5/MIT-17x17.png -[SHIELD:kspavc]: https://img.shields.io/badge/KSP-AVC--supported-brightgreen.svg?style=plastic -[SHIELD:spacedock]: https://img.shields.io/badge/SpaceDock-listed-blue.svg?style=plastic -[SHIELD:ckan]: https://img.shields.io/badge/CKAN-Indexed-blue.svg?style=plastic -[SHIELD:github]: https://img.shields.io/badge/Github-Indexed-blue.svg?style=plastic -[SHIELD:curseforge]: https://img.shields.io/badge/CurseForge-listed-blue.svg?style=plastic -[SHIELD:avcvalid]: https://github.com/zer0Kerbal/ScarpYard/workflows/Validate%20AVC%20.version%20files/badge.svg - -[LINK:magico13]: https://forum.kerbalspaceprogram.com/index.php?/profile/73338-magico13/ -[LINK:severedsolo]: https://forum.kerbalspaceprogram.com/index.php?/profile/80345-severedsolo/ -[LINK:zer0Kerbal]: https://forum.kerbalspaceprogram.com/index.php?/profile/190933-zer0kerbal/ -[LINK:linuxgurugamer]: https://forum.kerbalspaceprogram.com/index.php?/profile/129964-linuxgurugamer/ - -[IMG:hero:0]: https://i.imgur.com/2V0F5DT.png -[IMG:hero:1]: https://i.imgur.com/eWRLoBR.jpg -[IMG:hero:2]: https://i.imgur.com/EyWm9e9.jpg - diff --git a/Readme.htm b/Readme.htm index b04caef..c55a0d6 100644 --- a/Readme.htm +++ b/Readme.htm @@ -1,453 +1,22 @@ - - - - - - - - - - - - - - + + -

Oy Scrap! (OHS) (formerly UPFM)

-

Mod Version KSP version KSP-AVC License MIT LOGO:mit
-SpaceDock CKAN GitHub Curseforge
-Validate AVC .version files

+ +

Oy Scrap! (OHS) (formerly UPFM)

+

Mod Version KSP version KSP-AVC License MIT LOGO:mit
+SpaceDock CKAN GitHub Curseforge
+Validate AVC .version files

+
+

Poor Val, she's not having a good day. There she was on her way back from orbit, and this happened:

+

A bad day for Val

+
-

Poor Val, she's not having a good day. There she was on her way back from orbit, and this happened:

-

A bad day for Val -

You see, I forgot to take her shiny new ship for a test flight before sending it to space, so the reaction wheels failed. Then her oxygen started venting into space. So she quickly burned retrograde and started her re-entry. Except that as she came into land, the parachute failed too. Like I said, not a good day.

Sound exciting? Then why don't you install Oh Scrap! today.

@@ -455,51 +24,52 @@

Oy Scrap! (OHS) (formerly UPFM)

-

Eye candy of a really awesome Static Test that someone set up on facebook

-

(used with permission):

-


-

-

Special Thanks

+

Eye candy of a really awesome Static Test that someone set up on facebook

+

####(used with permission):
+

+

Special Thanks

-

Installation Directions:

+

Installation Directions:

-

A note to CKAN USERS: -- Kerbal Changelog is not a hard dependency, in that "Oh Scrap will load just fine without it". -- However, on CKAN it is a dependency. -- When I make a serious save / mod breaking change, CKAN will happily update you without you ever seeing a changelog. This means you could happily load your save, not notice the major version number has changed, and seriously break something. I do not like this. So CKAN users must use Kerbal Changelog, because that way nobody can say they weren't warned :).

+

A note to CKAN USERS:

+
-

Changelog Summary

+

Changelog Summary

See ChangeLog for full details of mod changes

-

Requires:

+

Requires:

-

Depends:

+

Depends:

-

Recomends:

+

Recomends:

-

Suggests:

+

Suggests:

-

Supports:

+

Supports:

-

Conflicts:

+

Conflicts:

-

Replaces:

+

Replaces:

-

License

-

aka Legal Mumbo Jumbo

+

License

+

Source: GitHub
-License: License: MIT MIT-17x17.png

+License: License: MIT MIT-17x17.png

-

Original

+

Original

Download Here
Source: GitHub
-License: License: MIT MIT-17x17.png

+License: License: MIT MIT-17x17.png


-

- -

+

Be Kind: Lithobrake, not jakebrake! Keep your Module Manager up to date

-
v2.0.1.0 original: 01 Oct 2019 zed'K | updated: 12 Mar 2020 zed'K
+
v2.0.1.0 original: 01 Oct 2019 zed'K | updated: 12 Mar 2020 zed'K
- - - \ No newline at end of file diff --git a/Source/Properties/Version.cs b/Source/Properties/Version.cs index df9c810..1c9d29e 100644 --- a/Source/Properties/Version.cs +++ b/Source/Properties/Version.cs @@ -1,19 +1,27 @@ - +//3 +// +// This code was generated by a tool. Any changes made manually will be lost +// the next time this code is regenerated. +// + +using System.Reflection; + +[assembly: AssemblyFileVersion("2.2.0.3")] +[assembly: AssemblyVersion("2.2.0.0")] -// Automatically generated code. Any changes will be lost! namespace OhScrap { - public static class Version - { - public const int major = 2; - public const int minor = 2; - public const int patch = 0; - public const int build = 0; - public const string Number = "2.2.0.0"; + public static class Version + { + public const int major = 2; + public const int minor = 2; + public const int patch = 0; + public const int build = 0; + public const string Number = "2.2.0.0"; #if DEBUG - public const string Text = Number + " BETA DEBUG"; + public const string Text = Number + " DEBUG"; #else - public const string Text = Number + " BETA"; + public const string Text = Number + ""; #endif - } -} + } +} \ No newline at end of file diff --git a/Source/Properties/Version.tt b/Source/Properties/Version.tt index 5d0dcd5..42fc2be 100644 --- a/Source/Properties/Version.tt +++ b/Source/Properties/Version.tt @@ -1,98 +1,125 @@ <# /* * Version.tt - * 1.1.0.0 + * 2.0.0.0 */ /* This file is licensed under the Do What the F* You Want to Public License ( http://www.wtfpl.net ) - * by LisiasT. http://ksp.lisias.net - * - * You are allowed to copy, modify and use this file unrestrictedly. :) - */ + * by zer0Kerbal. + * + * You are allowed to copy, modify and use this file unrestrictedly. :) + */ #> - <# // from https://docs.microsoft.com/en-us/visualstudio/modeling/walkthrough-generating-code-by-using-text-templates?view=vs-2017 #> <#@ template debug="false" hostspecific="true" language="C#" #> <#@ output extension=".cs" #> <#@ import namespace="System.IO" #> <# - string PROJECT_NAME = "OhScrap"; - int major = 0; - int minor = 0; - int patch = 0; - int build = 0; - - try - { - string file = this.Host.ResolvePath("../../" + PROJECT_NAME + ".version"); - string text = File.ReadAllText(file); + // + // Update the following with mod name as listed on the .version file + // + string PROJECT_NAME = "OhScrap"; + int major = 0; + int minor = 0; + int patch = 0; + int build = 0; + int revisionNumber; + try + { + //If we cannot find the file, the revision number is set to zero, + //so even if the file doesn't exists the generation will run anyway. + //NOTE: we suppose we're not messing with the generated file + + using(var f = File.OpenText(Host.ResolvePath("Version.cs"))) + { + //We're reading the previous revision number; in order to make the + //code as simple as we can, we're just going to rewrite it on the first row, commented. + //This is not elegant, but it's simple enough and quite effective. + string _st = f.ReadLine().Replace("//",""); + revisionNumber = int.Parse(_st) + 1; + } + }catch{ revisionNumber = 0; } + + try + { + string file = this.Host.ResolvePath("../../" + PROJECT_NAME + ".version"); + string text = File.ReadAllText(file); - { - int i = text.IndexOf("\"VERSION\"", System.StringComparison.Ordinal); - int j = text.IndexOf("}", i + 1, System.StringComparison.Ordinal); - text = text.Substring(i, j-i+1); - } + { + int i = text.IndexOf("\"VERSION\"", System.StringComparison.Ordinal); + int j = text.IndexOf("}", i + 1, System.StringComparison.Ordinal); + text = text.Substring(i, j-i+1); + } - try - { - int i = text.IndexOf("\"MAJOR\"", System.StringComparison.Ordinal); - while (!Char.IsNumber(text[i])) ++i; - int j = i; - while (Char.IsNumber(text[j])) ++j; - Int32.TryParse(text.Substring(i,j-i), out major); - } - catch { } + try + { + int i = text.IndexOf("\"MAJOR\"", System.StringComparison.Ordinal); + while (!Char.IsNumber(text[i])) ++i; + int j = i; + while (Char.IsNumber(text[j])) ++j; + Int32.TryParse(text.Substring(i,j-i), out major); + } + catch { } - try - { - int i = text.IndexOf("\"MINOR\"", System.StringComparison.Ordinal); - while (!Char.IsNumber(text[i])) ++i; - int j = i; - while (Char.IsNumber(text[j])) ++j; - Int32.TryParse(text.Substring(i,j-i), out minor); - } - catch { } + try + { + int i = text.IndexOf("\"MINOR\"", System.StringComparison.Ordinal); + while (!Char.IsNumber(text[i])) ++i; + int j = i; + while (Char.IsNumber(text[j])) ++j; + Int32.TryParse(text.Substring(i,j-i), out minor); + } + catch { } - try - { - int i = text.IndexOf("\"PATCH\"", System.StringComparison.Ordinal); - while (!Char.IsNumber(text[i])) ++i; - int j = i; - while (Char.IsNumber(text[j])) ++j; - Int32.TryParse(text.Substring(i,j-i), out patch); - } - catch { } + try + { + int i = text.IndexOf("\"PATCH\"", System.StringComparison.Ordinal); + while (!Char.IsNumber(text[i])) ++i; + int j = i; + while (Char.IsNumber(text[j])) ++j; + Int32.TryParse(text.Substring(i,j-i), out patch); + } + catch { } - try - { - int i = text.IndexOf("\"BUILD\"", System.StringComparison.Ordinal); - while (!Char.IsNumber(text[i])) ++i; - int j = i; - while (Char.IsNumber(text[j])) ++j; - Int32.TryParse(text.Substring(i,j-i), out build); - } - catch { } - } - catch (Exception e) - { - Write("Error: " + e.Message); - } + try + { + int i = text.IndexOf("\"BUILD\"", System.StringComparison.Ordinal); + while (!Char.IsNumber(text[i])) ++i; + int j = i; + while (Char.IsNumber(text[j])) ++j; + Int32.TryParse(text.Substring(i,j-i), out build); + } + catch { } + } + catch (Exception e) + { + Write("Error: " + e.Message); + } #> +//<#=revisionNumber#> +// +// This code was generated by a tool. Any changes made manually will be lost +// the next time this code is regenerated. +// + +using System.Reflection; + +[assembly: AssemblyFileVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= revisionNumber #>")] +[assembly: AssemblyVersion("<#= major #>.<#= minor #>.<#= patch #>.<#= build #>")] -// Automatically generated code. Any changes will be lost! namespace <#= PROJECT_NAME #> { - public static class Version - { - public const int major = <#= major #>; - public const int minor = <#= minor #>; - public const int patch = <#= patch #>; - public const int build = <#= build #>; - public const string Number = "<#= major #>.<#= minor #>.<#= patch #>.<#= build #>"; + public static class Version + { + public const int major = <#= major #>; + public const int minor = <#= minor #>; + public const int patch = <#= patch #>; + public const int build = <#= build #>; + public const string Number = "<#= major #>.<#= minor #>.<#= patch #>.<#= build #>"; #if DEBUG - public const string Text = Number + " BETA DEBUG"; + public const string Text = Number + " DEBUG"; #else - public const string Text = Number + " BETA"; + public const string Text = Number + ""; #endif - } -} + } +} \ No newline at end of file diff --git a/json/code.json b/json/code.json index 8ebb31e..b340c03 100644 --- a/json/code.json +++ b/json/code.json @@ -1,8 +1,8 @@ { - "schemaVersion": 1, - "label": "Code", - "labelColor": "darkblue", - "message": "<.NET 4.8> ", - "color": "66ccff", - "style": "plastic" -} + "schemaVersion": 1, + "label": "Code", + "labelColor": "66ccff", + "message": "<.Net 4.7.2> ", + "color": "darkblue", + "style": "plastic" +} diff --git a/json/ksp.json b/json/ksp.json index c56fc79..c38cbba 100644 --- a/json/ksp.json +++ b/json/ksp.json @@ -1,8 +1,8 @@ { - "schemaVersion": 1, - "label": "KSP", - "labelColor": "darkblue", - "message": "1.9.1", - "color": "66ccff", - "style": "plastic" + "schemaVersion": 1, + "label": "KSP", + "labelColor": "darkblue", + "message": "1.12.1", + "color": "66ccff", + "style": "plastic" } diff --git a/json/license.json b/json/license.json index 28f4b81..7c8b497 100644 --- a/json/license.json +++ b/json/license.json @@ -1,8 +1,8 @@ { - "schemaVersion": 1, - "label": "License", - "labelColor": "black", - "message": "MIT", - "color": "red", - "style": "plastic" -} \ No newline at end of file + "schemaVersion": 1, + "label": "License", + "labelColor": "black", + "message": "Expat/MIT", + "color": "red", + "style": "plastic" +} diff --git a/json/mod.json b/json/mod.json index e914cbc..2576a4e 100644 --- a/json/mod.json +++ b/json/mod.json @@ -1,8 +1,8 @@ { - "schemaVersion": 1, - "label": "OhScrap", - "labelColor": "darkgreen", - "message": "2.1.0.0", - "color": "orange", - "style": "plastic" + "schemaVersion": 1, + "label": "OhScrap!", + "labelColor": "darkgreen", + "message": "2.2.0.0", + "color": "orange", + "style": "plastic" }