From 9b6a6722398eb9d1355cab73e4a7c7c2717865b9 Mon Sep 17 00:00:00 2001
From: GregTCLTK <gregtcltk@gmail.com>
Date: Sun, 7 Jun 2020 18:31:40 +0200
Subject: [PATCH] Move Rethink stuff in an extra db folder

---
 src/main/java/com/bbn/hadder/Hadder.java                    | 1 +
 src/main/java/com/bbn/hadder/commands/CommandEvent.java     | 6 +++---
 .../com/bbn/hadder/commands/owner/BlacklistCommand.java     | 2 +-
 src/main/java/com/bbn/hadder/core/CommandHandler.java       | 6 +++---
 src/main/java/com/bbn/hadder/{ => db}/Rethink.java          | 6 +++---
 src/main/java/com/bbn/hadder/{ => db}/RethinkServer.java    | 4 ++--
 src/main/java/com/bbn/hadder/{ => db}/RethinkUser.java      | 4 ++--
 src/main/java/com/bbn/hadder/listener/CommandListener.java  | 6 +++---
 src/main/java/com/bbn/hadder/listener/GuildListener.java    | 2 +-
 .../java/com/bbn/hadder/listener/InviteLinkListener.java    | 4 ++--
 src/main/java/com/bbn/hadder/listener/MentionListener.java  | 6 +++---
 .../com/bbn/hadder/listener/PrivateMessageListener.java     | 4 ++--
 src/main/java/com/bbn/hadder/listener/ReadyListener.java    | 2 +-
 src/main/java/com/bbn/hadder/listener/RulesListener.java    | 4 ++--
 .../java/com/bbn/hadder/listener/StarboardListener.java     | 4 ++--
 src/main/java/com/bbn/hadder/utils/MessageEditor.java       | 2 +-
 16 files changed, 32 insertions(+), 31 deletions(-)
 rename src/main/java/com/bbn/hadder/{ => db}/Rethink.java (97%)
 rename src/main/java/com/bbn/hadder/{ => db}/RethinkServer.java (97%)
 rename src/main/java/com/bbn/hadder/{ => db}/RethinkUser.java (95%)

diff --git a/src/main/java/com/bbn/hadder/Hadder.java b/src/main/java/com/bbn/hadder/Hadder.java
index ab8edbe..3499a7b 100644
--- a/src/main/java/com/bbn/hadder/Hadder.java
+++ b/src/main/java/com/bbn/hadder/Hadder.java
@@ -26,6 +26,7 @@ import com.bbn.hadder.commands.fun.*;
 import com.bbn.hadder.commands.settings.*;
 import com.bbn.hadder.commands.music.*;
 import com.bbn.hadder.core.*;
+import com.bbn.hadder.db.Rethink;
 import com.bbn.hadder.listener.*;
 import net.dv8tion.jda.api.OnlineStatus;
 import net.dv8tion.jda.api.entities.Activity;
diff --git a/src/main/java/com/bbn/hadder/commands/CommandEvent.java b/src/main/java/com/bbn/hadder/commands/CommandEvent.java
index 90b1d8b..73dc632 100644
--- a/src/main/java/com/bbn/hadder/commands/CommandEvent.java
+++ b/src/main/java/com/bbn/hadder/commands/CommandEvent.java
@@ -16,9 +16,9 @@
 
 package com.bbn.hadder.commands;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkServer;
-import com.bbn.hadder.RethinkUser;
+import com.bbn.hadder.db.Rethink;
+import com.bbn.hadder.db.RethinkServer;
+import com.bbn.hadder.db.RethinkUser;
 import com.bbn.hadder.audio.AudioManager;
 import com.bbn.hadder.commands.general.HelpCommand;
 import com.bbn.hadder.core.CommandHandler;
diff --git a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
index 50555a4..b097af1 100644
--- a/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
+++ b/src/main/java/com/bbn/hadder/commands/owner/BlacklistCommand.java
@@ -16,7 +16,7 @@
 
 package com.bbn.hadder.commands.owner;
 
-import com.bbn.hadder.RethinkUser;
+import com.bbn.hadder.db.RethinkUser;
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
 import com.bbn.hadder.core.Perm;
