MiniDay/hamster-core
1
0
Fork 0
Code Issues Pull Requests Actions Releases 8 Activity

feat: 移除 redission，格式化代码

Browse Source
This commit is contained in:
叁只仓鼠
2023-08-20 16:46:40 +08:00
parent 0768161203
commit 9e6d39469d
11 changed files with 12 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core-bukkit/build.gradle.kts
View File

@@ -38,12 +38,6 @@ dependencies {
implementation("com.zaxxer:HikariCP:${hikariVersion}") { implementation("com.zaxxer:HikariCP:${hikariVersion}") {
exclude(group = "org.slf4j") exclude(group = "org.slf4j")
} }
val redissionVersion = property("redission_version")
implementation("org.redisson:redisson:${redissionVersion}") {
exclude(group = "io.netty")
exclude(group = "org.yaml")
exclude(group = "org.slf4j")
}
} }
tasks { tasks {

4
core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/HamsterCorePlugin.java
View File

@@ -13,9 +13,9 @@ import cn.hamster3.mc.plugin.core.bukkit.page.listener.PageListener;
import cn.hamster3.mc.plugin.core.bukkit.util.serializer.ItemStackAdapter; import cn.hamster3.mc.plugin.core.bukkit.util.serializer.ItemStackAdapter;
import cn.hamster3.mc.plugin.core.bukkit.util.serializer.PotionEffectAdapter; import cn.hamster3.mc.plugin.core.bukkit.util.serializer.PotionEffectAdapter;
import cn.hamster3.mc.plugin.core.common.data.DisplayMessage; import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
import cn.hamster3.mc.plugin.core.common.util.CoreUtils;
import cn.hamster3.mc.plugin.core.common.util.serializer.ComponentTypeAdapter; import cn.hamster3.mc.plugin.core.common.util.serializer.ComponentTypeAdapter;
import cn.hamster3.mc.plugin.core.common.util.serializer.MessageTypeAdapter; import cn.hamster3.mc.plugin.core.common.util.serializer.MessageTypeAdapter;
import cn.hamster3.mc.plugin.core.common.util.CoreUtils;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import net.kyori.adventure.platform.bukkit.BukkitAudiences; import net.kyori.adventure.platform.bukkit.BukkitAudiences;
import net.kyori.adventure.text.Component; import net.kyori.adventure.text.Component;
@@ -91,6 +91,8 @@ public class HamsterCorePlugin extends JavaPlugin {
Logger logger = getLogger(); Logger logger = getLogger();
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
logger.info("仓鼠核心正在关闭..."); logger.info("仓鼠核心正在关闭...");
CoreBukkitAPI.getInstance().getDataSource().close();
logger.info("已关闭数据库连接池.");
CoreUtils.WORKER_EXECUTOR.shutdownNow(); CoreUtils.WORKER_EXECUTOR.shutdownNow();
logger.info("已暂停 WORKER_EXECUTOR."); logger.info("已暂停 WORKER_EXECUTOR.");
CoreUtils.SCHEDULED_EXECUTOR.shutdownNow(); CoreUtils.SCHEDULED_EXECUTOR.shutdownNow();

28
core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/api/CoreBukkitAPI.java
View File

@@ -8,20 +8,10 @@ import net.kyori.adventure.platform.bukkit.BukkitAudiences;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;
import org.bukkit.configuration.file.FileConfiguration; import org.bukkit.configuration.file.FileConfiguration;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.redisson.Redisson;
import org.redisson.api.RedissonClient;
import org.redisson.config.Config;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
import java.util.Objects;
@SuppressWarnings("unused") @SuppressWarnings("unused")
public final class CoreBukkitAPI extends CoreAPI { public final class CoreBukkitAPI extends CoreAPI {
private final HikariDataSource datasource; private final HikariDataSource datasource;
private final RedissonClient redissonClient;
private CoreBukkitAPI() { private CoreBukkitAPI() {
HamsterCorePlugin plugin = HamsterCorePlugin.getInstance(); HamsterCorePlugin plugin = HamsterCorePlugin.getInstance();
@@ -48,19 +38,6 @@ public final class CoreBukkitAPI extends CoreAPI {
hikariConfig.setValidationTimeout(datasourceConfig.getLong("validation-timeout", 5000)); hikariConfig.setValidationTimeout(datasourceConfig.getLong("validation-timeout", 5000));
hikariConfig.setPoolName("HamsterCore-Pool"); hikariConfig.setPoolName("HamsterCore-Pool");
datasource = new HikariDataSource(hikariConfig); datasource = new HikariDataSource(hikariConfig);
File file = new File(plugin.getDataFolder(), "redission.yml");
try {
if (!file.exists()) {
Files.copy(
Objects.requireNonNull(plugin.getResource("redission.yml")),
file.toPath(), StandardCopyOption.REPLACE_EXISTING
);
}
redissonClient = Redisson.create(Config.fromYAML(file));
} catch (IOException e) {
throw new RuntimeException("redis 连接加载失败!", e);
}
} }
public static CoreBukkitAPI getInstance() { public static CoreBukkitAPI getInstance() {
@@ -83,9 +60,4 @@ public final class CoreBukkitAPI extends CoreAPI {
public @NotNull HikariDataSource getDataSource() { public @NotNull HikariDataSource getDataSource() {
return datasource; return datasource;
} }
@Override
public @NotNull RedissonClient getRedissonClient() {
return redissonClient;
}
} }

8
core-bukkit/src/main/java/cn/hamster3/mc/plugin/core/bukkit/page/handler/PageableHandler.java
View File

@@ -60,6 +60,10 @@ public abstract class PageableHandler<E> extends FixedPageHandler {
return elementButtonName; return elementButtonName;
} }
public void setElementButtonName(String elementButtonName) {
this.elementButtonName = elementButtonName;
}
@NotNull @NotNull
public String getElementButtonName(@NotNull E element) { public String getElementButtonName(@NotNull E element) {
return elementButtonName; return elementButtonName;
@@ -218,8 +222,4 @@ public abstract class PageableHandler<E> extends FixedPageHandler {
public void setBarrierButtonName(String barrierButtonName) { public void setBarrierButtonName(String barrierButtonName) {
this.barrierButtonName = barrierButtonName; this.barrierButtonName = barrierButtonName;
} }
public void setElementButtonName(String elementButtonName) {
this.elementButtonName = elementButtonName;
}
} }

6
core-bungeecord/build.gradle.kts
View File

@@ -31,12 +31,6 @@ dependencies {
implementation("com.zaxxer:HikariCP:${hikariVersion}") { implementation("com.zaxxer:HikariCP:${hikariVersion}") {
exclude(group = "org.slf4j") exclude(group = "org.slf4j")
} }
val redissionVersion = property("redission_version")
implementation("org.redisson:redisson:${redissionVersion}") {
exclude(group = "io.netty")
exclude(group = "org.yaml")
exclude(group = "org.slf4j")
}
} }
tasks { tasks {

2
core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/HamsterCorePlugin.java
View File

@@ -43,6 +43,8 @@ public class HamsterCorePlugin extends Plugin {
Logger logger = getLogger(); Logger logger = getLogger();
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
logger.info("仓鼠核心正在关闭..."); logger.info("仓鼠核心正在关闭...");
CoreBungeeAPI.getInstance().getDataSource().close();
logger.info("已关闭数据库连接池.");
CoreUtils.WORKER_EXECUTOR.shutdownNow(); CoreUtils.WORKER_EXECUTOR.shutdownNow();
logger.info("已暂停 WORKER_EXECUTOR."); logger.info("已暂停 WORKER_EXECUTOR.");
CoreUtils.SCHEDULED_EXECUTOR.shutdownNow(); CoreUtils.SCHEDULED_EXECUTOR.shutdownNow();

28
core-bungeecord/src/main/java/cn/hamster3/mc/plugin/core/bungee/api/CoreBungeeAPI.java
View File

@@ -8,19 +8,10 @@ import com.zaxxer.hikari.HikariDataSource;
import net.kyori.adventure.platform.AudienceProvider; import net.kyori.adventure.platform.AudienceProvider;
import net.md_5.bungee.config.Configuration; import net.md_5.bungee.config.Configuration;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.redisson.Redisson;
import org.redisson.api.RedissonClient;
import org.redisson.config.Config;
import java.io.File;
import java.io.IOException;
import java.nio.file.Files;
import java.nio.file.StandardCopyOption;
@SuppressWarnings("unused") @SuppressWarnings("unused")
public final class CoreBungeeAPI extends CoreAPI { public final class CoreBungeeAPI extends CoreAPI {
private final HikariDataSource datasource; private final HikariDataSource datasource;
private final RedissonClient redissonClient;
private CoreBungeeAPI() { private CoreBungeeAPI() {
HamsterCorePlugin plugin = HamsterCorePlugin.getInstance(); HamsterCorePlugin plugin = HamsterCorePlugin.getInstance();
@@ -47,20 +38,6 @@ public final class CoreBungeeAPI extends CoreAPI {
hikariConfig.setValidationTimeout(datasourceConfig.getLong("validation-timeout", 5000)); hikariConfig.setValidationTimeout(datasourceConfig.getLong("validation-timeout", 5000));
hikariConfig.setPoolName("HamsterCore-Pool"); hikariConfig.setPoolName("HamsterCore-Pool");
datasource = new HikariDataSource(hikariConfig); datasource = new HikariDataSource(hikariConfig);
File file = new File(plugin.getDataFolder(), "redission.yml");
try {
if (!file.exists()) {
Files.copy(
plugin.getResourceAsStream("redission.yml"),
file.toPath(), StandardCopyOption.REPLACE_EXISTING
);
}
redissonClient = Redisson.create(Config.fromYAML(file));
} catch (IOException e) {
throw new RuntimeException("redis 连接加载失败!", e);
}
} }
public static CoreBungeeAPI getInstance() { public static CoreBungeeAPI getInstance() {
@@ -83,9 +60,4 @@ public final class CoreBungeeAPI extends CoreAPI {
public @NotNull HikariDataSource getDataSource() { public @NotNull HikariDataSource getDataSource() {
return datasource; return datasource;
} }
@Override
public @NotNull RedissonClient getRedissonClient() {
return redissonClient;
}
} }

7
core-common/build.gradle.kts
View File

@@ -25,13 +25,6 @@ dependencies {
implementation("net.kyori:adventure-text-serializer-legacy:${adventureSerializerVersion}") { implementation("net.kyori:adventure-text-serializer-legacy:${adventureSerializerVersion}") {
exclude(group = "org.jetbrains") exclude(group = "org.jetbrains")
} }
val redissionVersion = property("redission_version")
implementation("org.redisson:redisson:${redissionVersion}") {
exclude(group = "io.netty")
exclude(group = "org.yaml")
exclude(group = "org.slf4j")
}
} }
tasks { tasks {

4
core-common/src/main/java/cn/hamster3/mc/plugin/core/common/api/CoreAPI.java
View File

@@ -2,7 +2,6 @@ package cn.hamster3.mc.plugin.core.common.api;
import net.kyori.adventure.platform.AudienceProvider; import net.kyori.adventure.platform.AudienceProvider;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.redisson.api.RedissonClient;
import javax.sql.DataSource; import javax.sql.DataSource;
import java.sql.Connection; import java.sql.Connection;
@@ -26,7 +25,4 @@ public abstract class CoreAPI {
public Connection getConnection() throws SQLException { public Connection getConnection() throws SQLException {
return getDataSource().getConnection(); return getDataSource().getConnection();
} }
@NotNull
public abstract RedissonClient getRedissonClient();
} }

2
core-common/src/main/java/cn/hamster3/mc/plugin/core/common/util/CoreUtils.java
View File

@@ -1,9 +1,9 @@
package cn.hamster3.mc.plugin.core.common.util; package cn.hamster3.mc.plugin.core.common.util;
import cn.hamster3.mc.plugin.core.common.data.DisplayMessage; import cn.hamster3.mc.plugin.core.common.data.DisplayMessage;
import cn.hamster3.mc.plugin.core.common.thread.NamedThreadFactory;
import cn.hamster3.mc.plugin.core.common.util.serializer.ComponentTypeAdapter; import cn.hamster3.mc.plugin.core.common.util.serializer.ComponentTypeAdapter;
import cn.hamster3.mc.plugin.core.common.util.serializer.MessageTypeAdapter; import cn.hamster3.mc.plugin.core.common.util.serializer.MessageTypeAdapter;
import cn.hamster3.mc.plugin.core.common.thread.NamedThreadFactory;
import com.google.gson.Gson; import com.google.gson.Gson;
import com.google.gson.GsonBuilder; import com.google.gson.GsonBuilder;
import com.google.gson.JsonObject; import com.google.gson.JsonObject;

1
gradle.properties
View File

@@ -2,4 +2,3 @@ org.gradle.jvmargs=-Xmx2G
adventure_version=4.3.0 adventure_version=4.3.0
adventure_serializer_version=4.14.0 adventure_serializer_version=4.14.0
HikariCP_version=4.0.3 HikariCP_version=4.0.3
redission_version=3.23.2