From 11a8884afb357dd18d92a03f56713ca5be90a0e9 Mon Sep 17 00:00:00 2001
From: SBDeveloper <support@sbdevelopment.tech>
Date: Fri, 26 Jul 2024 16:23:03 +0200
Subject: [PATCH] Bumped deps

---
 pom.xml                                        | 18 ++++++++----------
 .../handlers/Converter.java                    |  9 +++++----
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/pom.xml b/pom.xml
index d5af6b7..ad9bd79 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,14 +6,13 @@
 
     <groupId>tech.sbdevelopment</groupId>
     <artifactId>VehiclesPlusConverter</artifactId>
-    <version>0.1.3</version>
+    <version>0.1.4</version>
     <packaging>jar</packaging>
 
     <name>VehiclesPlusConverter</name>
 
     <description>Conversion plugin for v2 to v3.</description>
     <properties>
-        <java.version>1.8</java.version>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
     <url>sbdevelopment.tech</url>
@@ -23,16 +22,15 @@
             <plugin> 
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version>
+                <version>3.13.0</version>
                 <configuration>
-                    <source>10</source>
-                    <target>10</target>
+                    <release>11</release>
                 </configuration>
             </plugin>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.4</version>
+                <version>3.6.0</version>
                 <executions>
                     <execution>
                         <phase>package</phase>
@@ -69,22 +67,22 @@
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.19.2-R0.1-SNAPSHOT</version>
+            <version>1.21-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>nl.sbdeveloper</groupId>
             <artifactId>VehiclesPlus-v2</artifactId>
-            <version>2.4.4.1</version>
+            <version>2.4.6.2</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/src/libs/VehiclesPlus-2.4.4.1.jar</systemPath>
+            <systemPath>${project.basedir}/src/libs/VehiclesPlus-2.4.6.2.jar</systemPath>
         </dependency>
         <dependency>
             <groupId>nl.sbdeveloper</groupId>
             <artifactId>VehiclesPlus-v3</artifactId>
             <version>3.0.0-SNAPSHOT</version>
             <scope>system</scope>
-            <systemPath>${project.basedir}/src/libs/VehiclesPlus-3.0.0-SNAPSHOT.jar</systemPath>
+            <systemPath>${project.basedir}/src/libs/VehiclesPlus-3.0.0-SNAPSHOT-Clean.jar</systemPath>
         </dependency>
     </dependencies>
 </project>
diff --git a/src/main/java/tech/sbdevelopment/vehiclesplusconverter/handlers/Converter.java b/src/main/java/tech/sbdevelopment/vehiclesplusconverter/handlers/Converter.java
index d070067..82bd341 100644
--- a/src/main/java/tech/sbdevelopment/vehiclesplusconverter/handlers/Converter.java
+++ b/src/main/java/tech/sbdevelopment/vehiclesplusconverter/handlers/Converter.java
@@ -23,7 +23,6 @@ import nl.sbdeveloper.vehiclesplus.api.vehicles.settings.impl.*;
 import nl.sbdeveloper.vehiclesplus.storage.db.exceptions.DataStorageException;
 import nl.sbdeveloper.vehiclesplus.utils.jackson.ColorList;
 import org.bukkit.Bukkit;
-import org.bukkit.Particle;
 import org.bukkit.command.CommandSender;
 import org.bukkit.scheduler.BukkitRunnable;
 import tech.sbdevelopment.vehiclesplusconverter.VehiclesPlusConverter;
@@ -213,7 +212,7 @@ public class Converter {
                         .horn(new Horn(
                                 baseVehicle.getHornSettings().getEnabled(),
                                 new Sounds.Sound(
-                                        baseVehicle.getHornSettings().getSound().name(),
+                                        baseVehicle.getHornSettings().getSound().parseSound().name(),
                                         1
                                 )
                         ))
@@ -223,7 +222,7 @@ public class Converter {
                                 baseVehicle.getExhaustSettings().getXOffset(),
                                 baseVehicle.getExhaustSettings().getYOffset(),
                                 baseVehicle.getExhaustSettings().getZOffset(),
-                                Particle.valueOf(baseVehicle.getExhaustSettings().getParticleName())
+                                baseVehicle.getExhaustSettings().getParticle().get()
                         ))
                         .exitWhileMoving(baseVehicle.getCanExitWhileMoving())
                         .price(baseVehicle.getPrice())
@@ -271,7 +270,9 @@ public class Converter {
             for (StorageVehicle vehicle : set.getValue()) {
                 try {
                     nl.sbdeveloper.vehiclesplus.api.vehicles.impl.StorageVehicle newVehicle = new nl.sbdeveloper.vehiclesplus.api.vehicles.impl.StorageVehicle(
-                            nl.sbdeveloper.vehiclesplus.api.VehiclesPlusAPI.getVehicleModels().values().stream().filter(v -> v.getId().equalsIgnoreCase(vehicle.getBaseVehicle())).findFirst().orElseThrow(() -> new ConversionException("No VehicleModel found for", vehicle.getUuid()))
+                            UUID.randomUUID(),
+                            nl.sbdeveloper.vehiclesplus.api.VehiclesPlusAPI.getVehicleModels().values().stream().filter(v -> v.getId().equalsIgnoreCase(vehicle.getBaseVehicle())).findFirst().orElseThrow(() -> new ConversionException("No VehicleModel found for", vehicle.getUuid())),
+                            false
                     );
 
                     newVehicle.forceSave();