From 39f11ac7d4cd0378b398d050ab97f2ae7447f998 Mon Sep 17 00:00:00 2001 From: rooooose-b <142353909+rooooose-b@users.noreply.github.com> Date: Sun, 21 Jan 2024 20:27:49 +0100 Subject: [PATCH] chore: setup stuff --- .github/CODEOWNERS | 2 +- .github/FUNDING.yml | 1 - CODE_OF_CONDUCT.md | 10 -------- build.gradle.kts | 10 +++----- settings.gradle.kts | 2 +- .../AlathraSkills/AlathraSkills.java} | 20 ++++++++-------- .../AlathraSkills}/Reloadable.java | 2 +- .../command/CommandHandler.java | 10 ++++---- .../command/ExampleCommand.java | 2 +- .../AlathraSkills}/config/ConfigHandler.java | 10 ++++---- .../AlathraSkills}/db/DatabaseHandler.java | 24 +++++++++---------- .../AlathraSkills}/db/DatabaseQueries.java | 6 ++--- .../AlathraSkills}/db/DatabaseType.java | 2 +- .../db/flyway/DatabaseMigrationException.java | 2 +- .../db/flyway/DatabaseMigrationHandler.java | 6 ++--- .../db/flyway/FlywayMigrationsProvider.java | 2 +- .../db/flyway/migration/V3__Example.java | 6 ++--- .../AlathraSkills}/db/jooq/JooqContext.java | 4 ++-- .../AlathraSkills}/hooks/VaultHook.java | 10 ++++---- .../listener/ListenerHandler.java | 10 ++++---- .../listener/VaultListener.java | 15 ++++++------ .../AlathraSkills}/utility/Cfg.java | 8 +++---- .../AlathraSkills}/utility/DB.java | 16 ++++++------- .../Alathra/AlathraSkills/utility/Logger.java | 21 ++++++++++++++++ .../ExamplePlugin/utility/Logger.java | 21 ---------------- src/main/resources/db/migration/V2__Test.sql | 2 -- 26 files changed, 104 insertions(+), 120 deletions(-) delete mode 100644 .github/FUNDING.yml rename src/main/java/io/github/{ExampleUser/ExamplePlugin/ExamplePlugin.java => Alathra/AlathraSkills/AlathraSkills.java} (79%) rename src/main/java/io/github/{ExampleUser/ExamplePlugin => Alathra/AlathraSkills}/Reloadable.java (88%) rename src/main/java/io/github/{ExampleUser/ExamplePlugin => Alathra/AlathraSkills}/command/CommandHandler.java (70%) rename src/main/java/io/github/{ExampleUser/ExamplePlugin => Alathra/AlathraSkills}/command/ExampleCommand.java (94%) rename src/main/java/io/github/{ExampleUser/ExamplePlugin => Alathra/AlathraSkills}/config/ConfigHandler.java (77%) rename src/main/java/io/github/{ExampleUser/ExamplePlugin => Alathra/AlathraSkills}/db/DatabaseHandler.java (93%) rename src/main/java/io/github/{ExampleUser/ExamplePlugin => Alathra/AlathraSkills}/db/DatabaseQueries.java (95%) rename src/main/java/io/github/{ExampleUser/ExamplePlugin => Alathra/AlathraSkills}/db/DatabaseType.java (99%) rename src/main/java/io/github/{ExampleUser/ExamplePlugin => Alathra/AlathraSkills}/db/flyway/DatabaseMigrationException.java (71%) rename src/main/java/io/github/{ExampleUser/ExamplePlugin => Alathra/AlathraSkills}/db/flyway/DatabaseMigrationHandler.java (94%) rename src/main/java/io/github/{ExampleUser/ExamplePlugin => Alathra/AlathraSkills}/db/flyway/FlywayMigrationsProvider.java (90%) rename src/main/java/io/github/{ExampleUser/ExamplePlugin => Alathra/AlathraSkills}/db/flyway/migration/V3__Example.java (84%) rename src/main/java/io/github/{ExampleUser/ExamplePlugin => Alathra/AlathraSkills}/db/jooq/JooqContext.java (96%) rename src/main/java/io/github/{ExampleUser/ExamplePlugin => Alathra/AlathraSkills}/hooks/VaultHook.java (94%) rename src/main/java/io/github/{ExampleUser/ExamplePlugin => Alathra/AlathraSkills}/listener/ListenerHandler.java (67%) rename src/main/java/io/github/{ExampleUser/ExamplePlugin => Alathra/AlathraSkills}/listener/VaultListener.java (63%) rename src/main/java/io/github/{ExampleUser/ExamplePlugin => Alathra/AlathraSkills}/utility/Cfg.java (60%) rename src/main/java/io/github/{ExampleUser/ExamplePlugin => Alathra/AlathraSkills}/utility/DB.java (64%) create mode 100644 src/main/java/io/github/Alathra/AlathraSkills/utility/Logger.java delete mode 100644 src/main/java/io/github/ExampleUser/ExamplePlugin/utility/Logger.java delete mode 100644 src/main/resources/db/migration/V2__Test.sql diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index 17b297e..e598275 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -1 +1 @@ -* @GITHUB_USERNAME +* @rooooose-b diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100644 index 5d7f20c..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1 +0,0 @@ -github: GITHUB_USERNAME diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index e148814..39b030f 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -56,16 +56,6 @@ Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event. -## Enforcement - -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported to the community leaders responsible for enforcement at -GITHUB_CONTACT_EMAIL. -All complaints will be reviewed and investigated promptly and fairly. - -All community leaders are obligated to respect the privacy and security of the -reporter of any incident. - ## Enforcement Guidelines Community leaders will follow these Community Impact Guidelines in determining diff --git a/build.gradle.kts b/build.gradle.kts index d37c2df..171a947 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -17,8 +17,8 @@ plugins { idea } -group = "io.github.ExampleUser" -version = "1.0.5" +group = "io.github.Alathra" +version = "1.0.0" description = "" val mainPackage = "${project.group}.${rootProject.name}" @@ -78,10 +78,6 @@ dependencies { } tasks { - // NOTE: Use when developing plugins using Mojang mappings -// assemble { -// dependsOn(reobfJar) -// } build { dependsOn(shadowJar) @@ -154,7 +150,7 @@ bukkit { // Options: https://github.com/Minecrell/plugin-yml#bukkit prefix = project.name version = "${project.version}" description = "${project.description}" - authors = listOf("GITHUB_USERNAME") + authors = listOf("rooooose-b, ShermansWorld") contributors = listOf() apiVersion = "1.19" diff --git a/settings.gradle.kts b/settings.gradle.kts index 7609811..50a67fc 100644 --- a/settings.gradle.kts +++ b/settings.gradle.kts @@ -9,4 +9,4 @@ plugins { id("org.gradle.toolchains.foojay-resolver-convention") version("0.7.0") } -rootProject.name = "ExamplePlugin" \ No newline at end of file +rootProject.name = "AlathraSkills" \ No newline at end of file diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/ExamplePlugin.java b/src/main/java/io/github/Alathra/AlathraSkills/AlathraSkills.java similarity index 79% rename from src/main/java/io/github/ExampleUser/ExamplePlugin/ExamplePlugin.java rename to src/main/java/io/github/Alathra/AlathraSkills/AlathraSkills.java index 9ed8215..3340883 100644 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/ExamplePlugin.java +++ b/src/main/java/io/github/Alathra/AlathraSkills/AlathraSkills.java @@ -1,24 +1,24 @@ -package io.github.ExampleUser.ExamplePlugin; +package io.github.Alathra.AlathraSkills; import com.github.milkdrinkers.colorparser.ColorParser; -import io.github.ExampleUser.ExamplePlugin.command.CommandHandler; -import io.github.ExampleUser.ExamplePlugin.config.ConfigHandler; -import io.github.ExampleUser.ExamplePlugin.db.DatabaseHandler; -import io.github.ExampleUser.ExamplePlugin.hooks.VaultHook; -import io.github.ExampleUser.ExamplePlugin.listener.ListenerHandler; -import io.github.ExampleUser.ExamplePlugin.utility.Logger; +import io.github.Alathra.AlathraSkills.command.CommandHandler; +import io.github.Alathra.AlathraSkills.config.ConfigHandler; +import io.github.Alathra.AlathraSkills.db.DatabaseHandler; +import io.github.Alathra.AlathraSkills.hooks.VaultHook; +import io.github.Alathra.AlathraSkills.listener.ListenerHandler; +import io.github.Alathra.AlathraSkills.utility.Logger; import org.bukkit.plugin.java.JavaPlugin; import org.jetbrains.annotations.NotNull; -public class ExamplePlugin extends JavaPlugin { - private static ExamplePlugin instance; +public class AlathraSkills extends JavaPlugin { + private static AlathraSkills instance; private ConfigHandler configHandler; private DatabaseHandler databaseHandler; private CommandHandler commandHandler; private ListenerHandler listenerHandler; private static VaultHook vaultHook; - public static ExamplePlugin getInstance() { + public static AlathraSkills getInstance() { return instance; } diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/Reloadable.java b/src/main/java/io/github/Alathra/AlathraSkills/Reloadable.java similarity index 88% rename from src/main/java/io/github/ExampleUser/ExamplePlugin/Reloadable.java rename to src/main/java/io/github/Alathra/AlathraSkills/Reloadable.java index 5099f05..3f84826 100644 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/Reloadable.java +++ b/src/main/java/io/github/Alathra/AlathraSkills/Reloadable.java @@ -1,4 +1,4 @@ -package io.github.ExampleUser.ExamplePlugin; +package io.github.Alathra.AlathraSkills; /** * Implemented in classes that should support being reloaded IE executing the methods during runtime after startup. diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/command/CommandHandler.java b/src/main/java/io/github/Alathra/AlathraSkills/command/CommandHandler.java similarity index 70% rename from src/main/java/io/github/ExampleUser/ExamplePlugin/command/CommandHandler.java rename to src/main/java/io/github/Alathra/AlathraSkills/command/CommandHandler.java index 259eaab..adbb400 100644 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/command/CommandHandler.java +++ b/src/main/java/io/github/Alathra/AlathraSkills/command/CommandHandler.java @@ -1,7 +1,7 @@ -package io.github.ExampleUser.ExamplePlugin.command; +package io.github.Alathra.AlathraSkills.command; -import io.github.ExampleUser.ExamplePlugin.ExamplePlugin; -import io.github.ExampleUser.ExamplePlugin.Reloadable; +import io.github.Alathra.AlathraSkills.AlathraSkills; +import io.github.Alathra.AlathraSkills.Reloadable; import dev.jorel.commandapi.CommandAPI; import dev.jorel.commandapi.CommandAPIBukkitConfig; @@ -9,9 +9,9 @@ * A class to handle registration of commands. */ public class CommandHandler implements Reloadable { - private final ExamplePlugin plugin; + private final AlathraSkills plugin; - public CommandHandler(ExamplePlugin plugin) { + public CommandHandler(AlathraSkills plugin) { this.plugin = plugin; } diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/command/ExampleCommand.java b/src/main/java/io/github/Alathra/AlathraSkills/command/ExampleCommand.java similarity index 94% rename from src/main/java/io/github/ExampleUser/ExamplePlugin/command/ExampleCommand.java rename to src/main/java/io/github/Alathra/AlathraSkills/command/ExampleCommand.java index 42a2db1..017b184 100644 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/command/ExampleCommand.java +++ b/src/main/java/io/github/Alathra/AlathraSkills/command/ExampleCommand.java @@ -1,4 +1,4 @@ -package io.github.ExampleUser.ExamplePlugin.command; +package io.github.Alathra.AlathraSkills.command; import com.github.milkdrinkers.colorparser.ColorParser; import dev.jorel.commandapi.CommandAPICommand; diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/config/ConfigHandler.java b/src/main/java/io/github/Alathra/AlathraSkills/config/ConfigHandler.java similarity index 77% rename from src/main/java/io/github/ExampleUser/ExamplePlugin/config/ConfigHandler.java rename to src/main/java/io/github/Alathra/AlathraSkills/config/ConfigHandler.java index d7771e3..9e01f8c 100644 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/config/ConfigHandler.java +++ b/src/main/java/io/github/Alathra/AlathraSkills/config/ConfigHandler.java @@ -1,7 +1,7 @@ -package io.github.ExampleUser.ExamplePlugin.config; +package io.github.Alathra.AlathraSkills.config; -import io.github.ExampleUser.ExamplePlugin.ExamplePlugin; -import io.github.ExampleUser.ExamplePlugin.Reloadable; +import io.github.Alathra.AlathraSkills.AlathraSkills; +import io.github.Alathra.AlathraSkills.Reloadable; import com.github.milkdrinkers.Crate.Config; import javax.inject.Singleton; @@ -11,7 +11,7 @@ */ @Singleton public class ConfigHandler implements Reloadable { - private final ExamplePlugin plugin; + private final AlathraSkills plugin; private Config cfg; /** @@ -19,7 +19,7 @@ public class ConfigHandler implements Reloadable { * * @param plugin the plugin instance */ - public ConfigHandler(ExamplePlugin plugin) { + public ConfigHandler(AlathraSkills plugin) { this.plugin = plugin; } diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/db/DatabaseHandler.java b/src/main/java/io/github/Alathra/AlathraSkills/db/DatabaseHandler.java similarity index 93% rename from src/main/java/io/github/ExampleUser/ExamplePlugin/db/DatabaseHandler.java rename to src/main/java/io/github/Alathra/AlathraSkills/db/DatabaseHandler.java index 249aefd..bda6309 100644 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/db/DatabaseHandler.java +++ b/src/main/java/io/github/Alathra/AlathraSkills/db/DatabaseHandler.java @@ -1,12 +1,12 @@ -package io.github.ExampleUser.ExamplePlugin.db; - -import io.github.ExampleUser.ExamplePlugin.ExamplePlugin; -import io.github.ExampleUser.ExamplePlugin.Reloadable; -import io.github.ExampleUser.ExamplePlugin.db.flyway.DatabaseMigrationException; -import io.github.ExampleUser.ExamplePlugin.db.flyway.DatabaseMigrationHandler; -import io.github.ExampleUser.ExamplePlugin.db.jooq.JooqContext; -import io.github.ExampleUser.ExamplePlugin.utility.Cfg; -import io.github.ExampleUser.ExamplePlugin.utility.Logger; +package io.github.Alathra.AlathraSkills.db; + +import io.github.Alathra.AlathraSkills.AlathraSkills; +import io.github.Alathra.AlathraSkills.Reloadable; +import io.github.Alathra.AlathraSkills.db.flyway.DatabaseMigrationException; +import io.github.Alathra.AlathraSkills.db.flyway.DatabaseMigrationHandler; +import io.github.Alathra.AlathraSkills.db.jooq.JooqContext; +import io.github.Alathra.AlathraSkills.utility.Cfg; +import io.github.Alathra.AlathraSkills.utility.Logger; import com.zaxxer.hikari.HikariConfig; import com.zaxxer.hikari.HikariDataSource; import org.jetbrains.annotations.NotNull; @@ -22,7 +22,7 @@ */ @Singleton public class DatabaseHandler implements Reloadable { - private final ExamplePlugin plugin; + private final AlathraSkills plugin; private boolean isConnected = false; private HikariDataSource hikariDataSource; private DatabaseType database; @@ -33,7 +33,7 @@ public class DatabaseHandler implements Reloadable { * * @param plugin the plugin instance */ - public DatabaseHandler(ExamplePlugin plugin) { + public DatabaseHandler(AlathraSkills plugin) { this.plugin = plugin; } @@ -261,7 +261,7 @@ private void openConnection() { hikariConfig.setMaximumPoolSize(poolSize); hikariConfig.setMinimumIdle(poolSize); - hikariConfig.setPoolName("%s-hikari".formatted(ExamplePlugin.getInstance().getName())); + hikariConfig.setPoolName("%s-hikari".formatted(AlathraSkills.getInstance().getName())); hikariConfig.setAutoCommit(true); hikariConfig.setTransactionIsolation("TRANSACTION_REPEATABLE_READ"); hikariConfig.setIsolateInternalQueries(true); diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/db/DatabaseQueries.java b/src/main/java/io/github/Alathra/AlathraSkills/db/DatabaseQueries.java similarity index 95% rename from src/main/java/io/github/ExampleUser/ExamplePlugin/db/DatabaseQueries.java rename to src/main/java/io/github/Alathra/AlathraSkills/db/DatabaseQueries.java index 9db7740..5c1fb69 100644 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/db/DatabaseQueries.java +++ b/src/main/java/io/github/Alathra/AlathraSkills/db/DatabaseQueries.java @@ -1,7 +1,7 @@ -package io.github.ExampleUser.ExamplePlugin.db; +package io.github.Alathra.AlathraSkills.db; -import io.github.ExampleUser.ExamplePlugin.utility.DB; -import io.github.ExampleUser.ExamplePlugin.utility.Logger; +import io.github.Alathra.AlathraSkills.utility.DB; +import io.github.Alathra.AlathraSkills.utility.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; import org.jooq.DSLContext; diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/db/DatabaseType.java b/src/main/java/io/github/Alathra/AlathraSkills/db/DatabaseType.java similarity index 99% rename from src/main/java/io/github/ExampleUser/ExamplePlugin/db/DatabaseType.java rename to src/main/java/io/github/Alathra/AlathraSkills/db/DatabaseType.java index 678b3c1..be6915d 100644 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/db/DatabaseType.java +++ b/src/main/java/io/github/Alathra/AlathraSkills/db/DatabaseType.java @@ -1,4 +1,4 @@ -package io.github.ExampleUser.ExamplePlugin.db; +package io.github.Alathra.AlathraSkills.db; import com.mysql.cj.jdbc.MysqlDataSource; import org.h2.jdbcx.JdbcDataSource; diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/db/flyway/DatabaseMigrationException.java b/src/main/java/io/github/Alathra/AlathraSkills/db/flyway/DatabaseMigrationException.java similarity index 71% rename from src/main/java/io/github/ExampleUser/ExamplePlugin/db/flyway/DatabaseMigrationException.java rename to src/main/java/io/github/Alathra/AlathraSkills/db/flyway/DatabaseMigrationException.java index 213c218..1aad1a3 100644 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/db/flyway/DatabaseMigrationException.java +++ b/src/main/java/io/github/Alathra/AlathraSkills/db/flyway/DatabaseMigrationException.java @@ -1,4 +1,4 @@ -package io.github.ExampleUser.ExamplePlugin.db.flyway; +package io.github.Alathra.AlathraSkills.db.flyway; public class DatabaseMigrationException extends Exception { public DatabaseMigrationException(Throwable t) { diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/db/flyway/DatabaseMigrationHandler.java b/src/main/java/io/github/Alathra/AlathraSkills/db/flyway/DatabaseMigrationHandler.java similarity index 94% rename from src/main/java/io/github/ExampleUser/ExamplePlugin/db/flyway/DatabaseMigrationHandler.java rename to src/main/java/io/github/Alathra/AlathraSkills/db/flyway/DatabaseMigrationHandler.java index 0677bee..bbfdb33 100644 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/db/flyway/DatabaseMigrationHandler.java +++ b/src/main/java/io/github/Alathra/AlathraSkills/db/flyway/DatabaseMigrationHandler.java @@ -1,7 +1,7 @@ -package io.github.ExampleUser.ExamplePlugin.db.flyway; +package io.github.Alathra.AlathraSkills.db.flyway; -import io.github.ExampleUser.ExamplePlugin.db.DatabaseType; -import io.github.ExampleUser.ExamplePlugin.db.flyway.migration.V3__Example; +import io.github.Alathra.AlathraSkills.db.DatabaseType; +import io.github.Alathra.AlathraSkills.db.flyway.migration.V3__Example; import com.github.milkdrinkers.Crate.Config; import org.flywaydb.core.Flyway; import org.flywaydb.core.api.ClassProvider; diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/db/flyway/FlywayMigrationsProvider.java b/src/main/java/io/github/Alathra/AlathraSkills/db/flyway/FlywayMigrationsProvider.java similarity index 90% rename from src/main/java/io/github/ExampleUser/ExamplePlugin/db/flyway/FlywayMigrationsProvider.java rename to src/main/java/io/github/Alathra/AlathraSkills/db/flyway/FlywayMigrationsProvider.java index 2f3a04b..4f1bf51 100644 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/db/flyway/FlywayMigrationsProvider.java +++ b/src/main/java/io/github/Alathra/AlathraSkills/db/flyway/FlywayMigrationsProvider.java @@ -1,4 +1,4 @@ -package io.github.ExampleUser.ExamplePlugin.db.flyway; +package io.github.Alathra.AlathraSkills.db.flyway; import org.flywaydb.core.api.ClassProvider; import org.flywaydb.core.api.migration.JavaMigration; diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/db/flyway/migration/V3__Example.java b/src/main/java/io/github/Alathra/AlathraSkills/db/flyway/migration/V3__Example.java similarity index 84% rename from src/main/java/io/github/ExampleUser/ExamplePlugin/db/flyway/migration/V3__Example.java rename to src/main/java/io/github/Alathra/AlathraSkills/db/flyway/migration/V3__Example.java index a3e78a4..3e51eb2 100644 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/db/flyway/migration/V3__Example.java +++ b/src/main/java/io/github/Alathra/AlathraSkills/db/flyway/migration/V3__Example.java @@ -1,7 +1,7 @@ -package io.github.ExampleUser.ExamplePlugin.db.flyway.migration; +package io.github.Alathra.AlathraSkills.db.flyway.migration; -import io.github.ExampleUser.ExamplePlugin.utility.DB; -import io.github.ExampleUser.ExamplePlugin.utility.Logger; +import io.github.Alathra.AlathraSkills.utility.DB; +import io.github.Alathra.AlathraSkills.utility.Logger; import org.flywaydb.core.api.migration.BaseJavaMigration; import org.flywaydb.core.api.migration.Context; import org.jooq.DSLContext; diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/db/jooq/JooqContext.java b/src/main/java/io/github/Alathra/AlathraSkills/db/jooq/JooqContext.java similarity index 96% rename from src/main/java/io/github/ExampleUser/ExamplePlugin/db/jooq/JooqContext.java rename to src/main/java/io/github/Alathra/AlathraSkills/db/jooq/JooqContext.java index 94298ad..3ea02c2 100644 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/db/jooq/JooqContext.java +++ b/src/main/java/io/github/Alathra/AlathraSkills/db/jooq/JooqContext.java @@ -1,6 +1,6 @@ -package io.github.ExampleUser.ExamplePlugin.db.jooq; +package io.github.Alathra.AlathraSkills.db.jooq; -import io.github.ExampleUser.ExamplePlugin.utility.Cfg; +import io.github.Alathra.AlathraSkills.utility.Cfg; import org.jooq.*; import org.jooq.conf.*; import org.jooq.exception.DataAccessException; diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/hooks/VaultHook.java b/src/main/java/io/github/Alathra/AlathraSkills/hooks/VaultHook.java similarity index 94% rename from src/main/java/io/github/ExampleUser/ExamplePlugin/hooks/VaultHook.java rename to src/main/java/io/github/Alathra/AlathraSkills/hooks/VaultHook.java index 60ec935..41a2fd5 100644 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/hooks/VaultHook.java +++ b/src/main/java/io/github/Alathra/AlathraSkills/hooks/VaultHook.java @@ -1,7 +1,7 @@ -package io.github.ExampleUser.ExamplePlugin.hooks; +package io.github.Alathra.AlathraSkills.hooks; -import io.github.ExampleUser.ExamplePlugin.ExamplePlugin; -import io.github.ExampleUser.ExamplePlugin.Reloadable; +import io.github.Alathra.AlathraSkills.AlathraSkills; +import io.github.Alathra.AlathraSkills.Reloadable; import net.milkbowl.vault.chat.Chat; import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.permission.Permission; @@ -13,7 +13,7 @@ * A hook to interface with the Vault API. */ public class VaultHook implements Reloadable { - private final ExamplePlugin plugin; + private final AlathraSkills plugin; private @Nullable RegisteredServiceProvider rspEconomy; private @Nullable RegisteredServiceProvider rspPermissions; private @Nullable RegisteredServiceProvider rspChat; @@ -23,7 +23,7 @@ public class VaultHook implements Reloadable { * * @param plugin the plugin instance */ - public VaultHook(ExamplePlugin plugin) { + public VaultHook(AlathraSkills plugin) { this.plugin = plugin; } diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/listener/ListenerHandler.java b/src/main/java/io/github/Alathra/AlathraSkills/listener/ListenerHandler.java similarity index 67% rename from src/main/java/io/github/ExampleUser/ExamplePlugin/listener/ListenerHandler.java rename to src/main/java/io/github/Alathra/AlathraSkills/listener/ListenerHandler.java index 7ddd1fa..362b2dd 100644 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/listener/ListenerHandler.java +++ b/src/main/java/io/github/Alathra/AlathraSkills/listener/ListenerHandler.java @@ -1,15 +1,15 @@ -package io.github.ExampleUser.ExamplePlugin.listener; +package io.github.Alathra.AlathraSkills.listener; -import io.github.ExampleUser.ExamplePlugin.ExamplePlugin; -import io.github.ExampleUser.ExamplePlugin.Reloadable; +import io.github.Alathra.AlathraSkills.AlathraSkills; +import io.github.Alathra.AlathraSkills.Reloadable; /** * A class to handle registration of event listeners. */ public class ListenerHandler implements Reloadable { - private final ExamplePlugin plugin; + private final AlathraSkills plugin; - public ListenerHandler(ExamplePlugin plugin) { + public ListenerHandler(AlathraSkills plugin) { this.plugin = plugin; } diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/listener/VaultListener.java b/src/main/java/io/github/Alathra/AlathraSkills/listener/VaultListener.java similarity index 63% rename from src/main/java/io/github/ExampleUser/ExamplePlugin/listener/VaultListener.java rename to src/main/java/io/github/Alathra/AlathraSkills/listener/VaultListener.java index 58799e0..f76680b 100644 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/listener/VaultListener.java +++ b/src/main/java/io/github/Alathra/AlathraSkills/listener/VaultListener.java @@ -1,6 +1,7 @@ -package io.github.ExampleUser.ExamplePlugin.listener; +package io.github.Alathra.AlathraSkills.listener; -import io.github.ExampleUser.ExamplePlugin.ExamplePlugin; +import io.github.Alathra.AlathraSkills.AlathraSkills; +import io.github.Alathra.AlathraSkills.hooks.VaultHook; import net.milkbowl.vault.chat.Chat; import net.milkbowl.vault.economy.Economy; import net.milkbowl.vault.permission.Permission; @@ -10,11 +11,11 @@ import org.bukkit.plugin.RegisteredServiceProvider; /** - * Event Listener for the Vault Hook {@link io.github.ExampleUser.ExamplePlugin.hooks.VaultHook}. + * Event Listener for the Vault Hook {@link VaultHook}. */ public class VaultListener implements Listener { /** - * Update the Vault hooks RegisteredServiceProviders in {@link io.github.ExampleUser.ExamplePlugin.hooks.VaultHook}.

