Remove IServer::RemoveEntity, Update mock module

Author: FabianTerhorst

api/AltV.Net.Mock/MockAltV.cs

@@ -42,7 +42,6 @@ public IPlayer ConnectPlayer(string playerName, string reason, Action<IPlayer> i
             Alt.Module.PlayerPool.Create(ptr, MockEntities.Id, out var player);
             player.Name = playerName;
             intercept?.Invoke(player);
-            MockEntities.Insert(player);
             Alt.Module.OnPlayerConnect(ptr, player.Id, reason);
             return player;
         }

api/AltV.Net.Mock/MockBlip.cs

@@ -20,7 +20,7 @@ public MockBlip(IntPtr nativePointer) : base(nativePointer, BaseObjectType.Blip)
 
         public void Remove()
         {
-            throw new NotImplementedException();
+            Alt.Server.RemoveBlip(this);
         }
     }
 }

api/AltV.Net.Mock/MockCheckpoint.cs

@@ -29,7 +29,7 @@ bool ICheckpoint.IsVehicleIn(IVehicle vehicle)
 
         public void Remove()
         {
-            throw new NotImplementedException();
+            Alt.Server.RemoveCheckpoint(this);
         }
     }
 }

api/AltV.Net.Mock/MockEntities.cs

@@ -10,18 +10,11 @@ public class MockEntities
 
         public static ushort Id = 0;
 
-        public static readonly Dictionary<IntPtr, IBaseObject> Entities = new Dictionary<IntPtr, IBaseObject>();
-
         public static IntPtr GetNextPtr()
         {
             Ptr += 1;
             Id++;
             return Ptr;
         }
-
-        public static void Insert(IBaseObject entity)
-        {
-            Entities[Ptr] = entity;
-        }
     }
 }

api/AltV.Net.Mock/MockEntity.cs

@@ -7,7 +7,7 @@
 
 namespace AltV.Net.Mock
 {
-    public class MockEntity : IEntity
+    public abstract class MockEntity : IEntity
     {
         public IntPtr NativePointer { get; }
         public bool Exists { get; }
@@ -111,13 +111,15 @@ public bool GetSyncedMetaData<T>(string key, out T result)
             return true;
         }
 
-        public void Remove()
-        {
-            Alt.Server.RemoveEntity(this);
-        }
+        public abstract void Remove();
 
         public void CheckIfEntityExists()
         {
+            if (Exists)
+            {
+                return;
+            }
+            throw new EntityRemovedException(this);
         }
     }
 }

api/AltV.Net.Mock/MockPlayer.Events.cs

@@ -9,7 +9,8 @@ public static void Disconnect(this IPlayer player, string reason)
         {
             player.CancelEvents();
             Alt.Module.OnPlayerDisconnect(player.NativePointer, reason);
-            Alt.Server.RemoveEntity(player);
+            Alt.Module.OnPlayerRemove(player.NativePointer);
+            Alt.Module.OnRemovePlayer(player.NativePointer);
         }
 
         public static void Damage(this IPlayer player, IEntity attacker, uint weapon, byte damage)

api/AltV.Net.Mock/MockPlayer.cs

@@ -78,5 +78,10 @@ public ReadOnlyPlayer Copy()
         {
             return ReadOnlyPlayer.Empty;
         }
+
+        public override void Remove()
+        {
+            throw new NotImplementedException();
+        }
     }
 }

api/AltV.Net.Mock/MockServer.cs

@@ -186,15 +186,21 @@ public IVehicle CreateVehicle(uint model, Position pos, Rotation rotation)
             var ptr = MockEntities.GetNextPtr();
             vehiclePool.Create(ptr, MockEntities.Id, out var vehicle);
             vehicle.Position = pos;
-            //TODO: apis missing for more properties from create
-            MockEntities.Insert(vehicle);
+            if (vehicle is MockVehicle mockVehicle)
+            {
+                mockVehicle.Position = pos;
+                mockVehicle.Rotation = rotation;
+                mockVehicle.Model = model;
+            }
+            Alt.Module.OnCreateVehicle(ptr, MockEntities.Id);
             return vehicle;
         }
 
         public IntPtr CreateVehicleEntity(out ushort id, uint model, Position pos, Rotation rotation)
         {
             var ptr = MockEntities.GetNextPtr();
             id = MockEntities.Id;
+            Alt.Module.OnCreateVehicle(ptr, id);
             return ptr;
         }
 
