From 697b696e3625e96418d4a7c04831c947fa19d2f7 Mon Sep 17 00:00:00 2001
From: mohammed jasem alaajel <34905970+ham1255@users.noreply.github.com>
Date: Mon, 17 May 2021 01:27:01 +0400
Subject: [PATCH 1/3] moved some stuff
---
bukkit/pom.xml | 15 +++++++++++++++
.../src}/main/java/META-INF/MANIFEST.MF | 0
.../java/net/limework/rediskript/RediSkript.java | 0
.../rediskript/commands/CommandReloadRedis.java | 0
.../net/limework/rediskript/data/Encryption.java | 0
.../rediskript/events/RedisMessageEvent.java | 0
.../rediskript/managers/RedisController.java | 0
.../skript/elements/EffSendMessage.java | 0
.../rediskript/skript/elements/EvtRedis.java | 0
.../rediskript/skript/elements/ExprChannel.java | 0
.../rediskript/skript/elements/ExprMessage.java | 0
.../skript/elements/ExprMessageDate.java | 0
.../skript/elements/ExprVariableInChannel.java | 0
{src => bukkit/src}/main/resources/config.yml | 0
{src => bukkit/src}/main/resources/plugin.yml | 0
core/pom.xml | 15 +++++++++++++++
pom.xml | 6 +++++-
17 files changed, 35 insertions(+), 1 deletion(-)
create mode 100644 bukkit/pom.xml
rename {src => bukkit/src}/main/java/META-INF/MANIFEST.MF (100%)
rename {src => bukkit/src}/main/java/net/limework/rediskript/RediSkript.java (100%)
rename {src => bukkit/src}/main/java/net/limework/rediskript/commands/CommandReloadRedis.java (100%)
rename {src => bukkit/src}/main/java/net/limework/rediskript/data/Encryption.java (100%)
rename {src => bukkit/src}/main/java/net/limework/rediskript/events/RedisMessageEvent.java (100%)
rename {src => bukkit/src}/main/java/net/limework/rediskript/managers/RedisController.java (100%)
rename {src => bukkit/src}/main/java/net/limework/rediskript/skript/elements/EffSendMessage.java (100%)
rename {src => bukkit/src}/main/java/net/limework/rediskript/skript/elements/EvtRedis.java (100%)
rename {src => bukkit/src}/main/java/net/limework/rediskript/skript/elements/ExprChannel.java (100%)
rename {src => bukkit/src}/main/java/net/limework/rediskript/skript/elements/ExprMessage.java (100%)
rename {src => bukkit/src}/main/java/net/limework/rediskript/skript/elements/ExprMessageDate.java (100%)
rename {src => bukkit/src}/main/java/net/limework/rediskript/skript/elements/ExprVariableInChannel.java (100%)
rename {src => bukkit/src}/main/resources/config.yml (100%)
rename {src => bukkit/src}/main/resources/plugin.yml (100%)
create mode 100644 core/pom.xml
diff --git a/bukkit/pom.xml b/bukkit/pom.xml
new file mode 100644
index 0000000..9efabdc
--- /dev/null
+++ b/bukkit/pom.xml
@@ -0,0 +1,15 @@
+
+
+
+ RediSkript
+ net.limework
+ 1.3.3
+
+ 4.0.0
+
+ bukkit
+
+
+
\ No newline at end of file
diff --git a/src/main/java/META-INF/MANIFEST.MF b/bukkit/src/main/java/META-INF/MANIFEST.MF
similarity index 100%
rename from src/main/java/META-INF/MANIFEST.MF
rename to bukkit/src/main/java/META-INF/MANIFEST.MF
diff --git a/src/main/java/net/limework/rediskript/RediSkript.java b/bukkit/src/main/java/net/limework/rediskript/RediSkript.java
similarity index 100%
rename from src/main/java/net/limework/rediskript/RediSkript.java
rename to bukkit/src/main/java/net/limework/rediskript/RediSkript.java
diff --git a/src/main/java/net/limework/rediskript/commands/CommandReloadRedis.java b/bukkit/src/main/java/net/limework/rediskript/commands/CommandReloadRedis.java
similarity index 100%
rename from src/main/java/net/limework/rediskript/commands/CommandReloadRedis.java
rename to bukkit/src/main/java/net/limework/rediskript/commands/CommandReloadRedis.java
diff --git a/src/main/java/net/limework/rediskript/data/Encryption.java b/bukkit/src/main/java/net/limework/rediskript/data/Encryption.java
similarity index 100%
rename from src/main/java/net/limework/rediskript/data/Encryption.java
rename to bukkit/src/main/java/net/limework/rediskript/data/Encryption.java
diff --git a/src/main/java/net/limework/rediskript/events/RedisMessageEvent.java b/bukkit/src/main/java/net/limework/rediskript/events/RedisMessageEvent.java
similarity index 100%
rename from src/main/java/net/limework/rediskript/events/RedisMessageEvent.java
rename to bukkit/src/main/java/net/limework/rediskript/events/RedisMessageEvent.java
diff --git a/src/main/java/net/limework/rediskript/managers/RedisController.java b/bukkit/src/main/java/net/limework/rediskript/managers/RedisController.java
similarity index 100%
rename from src/main/java/net/limework/rediskript/managers/RedisController.java
rename to bukkit/src/main/java/net/limework/rediskript/managers/RedisController.java
diff --git a/src/main/java/net/limework/rediskript/skript/elements/EffSendMessage.java b/bukkit/src/main/java/net/limework/rediskript/skript/elements/EffSendMessage.java
similarity index 100%
rename from src/main/java/net/limework/rediskript/skript/elements/EffSendMessage.java
rename to bukkit/src/main/java/net/limework/rediskript/skript/elements/EffSendMessage.java
diff --git a/src/main/java/net/limework/rediskript/skript/elements/EvtRedis.java b/bukkit/src/main/java/net/limework/rediskript/skript/elements/EvtRedis.java
similarity index 100%
rename from src/main/java/net/limework/rediskript/skript/elements/EvtRedis.java
rename to bukkit/src/main/java/net/limework/rediskript/skript/elements/EvtRedis.java
diff --git a/src/main/java/net/limework/rediskript/skript/elements/ExprChannel.java b/bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprChannel.java
similarity index 100%
rename from src/main/java/net/limework/rediskript/skript/elements/ExprChannel.java
rename to bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprChannel.java
diff --git a/src/main/java/net/limework/rediskript/skript/elements/ExprMessage.java b/bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprMessage.java
similarity index 100%
rename from src/main/java/net/limework/rediskript/skript/elements/ExprMessage.java
rename to bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprMessage.java
diff --git a/src/main/java/net/limework/rediskript/skript/elements/ExprMessageDate.java b/bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprMessageDate.java
similarity index 100%
rename from src/main/java/net/limework/rediskript/skript/elements/ExprMessageDate.java
rename to bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprMessageDate.java
diff --git a/src/main/java/net/limework/rediskript/skript/elements/ExprVariableInChannel.java b/bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprVariableInChannel.java
similarity index 100%
rename from src/main/java/net/limework/rediskript/skript/elements/ExprVariableInChannel.java
rename to bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprVariableInChannel.java
diff --git a/src/main/resources/config.yml b/bukkit/src/main/resources/config.yml
similarity index 100%
rename from src/main/resources/config.yml
rename to bukkit/src/main/resources/config.yml
diff --git a/src/main/resources/plugin.yml b/bukkit/src/main/resources/plugin.yml
similarity index 100%
rename from src/main/resources/plugin.yml
rename to bukkit/src/main/resources/plugin.yml
diff --git a/core/pom.xml b/core/pom.xml
new file mode 100644
index 0000000..302c0bf
--- /dev/null
+++ b/core/pom.xml
@@ -0,0 +1,15 @@
+
+
+
+ RediSkript
+ net.limework
+ 1.3.3
+
+ 4.0.0
+
+ core
+
+
+
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index e107c46..c1fd95b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -7,7 +7,11 @@
net.limework
RediSkript
1.3.3
- jar
+
+ core
+ bukkit
+
+ pom
--
2.45.0
From 2b9e00fd39189c4ec16b431b76c24bc220fa2d61 Mon Sep 17 00:00:00 2001
From: mohammed jasem alaajel <34905970+ham1255@users.noreply.github.com>
Date: Mon, 17 May 2021 01:39:22 +0400
Subject: [PATCH 2/3] fix-file-naming
---
RediSkript-bukkit/pom.xml | 97 +++++++++++++++++++
.../src/main/java/META-INF/MANIFEST.MF | 0
.../net/limework/rediskript/RediSkript.java | 0
.../commands/CommandReloadRedis.java | 0
.../limework/rediskript/data/Encryption.java | 0
.../rediskript/events/RedisMessageEvent.java | 0
.../rediskript/managers/RedisController.java | 0
.../skript/elements/EffSendMessage.java | 0
.../rediskript/skript/elements/EvtRedis.java | 0
.../skript/elements/ExprChannel.java | 0
.../skript/elements/ExprMessage.java | 0
.../skript/elements/ExprMessageDate.java | 0
.../elements/ExprVariableInChannel.java | 0
.../src/main/resources/config.yml | 0
.../src/main/resources/plugin.yml | 0
{bukkit => RediSkript-core}/pom.xml | 5 +-
core/pom.xml | 15 ---
pom.xml | 40 +-------
18 files changed, 104 insertions(+), 53 deletions(-)
create mode 100644 RediSkript-bukkit/pom.xml
rename {bukkit => RediSkript-bukkit}/src/main/java/META-INF/MANIFEST.MF (100%)
rename {bukkit => RediSkript-bukkit}/src/main/java/net/limework/rediskript/RediSkript.java (100%)
rename {bukkit => RediSkript-bukkit}/src/main/java/net/limework/rediskript/commands/CommandReloadRedis.java (100%)
rename {bukkit => RediSkript-bukkit}/src/main/java/net/limework/rediskript/data/Encryption.java (100%)
rename {bukkit => RediSkript-bukkit}/src/main/java/net/limework/rediskript/events/RedisMessageEvent.java (100%)
rename {bukkit => RediSkript-bukkit}/src/main/java/net/limework/rediskript/managers/RedisController.java (100%)
rename {bukkit => RediSkript-bukkit}/src/main/java/net/limework/rediskript/skript/elements/EffSendMessage.java (100%)
rename {bukkit => RediSkript-bukkit}/src/main/java/net/limework/rediskript/skript/elements/EvtRedis.java (100%)
rename {bukkit => RediSkript-bukkit}/src/main/java/net/limework/rediskript/skript/elements/ExprChannel.java (100%)
rename {bukkit => RediSkript-bukkit}/src/main/java/net/limework/rediskript/skript/elements/ExprMessage.java (100%)
rename {bukkit => RediSkript-bukkit}/src/main/java/net/limework/rediskript/skript/elements/ExprMessageDate.java (100%)
rename {bukkit => RediSkript-bukkit}/src/main/java/net/limework/rediskript/skript/elements/ExprVariableInChannel.java (100%)
rename {bukkit => RediSkript-bukkit}/src/main/resources/config.yml (100%)
rename {bukkit => RediSkript-bukkit}/src/main/resources/plugin.yml (100%)
rename {bukkit => RediSkript-core}/pom.xml (90%)
delete mode 100644 core/pom.xml
diff --git a/RediSkript-bukkit/pom.xml b/RediSkript-bukkit/pom.xml
new file mode 100644
index 0000000..4dcfd46
--- /dev/null
+++ b/RediSkript-bukkit/pom.xml
@@ -0,0 +1,97 @@
+
+
+
+ RediSkript
+ net.limework
+ 1.3.3
+
+ 4.0.0
+
+ RediSkript-bukkit
+
+
+
+ spigot-repo
+ https://hub.spigotmc.org/nexus/content/repositories/snapshots/org/spigotmc/spigot-api/
+
+
+ jitpack.io
+ https://jitpack.io
+
+
+ commons-pool2
+ https://mvnrepository.com/artifact/org.apache.commons/commons-pool2
+
+
+ PaperMC
+ https://repo.destroystokyo.com/repository/maven-public/
+
+
+ sk89q
+ http://maven.sk89q.com/repo
+
+
+
+
+
+
+
+
+ src/main/resources
+ true
+
+
+
+
+ org.apache.maven.plugins
+ maven-compiler-plugin
+ 3.6.1
+
+
+ 1.8
+ UTF-8
+
+
+
+ org.apache.maven.plugins
+ maven-shade-plugin
+ 3.2.3
+
+ false
+
+
+
+ package
+
+ shade
+
+
+
+
+
+
+
+
+
+ com.github.SkriptLang
+ Skript
+ 2.5.3
+ jar
+ provided
+
+
+ org.spigotmc
+ spigot-api
+ 1.16.5-R0.1-SNAPSHOT
+ provided
+
+
+ redis.clients
+ jedis
+ 3.5.1
+
+
+
+
\ No newline at end of file
diff --git a/bukkit/src/main/java/META-INF/MANIFEST.MF b/RediSkript-bukkit/src/main/java/META-INF/MANIFEST.MF
similarity index 100%
rename from bukkit/src/main/java/META-INF/MANIFEST.MF
rename to RediSkript-bukkit/src/main/java/META-INF/MANIFEST.MF
diff --git a/bukkit/src/main/java/net/limework/rediskript/RediSkript.java b/RediSkript-bukkit/src/main/java/net/limework/rediskript/RediSkript.java
similarity index 100%
rename from bukkit/src/main/java/net/limework/rediskript/RediSkript.java
rename to RediSkript-bukkit/src/main/java/net/limework/rediskript/RediSkript.java
diff --git a/bukkit/src/main/java/net/limework/rediskript/commands/CommandReloadRedis.java b/RediSkript-bukkit/src/main/java/net/limework/rediskript/commands/CommandReloadRedis.java
similarity index 100%
rename from bukkit/src/main/java/net/limework/rediskript/commands/CommandReloadRedis.java
rename to RediSkript-bukkit/src/main/java/net/limework/rediskript/commands/CommandReloadRedis.java
diff --git a/bukkit/src/main/java/net/limework/rediskript/data/Encryption.java b/RediSkript-bukkit/src/main/java/net/limework/rediskript/data/Encryption.java
similarity index 100%
rename from bukkit/src/main/java/net/limework/rediskript/data/Encryption.java
rename to RediSkript-bukkit/src/main/java/net/limework/rediskript/data/Encryption.java
diff --git a/bukkit/src/main/java/net/limework/rediskript/events/RedisMessageEvent.java b/RediSkript-bukkit/src/main/java/net/limework/rediskript/events/RedisMessageEvent.java
similarity index 100%
rename from bukkit/src/main/java/net/limework/rediskript/events/RedisMessageEvent.java
rename to RediSkript-bukkit/src/main/java/net/limework/rediskript/events/RedisMessageEvent.java
diff --git a/bukkit/src/main/java/net/limework/rediskript/managers/RedisController.java b/RediSkript-bukkit/src/main/java/net/limework/rediskript/managers/RedisController.java
similarity index 100%
rename from bukkit/src/main/java/net/limework/rediskript/managers/RedisController.java
rename to RediSkript-bukkit/src/main/java/net/limework/rediskript/managers/RedisController.java
diff --git a/bukkit/src/main/java/net/limework/rediskript/skript/elements/EffSendMessage.java b/RediSkript-bukkit/src/main/java/net/limework/rediskript/skript/elements/EffSendMessage.java
similarity index 100%
rename from bukkit/src/main/java/net/limework/rediskript/skript/elements/EffSendMessage.java
rename to RediSkript-bukkit/src/main/java/net/limework/rediskript/skript/elements/EffSendMessage.java
diff --git a/bukkit/src/main/java/net/limework/rediskript/skript/elements/EvtRedis.java b/RediSkript-bukkit/src/main/java/net/limework/rediskript/skript/elements/EvtRedis.java
similarity index 100%
rename from bukkit/src/main/java/net/limework/rediskript/skript/elements/EvtRedis.java
rename to RediSkript-bukkit/src/main/java/net/limework/rediskript/skript/elements/EvtRedis.java
diff --git a/bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprChannel.java b/RediSkript-bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprChannel.java
similarity index 100%
rename from bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprChannel.java
rename to RediSkript-bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprChannel.java
diff --git a/bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprMessage.java b/RediSkript-bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprMessage.java
similarity index 100%
rename from bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprMessage.java
rename to RediSkript-bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprMessage.java
diff --git a/bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprMessageDate.java b/RediSkript-bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprMessageDate.java
similarity index 100%
rename from bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprMessageDate.java
rename to RediSkript-bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprMessageDate.java
diff --git a/bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprVariableInChannel.java b/RediSkript-bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprVariableInChannel.java
similarity index 100%
rename from bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprVariableInChannel.java
rename to RediSkript-bukkit/src/main/java/net/limework/rediskript/skript/elements/ExprVariableInChannel.java
diff --git a/bukkit/src/main/resources/config.yml b/RediSkript-bukkit/src/main/resources/config.yml
similarity index 100%
rename from bukkit/src/main/resources/config.yml
rename to RediSkript-bukkit/src/main/resources/config.yml
diff --git a/bukkit/src/main/resources/plugin.yml b/RediSkript-bukkit/src/main/resources/plugin.yml
similarity index 100%
rename from bukkit/src/main/resources/plugin.yml
rename to RediSkript-bukkit/src/main/resources/plugin.yml
diff --git a/bukkit/pom.xml b/RediSkript-core/pom.xml
similarity index 90%
rename from bukkit/pom.xml
rename to RediSkript-core/pom.xml
index 9efabdc..b5b0db9 100644
--- a/bukkit/pom.xml
+++ b/RediSkript-core/pom.xml
@@ -9,7 +9,10 @@
4.0.0
- bukkit
+ RediSkript-core
+
+
+
\ No newline at end of file
diff --git a/core/pom.xml b/core/pom.xml
deleted file mode 100644
index 302c0bf..0000000
--- a/core/pom.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
- RediSkript
- net.limework
- 1.3.3
-
- 4.0.0
-
- core
-
-
-
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
index c1fd95b..5977013 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,8 +8,8 @@
RediSkript
1.3.3
- core
- bukkit
+ RediSkript-core
+ RediSkript-bukkit
pom
@@ -50,43 +50,9 @@
-
-
- spigot-repo
- https://hub.spigotmc.org/nexus/content/repositories/snapshots/org/spigotmc/spigot-api/
-
-
- jitpack.io
- https://jitpack.io
-
-
- commons-pool2
- https://mvnrepository.com/artifact/org.apache.commons/commons-pool2
-
-
- PaperMC
- https://repo.destroystokyo.com/repository/maven-public/
-
-
- sk89q
- http://maven.sk89q.com/repo
-
-
+
-
- com.github.SkriptLang
- Skript
- 2.5.3
- jar
- provided
-
-
- org.spigotmc
- spigot-api
- 1.16.5-R0.1-SNAPSHOT
- provided
-
redis.clients
jedis
--
2.45.0
From b5d08de1de7dc887325ccd3467c54ebb8c864bc7 Mon Sep 17 00:00:00 2001
From: mohammed jasem alaajel <34905970+ham1255@users.noreply.github.com>
Date: Mon, 17 May 2021 02:06:53 +0400
Subject: [PATCH 3/3] 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
---
.github/workflows/maven.yml | 2 +-
RediSkript-bukkit/pom.xml | 15 ++++++++++++++-
.../rediskript/managers/RedisController.java | 4 +++-
RediSkript-core/pom.xml | 11 +++++++++--
.../java/net/limework/rediskript/Subscriber.java | 11 +++++++++++
.../net/limework/rediskript/data/Encryption.java | 13 ++++++-------
pom.xml | 7 +------
7 files changed, 45 insertions(+), 18 deletions(-)
create mode 100644 RediSkript-core/src/main/java/net/limework/rediskript/Subscriber.java
rename {RediSkript-bukkit => RediSkript-core}/src/main/java/net/limework/rediskript/data/Encryption.java (73%)
diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml
index bd27e14..59ed6be 100644
--- a/.github/workflows/maven.yml
+++ b/.github/workflows/maven.yml
@@ -29,4 +29,4 @@ jobs:
# Artifact name
name: RediSkript_JAR
# Destination path
- path: target/Red*
+ path: target/*.jar
diff --git a/RediSkript-bukkit/pom.xml b/RediSkript-bukkit/pom.xml
index 4dcfd46..4e5f4c6 100644
--- a/RediSkript-bukkit/pom.xml
+++ b/RediSkript-bukkit/pom.xml
@@ -5,7 +5,7 @@
RediSkript
net.limework
- 1.3.3
+ 1.4.0-SNAPSHOT
4.0.0
@@ -70,6 +70,14 @@
+
+ org.apache.maven.plugins
+ maven-jar-plugin
+ 3.2.0
+
+ ../target
+
+
@@ -92,6 +100,11 @@
jedis
3.5.1
+
+ net.limework
+ RediSkript-core
+ ${project.version}
+
\ No newline at end of file
diff --git a/RediSkript-bukkit/src/main/java/net/limework/rediskript/managers/RedisController.java b/RediSkript-bukkit/src/main/java/net/limework/rediskript/managers/RedisController.java
index ca20044..9dc20ff 100644
--- a/RediSkript-bukkit/src/main/java/net/limework/rediskript/managers/RedisController.java
+++ b/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);
diff --git a/RediSkript-core/pom.xml b/RediSkript-core/pom.xml
index b5b0db9..5afa440 100644
--- a/RediSkript-core/pom.xml
+++ b/RediSkript-core/pom.xml
@@ -5,14 +5,21 @@
RediSkript
net.limework
- 1.3.3
+ 1.4.0-SNAPSHOT
4.0.0
RediSkript-core
-
+
+
+ redis.clients
+ jedis
+ 3.5.1
+ provided
+
+
\ No newline at end of file
diff --git a/RediSkript-core/src/main/java/net/limework/rediskript/Subscriber.java b/RediSkript-core/src/main/java/net/limework/rediskript/Subscriber.java
new file mode 100644
index 0000000..d92ba6f
--- /dev/null
+++ b/RediSkript-core/src/main/java/net/limework/rediskript/Subscriber.java
@@ -0,0 +1,11 @@
+package net.limework.rediskript;
+
+
+import redis.clients.jedis.BinaryJedisPubSub;
+
+public abstract class Subscriber extends BinaryJedisPubSub implements Runnable {
+
+
+
+}
+
diff --git a/RediSkript-bukkit/src/main/java/net/limework/rediskript/data/Encryption.java b/RediSkript-core/src/main/java/net/limework/rediskript/data/Encryption.java
similarity index 73%
rename from RediSkript-bukkit/src/main/java/net/limework/rediskript/data/Encryption.java
rename to RediSkript-core/src/main/java/net/limework/rediskript/data/Encryption.java
index c044fd6..fea9488 100644
--- a/RediSkript-bukkit/src/main/java/net/limework/rediskript/data/Encryption.java
+++ b/RediSkript-core/src/main/java/net/limework/rediskript/data/Encryption.java
@@ -1,6 +1,5 @@
package net.limework.rediskript.data;
-import org.bukkit.configuration.Configuration;
import org.cryptomator.siv.SivMode;
import org.cryptomator.siv.UnauthenticCiphertextException;
@@ -9,17 +8,17 @@ import java.nio.charset.StandardCharsets;
public class Encryption {
- private boolean encryptionEnabled;
+ private final 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) {
+ public Encryption(boolean encryptionEnabled, String encryptionKey, String macKey){
+ this.encryptionEnabled = encryptionEnabled;
+ if (this.encryptionEnabled) {
// AES encryption
- encryptionKey = config.getString("Redis.EncryptionKey");
- macKey = config.getString("Redis.MacKey");
+ this.encryptionKey = encryptionKey;
+ this.macKey = encryptionKey;
}
}
diff --git a/pom.xml b/pom.xml
index 5977013..4e46db9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
net.limework
RediSkript
- 1.3.3
+ 1.4.0-SNAPSHOT
RediSkript-core
RediSkript-bukkit
@@ -53,11 +53,6 @@
-
- redis.clients
- jedis
- 3.5.1
-
org.json
json
--
2.45.0