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

new ConnectionController!

.gitignore

@@ -1,4 +1,7 @@
 target
 out
 .idea
+.idea/*
 compile
+*.iml
+

.idea/.name

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

.idea/artifacts/RediSkript_jar.xml

@@ -1,12 +0,0 @@
-<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

@@ -1,16 +0,0 @@
-<?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

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

.idea/jarRepositories.xml

@@ -1,30 +0,0 @@
-<?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

@@ -1,13 +0,0 @@
-<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

@@ -1,13 +0,0 @@
-<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

@@ -1,13 +0,0 @@
-<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

@@ -1,13 +0,0 @@
-<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

@@ -1,13 +0,0 @@
-<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

@@ -1,13 +0,0 @@
-<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

@@ -1,11 +0,0 @@
-<?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

@@ -1,8 +0,0 @@
-<?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

@@ -1,124 +0,0 @@
-<?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

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

LICENSE

@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

README.md

@@ -1,9 +1,14 @@
 RediSkript allows you to communicate between your servers with use of Redis, it's very fast and easy to use.
 
+Skript: https://github.com/SkriptLang/Skript
+
+RediSkript spigot page: https://www.spigotmc.org/resources/rediskript-communicate-between-servers-with-ease.85067/
+
+Jedis: https://github.com/redis/jedis
+
 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.
+It is developed and maintained by Govindas & the team of Govindas Limework developers.
 
 Redis Message:
 ```

RediSkript.iml

@@ -10,11 +10,64 @@
     </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" scope="PROVIDED" name="Maven: com.destroystokyo.paper:paper-api:1.15-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm:7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-commons:7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-tree:7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-analysis:7.1" level="project" />
+    <orderEntry type="library" name="Maven: com.google.code.gson:gson:2.8.6" level="project" />
+    <orderEntry type="library" name="Maven: org.jetbrains:annotations:19.0.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.SkriptLang:Skript:2.5.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.destroystokyo.paper:paper-api:1.16.4-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jsr305:1.3.9" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.googlecode.json-simple:json-simple:1.1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: junit:junit:4.10" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.hamcrest:hamcrest-core:1.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm:8.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-commons:8.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-tree:8.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-analysis:8.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.eclipse.jdt:org.eclipse.jdt.annotation:1.1.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:findbugs:3.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.jcip:jcip-annotations:1.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:bcel-findbugs:6.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.findbugs:jFormatString:2.0.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: dom4j:dom4j:1.6.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: xml-apis:xml-apis:1.0.b2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.ow2.asm:asm-debug-all:5.0.2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.apple:AppleJavaExtensions:1.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: jaxen:jaxen:1.1.6" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldguard:worldguard-legacy:7.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bukkit:bukkit:1.13-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldedit:worldedit-bukkit:7.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldedit:worldedit-core:7.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldedit.worldedit-libs:core:7.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: de.schlichtherle:truezip:6.8.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: rhino:js:1.7R2" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldedit.worldedit-libs:bukkit:7.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-slf4j-impl:2.8.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.apache.logging.log4j:log4j-api:2.8.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.worldguard:worldguard-core:7.0.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q.intake:intake:4.2-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q:squirrelid:0.2.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.flywaydb:flyway-core:3.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.khelekore:prtree:1.5.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.sk89q:commandbook:2.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.bstats:bstats-bukkit:1.4" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.github.marcelo-mason:PreciousStones:24e3d4bf67b7240ae36b32be10e99d4091938c5c" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: ant-contrib:ant-contrib:1.0b3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.milkbowl.vault:Vault:1.7.1" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: io.papermc:paperlib:1.0.5" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.spigotmc:spigot-api:1.16.4-R0.1-SNAPSHOT" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: commons-lang:commons-lang:2.6" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.guava:guava:21.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: com.google.code.gson:gson:2.8.0" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: net.md-5:bungeecord-chat:1.16-R0.3" level="project" />
+    <orderEntry type="library" scope="PROVIDED" name="Maven: org.yaml:snakeyaml:1.26" level="project" />
+    <orderEntry type="library" name="Maven: redis.clients:jedis:3.4.0" level="project" />
+    <orderEntry type="library" name="Maven: org.slf4j:slf4j-api:1.7.30" 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" />
+    <orderEntry type="library" name="Maven: org.apache.commons:commons-pool2:2.6.2" level="project" />
   </component>
 </module>

install.bat

@@ -0,0 +1 @@
+mvnw install

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.rediskript</groupId>
+    <groupId>net.limework</groupId>
     <artifactId>RediSkript</artifactId>
-    <version>1.3.0</version>
+    <version>1.3.2</version>
     <packaging>jar</packaging>
 
     <build>
@@ -27,10 +27,34 @@
                     <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>
+    <repositories>
         <repository>
             <id>spigot-repo</id>
             <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/org/spigotmc/spigot-api/</url>
@@ -42,7 +66,14 @@
         <repository>
             <id>commons-pool2</id>
             <url>https://mvnrepository.com/artifact/org.apache.commons/commons-pool2</url>
-
+        </repository>
+        <repository>
+            <id>PaperMC</id>
+            <url>https://repo.destroystokyo.com/repository/maven-public/</url>
+        </repository>
+        <repository>
+            <id>sk89q</id>
+            <url>http://maven.sk89q.com/repo</url>
         </repository>
     </repositories>
 
@@ -50,39 +81,39 @@
         <dependency>
             <groupId>com.github.SkriptLang</groupId>
             <artifactId>Skript</artifactId>
-            <version>2.5.1</version>
+            <version>2.5.3</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.spigotmc</groupId>
             <artifactId>spigot-api</artifactId>
-            <version>1.16.2-R0.1-SNAPSHOT</version>
+            <version>1.16.4-R0.1-SNAPSHOT</version>
             <scope>provided</scope>
         </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>
-        <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>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>3.4.1</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/net/limework/rediskript/RediSkript.java

@@ -1,44 +1,88 @@
 package net.limework.rediskript;
 
+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.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 net.limework.rediskript.events.RedisMessageEvent;
+import net.limework.rediskript.managers.RedisController;
+import net.limework.rediskript.skript.elements.*;
+import org.bukkit.ChatColor;
 import org.bukkit.plugin.java.JavaPlugin;
 
+import java.io.IOException;
+
 public class RediSkript extends JavaPlugin {
 
-    //Redis manager
-    private RedisManager rm;
+    private RedisController redisController;
 
-    public void startRedis(boolean reload) {
-        if (reload) { reloadConfig(); }
-        rm = new RedisManager(this);
-        rm.start();
+    public void reloadRedis() {
+        reloadConfig();
+        redisController.shutdown();
+        redisController = new RedisController(this);
     }
+
+    public void sendLogs(String message) {
+        getLogger().info(
+                ChatColor.translateAlternateColorCodes('&', "&b" + message)
+        );
+    }
+    public void sendErrorLogs(String message) {
+        getLogger().severe(
+                ChatColor.translateAlternateColorCodes('&', "&c" + message)
+        );
+    }
+
+    public void registerSyntax() {
+        SkriptAddon addon = Skript.registerAddon(this);
+        try {
+            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
+                public String get(RedisMessageEvent e) {
+                    return e.getChannelName();
+                }
+            }, 0);
+            Skript.registerExpression(ExprMessage.class, String.class, ExpressionType.SIMPLE, "redis message");
+            EventValues.registerEventValue(RedisMessageEvent.class, String.class, new Getter<String, RedisMessageEvent>() {
+                @Override
+                public String get(RedisMessageEvent e) {
+                    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();
+        }
+    }
+
     @Override
     public void onEnable() {
         saveDefaultConfig();
-        startRedis(false);
-
-        PluginCommand command = getServer().getPluginCommand("reloadredis");
-        assert command != null;
-        command.setExecutor(new CommandReloadRedis(this));
-
-        new SkriptHook(this);
+        redisController = new RedisController(this);
+        getServer().getPluginCommand("reloadredis").setExecutor(new CommandReloadRedis(this));
+        registerSyntax();
     }
 
     @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();
-        }
+        if (redisController != null) redisController.shutdown();
     }
-    public RedisManager getRm() {
-        return rm;
+
+    public RedisController getRC() {
+        return redisController;
     }
 }

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

@@ -7,6 +7,7 @@ import org.bukkit.command.Command;
 import org.bukkit.command.CommandExecutor;
 import org.bukkit.command.CommandSender;
 import org.bukkit.entity.Player;
+import org.bukkit.scheduler.BukkitRunnable;
 
 public class CommandReloadRedis implements CommandExecutor {
     private RediSkript plugin;
@@ -21,9 +22,17 @@ public class CommandReloadRedis implements CommandExecutor {
                     , "&2[&aRediSkript&2] &cThis command can only be executed in console.")));
             return true;
         }
-        plugin.getRm().reload();
+
+        //reload redis asynchronously to not lag the main thread (was doing a few seconds lagspike at most)
+        new BukkitRunnable() {
+            @Override
+            public void run() {
+                plugin.reloadRedis();
+            }
+        }.runTaskAsynchronously(plugin);
+
         //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."));
+        Bukkit.getLogger().info(ChatColor.translateAlternateColorCodes('&', "&eReloaded channels, encryption and login details!"));
 
         return false;
     }

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

@@ -8,46 +8,45 @@ import net.limework.rediskript.events.RedisMessageEvent;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.configuration.Configuration;
+import org.bukkit.scheduler.BukkitTask;
 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.*;
 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;
+public class RedisController extends BinaryJedisPubSub implements Runnable {
 
 
-    //sub
-    private BinaryJedis subscribeJedis;
-    private List<String> channels;
-    private AtomicBoolean isShuttingDown = new AtomicBoolean(false);
-    private Encryption encryption;
+    //Jedis Pool to be used by every another class.
+    private final JedisPool jedisPool;
+
+    //this seems useless unless tls is OFF!
+    private final Encryption encryption;
+
+    private byte[][] channelsInByte;
+
+    private final AtomicBoolean isConnectionBroken;
+    private final AtomicBoolean isConnecting;
+    private final RediSkript plugin;
+    private final boolean debugMode = false; //todo: will be later in the config in future release.
+    private final BukkitTask ConnectionTask;
 
 
-    public RedisManager(RediSkript plugin) {
+    public RedisController(RediSkript plugin) {
         this.plugin = plugin;
-        Configuration config = this.plugin.getConfig();
+        Configuration config = plugin.getConfig();
         JedisPoolConfig JConfig = new JedisPoolConfig();
         int maxConnections = config.getInt("Redis.MaxConnections");
-        if (maxConnections < 2) { maxConnections = 2; }
-
+        if (maxConnections < 2) {
+            maxConnections = 2;
+        }
         JConfig.setMaxTotal(maxConnections);
         JConfig.setMaxIdle(maxConnections);
         JConfig.setMinIdle(1);
@@ -58,66 +57,49 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable {
                 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);
+        setupChannels(config);
+        isConnectionBroken = new AtomicBoolean(true);
+        isConnecting = new AtomicBoolean(false);
+        //Start the main task on async thread
+        ConnectionTask = plugin.getServer().getScheduler().runTaskTimerAsynchronously(plugin, this, 0, 20 * 5);
     }
 
     @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) {
+        if (!isConnectionBroken.get() || isConnecting.get()) {
+            return;
+        }
+        plugin.sendLogs("Connecting to redis......");
+        isConnecting.set(true);
+        try (Jedis jedis = jedisPool.getResource()) {
+            isConnectionBroken.set(false);
+            plugin.sendLogs("&aConnection to redis has established!");
+            jedis.subscribe(this, channelsInByte);
+        } catch (Exception e) {
+            isConnecting.set(false);
+            isConnectionBroken.set(true);
+            plugin.sendErrorLogs("Connection has &lFAILED &cor Unable to connect to redis retrying to make connection...");
+            if (debugMode) {
                 e.printStackTrace();
             }
         }
     }
 
+    public void shutdown() {
+        ConnectionTask.cancel();
+        try {
+            this.unsubscribe();
+        } catch (Exception e) {
+            plugin.sendErrorLogs("Something went wrong during unsubscribing...");
+            if (debugMode) {
+                e.printStackTrace();
+            }
+        }
+
+        jedisPool.close();
+    }
+
     @Override
     public void onMessage(byte[] channel, byte[] message) {
         String channelString = new String(channel, StandardCharsets.UTF_8);
@@ -184,7 +166,7 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable {
                                     //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);
+                                    // variable.change(null, (Object[]) inputValue, Changer.ChangeMode.REMOVE);
                                     break;
                                 case "SET":
                                     Variables.setVariable(variableNames.get(i).toString(), inputValue, null, false);
@@ -194,12 +176,15 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable {
                 }
             }
         } 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);
+           plugin.sendErrorLogs("&cI got a message that was empty from channel " + channelString + " please check your code that you used to send the message. Message content:");
+            if (debugMode) {
+                e.printStackTrace();
+                plugin.sendErrorLogs(receivedMessage);
+            }
         }
 
     }
+
     public void sendMessage(String[] message, String channel) {
         JSONObject json = new JSONObject();
         json.put("Messages", new JSONArray(message));
@@ -207,6 +192,7 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable {
         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));
@@ -223,59 +209,50 @@ public class RedisManager extends BinaryJedisPubSub implements Runnable {
     public void finishSendMessage(JSONObject json, String channel) {
         try {
             byte[] message;
-            if (this.getEncryption().isEncryptionEnabled()) {
-                message = this.getEncryption().encrypt(json.toString());
+            if (encryption.isEncryptionEnabled()) {
+                message = encryption.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();
+                plugin.getServer().getScheduler().runTaskAsynchronously(plugin, () -> {
+                    try (BinaryJedis j = jedisPool.getResource()) {
+                        j.publish(channel.getBytes(StandardCharsets.UTF_8), message);
+                    } catch (Exception e) {
+                        System.out.println("Error sending redis message!");
+                        if (debugMode) {
+                            e.printStackTrace();
+                        }
+                    }
+
                 });
             } else {
-                BinaryJedis j = this.getJedisPool().getResource();
-                j.publish(channel.getBytes(StandardCharsets.UTF_8), message);
-                j.close();
+                //execute sending of redis message on the main thread if plugin is disabling
+                //so it can still process the sending
+                try (BinaryJedis j = jedisPool.getResource()) {
+                    j.publish(channel.getBytes(StandardCharsets.UTF_8), message);
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+
             }
         } 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();
+    private void setupChannels(Configuration config) {
+        List<String> channels = config.getStringList("Channels");
+        channelsInByte = new byte[channels.size()][1];
+        for (int x = 0; x < channels.size(); x++) {
+            channelsInByte[x] = channels.get(x).getBytes(StandardCharsets.UTF_8);
         }
-        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 Boolean isRedisConnectionOffline() {
+        return isConnectionBroken.get();
     }
-
-    public Encryption getEncryption() {
-        return encryption;
-    }
-
-    public ExecutorService getRedisService() { return RedisService; }
 }

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

@@ -1,49 +0,0 @@
-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 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 {
-    public SkriptHook(RediSkript plugin) {
-        SkriptAddon addon = Skript.registerAddon(plugin);
-        try {
-            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
-                public String get(RedisMessageEvent e) {
-                    return e.getChannelName();
-                }
-            }, 0);
-            Skript.registerExpression(ExprMessage.class, String.class, ExpressionType.SIMPLE, "redis message");
-            EventValues.registerEventValue(RedisMessageEvent.class, String.class, new Getter<String, RedisMessageEvent>() {
-                @Override
-                public String get(RedisMessageEvent e) {
-                    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();
-        }
-    }
-}

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

@@ -35,7 +35,7 @@ public class EffSendMessage extends Effect {
             Bukkit.getLogger().warning(ChatColor.translateAlternateColorCodes('&', "&2[&aRediSkript&a] &cChannel was empty. Please check your code."));
             return;
         }
-        plugin.getRm().sendMessage(message, channel);
+        plugin.getRC().sendMessage(message, channel);
     }
 
     @Override

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

@@ -14,10 +14,7 @@ public class EvtRedis extends SkriptEvent {
 
     @Override
     public boolean check(Event event) {
-        if (!(event instanceof RedisMessageEvent)) {
-            return false;
-        }
-        return true;
+        return (event instanceof RedisMessageEvent);
     }
 
     @Override

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

@@ -1,9 +1,12 @@
 package net.limework.rediskript.skript.elements;
 
+import ch.njol.skript.Skript;
 import ch.njol.skript.classes.Changer;
 import ch.njol.skript.lang.Expression;
 import ch.njol.skript.lang.SkriptParser;
+import ch.njol.skript.lang.Variable;
 import ch.njol.skript.lang.util.SimpleExpression;
+import ch.njol.skript.log.ErrorQuality;
 import ch.njol.skript.registrations.Classes;
 import ch.njol.skript.variables.SerializedVariable;
 import ch.njol.util.Kleenean;
@@ -19,13 +22,6 @@ public class ExprVariableInChannel extends SimpleExpression<Object> {
     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;
@@ -48,8 +44,8 @@ public class ExprVariableInChannel extends SimpleExpression<Object> {
     }
 
     @Override
-    public String toString(Event event, boolean b) {
-        return "variable in redis channel";
+    public String toString(Event event, boolean debug) {
+        return "variable " + name.toString(event,debug) + " in redis channel " + channel.toString(event, debug);
     }
     @Override
     public void change(Event e, Object[] changer, Changer.ChangeMode mode) {
@@ -70,10 +66,10 @@ public class ExprVariableInChannel extends SimpleExpression<Object> {
                     }
                 }
                 String operation = mode.toString();
-                plugin.getRm().sendVariables(name.getAll(e), values, channel.getSingle(e), operation);
+                plugin.getRC().sendVariables(name.getAll(e), values, channel.getSingle(e), operation);
                 break;
             case DELETE:
-                plugin.getRm().sendVariables(name.getAll(e), null, channel.getSingle(e), "SET");
+                plugin.getRC().sendVariables(name.getAll(e), null, channel.getSingle(e), "SET");
                 break;
         }
     }

src/main/resources/plugin.yml

@@ -1,7 +1,7 @@
 main: net.limework.rediskript.RediSkript
-name: RediSkript
+name: ${project.name}
 version: ${project.version}
-authors: [Govindas, ham1255, DaemonicKing]
+authors: [Govindas, ham1255, DaemonicKing, limework.net]
 api-version: 1.13
 depend: [Skript]
 commands: