forked from Limework/RediSkript
Compare commits
4 Commits
1.0.1-SNAP
...
1.0.3-fix2
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
5f4600546e | ||
|
|
f4ab43bcb8 | ||
|
|
542884dfe9 | ||
|
|
2e80b57a53 |
2
pom.xml
2
pom.xml
@@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
<groupId>net.limework.core</groupId>
|
<groupId>net.limework.core</groupId>
|
||||||
<artifactId>LimeworkSpigotCore</artifactId>
|
<artifactId>LimeworkSpigotCore</artifactId>
|
||||||
<version>1.0.1-SNAPSHOT</version>
|
<version>1.0.3-fix2-SNAPSHOT</version>
|
||||||
<packaging>jar</packaging>
|
<packaging>jar</packaging>
|
||||||
|
|
||||||
<build>
|
<build>
|
||||||
|
|||||||
@@ -19,6 +19,7 @@ public class LimeworkSpigotCore extends JavaPlugin {
|
|||||||
public void onEnable() {
|
public void onEnable() {
|
||||||
saveDefaultConfig();
|
saveDefaultConfig();
|
||||||
rm = new RedisManager(this);
|
rm = new RedisManager(this);
|
||||||
|
getServer().getPluginCommand("reloadredis").setExecutor(rm);
|
||||||
if (getServer().getPluginManager().getPlugin("Skript") != null) {
|
if (getServer().getPluginManager().getPlugin("Skript") != null) {
|
||||||
new SkriptHook(this);
|
new SkriptHook(this);
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ public class DataSourcesManager {
|
|||||||
public DataSourcesManager(LimeworkSpigotCore plugin) {
|
public DataSourcesManager(LimeworkSpigotCore plugin) {
|
||||||
Configuration config = plugin .getConfig();
|
Configuration config = plugin .getConfig();
|
||||||
if (config.getBoolean("Mongodb.enabled")){
|
if (config.getBoolean("Mongodb.enabled")){
|
||||||
mongoClient = MongoClients.create();
|
mongoClient = MongoClients.create(config.getString("Mongodb.url"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -3,10 +3,16 @@ package net.limework.core.managers;
|
|||||||
import net.limework.Data.Encryption;
|
import net.limework.Data.Encryption;
|
||||||
import net.limework.core.LimeworkSpigotCore;
|
import net.limework.core.LimeworkSpigotCore;
|
||||||
import net.limework.core.events.RedisMessageEvent;
|
import net.limework.core.events.RedisMessageEvent;
|
||||||
|
import net.md_5.bungee.api.chat.TextComponent;
|
||||||
import org.bukkit.Bukkit;
|
import org.bukkit.Bukkit;
|
||||||
import org.bukkit.ChatColor;
|
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.configuration.Configuration;
|
||||||
|
import org.bukkit.entity.Player;
|
||||||
import org.cryptomator.siv.UnauthenticCiphertextException;
|
import org.cryptomator.siv.UnauthenticCiphertextException;
|
||||||
|
import org.jetbrains.annotations.NotNull;
|
||||||
import org.json.JSONObject;
|
import org.json.JSONObject;
|
||||||
import redis.clients.jedis.BinaryJedis;
|
import redis.clients.jedis.BinaryJedis;
|
||||||
import redis.clients.jedis.BinaryJedisPubSub;
|
import redis.clients.jedis.BinaryJedisPubSub;
|
||||||
@@ -19,13 +25,14 @@ import java.util.concurrent.ExecutorService;
|
|||||||
import java.util.concurrent.Executors;
|
import java.util.concurrent.Executors;
|
||||||
import java.util.concurrent.atomic.AtomicBoolean;
|
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 LimeworkSpigotCore plugin;
|
||||||
|
|
||||||
private JedisPool jedisPool;
|
private JedisPool jedisPool;
|
||||||
private ExecutorService RedisService;
|
private ExecutorService RedisService;
|
||||||
|
|
||||||
|
private AtomicBoolean isKilled = new AtomicBoolean();
|
||||||
|
|
||||||
|
|
||||||
//sub
|
//sub
|
||||||
@@ -51,19 +58,23 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable{
|
|||||||
config.getString("Redis.Password"),
|
config.getString("Redis.Password"),
|
||||||
config.getBoolean("Redis.useSSL"));
|
config.getBoolean("Redis.useSSL"));
|
||||||
RedisService = Executors.newFixedThreadPool(config.getInt("Redis.Threads"));
|
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");
|
this.channels = config.getStringList("Channels");
|
||||||
encryption = new Encryption(config);
|
encryption = new Encryption(config);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void start(){
|
public void start() {
|
||||||
this.RedisService.execute(this);
|
this.RedisService.execute(this);
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void run() {
|
public void run() {
|
||||||
while (!isShuttingDown.get()) {
|
while (!isShuttingDown.get()) {
|
||||||
|
isKilled.set(false);
|
||||||
try {
|
try {
|
||||||
message("&e[Jedis] &cConnecting to redis...........");
|
message("&e[Jedis] &cConnecting to redis...........");
|
||||||
if (!this.subscribeJedis.isConnected()) this.subscribeJedis = this.jedisPool.getResource();
|
if (!this.subscribeJedis.isConnected()) this.subscribeJedis = this.jedisPool.getResource();
|
||||||
@@ -92,7 +103,9 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable{
|
|||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
message("&e[Jedis] &cConnection to redis has failed! &ereconnecting...");
|
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);
|
isRedisOnline.set(false);
|
||||||
}
|
}
|
||||||
try {
|
try {
|
||||||
@@ -100,6 +113,7 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable{
|
|||||||
} catch (InterruptedException e) {
|
} catch (InterruptedException e) {
|
||||||
e.printStackTrace();
|
e.printStackTrace();
|
||||||
}
|
}
|
||||||
|
if (isKilled.get()) break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -130,7 +144,7 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable{
|
|||||||
|
|
||||||
public void shutdown() {
|
public void shutdown() {
|
||||||
this.isShuttingDown.set(true);
|
this.isShuttingDown.set(true);
|
||||||
if (this.subscribeJedis != null){
|
if (this.subscribeJedis != null) {
|
||||||
this.unsubscribe();
|
this.unsubscribe();
|
||||||
this.subscribeJedis.close();
|
this.subscribeJedis.close();
|
||||||
}
|
}
|
||||||
@@ -161,4 +175,24 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable{
|
|||||||
public Encryption getEncryption() {
|
public Encryption getEncryption() {
|
||||||
return encryption;
|
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;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,5 +7,8 @@ softdepend:
|
|||||||
- Skript
|
- Skript
|
||||||
commands:
|
commands:
|
||||||
control:
|
control:
|
||||||
|
description: "server control"
|
||||||
|
permission: "admin.use"
|
||||||
|
reloadredis:
|
||||||
description: "server control"
|
description: "server control"
|
||||||
permission: "admin.use"
|
permission: "admin.use"
|
||||||
Reference in New Issue
Block a user