VehicleHandler #12 - Fixing few ConsoleOutput bugs, Removing Comand m…

…anager test function, Removing last Mapping tests

EvoMp/EvoMp.Core.ConsoleHandler/Server/ConsoleOutput.cs

@@ -95,9 +95,12 @@ public static void WriteLine(ConsoleType consoleType, string message, bool noWor
             string messageStartColorCode = "";
 
             // Search for message starting color code. Used to add same color code to splitted lines
-            List<string> messageColorCodes = ColorUtils.ParseColorCodesSimple(messages[0]);
-            if (messageColorCodes.Any())
-                messageStartColorCode = "~" + messageColorCodes[0] + "~";
+            if (messages.Any())
+            {
+                List<string> messageColorCodes = ColorUtils.ParseColorCodesSimple(messages[0]);
+                if (messageColorCodes.Any())
+                    messageStartColorCode = "~" + messageColorCodes[0] + "~";
+            }
 
             // Cut messages to fit in the console
             for (int i = 0; i < messages.Length; i++)
@@ -331,9 +334,9 @@ private static void InternalWrite(ConsoleType consoleType, string message, bool
             // Append message to complete message
             writeMessage += message;
 
-            string fillUpString =
-                "".PadRight(ConsoleHandler.WindowWidth -
-                            ColorUtils.CleanUp(writeMessage + suffix).Replace("\n", "").Length);
+            int fillUpLength = ConsoleHandler.WindowWidth -
+                               ColorUtils.CleanUp(writeMessage + suffix).Replace("\n", "").Length;
+            string fillUpString = "".PadRight(fillUpLength > 0 ? fillUpLength : 0);
 
             // Add suffixs and possible linebreak
             writeMessage += "~;~" + fillUpString + suffix;

EvoMp/EvoMp.Core.Module/EvoMp.Core.Module.csproj

@@ -48,9 +48,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoMapper, Version=6.2.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.6.2.2\lib\net45\AutoMapper.dll</HintPath>
-    </Reference>
     <Reference Include="BCrypt.Net, Version=0.1.5073.29922, Culture=neutral, PublicKeyToken=6bcd409ee6bc9292, processorArchitecture=MSIL">
       <HintPath>..\packages\BCrypt-Official.0.1.109\lib\BCrypt.Net.dll</HintPath>
     </Reference>
@@ -80,8 +77,6 @@
     <Reference Include="System.Runtime.Serialization" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Server\Entity\BaseEntityDto.cs" />
-    <Compile Include="Server\Entity\BaseEntityMap.cs" />
     <Compile Include="Server\ModuleProperties.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Server\Shared.cs" />

EvoMp/EvoMp.Core.Module/packages.config

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="AutoMapper" version="6.2.2" targetFramework="net461" />
   <package id="BCrypt-Official" version="0.1.109" targetFramework="net461" />
   <package id="EntityFramework" version="6.2.0" targetFramework="net461" />
   <package id="grandtheftmultiplayer.api" version="0.1.640.64" targetFramework="net461" />

EvoMp/EvoMp.Module.TestModule/EvoMp.Module.TestModule.csproj

@@ -76,8 +76,7 @@
     <Compile Include="Server\ITestModule.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Server\TestModule.cs" />
-    <Compile Include="Server\TestInitialized.cs" />
-    <Compile Include="Server\TestNotInitializedClass.cs" />
+    <Compile Include="Server\CommandTests.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\EvoMp.Core.Module\EvoMp.Core.Module.csproj">

EvoMp/EvoMp.Module.TestModule/Server/TestInitialized.cs → EvoMp/EvoMp.Module.TestModule/Server/CommandTests.cs

@@ -1,9 +1,10 @@
-using EvoMp.Module.CommandHandler.Server.Attributes;
+using EvoMp.Core.Module.Server;
+using EvoMp.Module.CommandHandler.Server.Attributes;
 using GrandTheftMultiplayer.Server.Elements;
 
 namespace EvoMp.Module.TestModule.Server
 {
-    public class TestInitialized
+    public class CommandTests
     {
         [PlayerCommand("/testDoubleCommandName")]
         public void TestDoubleCommandName(Client sender)
@@ -24,5 +25,11 @@ public void TestDoubleCommandAlias(Client sender)
         public void TestDoubleCommandAlias2(Client sender)
         {
         }
+
+        [PlayerCommand("/staticTest")]
+        public static void StaticTestFunction(Client sender)
+        {
+            Shared.Api.sendChatMessageToPlayer(sender, "Static command entered!");
+        }
     }
-}
+}

EvoMp/EvoMp.Module.TestModule/Server/TestModule.cs

@@ -12,7 +12,7 @@ public class TestModule : ITestModule
     {
         private readonly API _api;
         private readonly IVehicleHandler _vehicleHandler;
-        public TestInitialized TestInitialized = new TestInitialized();
+        public CommandTests TestInitialized = new CommandTests();
 
         public TestModule(API api, ICommandHandler commandHandler, IVehicleHandler vehicleHandler)
         {
@@ -24,26 +24,56 @@ public TestModule(API api, ICommandHandler commandHandler, IVehicleHandler vehic
         public void TestCommand(Client sender)
         {
             _api.sendChatMessageToPlayer(sender, "Test command runned.");
+            _api.setEntityInvincible(sender, false);
+            _api.freezePlayer(sender, false);
+            _api.setEntityTransparency(sender, 255);
+            _api.setEntityCollisionless(sender, false);
         }
 
 
         [PlayerCommand("/v")]
         public void TestVehicleCommand(Client sender, string vehicleName)
         {
+            VehicleHash possibleVehicleHash = (VehicleHash) (-1);
+
+            // Name like
             foreach (VehicleHash vehicleHash in Enum.GetValues(typeof(VehicleHash)))
                 if (vehicleName.ToLower() == $"{vehicleHash}".ToLower())
                 {
-                    NetHandle newVehicle = _api.createVehicle(vehicleHash, sender.position, sender.rotation, 0, 0,
-                        sender.dimension);
-                    _api.setPlayerIntoVehicle(sender, newVehicle, -1);
-                    _api.sendChatMessageToPlayer(sender, $"Vehicle ~o~{vehicleHash}~w~ created.");
+                    possibleVehicleHash = vehicleHash;
+                    break;
+                }
 
+            //Name starts with
+            if (possibleVehicleHash == (VehicleHash) (-1))
+                foreach (VehicleHash vehicleHash in Enum.GetValues(typeof(VehicleHash)))
+                    if ($"{vehicleHash}".ToLower().StartsWith(vehicleName.ToLower()))
+                    {
+                        possibleVehicleHash = vehicleHash;
+                        break;
+                    }
 
-                    // Create new Database vehicle entry
-                    //ExtendedVehicle newTestVehicle = new ExtendedVehicle(vehicleHash, sender.position, sender.rotation);
-                    // save enw Database vehcile entry
-                    //newTestVehicle.Save();
-                }
+            //Name contains
+            if (possibleVehicleHash == (VehicleHash) (-1))
+                foreach (VehicleHash vehicleHash in Enum.GetValues(typeof(VehicleHash)))
+                    if ($"{vehicleHash}".ToLower().Contains(vehicleName.ToLower()))
+                    {
+                        possibleVehicleHash = vehicleHash;
+                        break;
+                    }
+
+            // No vehicle found -> message & return
+            if (possibleVehicleHash == (VehicleHash) (-1))
+            {
+                _api.sendChatMessageToPlayer(sender, $"There is no vehicle like~o~{vehicleName}~w~ .");
+                return;
+            }
+
+            // Create new vehicle
+            NetHandle newVehicle = _api.createVehicle(possibleVehicleHash, sender.position, sender.rotation, 0, 0,
+                sender.dimension);
+            _api.setPlayerIntoVehicle(sender, newVehicle, -1);
+            _api.sendChatMessageToPlayer(sender, $"Vehicle ~o~{possibleVehicleHash}~w~ created.");
         }
     }
 }

EvoMp/EvoMp.Module.VehicleHandler/EvoMp.Module.VehicleHandler.csproj

@@ -30,9 +30,6 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="AutoMapper, Version=6.2.2.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
-      <HintPath>..\packages\AutoMapper.6.2.2\lib\net45\AutoMapper.dll</HintPath>
-    </Reference>
     <Reference Include="BCrypt.Net, Version=0.1.5073.29922, Culture=neutral, PublicKeyToken=6bcd409ee6bc9292, processorArchitecture=MSIL">
       <HintPath>..\packages\BCrypt-Official.0.1.109\lib\BCrypt.Net.dll</HintPath>
     </Reference>
@@ -65,7 +62,6 @@
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="Server\Entity\Mapping.cs" />
-    <Compile Include="Server\Entity\VehicleMap.cs" />
     <Compile Include="Server\Entity\VehicleDto.cs" />
     <Compile Include="Server\Entity\VehicleContext.cs" />
     <Compile Include="Server\Entity\VehicleRepository.cs" />

EvoMp/EvoMp.Module.VehicleHandler/Server/Entity/Mapping.cs

@@ -1,35 +1,36 @@
-using AutoMapper;
 using GrandTheftMultiplayer.Shared.Math;
 
 namespace EvoMp.Module.VehicleHandler.Server.Entity
 {
-    public class Mapping : Profile
+    public class Mapping
     {
         public Mapping()
         {
-            #region Vehicle Position & Rotation
-            // VehicleMap to VehicleDto
-            CreateMap<VehicleMap, VehicleDto>()
-                .ForMember(dest => dest.Position,
-                    mapExpession => mapExpession.MapFrom(source => new Vector3(source.X, source.Y, source.Z)))
-                .ForMember(destination => destination.Rotation,
-                    mapExpression => mapExpression.MapFrom(source => new Vector3(source.Xr, source.Yr, source.Zr)));
-
-            // VehicleDto to VehicleMap
-            CreateMap<VehicleDto, VehicleMap>()
-                .ForMember(destination => destination.X,
-                    mapExpression => mapExpression.MapFrom(source => source.Position.X))
-                .ForMember(destination => destination.Y,
-                    mapExpression => mapExpression.MapFrom(source => source.Position.Y))
-                .ForMember(destination => destination.Z,
-                    mapExpression => mapExpression.MapFrom(source => source.Position.Z))
-                .ForMember(destination => destination.Xr,
-                    mapExpression => mapExpression.MapFrom(source => source.Rotation.X))
-                .ForMember(destination => destination.Yr,
-                    mapExpression => mapExpression.MapFrom(source => source.Rotation.Y))
-                .ForMember(destination => destination.Zr,
-                    mapExpression => mapExpression.MapFrom(source => source.Rotation.Z));
-            #endregion //Vehicle Position & Rotation
+            //TODO: Remove if new solution works
+            /*  #region Vehicle Position & Rotation
+              // VehicleMap to VehicleDto
+              CreateMap<VehicleMap, VehicleDto>()
+                  .ForMember(dest => dest.Position,
+                      mapExpession => mapExpession.MapFrom(source => new Vector3(source.X, source.Y, source.Z)))
+                  .ForMember(destination => destination.Rotation,
+                      mapExpression => mapExpression.MapFrom(source => new Vector3(source.Xr, source.Yr, source.Zr)));
+  
+              // VehicleDto to VehicleMap
+              CreateMap<VehicleDto, VehicleMap>()
+                  .ForMember(destination => destination.X,
+                      mapExpression => mapExpression.MapFrom(source => source.Position.X))
+                  .ForMember(destination => destination.Y,
+                      mapExpression => mapExpression.MapFrom(source => source.Position.Y))
+                  .ForMember(destination => destination.Z,
+                      mapExpression => mapExpression.MapFrom(source => source.Position.Z))
+                  .ForMember(destination => destination.Xr,
+                      mapExpression => mapExpression.MapFrom(source => source.Rotation.X))
+                  .ForMember(destination => destination.Yr,
+                      mapExpression => mapExpression.MapFrom(source => source.Rotation.Y))
+                  .ForMember(destination => destination.Zr,
+                      mapExpression => mapExpression.MapFrom(source => source.Rotation.Z));
+              #endregion //Vehicle Position & Rotation
+              */
         }
     }
 }

EvoMp/EvoMp.Module.VehicleHandler/Server/Entity/VehicleContext.cs

@@ -17,7 +17,7 @@ public VehicleContext() : base(Environment.GetEnvironmentVariable("NameOrConnect
         }
 
         // Tables
-        public DbSet<VehicleMap> Vehicles { get; set; }
+        public DbSet<VehicleDto> Vehicles { get; set; }
 
         public void Init()
         {

EvoMp/EvoMp.Module.VehicleHandler/Server/Entity/VehicleDto.cs

@@ -2,42 +2,58 @@
 using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
-using EvoMp.Core.Module.Server.Entity;
 using EvoMp.Module.VehicleHandler.Server.Enum;
 using GrandTheftMultiplayer.Shared;
 using GrandTheftMultiplayer.Shared.Math;
 
 namespace EvoMp.Module.VehicleHandler.Server.Entity
 {
-    public class VehicleDto : BaseEntityDto
+    [Table("Vehicles")]
+    public class VehicleDto
     {
+        [DatabaseGenerated(DatabaseGeneratedOption.Identity)]
+        [Key]
+        [Required]
+        [Column("VehicleId")]
+        public int VehicleId { get; set; }
+
+        [Required]
+        [Column("VehicleHash")]
         public VehicleHash VehicleHash { get; set; }
 
-        public Vector3 Position { get; set; }
-
-        public Vector3 Rotation { get; set; }
-
+        //public Vector3 Position  { get; set; }
+        //public Vector3 Rotation  { get; set; }
         //public string PrimaryColorID  { get; set; }
         //public string SecondaryColorID  { get; set; }
 
+        [Column("NumberplateValue")]
         public string NumberplateValue { get; set; }
 
+        [Column("VehicleState")]
         public VehicleState VehicleState { get; set; }
 
+        [Column("KmStand")]
         public double KmStand { get; set; }
 
+        [Column("Fuel")]
         public double Fuel { get; set; }
 
+        [Column("Dimension")]
         public int Dimension { get; set; }
 
+        [Column("Health")]
         public double Health { get; set; }
 
+        [Column("Locked")]
         public bool Locked { get; set; }
 
+        [Column("EngineState")]
         public EngineState EngineState { get; set; }
 
+        [Column("SirenState")]
         public SirenState SirenState { get; set; }
 
+        [Column("SpecialLightState")]
         public SpecialLightState SpecialLightState { get; set; }
     }
 }