Update README.md

due to it not having threadpool, froze my server at one point

.gitignore

@@ -2,4 +2,3 @@ target
 out
 .idea
 compile
-*.iml

.idea/.name

@@ -0,0 +1 @@
+RediSkript

.idea/artifacts/RediSkript_jar.xml

@@ -0,0 +1,12 @@
+<component name="ArtifactManager">
+  <artifact type="jar" build-on-make="true" name="RediSkript:jar">
+    <output-path>$PROJECT_DIR$/../../Govindo/testserver/plugins</output-path>
+    <root id="archive" name="RediSkript.jar">
+      <element id="module-output" name="RediSkript" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/cryptomator/siv-mode/1.4.0/siv-mode-1.4.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/redis/clients/jedis/3.3.0/jedis-3.3.0.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/apache/commons/commons-pool2/2.6.2/commons-pool2-2.6.2.jar" path-in-jar="/" />
+      <element id="extracted-dir" path="$MAVEN_REPOSITORY$/org/json/json/20190722/json-20190722.jar" path-in-jar="/" />
+    </root>
+  </artifact>
+</component>

.idea/compiler.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="RediSkript" />
+      </profile>
+    </annotationProcessing>
+    <bytecodeTargetLevel>
+      <module name="RediSkript" target="1.8" />
+    </bytecodeTargetLevel>
+  </component>
+</project>

.idea/discord.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="DiscordProjectSettings">
+    <option name="show" value="PROJECT_FILES" />
+  </component>
+</project>

.idea/jarRepositories.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jitpack.io" />
+      <option name="name" value="jitpack.io" />
+      <option name="url" value="https://jitpack.io" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="commons-pool2" />
+      <option name="name" value="commons-pool2" />
+      <option name="url" value="https://mvnrepository.com/artifact/org.apache.commons/commons-pool2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="spigot-repo" />
+      <option name="name" value="spigot-repo" />
+      <option name="url" value="https://hub.spigotmc.org/nexus/content/repositories/snapshots/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+  </component>
+</project>

.idea/libraries/Maven__com_github_skriptlang_Skript_2_4_1.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: com.github.skriptlang:Skript:2.4.1">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/skriptlang/Skript/2.4.1/Skript-2.4.1.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/skriptlang/Skript/2.4.1/Skript-2.4.1-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/com/github/skriptlang/Skript/2.4.1/Skript-2.4.1-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_apache_commons_commons_pool2_2_6_2.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.apache.commons:commons-pool2:2.6.2">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-pool2/2.6.2/commons-pool2-2.6.2.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-pool2/2.6.2/commons-pool2-2.6.2-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/apache/commons/commons-pool2/2.6.2/commons-pool2-2.6.2-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_cryptomator_siv_mode_1_4_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.cryptomator:siv-mode:1.4.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/cryptomator/siv-mode/1.4.0/siv-mode-1.4.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/cryptomator/siv-mode/1.4.0/siv-mode-1.4.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/cryptomator/siv-mode/1.4.0/siv-mode-1.4.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_json_json_20190722.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.json:json:20190722">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/json/json/20190722/json-20190722.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/json/json/20190722/json-20190722-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/json/json/20190722/json-20190722-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__org_spigotmc_spigot_api_1_16_2_R0_1_SNAPSHOT.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: org.spigotmc:spigot-api:1.16.2-R0.1-SNAPSHOT">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.16.2-R0.1-SNAPSHOT/spigot-api-1.16.2-R0.1-20200910.205520-57.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.16.2-R0.1-SNAPSHOT/spigot-api-1.16.2-R0.1-20200910.205520-57-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/org/spigotmc/spigot-api/1.16.2-R0.1-SNAPSHOT/spigot-api-1.16.2-R0.1-20200910.205520-57-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/libraries/Maven__redis_clients_jedis_3_3_0.xml

@@ -0,0 +1,13 @@
+<component name="libraryTable">
+  <library name="Maven: redis.clients:jedis:3.3.0">
+    <CLASSES>
+      <root url="jar://$MAVEN_REPOSITORY$/redis/clients/jedis/3.3.0/jedis-3.3.0.jar!/" />
+    </CLASSES>
+    <JAVADOC>
+      <root url="jar://$MAVEN_REPOSITORY$/redis/clients/jedis/3.3.0/jedis-3.3.0-javadoc.jar!/" />
+    </JAVADOC>
+    <SOURCES>
+      <root url="jar://$MAVEN_REPOSITORY$/redis/clients/jedis/3.3.0/jedis-3.3.0-sources.jar!/" />
+    </SOURCES>
+  </library>
+</component>

.idea/misc.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK" />
+</project>

.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/RediSkript.iml" filepath="$PROJECT_DIR$/RediSkript.iml" />
+    </modules>
+  </component>
+</project>

.idea/uiDesigner.xml

