Renamed databaserewrite package to database

IllusionTheDev · Oct 25, 2023 · c405d18 · c405d18
1 parent e7eaca6
commit c405d18
Show file tree

Hide file tree

Showing 39 changed files with 83 additions and 83 deletions.
diff --git a/...ckCore-BungeeCord/src/main/java/me/illusion/skyblockcore/bungee/SkyblockBungeePlugin.java b/...ckCore-BungeeCord/src/main/java/me/illusion/skyblockcore/bungee/SkyblockBungeePlugin.java
@@ -10,7 +10,7 @@
 import me.illusion.skyblockcore.common.command.audience.SkyblockAudience;
 import me.illusion.skyblockcore.common.command.manager.SkyblockCommandManager;
 import me.illusion.skyblockcore.common.config.SkyblockMessagesFile;
-import me.illusion.skyblockcore.common.databaserewrite.registry.SkyblockDatabaseRegistry;
+import me.illusion.skyblockcore.common.database.registry.SkyblockDatabaseRegistry;
 import me.illusion.skyblockcore.common.event.manager.SkyblockEventManager;
 import me.illusion.skyblockcore.common.event.manager.SkyblockEventManagerImpl;
 import me.illusion.skyblockcore.common.utilities.file.IOUtils;

diff --git a/...baserewrite/AbstractSkyblockDatabase.java → ...on/database/AbstractSkyblockDatabase.java b/...baserewrite/AbstractSkyblockDatabase.java → ...on/database/AbstractSkyblockDatabase.java
@@ -1,4 +1,4 @@
-package me.illusion.skyblockcore.common.databaserewrite;
+package me.illusion.skyblockcore.common.database;
 
 import com.google.common.collect.Sets;
 import java.util.Collection;

diff --git a/...mon/databaserewrite/SkyblockDatabase.java → ...ore/common/database/SkyblockDatabase.java b/...mon/databaserewrite/SkyblockDatabase.java → ...ore/common/database/SkyblockDatabase.java
@@ -1,4 +1,4 @@
-package me.illusion.skyblockcore.common.databaserewrite;
+package me.illusion.skyblockcore.common.database;
 
 import java.util.Collection;
 import java.util.concurrent.CompletableFuture;