diff --git a/src/main/java/com/bbn/hadder/core/CommandHandler.java b/src/main/java/com/bbn/hadder/core/CommandHandler.java
index 7ab130a..a5ecd97 100644
--- a/src/main/java/com/bbn/hadder/core/CommandHandler.java
+++ b/src/main/java/com/bbn/hadder/core/CommandHandler.java
@@ -16,9 +16,9 @@
 
 package com.bbn.hadder.core;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkServer;
-import com.bbn.hadder.RethinkUser;
+import com.bbn.hadder.db.Rethink;
+import com.bbn.hadder.db.RethinkServer;
+import com.bbn.hadder.db.RethinkUser;
 import com.bbn.hadder.audio.AudioManager;
 import com.bbn.hadder.commands.Command;
 import com.bbn.hadder.commands.CommandEvent;
diff --git a/src/main/java/com/bbn/hadder/Rethink.java b/src/main/java/com/bbn/hadder/db/Rethink.java
similarity index 97%
rename from src/main/java/com/bbn/hadder/Rethink.java
rename to src/main/java/com/bbn/hadder/db/Rethink.java
index 069209f..c359350 100644
--- a/src/main/java/com/bbn/hadder/Rethink.java
+++ b/src/main/java/com/bbn/hadder/db/Rethink.java
@@ -10,11 +10,11 @@
  * 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
+ *  See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
-package com.bbn.hadder;
+package com.bbn.hadder.db;
 
 import com.bbn.hadder.core.Config;
 import com.rethinkdb.RethinkDB;
