Merge branch 'master' of https://github.com/Limework/RediSkript

Note: you can find the jar inside target folder now.

.github/workflows/maven.yml

@@ -29,4 +29,4 @@ jobs:
      # Artifact name
        name: RediSkript_JAR
      # Destination path
-       path: target/*.jar
+       path: target/Red*

README.md

@@ -17,7 +17,7 @@ Redis Message:
 on redis message:
   if redis channel is "world":
     broadcast "%redis message% %redis channel% %redis message date%"
-
+ 
 command /sendredis <text> <text>:
   usage: /sendredis <message> <channel>
   trigger:
@@ -41,7 +41,7 @@ Syntax:
 variable[s] %strings% in [redis] [channel] %string%
 ```
 
-There is only one command: **/reloadredis** it fully reloads the configuration, you can reload IP, password, channels and everything else.
+There is only one command: /reloadredis it fully reloads the configuration, you can reload IP, password, channels and everything else.
 
 You only need to have matching configuration in every server for communication and a Redis server to connect to. I recommend using VPS for hosting redis server, I personally use VPS from humbleservers.com.
 
@@ -51,50 +51,29 @@ Redis:
   #a secure password that cannot be cracked, please change it!
   #it is also recommended to firewall your redis server with iptables so it can only be accessed by specific IP addresses
   Password: "yHy0d2zdBlRmaSPj3CiBwEv5V3XxBTLTrCsGW7ntBnzhfxPxXJS6Q1aTtR6DSfAtCZr2VxWnsungXHTcF94a4bsWEpGAvjL9XMU"
-  #hostname of your redis server, you can use free redis hosting (search for it online) if you do not have the ability to host your own redis server
-  #redis server is very lightweight, takes under 30 MB of RAM usually
   Host: "127.0.0.1"
   #must be 2 or higher, if you set to lower, the addon will automatically use 2 as a minimum
-  #do not edit MaxConnections if you do not know what you're doing
-  #it is only useful to increase this number to account for PING between distant servers and when you are sending a lot of messages constantly
   MaxConnections: 2
   #the default Redis port
   Port: 6379
   #time out in milliseconds, how long it should take before it decides that it is unable to connect when sending a message
-  #9000 = 9 seconds
-  TimeOut: 9000
+  #90000 = 90 seconds
+  TimeOut: 90000
   #also known as SSL, only use this if you're running Redis 6.0.6 or higher, older versions will not work correctly
-  #it encrypts your traffic and makes data exchange between distant servers secure
+  #it encrypts your traffic and makes data exchange between distant servers completely secure
   useTLS: false
-  #EncryptMessages may be useful if you cannot use TLS due to use of older version of Redis or if you're paranoid about privacy and want to double encrypt your messages
-  #however this will not encrypt the initial authentication password, only the messages sent (use TLS for initial authentication password encryption)
-
-  #the encryption configuration must be the same across all servers in order to communicate
-
-  #use 16 characters long key for AES-128 encryption
-  #32 characters long key for AES-256 encryption
-  #AES-128 is faster, but less secure (but it is not crackable by today's technology as of 2020, may be crackable by quantum computers)
-  #the AES implementation used in RediSkript uses SIV mode, which makes the same key resistant to cracking for a big count of messages without the need of changing the key very often
+  #may be useful if you cannot use TLS due to use of older version of Redis
+  #however this will not encrypt the initial authentication password, only the messages sent
+  #it uses AES-128 SIV encryption which is secure enough for this
   EncryptMessages: true
-  #EncryptionKey and MacKey must be different
   EncryptionKey: "16CHARACTERS KEY"
   MacKey: "16CHARACTERS KEY"
 
-
 #the channels from which this server can receive messages
 #you can always send messages to all channels!
 #you can add as many channels as you wish!
-
-#ideal setup is having one global channel and having one channel that represents server name, so you know who to send messages to
-#then a few other utility channels up to your needs
 Channels:
