Skip to content

Commit

Permalink
Renamed M1 to Farmtronics.
Browse files Browse the repository at this point in the history
  • Loading branch information
JoeStrout committed Jan 9, 2022
1 parent d46d4aa commit 7aa3939
Show file tree
Hide file tree
Showing 15 changed files with 24 additions and 20 deletions.
2 changes: 1 addition & 1 deletion M1/Bot.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<Item> inventory { get { return farmer == null ? null : farmer.Items; } }
public Color screenColor = Color.Transparent;
Expand Down
2 changes: 1 addition & 1 deletion M1/BotUIMenu.cs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ 3. A MiniScript console.
using StardewValley;
using StardewValley.Menus;

namespace M1 {
namespace Farmtronics {
public class BotUIMenu : MenuWithInventory {

Bot bot;
Expand Down
2 changes: 1 addition & 1 deletion M1/Console.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion M1/Debug.cs
Original file line number Diff line number Diff line change
@@ -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);
Expand Down
3 changes: 2 additions & 1 deletion M1/M1.csproj → M1/Farmtronics.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,8 @@
<PropertyGroup>
<Copyright>Copyright © $([System.DateTime]::UtcNow.Year) Joe Strout ($([System.DateTime]::UtcNow.ToString("s")))</Copyright>
<TargetFramework>net5.0</TargetFramework>
<ReleaseVersion>0.1.0</ReleaseVersion>
<ReleaseVersion>1.0</ReleaseVersion>
<ModFolderName>Farmtronics</ModFolderName>
</PropertyGroup>

<ItemGroup>
Expand Down
7 changes: 5 additions & 2 deletions M1/M1.sln → M1/Farmtronics.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
2 changes: 1 addition & 1 deletion M1/FileUtils.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
using System.Collections.Generic;
using System.IO;
using System.Text;
using M1;
using Farmtronics;

public static class FileUtils {

Expand Down
2 changes: 1 addition & 1 deletion M1/KeyWatcher.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion M1/M1API.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions M1/ModEntry.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
using StardewValley.TerrainFeatures;


namespace M1
namespace Farmtronics
{
public class ModEntry : Mod, IAssetEditor {
public static IModHelper helper;
Expand Down Expand Up @@ -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;
Expand All @@ -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);
};
}
Expand Down
2 changes: 1 addition & 1 deletion M1/RealFileDisk.cs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using System.Collections;
using System.Collections.Generic;
using System.IO;
using M1;
using Farmtronics;

public class RealFileDisk : Disk {

Expand Down
4 changes: 2 additions & 2 deletions M1/Shell.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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; }
Expand All @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion M1/TextDisplay.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
using StardewValley;
using StardewModdingAPI;

namespace M1 {
namespace Farmtronics {

public class TextDisplay {

Expand Down
2 changes: 1 addition & 1 deletion M1/ToDoManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
using StardewModdingAPI;
using StardewValley;

namespace M1 {
namespace Farmtronics {
public static class ToDoManager {

public enum Task {
Expand Down
4 changes: 2 additions & 2 deletions M1/manifest.json
Original file line number Diff line number Diff line change
@@ -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": []
}

0 comments on commit 7aa3939

Please sign in to comment.