From 12e8d3593da473a6a0cf6505c616797c4d69512a Mon Sep 17 00:00:00 2001 From: sky Date: Wed, 6 May 2020 02:07:05 +0800 Subject: [PATCH] Update --- .../common/listener/ListenerCommand.java | 12 ++++++ .../taboolib/common/loader/StartupLoader.java | 4 +- .../taboolib/module/db/local/LocalPlayer.java | 39 ++++++++++--------- 3 files changed, 34 insertions(+), 21 deletions(-) diff --git a/src/main/scala/io/izzel/taboolib/common/listener/ListenerCommand.java b/src/main/scala/io/izzel/taboolib/common/listener/ListenerCommand.java index 8d0f7c1..5bb1524 100644 --- a/src/main/scala/io/izzel/taboolib/common/listener/ListenerCommand.java +++ b/src/main/scala/io/izzel/taboolib/common/listener/ListenerCommand.java @@ -4,6 +4,7 @@ import com.google.common.collect.Lists; import io.izzel.taboolib.TabooLib; import io.izzel.taboolib.TabooLibAPI; import io.izzel.taboolib.common.loader.Startup; +import io.izzel.taboolib.common.loader.StartupLoader; import io.izzel.taboolib.module.ai.SimpleAiSelector; import io.izzel.taboolib.module.command.lite.CommandBuilder; import io.izzel.taboolib.module.db.local.Local; @@ -22,6 +23,7 @@ import io.izzel.taboolib.util.item.Items; import io.izzel.taboolib.util.lite.Signs; import org.bukkit.Bukkit; import org.bukkit.Location; +import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.entity.Player; import org.bukkit.entity.Skeleton; import org.bukkit.event.EventHandler; @@ -41,6 +43,10 @@ import java.util.stream.Collectors; @TListener public class ListenerCommand implements Listener { + static { + StartupLoader.register(ListenerCommand.class); + } + abstract static class Module { abstract public String[] name(); @@ -175,6 +181,12 @@ public class ListenerCommand implements Listener { @Override public void run(Player player) { TellrawJson.create().append("§8[§fTabooLib§8] §7LocalPlayer: ").append("§c[...]").hoverText(LocalPlayer.get(player).saveToString()).send(player); + long time = System.currentTimeMillis(); + FileConfiguration conf = LocalPlayer.get0(player); + player.sendMessage("§8[§fTabooLib§8] §7get: " + (System.currentTimeMillis() - time) + "ms"); + time = System.currentTimeMillis(); + LocalPlayer.set0(player, conf); + player.sendMessage("§8[§fTabooLib§8] §7set: " + (System.currentTimeMillis() - time) + "ms"); } }); diff --git a/src/main/scala/io/izzel/taboolib/common/loader/StartupLoader.java b/src/main/scala/io/izzel/taboolib/common/loader/StartupLoader.java index 1dbfcf7..41ed629 100644 --- a/src/main/scala/io/izzel/taboolib/common/loader/StartupLoader.java +++ b/src/main/scala/io/izzel/taboolib/common/loader/StartupLoader.java @@ -2,7 +2,7 @@ package io.izzel.taboolib.common.loader; import com.google.common.collect.Lists; import io.izzel.taboolib.TabooLib; -import io.izzel.taboolib.common.listener.ListenerCommand; +import io.izzel.taboolib.module.db.local.LocalPlayer; import io.izzel.taboolib.module.inject.TInjectHelper; import java.lang.annotation.Annotation; @@ -19,7 +19,7 @@ public class StartupLoader { static List> classList = Lists.newArrayList(); static { - StartupLoader.register(ListenerCommand.class); + StartupLoader.register(LocalPlayer.class); } public static void register(Class clazz) { diff --git a/src/main/scala/io/izzel/taboolib/module/db/local/LocalPlayer.java b/src/main/scala/io/izzel/taboolib/module/db/local/LocalPlayer.java index 4a69915..c694eff 100644 --- a/src/main/scala/io/izzel/taboolib/module/db/local/LocalPlayer.java +++ b/src/main/scala/io/izzel/taboolib/module/db/local/LocalPlayer.java @@ -3,7 +3,6 @@ package io.izzel.taboolib.module.db.local; import com.google.common.collect.Maps; import io.izzel.taboolib.TabooLib; import io.izzel.taboolib.common.loader.Startup; -import io.izzel.taboolib.common.loader.StartupLoader; import io.izzel.taboolib.module.db.IHost; import io.izzel.taboolib.module.db.source.DBSource; import io.izzel.taboolib.module.db.sql.SQLTable; @@ -21,6 +20,8 @@ import java.nio.charset.StandardCharsets; import java.util.Base64; import java.util.Map; import java.util.UUID; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; /** * @Author 坏黑 @@ -28,32 +29,25 @@ import java.util.UUID; */ public class LocalPlayer { - static { - StartupLoader.register(LocalPlayer.class); - } - private static final Map files = Maps.newConcurrentMap(); + private static final ExecutorService executor = Executors.newSingleThreadExecutor(); private static IHost host; private static SQLTable table; private static DataSource dataSource; @Startup.Starting public static void init() { - host = new SQLiteHost(new File(LocalPlayer.getFolder(), "v2/data.db"), TabooLib.getPlugin()); + host = new SQLiteHost(Files.file(LocalPlayer.getFolder(), "v2/data.db"), TabooLib.getPlugin()); table = new SQLTable("player_data"); try { dataSource = DBSource.create(host); - table.executeUpdate("create table if not exists player_data (id integer not null primary key autoincrement, name text not null primary key, data text)").dataSource(dataSource).run(); + table.executeUpdate("create table if not exists player_data (name text primary key, data text)").dataSource(dataSource).run(); } catch (Throwable t) { t.printStackTrace(); } } - public static synchronized boolean find0(OfflinePlayer player) { - return table.select(Where.equals("name", LocalPlayer.toName(player))).find(dataSource); - } - - public static synchronized FileConfiguration get0(OfflinePlayer player) { + public static FileConfiguration get0(OfflinePlayer player) { File file = toFile(toName(player)); if (file.exists()) { try { @@ -63,15 +57,22 @@ public class LocalPlayer { Files.deepDelete(file); } } - return table.select(Where.equals("name", LocalPlayer.toName(player))).to(dataSource).resultNext(r -> SecuredFile.loadConfiguration(new String(Base64.getDecoder().decode(r.getString("data")), StandardCharsets.UTF_8))).run(new SecuredFile(), SecuredFile.class); + try { + return executor.submit(() -> table.select(Where.equals("name", LocalPlayer.toName(player))).to(dataSource).resultNext(r -> SecuredFile.loadConfiguration(new String(Base64.getDecoder().decode(r.getString("data")), StandardCharsets.UTF_8))).run(new SecuredFile(), SecuredFile.class)).get(); + } catch (Throwable t) { + t.printStackTrace(); + } + return new SecuredFile(); } - public static synchronized void set0(OfflinePlayer player, FileConfiguration data) { - if (find0(player)) { - table.update(Where.equals("name", LocalPlayer.toName(player))).set("data", Base64.getEncoder().encodeToString(data.saveToString().getBytes(StandardCharsets.UTF_8))).run(dataSource); - } else { - table.insert(null, LocalPlayer.toName(player), Base64.getEncoder().encodeToString(data.saveToString().getBytes(StandardCharsets.UTF_8))).run(dataSource); - } + public static void set0(OfflinePlayer player, FileConfiguration data) { + executor.submit(() -> { + if (table.select(Where.equals("name", LocalPlayer.toName(player))).find(dataSource)) { + table.update(Where.equals("name", LocalPlayer.toName(player))).set("data", Base64.getEncoder().encodeToString(data.saveToString().getBytes(StandardCharsets.UTF_8))).run(dataSource); + } else { + table.insert(LocalPlayer.toName(player), Base64.getEncoder().encodeToString(data.saveToString().getBytes(StandardCharsets.UTF_8))).run(dataSource); + } + }); } public static FileConfiguration get(OfflinePlayer player) {