Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,8 @@ tasks.withType<Javadoc> {
}

tasks.shadowJar {
exclude("org/jetbrains/annotations/**")
archiveClassifier = ""

relocationPrefix = "$group.plotsystem.shaded"
relocationPrefix = "com.alpsbte.plotsystem.shaded"
enableAutoRelocation = true
}

Expand Down
29 changes: 15 additions & 14 deletions gradle/libs.versions.toml
Original file line number Diff line number Diff line change
@@ -1,25 +1,26 @@
# This file was generated by the Gradle 'init' task.
# https://docs.gradle.org/current/userguide/platforms.html#sub::toml-dependencies-format

[versions]
com-alpsbte-alpslib-alpslib-hologram = "1.1.1" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/alpslib/alpslib-hologram/
com-alpsbte-alpslib-alpslib-io = "1.2.0" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/alpslib/alpslib-io/
com-alpsbte-alpslib-alpslib-utils = "1.3.6" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/alpslib/alpslib-utils/
# Dependencies
com-alpsbte-alpslib-alpslib-hologram = "1.1.2" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/alpslib/alpslib-hologram/
com-alpsbte-alpslib-alpslib-io = "1.2.3" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/alpslib/alpslib-io/
com-alpsbte-alpslib-alpslib-utils = "1.4.1" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/alpslib/alpslib-utils/
com-alpsbte-canvas = "1.3" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/com/alpsbte/canvas/
com-arcaniax-headdatabase-api = "1.3.2" # https://github.com/Arcaniax-Development/HeadDatabase-API/releases
com-github-decentsoftware-eu-decentholograms = "2.9.9" # https://github.com/DecentSoftware-eu/DecentHolograms/releases
com-github-fierioziy-particlenativeapi-particlenativeapi-plugin = "3.3.2" # https://github.com/Fierioziy/ParticleNativeAPI/releases - we are stuck at v3 for now. Need to migrate some time or remove it
multiverse-core = "5.5.1" # https://github.com/Multiverse/Multiverse-Core/releases
com-sk89q-worldguard-worldguard-bukkit = "7.0.15" # https://maven.enginehub.org/ui/packages/gav:%2F%2Fcom.sk89q.worldguard:worldguard-bukkit?name=com.sk89q.worldguard&type=packages
com-zaxxer-hikaricp = "7.0.2" # https://github.com/brettwooldridge/HikariCP/tags
commons-io-commons-io = "2.20.0" # https://central.sonatype.com/artifact/commons-io/commons-io - provided by Paper
de-oliver-fancynpcs = "2.9.0" # https://repo.fancyinnovations.com/#/releases/de/oliver/FancyNpcs
io-papermc-paper-paper-api = "1.21.11-R0.1-SNAPSHOT"
li-cinnazeyy-langlibs-api = "1.5.1" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/li/cinnazeyy/LangLibs-API/
org-mariadb-jdbc-mariadb-java-client = "3.5.7" # https://central.sonatype.com/artifact/org.mariadb.jdbc/mariadb-java-client
multiverse-core = "5.5.2" # https://repo.onarandombox.com/#/multiverse-releases/org/mvplugins/multiverse/core/multiverse-core
com-sk89q-worldguard-worldguard-bukkit = "7.0.15" # https://maven.enginehub.org/repo/com/sk89q/worldguard/worldguard-bukkit/
com-zaxxer-hikaricp = "6.3.0" # https://github.com/brettwooldridge/HikariCP/tags
commons-io-commons-io = "2.20.0" # Provided by Minecraft (Libs folder)
de-oliver-fancynpcs = "2.9.2" # https://fancyspaces.net/spaces/fancynpcs/maven-repos/fi-releases/de.oliver:FancyNpcs
io-papermc-paper-paper-api = "1.21.11-R0.1-SNAPSHOT" # https://artifactory.papermc.io/ui/native/universe/io/papermc/paper/paper-api/
li-cinnazeyy-langlibs-api = "1.5.2" # https://mvn.alps-bte.com/service/rest/repository/browse/alps-bte/li/cinnazeyy/LangLibs-API/
org-mariadb-jdbc-mariadb-java-client = "3.5.7" # https://central.sonatype.com/artifact/org.mariadb.jdbc/mariadb-java-client
com-intellectualsites-bom-bom-newest = "1.55" # Ref: https://github.com/IntellectualSites/bom
git-version = "4.3.0" # https://github.com/palantir/gradle-git-version/releases
# Plugins
shadow = "9.3.1" # https://github.com/GradleUp/shadow/releases
git-version = "4.3.0" # https://github.com/palantir/gradle-git-version/releases

