Update to API 1.0

Cannonb4ll · Jun 25, 2020 · b9362fb · b9362fb
1 parent ff36ec3
commit b9362fb
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 11 deletions.
diff --git a/VehicleCollisions/Folder.DotSettings.user b/VehicleCollisions/Folder.DotSettings.user
@@ -1,4 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005CDennis_005CDesktop_005Cfivepd_0020libs_005CCitizenFX_002ECore_002Edll/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/AddReferences/RecentPaths/=C_003A_005CUsers_005CDennis_005CDesktop_005Cfivepd_0020libs_005CFivePD_002Enet_002Edll/@EntryIndexedValue">True</s:Boolean>
 	<s:String x:Key="/Default/Environment/AssemblyExplorer/XmlDocument/@EntryValue">&lt;AssemblyExplorer&gt;&#xD;
   &lt;Assembly Path="C:\Users\Dennis\Desktop\fivepd libs\CalloutAPI.net.dll" /&gt;&#xD;
 &lt;/AssemblyExplorer&gt;</s:String></wpf:ResourceDictionary>
diff --git a/VehicleCollisions/VehicleCollisions.cs b/VehicleCollisions/VehicleCollisions.cs
@@ -1,15 +1,15 @@
 using System;
 using System.Threading.Tasks;
-using CalloutAPI;
 using CitizenFX.Core;
+using FivePD.API;
 using VehicleCollisions.Scenes;
-using VehicleCollisions.Utils;
 using static CitizenFX.Core.Native.API;
 using static CitizenFX.Core.UI.Screen;
+using Utilities = VehicleCollisions.Utils.Utilities;
 
 namespace VehicleCollisions
 {
-    [CalloutProperties("Vehicle Collisions", "Dennis Smink", "1.0.0", Probability.Medium)]
+    [CalloutProperties("Vehicle Collisions", "Dennis Smink", "1.0.0")]
     public class VehicleCollisions : Callout
     {
         private readonly IScene _scene;
@@ -24,18 +24,18 @@ public VehicleCollisions()
             _scene = new SceneFactory(Utilities.Between(1, 10)).GetScene(this);
             //scene = new SceneFactory(2).GetScene(this);
 
-            InitBase(new Vector3(_scene.Coordinates.X, _scene.Coordinates.Y, _scene.Coordinates.Z));
+            InitInfo(new Vector3(_scene.Coordinates.X, _scene.Coordinates.Y, _scene.Coordinates.Z));
 
             ShortName = _scene.Title;
             CalloutDescription = _scene.Description;
             ResponseCode = _scene.ResponseCode;
             StartDistance = _scene.StartDistance;
         }
 
-        public override async Task Init()
+        public override async Task OnAccept()
         {
             // When user accepts, continue
-            OnAccept();
+            InitBlip();
 
             // Spawn the on-scene cop car (if any)
             await SpawnOnSceneCopCars();

diff --git a/VehicleCollisions/VehicleCollisions.csproj b/VehicleCollisions/VehicleCollisions.csproj
@@ -32,12 +32,12 @@
         <WarningLevel>4</WarningLevel>
     </PropertyGroup>
     <ItemGroup>
-        <Reference Include="CalloutAPI.net, Version=0.6.4.0, Culture=neutral, PublicKeyToken=null">
-          <HintPath>..\..\..\Desktop\fivepd libs\CalloutAPI.net.dll</HintPath>
-        </Reference>
         <Reference Include="CitizenFX.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null">
           <HintPath>..\..\..\Desktop\fivepd libs\CitizenFX.Core.dll</HintPath>
         </Reference>
+        <Reference Include="FivePD.net, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null">
+          <HintPath>..\..\..\Desktop\fivepd libs\FivePD.net.dll</HintPath>
+        </Reference>
         <Reference Include="System" />
         <Reference Include="System.Core" />
         <Reference Include="System.Data" />

diff --git a/VehicleCollisions/obj/Debug/VehicleCollisions.csproj.CoreCompileInputs.cache b/VehicleCollisions/obj/Debug/VehicleCollisions.csproj.CoreCompileInputs.cache
@@ -1 +1 @@
-375a38557920ea8e67b6cc7bc995f84ffd0f6a6c
+bff92150bbfa29ca23fefc80c4e57a698ac27d63
diff --git a/VehicleCollisions/obj/Debug/VehicleCollisions.csproj.FileListAbsolute.txt b/VehicleCollisions/obj/Debug/VehicleCollisions.csproj.FileListAbsolute.txt
@@ -1,9 +1,9 @@
 C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\bin\Debug\VehicleIncidents.net.dll
 C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\bin\Debug\VehicleIncidents.net.pdb
-C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\bin\Debug\CalloutAPI.net.dll
 C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\bin\Debug\CitizenFX.Core.dll
 C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\obj\Debug\VehicleCollisions.csprojAssemblyReference.cache
 C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\obj\Debug\VehicleCollisions.csproj.CoreCompileInputs.cache
 C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\obj\Debug\VehicleCollisions.csproj.CopyComplete
 C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\obj\Debug\VehicleIncidents.net.dll
 C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\obj\Debug\VehicleIncidents.net.pdb
+C:\Users\Dennis\RiderProjects\VehicleCollisions\VehicleCollisions\bin\Debug\FivePD.net.dll
diff --git a/VehicleCollisions/obj/Debug/VehicleCollisions.csprojAssemblyReference.cache b/VehicleCollisions/obj/Debug/VehicleCollisions.csprojAssemblyReference.cache
diff --git a/VehicleCollisions/obj/Debug/VehicleIncidents.net.dll b/VehicleCollisions/obj/Debug/VehicleIncidents.net.dll
diff --git a/VehicleCollisions/obj/Debug/VehicleIncidents.net.pdb b/VehicleCollisions/obj/Debug/VehicleIncidents.net.pdb