diff --git a/M1/Bot.cs b/M1/Bot.cs index 776bb09..676f79f 100644 --- a/M1/Bot.cs +++ b/M1/Bot.cs @@ -15,7 +15,7 @@ This class is a stardew valley Object subclass that represents a Bot. using StardewValley.Tools; using StardewValley.Network; -namespace M1 { +namespace Farmtronics { public class Bot : StardewValley.Object { public IList inventory { get { return farmer == null ? null : farmer.Items; } } public Color screenColor = Color.Transparent; diff --git a/M1/BotUIMenu.cs b/M1/BotUIMenu.cs index 431864f..bbaf234 100644 --- a/M1/BotUIMenu.cs +++ b/M1/BotUIMenu.cs @@ -14,7 +14,7 @@ 3. A MiniScript console. using StardewValley; using StardewValley.Menus; -namespace M1 { +namespace Farmtronics { public class BotUIMenu : MenuWithInventory { Bot bot; diff --git a/M1/Console.cs b/M1/Console.cs index 068fc1b..de51b40 100644 --- a/M1/Console.cs +++ b/M1/Console.cs @@ -9,7 +9,7 @@ using StardewValley.Menus; using StardewValley.BellsAndWhistles; -namespace M1 { +namespace Farmtronics { public class Console : IClickableMenu, IKeyboardSubscriber { public new const int width = 800; // total width/height including the frame public new const int height = 640; diff --git a/M1/Debug.cs b/M1/Debug.cs index 4fb0efb..54fdae9 100644 --- a/M1/Debug.cs +++ b/M1/Debug.cs @@ -1,7 +1,7 @@ using System; using StardewModdingAPI; -namespace M1 { +namespace Farmtronics { public static class Debug { public static void Log(string s, object context=null) { ModEntry.instance.Monitor.Log(DateTime.Now.ToString("'['HH':'mm':'ss'] '") + s, LogLevel.Debug); diff --git a/M1/M1.csproj b/M1/Farmtronics.csproj similarity index 81% rename from M1/M1.csproj rename to M1/Farmtronics.csproj index 2f3522d..ab39b10 100644 --- a/M1/M1.csproj +++ b/M1/Farmtronics.csproj @@ -3,7 +3,8 @@ Copyright © $([System.DateTime]::UtcNow.Year) Joe Strout ($([System.DateTime]::UtcNow.ToString("s"))) net5.0 - 0.1.0 + 1.0 + Farmtronics diff --git a/M1/M1.sln b/M1/Farmtronics.sln similarity index 78% rename from M1/M1.sln rename to M1/Farmtronics.sln index 0742787..d58f2d3 100644 --- a/M1/M1.sln +++ b/M1/Farmtronics.sln @@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.810.13 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "M1", "M1.csproj", "{5FF720E2-E604-4B58-BDD9-9356FD69AFDE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Farmtronics", "Farmtronics.csproj", "{5FF720E2-E604-4B58-BDD9-9356FD69AFDE}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -23,6 +23,9 @@ Global SolutionGuid = {1A1D1271-8E80-4A8D-A57B-267C68FE3D68} EndGlobalSection GlobalSection(MonoDevelopProperties) = preSolution - version = 0.1.0 + version = 1.0 + Policies = $0 + $0.DotNetNamingPolicy = $1 + $1.DirectoryNamespaceAssociation = PrefixedHierarchical EndGlobalSection EndGlobal diff --git a/M1/FileUtils.cs b/M1/FileUtils.cs index 3bbba49..f1ea47a 100644 --- a/M1/FileUtils.cs +++ b/M1/FileUtils.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.IO; using System.Text; -using M1; +using Farmtronics; public static class FileUtils { diff --git a/M1/KeyWatcher.cs b/M1/KeyWatcher.cs index 8eceae9..4a31d38 100644 --- a/M1/KeyWatcher.cs +++ b/M1/KeyWatcher.cs @@ -7,7 +7,7 @@ as a key input (due to initial press or repeat). using StardewModdingAPI; using Microsoft.Xna.Framework; -namespace M1 { +namespace Farmtronics { public class KeyWatcher { public SButton keyButton; public char keyChar; diff --git a/M1/M1API.cs b/M1/M1API.cs index 7773b98..ef5cc84 100644 --- a/M1/M1API.cs +++ b/M1/M1API.cs @@ -17,7 +17,7 @@ This static class implements the APIs that extend MiniScript with -namespace M1 { +namespace Farmtronics { public static class M1API { static bool initialized; diff --git a/M1/ModEntry.cs b/M1/ModEntry.cs index 240a3f3..b3e5cd2 100644 --- a/M1/ModEntry.cs +++ b/M1/ModEntry.cs @@ -10,7 +10,7 @@ using StardewValley.TerrainFeatures; -namespace M1 +namespace Farmtronics { public class ModEntry : Mod, IAssetEditor { public static IModHelper helper; @@ -102,7 +102,7 @@ public void OnMenuChanged(object sender, MenuChangedEventArgs e) { if (!dlog.isQuestion || dlog.responses[0].responseKey != "Weather") return; // TV menu: insert a new option for the Home Computer - Response r = new Response("M1", "Farmtronics Home Computer"); + Response r = new Response("Farmtronics", "Farmtronics Home Computer"); dlog.responses.Insert(dlog.responses.Count-1, r); // adjust the dialog height var h = SpriteText.getHeightOfString(r.responseText, dlog.width) + 16; @@ -111,7 +111,7 @@ public void OnMenuChanged(object sender, MenuChangedEventArgs e) { var prevHandler = Game1.currentLocation.afterQuestion; Game1.currentLocation.afterQuestion = (who, whichAnswer) => { print($"{who} selected channel {whichAnswer}"); - if (whichAnswer == "M1") PresentComputer(); + if (whichAnswer == "Farmtronics") PresentComputer(); else prevHandler(who, whichAnswer); }; } diff --git a/M1/RealFileDisk.cs b/M1/RealFileDisk.cs index 82b95a3..d6f7383 100644 --- a/M1/RealFileDisk.cs +++ b/M1/RealFileDisk.cs @@ -1,7 +1,7 @@ using System.Collections; using System.Collections.Generic; using System.IO; -using M1; +using Farmtronics; public class RealFileDisk : Disk { diff --git a/M1/Shell.cs b/M1/Shell.cs index b4644cd..3f73463 100644 --- a/M1/Shell.cs +++ b/M1/Shell.cs @@ -13,7 +13,7 @@ the user. using Miniscript; using Microsoft.Xna.Framework; -namespace M1 { +namespace Farmtronics { public class Shell { public Console console { get; private set; } public Bot bot { get; private set; } @@ -35,7 +35,7 @@ public class Shell { public TextDisplay textDisplay { get { return console.display; } } public Shell() { - console = new M1.Console(this); + console = new Farmtronics.Console(this); // prepare the interpreter interpreter = new Interpreter(null, PrintLineWithTaskCheck, PrintLine); diff --git a/M1/TextDisplay.cs b/M1/TextDisplay.cs index 0b1620c..0ccf3be 100644 --- a/M1/TextDisplay.cs +++ b/M1/TextDisplay.cs @@ -8,7 +8,7 @@ using StardewValley; using StardewModdingAPI; -namespace M1 { +namespace Farmtronics { public class TextDisplay { diff --git a/M1/ToDoManager.cs b/M1/ToDoManager.cs index f833f43..8df122c 100644 --- a/M1/ToDoManager.cs +++ b/M1/ToDoManager.cs @@ -6,7 +6,7 @@ using StardewModdingAPI; using StardewValley; -namespace M1 { +namespace Farmtronics { public static class ToDoManager { public enum Task { diff --git a/M1/manifest.json b/M1/manifest.json index 0d3f677..ead62e5 100644 --- a/M1/manifest.json +++ b/M1/manifest.json @@ -1,10 +1,10 @@ { "Name": "Farmtronics", "Author": "Joe Strout", - "Version": "0.0.2", + "Version": "1.0", "Description": "Adds a high-tech \"home computer\" to your TV!", "UniqueID": "strout.farmtronics", - "EntryDll": "M1.dll", + "EntryDll": "Farmtronics.dll", "MinimumApiVersion": "3.0.0", "UpdateKeys": [] } \ No newline at end of file