@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Palette2">
+    <group name="Swing">
+      <item class="com.intellij.uiDesigner.HSpacer" tooltip-text="Horizontal Spacer" icon="/com/intellij/uiDesigner/icons/hspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="1" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="com.intellij.uiDesigner.VSpacer" tooltip-text="Vertical Spacer" icon="/com/intellij/uiDesigner/icons/vspacer.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="1" anchor="0" fill="2" />
+      </item>
+      <item class="javax.swing.JPanel" icon="/com/intellij/uiDesigner/icons/panel.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JScrollPane" icon="/com/intellij/uiDesigner/icons/scrollPane.png" removable="false" auto-create-binding="false" can-attach-label="true">
+        <default-constraints vsize-policy="7" hsize-policy="7" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JButton" icon="/com/intellij/uiDesigner/icons/button.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="0" fill="1" />
+        <initial-values>
+          <property name="text" value="Button" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JRadioButton" icon="/com/intellij/uiDesigner/icons/radioButton.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="RadioButton" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JCheckBox" icon="/com/intellij/uiDesigner/icons/checkBox.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="3" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="CheckBox" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JLabel" icon="/com/intellij/uiDesigner/icons/label.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="8" fill="0" />
+        <initial-values>
+          <property name="text" value="Label" />
+        </initial-values>
+      </item>
+      <item class="javax.swing.JTextField" icon="/com/intellij/uiDesigner/icons/textField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JPasswordField" icon="/com/intellij/uiDesigner/icons/passwordField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JFormattedTextField" icon="/com/intellij/uiDesigner/icons/formattedTextField.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1">
+          <preferred-size width="150" height="-1" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextArea" icon="/com/intellij/uiDesigner/icons/textArea.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTextPane" icon="/com/intellij/uiDesigner/icons/textPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JEditorPane" icon="/com/intellij/uiDesigner/icons/editorPane.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JComboBox" icon="/com/intellij/uiDesigner/icons/comboBox.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="2" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JTable" icon="/com/intellij/uiDesigner/icons/table.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JList" icon="/com/intellij/uiDesigner/icons/list.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="2" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTree" icon="/com/intellij/uiDesigner/icons/tree.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3">
+          <preferred-size width="150" height="50" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JTabbedPane" icon="/com/intellij/uiDesigner/icons/tabbedPane.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSplitPane" icon="/com/intellij/uiDesigner/icons/splitPane.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="3" hsize-policy="3" anchor="0" fill="3">
+          <preferred-size width="200" height="200" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JSpinner" icon="/com/intellij/uiDesigner/icons/spinner.png" removable="false" auto-create-binding="true" can-attach-label="true">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSlider" icon="/com/intellij/uiDesigner/icons/slider.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="8" fill="1" />
+      </item>
+      <item class="javax.swing.JSeparator" icon="/com/intellij/uiDesigner/icons/separator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="6" anchor="0" fill="3" />
+      </item>
+      <item class="javax.swing.JProgressBar" icon="/com/intellij/uiDesigner/icons/progressbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JToolBar" icon="/com/intellij/uiDesigner/icons/toolbar.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="6" anchor="0" fill="1">
+          <preferred-size width="-1" height="20" />
+        </default-constraints>
+      </item>
+      <item class="javax.swing.JToolBar$Separator" icon="/com/intellij/uiDesigner/icons/toolbarSeparator.png" removable="false" auto-create-binding="false" can-attach-label="false">
+        <default-constraints vsize-policy="0" hsize-policy="0" anchor="0" fill="1" />
+      </item>
+      <item class="javax.swing.JScrollBar" icon="/com/intellij/uiDesigner/icons/scrollbar.png" removable="false" auto-create-binding="true" can-attach-label="false">
+        <default-constraints vsize-policy="6" hsize-policy="0" anchor="0" fill="2" />
+      </item>
+    </group>
+  </component>
+</project>

.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

README.md

