SBDevelopment/VehiclesPlusConverter
3
1
Fork 1
Code Issues 1 Pull requests Releases 7 Activity

Compare commits

base: SBDevelopment:d62347d31ebd144b9826a7ddb91687958e514853
Branches Tags
SBDevelopment:master
SBDevelopment:0.2.4
SBDevelopment:0.2.3
SBDevelopment:0.2.2
SBDevelopment:0.2.1
SBDevelopment:0.2
SBDevelopment:0.1.4
SBDevelopment:0.1.3
SBDevelopment:0.1.2
SBDevelopment:0.1.1
SBDevelopment:0.1
..
compare: SBDevelopment:e34277070d815c708128e02f91d9751bbc6acba8
Branches Tags
SBDevelopment:master
SBDevelopment:0.2.4
SBDevelopment:0.2.3
SBDevelopment:0.2.2
SBDevelopment:0.2.1
SBDevelopment:0.2
SBDevelopment:0.1.4
SBDevelopment:0.1.3
SBDevelopment:0.1.2
SBDevelopment:0.1.1
SBDevelopment:0.1

No commits in common. "d62347d31ebd144b9826a7ddb91687958e514853" and "e34277070d815c708128e02f91d9751bbc6acba8" have entirely different histories.
d62347d31e ... e34277070d

2 changed files with 4 additions and 7 deletions
Show stats Expand all files Collapse all files

4
src/main/java/tech/sbdevelopment/vehiclesplusconverter/VehiclesPlusConverter.java
View file

@ -30,8 +30,8 @@ public final class VehiclesPlusConverter extends JavaPlugin {
}
Version versionNew = Version.of(Bukkit.getPluginManager().getPlugin("VehiclesPlus").getDescription().getVersion());
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.2!");
if (versionNew.isOlderThan(Version.of("3.0.1"))) {
Bukkit.getLogger().severe("Your VehiclesPlus v3 plugin is too old! Please update to at least v3.0.1!");
Bukkit.getPluginManager().disablePlugin(this);
return;
}

7
src/main/java/tech/sbdevelopment/vehiclesplusconverter/handlers/Converter.java
View file

@ -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.Sound;
import org.bukkit.command.CommandSender;
import org.bukkit.scheduler.BukkitRunnable;
import tech.sbdevelopment.vehiclesplusconverter.VehiclesPlusConverter;
@ -31,7 +30,6 @@ import tech.sbdevelopment.vehiclesplusconverter.api.ConversionException;
import java.util.List;
import java.util.Map;
import java.util.Optional;
import java.util.UUID;
import static tech.sbdevelopment.vehiclesplusconverter.utils.MainUtil.*;
@ -229,8 +227,7 @@ public class Converter {
.horn(new Horn(
baseVehicle.getHornSettings().getEnabled(),
new Sounds.Sound(
Optional.ofNullable(baseVehicle.getHornSettings().getSound().get())
.orElse(Sound.BLOCK_NOTE_BLOCK_BASS).getKey().toString(),
baseVehicle.getHornSettings().getSound().parseSound().name(),
1
)
))
@ -279,7 +276,7 @@ public class Converter {
saveToVehiclesPlus(model, "vehicles/" + model.getTypeId(), model.getId());
} catch (Exception e) {
VehiclesPlusConverter.getInstance().getLogger().log(java.util.logging.Level.SEVERE, "Could not convert vehicle model: " + baseVehicle.getName(), e);
e.printStackTrace();
}
}
}