Merge pull request #56 from Lhoerion/dev

Fixed resource delegates from being garbage collected & Fixed spelling of Weapons.CompatPwd, Weapons.CarbinRifle and Weapons.Fired

Author: FabianTerhorst

api/AltV.Net/CSharpResourceImpl.cs

@@ -1,5 +1,6 @@
 using System;
 using AltV.Net.Native;
+using System.Runtime.InteropServices;
 
 namespace AltV.Net
 {
@@ -30,65 +31,138 @@ public void Unload()
             AltNative.Resource.CSharpResourceImpl_Unload(NativePointer);
         }
 
-        internal void SetDelegates(AltNative.Resource.MainDelegate onStartResource)
+        internal void SetDelegates(AltNative.Resource.MainDelegate onStart)
         {
-            AltNative.Resource.CSharpResourceImpl_SetMainDelegate(NativePointer,
-                onStartResource);
-            AltNative.Resource.CSharpResourceImpl_SetStopDelegate(NativePointer, ModuleWrapper.OnStop);
-            AltNative.Resource.CSharpResourceImpl_SetTickDelegate(NativePointer, ModuleWrapper.OnTick);
-            AltNative.Resource.CSharpResourceImpl_SetServerEventDelegate(NativePointer, ModuleWrapper.OnServerEvent);
-            AltNative.Resource.CSharpResourceImpl_SetCheckpointDelegate(NativePointer, ModuleWrapper.OnCheckpoint);
-            AltNative.Resource.CSharpResourceImpl_SetClientEventDelegate(NativePointer, ModuleWrapper.OnClientEvent);
-            AltNative.Resource.CSharpResourceImpl_SetPlayerDamageDelegate(NativePointer,
-                ModuleWrapper.OnPlayerDamage);
-            AltNative.Resource.CSharpResourceImpl_SetPlayerConnectDelegate(NativePointer,
-                ModuleWrapper.OnPlayerConnect);
-            AltNative.Resource.CSharpResourceImpl_SetPlayerDeathDelegate(NativePointer,
-                ModuleWrapper.OnPlayerDeath);
-            AltNative.Resource.CSharpResourceImpl_SetExplosionDelegate(NativePointer,
-                ModuleWrapper.OnExplosion);
-            AltNative.Resource.CSharpResourceImpl_SetWeaponDamageDelegate(NativePointer,
-                ModuleWrapper.OnWeaponDamage);
-            AltNative.Resource.CSharpResourceImpl_SetPlayerDisconnectDelegate(NativePointer,
-                ModuleWrapper.OnPlayerDisconnect);
-            AltNative.Resource.CSharpResourceImpl_SetPlayerRemoveDelegate(NativePointer,
-                ModuleWrapper.OnPlayerRemove);
-            AltNative.Resource.CSharpResourceImpl_SetVehicleRemoveDelegate(NativePointer,
-                ModuleWrapper.OnVehicleRemove);
-            AltNative.Resource.CSharpResourceImpl_SetPlayerChangeVehicleSeatDelegate(NativePointer,
-                ModuleWrapper.OnPlayerChangeVehicleSeat);
-            AltNative.Resource.CSharpResourceImpl_SetPlayerEnterVehicleDelegate(NativePointer,
-                ModuleWrapper.OnPlayerEnterVehicle);
-            AltNative.Resource.CSharpResourceImpl_SetPlayerLeaveVehicleDelegate(NativePointer,
-                ModuleWrapper.OnPlayerLeaveVehicle);
-            AltNative.Resource.CSharpResourceImpl_SetCreatePlayerDelegate(NativePointer,
-                ModuleWrapper.OnCreatePlayer);
-            AltNative.Resource.CSharpResourceImpl_SetRemovePlayerDelegate(NativePointer,
-                ModuleWrapper.OnRemovePlayer);
-            AltNative.Resource.CSharpResourceImpl_SetCreateVehicleDelegate(NativePointer,
-                ModuleWrapper.OnCreateVehicle);
-            AltNative.Resource.CSharpResourceImpl_SetRemoveVehicleDelegate(NativePointer,
-                ModuleWrapper.OnRemoveVehicle);
-            AltNative.Resource.CSharpResourceImpl_SetCreateBlipDelegate(NativePointer, ModuleWrapper.OnCreateBlip);
-            AltNative.Resource.CSharpResourceImpl_SetRemoveBlipDelegate(NativePointer, ModuleWrapper.OnRemoveBlip);
-            AltNative.Resource.CSharpResourceImpl_SetCreateCheckpointDelegate(NativePointer,
-                ModuleWrapper.OnCreateCheckpoint);
-            AltNative.Resource.CSharpResourceImpl_SetRemoveCheckpointDelegate(NativePointer,
-                ModuleWrapper.OnRemoveCheckpoint);
-            AltNative.Resource.CSharpResourceImpl_SetCreateVoiceChannelDelegate(NativePointer,
-                ModuleWrapper.OnCreateVoiceChannel);
-            AltNative.Resource.CSharpResourceImpl_SetRemoveVoiceChannelDelegate(NativePointer,
-                ModuleWrapper.OnRemoveVoiceChannel);
-            AltNative.Resource.CSharpResourceImpl_SetConsoleCommandDelegate(NativePointer,
-                ModuleWrapper.OnConsoleCommand);
-            AltNative.Resource.CSharpResourceImpl_SetMetaChangeDelegate(NativePointer, ModuleWrapper.OnMetaDataChange);
-            AltNative.Resource.CSharpResourceImpl_SetSyncedMetaChangeDelegate(NativePointer,
-                ModuleWrapper.OnSyncedMetaDataChange);
-            AltNative.Resource.CSharpResourceImpl_SetCreateColShapeDelegate(NativePointer,
-                ModuleWrapper.OnCreateColShape);
-            AltNative.Resource.CSharpResourceImpl_SetRemoveColShapeDelegate(NativePointer,
-                ModuleWrapper.OnRemoveColShape);
-            AltNative.Resource.CSharpResourceImpl_SetColShapeDelegate(NativePointer, ModuleWrapper.OnColShape);
+            GCHandle.Alloc(onStart);
+            AltNative.Resource.CSharpResourceImpl_SetMainDelegate(NativePointer, onStart);
+
+            AltNative.Resource.StopDelegate onStop = ModuleWrapper.OnStop;
+            GCHandle.Alloc(onStop);
+            AltNative.Resource.CSharpResourceImpl_SetStopDelegate(NativePointer, onStop);
+
+            AltNative.Resource.TickDelegate onTick  = ModuleWrapper.OnTick;
+            GCHandle.Alloc(onTick);
+            AltNative.Resource.CSharpResourceImpl_SetTickDelegate(NativePointer, onTick);
+
+            AltNative.Resource.ServerEventDelegate onServerEvent = ModuleWrapper.OnServerEvent;
+            GCHandle.Alloc(onServerEvent);
+            AltNative.Resource.CSharpResourceImpl_SetServerEventDelegate(NativePointer, onServerEvent);
+
+            AltNative.Resource.CheckpointDelegate onCheckpoint = ModuleWrapper.OnCheckpoint;
+            GCHandle.Alloc(onCheckpoint);
+            AltNative.Resource.CSharpResourceImpl_SetCheckpointDelegate(NativePointer, onCheckpoint);
+
+            AltNative.Resource.ClientEventDelegate onClientEvent = ModuleWrapper.OnClientEvent;
+            GCHandle.Alloc(onClientEvent);
+            AltNative.Resource.CSharpResourceImpl_SetClientEventDelegate(NativePointer, onClientEvent);
+
+            AltNative.Resource.PlayerDamageDelegate onPlayerDamage = ModuleWrapper.OnPlayerDamage;
+            GCHandle.Alloc(onPlayerDamage);
+            AltNative.Resource.CSharpResourceImpl_SetPlayerDamageDelegate(NativePointer, onPlayerDamage);
+
+            AltNative.Resource.PlayerConnectDelegate onPlayerConnect = ModuleWrapper.OnPlayerConnect;
+            GCHandle.Alloc(onPlayerConnect);
+            AltNative.Resource.CSharpResourceImpl_SetPlayerConnectDelegate(NativePointer, onPlayerConnect);
+
+            AltNative.Resource.PlayerDeathDelegate onPlayerDeath = ModuleWrapper.OnPlayerDeath;
+            GCHandle.Alloc(onPlayerDeath);
+            AltNative.Resource.CSharpResourceImpl_SetPlayerDeathDelegate(NativePointer, onPlayerDeath);
+
+            AltNative.Resource.ExplosionDelegate onExplosion = ModuleWrapper.OnExplosion;
+            GCHandle.Alloc(onExplosion);
+            AltNative.Resource.CSharpResourceImpl_SetExplosionDelegate(NativePointer, onExplosion);
+
+            AltNative.Resource.WeaponDamageDelegate onWeaponDamage = ModuleWrapper.OnWeaponDamage;
+            GCHandle.Alloc(onWeaponDamage);
+            AltNative.Resource.CSharpResourceImpl_SetWeaponDamageDelegate(NativePointer, onWeaponDamage);
+
+            AltNative.Resource.PlayerDisconnectDelegate onPlayerDisconnect = ModuleWrapper.OnPlayerDisconnect;
+            GCHandle.Alloc(onPlayerDisconnect);
+            AltNative.Resource.CSharpResourceImpl_SetPlayerDisconnectDelegate(NativePointer, onPlayerDisconnect);
+
+            AltNative.Resource.PlayerRemoveDelegate onPlayerRemove = ModuleWrapper.OnPlayerRemove;
+            GCHandle.Alloc(onPlayerRemove);
+            AltNative.Resource.CSharpResourceImpl_SetPlayerRemoveDelegate(NativePointer, onPlayerRemove);
+
+            AltNative.Resource.VehicleRemoveDelegate onVehicleRemove = ModuleWrapper.OnVehicleRemove;
+            GCHandle.Alloc(onVehicleRemove);
+            AltNative.Resource.CSharpResourceImpl_SetVehicleRemoveDelegate(NativePointer, onVehicleRemove);
+
+            AltNative.Resource.PlayerChangeVehicleSeatDelegate onPlayerChangeVehicleSeat = ModuleWrapper.OnPlayerChangeVehicleSeat;
+            GCHandle.Alloc(onPlayerChangeVehicleSeat);
+            AltNative.Resource.CSharpResourceImpl_SetPlayerChangeVehicleSeatDelegate(NativePointer, onPlayerChangeVehicleSeat);
+
+            AltNative.Resource.PlayerEnterVehicleDelegate onPlayerEnterVehicle = ModuleWrapper.OnPlayerEnterVehicle;
+            GCHandle.Alloc(onPlayerEnterVehicle);
+            AltNative.Resource.CSharpResourceImpl_SetPlayerEnterVehicleDelegate(NativePointer, onPlayerEnterVehicle);
+
+            AltNative.Resource.PlayerLeaveVehicleDelegate onPlayerLeaveVehicle = ModuleWrapper.OnPlayerLeaveVehicle;
+            GCHandle.Alloc(onPlayerLeaveVehicle);
+            AltNative.Resource.CSharpResourceImpl_SetPlayerLeaveVehicleDelegate(NativePointer, onPlayerLeaveVehicle);
+
+            AltNative.Resource.CreatePlayerDelegate onCreatePlayer = ModuleWrapper.OnCreatePlayer;
+            GCHandle.Alloc(onCreatePlayer);
+            AltNative.Resource.CSharpResourceImpl_SetCreatePlayerDelegate(NativePointer, onCreatePlayer);
+
+            AltNative.Resource.RemovePlayerDelegate onRemovePlayer = ModuleWrapper.OnRemovePlayer;
+            GCHandle.Alloc(onRemovePlayer);
+            AltNative.Resource.CSharpResourceImpl_SetRemovePlayerDelegate(NativePointer, onRemovePlayer);
+
+            AltNative.Resource.CreateVehicleDelegate onCreateVehicle = ModuleWrapper.OnCreateVehicle;
+            GCHandle.Alloc(onCreateVehicle);
+            AltNative.Resource.CSharpResourceImpl_SetCreateVehicleDelegate(NativePointer, onCreateVehicle);
+
+            AltNative.Resource.RemoveVehicleDelegate onRemoveVehicle = ModuleWrapper.OnRemoveVehicle;
+            GCHandle.Alloc(onRemoveVehicle);
+            AltNative.Resource.CSharpResourceImpl_SetRemoveVehicleDelegate(NativePointer, onRemoveVehicle);
+
+            AltNative.Resource.CreateBlipDelegate onCreateBlip = ModuleWrapper.OnCreateBlip;
+            GCHandle.Alloc(onCreateBlip);
+            AltNative.Resource.CSharpResourceImpl_SetCreateBlipDelegate(NativePointer, onCreateBlip);
+
+            AltNative.Resource.RemoveBlipDelegate onRemoveBlip = ModuleWrapper.OnRemoveBlip;
+            GCHandle.Alloc(onRemoveBlip);
+            AltNative.Resource.CSharpResourceImpl_SetRemoveBlipDelegate(NativePointer, onRemoveBlip);
+
+            AltNative.Resource.CreateCheckpointDelegate onCreateCheckpoint = ModuleWrapper.OnCreateCheckpoint;
+            GCHandle.Alloc(onCreateCheckpoint);
+            AltNative.Resource.CSharpResourceImpl_SetCreateCheckpointDelegate(NativePointer, onCreateCheckpoint);
+
+            AltNative.Resource.RemoveCheckpointDelegate onRemoveCheckpoint = ModuleWrapper.OnRemoveCheckpoint;
+            GCHandle.Alloc(onRemoveCheckpoint);
+            AltNative.Resource.CSharpResourceImpl_SetRemoveCheckpointDelegate(NativePointer, onRemoveCheckpoint);
+
+            AltNative.Resource.CreateVoiceChannelDelegate onCreateVoiceChannel = ModuleWrapper.OnCreateVoiceChannel;
+            GCHandle.Alloc(onCreateVoiceChannel);
+            AltNative.Resource.CSharpResourceImpl_SetCreateVoiceChannelDelegate(NativePointer, onCreateVoiceChannel);
+
+            AltNative.Resource.RemoveVoiceChannelDelegate onRemoveVoiceChannel = ModuleWrapper.OnRemoveVoiceChannel;
+            GCHandle.Alloc(onRemoveVoiceChannel);
+            AltNative.Resource.CSharpResourceImpl_SetRemoveVoiceChannelDelegate(NativePointer, onRemoveVoiceChannel);
+
+            AltNative.Resource.ConsoleCommandDelegate onConsoleCommand = ModuleWrapper.OnConsoleCommand;
+            GCHandle.Alloc(onConsoleCommand);
+            AltNative.Resource.CSharpResourceImpl_SetConsoleCommandDelegate(NativePointer, onConsoleCommand);
+
+            AltNative.Resource.MetaChangeDelegate onMetaDataChange = ModuleWrapper.OnMetaDataChange;
+            GCHandle.Alloc(onMetaDataChange);
+            AltNative.Resource.CSharpResourceImpl_SetMetaChangeDelegate(NativePointer, onMetaDataChange);
+
+            AltNative.Resource.MetaChangeDelegate onSyncedMetaDataChange = ModuleWrapper.OnSyncedMetaDataChange;
+            GCHandle.Alloc(onSyncedMetaDataChange);
+            AltNative.Resource.CSharpResourceImpl_SetSyncedMetaChangeDelegate(NativePointer, onSyncedMetaDataChange);
+
+            AltNative.Resource.CreateColShapeDelegate onCreateColShape = ModuleWrapper.OnCreateColShape;
+            GCHandle.Alloc(onCreateColShape);
+            AltNative.Resource.CSharpResourceImpl_SetCreateColShapeDelegate(NativePointer, onCreateColShape);
+
+            AltNative.Resource.RemoveColShapeDelegate onRemoveColShape = ModuleWrapper.OnRemoveColShape;
+            GCHandle.Alloc(onRemoveColShape);
+            AltNative.Resource.CSharpResourceImpl_SetRemoveColShapeDelegate(NativePointer, onRemoveColShape);
+
+            AltNative.Resource.ColShapeDelegate onColShape = ModuleWrapper.OnColShape;
+            GCHandle.Alloc(onColShape);
+            AltNative.Resource.CSharpResourceImpl_SetColShapeDelegate(NativePointer, onColShape);
         }
     }
 }

api/AltV.Net/Data/Weapons.cs

@@ -1,31 +1,31 @@
 namespace AltV.Net.Data
 {
-    public static class Weapons
-    {
-        public static uint Knife = Alt.Hash("WEAPON_KNIFE");
-        public static uint Bat = Alt.Hash("WEAPON_BAT");
-        public static uint Bottle = Alt.Hash("WEAPON_BOTTLE");
-        public static uint Wrench = Alt.Hash("WEAPON_WRENCH");
-        public static uint Pistol = Alt.Hash("WEAPON_PISTOL");
-        public static uint HeavyPistol = Alt.Hash("WEAPON_HEAVYPISTOL");
-        public static uint Revolver = Alt.Hash("WEAPON_REVOLVER");
-        public static uint MicroSmg = Alt.Hash("WEAPON_MICROSMG");
-        public static uint Smg = Alt.Hash("WEAPON_SMG");
-        public static uint CompatPwd = Alt.Hash("WEAPON_COMBATPDW");
-        public static uint AssaultRifle = Alt.Hash("WEAPON_ASSAULTRIFLE");
-        public static uint CarbinRifle = Alt.Hash("WEAPON_CARBINERIFLE");
-        public static uint PumpShotgun = Alt.Hash("WEAPON_PUMPSHOTGUN");
-        public static uint Grenade = Alt.Hash("WEAPON_GRENADE");
-        public static uint RammedByCar = Alt.Hash("WEAPON_RAMMED_BY_CAR");
-        public static uint RunOverByCar = Alt.Hash("WEAPON_RUN_OVER_BY_CAR");
-        public static uint Fall = Alt.Hash("WEAPON_FALL");
-        public static uint Drowning = Alt.Hash("WEAPON_DROWNING");
-        public static uint DrowningInVehicle = Alt.Hash("WEAPON_DROWNING_IN_VEHICLE");
-        public static uint Explosion = Alt.Hash("WEAPON_EXPLOSION");
-        public static uint Fired = Alt.Hash("WEAPON_FIRE");
-        public static uint Bleeding = Alt.Hash("WEAPON_BLEEDING");
-        public static uint BarbedWire = Alt.Hash("WEAPON_BARBED_WIRE");
-        public static uint Exhaustion = Alt.Hash("WEAPON_EXHAUSTION");
-        public static uint ElectricFence = Alt.Hash("WEAPON_ELECTRIC_FENCE");
-    }
+	public static class Weapons
+	{
+		public static uint Knife = Alt.Hash("WEAPON_KNIFE");
+		public static uint Bat = Alt.Hash("WEAPON_BAT");
+		public static uint Bottle = Alt.Hash("WEAPON_BOTTLE");
+		public static uint Wrench = Alt.Hash("WEAPON_WRENCH");
+		public static uint Pistol = Alt.Hash("WEAPON_PISTOL");
+		public static uint HeavyPistol = Alt.Hash("WEAPON_HEAVYPISTOL");
+		public static uint Revolver = Alt.Hash("WEAPON_REVOLVER");
+		public static uint MicroSmg = Alt.Hash("WEAPON_MICROSMG");
+		public static uint Smg = Alt.Hash("WEAPON_SMG");
+		public static uint CombatPdw = Alt.Hash("WEAPON_COMBATPDW");
+		public static uint AssaultRifle = Alt.Hash("WEAPON_ASSAULTRIFLE");
+		public static uint CarbineRifle = Alt.Hash("WEAPON_CARBINERIFLE");
+		public static uint PumpShotgun = Alt.Hash("WEAPON_PUMPSHOTGUN");
+		public static uint Grenade = Alt.Hash("WEAPON_GRENADE");
+		public static uint RammedByCar = Alt.Hash("WEAPON_RAMMED_BY_CAR");
+		public static uint RunOverByCar = Alt.Hash("WEAPON_RUN_OVER_BY_CAR");
+		public static uint Fall = Alt.Hash("WEAPON_FALL");
+		public static uint Drowning = Alt.Hash("WEAPON_DROWNING");
+		public static uint DrowningInVehicle = Alt.Hash("WEAPON_DROWNING_IN_VEHICLE");
+		public static uint Explosion = Alt.Hash("WEAPON_EXPLOSION");
+		public static uint Fire = Alt.Hash("WEAPON_FIRE");
+		public static uint Bleeding = Alt.Hash("WEAPON_BLEEDING");
+		public static uint BarbedWire = Alt.Hash("WEAPON_BARBED_WIRE");
+		public static uint Exhaustion = Alt.Hash("WEAPON_EXHAUSTION");
+		public static uint ElectricFence = Alt.Hash("WEAPON_ELECTRIC_FENCE");
+	}
 }