diff --git a/.../databaserewrite/SkyblockDatabaseTag.java → .../common/database/SkyblockDatabaseTag.java b/.../databaserewrite/SkyblockDatabaseTag.java → .../common/database/SkyblockDatabaseTag.java
@@ -1,4 +1,4 @@
-package me.illusion.skyblockcore.common.databaserewrite;
+package me.illusion.skyblockcore.common.database;
 
 public enum SkyblockDatabaseTag {
 

diff --git a/...n/src/main/java/me/illusion/skyblockcore/common/database/cache/AbstractCacheDatabase.java b/...n/src/main/java/me/illusion/skyblockcore/common/database/cache/AbstractCacheDatabase.java
@@ -0,0 +1,11 @@
+package me.illusion.skyblockcore.common.database.cache;
+
+import me.illusion.skyblockcore.common.database.AbstractSkyblockDatabase;
+import me.illusion.skyblockcore.common.database.SkyblockDatabaseTag;
+
+public abstract class AbstractCacheDatabase extends AbstractSkyblockDatabase implements SkyblockCache {
+
+    protected AbstractCacheDatabase() {
+        addTag(SkyblockDatabaseTag.CACHE);
+    }
+}
diff --git a/.../databaserewrite/cache/SkyblockCache.java → .../common/database/cache/SkyblockCache.java b/.../databaserewrite/cache/SkyblockCache.java → .../common/database/cache/SkyblockCache.java
@@ -1,7 +1,7 @@
-package me.illusion.skyblockcore.common.databaserewrite.cache;
+package me.illusion.skyblockcore.common.database.cache;
 
 import java.util.concurrent.CompletableFuture;
-import me.illusion.skyblockcore.common.databaserewrite.SkyblockDatabase;
+import me.illusion.skyblockcore.common.database.SkyblockDatabase;
 
 public interface SkyblockCache extends SkyblockDatabase {
 

diff --git a/...che/redis/AbstractRedisCacheDatabase.java → ...che/redis/AbstractRedisCacheDatabase.java b/...che/redis/AbstractRedisCacheDatabase.java → ...che/redis/AbstractRedisCacheDatabase.java
@@ -1,11 +1,11 @@
-package me.illusion.skyblockcore.common.databaserewrite.cache.redis;
+package me.illusion.skyblockcore.common.database.cache.redis;
 
 import java.util.concurrent.CompletableFuture;
 import java.util.function.Consumer;
 import java.util.function.Function;
 import me.illusion.skyblockcore.common.config.section.ConfigurationSection;
-import me.illusion.skyblockcore.common.databaserewrite.SkyblockDatabaseTag;
-import me.illusion.skyblockcore.common.databaserewrite.cache.AbstractCacheDatabase;
+import me.illusion.skyblockcore.common.database.SkyblockDatabaseTag;
+import me.illusion.skyblockcore.common.database.cache.AbstractCacheDatabase;
 import redis.clients.jedis.Jedis;
 import redis.clients.jedis.JedisPool;
 

diff --git a/...ava/me/illusion/skyblockcore/common/database/persistence/AbstractPersistenceDatabase.java b/...ava/me/illusion/skyblockcore/common/database/persistence/AbstractPersistenceDatabase.java
@@ -0,0 +1,11 @@
+package me.illusion.skyblockcore.common.database.persistence;
+
+import me.illusion.skyblockcore.common.database.AbstractSkyblockDatabase;
+import me.illusion.skyblockcore.common.database.SkyblockDatabaseTag;
+
+public abstract class AbstractPersistenceDatabase extends AbstractSkyblockDatabase {
+
+    protected AbstractPersistenceDatabase() {
+        addTag(SkyblockDatabaseTag.FETCHING);
+    }
+}
diff --git a/...tence/mongo/MongoPersistenceDatabase.java → ...tence/mongo/MongoPersistenceDatabase.java b/...tence/mongo/MongoPersistenceDatabase.java → ...tence/mongo/MongoPersistenceDatabase.java
@@ -1,4 +1,4 @@
-package me.illusion.skyblockcore.common.databaserewrite.persistence.mongo;
+package me.illusion.skyblockcore.common.database.persistence.mongo;
 
 import com.mongodb.client.MongoClient;
 import com.mongodb.client.MongoClients;
@@ -8,8 +8,8 @@
 import java.util.List;
 import java.util.concurrent.CompletableFuture;
 import me.illusion.skyblockcore.common.config.section.ConfigurationSection;
-import me.illusion.skyblockcore.common.databaserewrite.SkyblockDatabaseTag;
-import me.illusion.skyblockcore.common.databaserewrite.persistence.AbstractPersistenceDatabase;
+import me.illusion.skyblockcore.common.database.SkyblockDatabaseTag;
+import me.illusion.skyblockcore.common.database.persistence.AbstractPersistenceDatabase;
 import org.bson.codecs.Codec;
 import org.bson.codecs.configuration.CodecRegistries;
 import org.bson.codecs.configuration.CodecRegistry;

diff --git a/...ite/persistence/mongo/MongoUUIDCodec.java → ...ase/persistence/mongo/MongoUUIDCodec.java b/...ite/persistence/mongo/MongoUUIDCodec.java → ...ase/persistence/mongo/MongoUUIDCodec.java
@@ -1,4 +1,4 @@
-package me.illusion.skyblockcore.common.databaserewrite.persistence.mongo;
+package me.illusion.skyblockcore.common.database.persistence.mongo;
 
 import java.util.UUID;
 import org.bson.BsonBinary;

diff --git a/...AbstractRemoteSQLPersistenceDatabase.java → ...AbstractRemoteSQLPersistenceDatabase.java b/...AbstractRemoteSQLPersistenceDatabase.java → ...AbstractRemoteSQLPersistenceDatabase.java
@@ -1,8 +1,8 @@
-package me.illusion.skyblockcore.common.databaserewrite.persistence.sql;
+package me.illusion.skyblockcore.common.database.persistence.sql;
 
 import java.util.concurrent.CompletableFuture;
 import me.illusion.skyblockcore.common.config.section.ConfigurationSection;
-import me.illusion.skyblockcore.common.databaserewrite.SkyblockDatabaseTag;
+import me.illusion.skyblockcore.common.database.SkyblockDatabaseTag;
 
 public abstract class AbstractRemoteSQLPersistenceDatabase extends AbstractSQLPersistenceDatabase {
 

diff --git a/...e/sql/AbstractSQLPersistenceDatabase.java → ...e/sql/AbstractSQLPersistenceDatabase.java b/...e/sql/AbstractSQLPersistenceDatabase.java → ...e/sql/AbstractSQLPersistenceDatabase.java
@@ -1,4 +1,4 @@
-package me.illusion.skyblockcore.common.databaserewrite.persistence.sql;
+package me.illusion.skyblockcore.common.database.persistence.sql;
 
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -11,10 +11,10 @@
 import java.util.function.Consumer;
 import lombok.SneakyThrows;
 import me.illusion.skyblockcore.common.config.section.ConfigurationSection;
-import me.illusion.skyblockcore.common.databaserewrite.SkyblockDatabaseTag;
-import me.illusion.skyblockcore.common.databaserewrite.persistence.AbstractPersistenceDatabase;
-import me.illusion.skyblockcore.common.databaserewrite.sql.functional.ResultSetFunction;
-import me.illusion.skyblockcore.common.databaserewrite.sql.object.StatementObject;
+import me.illusion.skyblockcore.common.database.SkyblockDatabaseTag;
+import me.illusion.skyblockcore.common.database.persistence.AbstractPersistenceDatabase;
+import me.illusion.skyblockcore.common.database.sql.functional.ResultSetFunction;
+import me.illusion.skyblockcore.common.database.sql.object.StatementObject;
 
 public abstract class AbstractSQLPersistenceDatabase extends AbstractPersistenceDatabase {
 

diff --git a/...ce/sql/impl/MySQLPersistenceDatabase.java → ...ce/sql/impl/MySQLPersistenceDatabase.java b/...ce/sql/impl/MySQLPersistenceDatabase.java → ...ce/sql/impl/MySQLPersistenceDatabase.java
@@ -1,10 +1,10 @@
-package me.illusion.skyblockcore.common.databaserewrite.persistence.sql.impl;
+package me.illusion.skyblockcore.common.database.persistence.sql.impl;
 
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.util.Properties;
 import java.util.concurrent.CompletableFuture;
-import me.illusion.skyblockcore.common.databaserewrite.persistence.sql.AbstractRemoteSQLPersistenceDatabase;
+import me.illusion.skyblockcore.common.database.persistence.sql.AbstractRemoteSQLPersistenceDatabase;
 
 public abstract class MySQLPersistenceDatabase extends AbstractRemoteSQLPersistenceDatabase {
 

diff --git a/...e/sql/impl/SQLitePersistenceDatabase.java → ...e/sql/impl/SQLitePersistenceDatabase.java b/...e/sql/impl/SQLitePersistenceDatabase.java → ...e/sql/impl/SQLitePersistenceDatabase.java
@@ -1,11 +1,11 @@
-package me.illusion.skyblockcore.common.databaserewrite.persistence.sql.impl;
+package me.illusion.skyblockcore.common.database.persistence.sql.impl;
 
 import java.io.File;
 import java.sql.Connection;
 import java.sql.DriverManager;
 import java.util.concurrent.CompletableFuture;
 import me.illusion.skyblockcore.common.config.section.ConfigurationSection;
-import me.illusion.skyblockcore.common.databaserewrite.persistence.sql.AbstractSQLPersistenceDatabase;
+import me.illusion.skyblockcore.common.database.persistence.sql.AbstractSQLPersistenceDatabase;
 import me.illusion.skyblockcore.common.platform.SkyblockPlatform;
 import me.illusion.skyblockcore.common.utilities.file.IOUtils;
 

diff --git a/...erewrite/registry/RegisteredDatabase.java → ...database/registry/RegisteredDatabase.java b/...erewrite/registry/RegisteredDatabase.java → ...database/registry/RegisteredDatabase.java
@@ -1,6 +1,6 @@
-package me.illusion.skyblockcore.common.databaserewrite.registry;
+package me.illusion.skyblockcore.common.database.registry;
 
-import me.illusion.skyblockcore.common.databaserewrite.SkyblockDatabase;
+import me.illusion.skyblockcore.common.database.SkyblockDatabase;
 
 public class RegisteredDatabase {
 

diff --git a/...y/SkyblockDatabaseCredentialRegistry.java → ...y/SkyblockDatabaseCredentialRegistry.java b/...y/SkyblockDatabaseCredentialRegistry.java → ...y/SkyblockDatabaseCredentialRegistry.java
@@ -1,4 +1,4 @@
-package me.illusion.skyblockcore.common.databaserewrite.registry;
+package me.illusion.skyblockcore.common.database.registry;
 
 import java.util.ArrayList;
 import java.util.HashSet;

diff --git a/...te/registry/SkyblockDatabaseProvider.java → ...se/registry/SkyblockDatabaseProvider.java b/...te/registry/SkyblockDatabaseProvider.java → ...se/registry/SkyblockDatabaseProvider.java
@@ -1,9 +1,9 @@
-package me.illusion.skyblockcore.common.databaserewrite.registry;
+package me.illusion.skyblockcore.common.database.registry;
 
 import java.util.Map;
 import me.illusion.skyblockcore.common.config.section.ConfigurationSection;
-import me.illusion.skyblockcore.common.databaserewrite.SkyblockDatabase;
-import me.illusion.skyblockcore.common.databaserewrite.registry.provider.MappedDatabaseProvider;
+import me.illusion.skyblockcore.common.database.SkyblockDatabase;
+import me.illusion.skyblockcore.common.database.registry.provider.MappedDatabaseProvider;
 
 public interface SkyblockDatabaseProvider {
 

diff --git a/...te/registry/SkyblockDatabaseRegistry.java → ...se/registry/SkyblockDatabaseRegistry.java b/...te/registry/SkyblockDatabaseRegistry.java → ...se/registry/SkyblockDatabaseRegistry.java
@@ -1,4 +1,4 @@
-package me.illusion.skyblockcore.common.databaserewrite.registry;
+package me.illusion.skyblockcore.common.database.registry;
 
 import com.google.common.collect.Sets;
 import java.util.Collection;
@@ -10,8 +10,8 @@
 import java.util.logging.Level;
 import me.illusion.skyblockcore.common.config.section.ConfigurationSection;
 import me.illusion.skyblockcore.common.config.section.WritableConfigurationSection;
-import me.illusion.skyblockcore.common.databaserewrite.SkyblockDatabase;
-import me.illusion.skyblockcore.common.databaserewrite.cache.SkyblockCache;
+import me.illusion.skyblockcore.common.database.SkyblockDatabase;
+import me.illusion.skyblockcore.common.database.cache.SkyblockCache;
 import me.illusion.skyblockcore.common.platform.SkyblockPlatform;
 import me.illusion.skyblockcore.common.storage.SkyblockStorage;
 import me.illusion.skyblockcore.common.storage.cache.redis.MemorySkyblockIslandCache;

diff --git a/...stry/provider/MappedDatabaseProvider.java → ...stry/provider/MappedDatabaseProvider.java b/...stry/provider/MappedDatabaseProvider.java → ...stry/provider/MappedDatabaseProvider.java
@@ -1,10 +1,10 @@
-package me.illusion.skyblockcore.common.databaserewrite.registry.provider;
+package me.illusion.skyblockcore.common.database.registry.provider;
 
 import com.google.common.collect.ImmutableMap;
 import java.util.HashMap;
 import java.util.Map;
-import me.illusion.skyblockcore.common.databaserewrite.SkyblockDatabase;
-import me.illusion.skyblockcore.common.databaserewrite.registry.SkyblockDatabaseProvider;
+import me.illusion.skyblockcore.common.database.SkyblockDatabase;
+import me.illusion.skyblockcore.common.database.registry.SkyblockDatabaseProvider;
 
 public class MappedDatabaseProvider implements SkyblockDatabaseProvider {
 

diff --git a/...ite/sql/functional/ResultSetConsumer.java → ...ase/sql/functional/ResultSetConsumer.java b/...ite/sql/functional/ResultSetConsumer.java → ...ase/sql/functional/ResultSetConsumer.java
@@ -1,4 +1,4 @@
-package me.illusion.skyblockcore.common.databaserewrite.sql.functional;
+package me.illusion.skyblockcore.common.database.sql.functional;
 
 import java.sql.ResultSet;
 

diff --git a/...ite/sql/functional/ResultSetFunction.java → ...ase/sql/functional/ResultSetFunction.java b/...ite/sql/functional/ResultSetFunction.java → ...ase/sql/functional/ResultSetFunction.java
@@ -1,4 +1,4 @@
-package me.illusion.skyblockcore.common.databaserewrite.sql.functional;
+package me.illusion.skyblockcore.common.database.sql.functional;
 
 import java.sql.ResultSet;
 

diff --git a/...ite/sql/object/ObjectStatementObject.java → ...ase/sql/object/ObjectStatementObject.java b/...ite/sql/object/ObjectStatementObject.java → ...ase/sql/object/ObjectStatementObject.java
@@ -1,4 +1,4 @@
-package me.illusion.skyblockcore.common.databaserewrite.sql.object;
+package me.illusion.skyblockcore.common.database.sql.object;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;

diff --git a/...serewrite/sql/object/StatementObject.java → .../database/sql/object/StatementObject.java b/...serewrite/sql/object/StatementObject.java → .../database/sql/object/StatementObject.java
@@ -1,4 +1,4 @@
-package me.illusion.skyblockcore.common.databaserewrite.sql.object;
+package me.illusion.skyblockcore.common.database.sql.object;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;

diff --git a/...ite/sql/object/StringStatementObject.java → ...ase/sql/object/StringStatementObject.java b/...ite/sql/object/StringStatementObject.java → ...ase/sql/object/StringStatementObject.java
@@ -1,4 +1,4 @@
-package me.illusion.skyblockcore.common.databaserewrite.sql.object;
+package me.illusion.skyblockcore.common.database.sql.object;
 
 import java.sql.PreparedStatement;
 import java.sql.SQLException;

diff --git a/...ain/java/me/illusion/skyblockcore/common/databaserewrite/cache/AbstractCacheDatabase.java b/...ain/java/me/illusion/skyblockcore/common/databaserewrite/cache/AbstractCacheDatabase.java
diff --git a/...illusion/skyblockcore/common/databaserewrite/persistence/AbstractPersistenceDatabase.java b/...illusion/skyblockcore/common/databaserewrite/persistence/AbstractPersistenceDatabase.java
diff --git a/...kCore-Common/src/main/java/me/illusion/skyblockcore/common/platform/SkyblockPlatform.java b/...kCore-Common/src/main/java/me/illusion/skyblockcore/common/platform/SkyblockPlatform.java
@@ -5,7 +5,7 @@
 import me.illusion.skyblockcore.common.command.manager.SkyblockCommandManager;
 import me.illusion.skyblockcore.common.config.ConfigurationProvider;
 import me.illusion.skyblockcore.common.config.SkyblockMessagesFile;
-import me.illusion.skyblockcore.common.databaserewrite.registry.SkyblockDatabaseRegistry;
+import me.illusion.skyblockcore.common.database.registry.SkyblockDatabaseRegistry;
 import me.illusion.skyblockcore.common.event.manager.SkyblockEventManager;
 
 /**

diff --git a/...ockCore-Common/src/main/java/me/illusion/skyblockcore/common/storage/SkyblockStorage.java b/...ockCore-Common/src/main/java/me/illusion/skyblockcore/common/storage/SkyblockStorage.java
@@ -1,7 +1,7 @@
 package me.illusion.skyblockcore.common.storage;
 
 import java.util.concurrent.CompletableFuture;
-import me.illusion.skyblockcore.common.databaserewrite.SkyblockDatabase;
+import me.illusion.skyblockcore.common.database.SkyblockDatabase;
 
 public interface SkyblockStorage<T extends SkyblockDatabase> extends SkyblockDatabase {
 

diff --git a/...mmon/src/main/java/me/illusion/skyblockcore/common/storage/cache/SkyblockIslandCache.java b/...mmon/src/main/java/me/illusion/skyblockcore/common/storage/cache/SkyblockIslandCache.java
@@ -4,7 +4,7 @@
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
-import me.illusion.skyblockcore.common.databaserewrite.cache.SkyblockCache;
+import me.illusion.skyblockcore.common.database.cache.SkyblockCache;
 
 public interface SkyblockIslandCache extends SkyblockCache {
 

diff --git a/...n/java/me/illusion/skyblockcore/common/storage/cache/redis/MemorySkyblockIslandCache.java b/...n/java/me/illusion/skyblockcore/common/storage/cache/redis/MemorySkyblockIslandCache.java
@@ -6,8 +6,8 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
 import me.illusion.skyblockcore.common.config.section.ConfigurationSection;
-import me.illusion.skyblockcore.common.databaserewrite.AbstractSkyblockDatabase;
-import me.illusion.skyblockcore.common.databaserewrite.SkyblockDatabaseTag;
+import me.illusion.skyblockcore.common.database.AbstractSkyblockDatabase;
+import me.illusion.skyblockcore.common.database.SkyblockDatabaseTag;
 import me.illusion.skyblockcore.common.storage.cache.SkyblockIslandCache;
 
 public class MemorySkyblockIslandCache extends AbstractSkyblockDatabase implements SkyblockIslandCache {

diff --git a/...in/java/me/illusion/skyblockcore/common/storage/cache/redis/RedisSkyblockIslandCache.java b/...in/java/me/illusion/skyblockcore/common/storage/cache/redis/RedisSkyblockIslandCache.java
@@ -6,7 +6,7 @@
 import java.util.Map;
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
-import me.illusion.skyblockcore.common.databaserewrite.cache.redis.AbstractRedisCacheDatabase;
+import me.illusion.skyblockcore.common.database.cache.redis.AbstractRedisCacheDatabase;
 import me.illusion.skyblockcore.common.storage.cache.SkyblockIslandCache;
 
 public class RedisSkyblockIslandCache extends AbstractRedisCacheDatabase implements SkyblockIslandCache {

diff --git a/...rc/main/java/me/illusion/skyblockcore/common/storage/island/mongo/MongoIslandStorage.java b/...rc/main/java/me/illusion/skyblockcore/common/storage/island/mongo/MongoIslandStorage.java
@@ -8,8 +8,8 @@
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import me.illusion.skyblockcore.common.data.IslandData;
-import me.illusion.skyblockcore.common.databaserewrite.persistence.mongo.MongoPersistenceDatabase;
-import me.illusion.skyblockcore.common.databaserewrite.persistence.mongo.MongoUUIDCodec;
+import me.illusion.skyblockcore.common.database.persistence.mongo.MongoPersistenceDatabase;
+import me.illusion.skyblockcore.common.database.persistence.mongo.MongoUUIDCodec;
 import me.illusion.skyblockcore.common.storage.island.SkyblockIslandStorage;
 import me.illusion.skyblockcore.common.storage.island.mongo.codec.MongoIslandDataCodec;
 import org.bson.codecs.Codec;

diff --git a/.../src/main/java/me/illusion/skyblockcore/common/storage/island/sql/MySQLIslandStorage.java b/.../src/main/java/me/illusion/skyblockcore/common/storage/island/sql/MySQLIslandStorage.java
@@ -7,8 +7,8 @@
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import me.illusion.skyblockcore.common.data.IslandData;
-import me.illusion.skyblockcore.common.databaserewrite.persistence.sql.impl.MySQLPersistenceDatabase;
-import me.illusion.skyblockcore.common.databaserewrite.sql.object.StringStatementObject;
+import me.illusion.skyblockcore.common.database.persistence.sql.impl.MySQLPersistenceDatabase;
+import me.illusion.skyblockcore.common.database.sql.object.StringStatementObject;
 import me.illusion.skyblockcore.common.storage.island.SkyblockIslandStorage;
 
 public class MySQLIslandStorage extends MySQLPersistenceDatabase implements SkyblockIslandStorage { // TODO: De-duplicate the SQL storages

diff --git a/...src/main/java/me/illusion/skyblockcore/common/storage/island/sql/SQLiteIslandStorage.java b/...src/main/java/me/illusion/skyblockcore/common/storage/island/sql/SQLiteIslandStorage.java
@@ -7,8 +7,8 @@
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import me.illusion.skyblockcore.common.data.IslandData;
-import me.illusion.skyblockcore.common.databaserewrite.persistence.sql.impl.SQLitePersistenceDatabase;
-import me.illusion.skyblockcore.common.databaserewrite.sql.object.StringStatementObject;
+import me.illusion.skyblockcore.common.database.persistence.sql.impl.SQLitePersistenceDatabase;
+import me.illusion.skyblockcore.common.database.sql.object.StringStatementObject;
 import me.illusion.skyblockcore.common.storage.island.SkyblockIslandStorage;
 
 public class SQLiteIslandStorage extends SQLitePersistenceDatabase implements SkyblockIslandStorage {

diff --git a/...main/java/me/illusion/skyblockcore/common/storage/profiles/mongo/MongoProfileStorage.java b/...main/java/me/illusion/skyblockcore/common/storage/profiles/mongo/MongoProfileStorage.java
@@ -7,8 +7,8 @@
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
-import me.illusion.skyblockcore.common.databaserewrite.persistence.mongo.MongoPersistenceDatabase;
-import me.illusion.skyblockcore.common.databaserewrite.persistence.mongo.MongoUUIDCodec;
+import me.illusion.skyblockcore.common.database.persistence.mongo.MongoPersistenceDatabase;
+import me.illusion.skyblockcore.common.database.persistence.mongo.MongoUUIDCodec;
 import me.illusion.skyblockcore.common.storage.profiles.SkyblockProfileStorage;
 import org.bson.codecs.Codec;
 

diff --git a/...c/main/java/me/illusion/skyblockcore/common/storage/profiles/sql/MySQLProfileStorage.java b/...c/main/java/me/illusion/skyblockcore/common/storage/profiles/sql/MySQLProfileStorage.java
@@ -7,8 +7,8 @@
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
-import me.illusion.skyblockcore.common.databaserewrite.persistence.sql.impl.MySQLPersistenceDatabase;
-import me.illusion.skyblockcore.common.databaserewrite.sql.object.StringStatementObject;
+import me.illusion.skyblockcore.common.database.persistence.sql.impl.MySQLPersistenceDatabase;
+import me.illusion.skyblockcore.common.database.sql.object.StringStatementObject;
 import me.illusion.skyblockcore.common.storage.profiles.SkyblockProfileStorage;
 
 public class MySQLProfileStorage extends MySQLPersistenceDatabase implements SkyblockProfileStorage {

diff --git a/.../main/java/me/illusion/skyblockcore/common/storage/profiles/sql/SQLiteProfileStorage.java b/.../main/java/me/illusion/skyblockcore/common/storage/profiles/sql/SQLiteProfileStorage.java
@@ -7,8 +7,8 @@
 import java.util.UUID;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ConcurrentHashMap;
-import me.illusion.skyblockcore.common.databaserewrite.persistence.sql.impl.SQLitePersistenceDatabase;
-import me.illusion.skyblockcore.common.databaserewrite.sql.object.StringStatementObject;
+import me.illusion.skyblockcore.common.database.persistence.sql.impl.SQLitePersistenceDatabase;
+import me.illusion.skyblockcore.common.database.sql.object.StringStatementObject;
 import me.illusion.skyblockcore.common.storage.profiles.SkyblockProfileStorage;
 
 public class SQLiteProfileStorage extends SQLitePersistenceDatabase implements SkyblockProfileStorage {

diff --git a/...src/main/java/me/illusion/skyblockcore/server/network/complex/ComplexSkyblockNetwork.java b/...src/main/java/me/illusion/skyblockcore/server/network/complex/ComplexSkyblockNetwork.java
@@ -5,7 +5,7 @@
 import lombok.Getter;
 import me.illusion.skyblockcore.common.communication.packet.PacketManager;
 import me.illusion.skyblockcore.common.config.SkyblockMessagesFile;
-import me.illusion.skyblockcore.common.databaserewrite.SkyblockDatabaseTag;
+import me.illusion.skyblockcore.common.database.SkyblockDatabaseTag;
 import me.illusion.skyblockcore.common.event.manager.SkyblockEventManager;
 import me.illusion.skyblockcore.common.storage.cache.SkyblockIslandCache;
 import me.illusion.skyblockcore.common.storage.island.SkyblockIslandStorage;