Refactor IndianHempPlant to implement IHarvestableObject interface and update HarvestableEntities to include IndianHempType

Author: KoertLichtendonk

src/OpenRP.Framework/Features/Harvestables/Components/IndianHempPlant.cs

@@ -13,34 +13,19 @@
 
 namespace OpenRP.Framework.Features.Harvestables.Components
 {
-    public class IndianHempPlant : Component, IHarvestableEntity
+    public class IndianHempPlant : Component, IHarvestableObject
     {
         private BiomeObject _generatedObject;
         private int _remainingLeaves;
 
-        public IndianHempPlant(BiomeObject generatedObject)
+        public IndianHempPlant()
         {
-            _generatedObject = generatedObject;
             _remainingLeaves = 10;
-
-            CreateDynamicObject();
-            //CreateDynamicTextLabel();
         }
 
         public string GetTextLabelString()
         {
-            return $"{ChatColor.Highlight}Indian Hemp (Apocynum Cannabinum)\n{ChatColor.White}{_remainingLeaves} leaves remaining\n\nUse {ChatColor.Highlight}/harvest hemp";
-        }
-
-        public Vector3 GetTextLabelPosition()
-        {
-            Vector3 textLabelPosition = new Vector3(_generatedObject.GamePosition.XY, _generatedObject.GamePosition.Z + 0.25f);
-            return textLabelPosition;
-        }
-
-        public void CreateDynamicTextLabel()
-        {
-            Vector3 textLabelPosition = GetTextLabelPosition();
+            return $"{ChatColor.Highlight}Indian Hemp (Apocynum Cannabinum)\n{ChatColor.White}{_remainingLeaves} leaves remaining\n\nUse {ChatColor.Highlight}/harvest indian hemp";
         }
 
         public DynamicTextLabel GetDynamicTextLabel()
@@ -54,27 +39,27 @@ public void UpdateDynamicTextLabel()
             dynamicTextLabel.Text = GetTextLabelString();
         }
 
-        public void CreateDynamicObject()
-        {
-            BiomeManager.CreateGeneratorObject(_generatedObject, Entity, _colAndreasService, _streamerService);
-        }
-
         public DynamicObject GetDynamicObject()
         {
             return GetComponentInChildren<DynamicObject>();
         }
 
         public bool IsPlayerNearby(Player player)
         {
-            Vector3 textLabelPosition = GetTextLabelPosition();
+            Vector3 textLabelPosition = GetDynamicTextLabel().Position;
             if (player.IsInRangeOfPoint(3.0f, textLabelPosition))
             {
                 return true;
             }
             return false;
         }
 
-        public void Harvest()
+        public void BeginHarvest()
+        {
+
+        }
+
+        public void EndHarvest()
         {
             _remainingLeaves -= 1;
             UpdateDynamicTextLabel();

src/OpenRP.Framework/Features/Harvestables/Entities/HarvestableEntities.cs

@@ -0,0 +1,31 @@
+using SampSharp.Entities;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection.Metadata.Ecma335;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenRP.Framework.Features.Harvestables.Entities
+{
+    public static class HarvestableEntities
+    {
+        // Id Registry
+        private static int IndianHempId = int.MinValue;
+
+        // Entity Types
+        [EntityType]
+        public static readonly Guid IndianHempType = new Guid("F7AC9D99-47F4-4C10-939D-C0A2183F2417");
+
+        // Generate Methods
+        public static EntityId GenerateIndianHempId()
+        {
+            EntityId newEntityId = new EntityId(IndianHempType, IndianHempId);
+
+            // Atomically decrement the counter to ensure thread-safety.
+            int newId = Interlocked.Increment(ref IndianHempId);
+
+            return newEntityId;
+        }
+    }
+}

src/OpenRP.Framework/Features/Harvestables/Entities/IHarvestableEntity.cs

@@ -0,0 +1,41 @@
+using SampSharp.Entities.SAMP;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OpenRP.Framework.Features.Harvestables.Entities
+{
+    public interface IHarvestableModel
+    {
+        /// <summary>
+        /// The name of the resource (e.g. "hemp"). Used for the /harvest command.
+        /// </summary>
+        string ResourceName { get; }
+
+        /// <summary>
+        /// The object model id of the resource.
+        /// </summary>
+        int ResourceObjectModelId { get; }
+
+        /// <summary>
+        /// Create the harvestable in the world.
+        /// </summary>
+        /// <param name="position">The positions of the harvestable.</param>
+        /// <param name="rotation">The rotations of the harvestable.</param>
+        void CreateHarvestable(Vector3 position, Vector3 rotation);
+
+        /// <summary>
+        /// Performs code at the begin of a player harvesting the resource
+        /// </summary>
+        /// <param name="player">The player harvesting.</param>
+        void BeginHarvest(Player player);
+
+        /// <summary>
+        /// Performs code at the end of a player harvesting the resource
+        /// </summary>
+        /// <param name="player">The player harvesting.</param>
+        void EndHarvest(Player player);
+    }
+}

src/OpenRP.Framework/Features/Harvestables/Entities/IHarvestableModel.cs

@@ -9,33 +9,8 @@ namespace OpenRP.Framework.Features.Harvestables.Entities
 {
     public interface IHarvestableObject
     {
-        /// <summary>
-        /// The name of the resource (e.g. "hemp"). Used for the /harvest command.
-        /// </summary>
-        string ResourceName { get; }
-
-        /// <summary>
-        /// The object model id of the resource.
-        /// </summary>
-        int ResourceObjectModelId { get; }
-
-        /// <summary>
-        /// Create the harvestable in the world.
-        /// </summary>
-        /// <param name="position">The positions of the harvestable.</param>
-        /// <param name="rotation">The rotations of the harvestable.</param>
-        void CreateHarvestable(Vector3 position, Vector3 rotation);
-
-        /// <summary>
-        /// Performs code at the begin of a player harvesting the resource
-        /// </summary>
-        /// <param name="player">The player harvesting.</param>
-        void BeginHarvest(Player player);
-
-        /// <summary>
-        /// Performs code at the end of a player harvesting the resource
-        /// </summary>
-        /// <param name="player">The player harvesting.</param>
-        void EndHarvest(Player player);
+        bool IsPlayerNearby(Player player);
+        void BeginHarvest();
+        void EndHarvest();
     }
 }

src/OpenRP.Framework/Features/Harvestables/Entities/IHarvestableObject.cs

@@ -14,24 +14,29 @@
 
 namespace OpenRP.Framework.Features.Harvestables.Services
 {
-    public class IndianHempHarvestable : IHarvestable
+    public class IndianHempHarvestableModel : IHarvestableModel
     {
         private readonly IEntityManager _entityManager;
         private readonly IColAndreasService _colAndreasService;
         private readonly IStreamerService _streamerService;
-        public IndianHempHarvestable(IEntityManager entityManager, IColAndreasService colAndreasService, IStreamerService streamerService)
+        public IndianHempHarvestableModel(IEntityManager entityManager, IColAndreasService colAndreasService, IStreamerService streamerService)
         {
             _entityManager = entityManager;
             _streamerService = streamerService;
             _colAndreasService = colAndreasService;
         }
 
-        public string ResourceName => "industrial hemp";
+        public string ResourceName => "indian hemp";
         public int ResourceObjectModelId => 19473;
 
-        public void CreateHarvestable(Vector3 positions, Vector3 rotations)
+        public void CreateHarvestable(Vector3 position, Vector3 rotation)
         {
+            EntityId harvestableId = HarvestableEntities.GenerateIndianHempId();
 
+            _entityManager.Create(harvestableId);
+
+            DynamicObject harvestableObject = _streamerService.CreateDynamicObject(ResourceObjectModelId, position, rotation, parent: harvestableId);
+            DynamicTextLabel harvestableTextLabel = _streamerService.CreateDynamicTextLabel(String.Empty, Color.White, new Vector3(position.XY, position.Z + 0.25f), 1.5f, parent: harvestableId);
         }
 
         public void BeginHarvest(Player player)
@@ -40,7 +45,7 @@ public void BeginHarvest(Player player)
             {
                 if (indianHempPlant.IsPlayerNearby(player))
                 {
-                    PlayerHarvesting.StartHarvesting(player, this, indianHempPlant, TimeSpan.FromSeconds(10));
+                    //PlayerHarvesting.StartHarvesting(player, this, indianHempPlant, TimeSpan.FromSeconds(10));
                     return;
                 }
             }