Remove Skript plugin check, as it doesn't load without it anyway

Oops forgot one more console message
Improve console messages
2020-11-02 12:09:18 +02:00 · 2020-10-31 17:12:13 +02:00 · 2020-10-31 16:48:42 +02:00 · 2020-10-29 10:01:36 +02:00 · 2020-10-29 09:47:18 +02:00 · 2020-10-28 12:20:27 +02:00
38 changed files with 726 additions and 494 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
 target
 out
-.idea
+.idea/workspace.xml
 compile
-*.iml
--- a/.idea/.name
+++ b/.idea/.name
@@ -0,0 +1 @@
+RediSkript
--- a/.idea/artifacts/RediSkript_jar.xml
+++ b/.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$/out/artifacts/RediSkript_jar</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>
--- a/.idea/compiler.xml
+++ b/.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>
--- a/.idea/discord.xml
+++ b/.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>
--- a/.idea/jarRepositories.xml
+++ b/.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>
--- a/.idea/libraries/Maven__com_github_skriptlang_Skript_2_4_1.xml
+++ b/.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>
--- a/.idea/libraries/Maven__org_apache_commons_commons_pool2_2_6_2.xml
+++ b/.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>
--- a/.idea/libraries/Maven__org_cryptomator_siv_mode_1_4_0.xml
+++ b/.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>
--- a/.idea/libraries/Maven__org_json_json_20190722.xml
+++ b/.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>
--- a/.idea/libraries/Maven__org_spigotmc_spigot_api_1_16_2_R0_1_SNAPSHOT.xml
+++ b/.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>
--- a/.idea/libraries/Maven__redis_clients_jedis_3_3_0.xml
+++ b/.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>
--- a/.idea/misc.xml
+++ b/.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>
--- a/.idea/modules.xml
+++ b/.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>
--- a/.idea/uiDesigner.xml
+++ b/.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>
--- a/.idea/vcs.xml
+++ b/.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>
--- a/README.md
+++ b/README.md
@@ -1,2 +1,57 @@
-# SkLimework
-Private addon
+**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:
+```
+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:
+    send redis message arg 1 to channel arg 2
+    send redis message "hello world!" to channel "world"
+```
+
+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.
+
+Configuration:
+```
+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"
+  Host: "127.0.0.1"
+  #must be 2 or higher, if you set to lower, the addon will automatically use 2 as a minimum
+  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
+  #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 completely secure
+  useTLS: false
+  #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: "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!
+Channels:
+  - "Channel1"
+  - "Channel2"
+  - "Channel3"
+  ```
--- a/RediSkript.iml
+++ b/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>
--- a/pom.xml
+++ b/pom.xml
@@ -5,8 +5,8 @@
    <modelVersion>4.0.0</modelVersion>

    <groupId>net.limework.core</groupId>
-    <artifactId>LimeworkSpigotCore</artifactId>
-    <version>1.0.3-SNAPSHOT</version>
+    <artifactId>RediSkript</artifactId>
+    <version>1.2.2</version>
    <packaging>jar</packaging>
 	
    <build>
@@ -27,95 +27,62 @@
                    <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>
            <url>https://jitpack.io</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>
+            <id>commons-pool2</id>
+            <url>https://mvnrepository.com/artifact/org.apache.commons/commons-pool2</url>
+
        </repository>
    </repositories>

    <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>
            <groupId>org.spigotmc</groupId>
            <artifactId>spigot-api</artifactId>
-            <version>1.16.1-R0.1-SNAPSHOT</version>
+            <version>1.16.2-R0.1-SNAPSHOT</version>
            <scope>provided</scope>
        </dependency>
-    <dependency>
-        <groupId>com.google.code.gson</groupId>
-        <artifactId>gson</artifactId>
-        <version>2.8.6</version>
-    </dependency>
    <dependency>
        <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>
-    </dependency>
-        <dependency>
-            <groupId>org.jetbrains</groupId>
-            <artifactId>annotations</artifactId>
-            <version>19.0.0</version>
        <scope>compile</scope>
    </dependency>
+    <!-- https://mvnrepository.com/artifact/org.apache.commons/commons-pool2 -->
    <dependency>
-            <groupId>org.mongodb</groupId>
-            <artifactId>mongodb-driver-sync</artifactId>
-            <version>4.0.4</version>
+        <groupId>org.apache.commons</groupId>
+        <artifactId>commons-pool2</artifactId>
+        <version>2.6.2</version>
+        <scope>compile</scope>
    </dependency>
    </dependencies>
 </project>
