Rugs work!wq

GeneralMods/Revitalize/Framework/Objects/Furniture/RugMultiTiledObject.cs

@@ -0,0 +1,113 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Xna.Framework;
+using PyTK.CustomElementHandler;
+using StardewValley;
+
+namespace Revitalize.Framework.Objects.Furniture
+{
+    public class RugMultiTiledObject:MultiTiledObject
+    {
+        public RugMultiTiledObject() : base()
+        {
+
+        }
+
+        public RugMultiTiledObject(BasicItemInformation Info) : base(Info)
+        {
+
+        }
+
+        public RugMultiTiledObject(BasicItemInformation Info, Vector2 TilePosition) : base(Info, TilePosition)
+        {
+
+        }
+
+        public RugMultiTiledObject(BasicItemInformation Info, Vector2 TilePosition, Dictionary<Vector2, MultiTiledComponent> Objects) : base(Info, TilePosition, Objects)
+        {
+
+
+        }
+
+        /// <summary>
+        /// Rotate all chair components associated with this chair object.
+        /// </summary>
+        public override void rotate()
+        {
+            Revitalize.ModCore.log("Rotate!");
+            foreach (KeyValuePair<Vector2, StardewValley.Object> pair in this.objects)
+            {
+                (pair.Value as RugTileComponent).rotate();
+            }
+            foreach (KeyValuePair<Vector2, StardewValley.Object> pair in this.objects)
+            {
+                (pair.Value as RugTileComponent).checkForSpecialUpSittingAnimation();
+            }
+
+            base.rotate();
+        }
+
+        public override Item getOne()
+        {
+            Dictionary<Vector2, MultiTiledComponent> objs = new Dictionary<Vector2, MultiTiledComponent>();
+            foreach (var pair in this.objects)
+            {
+                objs.Add(pair.Key, (MultiTiledComponent)pair.Value);
+            }
+
+
+            return new RugMultiTiledObject(this.info, this.TileLocation, objs);
+        }
+
+
+        public override ICustomObject recreate(Dictionary<string, string> additionalSaveData, object replacement)
+        {
+            RugMultiTiledObject obj = (RugMultiTiledObject)Revitalize.ModCore.Serializer.DeserializeGUID<RugMultiTiledObject>(additionalSaveData["GUID"]);
+            if (obj == null)
+            {
+                return null;
+            }
+
+            Dictionary<Vector2, Guid> guids = new Dictionary<Vector2, Guid>();
+
+            foreach (KeyValuePair<Vector2, Guid> pair in obj.childrenGuids)
+            {
+                guids.Add(pair.Key, pair.Value);
+            }
+
+            foreach (KeyValuePair<Vector2, Guid> pair in guids)
+            {
+                obj.childrenGuids.Remove(pair.Key);
+                //Revitalize.ModCore.log("DESERIALIZE: " + pair.Value.ToString());
+                RugTileComponent component = Revitalize.ModCore.Serializer.DeserializeGUID<RugTileComponent>(pair.Value.ToString());
+                component.InitNetFields();
+
+                obj.addComponent(pair.Key, component);
+
+
+            }
+            obj.InitNetFields();
+
+            if (!Revitalize.ModCore.ObjectGroups.ContainsKey(additionalSaveData["GUID"]))
+            {
+                Revitalize.ModCore.ObjectGroups.Add(additionalSaveData["GUID"], obj);
+                return obj;
+            }
+            else
+            {
+                return Revitalize.ModCore.ObjectGroups[additionalSaveData["GUID"]];
+            }
+
+
+        }
+
+
+        public override bool canBePlacedHere(GameLocation l, Vector2 tile)
+        {
+            return base.canBePlacedHere(l, tile);
+        }
+    }
+}

GeneralMods/Revitalize/Framework/Objects/Furniture/RugTileComponent.cs