@@ -1,14 +1,11 @@
-**To-do List**
-1. Fix memory leak of /reloadredis (Not yet known how to fix it, it can be easily noticed by changing IP addresses and using NetworkInterceptor plugin, it'll show connections still being done to old IP address, aswell as the new one, even if it doesn't use old IP address for anything.
-
-
 RediSkript allows you to communicate between your servers with use of Redis, it's very fast and easy to use.
 
 You can transfer any data in the form of text between your servers, you can program it to execute a set of instructions on the server depending on the redis message, etc. This can be used for making scripts that sync data between all servers and much more!
 
 
 It is originally developed by the team of Govindas Limework developers and is now maintained only by Govindas.
-Example:
+
+Redis Message:
 ```
 on redis message:
   if redis channel is "world":
@@ -20,8 +17,26 @@ command /sendredis <text> <text>:
     send redis message arg 1 to channel arg 2
     send redis message "hello world!" to channel "world"
 ```
+Managing variables:
+```
+set variables "test::1", "test::2", "test::3" in channel "global" to 100
+#then use this in any server that listens to "global" redis channel and was online when the above line was executed:
+send "%{test::*}%" #outputs 100, 100 and 100
 
-and that's all there is to this addon! 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.
+delete variables "test::*" in channel "global"
+
+set variable "test::%uuid of player%" in channel "playerdata" to tool of player
+#then you can in any server that is listening to "playerdata" channel and was online when the above line was executed:
+give {test::%uuid of player%} to player
+```
+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.
+
+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.
 
 Configuration:
 ```

RediSkript.iml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_8">
+    <output url="file://$MODULE_DIR$/target/classes" />
+    <output-test url="file://$MODULE_DIR$/target/test-classes" />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <excludeFolder url="file://$MODULE_DIR$/target" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.skriptlang:Skript:2.4.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.2-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:3.3.0" level="project" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.6.2" level="project" />
+    <orderEntry type="library" name="Maven: org.json:json:20190722" level="project" />
+    <orderEntry type="library" name="Maven: org.cryptomator:siv-mode:1.4.0" level="project" />
+  </component>
+</module>

pom.xml

@@ -4,9 +4,9 @@
          xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
 
-    <groupId>net.limework.core</groupId>
+    <groupId>net.limework.rediskript</groupId>
     <artifactId>RediSkript</artifactId>
-    <version>1.2.0</version>
+    <version>1.3.0</version>
     <packaging>jar</packaging>
 	
     <build>
@@ -27,37 +27,13 @@
                     <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>
-			<plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-jar-plugin</artifactId>
-                <version>3.2.0</version>
-                <configuration>
-                    <outputDirectory>${project.basedir}/compile</outputDirectory>
-                </configuration>
-            </plugin>
         </plugins>
     </build>
     
 	<repositories>
         <repository>
             <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/</url>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/org/spigotmc/spigot-api/</url>
         </repository>
         <repository>
             <id>jitpack.io</id>
@@ -72,9 +48,9 @@
 
     <dependencies>
         <dependency>
-            <groupId>com.github.skriptlang</groupId>
+            <groupId>com.github.SkriptLang</groupId>
             <artifactId>Skript</artifactId>
-            <version>2.4.1</version>
+            <version>2.5.1</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
@@ -87,22 +63,26 @@
         <groupId>redis.clients</groupId>
         <artifactId>jedis</artifactId>
         <version>3.3.0</version>
+        <scope>compile</scope>
     </dependency>
     <dependency>
         <groupId>org.json</groupId>
         <artifactId>json</artifactId>
         <version>20190722</version>
+        <scope>compile</scope>
     </dependency>
     <dependency>
         <groupId>org.cryptomator</groupId>
         <artifactId>siv-mode</artifactId>
         <version>1.4.0</version>
+        <scope>compile</scope>
     </dependency>
     <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-pool2 -->
     <dependency>
         <groupId>org.apache.commons</groupId>
         <artifactId>commons-pool2</artifactId>
         <version>2.6.2</version>
+        <scope>compile</scope>
     </dependency>
     </dependencies>
 </project>

src/main/java/META-INF/MANIFEST.MF

@@ -1,3 +1,3 @@
 Manifest-Version: 1.0
-Main-Class: net.limework.core.RediSkript
+Main-Class: net.limework.rediskript.RediSkript
 

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

@@ -1,45 +0,0 @@
-package net.limework.core;
-import net.limework.core.commands.ReloadRedis;
-import net.limework.core.hooks.SkriptHook;
-import net.limework.core.managers.RedisManager;
-import org.bukkit.command.PluginCommand;
-import org.bukkit.plugin.java.JavaPlugin;
-
-public class RediSkript extends JavaPlugin {
-
-    //Redis manager
-    private RedisManager rm;
-
-    public void startRedis(boolean reload) {
-        if (reload) { reloadConfig(); }
-        rm = new RedisManager(this);
-        rm.start();
-    }
-    @Override
-    public void onEnable() {
-        saveDefaultConfig();
-        if (getServer().getPluginManager().getPlugin("Skript") != null) {
-            startRedis(false);
-
-            PluginCommand command = getServer().getPluginCommand("reloadredis");
-            assert command != null;
-            command.setExecutor(new ReloadRedis(this));
-
-            new SkriptHook(this);
-        } else {
-            getLogger().info("Skript wasn't found.");
-        }
-    }
-
-    @Override
-    public void onDisable() {
-        if (rm != null) {
-            rm.shutdown();
-        }
-    }
-
-
-    public RedisManager getRm() {
-        return rm;
-    }
-}

src/main/java/net/limework/core/managers/RedisManager.java

@@ -1,166 +0,0 @@
-package net.limework.core.managers;
-
-import net.limework.core.RediSkript;
-import net.limework.core.events.RedisMessageEvent;
-import net.limework.data.Encryption;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.configuration.Configuration;
-import org.cryptomator.siv.UnauthenticCiphertextException;
-import org.json.JSONObject;
-import redis.clients.jedis.BinaryJedis;
-import redis.clients.jedis.BinaryJedisPubSub;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.JedisPoolConfig;
-
-import javax.crypto.IllegalBlockSizeException;
-import java.nio.charset.StandardCharsets;
-import java.util.List;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
-import java.util.concurrent.atomic.AtomicBoolean;
-
-public class RedisManager extends BinaryJedisPubSub implements Runnable {
-
-    private RediSkript plugin;
-
-    private JedisPool jedisPool;
-    private ExecutorService RedisService;
-
-
-    //sub
-    private BinaryJedis subscribeJedis;
-    private List<String> channels;
-    private AtomicBoolean isShuttingDown = new AtomicBoolean(false);
-    private Encryption encryption;
-
-
-    public RedisManager(RediSkript plugin) {
-        this.plugin = plugin;
-        Configuration config = this.plugin.getConfig();
-        JedisPoolConfig JConfig = new JedisPoolConfig();
-        int maxConnections = config.getInt("Redis.MaxConnections");
-        if (maxConnections < 2) { maxConnections = 2; }
-
-        JConfig.setMaxTotal(maxConnections);
-        JConfig.setMaxIdle(maxConnections);
-        JConfig.setMinIdle(1);
-        JConfig.setBlockWhenExhausted(true);
-        this.jedisPool = new JedisPool(JConfig,
-                config.getString("Redis.Host"),
-                config.getInt("Redis.Port"),
-                config.getInt("Redis.TimeOut"),
-                config.getString("Redis.Password"),
-                config.getBoolean("Redis.useTLS"));
-        RedisService = Executors.newSingleThreadExecutor();
-        try {
-            this.subscribeJedis = this.jedisPool.getResource();
-        } catch (Exception ignored) {
-        }
-        this.channels = config.getStringList("Channels");
-        encryption = new Encryption(config);
-
-    }
-
-    public void start() {
-        this.RedisService.execute(this);
-    }
-
-    @Override
-    public void run() {
-        while (!isShuttingDown.get()) {
-            try {
-                plugin.getLogger().info(ChatColor.translateAlternateColorCodes('&', "&2[&aRediSkript&a] &cConnecting to redis..."));
-                if (!this.subscribeJedis.isConnected()) this.subscribeJedis = this.jedisPool.getResource();
-                plugin.getLogger().info(ChatColor.translateAlternateColorCodes('&', "&2[&aRediSkript&a] &aRedis connected!"));
-                int byteArr2dSize = 1;
-                byte[][] channelsInByte = new byte[channels.size()][byteArr2dSize];
-                boolean reInitializeByteArray;
-                // Loop that reInitialize array IF array size is not enough
-                do {
-                    reInitializeByteArray = false;
-                    try {
-                        /* Data Initialization for channelsInByte array from List<String> channels */
-                        for (int x = 0; x < channels.size(); x++) {
-                            channelsInByte[x] = channels.get(x).getBytes(StandardCharsets.UTF_8);
-                        }
-                    } catch (ArrayIndexOutOfBoundsException ex) {
-                        reInitializeByteArray = true;
-                        /* Increase the current 2d array size to increase 1 and reinitialize the array*/
-                        byteArr2dSize += 1;
-                        channelsInByte = new byte[channels.size()][byteArr2dSize];
-                    }
-                } while (reInitializeByteArray);
-                this.subscribeJedis.subscribe(this, channelsInByte);
-
-
-            } catch (Exception e) {
-                plugin.getLogger().warning(ChatColor.translateAlternateColorCodes('&', "&2[&aRediSkript&a] &cConnection to redis has failed! &ereconnecting..."));
-                if (this.subscribeJedis != null) {
-                    this.subscribeJedis.close();
-                }
-            }
-            try {
-                Thread.sleep(1000);
-            } catch (InterruptedException e) {
-                e.printStackTrace();
-            }
-        }
-    }
-
-    @Override
-    public void onMessage(byte[] channel, byte[] message) {
-        String channelString = new String(channel, StandardCharsets.UTF_8);
-        String receivedMessage = null;
-        try {
-            //if encryption is enabled, decrypt the message, else just convert binary to string
-            if (this.encryption.isEncryptionEnabled()) {
-                try {
-                    receivedMessage = encryption.decrypt(message);
-                } catch (UnauthenticCiphertextException | IllegalBlockSizeException e) {
-                    e.printStackTrace();
-                }
-
-            } else {
-                //encryption is disabled, so let's just get the string
-                receivedMessage = new String(message, StandardCharsets.UTF_8);
-            }
-
-            if (receivedMessage != null) {
-                JSONObject j = new JSONObject(receivedMessage);
-                //System.out.println("Message got from channel: "+channel +" and the Message: " +json.toString());
-                RedisMessageEvent event = new RedisMessageEvent(channelString, j.getString("Message"), j.getLong("Date"));
-                Bukkit.getScheduler().runTask(plugin, () -> plugin.getServer().getPluginManager().callEvent(event));
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-            Bukkit.getLogger().warning(ChatColor.translateAlternateColorCodes('&', "&2[&aRediSkript&a] &cI got a message that was empty from channel " + channelString + " please check your code that you used to send the message. Message content:"));
-            Bukkit.getLogger().warning(receivedMessage);
-        }
-
-    }
-
-    public void shutdown() {
-        this.isShuttingDown.set(true);
-        if (this.subscribeJedis != null) {
-            this.unsubscribe();
-            this.subscribeJedis.close();
-            this.subscribeJedis.getClient().close();
-            this.jedisPool.getResource().close();
-        }
-        this.RedisService.shutdown();
-
-    }
-    public void reload() {
-        this.shutdown();
-        plugin.startRedis(true);
-    }
-
-    public JedisPool getJedisPool() {
-        return jedisPool;
-    }
-
-    public Encryption getEncryption() {
-        return encryption;
-    }
-}

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

@@ -0,0 +1,44 @@
+package net.limework.rediskript;
+
+import net.limework.rediskript.commands.CommandReloadRedis;
+import net.limework.rediskript.managers.RedisManager;
+import net.limework.rediskript.skript.SkriptHook;
+import org.bukkit.command.PluginCommand;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+import org.bukkit.plugin.java.JavaPlugin;
+
+public class RediSkript extends JavaPlugin {
+
+    //Redis manager
+    private RedisManager rm;
+
+    public void startRedis(boolean reload) {
+        if (reload) { reloadConfig(); }
+        rm = new RedisManager(this);
+        rm.start();
+    }
+    @Override
+    public void onEnable() {
+        saveDefaultConfig();
+        startRedis(false);
+
+        PluginCommand command = getServer().getPluginCommand("reloadredis");
+        assert command != null;
+        command.setExecutor(new CommandReloadRedis(this));
+
+        new SkriptHook(this);
+    }
+
+    @Override
+    //using HIGHEST event priority so it shuts down last and code can still execute well in "on script unload" and "on skript unload" events
+    @EventHandler(priority = EventPriority.LOWEST)
+    public void onDisable() {
+        if (rm != null) {
+            rm.shutdown();
+        }
+    }
+    public RedisManager getRm() {
+        return rm;
+    }
+}

src/main/java/net/limework/rediskript/commands/CommandReloadRedis.java

@@ -1,6 +1,6 @@
-package net.limework.core.commands;
+package net.limework.rediskript.commands;
 
-import net.limework.core.RediSkript;
+import net.limework.rediskript.RediSkript;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.command.Command;
@@ -8,9 +8,9 @@ import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
 
-public class ReloadRedis implements CommandExecutor {
+public class CommandReloadRedis implements CommandExecutor {
     private RediSkript plugin;
-    public ReloadRedis(RediSkript plugin) {
+    public CommandReloadRedis(RediSkript plugin) {
         this.plugin = plugin;
     }
     @Override
@@ -18,12 +18,12 @@ public class ReloadRedis implements CommandExecutor {
         if (sender instanceof Player) {
             //not using bungee TextComponent because it is not present in 1.8.8
             sender.sendMessage((ChatColor.translateAlternateColorCodes('&'
-                    , "&2[&aRediSkript&a] &cThis command can only be executed in console.")));
+                    , "&2[&aRediSkript&2] &cThis command can only be executed in console.")));
             return true;
         }
         plugin.getRm().reload();
         //not sending to sender, because this command can only be executed via console
-        Bukkit.getLogger().info(ChatColor.translateAlternateColorCodes('&', "&2[&aRediSkript&a] &eReloaded via command! Note this command is not stable, it should only be used in urgent cases where you absolutely need to change config details without restarting the server."));
+        Bukkit.getLogger().info(ChatColor.translateAlternateColorCodes('&', "&eReloaded via command! Note this command is not stable, it should only be used in urgent cases where you absolutely need to change config details without restarting the server."));
 
         return false;
     }

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

@@ -1,4 +1,4 @@
-package net.limework.data;
+package net.limework.rediskript.data;
 
 import org.bukkit.configuration.Configuration;
 import org.cryptomator.siv.SivMode;

src/main/java/net/limework/rediskript/events/RedisMessageEvent.java

@@ -1,4 +1,4 @@
-package net.limework.core.events;
+package net.limework.rediskript.events;
 
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;

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

@@ -0,0 +1,281 @@
+package net.limework.rediskript.managers;
+
+import ch.njol.skript.registrations.Classes;
+import ch.njol.skript.variables.Variables;
+import net.limework.rediskript.RediSkript;
+import net.limework.rediskript.data.Encryption;
+import net.limework.rediskript.events.RedisMessageEvent;
+import org.bukkit.Bukkit;
+import org.bukkit.ChatColor;
+import org.bukkit.configuration.Configuration;
+import org.cryptomator.siv.UnauthenticCiphertextException;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import redis.clients.jedis.BinaryJedis;
+import redis.clients.jedis.BinaryJedisPubSub;
+import redis.clients.jedis.JedisPool;
+import redis.clients.jedis.JedisPoolConfig;
+import redis.clients.jedis.exceptions.JedisConnectionException;
+
+import javax.crypto.IllegalBlockSizeException;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
+import java.util.List;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+public class RedisManager extends BinaryJedisPubSub implements Runnable {
+
+    private ExecutorService RedisReconnector;
+    private RediSkript plugin;
+
+    private JedisPool jedisPool;
+    private ExecutorService RedisService;
+
+
+    //sub
+    private BinaryJedis subscribeJedis;
+    private List<String> channels;
+    private AtomicBoolean isShuttingDown = new AtomicBoolean(false);
+    private Encryption encryption;
+
+
+    public RedisManager(RediSkript plugin) {
+        this.plugin = plugin;
+        Configuration config = this.plugin.getConfig();
+        JedisPoolConfig JConfig = new JedisPoolConfig();
+        int maxConnections = config.getInt("Redis.MaxConnections");
+        if (maxConnections < 2) { maxConnections = 2; }
+
+        JConfig.setMaxTotal(maxConnections);
+        JConfig.setMaxIdle(maxConnections);
+        JConfig.setMinIdle(1);
+        JConfig.setBlockWhenExhausted(true);
+        this.jedisPool = new JedisPool(JConfig,
+                config.getString("Redis.Host"),
+                config.getInt("Redis.Port"),
+                config.getInt("Redis.TimeOut"),
+                config.getString("Redis.Password"),
+                config.getBoolean("Redis.useTLS"));
+        RedisReconnector = Executors.newSingleThreadExecutor();
+        RedisService = Executors.newSingleThreadExecutor();
+        try {
+            this.subscribeJedis = this.jedisPool.getResource();
+        } catch (Exception ignored) {
+        }
+        this.channels = config.getStringList("Channels");
+        encryption = new Encryption(config);
+
+    }
+
+    public void start() {
+        this.RedisReconnector.execute(this);
+    }
+
+    @Override
+    public void run() {
+        while (!isShuttingDown.get() && plugin.isEnabled()) {
+            try {
+                plugin.getLogger().info(ChatColor.translateAlternateColorCodes('&', "&cConnecting to redis..."));
+                if (!this.subscribeJedis.isConnected()) this.subscribeJedis = this.jedisPool.getResource();
+                plugin.getLogger().info(ChatColor.translateAlternateColorCodes('&', "&aRedis connected!"));
+                int byteArr2dSize = 1;
+                byte[][] channelsInByte = new byte[channels.size()][byteArr2dSize];
+                boolean reInitializeByteArray;
+                // Loop that reInitialize array IF array size is not enough
+                do {
+                    reInitializeByteArray = false;
+                    try {
+                        /* Data Initialization for channelsInByte array from List<String> channels */
+                        for (int x = 0; x < channels.size(); x++) {
+                            channelsInByte[x] = channels.get(x).getBytes(StandardCharsets.UTF_8);
+                        }
+                    } catch (ArrayIndexOutOfBoundsException ex) {
+                        reInitializeByteArray = true;
+                        /* Increase the current 2d array size to increase 1 and reinitialize the array*/
+                        byteArr2dSize += 1;
+                        channelsInByte = new byte[channels.size()][byteArr2dSize];
+                    }
+                } while (reInitializeByteArray);
+                this.subscribeJedis.subscribe(this, channelsInByte);
+
+
+            } catch (Exception e) {
+                if (isShuttingDown.get() || !plugin.isEnabled()) {
+                    return;
+                }
+                plugin.getLogger().warning(ChatColor.translateAlternateColorCodes('&', "&cConnection to redis has failed! &cReconnecting..."));
+                if (this.subscribeJedis != null) {
+                    this.subscribeJedis.close();
+                }
+            }
+            try {
+                Thread.sleep(1000);
+            } catch (InterruptedException e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    @Override
+    public void onMessage(byte[] channel, byte[] message) {
+        String channelString = new String(channel, StandardCharsets.UTF_8);
+        String receivedMessage = null;
+        try {
+            //if encryption is enabled, decrypt the message, else just convert binary to string
+            if (this.encryption.isEncryptionEnabled()) {
+                try {
+                    receivedMessage = encryption.decrypt(message);
+                } catch (UnauthenticCiphertextException | IllegalBlockSizeException e) {
+                    e.printStackTrace();
+                }
+
+            } else {
+                //encryption is disabled, so let's just get the string
+                receivedMessage = new String(message, StandardCharsets.UTF_8);
+            }
+            if (receivedMessage != null) {
+                JSONObject j = new JSONObject(receivedMessage);
+                if (j.get("Type").equals("Skript")) {
+                    JSONArray messages = j.getJSONArray("Messages");
+                    RedisMessageEvent event;
+                    for (int i = 0; i < messages.length(); i++) {
+                        event = new RedisMessageEvent(channelString, messages.get(i).toString(), j.getLong("Date"));
+                        //if plugin is disabling, don't call events anymore
+                        if (plugin.isEnabled()) {
+                            RedisMessageEvent finalEvent = event;
+                            Bukkit.getScheduler().runTask(plugin, () -> plugin.getServer().getPluginManager().callEvent(finalEvent));
+                        }
+                    }
+                } else if (j.get("Type").equals("SkriptVariables")) {
+
+                    //Transfer variables between servers
+
+                    JSONArray variableNames = j.getJSONArray("Names");
+                    Object inputValue;
+                    String changeValue = null;
+                    JSONArray variableValues = null;
+                    if (!j.isNull("Values")) {
+                        variableValues = j.getJSONArray("Values");
+                    }
+                    for (int i = 0; i < variableNames.length(); i++) {
+
+                        if (j.isNull("Values")) {
+                            //only check for SET here, because null has to be ignored in all other cases
+
+                            if (j.getString("Operation").equals("SET")) {
+                                Variables.setVariable(variableNames.get(i).toString(), null, null, false);
+                            }
+
+                        } else {
+                            if (!variableValues.isNull(i)) {
+                                changeValue = variableValues.get(i).toString();
+                            }
+                            String[] inputs = changeValue.split("\\^", 2);
+                            inputValue = Classes.deserialize(inputs[0], Base64.getDecoder().decode(inputs[1]));
+                            switch (j.getString("Operation")) {
+                                case "ADD":
+                                    //I will add this once someone tells me how to remove from Skript variable
+                                    //because using SET operation has issues with inconvertible types (Double and Long)
+                                    //variable = (Variable) Variables.getVariable(variableNames.get(i).toString(), null, false);
+                                    // variable.change(null, (Object[]) inputValue, Changer.ChangeMode.REMOVE);
+                                case "REMOVE":
+                                    //I will add this once someone tells me how to remove from Skript variable
+                                    //because using SET operation has issues with inconvertible types (Double and Long)
+                                    //variable = (Variable) Variables.getVariable(variableNames.get(i).toString(), null, false);
+                                   // variable.change(null, (Object[]) inputValue, Changer.ChangeMode.REMOVE);
+                                    break;
+                                case "SET":
+                                    Variables.setVariable(variableNames.get(i).toString(), inputValue, null, false);
+                            }
+                        }
+                    }
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
+            Bukkit.getLogger().warning(ChatColor.translateAlternateColorCodes('&', "&cI got a message that was empty from channel " + channelString + " please check your code that you used to send the message. Message content:"));
+            Bukkit.getLogger().warning(receivedMessage);
+        }
+
+    }
+    public void sendMessage(String[] message, String channel) {
+        JSONObject json = new JSONObject();
+        json.put("Messages", new JSONArray(message));
+        json.put("Type", "Skript");
+        json.put("Date", System.currentTimeMillis()); //for unique string every time & PING calculations
+        finishSendMessage(json, channel);
+    }
+    public void sendVariables(String[] variableNames, String[] variableValues, String channel, String operation) {
+        JSONObject json = new JSONObject();
+        json.put("Names", new JSONArray(variableNames));
+        if (variableValues != null) {
+            json.put("Values", new JSONArray(variableValues));
+        }
+
+        json.put("Type", "SkriptVariables");
+        json.put("Date", System.currentTimeMillis()); //for unique string every time & PING calculations
+        json.put("Operation", operation);
+        finishSendMessage(json, channel);
+    }
+
+    public void finishSendMessage(JSONObject json, String channel) {
+        try {
+            byte[] message;
+            if (this.getEncryption().isEncryptionEnabled()) {
+                message = this.getEncryption().encrypt(json.toString());
+            } else {
+                message = json.toString().getBytes(StandardCharsets.UTF_8);
+            }
+            //execute sending of redis message on the main thread if plugin is disabling
+            //so it can still process the sending
+
+            //sending a redis message blocks main thread if there's no more connections available
+            //so to avoid issues, it's best to do it always on separate thread
+            if (plugin.isEnabled()) {
+                this.getRedisService().execute(() -> {
+                    BinaryJedis j = this.getJedisPool().getResource();
+                    j.publish(channel.getBytes(StandardCharsets.UTF_8), message);
+                    j.close();
+                });
+            } else {
+                BinaryJedis j = this.getJedisPool().getResource();
+                j.publish(channel.getBytes(StandardCharsets.UTF_8), message);
+                j.close();
+            }
+        } catch (JedisConnectionException exception) {
+            exception.printStackTrace();
+        }
+    }
+
+    public void shutdown() {
+        this.isShuttingDown.set(true);
+        if (this.subscribeJedis != null) {
+            this.unsubscribe();
+            this.subscribeJedis.close();
+            this.subscribeJedis.getClient().close();
+            this.jedisPool.getResource().close();
+        }
+        isShuttingDown.set(true);
+        this.RedisReconnector.shutdown();
+        this.RedisService.shutdown();
+        this.RedisService = null;
+        this.RedisReconnector = null;
+
+    }
+    public void reload() {
+        this.shutdown();
+        plugin.startRedis(true);
+    }
+
+    public JedisPool getJedisPool() {
+        return jedisPool;
+    }
+
+    public Encryption getEncryption() {
+        return encryption;
+    }
+
+    public ExecutorService getRedisService() { return RedisService; }
+}

src/main/java/net/limework/rediskript/skript/SkriptHook.java

@@ -1,4 +1,4 @@
-package net.limework.core.hooks;
+package net.limework.rediskript.skript;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptAddon;
@@ -6,23 +6,21 @@ import ch.njol.skript.lang.ExpressionType;
 import ch.njol.skript.registrations.EventValues;
 import ch.njol.skript.util.Date;
 import ch.njol.skript.util.Getter;
-import net.limework.core.RediSkript;
-import net.limework.core.events.RedisMessageEvent;
-import net.limework.core.skript.elements.EvtRedis;
-import net.limework.core.skript.elements.ExprChannel;
-import net.limework.core.skript.elements.ExprMessage;
-import net.limework.core.skript.elements.ExprMessageDate;
+import ch.njol.skript.util.Timespan;
+import net.limework.rediskript.RediSkript;
+import net.limework.rediskript.events.RedisMessageEvent;
+import net.limework.rediskript.skript.elements.*;
 
 import java.io.IOException;
 
 public class SkriptHook {
-
-    private SkriptAddon addon;
     public SkriptHook(RediSkript plugin) {
-        addon = Skript.registerAddon(plugin);
+        SkriptAddon addon = Skript.registerAddon(plugin);
         try {
-            addon.loadClasses("net.limework.core.skript", "elements");
+            addon.loadClasses("net.limework.rediskript.skript", "elements");
             Skript.registerEvent("redis message", EvtRedis.class, RedisMessageEvent.class, "redis message");
+            Skript.registerExpression(ExprVariableInChannel.class, Object.class, ExpressionType.PROPERTY, "variable[s] %strings% in [redis] [channel] %string%");
+
             Skript.registerExpression(ExprChannel.class, String.class, ExpressionType.SIMPLE, "redis channel");
             EventValues.registerEventValue(RedisMessageEvent.class, String.class, new Getter<String, RedisMessageEvent>() {
                 @Override

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

@@ -1,24 +1,18 @@
-package net.limework.core.skript.elements;
+package net.limework.rediskript.skript.elements;
 
 import ch.njol.skript.Skript;
 import ch.njol.skript.lang.Effect;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser;
 import ch.njol.util.Kleenean;
-import net.limework.core.RediSkript;
-import net.limework.core.managers.RedisManager;
+import net.limework.rediskript.RediSkript;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.event.Event;
-import org.json.JSONObject;
-import redis.clients.jedis.BinaryJedis;
-import redis.clients.jedis.exceptions.JedisConnectionException;
-
-import java.nio.charset.StandardCharsets;
 
 public class EffSendMessage extends Effect {
     static {
-        Skript.registerEffect(EffSendMessage.class, "send redis message %string% to [channel] %string%");
+        Skript.registerEffect(EffSendMessage.class, "send redis message[s] %strings% to [channel] %string%");
     }
 
 
@@ -31,10 +25,9 @@ public class EffSendMessage extends Effect {
 
         RediSkript plugin = (RediSkript) Bukkit.getPluginManager().getPlugin("RediSkript");
 
-        String message = this.message.getSingle(event);
+        String[] message = this.message.getAll(event);
         String channel = this.channel.getSingle(event);
-
-        if (message == null) {
+        if (message[0] == null) {
             Bukkit.getLogger().warning(ChatColor.translateAlternateColorCodes('&', "&2[&aRediSkript&a] &cRedis message was empty. Please check your code."));
             return;
         }
@@ -42,33 +35,12 @@ public class EffSendMessage extends Effect {
             Bukkit.getLogger().warning(ChatColor.translateAlternateColorCodes('&', "&2[&aRediSkript&a] &cChannel was empty. Please check your code."));
             return;
         }
-        assert plugin != null;
-        JSONObject json = new JSONObject();
-        json.put("Message", message);
-        json.put("Type", "Skript");
-        json.put("Date", System.currentTimeMillis()); //for unique string every time & PING calculations
-        byte[] msg;
-        RedisManager manager = plugin.getRm();
-
-        if (manager.getEncryption().isEncryptionEnabled()) {
-            msg = manager.getEncryption().encrypt(json.toString());
-        } else {
-            msg = json.toString().getBytes(StandardCharsets.UTF_8);
-        }
-        try {
-            BinaryJedis j = manager.getJedisPool().getResource();
-
-            j.publish(channel.getBytes(StandardCharsets.UTF_8), msg);
-            j.close();
-        } catch (JedisConnectionException exception) {
-            exception.printStackTrace();
-        }
-
+        plugin.getRm().sendMessage(message, channel);
     }
 
     @Override
     public String toString(Event event, boolean debug) {
-        return "send redis message " + message.getSingle(event) + " to channel " + channel.getSingle(event);
+        return "send redis message " + message.toString(event, debug) + " to channel " + channel.toString(event, debug);
     }
 
     @SuppressWarnings("unchecked")

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

@@ -1,14 +1,14 @@
-package net.limework.core.skript.elements;
+package net.limework.rediskript.skript.elements;
 import ch.njol.skript.lang.Literal;
 import ch.njol.skript.lang.SkriptEvent;
 import ch.njol.skript.lang.SkriptParser;
-import net.limework.core.events.RedisMessageEvent;
+import net.limework.rediskript.events.RedisMessageEvent;
 import org.bukkit.event.Event;
 
 public class EvtRedis extends SkriptEvent {
 
     @Override
-    public boolean init(Literal<?>[] literals, int i, SkriptParser.ParseResult parseResult) {
+    public boolean init(final Literal<?>[] literals, final int i, final SkriptParser.ParseResult parseResult) {
         return true;
     }
 

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

@@ -1,4 +1,4 @@
-package net.limework.core.skript.elements;
+package net.limework.rediskript.skript.elements;
 
 
 import ch.njol.skript.ScriptLoader;
@@ -8,7 +8,7 @@ import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.skript.log.ErrorQuality;
 import ch.njol.util.Kleenean;
-import net.limework.core.events.RedisMessageEvent;
+import net.limework.rediskript.events.RedisMessageEvent;
 import org.bukkit.event.Event;
 
 public class ExprChannel extends SimpleExpression<String> {

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

@@ -1,4 +1,4 @@
-package net.limework.core.skript.elements;
+package net.limework.rediskript.skript.elements;
 
 
 import ch.njol.skript.ScriptLoader;
@@ -8,7 +8,7 @@ import ch.njol.skript.lang.SkriptParser;
 import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.skript.log.ErrorQuality;
 import ch.njol.util.Kleenean;
-import net.limework.core.events.RedisMessageEvent;
+import net.limework.rediskript.events.RedisMessageEvent;
 import org.bukkit.event.Event;
 
 public class ExprMessage extends SimpleExpression<String> {

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

@@ -1,4 +1,4 @@
-package net.limework.core.skript.elements;
+package net.limework.rediskript.skript.elements;
 
 
 import ch.njol.skript.ScriptLoader;
@@ -9,7 +9,7 @@ import ch.njol.skript.lang.util.SimpleExpression;
 import ch.njol.skript.log.ErrorQuality;
 import ch.njol.skript.util.Date;
 import ch.njol.util.Kleenean;
-import net.limework.core.events.RedisMessageEvent;
+import net.limework.rediskript.events.RedisMessageEvent;
 import org.bukkit.event.Event;
 
 public class ExprMessageDate extends SimpleExpression<Date> {

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

@@ -0,0 +1,88 @@
+package net.limework.rediskript.skript.elements;
+
+import ch.njol.skript.classes.Changer;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser;
+import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.registrations.Classes;
+import ch.njol.skript.variables.SerializedVariable;
+import ch.njol.util.Kleenean;
+import ch.njol.util.coll.CollectionUtils;
+import net.limework.rediskript.RediSkript;
+import org.bukkit.Bukkit;
+import org.bukkit.event.Event;
+
+import java.util.Base64;
+
+public class ExprVariableInChannel extends SimpleExpression<Object> {
+    private Expression<String> name;
+    private Expression<String> channel;
+    @Override
+    public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parser) {
+       //if (expressions[0] instanceof Variable) {
+       //    Variable<?> variable = (Variable<?>) expressions[0];
+       //    System.out.println(variable.getName().toString());
+       //    String var = variable.getName().toString();
+       //    var = var.substring(1, var.length() - 1);
+
+       //}
+        name = (Expression<String>) expressions[0];
+        channel = (Expression<String>) expressions[1];
+        return true;
+
+    }
+
+    @Override
+    protected Object[] get(Event event) {
+        return null;
+    }
+
+    @Override
+    public boolean isSingle() {
+        return true;
+    }
+
+    @Override
+    public Class<? extends Object> getReturnType() {
+        return Object.class;
+    }
+
+    @Override
+    public String toString(Event event, boolean b) {
+        return "variable in redis channel";
+    }
+    @Override
+    public void change(Event e, Object[] changer, Changer.ChangeMode mode) {
+        RediSkript plugin = (RediSkript) Bukkit.getPluginManager().getPlugin("RediSkript");
+        switch (mode) {
+            case ADD:
+            case SET:
+            case REMOVE:
+                SerializedVariable.Value serialized;
+                String encoded;
+                String[] values = new String[changer.length+1];
+                for( int i = 0; i < changer.length; i++) {
+                    if (changer[i] != null) {
+                        serialized = Classes.serialize(changer[i]);
+                        encoded = Base64.getEncoder().encodeToString(serialized.data);
+                        encoded = serialized.type + "^" + encoded;
+                        values[i] = encoded;
+                    }
+                }
+                String operation = mode.toString();
+                plugin.getRm().sendVariables(name.getAll(e), values, channel.getSingle(e), operation);
+                break;
+            case DELETE:
+                plugin.getRm().sendVariables(name.getAll(e), null, channel.getSingle(e), "SET");
+                break;
+        }
+    }
+    @Override
+    public Class<?>[] acceptChange(Changer.ChangeMode mode) {
+        //if (mode == Changer.ChangeMode.DELETE || mode == Changer.ChangeMode.SET || mode == Changer.ChangeMode.ADD || mode == Changer.ChangeMode.REMOVE)
+        if (mode == Changer.ChangeMode.DELETE || mode == Changer.ChangeMode.SET)
+            return CollectionUtils.array(Object.class);
+
+        return null;
+    }
+}

src/main/resources/plugin.yml

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