Compare commits
2 commits
e34277070d
...
d62347d31e
Author | SHA1 | Date | |
---|---|---|---|
d62347d31e | |||
8d88cfadf7 |
2 changed files with 7 additions and 4 deletions
|
@ -30,8 +30,8 @@ public final class VehiclesPlusConverter extends JavaPlugin {
|
||||||
}
|
}
|
||||||
|
|
||||||
Version versionNew = Version.of(Bukkit.getPluginManager().getPlugin("VehiclesPlus").getDescription().getVersion());
|
Version versionNew = Version.of(Bukkit.getPluginManager().getPlugin("VehiclesPlus").getDescription().getVersion());
|
||||||
if (versionNew.isOlderThan(Version.of("3.0.1"))) {
|
if (versionNew.isOlderThan(Version.of("3.0.2"))) {
|
||||||
Bukkit.getLogger().severe("Your VehiclesPlus v3 plugin is too old! Please update to at least v3.0.1!");
|
Bukkit.getLogger().severe("Your VehiclesPlus v3 plugin is too old! Please update to at least v3.0.2!");
|
||||||
Bukkit.getPluginManager().disablePlugin(this);
|
Bukkit.getPluginManager().disablePlugin(this);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
|
@ -23,6 +23,7 @@ import nl.sbdeveloper.vehiclesplus.api.vehicles.settings.impl.*;
|
||||||
import nl.sbdeveloper.vehiclesplus.storage.db.exceptions.DataStorageException;
|
import nl.sbdeveloper.vehiclesplus.storage.db.exceptions.DataStorageException;
|
||||||
import nl.sbdeveloper.vehiclesplus.utils.jackson.ColorList;
|
import nl.sbdeveloper.vehiclesplus.utils.jackson.ColorList;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
|
import org.bukkit.Sound;
|
||||||
import org.bukkit.command.CommandSender;
|
import org.bukkit.command.CommandSender;
|
||||||
import org.bukkit.scheduler.BukkitRunnable;
|
import org.bukkit.scheduler.BukkitRunnable;
|
||||||
import tech.sbdevelopment.vehiclesplusconverter.VehiclesPlusConverter;
|
import tech.sbdevelopment.vehiclesplusconverter.VehiclesPlusConverter;
|
||||||
|
@ -30,6 +31,7 @@ import tech.sbdevelopment.vehiclesplusconverter.api.ConversionException;
|
||||||
|
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
import java.util.Optional;
|
||||||
import java.util.UUID;
|
import java.util.UUID;
|
||||||
|
|
||||||
import static tech.sbdevelopment.vehiclesplusconverter.utils.MainUtil.*;
|
import static tech.sbdevelopment.vehiclesplusconverter.utils.MainUtil.*;
|
||||||
|
@ -227,7 +229,8 @@ public class Converter {
|
||||||
.horn(new Horn(
|
.horn(new Horn(
|
||||||
baseVehicle.getHornSettings().getEnabled(),
|
baseVehicle.getHornSettings().getEnabled(),
|
||||||
new Sounds.Sound(
|
new Sounds.Sound(
|
||||||
baseVehicle.getHornSettings().getSound().parseSound().name(),
|
Optional.ofNullable(baseVehicle.getHornSettings().getSound().get())
|
||||||
|
.orElse(Sound.BLOCK_NOTE_BLOCK_BASS).getKey().toString(),
|
||||||
1
|
1
|
||||||
)
|
)
|
||||||
))
|
))
|
||||||
|
@ -276,7 +279,7 @@ public class Converter {
|
||||||
|
|
||||||
saveToVehiclesPlus(model, "vehicles/" + model.getTypeId(), model.getId());
|
saveToVehiclesPlus(model, "vehicles/" + model.getTypeId(), model.getId());
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
e.printStackTrace();
|
VehiclesPlusConverter.getInstance().getLogger().log(java.util.logging.Level.SEVERE, "Could not convert vehicle model: " + baseVehicle.getName(), e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue