From e9daa954737864b124e7b4d0d29f8fa24da70e22 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Mon, 11 Apr 2022 12:36:11 -0400 Subject: 1.4.0 initial --- pom.xml | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 56 insertions(+), 2 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 7e48a1c..d029bea 100644 --- a/pom.xml +++ b/pom.xml @@ -1,8 +1,11 @@ 4.0.0 net.tylermurphy HideAndSeek - 1.3.3 + 1.4.0 Hide and Seek Plugin + + UTF-8 + @@ -14,6 +17,50 @@ 8 + + org.apache.maven.plugins + maven-shade-plugin + 3.2.4 + + false + + + com.cryptomorin.xseries + net.tylermurphy.hideAndSeek.util.xseries + + + + + com.github.cryptomorin:XSeries + org.xerial:sqlite-jdbc + + + + + *:* + + META-INF/*.MF + com/cryptomorin/xseries/XBiome* + com/cryptomorin/xseries/NMSExtras* + com/cryptomorin/xseries/NoteBlockMusic* + com/cryptomorin/xseries/SkullCacheListener* + com/cryptomorin/xseries/XBlock* + com/cryptomorin/xseries/XEntity* + com/cryptomorin/xseries/particles/* + com/cryptomorin/xseries/messages/ActionBar* + + + + + + + package + + shade + + + + @@ -30,7 +77,7 @@ org.spigotmc spigot-api - 1.18.1-R0.1-SNAPSHOT + 1.9-R0.1-SNAPSHOT jar provided @@ -43,11 +90,18 @@ org.xerial sqlite-jdbc 3.36.0.3 + jar + provided org.jetbrains annotations 23.0.0 + + com.github.cryptomorin + XSeries + 8.7.1 + \ No newline at end of file -- cgit v1.2.3-freya From 8a011945d6e68b8e8dd44c247e66da3b3895199e Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Mon, 11 Apr 2022 12:38:03 -0400 Subject: pom fix --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index d029bea..2ca8916 100644 --- a/pom.xml +++ b/pom.xml @@ -77,7 +77,7 @@ org.spigotmc spigot-api - 1.9-R0.1-SNAPSHOT + 1.13-R0.1-SNAPSHOT jar provided -- cgit v1.2.3-freya From 3794537cf4435296253118bc4af84df57ae28836 Mon Sep 17 00:00:00 2001 From: Tyler Murphy Date: Wed, 13 Apr 2022 12:02:36 -0400 Subject: 1.4.0 rc2 --- pom.xml | 30 ++++++++++------------ .../hideAndSeek/configuration/Localization.java | 2 +- .../tylermurphy/hideAndSeek/database/Database.java | 20 +++++++++++---- .../hideAndSeek/database/PlayerInfoTable.java | 11 ++++++-- .../hideAndSeek/game/EventListener.java | 8 ++++-- 5 files changed, 45 insertions(+), 26 deletions(-) (limited to 'pom.xml') diff --git a/pom.xml b/pom.xml index 2ca8916..1d77b2c 100644 --- a/pom.xml +++ b/pom.xml @@ -26,31 +26,31 @@ com.cryptomorin.xseries - net.tylermurphy.hideAndSeek.util.xseries + net.tylermurphy.xseries - - com.github.cryptomorin:XSeries - org.xerial:sqlite-jdbc - + + org.spigotmc:spigot-api + com.comphenix.protocol:ProtocolLib + org.jetbrains:annotations + net.bytebuddy:byte-buddy + *:* META-INF/*.MF - com/cryptomorin/xseries/XBiome* - com/cryptomorin/xseries/NMSExtras* - com/cryptomorin/xseries/NoteBlockMusic* - com/cryptomorin/xseries/SkullCacheListener* - com/cryptomorin/xseries/XBlock* - com/cryptomorin/xseries/XEntity* - com/cryptomorin/xseries/particles/* - com/cryptomorin/xseries/messages/ActionBar* + sqlite-jdbc.properties + + + META-INF/services/java.sql.Driver + + @@ -89,9 +89,7 @@ org.xerial sqlite-jdbc - 3.36.0.3 - jar - provided + 3.7.2 org.jetbrains diff --git a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java index 07402d1..b93329f 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/configuration/Localization.java @@ -36,7 +36,7 @@ public class Localization { public static void loadLocalization() { - ConfigManager manager = new ConfigManager("localization.yml", "lang"+File.separator+"localization_"+Config.locale +".yml"); + ConfigManager manager = new ConfigManager("localization.yml", "lang/localization_"+Config.locale +".yml"); int PLUGIN_VERSION = manager.getDefaultInt("version"); int VERSION = manager.getInt("version"); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java b/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java index 9a0837b..8001368 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/database/Database.java @@ -21,6 +21,8 @@ package net.tylermurphy.hideAndSeek.database; import com.google.common.io.ByteStreams; import net.tylermurphy.hideAndSeek.Main; +import org.sqlite.SQLiteConfig; +import sun.font.ScriptRun; import java.io.ByteArrayInputStream; import java.io.File; @@ -30,6 +32,8 @@ import java.nio.ByteBuffer; import java.sql.Connection; import java.sql.DriverManager; import java.sql.SQLException; + +import java.sql.Statement; import java.util.UUID; public class Database { @@ -37,14 +41,15 @@ public class Database { private static final File databaseFile = new File(Main.data, "database.db"); public static PlayerInfoTable playerInfo; + private static SQLiteConfig config; protected static Connection connect() { Connection conn = null; try { String url = "jdbc:sqlite:"+databaseFile; - conn = DriverManager.getConnection(url); + conn = DriverManager.getConnection(url, config.toProperties()); } catch (SQLException e) { - System.out.println(e.getMessage()); + Main.plugin.getLogger().severe(e.getMessage()); } return conn; } @@ -71,10 +76,15 @@ public class Database { try { Class.forName("org.sqlite.JDBC"); } catch (ClassNotFoundException e) { - Main.plugin.getLogger().severe("Unable to load SQLite driver!"); - System.exit(-1); - return; + Main.plugin.getLogger().severe(e.getMessage()); + throw new RuntimeException(e.getMessage()); } + + config = new SQLiteConfig(); + config.setSynchronous(SQLiteConfig.SynchronousMode.NORMAL); + config.setTempStore(SQLiteConfig.TempStore.MEMORY); + playerInfo = new PlayerInfoTable(); } + } diff --git a/src/main/java/net/tylermurphy/hideAndSeek/database/PlayerInfoTable.java b/src/main/java/net/tylermurphy/hideAndSeek/database/PlayerInfoTable.java index e859687..7b9b476 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/database/PlayerInfoTable.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/database/PlayerInfoTable.java @@ -20,8 +20,10 @@ package net.tylermurphy.hideAndSeek.database; import net.tylermurphy.hideAndSeek.Main; +import net.tylermurphy.hideAndSeek.configuration.Config; import net.tylermurphy.hideAndSeek.util.WinType; +import java.io.ByteArrayInputStream; import java.io.IOException; import java.io.InputStream; import java.sql.*; @@ -42,7 +44,7 @@ public class PlayerInfoTable { + ");"; try(Connection connection = Database.connect(); Statement statement = connection.createStatement()){ - statement.execute(sql); + statement.executeUpdate(sql); } catch (SQLException e){ Main.plugin.getLogger().severe("SQL Error: " + e.getMessage()); } @@ -59,6 +61,8 @@ public class PlayerInfoTable { statement.setBytes(1, bytes); ResultSet rs = statement.executeQuery(); if(rs.next()){ + rs.close(); + connection.close(); return new PlayerInfo( uuid, rs.getInt("wins"), @@ -67,6 +71,7 @@ public class PlayerInfoTable { rs.getInt("games_played") ); } + rs.close(); } catch (SQLException e){ Main.plugin.getLogger().severe("SQL Error: " + e.getMessage()); } catch (IOException e) { @@ -84,7 +89,7 @@ public class PlayerInfoTable { List infoList = new ArrayList<>(); while(rs.next()){ PlayerInfo info = new PlayerInfo( - Database.convertBinaryStream(rs.getBinaryStream("uuid")), + Database.convertBinaryStream(new ByteArrayInputStream(rs.getBytes("uuid"))), rs.getInt("wins"), rs.getInt("seeker_wins"), rs.getInt("hider_wins"), @@ -92,6 +97,8 @@ public class PlayerInfoTable { ); infoList.add(info); } + rs.close(); + connection.close(); return infoList; } catch (SQLException e){ Main.plugin.getLogger().severe("SQL Error: " + e.getMessage()); diff --git a/src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java b/src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java index 698d650..aab55d4 100644 --- a/src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java +++ b/src/main/java/net/tylermurphy/hideAndSeek/game/EventListener.java @@ -271,9 +271,13 @@ public class EventListener implements Listener { } } } + String[] temp = array[0].split(":"); for(String handle : blockedCommands){ - System.out.println(handle); - if(array[0].substring(1).equalsIgnoreCase(handle) && Board.isPlayer(player) && Game.status != Status.STANDBY){ + if( + array[0].substring(1).equalsIgnoreCase(handle) && Board.isPlayer(player) && + temp[temp.length-1].substring(1).equalsIgnoreCase(handle) && Board.isPlayer(player) && + Game.status != Status.STANDBY + ) { player.sendMessage(errorPrefix + message("BLOCKED_COMMAND")); event.setCancelled(true); break; -- cgit v1.2.3-freya