From f9eebff332073177d48e62bf13f4ffd4d926b063 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Wed, 6 May 2020 21:43:20 -0400
Subject: update Content Patcher format in schema

---
 src/SMAPI.Web/wwwroot/schemas/content-patcher.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/SMAPI.Web/wwwroot')

diff --git a/src/SMAPI.Web/wwwroot/schemas/content-patcher.json b/src/SMAPI.Web/wwwroot/schemas/content-patcher.json
index f627ab95..726b50be 100644
--- a/src/SMAPI.Web/wwwroot/schemas/content-patcher.json
+++ b/src/SMAPI.Web/wwwroot/schemas/content-patcher.json
@@ -11,9 +11,9 @@
             "title": "Format version",
             "description": "The format version. You should always use the latest version to enable the latest features and avoid obsolete behavior.",
             "type": "string",
-            "const": "1.13.0",
+            "const": "1.14.0",
             "@errorMessages": {
-                "const": "Incorrect value '@value'. This should be set to the latest format version, currently '1.13.0'."
+                "const": "Incorrect value '@value'. This should be set to the latest format version, currently '1.14.0'."
             }
         },
         "ConfigSchema": {
-- 
cgit 


From df84df5ff195ccb7b9a47fbf644e175a26b40aa4 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 9 May 2020 14:06:10 -0400
Subject: add GitHub licenses to mod compatibility list, update release notes

---
 docs/release-notes.md                      |  4 ++++
 src/SMAPI.Web/ViewModels/ModListModel.cs   |  2 +-
 src/SMAPI.Web/ViewModels/ModModel.cs       |  4 ++++
 src/SMAPI.Web/Views/Mods/Index.cshtml      | 11 +++++++++--
 src/SMAPI.Web/wwwroot/Content/css/mods.css |  4 ++++
 5 files changed, 22 insertions(+), 3 deletions(-)

(limited to 'src/SMAPI.Web/wwwroot')

diff --git a/docs/release-notes.md b/docs/release-notes.md
index f12455bd..a660888c 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -5,6 +5,10 @@
 * For players:
   * Mod warnings are now listed alphabetically.
 
+* For the web UI:
+  * Updated web framework to improve site performance and reliability.
+  * Added GitHub licenses to mod compatibility list.
+
 * For modders:
   * Added `Multiplayer.PeerConnected` event.
   * Simplified paranoid warnings in the log and reduced their log level.
diff --git a/src/SMAPI.Web/ViewModels/ModListModel.cs b/src/SMAPI.Web/ViewModels/ModListModel.cs
index ff7513bc..6b8279c1 100644
--- a/src/SMAPI.Web/ViewModels/ModListModel.cs
+++ b/src/SMAPI.Web/ViewModels/ModListModel.cs
@@ -26,7 +26,7 @@ namespace StardewModdingAPI.Web.ViewModels
         public bool IsStale { get; set; }
 
         /// <summary>Whether the mod metadata is available.</summary>
-        public bool HasData => this.Mods != null;
+        public bool HasData => this.Mods?.Any() == true;
 
 
         /*********
diff --git a/src/SMAPI.Web/ViewModels/ModModel.cs b/src/SMAPI.Web/ViewModels/ModModel.cs
index 56316ab7..45b12397 100644
--- a/src/SMAPI.Web/ViewModels/ModModel.cs
+++ b/src/SMAPI.Web/ViewModels/ModModel.cs
@@ -22,6 +22,9 @@ namespace StardewModdingAPI.Web.ViewModels
         /// <summary>The mod author's alternative names, if any.</summary>
         public string AlternateAuthors { get; set; }
 
+        /// <summary>The GitHub repo, if any.</summary>
+        public string GitHubRepo { get; set; }
+
         /// <summary>The URL to the mod's source code, if any.</summary>
         public string SourceUrl { get; set; }
 
@@ -62,6 +65,7 @@ namespace StardewModdingAPI.Web.ViewModels
             this.AlternateNames = string.Join(", ", entry.Name.Skip(1).ToArray());
             this.Author = entry.Author.FirstOrDefault();
             this.AlternateAuthors = string.Join(", ", entry.Author.Skip(1).ToArray());
+            this.GitHubRepo = entry.GitHubRepo;
             this.SourceUrl = this.GetSourceUrl(entry);
             this.Compatibility = new ModCompatibilityModel(entry.Compatibility);
             this.BetaCompatibility = entry.BetaCompatibility != null ? new ModCompatibilityModel(entry.BetaCompatibility) : null;
diff --git a/src/SMAPI.Web/Views/Mods/Index.cshtml b/src/SMAPI.Web/Views/Mods/Index.cshtml
index f9835d36..842a1e03 100644
--- a/src/SMAPI.Web/Views/Mods/Index.cshtml
+++ b/src/SMAPI.Web/Views/Mods/Index.cshtml
@@ -1,6 +1,7 @@
 @using Humanizer
 @using Humanizer.Localisation
 @using StardewModdingAPI.Web.Framework
+@using StardewModdingAPI.Web.ViewModels
 @model StardewModdingAPI.Web.ViewModels.ModListModel
 @{
     ViewData["Title"] = "Mod compatibility";
@@ -15,7 +16,7 @@
     <script src="~/Content/js/mods.js?r=20200218"></script>
     <script>
         $(function() {
-            var data = @this.ForJson(Model.Mods);
+            var data = @this.ForJson(Model.Mods ?? new ModModel[0]);
             var enableBeta = @this.ForJson(Model.BetaVersion != null);
             smapi.modList(data, enableBeta);
         });
@@ -103,7 +104,13 @@ else
                     </td>
                     <td class="mod-broke-in" v-html="mod.LatestCompatibility.BrokeIn" v-show="showAdvanced"></td>
                     <td v-show="showAdvanced">
-                        <span v-if="mod.SourceUrl"><a v-bind:href="mod.SourceUrl">source</a></span>
+                        <span v-if="mod.SourceUrl">
+                            <a v-bind:href="mod.SourceUrl">source</a>
+                            <span v-if="mod.GitHubRepo">
+                                @* see https://shields.io/category/license *@
+                                (<img v-bind:src="'http://img.shields.io/github/license/' + mod.GitHubRepo + '?style=flat-square.png&label='" class="license-badge" alt="source" />)
+                            </span>
+                        </span>
                         <span v-else class="mod-closed-source">no source</span>
                     </td>
                     <td>
diff --git a/src/SMAPI.Web/wwwroot/Content/css/mods.css b/src/SMAPI.Web/wwwroot/Content/css/mods.css
index 697ba514..4f6578cb 100644
--- a/src/SMAPI.Web/wwwroot/Content/css/mods.css
+++ b/src/SMAPI.Web/wwwroot/Content/css/mods.css
@@ -153,3 +153,7 @@ table.wikitable > caption {
 #mod-list td.smapi-3-col span {
     border-bottom: 1px dashed gray;
 }
+
+#mod-list .license-badge {
+    vertical-align: middle;
+}
-- 
cgit 


From a2cfb71d898aca98d621f1b86dd5611337eea034 Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 16 May 2020 11:34:00 -0400
Subject: minor cleanup

---
 src/SMAPI.Web/Framework/Caching/Mods/ModCacheRepository.cs |  2 +-
 src/SMAPI.Web/Framework/LogParsing/LogParser.cs            |  6 +++---
 src/SMAPI.Web/Views/Mods/Index.cshtml                      |  2 +-
 src/SMAPI.Web/Views/Shared/_Layout.cshtml                  |  2 +-
 src/SMAPI.Web/wwwroot/Content/js/mods.js                   |  2 --
 src/SMAPI/Framework/Rendering/SDisplayDevice.cs            | 13 +------------
 src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs         |  2 +-
 src/SMAPI/Framework/SGame.cs                               |  2 +-
 8 files changed, 9 insertions(+), 22 deletions(-)

(limited to 'src/SMAPI.Web/wwwroot')

diff --git a/src/SMAPI.Web/Framework/Caching/Mods/ModCacheRepository.cs b/src/SMAPI.Web/Framework/Caching/Mods/ModCacheRepository.cs
index d6906866..6ba1d73d 100644
--- a/src/SMAPI.Web/Framework/Caching/Mods/ModCacheRepository.cs
+++ b/src/SMAPI.Web/Framework/Caching/Mods/ModCacheRepository.cs
@@ -72,7 +72,7 @@ namespace StardewModdingAPI.Web.Framework.Caching.Mods
         public void RemoveStaleMods(TimeSpan age)
         {
             DateTimeOffset minDate = DateTimeOffset.UtcNow.Subtract(age);
-            var result = this.Mods.DeleteMany(p => p.LastRequested < minDate);
+            this.Mods.DeleteMany(p => p.LastRequested < minDate);
         }
 
 
diff --git a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
index cce80816..227dcd89 100644
--- a/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
+++ b/src/SMAPI.Web/Framework/LogParsing/LogParser.cs
@@ -45,7 +45,7 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
         private readonly Regex ModUpdateListEntryPattern = new Regex(@"^   (?<name>.+?) (?<version>[^\s]+): (?<link>.+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
         /// <summary>A regex pattern matching SMAPI's update line.</summary>
-        private readonly Regex SMAPIUpdatePattern = new Regex(@"^You can update SMAPI to (?<version>[^\s]+): (?<link>.+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
+        private readonly Regex SmapiUpdatePattern = new Regex(@"^You can update SMAPI to (?<version>[^\s]+): (?<link>.+)$", RegexOptions.Compiled | RegexOptions.IgnoreCase);
 
 
         /*********
@@ -181,9 +181,9 @@ namespace StardewModdingAPI.Web.Framework.LogParsing
                             message.Section = LogSection.ModUpdateList;
                         }
 
-                        else if (message.Level == LogLevel.Alert && this.SMAPIUpdatePattern.IsMatch(message.Text))
+                        else if (message.Level == LogLevel.Alert && this.SmapiUpdatePattern.IsMatch(message.Text))
                         {
-                            Match match = this.SMAPIUpdatePattern.Match(message.Text);
+                            Match match = this.SmapiUpdatePattern.Match(message.Text);
                             string version = match.Groups["version"].Value;
                             string link = match.Groups["link"].Value;
                             smapiMod.UpdateVersion = version;
diff --git a/src/SMAPI.Web/Views/Mods/Index.cshtml b/src/SMAPI.Web/Views/Mods/Index.cshtml
index fa1375ec..c62e1466 100644
--- a/src/SMAPI.Web/Views/Mods/Index.cshtml
+++ b/src/SMAPI.Web/Views/Mods/Index.cshtml
@@ -83,7 +83,7 @@ else
                 </tr>
             </thead>
             <tbody>
-                <tr v-for="mod in mods" :key="mod.Name" v-bind:id="mod.Slug" :key="mod.Slug" v-bind:data-status="mod.Compatibility.Status" v-show="mod.Visible">
+                <tr v-for="mod in mods" :key="mod.Slug" v-bind:id="mod.Slug" v-bind:data-status="mod.Compatibility.Status" v-show="mod.Visible">
                     <td>
                         {{mod.Name}}
                         <small class="mod-alt-names" v-if="mod.AlternateNames">(aka {{mod.AlternateNames}})</small>
diff --git a/src/SMAPI.Web/Views/Shared/_Layout.cshtml b/src/SMAPI.Web/Views/Shared/_Layout.cshtml
index 2d06ceb1..67dcd3b3 100644
--- a/src/SMAPI.Web/Views/Shared/_Layout.cshtml
+++ b/src/SMAPI.Web/Views/Shared/_Layout.cshtml
@@ -29,7 +29,7 @@
     </div>
     <div id="content-column">
         <div id="content">
-            @if (ViewData["ViewTitle"] != string.Empty)
+            @if (ViewData["ViewTitle"] as string != string.Empty)
             {
                 <h1>@(ViewData["ViewTitle"] ?? ViewData["Title"])</h1>
             }
diff --git a/src/SMAPI.Web/wwwroot/Content/js/mods.js b/src/SMAPI.Web/wwwroot/Content/js/mods.js
index 35098b60..ac2754a4 100644
--- a/src/SMAPI.Web/wwwroot/Content/js/mods.js
+++ b/src/SMAPI.Web/wwwroot/Content/js/mods.js
@@ -1,5 +1,3 @@
-/* globals $ */
-
 var smapi = smapi || {};
 var app;
 smapi.modList = function (mods, enableBeta) {
diff --git a/src/SMAPI/Framework/Rendering/SDisplayDevice.cs b/src/SMAPI/Framework/Rendering/SDisplayDevice.cs
index 382949bf..85e69ae6 100644
--- a/src/SMAPI/Framework/Rendering/SDisplayDevice.cs
+++ b/src/SMAPI/Framework/Rendering/SDisplayDevice.cs
@@ -2,7 +2,6 @@ using System;
 using Microsoft.Xna.Framework;
 using Microsoft.Xna.Framework.Content;
 using Microsoft.Xna.Framework.Graphics;
-using StardewValley;
 using xTile.Dimensions;
 using xTile.Layers;
 using xTile.ObjectModel;
@@ -13,13 +12,6 @@ namespace StardewModdingAPI.Framework.Rendering
     /// <summary>A map display device which overrides the draw logic to support tile rotation.</summary>
     internal class SDisplayDevice : SXnaDisplayDevice
     {
-        /*********
-        ** Fields
-        *********/
-        /// <summary>The origin to use when rotating tiles.</summary>
-        private readonly Vector2 RotationOrigin;
-
-
         /*********
         ** Public methods
         *********/
@@ -27,10 +19,7 @@ namespace StardewModdingAPI.Framework.Rendering
         /// <param name="contentManager">The content manager through which to load tiles.</param>
         /// <param name="graphicsDevice">The graphics device with which to render tiles.</param>
         public SDisplayDevice(ContentManager contentManager, GraphicsDevice graphicsDevice)
-            : base(contentManager, graphicsDevice)
-        {
-            this.RotationOrigin = new Vector2((Game1.tileSize * Game1.pixelZoom) / 2f);
-        }
+            : base(contentManager, graphicsDevice) { }
 
         /// <summary>Draw a tile to the screen.</summary>
         /// <param name="tile">The tile to draw.</param>
diff --git a/src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs b/src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs
index d4f62b4f..121e53bc 100644
--- a/src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs
+++ b/src/SMAPI/Framework/Rendering/SXnaDisplayDevice.cs
@@ -10,7 +10,7 @@ using xTile.Layers;
 using xTile.Tiles;
 using Rectangle = xTile.Dimensions.Rectangle;
 
-namespace StardewModdingAPI.Framework
+namespace StardewModdingAPI.Framework.Rendering
 {
     /// <summary>A map display device which reimplements the default logic.</summary>
     /// <remarks>This is an exact copy of <see cref="XnaDisplayDevice"/>, except that private fields are protected and all methods are virtual.</remarks>
diff --git a/src/SMAPI/Framework/SGame.cs b/src/SMAPI/Framework/SGame.cs
index 2a30b595..82db5857 100644
--- a/src/SMAPI/Framework/SGame.cs
+++ b/src/SMAPI/Framework/SGame.cs
@@ -1310,7 +1310,7 @@ namespace StardewModdingAPI.Framework
                                 }
                                 Game1.drawPlayerHeldObject(Game1.player);
                             }
-                        label_139:
+                            label_139:
                             if ((Game1.player.UsingTool || Game1.pickingTool) && Game1.player.CurrentTool != null && ((!Game1.player.CurrentTool.Name.Equals("Seeds") || Game1.pickingTool) && (Game1.currentLocation.Map.GetLayer("Front").PickTile(new Location(Game1.player.getStandingX(), (int)Game1.player.Position.Y - 38), Game1.viewport.Size) != null && Game1.currentLocation.Map.GetLayer("Front").PickTile(new Location(Game1.player.getStandingX(), Game1.player.getStandingY()), Game1.viewport.Size) == null)))
                                 Game1.drawTool(Game1.player);
                             if (Game1.currentLocation.Map.GetLayer("AlwaysFront") != null)
-- 
cgit 


From b32cad4046916344665c67923482db09cacb366f Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Sat, 20 Jun 2020 11:13:23 -0400
Subject: add i18n schema to JSON validator

---
 docs/release-notes.md                              |  1 +
 docs/technical/web.md                              |  5 +++--
 .../Controllers/JsonValidatorController.cs         |  3 ++-
 src/SMAPI.Web/wwwroot/schemas/i18n.json            | 24 ++++++++++++++++++++++
 4 files changed, 30 insertions(+), 3 deletions(-)
 create mode 100644 src/SMAPI.Web/wwwroot/schemas/i18n.json

(limited to 'src/SMAPI.Web/wwwroot')

diff --git a/docs/release-notes.md b/docs/release-notes.md
index 3c3f0796..43e1011c 100644
--- a/docs/release-notes.md
+++ b/docs/release-notes.md
@@ -20,6 +20,7 @@
 
 * For the web UI:
   * Added GitHub licenses to mod compatibility list.
+  * Added SMAPI `i18n` schema to JSON validator.
   * Updated ModDrop URLs.
   * Internal changes to improve performance and reliability.
 
diff --git a/docs/technical/web.md b/docs/technical/web.md
index d21b87ac..50237bfe 100644
--- a/docs/technical/web.md
+++ b/docs/technical/web.md
@@ -110,8 +110,9 @@ Available schemas:
 
 format | schema URL
 ------ | ----------
-[SMAPI `manifest.json`](https://stardewvalleywiki.com/Modding:Modder_Guide/APIs/Manifest) | https://smapi.io/schemas/manifest.json
-[Content Patcher `content.json`](https://github.com/Pathoschild/StardewMods/tree/develop/ContentPatcher#readme) | https://smapi.io/schemas/content-patcher.json
+[SMAPI: `manifest.json`](https://stardewvalleywiki.com/Modding:Modder_Guide/APIs/Manifest) | https://smapi.io/schemas/manifest.json
+[SMAPI: translations (`i18n` folder)](https://stardewvalleywiki.com/Modding:Modder_Guide/APIs/Translation) | https://smapi.io/schemas/i18n.json
+[Content Patcher: `content.json`](https://github.com/Pathoschild/StardewMods/tree/develop/ContentPatcher#readme) | https://smapi.io/schemas/content-patcher.json
 
 ## Web API
 ### Overview
diff --git a/src/SMAPI.Web/Controllers/JsonValidatorController.cs b/src/SMAPI.Web/Controllers/JsonValidatorController.cs
index c43fb929..8fb9e06a 100644
--- a/src/SMAPI.Web/Controllers/JsonValidatorController.cs
+++ b/src/SMAPI.Web/Controllers/JsonValidatorController.cs
@@ -27,7 +27,8 @@ namespace StardewModdingAPI.Web.Controllers
         private readonly IDictionary<string, string> SchemaFormats = new Dictionary<string, string>
         {
             ["none"] = "None",
-            ["manifest"] = "Manifest",
+            ["manifest"] = "SMAPI: manifest",
+            ["i18n"] = "SMAPI: translations (i18n)",
             ["content-patcher"] = "Content Patcher"
         };
 
diff --git a/src/SMAPI.Web/wwwroot/schemas/i18n.json b/src/SMAPI.Web/wwwroot/schemas/i18n.json
new file mode 100644
index 00000000..493ad213
--- /dev/null
+++ b/src/SMAPI.Web/wwwroot/schemas/i18n.json
@@ -0,0 +1,24 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "$id": "https://smapi.io/schemas/i18n.json",
+    "title": "SMAPI i18n file",
+    "description": "A translation file for a SMAPI mod or content pack.",
+    "@documentationUrl": "https://stardewvalleywiki.com/Modding:Modder_Guide/APIs/Translation",
+    "type": "object",
+
+    "properties": {
+        "$schema": {
+            "title": "Schema",
+            "description": "A reference to this JSON schema. Not part of the actual format, but useful for validation tools.",
+            "type": "string",
+            "const": "https://smapi.io/schemas/manifest.json"
+        }
+    },
+
+    "additionalProperties": {
+        "type": "string",
+        "@errorMessages": {
+            "type": "Invalid property. Translation files can only contain text property values."
+        }
+    }
+}
-- 
cgit