This ensures the Vault hook is lazily loaded and working properly, even on reloads. + * Update the Vault hooks RegisteredServiceProviders in {@link VaultHook}.

This ensures the Vault hook is lazily loaded and working properly, even on reloads. * * @param e event */ @@ -24,11 +25,11 @@ public void onServiceRegisterEvent(ServiceRegisterEvent e) { RegisteredServiceProvider rsp = e.getProvider(); Object rspProvider = rsp.getProvider(); if (rspProvider instanceof Economy) { - ExamplePlugin.getVaultHook().setEconomy((RegisteredServiceProvider) rsp); + AlathraSkills.getVaultHook().setEconomy((RegisteredServiceProvider) rsp); } else if (rspProvider instanceof Permission) { - ExamplePlugin.getVaultHook().setPermissions((RegisteredServiceProvider) rsp); + AlathraSkills.getVaultHook().setPermissions((RegisteredServiceProvider) rsp); } else if (rspProvider instanceof Chat) { - ExamplePlugin.getVaultHook().setChat((RegisteredServiceProvider) rsp); + AlathraSkills.getVaultHook().setChat((RegisteredServiceProvider) rsp); } } } diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/utility/Cfg.java b/src/main/java/io/github/Alathra/AlathraSkills/utility/Cfg.java similarity index 60% rename from src/main/java/io/github/ExampleUser/ExamplePlugin/utility/Cfg.java rename to src/main/java/io/github/Alathra/AlathraSkills/utility/Cfg.java index 6b1d1a5..caf6ef0 100644 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/utility/Cfg.java +++ b/src/main/java/io/github/Alathra/AlathraSkills/utility/Cfg.java @@ -1,7 +1,7 @@ -package io.github.ExampleUser.ExamplePlugin.utility; +package io.github.Alathra.AlathraSkills.utility; -import io.github.ExampleUser.ExamplePlugin.ExamplePlugin; -import io.github.ExampleUser.ExamplePlugin.config.ConfigHandler; +import io.github.Alathra.AlathraSkills.AlathraSkills; +import io.github.Alathra.AlathraSkills.config.ConfigHandler; import com.github.milkdrinkers.Crate.Config; import org.jetbrains.annotations.NotNull; @@ -14,6 +14,6 @@ public abstract class Cfg { */ @NotNull public static Config get() { - return ExamplePlugin.getInstance().getConfigHandler().getConfig(); + return AlathraSkills.getInstance().getConfigHandler().getConfig(); } } diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/utility/DB.java b/src/main/java/io/github/Alathra/AlathraSkills/utility/DB.java similarity index 64% rename from src/main/java/io/github/ExampleUser/ExamplePlugin/utility/DB.java rename to src/main/java/io/github/Alathra/AlathraSkills/utility/DB.java index a76297b..dcccbfd 100644 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/utility/DB.java +++ b/src/main/java/io/github/Alathra/AlathraSkills/utility/DB.java @@ -1,9 +1,9 @@ -package io.github.ExampleUser.ExamplePlugin.utility; +package io.github.Alathra.AlathraSkills.utility; -import io.github.ExampleUser.ExamplePlugin.ExamplePlugin; -import io.github.ExampleUser.ExamplePlugin.db.DatabaseHandler; -import io.github.ExampleUser.ExamplePlugin.db.DatabaseType; -import io.github.ExampleUser.ExamplePlugin.db.jooq.JooqContext; +import io.github.Alathra.AlathraSkills.AlathraSkills; +import io.github.Alathra.AlathraSkills.db.DatabaseHandler; +import io.github.Alathra.AlathraSkills.db.DatabaseType; +import io.github.Alathra.AlathraSkills.db.jooq.JooqContext; import org.jetbrains.annotations.NotNull; import org.jooq.DSLContext; @@ -19,7 +19,7 @@ public abstract class DB { */ @NotNull public static Connection getConnection() throws SQLException { - return ExamplePlugin.getInstance().getDataHandler().getConnection(); + return AlathraSkills.getInstance().getDataHandler().getConnection(); } /** @@ -27,13 +27,13 @@ public static Connection getConnection() throws SQLException { */ @NotNull public static DSLContext getContext(Connection con) { - return ExamplePlugin.getInstance().getDataHandler().getJooqContext().createContext(con); + return AlathraSkills.getInstance().getDataHandler().getJooqContext().createContext(con); } /** * Convenience method for {@link DatabaseHandler#getDB()} to getConnection {@link DatabaseType} */ public static DatabaseType getDB() { - return ExamplePlugin.getInstance().getDataHandler().getDB(); + return AlathraSkills.getInstance().getDataHandler().getDB(); } } diff --git a/src/main/java/io/github/Alathra/AlathraSkills/utility/Logger.java b/src/main/java/io/github/Alathra/AlathraSkills/utility/Logger.java new file mode 100644 index 0000000..e911a97 --- /dev/null +++ b/src/main/java/io/github/Alathra/AlathraSkills/utility/Logger.java @@ -0,0 +1,21 @@ +package io.github.Alathra.AlathraSkills.utility; + + +import io.github.Alathra.AlathraSkills.AlathraSkills; +import net.kyori.adventure.text.logger.slf4j.ComponentLogger; +import org.jetbrains.annotations.NotNull; + +/** + * A class that provides shorthand access to {@link AlathraSkills#getComponentLogger}. + */ +public class Logger { + /** + * Get component logger. Shorthand for: + * + * @return the component logger {@link AlathraSkills#getComponentLogger}. + */ + @NotNull + public static ComponentLogger get() { + return AlathraSkills.getInstance().getComponentLogger(); + } +} diff --git a/src/main/java/io/github/ExampleUser/ExamplePlugin/utility/Logger.java b/src/main/java/io/github/ExampleUser/ExamplePlugin/utility/Logger.java deleted file mode 100644 index 563dd91..0000000 --- a/src/main/java/io/github/ExampleUser/ExamplePlugin/utility/Logger.java +++ /dev/null @@ -1,21 +0,0 @@ -package io.github.ExampleUser.ExamplePlugin.utility; - - -import io.github.ExampleUser.ExamplePlugin.ExamplePlugin; -import net.kyori.adventure.text.logger.slf4j.ComponentLogger; -import org.jetbrains.annotations.NotNull; - -/** - * A class that provides shorthand access to {@link ExamplePlugin#getComponentLogger}. - */ -public class Logger { - /** - * Get component logger. Shorthand for: - * - * @return the component logger {@link ExamplePlugin#getComponentLogger}. - */ - @NotNull - public static ComponentLogger get() { - return ExamplePlugin.getInstance().getComponentLogger(); - } -} diff --git a/src/main/resources/db/migration/V2__Test.sql b/src/main/resources/db/migration/V2__Test.sql deleted file mode 100644 index 5697876..0000000 --- a/src/main/resources/db/migration/V2__Test.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE IF EXISTS ${tablePrefix}test - ADD COLUMN test INT NULL;