From 60b61869cc5905a7fbc54d6eab2b6ce7c377251e Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 21 Jun 2025 03:48:38 -0400 Subject: [PATCH] update: clean up project --- build.gradle | 115 ++++++++---------- gradle.properties | 2 + gradlew | 5 +- .../quaint => gg/drak/thebase}/TheBase.java | 2 +- .../drak/thebase}/async/AsyncTask.java | 3 +- .../drak/thebase}/async/AsyncUtils.java | 29 +---- .../drak/thebase}/async/SyncInstance.java | 4 +- .../drak/thebase}/async/SyncTask.java | 2 +- .../drak/thebase}/async/TaskLike.java | 2 +- .../drak/thebase}/async/TaskThread.java | 2 +- .../drak/thebase}/async/ThreadHolder.java | 2 +- .../drak/thebase}/async/WithSync.java | 2 +- .../thebase}/events/BaseEventHandler.java | 8 +- .../thebase}/events/BaseEventListener.java | 2 +- .../thebase}/events/BaseListenerLayout.java | 12 +- .../thebase}/events/RegisteredListener.java | 12 +- .../thebase}/events/components/BaseEvent.java | 4 +- .../events/components/FunctionedCall.java | 2 +- .../events/processing/BaseEventExecutor.java | 8 +- .../events/processing/BaseEventPriority.java | 9 +- .../events/processing/BaseProcessor.java | 2 +- .../exception/BaseEventException.java | 2 +- .../thebase}/numbers/WeightedInteger.java | 2 +- .../drak/thebase}/objects/AtomicString.java | 2 +- .../drak/thebase}/objects/Classifiable.java | 2 +- .../drak/thebase}/objects/ClassifiedSet.java | 2 +- .../drak/thebase}/objects/DatedNumber.java | 2 +- .../drak/thebase}/objects/Identifiable.java | 2 +- .../drak/thebase}/objects/Identified.java | 2 +- .../drak/thebase}/objects/Indexable.java | 2 +- .../drak/thebase}/objects/Indexed.java | 2 +- .../drak/thebase}/objects/SingleSet.java | 2 +- .../thebase}/objects/handling/IEventable.java | 2 +- .../handling/derived/IModEventable.java | 2 +- .../handling/derived/IModifierEventable.java | 9 +- .../handling/derived/IOtherEventable.java | 8 ++ .../handling/derived/IPluginEventable.java | 8 +- .../derived/IStreamlineEventable.java | 2 +- .../handling/derived/ModEventable.java | 4 +- .../handling/derived/PluginEventable.java | 5 +- .../thebase}/savables/SavableResource.java | 12 +- .../events/CreateSavableResourceEvent.java | 4 +- .../events/DeleteSavableResourceEvent.java | 4 +- .../savables/events/SavableEvent.java | 6 +- .../drak/thebase}/storage/StorageUtils.java | 4 +- .../storage/datastores/ISimpleDatastore.java | 2 +- .../datastores/SimpleFlatDatastore.java | 6 +- .../datastores/SimpleJsonDatastore.java | 7 +- .../datastores/SimpleTomlDatastore.java | 5 +- .../storage/documents/ISimpleDocument.java | 2 +- .../storage/documents/SimpleFlatDocument.java | 6 +- .../storage/documents/SimpleJsonDocument.java | 4 +- .../storage/documents/SimpleTomlDocument.java | 4 +- .../storage/managers/IStorageManager.java | 6 +- .../datastores/IDataStoreManager.java | 11 ++ .../datastores/SimpleDataStoreManager.java | 4 +- .../managers/documents/IDocumentManager.java | 11 ++ .../documents/SimpleDocumentManager.java | 4 +- .../documents/SimpleJsonDocumentManager.java | 4 +- .../documents/SimpleTomlDocumentManager.java | 4 +- .../storage/resources/StorageResource.java | 10 +- .../resources/flat/FlatFileResource.java | 8 +- .../flat/simple/SimpleConfiguration.java | 6 +- .../resources/flat/simple/SimpleJson.java | 6 +- .../resources/flat/simple/SimpleToml.java | 6 +- .../drak/thebase}/utils/MatcherUtils.java | 2 +- .../drak/thebase}/utils/MathUtils.java | 2 +- .../drak/thebase}/utils/ObjectUtils.java | 2 +- .../drak/thebase}/utils/StringUtils.java | 2 +- .../datastores/IDataStoreManager.java | 11 -- .../managers/documents/IDocumentManager.java | 11 -- 71 files changed, 213 insertions(+), 254 deletions(-) rename src/main/java/{tv/quaint => gg/drak/thebase}/TheBase.java (82%) rename src/main/java/{tv/quaint => gg/drak/thebase}/async/AsyncTask.java (98%) rename src/main/java/{tv/quaint => gg/drak/thebase}/async/AsyncUtils.java (82%) rename src/main/java/{tv/quaint => gg/drak/thebase}/async/SyncInstance.java (93%) rename src/main/java/{tv/quaint => gg/drak/thebase}/async/SyncTask.java (97%) rename src/main/java/{tv/quaint => gg/drak/thebase}/async/TaskLike.java (94%) rename src/main/java/{tv/quaint => gg/drak/thebase}/async/TaskThread.java (98%) rename src/main/java/{tv/quaint => gg/drak/thebase}/async/ThreadHolder.java (99%) rename src/main/java/{tv/quaint => gg/drak/thebase}/async/WithSync.java (97%) rename src/main/java/{tv/quaint => gg/drak/thebase}/events/BaseEventHandler.java (96%) rename src/main/java/{tv/quaint => gg/drak/thebase}/events/BaseEventListener.java (75%) rename src/main/java/{tv/quaint => gg/drak/thebase}/events/BaseListenerLayout.java (92%) rename src/main/java/{tv/quaint => gg/drak/thebase}/events/RegisteredListener.java (87%) rename src/main/java/{tv/quaint => gg/drak/thebase}/events/components/BaseEvent.java (88%) rename src/main/java/{tv/quaint => gg/drak/thebase}/events/components/FunctionedCall.java (94%) rename src/main/java/{tv/quaint => gg/drak/thebase}/events/processing/BaseEventExecutor.java (56%) rename src/main/java/{tv/quaint => gg/drak/thebase}/events/processing/BaseEventPriority.java (90%) rename src/main/java/{tv/quaint => gg/drak/thebase}/events/processing/BaseProcessor.java (95%) rename src/main/java/{tv/quaint => gg/drak/thebase}/events/processing/exception/BaseEventException.java (95%) rename src/main/java/{tv/quaint => gg/drak/thebase}/numbers/WeightedInteger.java (98%) rename src/main/java/{tv/quaint => gg/drak/thebase}/objects/AtomicString.java (93%) rename src/main/java/{tv/quaint => gg/drak/thebase}/objects/Classifiable.java (84%) rename src/main/java/{tv/quaint => gg/drak/thebase}/objects/ClassifiedSet.java (84%) rename src/main/java/{tv/quaint => gg/drak/thebase}/objects/DatedNumber.java (96%) rename src/main/java/{tv/quaint => gg/drak/thebase}/objects/Identifiable.java (89%) rename src/main/java/{tv/quaint => gg/drak/thebase}/objects/Identified.java (94%) rename src/main/java/{tv/quaint => gg/drak/thebase}/objects/Indexable.java (87%) rename src/main/java/{tv/quaint => gg/drak/thebase}/objects/Indexed.java (94%) rename src/main/java/{tv/quaint => gg/drak/thebase}/objects/SingleSet.java (88%) rename src/main/java/{tv/quaint => gg/drak/thebase}/objects/handling/IEventable.java (59%) rename src/main/java/{tv/quaint => gg/drak/thebase}/objects/handling/derived/IModEventable.java (77%) rename src/main/java/{tv/quaint => gg/drak/thebase}/objects/handling/derived/IModifierEventable.java (74%) create mode 100644 src/main/java/gg/drak/thebase/objects/handling/derived/IOtherEventable.java rename src/main/java/{tv/quaint => gg/drak/thebase}/objects/handling/derived/IPluginEventable.java (50%) rename src/main/java/{tv/quaint => gg/drak/thebase}/objects/handling/derived/IStreamlineEventable.java (78%) rename src/main/java/{tv/quaint => gg/drak/thebase}/objects/handling/derived/ModEventable.java (91%) rename src/main/java/{tv/quaint => gg/drak/thebase}/objects/handling/derived/PluginEventable.java (90%) rename src/main/java/{tv/quaint => gg/drak/thebase}/savables/SavableResource.java (88%) rename src/main/java/{tv/quaint => gg/drak/thebase}/savables/events/CreateSavableResourceEvent.java (66%) rename src/main/java/{tv/quaint => gg/drak/thebase}/savables/events/DeleteSavableResourceEvent.java (66%) rename src/main/java/{tv/quaint => gg/drak/thebase}/savables/events/SavableEvent.java (63%) rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/StorageUtils.java (97%) rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/datastores/ISimpleDatastore.java (83%) rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/datastores/SimpleFlatDatastore.java (86%) rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/datastores/SimpleJsonDatastore.java (78%) rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/datastores/SimpleTomlDatastore.java (85%) rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/documents/ISimpleDocument.java (77%) rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/documents/SimpleFlatDocument.java (88%) rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/documents/SimpleJsonDocument.java (87%) rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/documents/SimpleTomlDocument.java (87%) rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/managers/IStorageManager.java (92%) create mode 100644 src/main/java/gg/drak/thebase/storage/managers/datastores/IDataStoreManager.java rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/managers/datastores/SimpleDataStoreManager.java (94%) create mode 100644 src/main/java/gg/drak/thebase/storage/managers/documents/IDocumentManager.java rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/managers/documents/SimpleDocumentManager.java (94%) rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/managers/documents/SimpleJsonDocumentManager.java (68%) rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/managers/documents/SimpleTomlDocumentManager.java (68%) rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/resources/StorageResource.java (94%) rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/resources/flat/FlatFileResource.java (95%) rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/resources/flat/simple/SimpleConfiguration.java (80%) rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/resources/flat/simple/SimpleJson.java (78%) rename src/main/java/{tv/quaint => gg/drak/thebase}/storage/resources/flat/simple/SimpleToml.java (78%) rename src/main/java/{tv/quaint => gg/drak/thebase}/utils/MatcherUtils.java (97%) rename src/main/java/{tv/quaint => gg/drak/thebase}/utils/MathUtils.java (98%) rename src/main/java/{tv/quaint => gg/drak/thebase}/utils/ObjectUtils.java (96%) rename src/main/java/{tv/quaint => gg/drak/thebase}/utils/StringUtils.java (99%) delete mode 100644 src/main/java/tv/quaint/storage/managers/datastores/IDataStoreManager.java delete mode 100644 src/main/java/tv/quaint/storage/managers/documents/IDocumentManager.java diff --git a/build.gradle b/build.gradle index 63404e0..96aa16a 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { id 'java' - id 'com.github.johnrengelman.shadow' version '7.1.2' + id 'com.gradleup.shadow' version '8.3.6' id 'io.freefair.lombok' version '8.10.2' - id 'maven-publish' // for jitpack.io + id 'maven-publish' } group = 'com.github.server-utilities' @@ -11,83 +11,70 @@ version = '1.0.0' repositories { mavenCentral() mavenLocal() - - // JitPack maven { url 'https://jitpack.io' } } -dependencies { - implementation('com.github.simplix-softworks:simplixstorage:3.2.7') - shadow('com.github.simplix-softworks:simplixstorage:3.2.7') - - implementation('mysql:mysql-connector-java:8.0.33') - shadow('mysql:mysql-connector-java:8.0.33') - - implementation('org.xerial:sqlite-jdbc:3.46.1.0') - .exclude(group: 'org.slf4j', module: 'slf4j-api') - shadow('org.xerial:sqlite-jdbc:3.46.1.0') - .exclude(group: 'org.slf4j', module: 'slf4j-api') - - implementation('com.zaxxer:HikariCP:5.1.0') - .exclude(group: 'org.slf4j', module: 'slf4j-api') - .exclude(group: 'org.apache.logging.log4j', module: 'log4j-api') - .exclude(group: 'org.apache.logging.log4j', module: 'log4j-core') - .exclude(group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl') - shadow('com.zaxxer:HikariCP:5.1.0') - .exclude(group: 'org.slf4j', module: 'slf4j-api') - .exclude(group: 'org.apache.logging.log4j', module: 'log4j-api') - .exclude(group: 'org.apache.logging.log4j', module: 'log4j-core') - .exclude(group: 'org.apache.logging.log4j', module: 'log4j-slf4j-impl') - - implementation('net.objecthunter:exp4j:0.4.8') - shadow('net.objecthunter:exp4j:0.4.8') +configurations { + implementation { + exclude group: 'org.slf4j', module: 'slf4j-api' + exclude group: 'org.apache.logging.log4j' + } + shadow { + exclude group: 'org.slf4j', module: 'slf4j-api' + exclude group: 'org.apache.logging.log4j' + } +} - implementation('com.google.re2j:re2j:1.7') - shadow('com.google.re2j:re2j:1.7') +dependencies { + implementation "me.nobeld:SimplixStorage:3.3.0-beta.3" + implementation 'mysql:mysql-connector-java:8.0.33' + implementation 'org.xerial:sqlite-jdbc:3.46.1.0' + implementation 'com.zaxxer:HikariCP:5.1.0' + implementation 'net.objecthunter:exp4j:0.4.8' + implementation 'com.google.re2j:re2j:1.7' } shadowJar { - relocate('de.leonhard', 'tv.quaint.thebase.lib.leonhard') - relocate('com.mysql', 'tv.quaint.thebase.lib.mysql') - relocate('com.zaxxer.hikari', 'tv.quaint.thebase.lib.hikari') - relocate('net.objecthunter.exp4j', 'tv.quaint.thebase.lib.exp4j') - relocate('com.google.re2j', 'tv.quaint.thebase.lib.re2j') - relocate('com.google.gson', 'tv.quaint.thebase.lib.google.gson') - relocate('com.google.guava', 'tv.quaint.thebase.lib.google.guava') - relocate('org.sqlite', 'tv.quaint.thebase.lib.sqlite') - relocate('org.xerial', 'tv.quaint.thebase.lib.xerial') - relocate('org.apache.commons', 'tv.quaint.thebase.lib.apache.commons') - relocate('org.yaml', 'tv.quaint.thebase.lib.yaml') - relocate('org.jetbrains', 'tv.quaint.thebase.lib.jetbrains') - relocate('org.bstats', 'tv.quaint.thebase.lib.bstats') - relocate('lombok', 'tv.quaint.thebase.lib.lombok') - - exclude('com.google.common.*') - exclude('org.apache.logging.log4j.*') - exclude('org.slf4j.*') - - archiveFileName = project.name + '-' + project.version + '.jar' + configurations = [project.configurations.implementation, project.configurations.shadow] + Map relocations = [ + 'de.leonhard': 'gg.drak.thebase.lib.leonhard', + 'com.mysql': 'gg.drak.thebase.lib.mysql', + 'com.zaxxer.hikari': 'gg.drak.thebase.lib.hikari', + 'net.objecthunter.exp4j': 'gg.drak.thebase.lib.exp4j', + 'com.google.re2j': 'gg.drak.thebase.lib.re2j', + 'com.google.gson': 'gg.drak.thebase.lib.google.gson', + 'com.google.guava': 'gg.drak.thebase.lib.google.guava', + 'org.sqlite': 'gg.drak.thebase.lib.sqlite', + 'org.xerial': 'gg.drak.thebase.lib.xerial', + 'org.apache.commons': 'gg.drak.thebase.lib.apache.commons', + 'org.yaml': 'gg.drak.thebase.lib.yaml', + 'org.bstats': 'gg.drak.thebase.lib.bstats' + ] + relocations.each { src, dest -> relocate src, dest } + + exclude 'com/google/common/**' + exclude 'org/apache/logging/log4j/**' + exclude 'org/slf4j/**' + exclude 'META-INF/**' + exclude '**/LICENSE' + exclude '**/README.md' + exclude '**/docs/**' + + archiveFileName = "${project.name}-${project.version}.jar" } tasks.register('deploy', Copy) { - // Define the deployment directory - def deployDir = file(System.getenv("DEPLOY_DIR") ?: "$rootDir/deploy") + def deployDir = file(System.getenv('DEPLOY_DIR') ?: "$rootDir/deploy") + from shadowJar.archiveFile + into deployDir - // Ensure the deployment directory exists doFirst { println "Deploying to: $deployDir" deployDir.mkdirs() - println "Generated JAR file: ${shadowJar.archiveFile}" + println "Generated JAR file: ${shadowJar.archiveFile.get()}" } - - // Copy the shadowJar output - from shadowJar.archiveFile - into deployDir } -// Ensure that the deploy task runs after the shadowJar task -shadowJar.finalizedBy(deploy) - tasks.named('deploy').configure { dependsOn 'shadowJar', 'sourcesJar', 'javadocJar', 'jar' } @@ -108,6 +95,4 @@ java { wrapper { gradleVersion = '8.9' distributionType = Wrapper.DistributionType.BIN -} - -// comment for testing +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index fa8f0f0..b3d1a21 100644 --- a/gradle.properties +++ b/gradle.properties @@ -6,6 +6,8 @@ org.gradle.parallel = true org.gradle.caching = true org.gradle.vfs.watch = false +crate.version = 4.0.0-RC.2 + # Other properties #name = TheBase #group = com.github.server-utilities diff --git a/gradlew b/gradlew index f5feea6..faf9300 100644 --- a/gradlew +++ b/gradlew @@ -86,8 +86,7 @@ done # shellcheck disable=SC2034 APP_BASE_NAME=${0##*/} # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036) -APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s -' "$PWD" ) || exit +APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD=maximum @@ -206,7 +205,7 @@ fi DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Collect all arguments for the java command: -# * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments, # and any embedded shellness will be escaped. # * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be # treated as '${Hostname}' itself on the command line. diff --git a/src/main/java/tv/quaint/TheBase.java b/src/main/java/gg/drak/thebase/TheBase.java similarity index 82% rename from src/main/java/tv/quaint/TheBase.java rename to src/main/java/gg/drak/thebase/TheBase.java index 7229c81..623523c 100644 --- a/src/main/java/tv/quaint/TheBase.java +++ b/src/main/java/gg/drak/thebase/TheBase.java @@ -1,4 +1,4 @@ -package tv.quaint; +package gg.drak.thebase; import lombok.Getter; diff --git a/src/main/java/tv/quaint/async/AsyncTask.java b/src/main/java/gg/drak/thebase/async/AsyncTask.java similarity index 98% rename from src/main/java/tv/quaint/async/AsyncTask.java rename to src/main/java/gg/drak/thebase/async/AsyncTask.java index 85acdce..1d93309 100644 --- a/src/main/java/tv/quaint/async/AsyncTask.java +++ b/src/main/java/gg/drak/thebase/async/AsyncTask.java @@ -1,8 +1,7 @@ -package tv.quaint.async; +package gg.drak.thebase.async; import lombok.Getter; import lombok.Setter; -import org.jetbrains.annotations.NotNull; import javax.swing.*; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/tv/quaint/async/AsyncUtils.java b/src/main/java/gg/drak/thebase/async/AsyncUtils.java similarity index 82% rename from src/main/java/tv/quaint/async/AsyncUtils.java rename to src/main/java/gg/drak/thebase/async/AsyncUtils.java index d280d4b..8d46f74 100644 --- a/src/main/java/tv/quaint/async/AsyncUtils.java +++ b/src/main/java/gg/drak/thebase/async/AsyncUtils.java @@ -1,9 +1,8 @@ -package tv.quaint.async; +package gg.drak.thebase.async; import lombok.Getter; import lombok.Setter; -import javax.swing.*; import java.util.Optional; import java.util.concurrent.CompletableFuture; import java.util.concurrent.ConcurrentSkipListSet; @@ -15,33 +14,7 @@ public class AsyncUtils { @Getter @Setter private static AtomicLong currentTaskId = new AtomicLong(0); -// @Getter @Setter -// private static Timer taskThread; -// -// -// public static void restartTicker() { -// if (taskThread != null) { -// taskThread.stop(); -// } -// -// taskThread = createNewTimer(); -// taskThread.start(); -// } -// -// public static Timer createNewTimer() { -// return new Timer(50, e -> { -// try { -// tickTasks(); -// } catch (Exception ex) { -// ex.printStackTrace(); -// } -// }); -// } - public static void init() { -// restartTicker(); -// -// getCurrentTaskId().set(0); } @Getter @Setter diff --git a/src/main/java/tv/quaint/async/SyncInstance.java b/src/main/java/gg/drak/thebase/async/SyncInstance.java similarity index 93% rename from src/main/java/tv/quaint/async/SyncInstance.java rename to src/main/java/gg/drak/thebase/async/SyncInstance.java index 487a3f7..bbb9c48 100644 --- a/src/main/java/tv/quaint/async/SyncInstance.java +++ b/src/main/java/gg/drak/thebase/async/SyncInstance.java @@ -1,9 +1,9 @@ -package tv.quaint.async; +package gg.drak.thebase.async; import lombok.Getter; import lombok.Setter; import org.jetbrains.annotations.NotNull; -import tv.quaint.objects.handling.IEventable; +import gg.drak.thebase.objects.handling.IEventable; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/tv/quaint/async/SyncTask.java b/src/main/java/gg/drak/thebase/async/SyncTask.java similarity index 97% rename from src/main/java/tv/quaint/async/SyncTask.java rename to src/main/java/gg/drak/thebase/async/SyncTask.java index 7ddb46a..b6311c5 100644 --- a/src/main/java/tv/quaint/async/SyncTask.java +++ b/src/main/java/gg/drak/thebase/async/SyncTask.java @@ -1,4 +1,4 @@ -package tv.quaint.async; +package gg.drak.thebase.async; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/tv/quaint/async/TaskLike.java b/src/main/java/gg/drak/thebase/async/TaskLike.java similarity index 94% rename from src/main/java/tv/quaint/async/TaskLike.java rename to src/main/java/gg/drak/thebase/async/TaskLike.java index fef6d4e..4583097 100644 --- a/src/main/java/tv/quaint/async/TaskLike.java +++ b/src/main/java/gg/drak/thebase/async/TaskLike.java @@ -1,4 +1,4 @@ -package tv.quaint.async; +package gg.drak.thebase.async; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/tv/quaint/async/TaskThread.java b/src/main/java/gg/drak/thebase/async/TaskThread.java similarity index 98% rename from src/main/java/tv/quaint/async/TaskThread.java rename to src/main/java/gg/drak/thebase/async/TaskThread.java index 10a26b5..6f2a122 100644 --- a/src/main/java/tv/quaint/async/TaskThread.java +++ b/src/main/java/gg/drak/thebase/async/TaskThread.java @@ -1,4 +1,4 @@ -package tv.quaint.async; +package gg.drak.thebase.async; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/tv/quaint/async/ThreadHolder.java b/src/main/java/gg/drak/thebase/async/ThreadHolder.java similarity index 99% rename from src/main/java/tv/quaint/async/ThreadHolder.java rename to src/main/java/gg/drak/thebase/async/ThreadHolder.java index f2161a8..d316fd6 100644 --- a/src/main/java/tv/quaint/async/ThreadHolder.java +++ b/src/main/java/gg/drak/thebase/async/ThreadHolder.java @@ -1,4 +1,4 @@ -package tv.quaint.async; +package gg.drak.thebase.async; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/tv/quaint/async/WithSync.java b/src/main/java/gg/drak/thebase/async/WithSync.java similarity index 97% rename from src/main/java/tv/quaint/async/WithSync.java rename to src/main/java/gg/drak/thebase/async/WithSync.java index 6cdb24e..347e551 100644 --- a/src/main/java/tv/quaint/async/WithSync.java +++ b/src/main/java/gg/drak/thebase/async/WithSync.java @@ -1,4 +1,4 @@ -package tv.quaint.async; +package gg.drak.thebase.async; import java.util.concurrent.CompletableFuture; diff --git a/src/main/java/tv/quaint/events/BaseEventHandler.java b/src/main/java/gg/drak/thebase/events/BaseEventHandler.java similarity index 96% rename from src/main/java/tv/quaint/events/BaseEventHandler.java rename to src/main/java/gg/drak/thebase/events/BaseEventHandler.java index 979da92..03480b0 100644 --- a/src/main/java/tv/quaint/events/BaseEventHandler.java +++ b/src/main/java/gg/drak/thebase/events/BaseEventHandler.java @@ -1,10 +1,10 @@ -package tv.quaint.events; +package gg.drak.thebase.events; import lombok.Getter; import lombok.Setter; -import tv.quaint.events.components.BaseEvent; -import tv.quaint.events.components.FunctionedCall; -import tv.quaint.objects.handling.IEventable; +import gg.drak.thebase.events.components.BaseEvent; +import gg.drak.thebase.events.components.FunctionedCall; +import gg.drak.thebase.objects.handling.IEventable; import java.lang.reflect.Method; import java.util.Arrays; diff --git a/src/main/java/tv/quaint/events/BaseEventListener.java b/src/main/java/gg/drak/thebase/events/BaseEventListener.java similarity index 75% rename from src/main/java/tv/quaint/events/BaseEventListener.java rename to src/main/java/gg/drak/thebase/events/BaseEventListener.java index 252eca0..8e68c32 100644 --- a/src/main/java/tv/quaint/events/BaseEventListener.java +++ b/src/main/java/gg/drak/thebase/events/BaseEventListener.java @@ -1,4 +1,4 @@ -package tv.quaint.events; +package gg.drak.thebase.events; /** * Simple interface for tagging all EventListeners diff --git a/src/main/java/tv/quaint/events/BaseListenerLayout.java b/src/main/java/gg/drak/thebase/events/BaseListenerLayout.java similarity index 92% rename from src/main/java/tv/quaint/events/BaseListenerLayout.java rename to src/main/java/gg/drak/thebase/events/BaseListenerLayout.java index 6c0f552..4e54ab7 100644 --- a/src/main/java/tv/quaint/events/BaseListenerLayout.java +++ b/src/main/java/gg/drak/thebase/events/BaseListenerLayout.java @@ -1,12 +1,12 @@ -package tv.quaint.events; +package gg.drak.thebase.events; import lombok.Getter; import lombok.Setter; -import tv.quaint.events.components.BaseEvent; -import tv.quaint.events.processing.BaseProcessor; -import tv.quaint.events.processing.exception.BaseEventException; -import tv.quaint.events.processing.BaseEventExecutor; -import tv.quaint.objects.handling.IEventable; +import gg.drak.thebase.events.components.BaseEvent; +import gg.drak.thebase.events.processing.BaseProcessor; +import gg.drak.thebase.events.processing.exception.BaseEventException; +import gg.drak.thebase.events.processing.BaseEventExecutor; +import gg.drak.thebase.objects.handling.IEventable; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; diff --git a/src/main/java/tv/quaint/events/RegisteredListener.java b/src/main/java/gg/drak/thebase/events/RegisteredListener.java similarity index 87% rename from src/main/java/tv/quaint/events/RegisteredListener.java rename to src/main/java/gg/drak/thebase/events/RegisteredListener.java index 1e4f9b3..c3a8d22 100644 --- a/src/main/java/tv/quaint/events/RegisteredListener.java +++ b/src/main/java/gg/drak/thebase/events/RegisteredListener.java @@ -1,13 +1,13 @@ -package tv.quaint.events; +package gg.drak.thebase.events; import lombok.Getter; import lombok.Setter; import org.jetbrains.annotations.NotNull; -import tv.quaint.events.components.BaseEvent; -import tv.quaint.events.processing.BaseEventPriority; -import tv.quaint.events.processing.exception.BaseEventException; -import tv.quaint.events.processing.BaseEventExecutor; -import tv.quaint.objects.handling.IEventable; +import gg.drak.thebase.events.components.BaseEvent; +import gg.drak.thebase.events.processing.BaseEventPriority; +import gg.drak.thebase.events.processing.exception.BaseEventException; +import gg.drak.thebase.events.processing.BaseEventExecutor; +import gg.drak.thebase.objects.handling.IEventable; /** * Stores relevant information for plugin listeners diff --git a/src/main/java/tv/quaint/events/components/BaseEvent.java b/src/main/java/gg/drak/thebase/events/components/BaseEvent.java similarity index 88% rename from src/main/java/tv/quaint/events/components/BaseEvent.java rename to src/main/java/gg/drak/thebase/events/components/BaseEvent.java index 23c7d80..99faa23 100644 --- a/src/main/java/tv/quaint/events/components/BaseEvent.java +++ b/src/main/java/gg/drak/thebase/events/components/BaseEvent.java @@ -1,8 +1,8 @@ -package tv.quaint.events.components; +package gg.drak.thebase.events.components; import lombok.Getter; import lombok.Setter; -import tv.quaint.events.BaseEventHandler; +import gg.drak.thebase.events.BaseEventHandler; import java.util.Date; diff --git a/src/main/java/tv/quaint/events/components/FunctionedCall.java b/src/main/java/gg/drak/thebase/events/components/FunctionedCall.java similarity index 94% rename from src/main/java/tv/quaint/events/components/FunctionedCall.java rename to src/main/java/gg/drak/thebase/events/components/FunctionedCall.java index be6dd4e..eecff46 100644 --- a/src/main/java/tv/quaint/events/components/FunctionedCall.java +++ b/src/main/java/gg/drak/thebase/events/components/FunctionedCall.java @@ -1,4 +1,4 @@ -package tv.quaint.events.components; +package gg.drak.thebase.events.components; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/tv/quaint/events/processing/BaseEventExecutor.java b/src/main/java/gg/drak/thebase/events/processing/BaseEventExecutor.java similarity index 56% rename from src/main/java/tv/quaint/events/processing/BaseEventExecutor.java rename to src/main/java/gg/drak/thebase/events/processing/BaseEventExecutor.java index 475d406..7b40402 100644 --- a/src/main/java/tv/quaint/events/processing/BaseEventExecutor.java +++ b/src/main/java/gg/drak/thebase/events/processing/BaseEventExecutor.java @@ -1,9 +1,9 @@ -package tv.quaint.events.processing; +package gg.drak.thebase.events.processing; import org.jetbrains.annotations.NotNull; -import tv.quaint.events.BaseEventListener; -import tv.quaint.events.components.BaseEvent; -import tv.quaint.events.processing.exception.BaseEventException; +import gg.drak.thebase.events.BaseEventListener; +import gg.drak.thebase.events.components.BaseEvent; +import gg.drak.thebase.events.processing.exception.BaseEventException; /** * Interface which defines the class for event call backs to plugins diff --git a/src/main/java/tv/quaint/events/processing/BaseEventPriority.java b/src/main/java/gg/drak/thebase/events/processing/BaseEventPriority.java similarity index 90% rename from src/main/java/tv/quaint/events/processing/BaseEventPriority.java rename to src/main/java/gg/drak/thebase/events/processing/BaseEventPriority.java index 1c2e676..b29c4f0 100644 --- a/src/main/java/tv/quaint/events/processing/BaseEventPriority.java +++ b/src/main/java/gg/drak/thebase/events/processing/BaseEventPriority.java @@ -1,5 +1,8 @@ -package tv.quaint.events.processing; +package gg.drak.thebase.events.processing; +import lombok.Getter; + +@Getter public enum BaseEventPriority { /** * Event call is of very low importance and should be run first, to allow @@ -36,8 +39,4 @@ public enum BaseEventPriority { private BaseEventPriority(int slot) { this.slot = slot; } - - public int getSlot() { - return slot; - } } diff --git a/src/main/java/tv/quaint/events/processing/BaseProcessor.java b/src/main/java/gg/drak/thebase/events/processing/BaseProcessor.java similarity index 95% rename from src/main/java/tv/quaint/events/processing/BaseProcessor.java rename to src/main/java/gg/drak/thebase/events/processing/BaseProcessor.java index 8e40ac1..7419346 100644 --- a/src/main/java/tv/quaint/events/processing/BaseProcessor.java +++ b/src/main/java/gg/drak/thebase/events/processing/BaseProcessor.java @@ -1,4 +1,4 @@ -package tv.quaint.events.processing; +package gg.drak.thebase.events.processing; import java.lang.annotation.ElementType; import java.lang.annotation.Retention; diff --git a/src/main/java/tv/quaint/events/processing/exception/BaseEventException.java b/src/main/java/gg/drak/thebase/events/processing/exception/BaseEventException.java similarity index 95% rename from src/main/java/tv/quaint/events/processing/exception/BaseEventException.java rename to src/main/java/gg/drak/thebase/events/processing/exception/BaseEventException.java index adc6ee8..66c7913 100644 --- a/src/main/java/tv/quaint/events/processing/exception/BaseEventException.java +++ b/src/main/java/gg/drak/thebase/events/processing/exception/BaseEventException.java @@ -1,4 +1,4 @@ -package tv.quaint.events.processing.exception; +package gg.drak.thebase.events.processing.exception; public class BaseEventException extends Exception { private static final long serialVersionUID = 3532808232324183999L; diff --git a/src/main/java/tv/quaint/numbers/WeightedInteger.java b/src/main/java/gg/drak/thebase/numbers/WeightedInteger.java similarity index 98% rename from src/main/java/tv/quaint/numbers/WeightedInteger.java rename to src/main/java/gg/drak/thebase/numbers/WeightedInteger.java index a728013..5fa41f9 100644 --- a/src/main/java/tv/quaint/numbers/WeightedInteger.java +++ b/src/main/java/gg/drak/thebase/numbers/WeightedInteger.java @@ -1,4 +1,4 @@ -package tv.quaint.numbers; +package gg.drak.thebase.numbers; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/tv/quaint/objects/AtomicString.java b/src/main/java/gg/drak/thebase/objects/AtomicString.java similarity index 93% rename from src/main/java/tv/quaint/objects/AtomicString.java rename to src/main/java/gg/drak/thebase/objects/AtomicString.java index a77305d..3329fc3 100644 --- a/src/main/java/tv/quaint/objects/AtomicString.java +++ b/src/main/java/gg/drak/thebase/objects/AtomicString.java @@ -1,4 +1,4 @@ -package tv.quaint.objects; +package gg.drak.thebase.objects; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/tv/quaint/objects/Classifiable.java b/src/main/java/gg/drak/thebase/objects/Classifiable.java similarity index 84% rename from src/main/java/tv/quaint/objects/Classifiable.java rename to src/main/java/gg/drak/thebase/objects/Classifiable.java index 3f01b29..35b9e57 100644 --- a/src/main/java/tv/quaint/objects/Classifiable.java +++ b/src/main/java/gg/drak/thebase/objects/Classifiable.java @@ -1,4 +1,4 @@ -package tv.quaint.objects; +package gg.drak.thebase.objects; public interface Classifiable { /** diff --git a/src/main/java/tv/quaint/objects/ClassifiedSet.java b/src/main/java/gg/drak/thebase/objects/ClassifiedSet.java similarity index 84% rename from src/main/java/tv/quaint/objects/ClassifiedSet.java rename to src/main/java/gg/drak/thebase/objects/ClassifiedSet.java index e62ac53..ebcc2ce 100644 --- a/src/main/java/tv/quaint/objects/ClassifiedSet.java +++ b/src/main/java/gg/drak/thebase/objects/ClassifiedSet.java @@ -1,4 +1,4 @@ -package tv.quaint.objects; +package gg.drak.thebase.objects; public class ClassifiedSet> extends SingleSet, O> { public ClassifiedSet(O value) { diff --git a/src/main/java/tv/quaint/objects/DatedNumber.java b/src/main/java/gg/drak/thebase/objects/DatedNumber.java similarity index 96% rename from src/main/java/tv/quaint/objects/DatedNumber.java rename to src/main/java/gg/drak/thebase/objects/DatedNumber.java index d05a193..966d204 100644 --- a/src/main/java/tv/quaint/objects/DatedNumber.java +++ b/src/main/java/gg/drak/thebase/objects/DatedNumber.java @@ -1,4 +1,4 @@ -package tv.quaint.objects; +package gg.drak.thebase.objects; import lombok.Getter; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/tv/quaint/objects/Identifiable.java b/src/main/java/gg/drak/thebase/objects/Identifiable.java similarity index 89% rename from src/main/java/tv/quaint/objects/Identifiable.java rename to src/main/java/gg/drak/thebase/objects/Identifiable.java index 43dafa3..4d06fe7 100644 --- a/src/main/java/tv/quaint/objects/Identifiable.java +++ b/src/main/java/gg/drak/thebase/objects/Identifiable.java @@ -1,4 +1,4 @@ -package tv.quaint.objects; +package gg.drak.thebase.objects; /** * An interface for objects that have an identifier. diff --git a/src/main/java/tv/quaint/objects/Identified.java b/src/main/java/gg/drak/thebase/objects/Identified.java similarity index 94% rename from src/main/java/tv/quaint/objects/Identified.java rename to src/main/java/gg/drak/thebase/objects/Identified.java index 8707b91..b6df924 100644 --- a/src/main/java/tv/quaint/objects/Identified.java +++ b/src/main/java/gg/drak/thebase/objects/Identified.java @@ -1,4 +1,4 @@ -package tv.quaint.objects; +package gg.drak.thebase.objects; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/tv/quaint/objects/Indexable.java b/src/main/java/gg/drak/thebase/objects/Indexable.java similarity index 87% rename from src/main/java/tv/quaint/objects/Indexable.java rename to src/main/java/gg/drak/thebase/objects/Indexable.java index f24d2d2..da48344 100644 --- a/src/main/java/tv/quaint/objects/Indexable.java +++ b/src/main/java/gg/drak/thebase/objects/Indexable.java @@ -1,4 +1,4 @@ -package tv.quaint.objects; +package gg.drak.thebase.objects; /** * An interface for objects that have an index. diff --git a/src/main/java/tv/quaint/objects/Indexed.java b/src/main/java/gg/drak/thebase/objects/Indexed.java similarity index 94% rename from src/main/java/tv/quaint/objects/Indexed.java rename to src/main/java/gg/drak/thebase/objects/Indexed.java index a2f6fc8..f7ac25e 100644 --- a/src/main/java/tv/quaint/objects/Indexed.java +++ b/src/main/java/gg/drak/thebase/objects/Indexed.java @@ -1,4 +1,4 @@ -package tv.quaint.objects; +package gg.drak.thebase.objects; import org.jetbrains.annotations.NotNull; diff --git a/src/main/java/tv/quaint/objects/SingleSet.java b/src/main/java/gg/drak/thebase/objects/SingleSet.java similarity index 88% rename from src/main/java/tv/quaint/objects/SingleSet.java rename to src/main/java/gg/drak/thebase/objects/SingleSet.java index b04e530..dceb42c 100644 --- a/src/main/java/tv/quaint/objects/SingleSet.java +++ b/src/main/java/gg/drak/thebase/objects/SingleSet.java @@ -1,4 +1,4 @@ -package tv.quaint.objects; +package gg.drak.thebase.objects; import lombok.Getter; import lombok.Setter; diff --git a/src/main/java/tv/quaint/objects/handling/IEventable.java b/src/main/java/gg/drak/thebase/objects/handling/IEventable.java similarity index 59% rename from src/main/java/tv/quaint/objects/handling/IEventable.java rename to src/main/java/gg/drak/thebase/objects/handling/IEventable.java index fdb26e9..718d104 100644 --- a/src/main/java/tv/quaint/objects/handling/IEventable.java +++ b/src/main/java/gg/drak/thebase/objects/handling/IEventable.java @@ -1,4 +1,4 @@ -package tv.quaint.objects.handling; +package gg.drak.thebase.objects.handling; public interface IEventable { String getIdentifier(); diff --git a/src/main/java/tv/quaint/objects/handling/derived/IModEventable.java b/src/main/java/gg/drak/thebase/objects/handling/derived/IModEventable.java similarity index 77% rename from src/main/java/tv/quaint/objects/handling/derived/IModEventable.java rename to src/main/java/gg/drak/thebase/objects/handling/derived/IModEventable.java index 049821a..1b0658f 100644 --- a/src/main/java/tv/quaint/objects/handling/derived/IModEventable.java +++ b/src/main/java/gg/drak/thebase/objects/handling/derived/IModEventable.java @@ -1,4 +1,4 @@ -package tv.quaint.objects.handling.derived; +package gg.drak.thebase.objects.handling.derived; public interface IModEventable extends IModifierEventable { @Override diff --git a/src/main/java/tv/quaint/objects/handling/derived/IModifierEventable.java b/src/main/java/gg/drak/thebase/objects/handling/derived/IModifierEventable.java similarity index 74% rename from src/main/java/tv/quaint/objects/handling/derived/IModifierEventable.java rename to src/main/java/gg/drak/thebase/objects/handling/derived/IModifierEventable.java index ac3895d..43a4da5 100644 --- a/src/main/java/tv/quaint/objects/handling/derived/IModifierEventable.java +++ b/src/main/java/gg/drak/thebase/objects/handling/derived/IModifierEventable.java @@ -1,6 +1,6 @@ -package tv.quaint.objects.handling.derived; +package gg.drak.thebase.objects.handling.derived; -import tv.quaint.objects.handling.IEventable; +import gg.drak.thebase.objects.handling.IEventable; import java.io.File; @@ -9,6 +9,7 @@ enum ModifierType { PLUGIN, MOD, STREAMLINE, + OTHER, ; } @@ -28,6 +29,10 @@ public default boolean isStreamline() { return getModifierType().equals(ModifierType.STREAMLINE); } + public default boolean isOther() { + return getModifierType().equals(ModifierType.OTHER); + } + public default void initializeDataFolder() { getDataFolder().mkdirs(); } diff --git a/src/main/java/gg/drak/thebase/objects/handling/derived/IOtherEventable.java b/src/main/java/gg/drak/thebase/objects/handling/derived/IOtherEventable.java new file mode 100644 index 0000000..e7249f1 --- /dev/null +++ b/src/main/java/gg/drak/thebase/objects/handling/derived/IOtherEventable.java @@ -0,0 +1,8 @@ +package gg.drak.thebase.objects.handling.derived; + +public interface IOtherEventable extends IModifierEventable { + @Override + public default ModifierType getModifierType() { + return ModifierType.OTHER; + } +} diff --git a/src/main/java/tv/quaint/objects/handling/derived/IPluginEventable.java b/src/main/java/gg/drak/thebase/objects/handling/derived/IPluginEventable.java similarity index 50% rename from src/main/java/tv/quaint/objects/handling/derived/IPluginEventable.java rename to src/main/java/gg/drak/thebase/objects/handling/derived/IPluginEventable.java index 9ef34f1..c79d86c 100644 --- a/src/main/java/tv/quaint/objects/handling/derived/IPluginEventable.java +++ b/src/main/java/gg/drak/thebase/objects/handling/derived/IPluginEventable.java @@ -1,10 +1,4 @@ -package tv.quaint.objects.handling.derived; - -import lombok.Getter; -import tv.quaint.objects.handling.IEventable; -import tv.quaint.storage.StorageUtils; - -import java.io.File; +package gg.drak.thebase.objects.handling.derived; public interface IPluginEventable extends IModifierEventable { @Override diff --git a/src/main/java/tv/quaint/objects/handling/derived/IStreamlineEventable.java b/src/main/java/gg/drak/thebase/objects/handling/derived/IStreamlineEventable.java similarity index 78% rename from src/main/java/tv/quaint/objects/handling/derived/IStreamlineEventable.java rename to src/main/java/gg/drak/thebase/objects/handling/derived/IStreamlineEventable.java index 58624af..ecb5a74 100644 --- a/src/main/java/tv/quaint/objects/handling/derived/IStreamlineEventable.java +++ b/src/main/java/gg/drak/thebase/objects/handling/derived/IStreamlineEventable.java @@ -1,4 +1,4 @@ -package tv.quaint.objects.handling.derived; +package gg.drak.thebase.objects.handling.derived; public interface IStreamlineEventable extends IModifierEventable { @Override diff --git a/src/main/java/tv/quaint/objects/handling/derived/ModEventable.java b/src/main/java/gg/drak/thebase/objects/handling/derived/ModEventable.java similarity index 91% rename from src/main/java/tv/quaint/objects/handling/derived/ModEventable.java rename to src/main/java/gg/drak/thebase/objects/handling/derived/ModEventable.java index 2c1223e..1e0c52b 100644 --- a/src/main/java/tv/quaint/objects/handling/derived/ModEventable.java +++ b/src/main/java/gg/drak/thebase/objects/handling/derived/ModEventable.java @@ -1,7 +1,7 @@ -package tv.quaint.objects.handling.derived; +package gg.drak.thebase.objects.handling.derived; import lombok.Getter; -import tv.quaint.storage.StorageUtils; +import gg.drak.thebase.storage.StorageUtils; import java.io.File; diff --git a/src/main/java/tv/quaint/objects/handling/derived/PluginEventable.java b/src/main/java/gg/drak/thebase/objects/handling/derived/PluginEventable.java similarity index 90% rename from src/main/java/tv/quaint/objects/handling/derived/PluginEventable.java rename to src/main/java/gg/drak/thebase/objects/handling/derived/PluginEventable.java index 78b3dc7..bfc7af2 100644 --- a/src/main/java/tv/quaint/objects/handling/derived/PluginEventable.java +++ b/src/main/java/gg/drak/thebase/objects/handling/derived/PluginEventable.java @@ -1,8 +1,7 @@ -package tv.quaint.objects.handling.derived; +package gg.drak.thebase.objects.handling.derived; import lombok.Getter; -import lombok.Setter; -import tv.quaint.storage.StorageUtils; +import gg.drak.thebase.storage.StorageUtils; import java.io.File; diff --git a/src/main/java/tv/quaint/savables/SavableResource.java b/src/main/java/gg/drak/thebase/savables/SavableResource.java similarity index 88% rename from src/main/java/tv/quaint/savables/SavableResource.java rename to src/main/java/gg/drak/thebase/savables/SavableResource.java index 56c4f82..f092b24 100644 --- a/src/main/java/tv/quaint/savables/SavableResource.java +++ b/src/main/java/gg/drak/thebase/savables/SavableResource.java @@ -1,12 +1,12 @@ -package tv.quaint.savables; +package gg.drak.thebase.savables; import lombok.Getter; import lombok.Setter; -import tv.quaint.events.BaseEventHandler; -import tv.quaint.objects.Identifiable; -import tv.quaint.savables.events.CreateSavableResourceEvent; -import tv.quaint.savables.events.DeleteSavableResourceEvent; -import tv.quaint.storage.resources.StorageResource; +import gg.drak.thebase.events.BaseEventHandler; +import gg.drak.thebase.objects.Identifiable; +import gg.drak.thebase.savables.events.CreateSavableResourceEvent; +import gg.drak.thebase.savables.events.DeleteSavableResourceEvent; +import gg.drak.thebase.storage.resources.StorageResource; public abstract class SavableResource implements Identifiable { @Getter @Setter diff --git a/src/main/java/tv/quaint/savables/events/CreateSavableResourceEvent.java b/src/main/java/gg/drak/thebase/savables/events/CreateSavableResourceEvent.java similarity index 66% rename from src/main/java/tv/quaint/savables/events/CreateSavableResourceEvent.java rename to src/main/java/gg/drak/thebase/savables/events/CreateSavableResourceEvent.java index 21dd1c1..71cd8a9 100644 --- a/src/main/java/tv/quaint/savables/events/CreateSavableResourceEvent.java +++ b/src/main/java/gg/drak/thebase/savables/events/CreateSavableResourceEvent.java @@ -1,6 +1,6 @@ -package tv.quaint.savables.events; +package gg.drak.thebase.savables.events; -import tv.quaint.savables.SavableResource; +import gg.drak.thebase.savables.SavableResource; public class CreateSavableResourceEvent extends SavableEvent { public CreateSavableResourceEvent(T resource) { diff --git a/src/main/java/tv/quaint/savables/events/DeleteSavableResourceEvent.java b/src/main/java/gg/drak/thebase/savables/events/DeleteSavableResourceEvent.java similarity index 66% rename from src/main/java/tv/quaint/savables/events/DeleteSavableResourceEvent.java rename to src/main/java/gg/drak/thebase/savables/events/DeleteSavableResourceEvent.java index 6462c22..fdf6a6f 100644 --- a/src/main/java/tv/quaint/savables/events/DeleteSavableResourceEvent.java +++ b/src/main/java/gg/drak/thebase/savables/events/DeleteSavableResourceEvent.java @@ -1,6 +1,6 @@ -package tv.quaint.savables.events; +package gg.drak.thebase.savables.events; -import tv.quaint.savables.SavableResource; +import gg.drak.thebase.savables.SavableResource; public class DeleteSavableResourceEvent extends SavableEvent { public DeleteSavableResourceEvent(T resource) { diff --git a/src/main/java/tv/quaint/savables/events/SavableEvent.java b/src/main/java/gg/drak/thebase/savables/events/SavableEvent.java similarity index 63% rename from src/main/java/tv/quaint/savables/events/SavableEvent.java rename to src/main/java/gg/drak/thebase/savables/events/SavableEvent.java index 2daa8f6..80445b9 100644 --- a/src/main/java/tv/quaint/savables/events/SavableEvent.java +++ b/src/main/java/gg/drak/thebase/savables/events/SavableEvent.java @@ -1,8 +1,8 @@ -package tv.quaint.savables.events; +package gg.drak.thebase.savables.events; import lombok.Getter; -import tv.quaint.events.components.BaseEvent; -import tv.quaint.savables.SavableResource; +import gg.drak.thebase.events.components.BaseEvent; +import gg.drak.thebase.savables.SavableResource; public abstract class SavableEvent extends BaseEvent { @Getter diff --git a/src/main/java/tv/quaint/storage/StorageUtils.java b/src/main/java/gg/drak/thebase/storage/StorageUtils.java similarity index 97% rename from src/main/java/tv/quaint/storage/StorageUtils.java rename to src/main/java/gg/drak/thebase/storage/StorageUtils.java index 030cd7e..3cb2da4 100644 --- a/src/main/java/tv/quaint/storage/StorageUtils.java +++ b/src/main/java/gg/drak/thebase/storage/StorageUtils.java @@ -1,11 +1,11 @@ -package tv.quaint.storage; +package gg.drak.thebase.storage; import de.leonhard.storage.*; import de.leonhard.storage.internal.FlatFile; import de.leonhard.storage.internal.settings.ConfigSettings; import de.leonhard.storage.internal.settings.ReloadSettings; import lombok.Getter; -import tv.quaint.objects.handling.derived.IModifierEventable; +import gg.drak.thebase.objects.handling.derived.IModifierEventable; import java.io.File; import java.io.InputStream; diff --git a/src/main/java/tv/quaint/storage/datastores/ISimpleDatastore.java b/src/main/java/gg/drak/thebase/storage/datastores/ISimpleDatastore.java similarity index 83% rename from src/main/java/tv/quaint/storage/datastores/ISimpleDatastore.java rename to src/main/java/gg/drak/thebase/storage/datastores/ISimpleDatastore.java index 3bda643..40d2518 100644 --- a/src/main/java/tv/quaint/storage/datastores/ISimpleDatastore.java +++ b/src/main/java/gg/drak/thebase/storage/datastores/ISimpleDatastore.java @@ -1,4 +1,4 @@ -package tv.quaint.storage.datastores; +package gg.drak.thebase.storage.datastores; public interface ISimpleDatastore { public void init(T object); diff --git a/src/main/java/tv/quaint/storage/datastores/SimpleFlatDatastore.java b/src/main/java/gg/drak/thebase/storage/datastores/SimpleFlatDatastore.java similarity index 86% rename from src/main/java/tv/quaint/storage/datastores/SimpleFlatDatastore.java rename to src/main/java/gg/drak/thebase/storage/datastores/SimpleFlatDatastore.java index 13cffcf..60f0ec8 100644 --- a/src/main/java/tv/quaint/storage/datastores/SimpleFlatDatastore.java +++ b/src/main/java/gg/drak/thebase/storage/datastores/SimpleFlatDatastore.java @@ -1,8 +1,8 @@ -package tv.quaint.storage.datastores; +package gg.drak.thebase.storage.datastores; import de.leonhard.storage.internal.FlatFile; -import tv.quaint.objects.handling.derived.IModifierEventable; -import tv.quaint.storage.documents.SimpleFlatDocument; +import gg.drak.thebase.objects.handling.derived.IModifierEventable; +import gg.drak.thebase.storage.documents.SimpleFlatDocument; import java.io.File; diff --git a/src/main/java/tv/quaint/storage/datastores/SimpleJsonDatastore.java b/src/main/java/gg/drak/thebase/storage/datastores/SimpleJsonDatastore.java similarity index 78% rename from src/main/java/tv/quaint/storage/datastores/SimpleJsonDatastore.java rename to src/main/java/gg/drak/thebase/storage/datastores/SimpleJsonDatastore.java index ff37dc9..dddfd88 100644 --- a/src/main/java/tv/quaint/storage/datastores/SimpleJsonDatastore.java +++ b/src/main/java/gg/drak/thebase/storage/datastores/SimpleJsonDatastore.java @@ -1,9 +1,8 @@ -package tv.quaint.storage.datastores; +package gg.drak.thebase.storage.datastores; import de.leonhard.storage.Json; -import de.leonhard.storage.internal.FlatFile; -import tv.quaint.objects.handling.derived.IModifierEventable; -import tv.quaint.storage.documents.SimpleFlatDocument; +import gg.drak.thebase.objects.handling.derived.IModifierEventable; +import gg.drak.thebase.storage.documents.SimpleFlatDocument; import java.io.File; diff --git a/src/main/java/tv/quaint/storage/datastores/SimpleTomlDatastore.java b/src/main/java/gg/drak/thebase/storage/datastores/SimpleTomlDatastore.java similarity index 85% rename from src/main/java/tv/quaint/storage/datastores/SimpleTomlDatastore.java rename to src/main/java/gg/drak/thebase/storage/datastores/SimpleTomlDatastore.java index df71941..f635636 100644 --- a/src/main/java/tv/quaint/storage/datastores/SimpleTomlDatastore.java +++ b/src/main/java/gg/drak/thebase/storage/datastores/SimpleTomlDatastore.java @@ -1,8 +1,7 @@ -package tv.quaint.storage.datastores; +package gg.drak.thebase.storage.datastores; -import de.leonhard.storage.Json; import de.leonhard.storage.Toml; -import tv.quaint.objects.handling.derived.IModifierEventable; +import gg.drak.thebase.objects.handling.derived.IModifierEventable; import java.io.File; diff --git a/src/main/java/tv/quaint/storage/documents/ISimpleDocument.java b/src/main/java/gg/drak/thebase/storage/documents/ISimpleDocument.java similarity index 77% rename from src/main/java/tv/quaint/storage/documents/ISimpleDocument.java rename to src/main/java/gg/drak/thebase/storage/documents/ISimpleDocument.java index d4501fa..d2b0fa1 100644 --- a/src/main/java/tv/quaint/storage/documents/ISimpleDocument.java +++ b/src/main/java/gg/drak/thebase/storage/documents/ISimpleDocument.java @@ -1,4 +1,4 @@ -package tv.quaint.storage.documents; +package gg.drak.thebase.storage.documents; public interface ISimpleDocument { public void init(); diff --git a/src/main/java/tv/quaint/storage/documents/SimpleFlatDocument.java b/src/main/java/gg/drak/thebase/storage/documents/SimpleFlatDocument.java similarity index 88% rename from src/main/java/tv/quaint/storage/documents/SimpleFlatDocument.java rename to src/main/java/gg/drak/thebase/storage/documents/SimpleFlatDocument.java index 56da7cf..01de3ec 100644 --- a/src/main/java/tv/quaint/storage/documents/SimpleFlatDocument.java +++ b/src/main/java/gg/drak/thebase/storage/documents/SimpleFlatDocument.java @@ -1,8 +1,8 @@ -package tv.quaint.storage.documents; +package gg.drak.thebase.storage.documents; import de.leonhard.storage.internal.FlatFile; -import tv.quaint.objects.handling.derived.IModifierEventable; -import tv.quaint.storage.resources.flat.FlatFileResource; +import gg.drak.thebase.objects.handling.derived.IModifierEventable; +import gg.drak.thebase.storage.resources.flat.FlatFileResource; import java.io.File; diff --git a/src/main/java/tv/quaint/storage/documents/SimpleJsonDocument.java b/src/main/java/gg/drak/thebase/storage/documents/SimpleJsonDocument.java similarity index 87% rename from src/main/java/tv/quaint/storage/documents/SimpleJsonDocument.java rename to src/main/java/gg/drak/thebase/storage/documents/SimpleJsonDocument.java index f2e8d0d..34822ad 100644 --- a/src/main/java/tv/quaint/storage/documents/SimpleJsonDocument.java +++ b/src/main/java/gg/drak/thebase/storage/documents/SimpleJsonDocument.java @@ -1,7 +1,7 @@ -package tv.quaint.storage.documents; +package gg.drak.thebase.storage.documents; import de.leonhard.storage.Json; -import tv.quaint.objects.handling.derived.IModifierEventable; +import gg.drak.thebase.objects.handling.derived.IModifierEventable; import java.io.File; diff --git a/src/main/java/tv/quaint/storage/documents/SimpleTomlDocument.java b/src/main/java/gg/drak/thebase/storage/documents/SimpleTomlDocument.java similarity index 87% rename from src/main/java/tv/quaint/storage/documents/SimpleTomlDocument.java rename to src/main/java/gg/drak/thebase/storage/documents/SimpleTomlDocument.java index cdeb8f3..fb09635 100644 --- a/src/main/java/tv/quaint/storage/documents/SimpleTomlDocument.java +++ b/src/main/java/gg/drak/thebase/storage/documents/SimpleTomlDocument.java @@ -1,7 +1,7 @@ -package tv.quaint.storage.documents; +package gg.drak.thebase.storage.documents; import de.leonhard.storage.Toml; -import tv.quaint.objects.handling.derived.IModifierEventable; +import gg.drak.thebase.objects.handling.derived.IModifierEventable; import java.io.File; diff --git a/src/main/java/tv/quaint/storage/managers/IStorageManager.java b/src/main/java/gg/drak/thebase/storage/managers/IStorageManager.java similarity index 92% rename from src/main/java/tv/quaint/storage/managers/IStorageManager.java rename to src/main/java/gg/drak/thebase/storage/managers/IStorageManager.java index 725dd2f..55aa3ba 100644 --- a/src/main/java/tv/quaint/storage/managers/IStorageManager.java +++ b/src/main/java/gg/drak/thebase/storage/managers/IStorageManager.java @@ -1,9 +1,9 @@ -package tv.quaint.storage.managers; +package gg.drak.thebase.storage.managers; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import tv.quaint.objects.Classifiable; -import tv.quaint.storage.resources.StorageResource; +import gg.drak.thebase.objects.Classifiable; +import gg.drak.thebase.storage.resources.StorageResource; import java.io.File; diff --git a/src/main/java/gg/drak/thebase/storage/managers/datastores/IDataStoreManager.java b/src/main/java/gg/drak/thebase/storage/managers/datastores/IDataStoreManager.java new file mode 100644 index 0000000..2813347 --- /dev/null +++ b/src/main/java/gg/drak/thebase/storage/managers/datastores/IDataStoreManager.java @@ -0,0 +1,11 @@ +package gg.drak.thebase.storage.managers.datastores; + +import gg.drak.thebase.storage.datastores.SimpleFlatDatastore; +import gg.drak.thebase.storage.managers.IStorageManager; + +public interface IDataStoreManager> extends IStorageManager { + /** + * Saves all documents. + */ + void saveAll(); +} diff --git a/src/main/java/tv/quaint/storage/managers/datastores/SimpleDataStoreManager.java b/src/main/java/gg/drak/thebase/storage/managers/datastores/SimpleDataStoreManager.java similarity index 94% rename from src/main/java/tv/quaint/storage/managers/datastores/SimpleDataStoreManager.java rename to src/main/java/gg/drak/thebase/storage/managers/datastores/SimpleDataStoreManager.java index 76784c4..c51298f 100644 --- a/src/main/java/tv/quaint/storage/managers/datastores/SimpleDataStoreManager.java +++ b/src/main/java/gg/drak/thebase/storage/managers/datastores/SimpleDataStoreManager.java @@ -1,10 +1,10 @@ -package tv.quaint.storage.managers.datastores; +package gg.drak.thebase.storage.managers.datastores; import lombok.Getter; import lombok.Setter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import tv.quaint.storage.datastores.SimpleFlatDatastore; +import gg.drak.thebase.storage.datastores.SimpleFlatDatastore; import java.io.File; import java.util.concurrent.ConcurrentSkipListMap; diff --git a/src/main/java/gg/drak/thebase/storage/managers/documents/IDocumentManager.java b/src/main/java/gg/drak/thebase/storage/managers/documents/IDocumentManager.java new file mode 100644 index 0000000..9ed036d --- /dev/null +++ b/src/main/java/gg/drak/thebase/storage/managers/documents/IDocumentManager.java @@ -0,0 +1,11 @@ +package gg.drak.thebase.storage.managers.documents; + +import gg.drak.thebase.storage.documents.SimpleFlatDocument; +import gg.drak.thebase.storage.managers.IStorageManager; + +public interface IDocumentManager> extends IStorageManager { + /** + * Saves all documents. + */ + void saveAll(); +} diff --git a/src/main/java/tv/quaint/storage/managers/documents/SimpleDocumentManager.java b/src/main/java/gg/drak/thebase/storage/managers/documents/SimpleDocumentManager.java similarity index 94% rename from src/main/java/tv/quaint/storage/managers/documents/SimpleDocumentManager.java rename to src/main/java/gg/drak/thebase/storage/managers/documents/SimpleDocumentManager.java index 5639e47..61f432d 100644 --- a/src/main/java/tv/quaint/storage/managers/documents/SimpleDocumentManager.java +++ b/src/main/java/gg/drak/thebase/storage/managers/documents/SimpleDocumentManager.java @@ -1,10 +1,10 @@ -package tv.quaint.storage.managers.documents; +package gg.drak.thebase.storage.managers.documents; import lombok.Getter; import lombok.Setter; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import tv.quaint.storage.documents.SimpleFlatDocument; +import gg.drak.thebase.storage.documents.SimpleFlatDocument; import java.io.File; import java.util.concurrent.ConcurrentSkipListMap; diff --git a/src/main/java/tv/quaint/storage/managers/documents/SimpleJsonDocumentManager.java b/src/main/java/gg/drak/thebase/storage/managers/documents/SimpleJsonDocumentManager.java similarity index 68% rename from src/main/java/tv/quaint/storage/managers/documents/SimpleJsonDocumentManager.java rename to src/main/java/gg/drak/thebase/storage/managers/documents/SimpleJsonDocumentManager.java index 015d903..1ca342a 100644 --- a/src/main/java/tv/quaint/storage/managers/documents/SimpleJsonDocumentManager.java +++ b/src/main/java/gg/drak/thebase/storage/managers/documents/SimpleJsonDocumentManager.java @@ -1,6 +1,6 @@ -package tv.quaint.storage.managers.documents; +package gg.drak.thebase.storage.managers.documents; -import tv.quaint.storage.documents.SimpleJsonDocument; +import gg.drak.thebase.storage.documents.SimpleJsonDocument; import java.io.File; diff --git a/src/main/java/tv/quaint/storage/managers/documents/SimpleTomlDocumentManager.java b/src/main/java/gg/drak/thebase/storage/managers/documents/SimpleTomlDocumentManager.java similarity index 68% rename from src/main/java/tv/quaint/storage/managers/documents/SimpleTomlDocumentManager.java rename to src/main/java/gg/drak/thebase/storage/managers/documents/SimpleTomlDocumentManager.java index c523706..0287137 100644 --- a/src/main/java/tv/quaint/storage/managers/documents/SimpleTomlDocumentManager.java +++ b/src/main/java/gg/drak/thebase/storage/managers/documents/SimpleTomlDocumentManager.java @@ -1,6 +1,6 @@ -package tv.quaint.storage.managers.documents; +package gg.drak.thebase.storage.managers.documents; -import tv.quaint.storage.documents.SimpleTomlDocument; +import gg.drak.thebase.storage.documents.SimpleTomlDocument; import java.io.File; diff --git a/src/main/java/tv/quaint/storage/resources/StorageResource.java b/src/main/java/gg/drak/thebase/storage/resources/StorageResource.java similarity index 94% rename from src/main/java/tv/quaint/storage/resources/StorageResource.java rename to src/main/java/gg/drak/thebase/storage/resources/StorageResource.java index 29a4b90..1306797 100644 --- a/src/main/java/tv/quaint/storage/resources/StorageResource.java +++ b/src/main/java/gg/drak/thebase/storage/resources/StorageResource.java @@ -1,12 +1,12 @@ -package tv.quaint.storage.resources; +package gg.drak.thebase.storage.resources; import lombok.Getter; import lombok.Setter; import org.jetbrains.annotations.NotNull; -import tv.quaint.objects.Classifiable; -import tv.quaint.storage.StorageUtils; -import tv.quaint.utils.MathUtils; -import tv.quaint.utils.StringUtils; +import gg.drak.thebase.objects.Classifiable; +import gg.drak.thebase.storage.StorageUtils; +import gg.drak.thebase.utils.MathUtils; +import gg.drak.thebase.utils.StringUtils; import java.io.InputStream; import java.time.temporal.ChronoUnit; diff --git a/src/main/java/tv/quaint/storage/resources/flat/FlatFileResource.java b/src/main/java/gg/drak/thebase/storage/resources/flat/FlatFileResource.java similarity index 95% rename from src/main/java/tv/quaint/storage/resources/flat/FlatFileResource.java rename to src/main/java/gg/drak/thebase/storage/resources/flat/FlatFileResource.java index 2c4ba18..ce5d4cd 100644 --- a/src/main/java/tv/quaint/storage/resources/flat/FlatFileResource.java +++ b/src/main/java/gg/drak/thebase/storage/resources/flat/FlatFileResource.java @@ -1,13 +1,11 @@ -package tv.quaint.storage.resources.flat; +package gg.drak.thebase.storage.resources.flat; import de.leonhard.storage.*; import de.leonhard.storage.internal.FlatFile; -import de.leonhard.storage.internal.settings.ConfigSettings; -import de.leonhard.storage.internal.settings.ReloadSettings; import lombok.Getter; import lombok.Setter; -import tv.quaint.storage.StorageUtils; -import tv.quaint.storage.resources.StorageResource; +import gg.drak.thebase.storage.StorageUtils; +import gg.drak.thebase.storage.resources.StorageResource; import java.io.File; import java.io.InputStream; diff --git a/src/main/java/tv/quaint/storage/resources/flat/simple/SimpleConfiguration.java b/src/main/java/gg/drak/thebase/storage/resources/flat/simple/SimpleConfiguration.java similarity index 80% rename from src/main/java/tv/quaint/storage/resources/flat/simple/SimpleConfiguration.java rename to src/main/java/gg/drak/thebase/storage/resources/flat/simple/SimpleConfiguration.java index 0ffd7be..817d0ec 100644 --- a/src/main/java/tv/quaint/storage/resources/flat/simple/SimpleConfiguration.java +++ b/src/main/java/gg/drak/thebase/storage/resources/flat/simple/SimpleConfiguration.java @@ -1,8 +1,8 @@ -package tv.quaint.storage.resources.flat.simple; +package gg.drak.thebase.storage.resources.flat.simple; import de.leonhard.storage.Config; -import tv.quaint.objects.handling.derived.IModifierEventable; -import tv.quaint.storage.resources.flat.FlatFileResource; +import gg.drak.thebase.objects.handling.derived.IModifierEventable; +import gg.drak.thebase.storage.resources.flat.FlatFileResource; import java.io.File; diff --git a/src/main/java/tv/quaint/storage/resources/flat/simple/SimpleJson.java b/src/main/java/gg/drak/thebase/storage/resources/flat/simple/SimpleJson.java similarity index 78% rename from src/main/java/tv/quaint/storage/resources/flat/simple/SimpleJson.java rename to src/main/java/gg/drak/thebase/storage/resources/flat/simple/SimpleJson.java index 50448f6..7217457 100644 --- a/src/main/java/tv/quaint/storage/resources/flat/simple/SimpleJson.java +++ b/src/main/java/gg/drak/thebase/storage/resources/flat/simple/SimpleJson.java @@ -1,8 +1,8 @@ -package tv.quaint.storage.resources.flat.simple; +package gg.drak.thebase.storage.resources.flat.simple; import de.leonhard.storage.Json; -import tv.quaint.objects.handling.derived.IModifierEventable; -import tv.quaint.storage.resources.flat.FlatFileResource; +import gg.drak.thebase.objects.handling.derived.IModifierEventable; +import gg.drak.thebase.storage.resources.flat.FlatFileResource; import java.io.File; diff --git a/src/main/java/tv/quaint/storage/resources/flat/simple/SimpleToml.java b/src/main/java/gg/drak/thebase/storage/resources/flat/simple/SimpleToml.java similarity index 78% rename from src/main/java/tv/quaint/storage/resources/flat/simple/SimpleToml.java rename to src/main/java/gg/drak/thebase/storage/resources/flat/simple/SimpleToml.java index 04c638d..b1e0563 100644 --- a/src/main/java/tv/quaint/storage/resources/flat/simple/SimpleToml.java +++ b/src/main/java/gg/drak/thebase/storage/resources/flat/simple/SimpleToml.java @@ -1,8 +1,8 @@ -package tv.quaint.storage.resources.flat.simple; +package gg.drak.thebase.storage.resources.flat.simple; import de.leonhard.storage.Toml; -import tv.quaint.objects.handling.derived.IModifierEventable; -import tv.quaint.storage.resources.flat.FlatFileResource; +import gg.drak.thebase.objects.handling.derived.IModifierEventable; +import gg.drak.thebase.storage.resources.flat.FlatFileResource; import java.io.File; diff --git a/src/main/java/tv/quaint/utils/MatcherUtils.java b/src/main/java/gg/drak/thebase/utils/MatcherUtils.java similarity index 97% rename from src/main/java/tv/quaint/utils/MatcherUtils.java rename to src/main/java/gg/drak/thebase/utils/MatcherUtils.java index fe251f6..1e9367e 100644 --- a/src/main/java/tv/quaint/utils/MatcherUtils.java +++ b/src/main/java/gg/drak/thebase/utils/MatcherUtils.java @@ -1,4 +1,4 @@ -package tv.quaint.utils; +package gg.drak.thebase.utils; import com.google.re2j.Matcher; import com.google.re2j.Pattern; diff --git a/src/main/java/tv/quaint/utils/MathUtils.java b/src/main/java/gg/drak/thebase/utils/MathUtils.java similarity index 98% rename from src/main/java/tv/quaint/utils/MathUtils.java rename to src/main/java/gg/drak/thebase/utils/MathUtils.java index 33b410a..e8cdcb3 100644 --- a/src/main/java/tv/quaint/utils/MathUtils.java +++ b/src/main/java/gg/drak/thebase/utils/MathUtils.java @@ -1,4 +1,4 @@ -package tv.quaint.utils; +package gg.drak.thebase.utils; import net.objecthunter.exp4j.Expression; import net.objecthunter.exp4j.ExpressionBuilder; diff --git a/src/main/java/tv/quaint/utils/ObjectUtils.java b/src/main/java/gg/drak/thebase/utils/ObjectUtils.java similarity index 96% rename from src/main/java/tv/quaint/utils/ObjectUtils.java rename to src/main/java/gg/drak/thebase/utils/ObjectUtils.java index 8b54690..87cd443 100644 --- a/src/main/java/tv/quaint/utils/ObjectUtils.java +++ b/src/main/java/gg/drak/thebase/utils/ObjectUtils.java @@ -1,4 +1,4 @@ -package tv.quaint.utils; +package gg.drak.thebase.utils; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/tv/quaint/utils/StringUtils.java b/src/main/java/gg/drak/thebase/utils/StringUtils.java similarity index 99% rename from src/main/java/tv/quaint/utils/StringUtils.java rename to src/main/java/gg/drak/thebase/utils/StringUtils.java index dd2eef9..d538dea 100644 --- a/src/main/java/tv/quaint/utils/StringUtils.java +++ b/src/main/java/gg/drak/thebase/utils/StringUtils.java @@ -1,4 +1,4 @@ -package tv.quaint.utils; +package gg.drak.thebase.utils; import java.util.*; import java.util.concurrent.ConcurrentSkipListSet; diff --git a/src/main/java/tv/quaint/storage/managers/datastores/IDataStoreManager.java b/src/main/java/tv/quaint/storage/managers/datastores/IDataStoreManager.java deleted file mode 100644 index 2f54f42..0000000 --- a/src/main/java/tv/quaint/storage/managers/datastores/IDataStoreManager.java +++ /dev/null @@ -1,11 +0,0 @@ -package tv.quaint.storage.managers.datastores; - -import tv.quaint.storage.datastores.SimpleFlatDatastore; -import tv.quaint.storage.managers.IStorageManager; - -public interface IDataStoreManager> extends IStorageManager { - /** - * Saves all documents. - */ - void saveAll(); -} diff --git a/src/main/java/tv/quaint/storage/managers/documents/IDocumentManager.java b/src/main/java/tv/quaint/storage/managers/documents/IDocumentManager.java deleted file mode 100644 index 4ceb7ba..0000000 --- a/src/main/java/tv/quaint/storage/managers/documents/IDocumentManager.java +++ /dev/null @@ -1,11 +0,0 @@ -package tv.quaint.storage.managers.documents; - -import tv.quaint.storage.documents.SimpleFlatDocument; -import tv.quaint.storage.managers.IStorageManager; - -public interface IDocumentManager> extends IStorageManager { - /** - * Saves all documents. - */ - void saveAll(); -}