moved some classes + now plugin compiles with new changes

Moved some classes to Core module Like encryption so it can be used on another modules aka bungee

RediSkript-bukkit/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <artifactId>RediSkript</artifactId>
         <groupId>net.limework</groupId>
-        <version>1.3.3</version>
+        <version>1.4.0-SNAPSHOT</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
@@ -70,6 +70,14 @@
                     </execution>
                 </executions>
             </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>3.2.0</version>
+                <configuration>
+                    <outputDirectory>../target</outputDirectory>
+                </configuration>
+            </plugin>
         </plugins>
     </build>
 
@@ -92,6 +100,11 @@
             <artifactId>jedis</artifactId>
             <version>3.5.1</version>
         </dependency>
+        <dependency>
+            <groupId>net.limework</groupId>
+            <artifactId>RediSkript-core</artifactId>
+            <version>${project.version}</version>
+        </dependency>
     </dependencies>
 
 </project>

RediSkript-bukkit/src/main/java/net/limework/rediskript/data/Encryption.java

@@ -1,37 +0,0 @@
-package net.limework.rediskript.data;
-
-import org.bukkit.configuration.Configuration;
-import org.cryptomator.siv.SivMode;
-import org.cryptomator.siv.UnauthenticCiphertextException;
-
-import javax.crypto.IllegalBlockSizeException;
-import java.nio.charset.StandardCharsets;
-
-public class Encryption {
-
-    private boolean encryptionEnabled;
-    private String encryptionKey;
-    private String macKey;
-    private final SivMode AES_SIV = new SivMode();
-
-    public Encryption(Configuration config){
-        encryptionEnabled = config.getBoolean("Redis.EncryptMessages");
-        if (encryptionEnabled) {
-            // AES encryption
-            encryptionKey = config.getString("Redis.EncryptionKey");
-            macKey = config.getString("Redis.MacKey");
-        }
-    }
-
-    public boolean isEncryptionEnabled() { return encryptionEnabled; }
-
-    public String decrypt(byte[] message) throws UnauthenticCiphertextException, IllegalBlockSizeException {
-        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(StandardCharsets.UTF_8), macKey.getBytes(StandardCharsets.UTF_8), message.getBytes(StandardCharsets.UTF_8));
-    }
-
-
-}

RediSkript-bukkit/src/main/java/net/limework/rediskript/managers/RedisController.java

@@ -56,7 +56,9 @@ public class RedisController extends BinaryJedisPubSub implements Runnable {
                 config.getInt("Redis.TimeOut"),
                 config.getString("Redis.Password"),
                 config.getBoolean("Redis.useTLS"));
-        encryption = new Encryption(config);
+        encryption = new Encryption(config.getBoolean("Redis.EncryptMessages"),
+                config.getString("Redis.EncryptionKe"),
+                config.getString("Redis.MacKey"));
         setupChannels(config);
         isConnectionBroken = new AtomicBoolean(true);
         isConnecting = new AtomicBoolean(false);