restore obsolete interfaces for backwards compatibility with EntoFramework

3 files changed, 281 insertions, 3 deletions

diff --git a/src/StardewModdingAPI/Inheritance/SObject.cs b/src/StardewModdingAPI/Inheritance/SObject.cs
new file mode 100644
index 00000000..5c8b4d13
--- /dev/null
+++ b/src/StardewModdingAPI/Inheritance/SObject.cs
@@ -0,0 +1,277 @@
+using System;
+using System.Xml.Serialization;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using StardewValley;
+using Object = StardewValley.Object;
+
+#pragma warning disable 1591
+
+namespace StardewModdingAPI.Inheritance
+{
+    [Obsolete("Do not use at this time.")]
+    public class SObject : Object
+    {
+        public SObject()
+        {
+            name = "Modded Item Name";
+            Description = "Modded Item Description";
+            CategoryName = "Modded Item Category";
+            Category = 4163;
+            CategoryColour = Color.White;
+            IsPassable = false;
+            IsPlaceable = false;
+            boundingBox = new Rectangle(0, 0, 64, 64);
+            MaxStackSize = 999;
+
+            type = "interactive";
+        }
+
+        public override string Name
+        {
+            get { return name; }
+            set { name = value; }
+        }
+
+        public string Description { get; set; }
+        public Texture2D Texture { get; set; }
+        public string CategoryName { get; set; }
+        public Color CategoryColour { get; set; }
+        public bool IsPassable { get; set; }
+        public bool IsPlaceable { get; set; }
+        public bool HasBeenRegistered { get; set; }
+        public int RegisteredId { get; set; }
+
+        public int MaxStackSize { get; set; }
+
+        public bool WallMounted { get; set; }
+        public Vector2 DrawPosition { get; set; }
+
+        public bool FlaggedForPickup { get; set; }
+
+        [XmlIgnore]
+        public Vector2 CurrentMouse { get; protected set; }
+
+        [XmlIgnore]
+        public Vector2 PlacedAt { get; protected set; }
+
+        public override int Stack
+        {
+            get { return stack; }
+            set { stack = value; }
+        }
+
+        public override string getDescription()
+        {
+            return Description;
+        }
+
+        public override void draw(SpriteBatch spriteBatch, int x, int y, float alpha = 1)
+        {
+            if (Texture != null)
+            {
+                spriteBatch.Draw(Texture, Game1.GlobalToLocal(Game1.viewport, new Vector2(x * Game1.tileSize + Game1.tileSize / 2 + (shakeTimer > 0 ? Game1.random.Next(-1, 2) : 0), y * Game1.tileSize + Game1.tileSize / 2 + (shakeTimer > 0 ? Game1.random.Next(-1, 2) : 0))), Game1.currentLocation.getSourceRectForObject(ParentSheetIndex), Color.White * alpha, 0f, new Vector2(8f, 8f), scale.Y > 1f ? getScale().Y : Game1.pixelZoom, flipped ? SpriteEffects.FlipHorizontally : SpriteEffects.None, (isPassable() ? getBoundingBox(new Vector2(x, y)).Top : getBoundingBox(new Vector2(x, y)).Bottom) / 10000f);
+            }
+        }
+
+        public new void drawAsProp(SpriteBatch b)
+        {
+        }
+
+        public override void draw(SpriteBatch spriteBatch, int xNonTile, int yNonTile, float layerDepth, float alpha = 1)
+        {
+            Log.Debug("THIS DRAW FUNCTION IS NOT IMPLEMENTED I WANT TO KNOW WHERE IT IS CALLED");
+            //try
+            //{
+            //    if (Texture != null)
+            //    {
+            //        int targSize = Game1.tileSize;
+            //        int midX = (xNonTile) + 32;
+            //        int midY = (yNonTile) + 32;
+
+            //        int targX = midX - targSize / 2;
+            //        int targY = midY - targSize / 2;
+
+            //        Rectangle targ = new Rectangle(targX, targY, targSize, targSize);
+            //        spriteBatch.Draw(Texture, targ, null, new Color(255, 255, 255, 255f * alpha), 0, Vector2.Zero, SpriteEffects.None, layerDepth);
+            //        //spriteBatch.Draw(Program.DebugPixel, targ, null, Color.Red, 0, Vector2.Zero, SpriteEffects.None, layerDepth);
+            //        /*
+            //        spriteBatch.DrawString(Game1.dialogueFont, "TARG: " + targ, new Vector2(128, 0), Color.Red);
+            //        spriteBatch.DrawString(Game1.dialogueFont, ".", new Vector2(targX * 0.5f, targY), Color.Orange);
+            //        spriteBatch.DrawString(Game1.dialogueFont, ".", new Vector2(targX, targY), Color.Red);
+            //        spriteBatch.DrawString(Game1.dialogueFont, ".", new Vector2(targX * 1.5f, targY), Color.Yellow);
+            //        spriteBatch.DrawString(Game1.dialogueFont, ".", new Vector2(targX * 2f, targY), Color.Green);
+            //        */
+            //    }
+            //}
+            //catch (Exception ex)
+            //{
+            //    Log.AsyncR(ex.ToString());
+            //    Console.ReadKey();
+            //}
+        }
+
+        public override void drawInMenu(SpriteBatch spriteBatch, Vector2 location, float scaleSize, float transparency, float layerDepth, bool drawStackNumber)
+        {
+            if (isRecipe)
+            {
+                transparency = 0.5f;
+                scaleSize *= 0.75f;
+            }
+
+            if (Texture != null)
+            {
+                var targSize = (int) (64 * scaleSize * 0.9f);
+                var midX = (int) (location.X + 32);
+                var midY = (int) (location.Y + 32);
+
+                var targX = midX - targSize / 2;
+                var targY = midY - targSize / 2;
+
+                spriteBatch.Draw(Texture, new Rectangle(targX, targY, targSize, targSize), null, new Color(255, 255, 255, transparency), 0, Vector2.Zero, SpriteEffects.None, layerDepth);
+            }
+            if (drawStackNumber)
+            {
+                var _scale = 0.5f + scaleSize;
+                Game1.drawWithBorder(stack.ToString(), Color.Black, Color.White, location + new Vector2(Game1.tileSize - Game1.tinyFont.MeasureString(string.Concat(stack.ToString())).X * _scale, Game1.tileSize - (float) ((double) Game1.tinyFont.MeasureString(string.Concat(stack.ToString())).Y * 3.0f / 4.0f) * _scale), 0.0f, _scale, 1f, true);
+            }
+        }
+
+        public override void drawWhenHeld(SpriteBatch spriteBatch, Vector2 objectPosition, Farmer f)
+        {
+            if (Texture != null)
+            {
+                var targSize = 64;
+                var midX = (int) (objectPosition.X + 32);
+                var midY = (int) (objectPosition.Y + 32);
+
+                var targX = midX - targSize / 2;
+                var targY = midY - targSize / 2;
+
+                spriteBatch.Draw(Texture, new Rectangle(targX, targY, targSize, targSize), null, Color.White, 0, Vector2.Zero, SpriteEffects.None, (f.getStandingY() + 2) / 10000f);
+            }
+        }
+
+        public override Color getCategoryColor()
+        {
+            return CategoryColour;
+        }
+
+        public override string getCategoryName()
+        {
+            if (string.IsNullOrEmpty(CategoryName))
+                return "Modded Item";
+            return CategoryName;
+        }
+
+        public override bool isPassable()
+        {
+            return IsPassable;
+        }
+
+        public override bool isPlaceable()
+        {
+            return IsPlaceable;
+        }
+
+        public override int maximumStackSize()
+        {
+            return MaxStackSize;
+        }
+
+        public SObject Clone()
+        {
+            var toRet = new SObject
+            {
+                Name = Name,
+                CategoryName = CategoryName,
+                Description = Description,
+                Texture = Texture,
+                IsPassable = IsPassable,
+                IsPlaceable = IsPlaceable,
+                quality = quality,
+                scale = scale,
+                isSpawnedObject = isSpawnedObject,
+                isRecipe = isRecipe,
+                questItem = questItem,
+                stack = 1,
+                HasBeenRegistered = HasBeenRegistered,
+                RegisteredId = RegisteredId
+            };
+
+
+            return toRet;
+        }
+
+        public override Item getOne()
+        {
+            return Clone();
+        }
+
+        public override void actionWhenBeingHeld(Farmer who)
+        {
+            var x = Game1.oldMouseState.X + Game1.viewport.X;
+            var y = Game1.oldMouseState.Y + Game1.viewport.Y;
+
+            x = x / Game1.tileSize;
+            y = y / Game1.tileSize;
+
+            CurrentMouse = new Vector2(x, y);
+            //Program.LogDebug(canBePlacedHere(Game1.currentLocation, CurrentMouse));
+            base.actionWhenBeingHeld(who);
+        }
+
+        public override bool canBePlacedHere(GameLocation l, Vector2 tile)
+        {
+            //Program.LogDebug(CurrentMouse.ToString().Replace("{", "").Replace("}", ""));
+            if (!l.objects.ContainsKey(tile))
+                return true;
+
+            return false;
+        }
+
+        public override bool placementAction(GameLocation location, int x, int y, Farmer who = null)
+        {
+            if (Game1.didPlayerJustRightClick())
+                return false;
+
+            x = x / Game1.tileSize;
+            y = y / Game1.tileSize;
+
+            //Program.LogDebug(x + " - " + y);
+            //Console.ReadKey();
+
+            var key = new Vector2(x, y);
+
+            if (!canBePlacedHere(location, key))
+                return false;
+
+            var s = Clone();
+
+            s.PlacedAt = key;
+            s.boundingBox = new Rectangle(x / Game1.tileSize * Game1.tileSize, y / Game1.tileSize * Game1.tileSize, boundingBox.Width, boundingBox.Height);
+
+            location.objects.Add(key, s);
+            Log.Async($"{GetHashCode()} - {s.GetHashCode()}");
+
+            return true;
+        }
+
+        public override void actionOnPlayerEntry()
+        {
+            //base.actionOnPlayerEntry();
+        }
+
+        public override void drawPlacementBounds(SpriteBatch spriteBatch, GameLocation location)
+        {
+            if (canBePlacedHere(location, CurrentMouse))
+            {
+                var targSize = Game1.tileSize;
+
+                var x = Game1.oldMouseState.X + Game1.viewport.X;
+                var y = Game1.oldMouseState.Y + Game1.viewport.Y;
+                spriteBatch.Draw(Game1.mouseCursors, new Vector2(x / Game1.tileSize * Game1.tileSize - Game1.viewport.X, y / Game1.tileSize * Game1.tileSize - Game1.viewport.Y), new Rectangle(Utility.playerCanPlaceItemHere(location, this, x, y, Game1.player) ? 194 : 210, 388, 16, 16), Color.White, 0.0f, Vector2.Zero, Game1.pixelZoom, SpriteEffects.None, 0.01f);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/StardewModdingAPI/Framework/LogWriter.cs b/src/StardewModdingAPI/LogWriter.cs
index c21d53f4..f38135d9 100644
--- a/src/StardewModdingAPI/Framework/LogWriter.cs
+++ b/src/StardewModdingAPI/LogWriter.cs
@@ -3,11 +3,11 @@ using System.Collections.Concurrent;
 using System.IO;
 using System.Linq;
 
-namespace StardewModdingAPI.Framework
+namespace StardewModdingAPI
 {
     /// <summary>A log writer which queues messages for output, and periodically flushes them to the console and log file.</summary>
     /// <remarks>Only one instance should be created.</remarks>
-    internal class LogWriter
+    public class LogWriter
     {
         /*********
         ** Properties
diff --git a/src/StardewModdingAPI/StardewModdingAPI.csproj b/src/StardewModdingAPI/StardewModdingAPI.csproj
index 4fdd2ff6..afcc17f6 100644
--- a/src/StardewModdingAPI/StardewModdingAPI.csproj
+++ b/src/StardewModdingAPI/StardewModdingAPI.csproj
@@ -200,9 +200,10 @@
     <Compile Include="Framework\UserSettings.cs" />
     <Compile Include="Inheritance\ChangeType.cs" />
     <Compile Include="Inheritance\ItemStackChange.cs" />
+    <Compile Include="Inheritance\SObject.cs" />
     <Compile Include="Log.cs" />
     <Compile Include="LogInfo.cs" />
-    <Compile Include="Framework\LogWriter.cs" />
+    <Compile Include="LogWriter.cs" />
     <Compile Include="Manifest.cs" />
     <Compile Include="Mod.cs" />
     <Compile Include="ModHelper.cs" />