[libraries]
com-alpsbte-alpslib-alpslib-hologram = { module = "com.alpsbte.alpslib:alpslib-hologram", version.ref = "com-alpsbte-alpslib-alpslib-hologram" }
Expand All @@ -41,4 +42,4 @@ com-intellectualsites-bom-bom-newest = { module = "com.intellectualsites.bom:bom

[plugins]
git-version = { id = "com.palantir.git-version", version.ref = "git-version" }
shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
272 changes: 0 additions & 272 deletions pom.xml

This file was deleted.

6 changes: 4 additions & 2 deletions src/main/java/com/alpsbte/plotsystem/PlotSystem.java
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,10 @@ public static PlotSystem getPlugin() {
return plugin;
}

public void initDatabase() throws IOException, SQLException, ClassNotFoundException {
DatabaseConnection.initializeDatabase(DatabaseConfigPaths.getConfig(getConfig()), true);
public void initDatabase() throws IOException, SQLException, RuntimeException {
// We currently want to save everything in UTC to have no mismatch, because CURRENT_TIMESTAMP uses UTC + DateTime doesn't support timezones (we would have to use TIMESTAMP)
// These url parameters align behaviour (at least on linux)
DatabaseConnection.initializeDatabase(DatabaseConfigPaths.getConfig(getConfig()), true, "serverTimezone=UTC&forceConnectionTimeZoneToSession=true");
var initScript = CharStreams.toString(Objects.requireNonNull(getTextResource("DATABASE.sql")));
try (var con = DatabaseConnection.getConnection(); var s = con.createStatement()) {
s.execute(initScript);
Expand Down
8 changes: 5 additions & 3 deletions src/main/java/com/alpsbte/plotsystem/core/EventListener.java
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@

public class EventListener implements Listener {
@EventHandler
public void onPlayerJoinEvent(PlayerJoinEvent event) {
public void onPlayerJoinEvent(@NotNull PlayerJoinEvent event) {
Player player = event.getPlayer();

// Add Items
Expand Down Expand Up @@ -141,8 +141,10 @@ public void onPlayerQuitEvent(@NotNull PlayerQuitEvent event) {
plotWorld.unloadWorld(false);
}, 60L);

PlotUtils.plotReminder.get(event.getPlayer().getUniqueId()).cancel();
PlotUtils.plotReminder.remove(event.getPlayer().getUniqueId());
if (PlotUtils.plotReminder.containsKey(event.getPlayer().getUniqueId())) {
PlotUtils.plotReminder.get(event.getPlayer().getUniqueId()).cancel();
PlotUtils.plotReminder.remove(event.getPlayer().getUniqueId());
}
}

@EventHandler
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,7 @@
import java.sql.Date;
import java.sql.ResultSet;
import java.sql.Timestamp;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.Instant;
import java.util.Deque;
import java.util.HashMap;
import java.util.LinkedList;
Expand Down Expand Up @@ -65,7 +64,7 @@ public boolean setStageId(int tutorialId, String playerUUID, int stageId) {
String qSetStage = "UPDATE tutorial SET stage_id = ?, last_stage_complete_date = ? WHERE tutorial_id = ? AND uuid = ?;";
return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qSetStage, ps -> {
ps.setInt(1, stageId);
ps.setObject(2, LocalDate.now());
ps.setTimestamp(2, Timestamp.from(Instant.now()));
ps.setInt(3, tutorialId);
ps.setString(4, playerUUID);
return ps.executeUpdate() > 0;
Expand All @@ -76,7 +75,8 @@ public boolean setComplete(int tutorialId, String playerUUID) {
String qSetComplete = "UPDATE tutorial SET is_complete = ?, last_stage_complete_date = ? WHERE tutorial_id = ? AND uuid = ?;";
return Boolean.TRUE.equals(Utils.handleSqlException(false, () -> SqlHelper.runQuery(qSetComplete, ps -> {
ps.setBoolean(1, true);
ps.setObject(2, Timestamp.valueOf(LocalDateTime.now()));

ps.setTimestamp(2, Timestamp.from(Instant.now()));
ps.setInt(3, tutorialId);
ps.setString(4, playerUUID);
return ps.executeUpdate() > 0;
Expand Down
Loading