@@ -31,7 +31,7 @@ public class Rethink {
     private Connection conn;
     private Config config;
 
-    Rethink(Config config) {
+    public Rethink(Config config) {
         this.config = config;
     }
 
diff --git a/src/main/java/com/bbn/hadder/RethinkServer.java b/src/main/java/com/bbn/hadder/db/RethinkServer.java
similarity index 97%
rename from src/main/java/com/bbn/hadder/RethinkServer.java
rename to src/main/java/com/bbn/hadder/db/RethinkServer.java
index e54dfd9..0993922 100644
--- a/src/main/java/com/bbn/hadder/RethinkServer.java
+++ b/src/main/java/com/bbn/hadder/db/RethinkServer.java
@@ -10,11 +10,11 @@
  * 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
+ *  See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
-package com.bbn.hadder;
+package com.bbn.hadder.db;
 
 import org.json.JSONObject;
 
diff --git a/src/main/java/com/bbn/hadder/RethinkUser.java b/src/main/java/com/bbn/hadder/db/RethinkUser.java
similarity index 95%
rename from src/main/java/com/bbn/hadder/RethinkUser.java
rename to src/main/java/com/bbn/hadder/db/RethinkUser.java
index 0579947..ba65bc3 100644
--- a/src/main/java/com/bbn/hadder/RethinkUser.java
+++ b/src/main/java/com/bbn/hadder/db/RethinkUser.java
@@ -10,11 +10,11 @@
  * 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
+ *  See the License for the specific language governing permissions and
  * limitations under the License.
  */
 
-package com.bbn.hadder;
+package com.bbn.hadder.db;
 
 import org.json.JSONObject;
 
diff --git a/src/main/java/com/bbn/hadder/listener/CommandListener.java b/src/main/java/com/bbn/hadder/listener/CommandListener.java
index 286d320..0defad9 100644
--- a/src/main/java/com/bbn/hadder/listener/CommandListener.java
+++ b/src/main/java/com/bbn/hadder/listener/CommandListener.java
@@ -16,9 +16,9 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkServer;
-import com.bbn.hadder.RethinkUser;
+import com.bbn.hadder.db.Rethink;
+import com.bbn.hadder.db.RethinkServer;
+import com.bbn.hadder.db.RethinkUser;
 import com.bbn.hadder.audio.AudioManager;
 import com.bbn.hadder.core.CommandHandler;
 import net.dv8tion.jda.api.EmbedBuilder;
diff --git a/src/main/java/com/bbn/hadder/listener/GuildListener.java b/src/main/java/com/bbn/hadder/listener/GuildListener.java
index 91204ca..a35ce21 100644
--- a/src/main/java/com/bbn/hadder/listener/GuildListener.java
+++ b/src/main/java/com/bbn/hadder/listener/GuildListener.java
@@ -16,7 +16,7 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
+import com.bbn.hadder.db.Rethink;
 import com.bbn.hadder.core.Config;
 import com.bbn.hadder.utils.BotList;
 import com.bbn.hadder.utils.MessageEditor;
diff --git a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java
index ea00e93..69dddfd 100644
--- a/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java
+++ b/src/main/java/com/bbn/hadder/listener/InviteLinkListener.java
@@ -16,8 +16,8 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkServer;
+import com.bbn.hadder.db.Rethink;
+import com.bbn.hadder.db.RethinkServer;
 import net.dv8tion.jda.api.Permission;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.entities.Message;
diff --git a/src/main/java/com/bbn/hadder/listener/MentionListener.java b/src/main/java/com/bbn/hadder/listener/MentionListener.java
index 7fb9e11..2ac4e3d 100644
--- a/src/main/java/com/bbn/hadder/listener/MentionListener.java
+++ b/src/main/java/com/bbn/hadder/listener/MentionListener.java
@@ -16,9 +16,9 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkServer;
-import com.bbn.hadder.RethinkUser;
+import com.bbn.hadder.db.Rethink;
+import com.bbn.hadder.db.RethinkServer;
+import com.bbn.hadder.db.RethinkUser;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.ChannelType;
 import net.dv8tion.jda.api.events.message.MessageReceivedEvent;
diff --git a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
index fc258f9..8e94bbe 100644
--- a/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
+++ b/src/main/java/com/bbn/hadder/listener/PrivateMessageListener.java
@@ -16,8 +16,8 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkUser;
+import com.bbn.hadder.db.Rethink;
+import com.bbn.hadder.db.RethinkUser;
 import com.bbn.hadder.utils.MessageEditor;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.ChannelType;
diff --git a/src/main/java/com/bbn/hadder/listener/ReadyListener.java b/src/main/java/com/bbn/hadder/listener/ReadyListener.java
index 51b3491..2262453 100644
--- a/src/main/java/com/bbn/hadder/listener/ReadyListener.java
+++ b/src/main/java/com/bbn/hadder/listener/ReadyListener.java
@@ -16,7 +16,7 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
+import com.bbn.hadder.db.Rethink;
 import com.bbn.hadder.core.Config;
 import com.bbn.hadder.utils.BotList;
 import net.dv8tion.jda.api.entities.Guild;
diff --git a/src/main/java/com/bbn/hadder/listener/RulesListener.java b/src/main/java/com/bbn/hadder/listener/RulesListener.java
index 8ee5fc4..a04662f 100644
--- a/src/main/java/com/bbn/hadder/listener/RulesListener.java
+++ b/src/main/java/com/bbn/hadder/listener/RulesListener.java
@@ -16,8 +16,8 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkServer;
+import com.bbn.hadder.db.Rethink;
+import com.bbn.hadder.db.RethinkServer;
 import net.dv8tion.jda.api.events.message.react.MessageReactionAddEvent;
 import net.dv8tion.jda.api.events.message.react.MessageReactionRemoveEvent;
 import net.dv8tion.jda.api.hooks.ListenerAdapter;
diff --git a/src/main/java/com/bbn/hadder/listener/StarboardListener.java b/src/main/java/com/bbn/hadder/listener/StarboardListener.java
index 2467ad5..060777b 100644
--- a/src/main/java/com/bbn/hadder/listener/StarboardListener.java
+++ b/src/main/java/com/bbn/hadder/listener/StarboardListener.java
@@ -16,8 +16,8 @@
 
 package com.bbn.hadder.listener;
 
-import com.bbn.hadder.Rethink;
-import com.bbn.hadder.RethinkServer;
+import com.bbn.hadder.db.Rethink;
+import com.bbn.hadder.db.RethinkServer;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.MessageBuilder;
 import net.dv8tion.jda.api.entities.MessageReaction;
diff --git a/src/main/java/com/bbn/hadder/utils/MessageEditor.java b/src/main/java/com/bbn/hadder/utils/MessageEditor.java
index c760b70..aac0d8c 100644
--- a/src/main/java/com/bbn/hadder/utils/MessageEditor.java
+++ b/src/main/java/com/bbn/hadder/utils/MessageEditor.java
@@ -16,7 +16,7 @@
 
 package com.bbn.hadder.utils;
 
-import com.bbn.hadder.RethinkUser;
+import com.bbn.hadder.db.RethinkUser;
 import net.dv8tion.jda.api.EmbedBuilder;
 import net.dv8tion.jda.api.entities.User;