Update TillableGround

TillableGround/ModConfig.cs

@@ -1,5 +1,9 @@
-namespace TillableGround {
+using StardewModdingAPI;
+
+namespace TillableGround {
     class ModConfig {
-        public bool TillAnywhere { get; set; } = false;
+        public bool AllowTillingAnywhere { get; set; } = false;
+        public SButton AllowTillingKeybind { get; set; } = SButton.H;
+        public SButton PreventTillingKeybind { get; set; } = SButton.U;
     }
 }

TillableGround/TillableGround.cs

@@ -3,6 +3,8 @@
 using StardewValley;
 using Microsoft.Xna.Framework;
 using System.Collections.Generic;
+using xTile.Layers;
+using xTile.Tiles;
 
 namespace TillableGround {
      public class TillableGround : Mod {
@@ -11,7 +13,7 @@ public class TillableGround : Mod {
         public override void Entry(IModHelper helper) {
             Config = Helper.ReadConfig<ModConfig>();
 
-            if (Config.TillAnywhere) {
+            if (Config.AllowTillingAnywhere) {
                 InputEvents.ButtonReleased += InputEvents_ButtonReleased;
             }
             else {
@@ -21,14 +23,16 @@ public override void Entry(IModHelper helper) {
 
         void InputEvents_ButtonPressed( object sender, EventArgsInput e ) {
             if (!Context.IsWorldReady) { return; }
-
-            if (e.Button == SButton.H) {
-                Vector2 tile = e.Cursor.Tile;
-                int x = (int)tile.X, y = (int)tile.Y;
-                if (Utility.tileWithinRadiusOfPlayer(x, y, 1, Game1.player)) {
-                    SetTileTillable(x, y);
-                    FancyTillFeedback(x, y);
-                }
+
+            Vector2 tile = e.Cursor.Tile;
+            int x = (int)tile.X, y = (int)tile.Y;
+            if (e.Button == Config.AllowTillingKeybind) {
+                SetTileTillable(x, y);
+                FancyTillFeedback(x, y, "Tillable");
+            }
+            else if (e.Button == Config.PreventTillingKeybind) {
+                SetTileUntillable(x, y);
+                FancyTillFeedback(x, y, "Untillable");
             }
         }
 
@@ -45,6 +49,12 @@ public void SetTileTillable(int x, int y) {
             Game1.currentLocation.setTileProperty(x, y, "Back", "Diggable", "T");
         }
 
+        public void SetTileUntillable(int x, int y) {
+            Layer layer = Game1.currentLocation.map.GetLayer("Back");
+            Tile tile = layer.PickTile(new xTile.Dimensions.Location(x, y) * Game1.tileSize, Game1.viewport.Size);
+            tile.Properties.Remove("Diggable");
+        }
+
         public List<Vector2> GetHoedTiles() {
             Farmer player = Game1.player;
             Vector2 vector = player.GetToolLocation(false);
@@ -54,14 +64,14 @@ public List<Vector2> GetHoedTiles() {
                 Invoke<List<Vector2>>(offset, player.toolPower, player);
         }
 
-        public void FancyTillFeedback(int x, int y) {
+        public void FancyTillFeedback(int x, int y, string message) {
             // Add the hoe animation without hoeing
             Game1.currentLocation.temporarySprites.Add(
                  new TemporaryAnimatedSprite(12, new Vector2(x * 64f, y * 64f), Color.White, 8,
                      Game1.random.NextDouble() < 0.5, 50f, 0, -1, -1f, -1, 0)
             );
 
-            Game1.addHUDMessage(new HUDMessage("Made tile tillable", 3) {
+            Game1.addHUDMessage(new HUDMessage("Made tile " + message, 3) {
                 noIcon = true,
                 timeLeft = HUDMessage.defaultTime / 4
             });

TillableGround/manifest.json

@@ -1,7 +1,7 @@
 {
   "Name": "TillableGround",
   "Author": "hawkfalcon",
-  "Version": "1.1.0",
+  "Version": "2.0.0",
   "Description": "Make any tile tillable (so you can use your hoe on it)",
   "UniqueID": "hawkfalcon.TillableGround",
   "EntryDll": "TillableGround.dll",