--- a/src/main/java/META-INF/MANIFEST.MF
+++ b/src/main/java/META-INF/MANIFEST.MF
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Main-Class: net.limework.rediskript.RediSkript
+
--- a/src/main/java/net/limework/core/LimeworkSpigotCore.java
+++ b/src/main/java/net/limework/core/LimeworkSpigotCore.java
@@ -1,58 +0,0 @@
-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;
-
-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 {
-            getLogger().info("Skript wasn't found.");
-        }
-        rm.start();
-        try {
-            ControlGui controlGui = new ControlGui(this);
-            this.getServer().getPluginManager().registerEvents(controlGui, this);
-            this.getCommand("control").setExecutor(controlGui);
-        } catch (NoSuchFieldError e) {
-            getLogger().info("SOMETHING WENT WRONG WHEN LOADING control gui.");
-            e.printStackTrace();
-        }
-        dsm = new DataSourcesManager(this);
-
-
-
-
-    }
-
-    @Override
-    public void onDisable() {
-        rm.shutdown();
-        dsm.shutdown();
-    }
-
-
-    public RedisManager getRm() {
-        return rm;
-    }
-
-    public DataSourcesManager getDsm() {
-        return dsm;
-    }
-}
--- a/src/main/java/net/limework/core/Skript/elements/EffSendMessage.java
+++ b/src/main/java/net/limework/core/Skript/elements/EffSendMessage.java
@@ -1,70 +0,0 @@
-package net.limework.core.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.LimeworkSpigotCore;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.event.Event;
-import org.json.JSONObject;
-import redis.clients.jedis.BinaryJedis;
-
-import java.nio.charset.StandardCharsets;
-
-public class EffSendMessage extends Effect {
-    //"hi"
-    static {
-        Skript.registerEffect(EffSendMessage.class, "send redis message to channel %string% with message %string%");
-    }
-
-
-    private Expression<String> channel;
-    private Expression<String> message;
-
-
-    @Override
-    protected void execute(Event event) {
-        LimeworkSpigotCore plugin = (LimeworkSpigotCore) Bukkit.getPluginManager().getPlugin("LimeworkSpigotCore");
-        String message = this.message.getSingle(event);
-        String channel = this.channel.getSingle(event);
-        if (message == null) {//checks if message equals null if true does not execute.
-            Bukkit.getLogger().warning(ChatColor.translateAlternateColorCodes('&', "&2[&aGBot&a] &cMessage Was empty Please check your code."));
-            return;
-        }
-        assert plugin != null;
-        plugin.getRm().getRedisService().execute(() -> {
-            BinaryJedis j = plugin.getRm().getJedisPool().getResource();
-            JSONObject json = new JSONObject();
-            json.put("Message", message);
-            json.put("Type", "Skript");
-            json.put("Date", System.nanoTime()); //for unique string every time & PING calculations
-            byte[] msg;
-            if (plugin.getRm().getEncryption().isEncryptionEnabled()) {
-                msg = plugin.getRm().getEncryption().encrypt(json.toString());
-            } else {
-                msg = message.getBytes(StandardCharsets.UTF_8);
-            }
-            j.publish(channel.getBytes(), msg);
-            //System.out.println("SkriptSide sent MESSAGE: ["+ message + "] to channel: " + channel + " and json: \n" + json.toString());
-            j.close();
-        });
-
-    }
-
-    @Override
-    public String toString(Event event, boolean b) {
-        return null;
-    }
-
-    @SuppressWarnings("unchecked")
-    @Override
-    public boolean init(Expression<?>[] expressions, int matchedPattern, Kleenean isDelayed, SkriptParser.ParseResult parser) {
-        this.channel = (Expression<String>) expressions[0];
-        this.message = (Expression<String>) expressions[1];
-        return true;
-    }
-
-}
--- a/src/main/java/net/limework/core/abstraction/Gui.java
+++ b/src/main/java/net/limework/core/abstraction/Gui.java
@@ -1,69 +0,0 @@
-package net.limework.core.abstraction;
-
-import ch.njol.skript.Skript;
-import org.bukkit.Bukkit;
-import org.bukkit.ChatColor;
-import org.bukkit.Material;
-import org.bukkit.inventory.Inventory;
-import org.bukkit.inventory.ItemStack;
-import org.bukkit.inventory.meta.ItemMeta;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import static org.bukkit.ChatColor.translateAlternateColorCodes;
-
-public abstract class Gui {
-    protected Inventory gui;
-    private int rows;
-    private boolean loaded = false;
-    protected String name;
-
-
-    protected void setup(String name, int rows) {
-        if (loaded) {
-            return;
-        }
-        loaded = true;
-        this.rows = 9 * rows;
-        this.name = ChatColor.translateAlternateColorCodes('&', name);
-        gui = Bukkit.createInventory(null, this.rows, this.name);
-    }
-
-
-    protected void makeItem(Material material, int howMany, int slot,  String name) {
-        ItemStack item = new ItemStack(material, 1);
-        ItemMeta item_meta = item.getItemMeta();
-        item_meta.setDisplayName(translateAlternateColorCodes('&', name));
-        item.setItemMeta(item_meta);
-        item.setAmount(howMany);
-        this.gui.clear(slot);
-        this.gui.setItem(slot, item);
-    }
-
-    protected void makeItem(Material material, int howMany, int slot,  String name, String... Lore) {
-        ItemStack item = new ItemStack(material, 1);
-        ItemMeta item_meta = item.getItemMeta();
-        item_meta.setDisplayName(translateAlternateColorCodes('&', name));
-        List<String> lore = new ArrayList<>();
-        for (String s : Lore) {
-            lore.add(translateAlternateColorCodes('&', s));
-        }
-        item_meta.setLore(lore);
-        item.setItemMeta(item_meta);
-        item.setAmount(howMany);
-        this.gui.clear(slot);
-        this.gui.setItem(slot, item);
-    }
-
-    protected void fillGUI(Material material) {
-        int slot = -1;
-        while (slot <= (this.rows - 2)) {
-            slot++;
-            makeItem(material, 1, slot , "&1.", "");
-        }
-
-    }
-
-
-}
--- a/src/main/java/net/limework/core/guis/ControlGui.java
+++ b/src/main/java/net/limework/core/guis/ControlGui.java
@@ -1,90 +0,0 @@
-package net.limework.core.guis;
-
-import net.limework.core.LimeworkSpigotCore;
-import net.limework.core.abstraction.Gui;
-import org.bukkit.*;
-import org.bukkit.command.Command;
-import org.bukkit.command.CommandExecutor;
-import org.bukkit.command.CommandSender;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.Listener;
-import org.bukkit.event.inventory.InventoryClickEvent;
-import org.jetbrains.annotations.NotNull;
-
-public class ControlGui extends Gui implements Listener, CommandExecutor {
-    private LimeworkSpigotCore plugin;
-
-    public ControlGui(LimeworkSpigotCore plugin) {
-        this.plugin = plugin;
-        setup("&cServer Control", 6);
-        //fillGUI(Material.LIME_STAINED_GLASS_PANE);
-        makeItem(Material.CRAFTING_TABLE, 1, 10, "&eCreative mode", "&cClick this for creative mode.");
-        makeItem(Material.DIAMOND_SWORD, 1, 12, "&eSurvival Mode", "&bClick this for Survival mode.");
-        makeItem(Material.DIAMOND, 1, 14, "&eSpectator Mode", "&eClick this for Spectator mode.");
-        makeItem(Material.PUFFERFISH, 1, 16, "&eAdventure Mode", "&aClick this for Adventure mode.");
-        plugin.getServer().getScheduler().runTaskTimer(plugin, () -> {
-            makeItem(Material.OAK_SIGN, 1, 37, "&eRam: " + ((Runtime.getRuntime().totalMemory() - Runtime.getRuntime().freeMemory()) / 1000000) + "MB/" + (Runtime.getRuntime().totalMemory() / 1000000) + "MB");
-            makeItem(Material.PLAYER_HEAD, 1, 40, "&eOnline Players: " + plugin.getServer().getOnlinePlayers().size() + "/" + plugin.getServer().getMaxPlayers());
-        }, 0, 20);
-        makeItem(Material.RED_WOOL, 1, 53, "&c&lShutdown the server");
-    }
-
-
-    @Override
-    public boolean onCommand(@NotNull CommandSender sender, @NotNull Command cmd, @NotNull String label, @NotNull String[] args) {
-        if (sender instanceof Player) {
-            Player p = ((Player) sender);
-            p.openInventory(gui);
-        }
-        return false;
-    }
-
-    @EventHandler
-    public void onInventory(InventoryClickEvent e) {
-        if (e.getInventory() == gui) {
-            e.setCancelled(true);
-            Player p = (Player) e.getWhoClicked();
-            switch (e.getSlot()) {
-                case 10: {
-                    p.setGameMode(GameMode.CREATIVE);
-                    p.closeInventory();
-                    p.playSound(p.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1.0f, 2.0f);
-                    break;
-                }
-                case 12: {
-                    p.setGameMode(GameMode.SURVIVAL);
-                    p.closeInventory();
-                    p.playSound(p.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1.0f, 2.0f);
-                    break;
-                }
-                case 14: {
-                    p.setGameMode(GameMode.SPECTATOR);
-                    p.closeInventory();
-                    p.playSound(p.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1.0f, 2.0f);
-                    break;
-                }
-                case 16: {
-                    p.setGameMode(GameMode.ADVENTURE);
-                    p.closeInventory();
-                    p.playSound(p.getLocation(), Sound.ENTITY_PLAYER_LEVELUP, 1.0f, 2.0f);
-                    break;
-                }
-                case 53: {
-                    p.closeInventory();
-                    plugin.getServer().shutdown();
-                    break;
-                }
-                default: {
-                    p.playSound(p.getLocation(), Sound.ENTITY_ENDERMAN_TELEPORT, 1.0f, 0.0f);
-                    break;
-                }
-            }
-
-
-        }
-
-    }
-
-
-}
--- a/src/main/java/net/limework/core/managers/DataSourcesManager.java
+++ b/src/main/java/net/limework/core/managers/DataSourcesManager.java
@@ -1,29 +0,0 @@
-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;
-    }
-}
--- a/src/main/java/net/limework/rediskript/RediSkript.java
+++ b/src/main/java/net/limework/rediskript/RediSkript.java
@@ -0,0 +1,45 @@
+package net.limework.rediskript;
+import net.limework.rediskript.commands.CommandReloadRedis;
+import net.limework.rediskript.skript.SkriptHook;
+import net.limework.rediskript.managers.RedisManager;
+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.HIGHEST)
+    public void onDisable() {
+        if (rm != null) {
+            rm.shutdown();
+        }
+    }
+
+
+    public RedisManager getRm() {
+        return rm;
+    }
+}
--- a/src/main/java/net/limework/rediskript/commands/CommandReloadRedis.java
+++ b/src/main/java/net/limework/rediskript/commands/CommandReloadRedis.java
@@ -0,0 +1,30 @@
+package net.limework.rediskript.commands;
+
+import net.limework.rediskript.RediSkript;
+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.entity.Player;
+
+public class CommandReloadRedis implements CommandExecutor {
+    private RediSkript plugin;
+    public CommandReloadRedis(RediSkript plugin) {
+        this.plugin = plugin;
+    }
+    @Override
+    public boolean onCommand(CommandSender sender, Command cmd, String label, String[] args) {
+        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.")));
+            return true;
+        }
+        plugin.getRm().reload();
+        //not sending to sender, because this command can only be executed via console
+        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;
+    }
+}
--- a/src/main/java/net/limework/rediskript/data/Encryption.java
+++ b/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;
@@ -26,11 +26,11 @@ public class Encryption {
    public boolean isEncryptionEnabled() { return encryptionEnabled; }

    public String decrypt(byte[] message) throws UnauthenticCiphertextException, IllegalBlockSizeException {
-        return new String(AES_SIV.decrypt(encryptionKey.getBytes(), macKey.getBytes(), message), StandardCharsets.UTF_8);
+        return new String(AES_SIV.decrypt(encryptionKey.getBytes(StandardCharsets.UTF_8), macKey.getBytes(StandardCharsets.UTF_8), message), StandardCharsets.UTF_8);
    }

    public byte[] encrypt(String message) {
-        return AES_SIV.encrypt(encryptionKey.getBytes(), macKey.getBytes(), message.getBytes());
+        return AES_SIV.encrypt(encryptionKey.getBytes(StandardCharsets.UTF_8), macKey.getBytes(StandardCharsets.UTF_8), message.getBytes(StandardCharsets.UTF_8));
    }


--- a/src/main/java/net/limework/rediskript/events/RedisMessageEvent.java
+++ b/src/main/java/net/limework/rediskript/events/RedisMessageEvent.java
@@ -1,6 +1,5 @@
-package net.limework.core.events;
+package net.limework.rediskript.events;

-import org.bukkit.Bukkit;
 import org.bukkit.event.Event;
 import org.bukkit.event.HandlerList;

@@ -10,11 +9,13 @@ public class RedisMessageEvent extends Event {

    private String channelName;
    private String message;
+    private long date;

-    public RedisMessageEvent(String channelName , String message) {
-        super(true);
+    public RedisMessageEvent(String channelName , String message, long date) {
+        super(false);
        this.channelName = channelName;
        this.message = message;
+        this.date = date;
    }


@@ -35,6 +36,8 @@ public class RedisMessageEvent extends Event {
        return channelName;
    }

+    public long getDate() { return date;}
+
    public String getMessage() {
        return message;
    }
--- a/src/main/java/net/limework/rediskript/managers/RedisManager.java
+++ b/src/main/java/net/limework/rediskript/managers/RedisManager.java
@@ -1,18 +1,12 @@
-package net.limework.core.managers;
+package net.limework.rediskript.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 net.limework.rediskript.RediSkript;
+import net.limework.rediskript.events.RedisMessageEvent;
+import net.limework.rediskript.data.Encryption;
 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;
@@ -20,14 +14,15 @@ 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, CommandExecutor {
+public class RedisManager extends BinaryJedisPubSub implements Runnable {

-    private LimeworkSpigotCore plugin;
+    private RediSkript plugin;

    private JedisPool jedisPool;
    private ExecutorService RedisService;
@@ -37,16 +32,18 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable, Command
    private BinaryJedis subscribeJedis;
    private List<String> channels;
    private AtomicBoolean isShuttingDown = new AtomicBoolean(false);
-    private AtomicBoolean isRedisOnline = new AtomicBoolean();
    private Encryption encryption;


-    public RedisManager(LimeworkSpigotCore plugin) {
+    public RedisManager(RediSkript plugin) {
        this.plugin = plugin;
        Configuration config = this.plugin.getConfig();
        JedisPoolConfig JConfig = new JedisPoolConfig();
-        JConfig.setMaxTotal(config.getInt("Redis.MaxConnections"));
-        JConfig.setMaxIdle(config.getInt("Redis.MaxConnections"));
+        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,
@@ -54,8 +51,8 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable, Command
                config.getInt("Redis.Port"),
                config.getInt("Redis.TimeOut"),
                config.getString("Redis.Password"),
-                config.getBoolean("Redis.useSSL"));
-        RedisService = Executors.newFixedThreadPool(config.getInt("Redis.Threads"));
+                config.getBoolean("Redis.useTLS"));
+        RedisService = Executors.newSingleThreadExecutor();
        try {
            this.subscribeJedis = this.jedisPool.getResource();
        } catch (Exception ignored) {
@@ -73,21 +70,19 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable, Command
    public void run() {
        while (!isShuttingDown.get()) {
            try {
-                message("&e[Jedis] &cConnecting to redis...........");
+                plugin.getLogger().info(ChatColor.translateAlternateColorCodes('&', "&cConnecting to redis..."));
                if (!this.subscribeJedis.isConnected()) this.subscribeJedis = this.jedisPool.getResource();
-                isRedisOnline.set(true);
-                message("&e[Jedis] &aRedis Connected");
+                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();
+                            channelsInByte[x] = channels.get(x).getBytes(StandardCharsets.UTF_8);
                        }
                    } catch (ArrayIndexOutOfBoundsException ex) {
                        reInitializeByteArray = true;
@@ -98,12 +93,12 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable, Command
                } while (reInitializeByteArray);
                this.subscribeJedis.subscribe(this, channelsInByte);

+
            } catch (Exception e) {
-                message("&e[Jedis] &cConnection to redis has failed! &ereconnecting...");
+                plugin.getLogger().warning(ChatColor.translateAlternateColorCodes('&', "&cConnection to redis has failed! &cReconnecting..."));
                if (this.subscribeJedis != null) {
                    this.subscribeJedis.close();
                }
-                isRedisOnline.set(false);
            }
            try {
                Thread.sleep(1000);
@@ -113,27 +108,34 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable, Command
        }
    }

-    private void message(String message) {
-        plugin.getLogger().info(ChatColor.translateAlternateColorCodes('&', message));
-    }
-
    @Override
    public void onMessage(byte[] channel, byte[] message) {
-        String channelString = new String(channel);
+        String channelString = new String(channel, StandardCharsets.UTF_8);
+        String receivedMessage = null;
        try {
-            String decrypted = null;
+            //if encryption is enabled, decrypt the message, else just convert binary to string
+            if (this.encryption.isEncryptionEnabled()) {
                try {
-                decrypted = encryption.decrypt(message);
+                    receivedMessage = encryption.decrypt(message);
                } catch (UnauthenticCiphertextException | IllegalBlockSizeException e) {
                    e.printStackTrace();
                }
-            assert decrypted != null;
-            JSONObject j = new JSONObject(decrypted);
+
+            } 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());
-            plugin.getServer().getPluginManager().callEvent(new RedisMessageEvent(channelString, j.getString("Message")));
+                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[&aGBot&a] &cI Got a Message that Was empty from channel " + channel + " Please check your code that you used to send the message. ^ ignore the error."));
+            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);
        }

    }
@@ -143,43 +145,22 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable, Command
        if (this.subscribeJedis != null) {
            this.unsubscribe();
            this.subscribeJedis.close();
+            this.subscribeJedis.getClient().close();
+            this.jedisPool.getResource().close();
        }
        this.RedisService.shutdown();

    }
-
-    public boolean IsRedisOnline() {
-        return isRedisOnline.get();
+    public void reload() {
+        this.shutdown();
+        plugin.startRedis(true);
    }

    public JedisPool getJedisPool() {
        return jedisPool;
    }

-    public ExecutorService getRedisService() {
-        return RedisService;
-    }
-
-    public AtomicBoolean getIsShuttingDown() {
-        return isShuttingDown;
-    }
-
-    public AtomicBoolean getIsRedisOnline() {
-        return isRedisOnline;
-    }
-
    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;
-        }
-        start();
-        return false;
-    }
 }
