From 4bcb9da31a128b56397bc9983deb0df4c1357f6f Mon Sep 17 00:00:00 2001
From: Jesse Plamondon-Willard <Pathoschild@users.noreply.github.com>
Date: Mon, 24 Dec 2018 20:06:26 -0500
Subject: [PATCH] remove obsolete resource translations

---
 SDVModTest/Extensions/ObjectExtensions.cs     |  30 ---
 SDVModTest/ModEntry.cs                        |  24 ---
 SDVModTest/Properties/Resources.Designer.cs   | 198 ------------------
 SDVModTest/Properties/Resources.resx          | 165 ---------------
 SDVModTest/UI Info Suite.csproj               |  12 --
 .../UIElements/ShowCropAndBarrelTime.cs       |   2 -
 SDVModTest/UIElements/ShowQueenOfSauceIcon.cs |   2 +-
 7 files changed, 1 insertion(+), 432 deletions(-)
 delete mode 100644 SDVModTest/Properties/Resources.Designer.cs
 delete mode 100644 SDVModTest/Properties/Resources.resx

diff --git a/SDVModTest/Extensions/ObjectExtensions.cs b/SDVModTest/Extensions/ObjectExtensions.cs
index 1151657..7e05547 100644
--- a/SDVModTest/Extensions/ObjectExtensions.cs
+++ b/SDVModTest/Extensions/ObjectExtensions.cs
@@ -3,10 +3,6 @@ using StardewModdingAPI;
 using StardewValley;
 using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Resources;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace UIInfoSuite.Extensions
 {
@@ -77,31 +73,5 @@ namespace UIInfoSuite.Extensions
 
             return result;
         }
-
-        public static String SafeGetString(this ResourceManager manager, String key)
-        {
-            String result = string.Empty;
-
-            if (!String.IsNullOrEmpty(key))
-            {
-                try
-                {
-                    result = manager.GetString(key, ModEntry.SpecificCulture);
-                }
-                catch
-                {
-                    try
-                    {
-                        result = Properties.Resources.ResourceManager.GetString(key);
-                    }
-                    catch
-                    {
-
-                    }
-                }
-            }
-
-            return result ?? String.Empty;
-        }
     }
 }
diff --git a/SDVModTest/ModEntry.cs b/SDVModTest/ModEntry.cs
index f9a0128..8f75394 100644
--- a/SDVModTest/ModEntry.cs
+++ b/SDVModTest/ModEntry.cs
@@ -11,9 +11,6 @@ using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using System.Xml;
-using System.Globalization;
-using static StardewValley.LocalizedContentManager;
-using System.Resources;
 using System.Reflection;
 
 namespace UIInfoSuite
@@ -26,22 +23,9 @@ namespace UIInfoSuite
         private readonly Dictionary<String, String> _options = new Dictionary<string, string>();
 
         public static IMonitor MonitorObject { get; private set; }
-        public static CultureInfo SpecificCulture { get; private set; }
-        //public static ResourceManager Resources { get; private set; }
-        //public static IModHelper Helper { get; private set; }
 
         private ModOptionsPageHandler _modOptionsPageHandler;
 
-        public ModEntry()
-        {
-            
-        }
-
-        ~ModEntry()
-        {
-
-        }
-
         public override void Entry(IModHelper helper)
         {
             //Helper = helper;
@@ -51,8 +35,6 @@ namespace UIInfoSuite
             SaveEvents.AfterSave += SaveModData;
             SaveEvents.AfterReturnToTitle += ReturnToTitle;
             GraphicsEvents.OnPreRenderEvent += IconHandler.Handler.Reset;
-            LocalizedContentManager.OnLanguageChange += LocalizedContentManager_OnLanguageChange;
-            LocalizedContentManager_OnLanguageChange(LocalizedContentManager.CurrentLanguageCode);
 
             //Resources = new ResourceManager("UIInfoSuite.Resource.strings", Assembly.GetAssembly(typeof(ModEntry)));
             //try
@@ -66,12 +48,6 @@ namespace UIInfoSuite
             //}
         }
 