-  - "global"
-  - "servername"
+  - "Channel1"
+  - "Channel2"
   - "Channel3"
   ```
-
-## YourKit
-
-YourKit supports open source projects with innovative and intelligent tools for monitoring and profiling Java and .NET applications. YourKit is the creator of [YourKit Java Profiler](https://www.yourkit.com/java/profiler/), [YourKit .NET Profiler](https://www.yourkit.com/.net/profiler/) and [YourKit YouMonitor](https://www.yourkit.com/youmonitor/).
-
-![YourKit](https://www.yourkit.com/images/yklogo.png)

RediSkript-bukkit/pom.xml

@@ -1,88 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>RediSkript</artifactId>
-        <groupId>net.limework</groupId>
-        <version>1.3.4</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>RediSkript-bukkit</artifactId>
-
-    <repositories>
-        <repository>
-            <id>papermc</id>
-            <url>https://papermc.io/repo/repository/maven-public/</url>
-        </repository>
-    </repositories>
-
-    <build>
-        <resources>
-            <resource>
-                <directory>src/main/resources</directory>
-                <filtering>true</filtering>
-            </resource>
-        </resources>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>3.2.3</version>
-                <configuration>
-                    <createDependencyReducedPom>false</createDependencyReducedPom>
-                </configuration>
-                <executions>
-                    <execution>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>shade</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
-                <configuration>
-                    <outputDirectory>../target</outputDirectory>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-
-    <dependencies>
-        <dependency>
-            <groupId>com.github.SkriptLang</groupId>
-            <artifactId>Skript</artifactId>
-            <version>2.5.3</version>
-            <type>jar</type>
-            <exclusions>
-                <exclusion>
-                    <groupId>*</groupId>
-                    <artifactId>*</artifactId>
-                </exclusion>
-            </exclusions>
-            <scope>provided</scope>
-        </dependency>
-				<dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-            <version>3.7.0</version>
-        </dependency>
-        <dependency>
-            <groupId>net.limework</groupId>
-            <artifactId>RediSkript-core</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-    </dependencies>
-
-</project>

RediSkript-core/pom.xml

@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>RediSkript</artifactId>
-        <groupId>net.limework</groupId>
-        <version>1.3.4</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>RediSkript-core</artifactId>
-
-
-    <dependencies>
-        <dependency>
-            <groupId>redis.clients</groupId>
-            <artifactId>jedis</artifactId>
-            <version>3.5.1</version>
-            <scope>provided</scope>
-        </dependency>
-    </dependencies>
-
-
-</project>

RediSkript-core/src/main/java/net/limework/rediskript/Subscriber.java

@@ -1,11 +0,0 @@
-package net.limework.rediskript;
-
-
-import redis.clients.jedis.BinaryJedisPubSub;
-
-public abstract class Subscriber extends BinaryJedisPubSub implements Runnable {
-
-
-
-}
-

pom.xml

@@ -6,14 +6,51 @@
 
     <groupId>net.limework</groupId>
     <artifactId>RediSkript</artifactId>
-    <version>1.3.4</version>
-    <modules>
-        <module>RediSkript-core</module>
-        <module>RediSkript-bukkit</module>
-    </modules>
-    <packaging>pom</packaging>
+    <version>1.3.3</version>
+    <packaging>jar</packaging>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <encoding>UTF-8</encoding>
+                </configuration>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-shade-plugin</artifactId>
+                <version>3.2.3</version>
+                <configuration>
+                    <createDependencyReducedPom>false</createDependencyReducedPom>
+                </configuration>
+                <executions>
+                    <execution>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>shade</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
 
     <repositories>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/org/spigotmc/spigot-api/</url>
+        </repository>
         <repository>
             <id>jitpack.io</id>
             <url>https://jitpack.io</url>
@@ -22,28 +59,39 @@
             <id>commons-pool2</id>
             <url>https://mvnrepository.com/artifact/org.apache.commons/commons-pool2</url>
         </repository>
+        <repository>
+            <id>PaperMC</id>
+            <url>https://repo.destroystokyo.com/repository/maven-public/</url>
+        </repository>
+        <repository>
+            <id>sk89q</id>
+            <url>http://maven.sk89q.com/repo</url>
+        </repository>
     </repositories>
 
-    <build>
-        <plugins>
-        <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <version>3.6.1</version>
-            <configuration>
-                <source>1.8</source>
-                <target>1.8</target>
-                <encoding>UTF-8</encoding>
-            </configuration>
-        </plugin>
-        </plugins>
-    </build>
-
     <dependencies>
+        <dependency>
+            <groupId>com.github.SkriptLang</groupId>
+            <artifactId>Skript</artifactId>
+            <version>2.5.3</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>3.5.1</version>
+        </dependency>
         <dependency>
             <groupId>org.json</groupId>
             <artifactId>json</artifactId>
-            <version>20210307</version>
+            <version>20201115</version>
         </dependency>
         <dependency>
             <groupId>org.cryptomator</groupId>

src/main/java/net/limework/rediskript/RediSkript.java

@@ -10,7 +10,6 @@ import net.limework.rediskript.commands.CommandReloadRedis;
 import net.limework.rediskript.events.RedisMessageEvent;
 import net.limework.rediskript.managers.RedisController;
 import net.limework.rediskript.skript.elements.*;
-import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.plugin.java.JavaPlugin;
 
@@ -90,12 +89,4 @@ public class RediSkript extends JavaPlugin {
     public RedisController getRC() {
         return redisController;
     }
-
-    //Developer note: This is use for skript-reflect! and also for plugin use for static stuff -> skript effects classes
-    //DO NOT USE THIS IN NON STATIC CLASSES
-    public static RediSkript getAPI(){
-        //this safer than making static.
-        return (RediSkript) Bukkit.getServer().getPluginManager().getPlugin("RediSkript");
-    }
-
 }

src/main/java/net/limework/rediskript/data/Encryption.java

@@ -1,5 +1,6 @@
 package net.limework.rediskript.data;
 
+import org.bukkit.configuration.Configuration;
 import org.cryptomator.siv.SivMode;
 import org.cryptomator.siv.UnauthenticCiphertextException;
 
@@ -8,17 +9,17 @@ import java.nio.charset.StandardCharsets;
 
 public class Encryption {
 
-    private final boolean encryptionEnabled;
+    private boolean encryptionEnabled;
     private String encryptionKey;
     private String macKey;
     private final SivMode AES_SIV = new SivMode();
 
-    public Encryption(boolean encryptionEnabled, String encryptionKey, String macKey){
-        this.encryptionEnabled = encryptionEnabled;
-        if (this.encryptionEnabled) {
+    public Encryption(Configuration config){
+        encryptionEnabled = config.getBoolean("Redis.EncryptMessages");
+        if (encryptionEnabled) {
             // AES encryption
-            this.encryptionKey = encryptionKey;
-            this.macKey = macKey;
+            encryptionKey = config.getString("Redis.EncryptionKey");
+            macKey = config.getString("Redis.MacKey");
         }
     }
 

src/main/java/net/limework/rediskript/managers/RedisController.java

@@ -27,8 +27,6 @@ public class RedisController extends BinaryJedisPubSub implements Runnable {
     private final JedisPool jedisPool;
 
     //this seems useless unless tls is OFF!
-
-    // class author is govindas :/
     private final Encryption encryption;
 
     private byte[][] channelsInByte;
@@ -58,9 +56,7 @@ public class RedisController extends BinaryJedisPubSub implements Runnable {
                 config.getInt("Redis.TimeOut"),
                 config.getString("Redis.Password"),
                 config.getBoolean("Redis.useTLS"));
-        encryption = new Encryption(config.getBoolean("Redis.EncryptMessages"),
-                config.getString("Redis.EncryptionKey"),
-                config.getString("Redis.MacKey"));
+        encryption = new Encryption(config);
         setupChannels(config);
         isConnectionBroken = new AtomicBoolean(true);
         isConnecting = new AtomicBoolean(false);
@@ -259,10 +255,4 @@ public class RedisController extends BinaryJedisPubSub implements Runnable {
     public Boolean isRedisConnectionOffline() {
         return isConnectionBroken.get();
     }
-
-    // for skript reflect :)
-    public JedisPool getJedisPool() {
-        return jedisPool;
-    }
-    //
 }

src/main/java/net/limework/rediskript/skript/elements/EffSendMessage.java

@@ -23,7 +23,7 @@ public class EffSendMessage extends Effect {
     @Override
     protected void execute(Event event) {
 
-        RediSkript plugin = RediSkript.getAPI();
+        RediSkript plugin = (RediSkript) Bukkit.getPluginManager().getPlugin("RediSkript");
 
         String[] message = this.message.getAll(event);
         String channel = this.channel.getSingle(event);

src/main/resources/plugin.yml

@@ -1,10 +1,9 @@
 main: net.limework.rediskript.RediSkript
-name: RediSkript
+name: ${project.name}
 version: ${project.version}
 authors: [Govindas, ham1255, DaemonicKing, limework.net]
 api-version: 1.13
 depend: [Skript]
 commands:
   reloadredis:
-    description: "Reload redis configuration & restart the connection."
-    permission: reload.redis
+    description: "Reload redis configuration & restart the connection."