diff --git a/pom.xml b/pom.xml index 10e77985..315da1ac 100644 --- a/pom.xml +++ b/pom.xml @@ -28,7 +28,7 @@ net.md-5 specialsource-maven-plugin - 1.2.4 + 2.0.3 package @@ -37,9 +37,9 @@ remap-obf - org.spigotmc:minecraft-server:1.20.1-R0.1-SNAPSHOT:txt:maps-mojang + org.spigotmc:minecraft-server:1.20.6-R0.1-SNAPSHOT:txt:maps-mojang true - org.spigotmc:spigot:1.20.1-R0.1-SNAPSHOT:jar:remapped-mojang + org.spigotmc:spigot:1.20.6-R0.1-SNAPSHOT:jar:remapped-mojang true remapped-obf @@ -52,8 +52,8 @@ remap-spigot ${project.build.directory}/${project.artifactId}-${project.version}-remapped-obf.jar - org.spigotmc:minecraft-server:1.20.1-R0.1-SNAPSHOT:csrg:maps-spigot - org.spigotmc:spigot:1.20.1-R0.1-SNAPSHOT:jar:remapped-obf + org.spigotmc:minecraft-server:1.20.6-R0.1-SNAPSHOT:csrg:maps-spigot + org.spigotmc:spigot:1.20.6-R0.1-SNAPSHOT:jar:remapped-obf @@ -64,15 +64,15 @@ maven-compiler-plugin 3.8.1 - 17 - 17 + 21 + 21 org.apache.maven.plugins maven-shade-plugin - 3.3.0 + 3.6.0 ${project.build.directory}/dependency-reduced-pom.xml @@ -118,7 +118,7 @@ io.papermc.paper paper-api - 1.20-R0.1-SNAPSHOT + 1.20.6-R0.1-SNAPSHOT provided @@ -132,7 +132,7 @@ org.spigotmc spigot - 1.20.1-R0.1-SNAPSHOT + 1.20.6-R0.1-SNAPSHOT remapped-mojang provided @@ -154,7 +154,7 @@ org.projectlombok lombok - 1.18.24 + 1.18.32 @@ -177,7 +177,7 @@ com.zaxxer HikariCP - 2.4.1 + 5.1.0 co.aikar @@ -210,7 +210,7 @@ me.clip placeholderapi - 2.11.3 + 2.11.6 provided @@ -220,6 +220,12 @@ 1.7.0 provided + + + org.mariadb.jdbc + mariadb-java-client + 3.1.2 + diff --git a/src/main/java/me/makkuusen/timing/system/ApiUtilities.java b/src/main/java/me/makkuusen/timing/system/ApiUtilities.java index 0adef46d..6ecf4d38 100644 --- a/src/main/java/me/makkuusen/timing/system/ApiUtilities.java +++ b/src/main/java/me/makkuusen/timing/system/ApiUtilities.java @@ -12,7 +12,7 @@ import com.sk89q.worldedit.regions.Region; import me.makkuusen.timing.system.api.TimingSystemAPI; import me.makkuusen.timing.system.api.events.BoatSpawnEvent; -import me.makkuusen.timing.system.boat.v1_20_R1.BoatSpawner; +import me.makkuusen.timing.system.boat.v1_20_R4.BoatSpawner; import me.makkuusen.timing.system.boatutils.BoatUtilsManager; import me.makkuusen.timing.system.boatutils.BoatUtilsMode; import me.makkuusen.timing.system.database.TSDatabase; @@ -414,14 +414,14 @@ public static Boat spawnBoat(Location location, Boat.Type type, boolean isChestB Boat boat; if (isChestBoat) { - if (isServerVersion1_20_1()) { // TODO add option to turn off boat lag prevention + if (isServerVersion1_20_6()) { // TODO add option to turn off boat lag prevention boat = BoatSpawner.spawnChestBoat(location); } else { boat = (Boat) location.getWorld().spawnEntity(location, EntityType.CHEST_BOAT); } } else { - if (isServerVersion1_20_1()) { // TODO add option to turn off boat lag prevention + if (isServerVersion1_20_6()) { // TODO add option to turn off boat lag prevention boat = BoatSpawner.spawnBoat(location); } else { boat = (Boat) location.getWorld().spawnEntity(location, EntityType.BOAT); @@ -436,8 +436,8 @@ public static Boat spawnBoat(Location location, Boat.Type type, boolean isChestB return boat; } - private static boolean isServerVersion1_20_1() { - return Bukkit.getVersion().contains("1.20.1"); + private static boolean isServerVersion1_20_6() { + return Bukkit.getVersion().contains("1.20.6"); } public static Optional getSelection(Player player) { diff --git a/src/main/java/me/makkuusen/timing/system/Tasks.java b/src/main/java/me/makkuusen/timing/system/Tasks.java index 966ba459..8b4b8799 100644 --- a/src/main/java/me/makkuusen/timing/system/Tasks.java +++ b/src/main/java/me/makkuusen/timing/system/Tasks.java @@ -47,7 +47,7 @@ public void startParticleSpawner(TimingSystem plugin) { track.getTrackLocations().getLocations(TrackLocation.Type.GRID).forEach(location -> setParticles(player, location.getLocation(), Particle.WAX_OFF)); track.getTrackLocations().getLocations(TrackLocation.Type.QUALYGRID).forEach(location -> setParticles(player, location.getLocation(), Particle.WAX_ON)); track.getTrackLocations().getLocations(TrackLocation.Type.FINISH_TP).forEach(location -> setParticles(player, location.getLocation(), Particle.HEART)); - track.getTrackLocations().getLocations(TrackLocation.Type.FINISH_TP_ALL).forEach(location -> setParticles(player, location.getLocation(), Particle.VILLAGER_ANGRY)); + track.getTrackLocations().getLocations(TrackLocation.Type.FINISH_TP_ALL).forEach(location -> setParticles(player, location.getLocation(), Particle.ANGRY_VILLAGER)); } }, 0, 10); } @@ -215,13 +215,13 @@ private void setParticles(Player player, TrackRegion region) { } else if (region.getRegionType().equals(TrackRegion.RegionType.RESET)) { particle = Particle.WAX_ON; } else if (region.getRegionType().equals(TrackRegion.RegionType.START)) { - particle = Particle.VILLAGER_HAPPY; + particle = Particle.HAPPY_VILLAGER; } else if (region.getRegionType().equals(TrackRegion.RegionType.END)) { - particle = Particle.VILLAGER_ANGRY; + particle = Particle.ANGRY_VILLAGER; } else if (region.getRegionType().equals(TrackRegion.RegionType.PIT)) { particle = Particle.HEART; } else if (region.getRegionType().equals(TrackRegion.RegionType.INPIT)) { - particle = Particle.SPELL_WITCH; + particle = Particle.WITCH; } else { particle = Particle.WAX_OFF; } diff --git a/src/main/java/me/makkuusen/timing/system/boat/v1_20_R1/BoatSpawner.java b/src/main/java/me/makkuusen/timing/system/boat/v1_20_R4/BoatSpawner.java similarity index 86% rename from src/main/java/me/makkuusen/timing/system/boat/v1_20_R1/BoatSpawner.java rename to src/main/java/me/makkuusen/timing/system/boat/v1_20_R4/BoatSpawner.java index e692c595..53cd7371 100644 --- a/src/main/java/me/makkuusen/timing/system/boat/v1_20_R1/BoatSpawner.java +++ b/src/main/java/me/makkuusen/timing/system/boat/v1_20_R4/BoatSpawner.java @@ -1,11 +1,11 @@ -package me.makkuusen.timing.system.boat.v1_20_R1; +package me.makkuusen.timing.system.boat.v1_20_R4; import org.bukkit.Bukkit; import org.bukkit.Location; -import org.bukkit.craftbukkit.v1_20_R1.CraftServer; -import org.bukkit.craftbukkit.v1_20_R1.CraftWorld; -import org.bukkit.craftbukkit.v1_20_R1.entity.CraftBoat; -import org.bukkit.craftbukkit.v1_20_R1.entity.CraftChestBoat; +import org.bukkit.craftbukkit.v1_20_R4.CraftServer; +import org.bukkit.craftbukkit.v1_20_R4.CraftWorld; +import org.bukkit.craftbukkit.v1_20_R4.entity.CraftBoat; +import org.bukkit.craftbukkit.v1_20_R4.entity.CraftChestBoat; import org.bukkit.event.entity.CreatureSpawnEvent; import net.minecraft.server.level.ServerLevel; diff --git a/src/main/java/me/makkuusen/timing/system/boat/v1_20_R1/CollisionlessBoat.java b/src/main/java/me/makkuusen/timing/system/boat/v1_20_R4/CollisionlessBoat.java similarity index 88% rename from src/main/java/me/makkuusen/timing/system/boat/v1_20_R1/CollisionlessBoat.java rename to src/main/java/me/makkuusen/timing/system/boat/v1_20_R4/CollisionlessBoat.java index 21842c59..65ec6b21 100644 --- a/src/main/java/me/makkuusen/timing/system/boat/v1_20_R1/CollisionlessBoat.java +++ b/src/main/java/me/makkuusen/timing/system/boat/v1_20_R4/CollisionlessBoat.java @@ -1,4 +1,4 @@ -package me.makkuusen.timing.system.boat.v1_20_R1; +package me.makkuusen.timing.system.boat.v1_20_R4; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.vehicle.Boat; diff --git a/src/main/java/me/makkuusen/timing/system/boat/v1_20_R1/CollisionlessChestBoat.java b/src/main/java/me/makkuusen/timing/system/boat/v1_20_R4/CollisionlessChestBoat.java similarity index 92% rename from src/main/java/me/makkuusen/timing/system/boat/v1_20_R1/CollisionlessChestBoat.java rename to src/main/java/me/makkuusen/timing/system/boat/v1_20_R4/CollisionlessChestBoat.java index 98c7383b..e49cd895 100644 --- a/src/main/java/me/makkuusen/timing/system/boat/v1_20_R1/CollisionlessChestBoat.java +++ b/src/main/java/me/makkuusen/timing/system/boat/v1_20_R4/CollisionlessChestBoat.java @@ -1,4 +1,4 @@ -package me.makkuusen.timing.system.boat.v1_20_R1; +package me.makkuusen.timing.system.boat.v1_20_R4; import net.minecraft.world.entity.Entity; import net.minecraft.world.entity.EntityType; diff --git a/src/main/java/me/makkuusen/timing/system/database/MariaDBDatabase.java b/src/main/java/me/makkuusen/timing/system/database/MariaDBDatabase.java index a426f459..4191aab2 100644 --- a/src/main/java/me/makkuusen/timing/system/database/MariaDBDatabase.java +++ b/src/main/java/me/makkuusen/timing/system/database/MariaDBDatabase.java @@ -16,10 +16,11 @@ public boolean initialize() { String hostAndPort = config.getSqlHost() + ":" + config.getSqlPort(); PooledDatabaseOptions options = BukkitDB.getRecommendedOptions(TimingSystem.getPlugin(), config.getSqlUsername(), config.getSqlPassword(), config.getSqlDatabase(), hostAndPort); + + //Fix invalid MariaDB Options options.getOptions().setDsn("mariadb://" + hostAndPort + "/" + config.getSqlDatabase()); - options.setDataSourceProperties(new HashMap<>() {{ - put("useSSL", false); - }}); + //End Fix + options.setMinIdleConnections(5); options.setMaxConnections(5); co.aikar.idb.Database db = new HikariPooledDatabase(options); diff --git a/src/main/java/me/makkuusen/timing/system/gui/TrackFilter.java b/src/main/java/me/makkuusen/timing/system/gui/TrackFilter.java index de1a9537..809aac36 100644 --- a/src/main/java/me/makkuusen/timing/system/gui/TrackFilter.java +++ b/src/main/java/me/makkuusen/timing/system/gui/TrackFilter.java @@ -57,7 +57,7 @@ public boolean hasValidTags() { public ItemStack getItem(TPlayer tPlayer){ var item = new ItemBuilder(Material.HOPPER).setName(Text.get(tPlayer, Gui.FILTER_BY)).build(); ItemMeta im = getItemMeta(tPlayer, item); - im.addEnchant(Enchantment.LUCK, 1, true); + im.addEnchant(Enchantment.LUCK_OF_THE_SEA, 1, true); im.addItemFlags(ItemFlag.HIDE_ENCHANTS); im.addItemFlags(ItemFlag.HIDE_ARMOR_TRIM); im.addItemFlags(ItemFlag.HIDE_DYE);