--- a/src/main/java/net/limework/rediskript/skript/SkriptHook.java
+++ b/src/main/java/net/limework/rediskript/skript/SkriptHook.java
@@ -1,22 +1,24 @@
-package net.limework.core.hooks;
+package net.limework.rediskript.skript;

 import ch.njol.skript.Skript;
 import ch.njol.skript.SkriptAddon;
 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.LimeworkSpigotCore;
-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.rediskript.RediSkript;
+import net.limework.rediskript.events.RedisMessageEvent;
+import net.limework.rediskript.skript.elements.EvtRedis;
+import net.limework.rediskript.skript.elements.ExprChannel;
+import net.limework.rediskript.skript.elements.ExprMessage;
+import net.limework.rediskript.skript.elements.ExprMessageDate;

 import java.io.IOException;

 public class SkriptHook {

    private SkriptAddon addon;
-    public SkriptHook(LimeworkSpigotCore plugin) {
+    public SkriptHook(RediSkript plugin) {
        addon = Skript.registerAddon(plugin);
        try {
            addon.loadClasses("net.limework.core.skript", "elements");
@@ -35,12 +37,15 @@ public class SkriptHook {
                    return e.getMessage();
                }
            }, 0);
+            Skript.registerExpression(ExprMessageDate.class, Date.class, ExpressionType.SIMPLE, "redis message date");
+            EventValues.registerEventValue(RedisMessageEvent.class, Date.class, new Getter<Date, RedisMessageEvent>() {
+                @Override
+                public Date get(RedisMessageEvent e) {
+                    return new Date(e.getDate());
+                }
+            }, 0);
        } catch (IOException e) {
            e.printStackTrace();
        }
    }
-
-    public SkriptAddon getAddon() {
-        return addon;
-    }
 }
--- a/src/main/java/net/limework/rediskript/skript/elements/EffSendMessage.java
+++ b/src/main/java/net/limework/rediskript/skript/elements/EffSendMessage.java
@@ -0,0 +1,82 @@
+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.rediskript.RediSkript;
+import net.limework.rediskript.managers.RedisManager;
+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%");
+    }
+
+
+    private Expression<String> channel;
+    private Expression<String> message;
+
+
+    @Override
+    protected void execute(Event event) {
+
+        RediSkript plugin = (RediSkript) Bukkit.getPluginManager().getPlugin("RediSkript");
+
+        String message = this.message.getSingle(event);
+        String channel = this.channel.getSingle(event);
+
+        if (message == null) {
+            Bukkit.getLogger().warning(ChatColor.translateAlternateColorCodes('&', "&2[&aRediSkript&a] &cRedis message was empty. Please check your code."));
+            return;
+        }
+        if (channel == null) {
+            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();
+        }
+
+    }
+
+    @Override
+    public String toString(Event event, boolean debug) {
+        return "send redis message " + message.toString(event, debug) + " to channel " + channel.toString(event, debug);
+    }
+
+    @SuppressWarnings("unchecked")
+    @Override
+    public boolean init(final Expression<?>[] expressions, final int matchedPattern, final Kleenean isDelayed, final SkriptParser.ParseResult parser) {
+        this.message = (Expression<String>) expressions[0];
+        this.channel = (Expression<String>) expressions[1];
+        return true;
+    }
+
+}
--- a/src/main/java/net/limework/rediskript/skript/elements/EvtRedis.java
+++ b/src/main/java/net/limework/rediskript/skript/elements/EvtRedis.java
@@ -1,27 +1,27 @@
-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.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;
    }

    @Override
    public boolean check(Event event) {
+        if (!(event instanceof RedisMessageEvent)) {
+            return false;
+        }
        return true;
    }

    @Override
-    public String toString(Event event, boolean b) {
+    public String toString(Event event, boolean debug) {
        return "redis message";
    }
 }
--- a/src/main/java/net/limework/rediskript/skript/elements/ExprChannel.java
+++ b/src/main/java/net/limework/rediskript/skript/elements/ExprChannel.java
@@ -1,11 +1,14 @@
-package net.limework.core.skript.elements;
+package net.limework.rediskript.skript.elements;


+import ch.njol.skript.ScriptLoader;
+import ch.njol.skript.Skript;
 import ch.njol.skript.lang.Expression;
 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> {
@@ -27,7 +30,11 @@ public class ExprChannel extends SimpleExpression<String> {
    }

    @Override
-    public boolean init(Expression<?>[] expressions, int i, Kleenean kleenean, SkriptParser.ParseResult parseResult) {
+    public boolean init(final Expression<?>[] expressions, final int matchedPattern, final Kleenean isDelayed, final SkriptParser.ParseResult parseResult) {
+        if (!ScriptLoader.isCurrentEvent(RedisMessageEvent.class)) {
+            Skript.error("Cannot use 'redis channel' outside of a redis message event", ErrorQuality.SEMANTIC_ERROR);
+            return false;
+        }
        return true;
    }

--- a/src/main/java/net/limework/rediskript/skript/elements/ExprMessage.java
+++ b/src/main/java/net/limework/rediskript/skript/elements/ExprMessage.java
@@ -1,11 +1,14 @@
-package net.limework.core.skript.elements;
+package net.limework.rediskript.skript.elements;


+import ch.njol.skript.ScriptLoader;
+import ch.njol.skript.Skript;
 import ch.njol.skript.lang.Expression;
 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> {
@@ -22,12 +25,16 @@ public class ExprMessage extends SimpleExpression<String> {
    }

    @Override
-    public String toString(Event event, boolean b) {
+    public String toString(Event event, boolean debug) {
        return "redis message";
    }

    @Override
-    public boolean init(Expression<?>[] expressions, int i, Kleenean kleenean, SkriptParser.ParseResult parseResult) {
+    public boolean init(final Expression<?>[] expressions, final int matchedPattern, final Kleenean isDelayed, final SkriptParser.ParseResult parseResult) {
+        if (!ScriptLoader.isCurrentEvent(RedisMessageEvent.class)) {
+            Skript.error("Cannot use 'redis message' outside of a redis message event", ErrorQuality.SEMANTIC_ERROR);
+            return false;
+        }
        return true;
    }

--- a/src/main/java/net/limework/rediskript/skript/elements/ExprMessageDate.java
+++ b/src/main/java/net/limework/rediskript/skript/elements/ExprMessageDate.java
@@ -0,0 +1,49 @@
+package net.limework.rediskript.skript.elements;
+
+
+import ch.njol.skript.ScriptLoader;
+import ch.njol.skript.Skript;
+import ch.njol.skript.lang.Expression;
+import ch.njol.skript.lang.SkriptParser;
+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.rediskript.events.RedisMessageEvent;
+import org.bukkit.event.Event;
+
+public class ExprMessageDate extends SimpleExpression<Date> {
+
+
+    @Override
+    public boolean isSingle() {
+        return true;
+    }
+
+    @Override
+    public Class<? extends Date> getReturnType() {
+        return Date.class;
+    }
+
+    @Override
+    public String toString(Event event, boolean b) {
+        return "redis message date";
+    }
+
+    @Override
+    public boolean init(final Expression<?>[] expressions, final int matchedPattern, final Kleenean isDelayed, final SkriptParser.ParseResult parseResult) {
+        if (!ScriptLoader.isCurrentEvent(RedisMessageEvent.class)) {
+            Skript.error("Cannot use 'redis message date' outside of a redis message event", ErrorQuality.SEMANTIC_ERROR);
+            return false;
+        }
+        return true;
+    }
+    @Override
+    protected Date[] get(Event e) {
+        if (e instanceof RedisMessageEvent){
+            long date = ((RedisMessageEvent) e).getDate();
+            return new Date[]{new Date(date)};
+        }
+        return null;
+    }
+}
--- a/src/main/resources/config.yml
+++ b/src/main/resources/config.yml
@@ -1,21 +1,29 @@
 Redis:
-  Password: "yHy0d2zdBlRmaSPj3CiBwEv5V3XxBTLTrCsGW7ntBnzhfxPxXJS6Q1aTtR6DSfAtCZr2VxWnsungXHTcF94a4bsWEpGAvjL6XMU"
+  #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"
  Host: "127.0.0.1"
-  MaxConnections: 20
-  Threads: 10
+  #must be 2 or higher, if you set to lower, the addon will automatically use 2 as a minimum
+  MaxConnections: 2
+  #the default Redis port
  Port: 6379
-  TimeOut: 40000
-  useSSL: false
-  #useful if SSL is disabled
-  EncryptMessages: false
+  #time out in milliseconds, how long it should take before it decides that it is unable to connect when sending a message
+  #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 completely secure
+  useTLS: false
+  #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: "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!
 Channels:
  - "Channel1"
  - "Channel2"
  - "Channel3"
-
-Mongodb:
-  enabled: false
-  url: ""
--- a/src/main/resources/plugin.yml
+++ b/src/main/resources/plugin.yml
@@ -1,14 +1,9 @@
-main: net.limework.core.LimeworkSpigotCore
-name: LimeworkSpigotCore
+main: net.limework.core.RediSkript
+name: RediSkript
 version: ${project.version}
-author: limework.net
+authors: [Govindas, ham1255, DaemonicKing]
 api-version: 1.13
-softdepend:
-  - Skript
+depend: [Skript]
 commands:
-  control:
-    description: "server control"
-    permission: "admin.use"
  reloadredis:
-    description: "server control"
-    permission: "admin.use"
+    description: "Reload redis configuration & restart the connection."
Author	SHA1	Message	Date
Govindass	211a45ee52	Remove Skript plugin check, as it doesn't load without it anyway	2020-11-02 12:09:18 +02:00
Govindass	1e85072e34	Oops forgot one more console message	2020-10-31 17:12:13 +02:00
Govindass	a60cae72e3	Improve console messages	2020-10-31 16:48:42 +02:00
Govindass	d4461f09c8	some refactoring, make classes more well-sorted	2020-10-29 10:01:36 +02:00
Govindass	dd6b9b6ee6	use HIGHEST priority on disable, so "on script unload" can still work	2020-10-29 09:47:18 +02:00
Govindass	2ee28a5450	Update jarRepositories.xml	2020-10-28 12:20:27 +02:00
Govindass	26b9e0e1d8	Merge branch 'master' of https://github.com/Limework/RediSkript	2020-10-28 12:15:30 +02:00
Govindass	933b85b2d5	try fix maven 2	2020-10-28 12:15:27 +02:00
Govindass	824cf3664c	try fix maven	2020-10-28 12:08:44 +02:00
Govindas	d02cac7c5d	Update README.md	2020-10-28 11:55:00 +02:00
Govindass	a520ba6496	Update pom.xml	2020-10-28 11:53:44 +02:00
Govindass	4d265cbf61	Improve debug (thanks ShaneBee)	2020-10-27 09:06:36 +02:00
Govindass	7849efd866	Little questionable improvements (shouldn't hurt anything anyway)	2020-10-24 17:59:48 +03:00
Govindass	f80d9b36e7	Make on redis message a synchronous event for thread-safety	2020-10-24 15:19:10 +03:00
Govindass	0c20becfa1	Merge branch 'master' of https://github.com/Limework/RediSkript	2020-10-24 14:33:12 +03:00
Govindass	089fdfd1f3	Update pom.xml	2020-10-24 14:32:55 +03:00
Govindas	c4426a692e	Update README.md	2020-10-24 14:32:48 +03:00
Govindass	ed3ea7b2c7	Remove unneeded threadpool (testing has shown for it to be unneeded)	2020-10-24 13:29:49 +03:00
Govindass	2b00f0908e	change useSSL to useTLS, because redis itself refers to it as TLS	2020-10-24 12:35:35 +03:00
Govindass	f6c4bbcdce	Revert "fixed reload but not tested" This reverts commit `a08ecd93b7`.	2020-10-24 12:32:40 +03:00
Govindass	ba48fdc564	Revert "Update RedisManager.java" This reverts commit `6c5d580b16`.	2020-10-24 12:32:36 +03:00
Govindass	ce47af29f4	Revert "Update RedisManager.java" This reverts commit `b93624bc49`.	2020-10-24 12:32:24 +03:00
mohammed jasem alaajel	b93624bc49	Update RedisManager.java	2020-10-23 21:01:57 +04:00
mohammed jasem alaajel	6c5d580b16	Update RedisManager.java	2020-10-23 20:45:53 +04:00
mohammed jasem alaajel	a08ecd93b7	fixed reload but not tested	2020-10-23 20:37:43 +04:00
Govindass	c720433c60	Re-word redis reload command information	2020-10-23 17:50:04 +03:00
Govindass	12ce69d68f	Fix critical redis server shutdown bug	2020-10-23 17:48:22 +03:00
Govindass	efab085c47	Better 1.8 support & cleanup	2020-10-23 17:21:32 +03:00
Govindass	31db51fce6	Undo synchronous event, broke 1.8 servers completely	2020-10-23 16:55:04 +03:00
Govindass	776ebc9780	add redis message date expression & improve quality of existing expressions & make event guaranteedly synchronous	2020-10-23 16:49:25 +03:00
Govindass	1ef35dfb60	New /reloadredis fully restarts the plugin with reloaded configuration & some code improvements	2020-10-23 14:34:30 +03:00
Govindass	2049616f64	Make json errors easier to debug	2020-10-22 17:44:45 +03:00
Govindass	97aa663bfd	Reduce jar size by removing unneeded dependencies	2020-10-22 17:28:00 +03:00
Govindass	4afd5a2dbc	Merge branch 'master' of https://github.com/Limework/RediSkript	2020-10-22 14:19:36 +03:00
Govindass	92d89ec76d	Remove debug message & Hotfix	2020-10-22 14:19:29 +03:00
Govindas	0ca8712a1a	Update README.md	2020-10-22 13:31:38 +03:00
Govindass	216b2635b3	Further fixes & refactoring for release	2020-10-22 13:30:41 +03:00
Govindass	df8608802d	Fix encryption disabling & some refactoring	2020-10-22 12:32:08 +03:00
Govindass	157e2b08c7	Remove unneeded code	2020-10-18 17:07:37 +03:00
mohammed jasem alaajel	5f4600546e	small fix to make sure the connect was killed	2020-07-30 09:35:50 +04:00
mohammed jasem alaajel	f4ab43bcb8	added protection to kill current working sub	2020-07-28 10:53:42 +04:00