-        private void LocalizedContentManager_OnLanguageChange(LanguageCode code)
-        {
-            String cultureString = code.ToString();
-            SpecificCulture = CultureInfo.CreateSpecificCulture(cultureString);
-        }
-
         private void ReturnToTitle(object sender, EventArgs e)
         {
             _modOptionsPageHandler?.Dispose();
diff --git a/SDVModTest/Properties/Resources.Designer.cs b/SDVModTest/Properties/Resources.Designer.cs
deleted file mode 100644
index a000da7..0000000
--- a/SDVModTest/Properties/Resources.Designer.cs
+++ /dev/null
@@ -1,198 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-//     This code was generated by a tool.
-//     Runtime Version:4.0.30319.42000
-//
-//     Changes to this file may cause incorrect behavior and will be lost if
-//     the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-
-namespace UIInfoSuite.Properties {
-    using System;
-    
-    
-    /// <summary>
-    ///   A strongly-typed resource class, for looking up localized strings, etc.
-    /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
-    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources {
-        
-        private static global::System.Resources.ResourceManager resourceMan;
-        
-        private static global::System.Globalization.CultureInfo resourceCulture;
-        
-        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources() {
-        }
-        
-        /// <summary>
-        ///   Returns the cached ResourceManager instance used by this class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager {
-            get {
-                if (object.ReferenceEquals(resourceMan, null)) {
-                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("UIInfoSuite.Properties.Resources", typeof(Resources).Assembly);
-                    resourceMan = temp;
-                }
-                return resourceMan;
-            }
-        }
-        
-        /// <summary>
-        ///   Overrides the current thread's CurrentUICulture property for all
-        ///   resource lookups using this strongly typed resource class.
-        /// </summary>
-        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture {
-            get {
-                return resourceCulture;
-            }
-            set {
-                resourceCulture = value;
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Billboard.
-        /// </summary>
-        internal static string Billboard {
-            get {
-                return ResourceManager.GetString("Billboard", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Calendar.
-        /// </summary>
-        internal static string Calendar {
-            get {
-                return ResourceManager.GetString("Calendar", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to days.
-        /// </summary>
-        internal static string Days {
-            get {
-                return ResourceManager.GetString("Days", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to days to mature.
-        /// </summary>
-        internal static string DaysToMature {
-            get {
-                return ResourceManager.GetString("DaysToMature", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to You&apos;re feelin&apos; lucky!!.
-        /// </summary>
-        internal static string FeelingLucky {
-            get {
-                return ResourceManager.GetString("FeelingLucky", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Harvest price.
-        /// </summary>
-        internal static string HarvestPrice {
-            get {
-                return ResourceManager.GetString("HarvestPrice", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to hours.
-        /// </summary>
-        internal static string Hours {
-            get {
-                return ResourceManager.GetString("Hours", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Level Up.
-        /// </summary>
-        internal static string LevelUp {
-            get {
-                return ResourceManager.GetString("LevelUp", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Feelin&apos; lucky... but not too lucky.
-        /// </summary>
-        internal static string LuckyButNotTooLucky {
-            get {
-                return ResourceManager.GetString("LuckyButNotTooLucky", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Maybe you should stay home today....
-        /// </summary>
-        internal static string MaybeStayHome {
-            get {
-                return ResourceManager.GetString("MaybeStayHome", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to minutes.
-        /// </summary>
-        internal static string Minutes {
-            get {
-                return ResourceManager.GetString("Minutes", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to You&apos;re not feeling lucky at all today....
-        /// </summary>
-        internal static string NotFeelingLuckyAtAll {
-            get {
-                return ResourceManager.GetString("NotFeelingLuckyAtAll", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Ready To Harvest!.
-        /// </summary>
-        internal static string ReadyToHarvest {
-            get {
-                return ResourceManager.GetString("ReadyToHarvest", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Today&apos;s Recipe: .
-        /// </summary>
-        internal static string TodaysRecipe {
-            get {
-                return ResourceManager.GetString("TodaysRecipe", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to Traveling merchant is in town!.
-        /// </summary>
-        internal static string TravelingMerchantIsInTown {
-            get {
-                return ResourceManager.GetString("TravelingMerchantIsInTown", resourceCulture);
-            }
-        }
-    }
-}
diff --git a/SDVModTest/Properties/Resources.resx b/SDVModTest/Properties/Resources.resx
deleted file mode 100644
index fb3260e..0000000
--- a/SDVModTest/Properties/Resources.resx
+++ /dev/null
@@ -1,165 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="Billboard" xml:space="preserve">
-    <value>Billboard</value>
-  </data>
-  <data name="Calendar" xml:space="preserve">
-    <value>Calendar</value>
-  </data>
-  <data name="Days" xml:space="preserve">
-    <value>days</value>
-  </data>
-  <data name="DaysToMature" xml:space="preserve">
-    <value>days to mature</value>
-  </data>
-  <data name="FeelingLucky" xml:space="preserve">
-    <value>You're feelin' lucky!!</value>
-  </data>
-  <data name="HarvestPrice" xml:space="preserve">
-    <value>Harvest price</value>
-  </data>
-  <data name="Hours" xml:space="preserve">
-    <value>hours</value>
-  </data>
-  <data name="LevelUp" xml:space="preserve">
-    <value>Level Up</value>
-  </data>
-  <data name="LuckyButNotTooLucky" xml:space="preserve">
-    <value>Feelin' lucky... but not too lucky</value>
-  </data>
-  <data name="MaybeStayHome" xml:space="preserve">
-    <value>Maybe you should stay home today...</value>
-  </data>
-  <data name="Minutes" xml:space="preserve">
-    <value>minutes</value>
-  </data>
-  <data name="NotFeelingLuckyAtAll" xml:space="preserve">
-    <value>You're not feeling lucky at all today...</value>
-  </data>
-  <data name="ReadyToHarvest" xml:space="preserve">
-    <value>Ready To Harvest!</value>
-  </data>
-  <data name="TodaysRecipe" xml:space="preserve">
-    <value>Today's Recipe: </value>
-  </data>
-  <data name="TravelingMerchantIsInTown" xml:space="preserve">
-    <value>Traveling merchant is in town!</value>
-  </data>
-</root>
\ No newline at end of file
diff --git a/SDVModTest/UI Info Suite.csproj b/SDVModTest/UI Info Suite.csproj
index bc2d871..8fb5097 100644
--- a/SDVModTest/UI Info Suite.csproj	
+++ b/SDVModTest/UI Info Suite.csproj	
@@ -33,7 +33,6 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <DebugSymbols>true</DebugSymbols>
-    <DocumentationFile></DocumentationFile>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -78,11 +77,6 @@
     <Compile Include="Options\ModOptionsPageButton.cs" />
     <Compile Include="Options\ModOptionsPageHandler.cs" />
     <Compile Include="Options\ModOptionsPageIcon.cs" />
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
     <Compile Include="Tools.cs" />
     <Compile Include="Extensions\StringExtensions.cs" />
     <Compile Include="ModEntry.cs" />
@@ -127,11 +121,5 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/SDVModTest/UIElements/ShowCropAndBarrelTime.cs b/SDVModTest/UIElements/ShowCropAndBarrelTime.cs
index f72af27..adb3cb3 100644
--- a/SDVModTest/UIElements/ShowCropAndBarrelTime.cs
+++ b/SDVModTest/UIElements/ShowCropAndBarrelTime.cs
@@ -9,9 +9,7 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
-using System.Resources;
 using System.Reflection;
-using System.Globalization;
 using StardewValley.Objects;
 using StardewModdingAPI;
 using StardewValley.Locations;
diff --git a/SDVModTest/UIElements/ShowQueenOfSauceIcon.cs b/SDVModTest/UIElements/ShowQueenOfSauceIcon.cs
index 2842b27..476ce6a 100644
--- a/SDVModTest/UIElements/ShowQueenOfSauceIcon.cs
+++ b/SDVModTest/UIElements/ShowQueenOfSauceIcon.cs
@@ -121,7 +121,7 @@ namespace UIInfoSuite.UIElements
                     splitValues = craftingRecipesValue.Split('/');
             }
 
-            string languageRecipeName = (LocalizedContentManager.CurrentLanguageCode == LocalizedContentManager.LanguageCode.en) ?
+            string languageRecipeName = (_helper.Content.CurrentLocaleConstant == LocalizedContentManager.LanguageCode.en) ?
                 key : splitValues[splitValues.Length - 1];
 
             array1[1] = languageRecipeName;