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] 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 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>RediSkript</artifactId>
+        <groupId>net.limework</groupId>
+        <version>1.3.3</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>RediSkript-bukkit</artifactId>
+
+    <repositories>
+        <repository>
+            <id>spigot-repo</id>
+            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/org/spigotmc/spigot-api/</url>
+        </repository>
+        <repository>
+            <id>jitpack.io</id>
+            <url>https://jitpack.io</url>
+        </repository>
+        <repository>
+            <id>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>
+
+
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+                <filtering>true</filtering>
+            </resource>
+        </resources>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <version>3.6.1</version>
+                <configuration>
+                    <source>1.8</source>
+                    <target>1.8</target>
+                    <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>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.github.SkriptLang</groupId>
+            <artifactId>Skript</artifactId>
+            <version>2.5.3</version>
+            <type>jar</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.spigotmc</groupId>
+            <artifactId>spigot-api</artifactId>
+            <version>1.16.5-R0.1-SNAPSHOT</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>redis.clients</groupId>
+            <artifactId>jedis</artifactId>
+            <version>3.5.1</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ 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 @@
     </parent>
     <modelVersion>4.0.0</modelVersion>
 
-    <artifactId>bukkit</artifactId>
+    <artifactId>RediSkript-core</artifactId>
+
+
+
 
 
 </project>
\ 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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
-    <parent>
-        <artifactId>RediSkript</artifactId>
-        <groupId>net.limework</groupId>
-        <version>1.3.3</version>
-    </parent>
-    <modelVersion>4.0.0</modelVersion>
-
-    <artifactId>core</artifactId>
-
-
-</project>
\ 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 @@
     <artifactId>RediSkript</artifactId>
     <version>1.3.3</version>
     <modules>
-        <module>core</module>
-        <module>bukkit</module>
+        <module>RediSkript-core</module>
+        <module>RediSkript-bukkit</module>
     </modules>
     <packaging>pom</packaging>
 
@@ -50,43 +50,9 @@
         </plugins>
     </build>
 
-    <repositories>
-        <repository>
-            <id>spigot-repo</id>
-            <url>https://hub.spigotmc.org/nexus/content/repositories/snapshots/org/spigotmc/spigot-api/</url>
-        </repository>
-        <repository>
-            <id>jitpack.io</id>
-            <url>https://jitpack.io</url>
-        </repository>
-        <repository>
-            <id>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>
+
 
     <dependencies>
-        <dependency>
-            <groupId>com.github.SkriptLang</groupId>
-            <artifactId>Skript</artifactId>
-            <version>2.5.3</version>
-            <type>jar</type>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.spigotmc</groupId>
-            <artifactId>spigot-api</artifactId>
-            <version>1.16.5-R0.1-SNAPSHOT</version>
-            <scope>provided</scope>
-        </dependency>
         <dependency>
             <groupId>redis.clients</groupId>
             <artifactId>jedis</artifactId>