@@ -0,0 +1,156 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.Xna.Framework;
+using Microsoft.Xna.Framework.Graphics;
+using PyTK.CustomElementHandler;
+using StardewValley;
+
+namespace Revitalize.Framework.Objects.Furniture
+{
+    public class RugTileComponent:MultiTiledComponent
+    {
+
+        public RugTileComponent() : base()
+        {
+
+        }
+
+        public RugTileComponent(BasicItemInformation Info) : base(Info)
+        {
+            this.info.ignoreBoundingBox = true;
+        }
+
+        public RugTileComponent(BasicItemInformation Info, Vector2 TileLocation) : base(Info, TileLocation)
+        {
+            this.info.ignoreBoundingBox = true;
+        }
+
+
+
+        /// <summary>
+        /// When the chair is right clicked ensure that all pieces associated with it are also rotated.
+        /// </summary>
+        /// <param name="who"></param>
+        /// <returns></returns>
+        public override bool rightClicked(Farmer who)
+        {
+            this.containerObject.rotate(); //Ensure that all of the chair pieces rotate at the same time.
+            return true;
+            //return base.rightClicked(who);
+        }
+
+        public override Item getOne()
+        {
+            RugTileComponent component = new RugTileComponent(this.info);
+            component.containerObject = this.containerObject;
+            component.offsetKey = this.offsetKey;
+            return component;
+        }
+
+        public override ICustomObject recreate(Dictionary<string, string> additionalSaveData, object replacement)
+        {
+            //instead of using this.offsetkey.x use get additional save data function and store offset key there
+
+            Vector2 offsetKey = new Vector2(Convert.ToInt32(additionalSaveData["offsetKeyX"]), Convert.ToInt32(additionalSaveData["offsetKeyY"]));
+            RugTileComponent self = Revitalize.ModCore.Serializer.DeserializeGUID<RugTileComponent>(additionalSaveData["GUID"]);
+            if (self == null)
+            {
+                return null;
+            }
+
+            if (!Revitalize.ModCore.ObjectGroups.ContainsKey(additionalSaveData["ParentGUID"]))
+            {
+                //Get new container
+                RugMultiTiledObject obj = (RugMultiTiledObject)Revitalize.ModCore.Serializer.DeserializeGUID<RugMultiTiledObject>(additionalSaveData["ParentGUID"]);
+                self.containerObject = obj;
+                obj.addComponent(offsetKey, self);
+                //Revitalize.ModCore.log("ADD IN AN OBJECT!!!!");
+                Revitalize.ModCore.ObjectGroups.Add(additionalSaveData["ParentGUID"], obj);
+            }
+            else
+            {
+                self.containerObject = Revitalize.ModCore.ObjectGroups[additionalSaveData["ParentGUID"]];
+                Revitalize.ModCore.ObjectGroups[additionalSaveData["GUID"]].addComponent(offsetKey, self);
+                //Revitalize.ModCore.log("READD AN OBJECT!!!!");
+            }
+
+            return (ICustomObject)self;
+        }
+
+        public override Dictionary<string, string> getAdditionalSaveData()
+        {
+            Dictionary<string, string> saveData = base.getAdditionalSaveData();
+            Revitalize.ModCore.Serializer.SerializeGUID(this.containerObject.childrenGuids[this.offsetKey].ToString(), this);
+
+            return saveData;
+
+        }
+
+
+        /// <summary>
+        ///Used to manage graphics for chairs that need to deal with special "layering" for transparent chair backs. Otherwise the player would be hidden.
+        /// </summary>
+        public void checkForSpecialUpSittingAnimation()
+        {
+            if (this.info.facingDirection == Enums.Direction.Up && Revitalize.ModCore.playerInfo.sittingInfo.SittingObject == this.containerObject)
+            {
+                string animationKey = "Sitting_" + (int)Enums.Direction.Up;
+                if (this.animationManager.animations.ContainsKey(animationKey))
+                {
+                    this.animationManager.setAnimation(animationKey);
+                }
+            }
+        }
+
+        /// <summary>What happens when the object is drawn at a tile location.</summary>
+        public override void draw(SpriteBatch spriteBatch, int x, int y, float alpha = 1f)
+        {
+            if (this.info.ignoreBoundingBox == true)
+            {
+                x *= -1;
+                y *= -1;
+            }
+
+            if (this.info == null)
+            {
+                Revitalize.ModCore.log("info is null");
+                if (this.syncObject == null) Revitalize.ModCore.log("DEAD SYNC");
+            }
+            if (this.animationManager == null) Revitalize.ModCore.log("Animation Manager Null");
+            if (this.displayTexture == null) Revitalize.ModCore.log("Display texture is null");
+
+            //The actual planter box being drawn.
+            if (this.animationManager == null)
+            {
+                if (this.animationManager.getExtendedTexture() == null)
+                    ModCore.ModMonitor.Log("Tex Extended is null???");
+
+                spriteBatch.Draw(this.displayTexture, Game1.GlobalToLocal(Game1.viewport, new Vector2((float)(x * Game1.tileSize), y * Game1.tileSize)), new Rectangle?(this.animationManager.currentAnimation.sourceRectangle), this.info.drawColor * alpha, 0f, Vector2.Zero, (float)Game1.pixelZoom, this.flipped ? SpriteEffects.FlipHorizontally : SpriteEffects.None, Math.Max(0f, (float)(y * Game1.tileSize) / 10000f));
+                // Log.AsyncG("ANIMATION IS NULL?!?!?!?!");
+            }
+
+            else
+            {
+                //Log.AsyncC("Animation Manager is working!");
+                float addedDepth = 0;
+                this.animationManager.draw(spriteBatch, this.displayTexture, Game1.GlobalToLocal(Game1.viewport, new Vector2((float)(x * Game1.tileSize), y * Game1.tileSize)), new Rectangle?(this.animationManager.currentAnimation.sourceRectangle), this.info.drawColor * alpha, 0f, Vector2.Zero, (float)Game1.pixelZoom, this.flipped ? SpriteEffects.FlipHorizontally : SpriteEffects.None, Math.Max(0f, 0.0001f));
+                try
+                {
+                    this.animationManager.tickAnimation();
+                    // Log.AsyncC("Tick animation");
+                }
+                catch (Exception err)
+                {
+                    ModCore.ModMonitor.Log(err.ToString());
+                }
+            }
+
+            // spriteBatch.Draw(Game1.mouseCursors, Game1.GlobalToLocal(Game1.viewport, new Vector2((float)((double)tileLocation.X * (double)Game1.tileSize + (((double)tileLocation.X * 11.0 + (double)tileLocation.Y * 7.0) % 10.0 - 5.0)) + (float)(Game1.tileSize / 2), (float)((double)tileLocation.Y * (double)Game1.tileSize + (((double)tileLocation.Y * 11.0 + (double)tileLocation.X * 7.0) % 10.0 - 5.0)) + (float)(Game1.tileSize / 2))), new Rectangle?(new Rectangle((int)((double)tileLocation.X * 51.0 + (double)tileLocation.Y * 77.0) % 3 * 16, 128 + this.whichForageCrop * 16, 16, 16)), Color.White, 0.0f, new Vector2(8f, 8f), (float)Game1.pixelZoom, SpriteEffects.None, (float)(((double)tileLocation.Y * (double)Game1.tileSize + (double)(Game1.tileSize / 2) + (((double)tileLocation.Y * 11.0 + (double)tileLocation.X * 7.0) % 10.0 - 5.0)) / 10000.0));
+
+        }
+
+    }
+}

GeneralMods/Revitalize/ModCore.cs

@@ -203,8 +203,6 @@ namespace Revitalize
                     }
                 }
             }, "Default_" + (int)Framework.Enums.Direction.Down), Color.White, true, new Framework.Utilities.InventoryManager(), new LightManager()), new Framework.Objects.InformationFiles.Furniture.ChairInformation(false));
-
-
             Framework.Objects.Furniture.ChairTileComponent chairBottom = new Framework.Objects.Furniture.ChairTileComponent(new BasicItemInformation("Oak Chair", "A basic wooden chair", "Chairs", Color.Brown, -300, 0, false, 100, Vector2.Zero, true, true, "Omegasis.Revitalize.Furniture.Basic.OakChair", "2048/0/-300/Crafting -9/Play '2048 by Platonymous' at home!/true/true/0/2048", Framework.Graphics.TextureManager.TextureManagers["Furniture"].getTexture("Oak Chair").texture, Color.White, 0, false, typeof(Framework.Objects.Furniture.ChairTileComponent), null, new AnimationManager(TextureManager.TextureManagers["Furniture"].getTexture("Oak Chair"), new Animation(new Rectangle(0, 16, 16, 16)), new Dictionary<string, List<Animation>>() {
                 { "Default_" + (int)Framework.Enums.Direction.Down , new List<Animation>()
                     {
@@ -255,6 +253,12 @@ namespace Revitalize
 
             customObjects.Add("Omegasis.BigTiledTest", bigObject);
             customObjects.Add("Omegasis.Revitalize.Furniture.Chairs.OakChair",oakChair);
+
+            Framework.Objects.Furniture.RugTileComponent rug1 = new Framework.Objects.Furniture.RugTileComponent(new BasicItemInformation("BasicRugTile", "A basic rug", "Rug", Color.Brown, -300, 0, false, 100, new Vector2(0, 0), true, true, "Omegasis.Revitalize.Furniture.Basic.Rugs.TestRug", generatePlaceholderString(), TextureManager.TextureManagers["Furniture"].getTexture("Oak Chair").texture, Color.White, 0,true, typeof(Framework.Objects.Furniture.RugTileComponent), null, new AnimationManager(TextureManager.TextureManagers["Furniture"].getTexture("Oak Chair"), new Animation(new Rectangle(0, 0, 16, 16))), Color.White, true, null, null));
+            Framework.Objects.Furniture.RugMultiTiledObject rug = new Framework.Objects.Furniture.RugMultiTiledObject(new BasicItemInformation("BasicRugTile", "A basic rug", "Rug", Color.Brown, -300, 0, false, 100, new Vector2(0, 0), true, true, "Omegasis.Revitalize.Furniture.Basic.Rugs.TestRug", generatePlaceholderString(), TextureManager.TextureManagers["Furniture"].getTexture("Oak Chair").texture, Color.White, 0, true, typeof(Framework.Objects.Furniture.RugMultiTiledObject), null, new AnimationManager(), Color.White, true, null, null));
+            rug.addComponent(new Vector2(0, 0), rug1);
+
+            customObjects.Add("Omegasis.Revitalize.Furniture.Rugs.RugTest", rug);
         }
 
         private void createDirectories()
@@ -293,9 +297,7 @@ namespace Revitalize
             }
             //Game1.player.addItemToInventory(customObjects["Omegasis.BigTiledTest"].getOne());
             Game1.player.addItemToInventory(getObjectFromPool("Omegasis.Revitalize.Furniture.Chairs.OakChair"));
-
+            Game1.player.addItemToInventory(getObjectFromPool("Omegasis.Revitalize.Furniture.Rugs.RugTest"));
-            Netcode.NetString str = new Netcode.NetString("AHHH");
-            Serializer.Serialize(Path.Combine(this.Helper.DirectoryPath, "str.json"),str);
 
             /*
             StardewValley.Tools.Axe axe = new StardewValley.Tools.Axe();

GeneralMods/Revitalize/Revitalize.csproj

@@ -67,6 +67,8 @@
     <Compile Include="Framework\Objects\Furniture\ChairTileComponent.cs" />
     <Compile Include="Framework\Objects\Furniture\CustomFurniture.cs" />
     <Compile Include="Framework\Objects\Furniture\FurnitureTileComponent.cs" />
+    <Compile Include="Framework\Objects\Furniture\RugMultiTiledObject.cs" />
+    <Compile Include="Framework\Objects\Furniture\RugTileComponent.cs" />
     <Compile Include="Framework\Objects\InformationFiles\Furniture\ChairInformation.cs" />
     <Compile Include="Framework\Objects\InformationFiles\Furniture\FurnitureInformation.cs" />
     <Compile Include="Framework\Objects\InformationFiles\ObjectGUIDInfo.cs" />