Compare commits
5 Commits
1.0.0-SNAP
...
1.0.3-fix2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5f4600546e | ||
|
|
f4ab43bcb8 | ||
|
|
542884dfe9 | ||
|
|
2e80b57a53 | ||
|
|
4141bcdfb1 |
7
pom.xml
7
pom.xml
@@ -6,7 +6,7 @@
|
||||
|
||||
<groupId>net.limework.core</groupId>
|
||||
<artifactId>LimeworkSpigotCore</artifactId>
|
||||
<version>1.0.0-SNAPSHOT</version>
|
||||
<version>1.0.3-fix2-SNAPSHOT</version>
|
||||
<packaging>jar</packaging>
|
||||
|
||||
<build>
|
||||
@@ -112,5 +112,10 @@
|
||||
<version>19.0.0</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
<groupId>org.mongodb</groupId>
|
||||
<artifactId>mongodb-driver-sync</artifactId>
|
||||
<version>4.0.4</version>
|
||||
</dependency>
|
||||
</dependencies>
|
||||
</project>
|
||||
@@ -2,6 +2,7 @@ package net.limework.core;
|
||||
|
||||
import net.limework.core.guis.ControlGui;
|
||||
import net.limework.core.hooks.SkriptHook;
|
||||
import net.limework.core.managers.DataSourcesManager;
|
||||
import net.limework.core.managers.RedisManager;
|
||||
import org.bukkit.plugin.java.JavaPlugin;
|
||||
|
||||
@@ -10,11 +11,15 @@ public class LimeworkSpigotCore extends JavaPlugin {
|
||||
//Redis manager
|
||||
private RedisManager rm;
|
||||
|
||||
//data
|
||||
private DataSourcesManager dsm;
|
||||
|
||||
|
||||
@Override
|
||||
public void onEnable() {
|
||||
saveDefaultConfig();
|
||||
rm = new RedisManager(this);
|
||||
getServer().getPluginCommand("reloadredis").setExecutor(rm);
|
||||
if (getServer().getPluginManager().getPlugin("Skript") != null) {
|
||||
new SkriptHook(this);
|
||||
} else {
|
||||
@@ -29,6 +34,9 @@ public class LimeworkSpigotCore extends JavaPlugin {
|
||||
getLogger().info("SOMETHING WENT WRONG WHEN LOADING control gui.");
|
||||
e.printStackTrace();
|
||||
}
|
||||
dsm = new DataSourcesManager(this);
|
||||
|
||||
|
||||
|
||||
|
||||
}
|
||||
@@ -36,10 +44,15 @@ public class LimeworkSpigotCore extends JavaPlugin {
|
||||
@Override
|
||||
public void onDisable() {
|
||||
rm.shutdown();
|
||||
dsm.shutdown();
|
||||
}
|
||||
|
||||
|
||||
public RedisManager getRm() {
|
||||
return rm;
|
||||
}
|
||||
|
||||
public DataSourcesManager getDsm() {
|
||||
return dsm;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,29 @@
|
||||
package net.limework.core.managers;
|
||||
|
||||
import com.mongodb.client.MongoClient;
|
||||
import com.mongodb.client.MongoClients;
|
||||
import net.limework.core.LimeworkSpigotCore;
|
||||
import org.bukkit.configuration.Configuration;
|
||||
|
||||
public class DataSourcesManager {
|
||||
|
||||
private MongoClient mongoClient;
|
||||
|
||||
|
||||
public DataSourcesManager(LimeworkSpigotCore plugin) {
|
||||
Configuration config = plugin .getConfig();
|
||||
if (config.getBoolean("Mongodb.enabled")){
|
||||
mongoClient = MongoClients.create(config.getString("Mongodb.url"));
|
||||
}
|
||||
}
|
||||
|
||||
public void shutdown(){
|
||||
mongoClient.close();
|
||||
}
|
||||
|
||||
|
||||
|
||||
public MongoClient getMongoClient() {
|
||||
return mongoClient;
|
||||
}
|
||||
}
|
||||
@@ -3,10 +3,16 @@ package net.limework.core.managers;
|
||||
import net.limework.Data.Encryption;
|
||||
import net.limework.core.LimeworkSpigotCore;
|
||||
import net.limework.core.events.RedisMessageEvent;
|
||||
import net.md_5.bungee.api.chat.TextComponent;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.ChatColor;
|
||||
import org.bukkit.command.Command;
|
||||
import org.bukkit.command.CommandExecutor;
|
||||
import org.bukkit.command.CommandSender;
|
||||
import org.bukkit.configuration.Configuration;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.cryptomator.siv.UnauthenticCiphertextException;
|
||||
import org.jetbrains.annotations.NotNull;
|
||||
import org.json.JSONObject;
|
||||
import redis.clients.jedis.BinaryJedis;
|
||||
import redis.clients.jedis.BinaryJedisPubSub;
|
||||
@@ -19,13 +25,14 @@ import java.util.concurrent.ExecutorService;
|
||||
import java.util.concurrent.Executors;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
|
||||
public class RedisManager extends BinaryJedisPubSub implements Runnable{
|
||||
public class RedisManager extends BinaryJedisPubSub implements Runnable, CommandExecutor {
|
||||
|
||||
private LimeworkSpigotCore plugin;
|
||||
|
||||
private JedisPool jedisPool;
|
||||
private ExecutorService RedisService;
|
||||
|
||||
private AtomicBoolean isKilled = new AtomicBoolean();
|
||||
|
||||
|
||||
//sub
|
||||
@@ -51,19 +58,23 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable{
|
||||
config.getString("Redis.Password"),
|
||||
config.getBoolean("Redis.useSSL"));
|
||||
RedisService = Executors.newFixedThreadPool(config.getInt("Redis.Threads"));
|
||||
try{this.subscribeJedis = this.jedisPool.getResource(); }catch (Exception ignored){}
|
||||
try {
|
||||
this.subscribeJedis = this.jedisPool.getResource();
|
||||
} catch (Exception ignored) {
|
||||
}
|
||||
this.channels = config.getStringList("Channels");
|
||||
encryption = new Encryption(config);
|
||||
|
||||
}
|
||||
|
||||
public void start(){
|
||||
public void start() {
|
||||
this.RedisService.execute(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void run() {
|
||||
while (!isShuttingDown.get()) {
|
||||
isKilled.set(false);
|
||||
try {
|
||||
message("&e[Jedis] &cConnecting to redis...........");
|
||||
if (!this.subscribeJedis.isConnected()) this.subscribeJedis = this.jedisPool.getResource();
|
||||
@@ -92,7 +103,9 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable{
|
||||
|
||||
} catch (Exception e) {
|
||||
message("&e[Jedis] &cConnection to redis has failed! &ereconnecting...");
|
||||
if (this.subscribeJedis != null){this.subscribeJedis.close();}
|
||||
if (this.subscribeJedis != null) {
|
||||
this.subscribeJedis.close();
|
||||
}
|
||||
isRedisOnline.set(false);
|
||||
}
|
||||
try {
|
||||
@@ -100,6 +113,7 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable{
|
||||
} catch (InterruptedException e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
if (isKilled.get()) break;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -130,7 +144,7 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable{
|
||||
|
||||
public void shutdown() {
|
||||
this.isShuttingDown.set(true);
|
||||
if (this.subscribeJedis != null){
|
||||
if (this.subscribeJedis != null) {
|
||||
this.unsubscribe();
|
||||
this.subscribeJedis.close();
|
||||
}
|
||||
@@ -161,4 +175,24 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable{
|
||||
public Encryption getEncryption() {
|
||||
return encryption;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean onCommand(CommandSender sender, Command cmd, String lable, String[] args) {
|
||||
if (sender instanceof Player) {
|
||||
sender.sendMessage(TextComponent.fromLegacyText(ChatColor.translateAlternateColorCodes('&'
|
||||
, "&c&lYou can not execute this command!!!!!!")));
|
||||
return true;
|
||||
}
|
||||
isKilled.set(true);
|
||||
try {
|
||||
if (this.subscribeJedis != null) {
|
||||
this.unsubscribe();
|
||||
this.subscribeJedis.close();
|
||||
}
|
||||
} catch (Exception e) {
|
||||
e.printStackTrace();
|
||||
}
|
||||
start();
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -14,4 +14,8 @@ Redis:
|
||||
Channels:
|
||||
- "Channel1"
|
||||
- "Channel2"
|
||||
- "Channel3"
|
||||
- "Channel3"
|
||||
|
||||
Mongodb:
|
||||
enabled: false
|
||||
url: ""
|
||||
@@ -7,5 +7,8 @@ softdepend:
|
||||
- Skript
|
||||
commands:
|
||||
control:
|
||||
description: "server control"
|
||||
permission: "admin.use"
|
||||
reloadredis:
|
||||
description: "server control"
|
||||
permission: "admin.use"
|
||||
Reference in New Issue
Block a user