@@ -211,8 +217,7 @@ public ICheckpoint CreateCheckpoint(IPlayer player, byte type, Position pos, flo
                 mockCheckpoint.Height = height;
                 mockCheckpoint.Color = color;
             }
-
-            MockEntities.Insert(checkpoint);
+            Alt.Module.OnCreateCheckpoint(ptr);
             return checkpoint;
         }
 
@@ -225,8 +230,7 @@ public IBlip CreateBlip(IPlayer player, byte type, Position pos)
                 mockBlip.Position = pos;
                 mockBlip.BlipType = type;
             }
-
-            MockEntities.Insert(blip);
+            Alt.Module.OnCreateBlip(ptr);
             return blip;
         }
 
@@ -240,8 +244,7 @@ public IBlip CreateBlip(IPlayer player, byte type, IEntity entityAttach)
                 mockBlip.IsAttached = true;
                 mockBlip.AttachedTo = entityAttach;
             }
-
-            MockEntities.Insert(blip);
+            Alt.Module.OnCreateBlip(ptr);
             return blip;
         }
 
@@ -254,8 +257,7 @@ public IVoiceChannel CreateVoiceChannel(bool spatial, float maxDistance)
                 mockVoiceChannel.IsSpatial = spatial;
                 mockVoiceChannel.MaxDistance = maxDistance;
             }
-
-            MockEntities.Insert(voiceChannel);
+            Alt.Module.OnCreateVoiceChannel(ptr);
             return voiceChannel;
         }
 
@@ -272,25 +274,22 @@ public void RemoveEntity(IEntity entity)
         public void RemoveBlip(IBlip blip)
         {
             Alt.Module.OnRemoveBlip(blip.NativePointer);
-            MockEntities.Entities.Remove(blip.NativePointer);
         }
 
         public void RemoveCheckpoint(ICheckpoint checkpoint)
         {
-            Alt.Module.OnRemoveCheckpoint(checkpoint.NativePointer);
-            MockEntities.Entities.Remove(checkpoint.NativePointer);
+            Alt.Module.OnRemoveCheckpoint(checkpoint.NativePointer); 
         }
 
         public void RemoveVehicle(IVehicle vehicle)
         {
+            Alt.Module.OnVehicleRemove(vehicle.NativePointer);
             Alt.Module.OnRemoveVehicle(vehicle.NativePointer);
-            MockEntities.Entities.Remove(vehicle.NativePointer);
         }
 
         public void RemoveVoiceChannel(IVoiceChannel channel)
         {
             Alt.Module.OnRemoveVoiceChannel(channel.NativePointer);
-            MockEntities.Entities.Remove(channel.NativePointer);
         }
 
         public ServerNativeResource GetResource(string name)

api/AltV.Net.Mock/MockVehicle.cs

@@ -10,6 +10,8 @@ public class MockVehicle: MockEntity, IVehicle
         public MockVehicle(IntPtr nativePointer, ushort id): base(nativePointer, BaseObjectType.Vehicle, id)
         {
         }
+        
+        
 
         public IPlayer Driver { get; }
         public byte ModKit { get; set; }
@@ -229,5 +231,10 @@ public void SetBumperDamageLevel(byte bumperId, byte damageLevel)
         }
 
         public string DamageData { get; set; }
+
+        public override void Remove()
+        {
+            Alt.Server.RemoveVehicle(this);
+        }
     }
 }

api/AltV.Net.Mock/MockVoiceChannel.cs

@@ -3,35 +3,10 @@
 
 namespace AltV.Net.Mock
 {
-    public class MockVoiceChannel : IVoiceChannel
+    public class MockVoiceChannel : MockWorldObject, IVoiceChannel
     {
-        public MockVoiceChannel(IntPtr nativePointer)
+        public MockVoiceChannel(IntPtr nativePointer): base(nativePointer, BaseObjectType.VoiceChannel)
         {
-            NativePointer = nativePointer;
-        }
-
-        public IntPtr NativePointer { get; }
-        public bool Exists { get; }
-        public BaseObjectType Type { get; }
-
-        public void SetMetaData(string key, object value)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool GetMetaData<T>(string key, out T result)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void SetData(string key, object value)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool GetData<T>(string key, out T result)
-        {
-            throw new NotImplementedException();
         }
 
         public void AddPlayer(IPlayer player)
@@ -69,11 +44,7 @@ public bool IsPlayerMuted(IPlayer player)
 
         public void Remove()
         {
-            throw new NotImplementedException();
-        }
-
-        public void CheckIfEntityExists()
-        {
+            Alt.Server.RemoveVoiceChannel(this);
         }
     }
 }