Update to new version. Remove src folder. Add colors, neons, wheel ch…

…anges
altv-atlas · Nov 29, 2023 · a28d19b · a28d19b
1 parent 82ccd3b
commit a28d19b
Show file tree

Hide file tree

Showing 20 changed files with 83 additions and 443 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -35,7 +35,7 @@ jobs:
       uses: actions/setup-dotnet@v3
 
     # Create the NuGet package in the folder from the environment variable NuGetDirectory
-    - run: dotnet pack src/*.csproj --configuration Release --output ${{ env.NuGetDirectory }}
+    - run: dotnet pack *.csproj --configuration Release --output ${{ env.NuGetDirectory }}
 
     # Publish the NuGet package as an artifact, so they can be used in the following jobs
     - uses: actions/upload-artifact@v3

diff --git a/src/AltV.Atlas.Vehicles.csproj → AltV.Atlas.Vehicles.Server.csproj b/src/AltV.Atlas.Vehicles.csproj → AltV.Atlas.Vehicles.Server.csproj
@@ -12,10 +12,11 @@
         <PublishUrl>https://github.com/altv-atlas</PublishUrl>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+        <RootNamespace>AltV.Atlas.Vehicles.Server</RootNamespace>
     </PropertyGroup>
 
     <ItemGroup>
-        <None Include="../README.md" Pack="true" PackagePath="\"/>
+        <None Include="README.md" Pack="true" PackagePath="\"/>
         <PackageReference Include="AltV.Net.Async" Version="15.0.6"/>
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0"/>
         <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0"/>
@@ -26,7 +27,13 @@
         <PackageReference Include="AltV.Atlas.Shared" Version="2.0.0" />
     </ItemGroup>
 
+
     <ItemGroup Condition=" '$(Configuration)' == 'Debug' ">
-        <ProjectReference Include="..\..\AltV.Atlas.Shared\AltV.Atlas.Shared.csproj" />
+        <ProjectReference Include="..\AltV.Atlas.Shared\AltV.Atlas.Shared.csproj" />
+        <ProjectReference Include="..\AltV.Atlas.Vehicles.Shared\AltV.Atlas.Vehicles.Shared.csproj" />
+    </ItemGroup>
+
+
+    <ItemGroup>
     </ItemGroup>
 </Project>
diff --git a/src/AltV/Entities/AtlasVehicleBase.cs → AltV/Entities/AtlasVehicleBase.cs b/src/AltV/Entities/AtlasVehicleBase.cs → AltV/Entities/AtlasVehicleBase.cs
@@ -1,9 +1,9 @@
-using AltV.Atlas.Vehicles.AltV.Interfaces;
+using AltV.Atlas.Vehicles.Server.AltV.Interfaces;
 using AltV.Net;
 using AltV.Net.Async.Elements.Entities;
 using AltV.Net.Elements.Entities;
 
-namespace AltV.Atlas.Vehicles.AltV.Entities;
+namespace AltV.Atlas.Vehicles.Server.AltV.Entities;
 
 public class AtlasVehicleBase( ICore core, IntPtr nativePointer, uint id ) : AsyncVehicle( core, nativePointer, id ), IAtlasVehicle
 {

diff --git a/src/AltV/Factories/AltVehicleFactory.cs → AltV/Factories/AltVehicleFactory.cs b/src/AltV/Factories/AltVehicleFactory.cs → AltV/Factories/AltVehicleFactory.cs
@@ -1,9 +1,9 @@
-using AltV.Atlas.Vehicles.AltV.Entities;
-using AltV.Atlas.Vehicles.AltV.Interfaces;
+using AltV.Atlas.Vehicles.Server.AltV.Entities;
+using AltV.Atlas.Vehicles.Server.AltV.Interfaces;
 using AltV.Net;
 using Microsoft.Extensions.DependencyInjection;
 
-namespace AltV.Atlas.Vehicles.AltV.Factories;
+namespace AltV.Atlas.Vehicles.Server.AltV.Factories;
 
 /// <summary>
 /// Entity factory for atlas vehicles

diff --git a/src/AltV/Interfaces/IAtlasVehicle.cs → AltV/Interfaces/IAtlasVehicle.cs b/src/AltV/Interfaces/IAtlasVehicle.cs → AltV/Interfaces/IAtlasVehicle.cs
@@ -1,7 +1,6 @@
-using AltV.Net.Data;
-using AltV.Net.Elements.Entities;
+using AltV.Net.Elements.Entities;
 
-namespace AltV.Atlas.Vehicles.AltV.Interfaces;
+namespace AltV.Atlas.Vehicles.Server.AltV.Interfaces;
 
 public interface IAtlasVehicle : IVehicle
 {

diff --git a/src/Data/GtaColor.cs → Data/GtaColor.cs b/src/Data/GtaColor.cs → Data/GtaColor.cs
@@ -1,6 +1,7 @@
 using System.Collections.Frozen;
-using AltV.Atlas.Vehicles.Enums;
-namespace AltV.Atlas.Vehicles.Data;
+using AltV.Atlas.Vehicles.Server.Enums;
+
+namespace AltV.Atlas.Vehicles.Server.Data;
 
 /// <summary>
 /// A class that holds GtaColor extensions

diff --git a/src/Entities/AtlasPlayerVehicle.cs → Entities/AtlasPlayerVehicle.cs b/src/Entities/AtlasPlayerVehicle.cs → Entities/AtlasPlayerVehicle.cs
@@ -1,5 +1,6 @@
 using AltV.Net;
-namespace AltV.Atlas.Vehicles.Entities;
+
+namespace AltV.Atlas.Vehicles.Server.Entities;
 
 public class AtlasPlayerVehicle( ICore core, IntPtr nativePointer, uint id ) : AtlasTuningVehicle( core, nativePointer, id )
 {

diff --git a/src/Entities/AtlasTuningVehicle.cs → Entities/AtlasTuningVehicle.cs b/src/Entities/AtlasTuningVehicle.cs → Entities/AtlasTuningVehicle.cs
@@ -1,13 +1,14 @@
 using AltV.Atlas.Shared.Extensions;
-using AltV.Atlas.Vehicles.AltV.Entities;
-using AltV.Atlas.Vehicles.Data;
-using AltV.Atlas.Vehicles.Enums;
-using AltV.Atlas.Vehicles.Models;
+using AltV.Atlas.Vehicles.Server.AltV.Entities;
+using AltV.Atlas.Vehicles.Server.Data;
+using AltV.Atlas.Vehicles.Server.Enums;
+using AltV.Atlas.Vehicles.Server.Models;
+using AltV.Atlas.Vehicles.Shared.Models;
 using AltV.Net;
 using AltV.Net.Data;
 using AltV.Net.Enums;
 
-namespace AltV.Atlas.Vehicles.Entities;
+namespace AltV.Atlas.Vehicles.Server.Entities;
 
 public class AtlasTuningVehicle : AtlasVehicleBase
 {
@@ -246,4 +247,35 @@ public void SetWheels( EWheelType wheelType, byte variation )
         SetWheels( ( byte ) wheelType, variation );
     }
 
+    /// <summary>
+    /// Changes the vehicles wheel mods for each wheel
+    /// </summary>
+    /// <param name="wheelMod">The data to apply</param>
+    public void ChangeWheel( WheelMod wheelMod )
+    {
+        var wheels = new List<WheelMod>( );
+
+        for( byte i = 0; i < WheelsCount; i++ )
+        {
+            wheelMod.Index = i;
+            wheels.Add( wheelMod );
+        }
+
+        SetStreamSyncedMetaData( "changeWheels", wheels );
+    }
+
+    /// <summary>
+    /// Changes the vehicle wheel mods
+    /// </summary>
+    /// <param name="wheelMods">The mod values to apply</param>
+    public void ChangeWheels( IList<WheelMod> wheelMods )
+    {
+        SetStreamSyncedMetaData( "changeWheels", wheelMods );
+    }
+
+    public void ChangeWheelTest( float value )
+    {
+        SetStreamSyncedMetaData( "changeWheels", value );
+    }
+
 }
diff --git a/src/Enums/EColorMaterial.cs → Enums/EColorMaterial.cs b/src/Enums/EColorMaterial.cs → Enums/EColorMaterial.cs
@@ -1,4 +1,4 @@
-namespace AltV.Atlas.Vehicles.Enums;
+namespace AltV.Atlas.Vehicles.Server.Enums;
 
 /// <summary>
 /// Different materials a car color can have

diff --git a/src/Enums/EGtaColor.cs → Enums/EGtaColor.cs b/src/Enums/EGtaColor.cs → Enums/EGtaColor.cs
@@ -1,4 +1,4 @@
-namespace AltV.Atlas.Vehicles.Enums;
+namespace AltV.Atlas.Vehicles.Server.Enums;
 
 /// <summary>
 /// All default GTA colors

diff --git a/src/Enums/EHeadlightColor.cs → Enums/EHeadlightColor.cs b/src/Enums/EHeadlightColor.cs → Enums/EHeadlightColor.cs
@@ -1,4 +1,4 @@
-namespace AltV.Atlas.Vehicles.Enums;
+namespace AltV.Atlas.Vehicles.Server.Enums;
 
 /// <summary>
 /// All available headlight colors

diff --git a/src/Enums/ENeonStyle.cs → Enums/ENeonStyle.cs b/src/Enums/ENeonStyle.cs → Enums/ENeonStyle.cs
@@ -1,4 +1,4 @@
-namespace AltV.Atlas.Vehicles.Enums;
+namespace AltV.Atlas.Vehicles.Server.Enums;
 
 [Flags]
 public enum ENeonStyle

diff --git a/src/Enums/EWheelType.cs → Enums/EWheelType.cs b/src/Enums/EWheelType.cs → Enums/EWheelType.cs
@@ -1,4 +1,4 @@
-namespace AltV.Atlas.Vehicles.Enums;
+namespace AltV.Atlas.Vehicles.Server.Enums;
 
 /// <summary>
 /// All different default GTA wheel types

diff --git a/src/Events/AtlasVehicleEvents.cs → Events/AtlasVehicleEvents.cs b/src/Events/AtlasVehicleEvents.cs → Events/AtlasVehicleEvents.cs
@@ -1,7 +1,7 @@
-using AltV.Atlas.Vehicles.AltV.Interfaces;
+using AltV.Atlas.Vehicles.Server.AltV.Interfaces;
 using AltV.Net.Elements.Entities;
 
-namespace AltV.Atlas.Vehicles.Events;
+namespace AltV.Atlas.Vehicles.Server.Events;
 
 /// <summary>
 /// Class that receives and emits events that occur within vehicles module

diff --git a/src/Events/PlayerEnterVehicleEvent.cs → Events/PlayerEnterVehicleEvent.cs b/src/Events/PlayerEnterVehicleEvent.cs → Events/PlayerEnterVehicleEvent.cs
@@ -1,10 +1,9 @@
-using AltV.Atlas.Vehicles.AltV.Interfaces;
+using AltV.Atlas.Vehicles.Server.AltV.Interfaces;
 using AltV.Net;
-using AltV.Net.Async;
 using AltV.Net.Data;
 using AltV.Net.Elements.Entities;
 
-namespace AltV.Atlas.Vehicles.Events;
+namespace AltV.Atlas.Vehicles.Server.Events;
 
 /// <summary>
 /// Listens to altV PlayerEnterVehicle event

diff --git a/src/Factories/AtlasVehicleFactory.cs → Factories/AtlasVehicleFactory.cs b/src/Factories/AtlasVehicleFactory.cs → Factories/AtlasVehicleFactory.cs
@@ -1,13 +1,13 @@
-using AltV.Atlas.Vehicles.AltV.Interfaces;
-using AltV.Atlas.Vehicles.Interfaces;
+using AltV.Atlas.Vehicles.Server.AltV.Interfaces;
+using AltV.Atlas.Vehicles.Server.Interfaces;
 using AltV.Net;
 using AltV.Net.Async;
 using AltV.Net.Data;
 using AltV.Net.Enums;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace AltV.Atlas.Vehicles.Factories;
+namespace AltV.Atlas.Vehicles.Server.Factories;
 
 /// <summary>
 /// Factory to create new atlas vehicle

diff --git a/src/Interfaces/IAtlasVehicleFactory.cs → Interfaces/IAtlasVehicleFactory.cs b/src/Interfaces/IAtlasVehicleFactory.cs → Interfaces/IAtlasVehicleFactory.cs
@@ -1,8 +1,8 @@
-using AltV.Atlas.Vehicles.AltV.Interfaces;
+using AltV.Atlas.Vehicles.Server.AltV.Interfaces;
 using AltV.Net.Data;
 using AltV.Net.Enums;
 
-namespace AltV.Atlas.Vehicles.Interfaces;
+namespace AltV.Atlas.Vehicles.Server.Interfaces;
 
 public interface IAtlasVehicleFactory
 {

diff --git a/src/Models/VehicleMod.cs → Models/VehicleMod.cs b/src/Models/VehicleMod.cs → Models/VehicleMod.cs
@@ -1,5 +1,6 @@
 using AltV.Net.Enums;
-namespace AltV.Atlas.Vehicles.Models;
+
+namespace AltV.Atlas.Vehicles.Server.Models;
 
 public class VehicleMod
 {

diff --git a/src/VehicleModule.cs → VehicleModule.cs b/src/VehicleModule.cs → VehicleModule.cs
@@ -1,15 +1,13 @@
-using AltV.Atlas.Vehicles.AltV.Entities;
-using AltV.Atlas.Vehicles.AltV.Factories;
-using AltV.Atlas.Vehicles.AltV.Interfaces;
-using AltV.Atlas.Vehicles.Entities;
-using AltV.Atlas.Vehicles.Events;
-using AltV.Atlas.Vehicles.Factories;
-using AltV.Atlas.Vehicles.Interfaces;
+using AltV.Atlas.Vehicles.Server.AltV.Entities;
+using AltV.Atlas.Vehicles.Server.AltV.Factories;
+using AltV.Atlas.Vehicles.Server.AltV.Interfaces;
+using AltV.Atlas.Vehicles.Server.Events;
+using AltV.Atlas.Vehicles.Server.Factories;
+using AltV.Atlas.Vehicles.Server.Interfaces;
 using AltV.Net;
-using AltV.Net.Async.Elements.Entities;
-using AltV.Net.Elements.Entities;
 using Microsoft.Extensions.DependencyInjection;
-namespace AltV.Atlas.Vehicles;
+
+namespace AltV.Atlas.Vehicles.Server;
 
 /// <summary>
 ///     Entrypoint for atlas vehicle module