diff --git a/.gitignore b/.gitignore index 3ac5f13..668f5f4 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,3 @@ -.gradle -!gradle-wrapper.jar -build target/ pom.xml.tag pom.xml.releaseBackup @@ -20,7 +17,7 @@ buildNumber.properties .idea/**/dataSources/ .idea/**/dataSources.ids .idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml +.idea/**/sqlDataSources.xml .idea/**/dynamic.xml .idea/**/uiDesigner.xml .idea/**/dbnavigator.xml @@ -72,9 +69,11 @@ Temporary Items .classpath .project .settings/ -.apt_generated_tests/ -.apt_generated/ -.factorypath .env .secrets.env -bin/ \ No newline at end of file +.gradle/ +build/ +bin/ +*.pom.xml +modules/ +!gradle-wrapper.jar \ No newline at end of file diff --git a/build.gradle b/build.gradle index 21b8b42..9b9018c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,14 @@ -import org.apache.tools.ant.filters.ReplaceTokens +import org.apache.tools.ant.filters.ReplaceTokens plugins { - id 'java' + id 'java' // Remove once migration is finished + id 'org.jetbrains.kotlin.jvm' version '1.6.20' id 'com.github.johnrengelman.shadow' version '7.1.2' + id 'org.jetbrains.dokka' version '1.6.10' } group 'xyz.theprogramsrc' -version '3.18.0' +version '4.0.0' description 'Secure your users and server.' repositories{ @@ -14,56 +16,97 @@ repositories{ mavenLocal() maven { url 'https://repo.theprogramsrc.xyz/repository/maven-public/' } + maven { url 'https://repo.theprogramsrc.xyz/repository/simplecoreapi-modules/' } maven { url 'https://oss.sonatype.org/content/repositories/snapshots/' } maven { url 'https://oss.sonatype.org/content/repositories/releases/' } + maven { url 'https://oss.sonatype.org/content/groups/public/' } maven { url 'https://hub.spigotmc.org/nexus/content/repositories/snapshots/' } - maven { url 'https://repo.codemc.org/repository/maven-public' } maven { url 'https://repo.extendedclip.com/content/repositories/placeholderapi/' } + maven { url 'https://repo.codemc.org/repository/maven-public/' } maven { url 'https://jitpack.io/' } } +// Versions +def exposedVersion = "0.38.1" + dependencies { - implementation 'xyz.theprogramsrc:supercoreapi:5.3.4-SNAPSHOT' - - compileOnly 'org.apache.logging.log4j:log4j-core:2.17.1' - compileOnly 'org.spigotmc:spigot-api:1.17.1-R0.1-SNAPSHOT' - compileOnly 'net.md-5:bungeecord-api:1.17-R0.1-SNAPSHOT' - compileOnly 'me.clip:placeholderapi:2.10.9' -} + compileOnly 'xyz.theprogramsrc:supercoreapi:5.3.4-SNAPSHOT' // Remove depend once the migration is finished! -processResources { - filter ReplaceTokens, tokens: [name: rootProject.name, version: project.version.toString(), description: project.description] -} + /* Kotlin and Minecraft */ + implementation 'org.jetbrains.kotlin:kotlin-stdlib:1.6.20' + compileOnly 'org.spigotmc:spigot-api:1.18.1-R0.1-SNAPSHOT' + compileOnly 'net.md-5:bungeecord-api:1.18-R0.1-SNAPSHOT' -sourceCompatibility = 1.8 -targetCompatibility = 1.8 + /* SimpleCoreAPI */ + compileOnly 'xyz.theprogramsrc:simplecoreapi:0.3.4-SNAPSHOT' + compileOnly 'xyz.theprogramsrc:commandsmodule:0.1.0-SNAPSHOT' + compileOnly 'xyz.theprogramsrc:filesmodule:0.1.1-SNAPSHOT' + compileOnly 'xyz.theprogramsrc:tasksmodule:0.1.0-SNAPSHOT' + compileOnly 'xyz.theprogramsrc:translationsmodule:0.1.5-SNAPSHOT' + compileOnly 'xyz.theprogramsrc:dependencydownloadermodule:0.1.1-SNAPSHOT' + compileOnly 'xyz.theprogramsrc:uismodule:0.1.1-SNAPSHOT' + compileOnly 'xyz.theprogramsrc:networkingmodule:0.1.0-SNAPSHOT' + compileOnly 'xyz.theprogramsrc:loggingmodule:0.2.1-SNAPSHOT' -tasks.withType(JavaCompile) { - options.encoding = "UTF-8" -} -tasks.withType(Copy) { - duplicatesStrategy = 'include' + /* DataBase */ + compileOnly "org.jetbrains.exposed:exposed-core:$exposedVersion" + compileOnly "org.jetbrains.exposed:exposed-dao:$exposedVersion" + compileOnly "org.jetbrains.exposed:exposed-jdbc:$exposedVersion" + compileOnly "org.jetbrains.exposed:exposed-java-time:$exposedVersion" + compileOnly 'mysql:mysql-connector-java:8.0.28' + compileOnly 'org.xerial:sqlite-jdbc:3.36.0.3' + + + /* Hashing */ + implementation 'at.favre.lib:bcrypt:0.9.0' + + /* Extras */ + compileOnly 'me.clip:placeholderapi:2.10.9' } -tasks.withType(Jar) { - duplicatesStrategy = 'include' +processResources { + filter ReplaceTokens, tokens: [name: rootProject.name, version: project.version.toString(), description: project.description] } shadowJar { - relocate 'xyz.theprogramsrc.supercoreapi', 'xyz.theprogramsrc.superauth.supercoreapi' - // relocate 'org.apache.logging.log4j', 'xyz.theprogramsrc.superauth.logging' + mergeServiceFiles() + exclude('**/*.kotlin_metadata') + exclude('**/*.kotlin_builtins') archiveBaseName.set('SuperAuth') archiveClassifier.set('') archiveVersion.set('') +} - minimize() +java { + sourceCompatibility = JavaVersion.VERSION_11 + targetCompatibility = JavaVersion.VERSION_11 + withSourcesJar() } -sourceSets.main.java.srcDir 'src/main/java' -sourceSets.main.resources.srcDir 'src/main/resources' +tasks.withType(JavaCompile) { + options.encoding = 'UTF-8' +} + +tasks.withType(Jar) { + duplicatesStrategy = DuplicatesStrategy.EXCLUDE +} + +tasks.withType(Copy){ + duplicatesStrategy = DuplicatesStrategy.EXCLUDE +} test { useJUnitPlatform() } + +configurations { + testImplementation { + extendsFrom(compileOnly) + } +} + +tasks.named("dokkaHtml") { + outputDirectory.set(file(project.buildDir.absolutePath + '/dokka')) +} diff --git a/src/main/java/xyz/theprogramsrc/superauth/api/auth/SuperAuthAfterCaptchaEvent.java b/src/main/java/xyz/theprogramsrc/superauth/api/auth/SuperAuthAfterCaptchaEvent.java deleted file mode 100644 index 9c0d924..0000000 --- a/src/main/java/xyz/theprogramsrc/superauth/api/auth/SuperAuthAfterCaptchaEvent.java +++ /dev/null @@ -1,13 +0,0 @@ -package xyz.theprogramsrc.superauth.api.auth; - -import xyz.theprogramsrc.superauth.api.SuperAuthAPIEvent; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; - -public class SuperAuthAfterCaptchaEvent extends SuperAuthAPIEvent { - - public SuperAuthAfterCaptchaEvent(AuthSettings authSettings, UserStorage userStorage, String user) { - super(authSettings, userStorage, user); - } - -} diff --git a/src/main/java/xyz/theprogramsrc/superauth/api/auth/SuperAuthAfterLoginEvent.java b/src/main/java/xyz/theprogramsrc/superauth/api/auth/SuperAuthAfterLoginEvent.java deleted file mode 100644 index 88d2c11..0000000 --- a/src/main/java/xyz/theprogramsrc/superauth/api/auth/SuperAuthAfterLoginEvent.java +++ /dev/null @@ -1,13 +0,0 @@ -package xyz.theprogramsrc.superauth.api.auth; - -import xyz.theprogramsrc.superauth.api.SuperAuthAPIEvent; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; - -public class SuperAuthAfterLoginEvent extends SuperAuthAPIEvent { - - public SuperAuthAfterLoginEvent(AuthSettings authSettings, UserStorage userStorage, String user) { - super(authSettings, userStorage, user); - } - -} diff --git a/src/main/java/xyz/theprogramsrc/superauth/api/auth/SuperAuthAfterRegisterEvent.java b/src/main/java/xyz/theprogramsrc/superauth/api/auth/SuperAuthAfterRegisterEvent.java deleted file mode 100644 index dd62b15..0000000 --- a/src/main/java/xyz/theprogramsrc/superauth/api/auth/SuperAuthAfterRegisterEvent.java +++ /dev/null @@ -1,13 +0,0 @@ -package xyz.theprogramsrc.superauth.api.auth; - -import xyz.theprogramsrc.superauth.api.SuperAuthAPIEvent; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; - -public class SuperAuthAfterRegisterEvent extends SuperAuthAPIEvent { - - public SuperAuthAfterRegisterEvent(AuthSettings authSettings, UserStorage userStorage, String user) { - super(authSettings, userStorage, user); - } - -} diff --git a/src/main/java/xyz/theprogramsrc/superauth/api/auth/SuperAuthBeforeCaptchaEvent.java b/src/main/java/xyz/theprogramsrc/superauth/api/auth/SuperAuthBeforeCaptchaEvent.java deleted file mode 100644 index 4fc3e0f..0000000 --- a/src/main/java/xyz/theprogramsrc/superauth/api/auth/SuperAuthBeforeCaptchaEvent.java +++ /dev/null @@ -1,13 +0,0 @@ -package xyz.theprogramsrc.superauth.api.auth; - -import xyz.theprogramsrc.superauth.api.SuperAuthAPIEvent; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; - -public class SuperAuthBeforeCaptchaEvent extends SuperAuthAPIEvent { - - public SuperAuthBeforeCaptchaEvent(AuthSettings authSettings, UserStorage userStorage, String user) { - super(authSettings, userStorage, user); - } - -} diff --git a/src/main/java/xyz/theprogramsrc/superauth/api/auth/SuperAuthBeforeLoginEvent.java b/src/main/java/xyz/theprogramsrc/superauth/api/auth/SuperAuthBeforeLoginEvent.java deleted file mode 100644 index e393b2d..0000000 --- a/src/main/java/xyz/theprogramsrc/superauth/api/auth/SuperAuthBeforeLoginEvent.java +++ /dev/null @@ -1,13 +0,0 @@ -package xyz.theprogramsrc.superauth.api.auth; - -import xyz.theprogramsrc.superauth.api.SuperAuthAPIEvent; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; - -public class SuperAuthBeforeLoginEvent extends SuperAuthAPIEvent { - - public SuperAuthBeforeLoginEvent(AuthSettings authSettings, UserStorage userStorage, String user) { - super(authSettings, userStorage, user); - } - -} diff --git a/src/main/java/xyz/theprogramsrc/superauth/api/auth/SuperAuthBeforeRegisterEvent.java b/src/main/java/xyz/theprogramsrc/superauth/api/auth/SuperAuthBeforeRegisterEvent.java deleted file mode 100644 index d5b6a04..0000000 --- a/src/main/java/xyz/theprogramsrc/superauth/api/auth/SuperAuthBeforeRegisterEvent.java +++ /dev/null @@ -1,13 +0,0 @@ -package xyz.theprogramsrc.superauth.api.auth; - -import xyz.theprogramsrc.superauth.api.SuperAuthAPIEvent; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; - -public class SuperAuthBeforeRegisterEvent extends SuperAuthAPIEvent { - - public SuperAuthBeforeRegisterEvent(AuthSettings authSettings, UserStorage userStorage, String user) { - super(authSettings, userStorage, user); - } - -} diff --git a/src/main/java/xyz/theprogramsrc/superauth/api/others/UserPasswordChangeEvent.java b/src/main/java/xyz/theprogramsrc/superauth/api/others/UserPasswordChangeEvent.java deleted file mode 100644 index 46079b2..0000000 --- a/src/main/java/xyz/theprogramsrc/superauth/api/others/UserPasswordChangeEvent.java +++ /dev/null @@ -1,11 +0,0 @@ -package xyz.theprogramsrc.superauth.api.others; - -import xyz.theprogramsrc.superauth.api.SuperAuthAPIEvent; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; - -public class UserPasswordChangeEvent extends SuperAuthAPIEvent { - public UserPasswordChangeEvent(AuthSettings authSettings, UserStorage userStorage, String user) { - super(authSettings, userStorage, user); - } -} diff --git a/src/main/java/xyz/theprogramsrc/superauth/api/SuperAuthAPIEvent.java b/src/main/java/xyz/theprogramsrc/superauth_v3/api/SuperAuthAPIEvent.java similarity index 70% rename from src/main/java/xyz/theprogramsrc/superauth/api/SuperAuthAPIEvent.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/api/SuperAuthAPIEvent.java index 8a1fb2c..91f7b85 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/api/SuperAuthAPIEvent.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/api/SuperAuthAPIEvent.java @@ -1,9 +1,9 @@ -package xyz.theprogramsrc.superauth.api; +package xyz.theprogramsrc.superauth_v3.api; -import xyz.theprogramsrc.superauth.global.hashing.HashingMethod; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; +import xyz.theprogramsrc.superauth_v3.global.hashing.HashingMethod; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; public class SuperAuthAPIEvent { diff --git a/src/main/java/xyz/theprogramsrc/superauth/api/SuperAuthAPIHandler.java b/src/main/java/xyz/theprogramsrc/superauth_v3/api/SuperAuthAPIHandler.java similarity index 66% rename from src/main/java/xyz/theprogramsrc/superauth/api/SuperAuthAPIHandler.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/api/SuperAuthAPIHandler.java index 952d5ee..7cd7dd0 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/api/SuperAuthAPIHandler.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/api/SuperAuthAPIHandler.java @@ -1,4 +1,4 @@ -package xyz.theprogramsrc.superauth.api; +package xyz.theprogramsrc.superauth_v3.api; public interface SuperAuthAPIHandler { diff --git a/src/main/java/xyz/theprogramsrc/superauth/api/actions/SuperAuthAction.java b/src/main/java/xyz/theprogramsrc/superauth_v3/api/actions/SuperAuthAction.java similarity index 91% rename from src/main/java/xyz/theprogramsrc/superauth/api/actions/SuperAuthAction.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/api/actions/SuperAuthAction.java index 3a24918..6ea1f09 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/api/actions/SuperAuthAction.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/api/actions/SuperAuthAction.java @@ -1,4 +1,4 @@ -package xyz.theprogramsrc.superauth.api.actions; +package xyz.theprogramsrc.superauth_v3.api.actions; import org.bukkit.entity.Player; diff --git a/src/main/java/xyz/theprogramsrc/superauth_v3/api/auth/SuperAuthAfterCaptchaEvent.java b/src/main/java/xyz/theprogramsrc/superauth_v3/api/auth/SuperAuthAfterCaptchaEvent.java new file mode 100644 index 0000000..a7dcc89 --- /dev/null +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/api/auth/SuperAuthAfterCaptchaEvent.java @@ -0,0 +1,13 @@ +package xyz.theprogramsrc.superauth_v3.api.auth; + +import xyz.theprogramsrc.superauth_v3.api.SuperAuthAPIEvent; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; + +public class SuperAuthAfterCaptchaEvent extends SuperAuthAPIEvent { + + public SuperAuthAfterCaptchaEvent(AuthSettings authSettings, UserStorage userStorage, String user) { + super(authSettings, userStorage, user); + } + +} diff --git a/src/main/java/xyz/theprogramsrc/superauth_v3/api/auth/SuperAuthAfterLoginEvent.java b/src/main/java/xyz/theprogramsrc/superauth_v3/api/auth/SuperAuthAfterLoginEvent.java new file mode 100644 index 0000000..95d6e9b --- /dev/null +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/api/auth/SuperAuthAfterLoginEvent.java @@ -0,0 +1,13 @@ +package xyz.theprogramsrc.superauth_v3.api.auth; + +import xyz.theprogramsrc.superauth_v3.api.SuperAuthAPIEvent; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; + +public class SuperAuthAfterLoginEvent extends SuperAuthAPIEvent { + + public SuperAuthAfterLoginEvent(AuthSettings authSettings, UserStorage userStorage, String user) { + super(authSettings, userStorage, user); + } + +} diff --git a/src/main/java/xyz/theprogramsrc/superauth_v3/api/auth/SuperAuthAfterRegisterEvent.java b/src/main/java/xyz/theprogramsrc/superauth_v3/api/auth/SuperAuthAfterRegisterEvent.java new file mode 100644 index 0000000..cd7fed3 --- /dev/null +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/api/auth/SuperAuthAfterRegisterEvent.java @@ -0,0 +1,13 @@ +package xyz.theprogramsrc.superauth_v3.api.auth; + +import xyz.theprogramsrc.superauth_v3.api.SuperAuthAPIEvent; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; + +public class SuperAuthAfterRegisterEvent extends SuperAuthAPIEvent { + + public SuperAuthAfterRegisterEvent(AuthSettings authSettings, UserStorage userStorage, String user) { + super(authSettings, userStorage, user); + } + +} diff --git a/src/main/java/xyz/theprogramsrc/superauth_v3/api/auth/SuperAuthBeforeCaptchaEvent.java b/src/main/java/xyz/theprogramsrc/superauth_v3/api/auth/SuperAuthBeforeCaptchaEvent.java new file mode 100644 index 0000000..23e1ba9 --- /dev/null +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/api/auth/SuperAuthBeforeCaptchaEvent.java @@ -0,0 +1,13 @@ +package xyz.theprogramsrc.superauth_v3.api.auth; + +import xyz.theprogramsrc.superauth_v3.api.SuperAuthAPIEvent; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; + +public class SuperAuthBeforeCaptchaEvent extends SuperAuthAPIEvent { + + public SuperAuthBeforeCaptchaEvent(AuthSettings authSettings, UserStorage userStorage, String user) { + super(authSettings, userStorage, user); + } + +} diff --git a/src/main/java/xyz/theprogramsrc/superauth_v3/api/auth/SuperAuthBeforeLoginEvent.java b/src/main/java/xyz/theprogramsrc/superauth_v3/api/auth/SuperAuthBeforeLoginEvent.java new file mode 100644 index 0000000..d88c794 --- /dev/null +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/api/auth/SuperAuthBeforeLoginEvent.java @@ -0,0 +1,13 @@ +package xyz.theprogramsrc.superauth_v3.api.auth; + +import xyz.theprogramsrc.superauth_v3.api.SuperAuthAPIEvent; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; + +public class SuperAuthBeforeLoginEvent extends SuperAuthAPIEvent { + + public SuperAuthBeforeLoginEvent(AuthSettings authSettings, UserStorage userStorage, String user) { + super(authSettings, userStorage, user); + } + +} diff --git a/src/main/java/xyz/theprogramsrc/superauth_v3/api/auth/SuperAuthBeforeRegisterEvent.java b/src/main/java/xyz/theprogramsrc/superauth_v3/api/auth/SuperAuthBeforeRegisterEvent.java new file mode 100644 index 0000000..abc624a --- /dev/null +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/api/auth/SuperAuthBeforeRegisterEvent.java @@ -0,0 +1,13 @@ +package xyz.theprogramsrc.superauth_v3.api.auth; + +import xyz.theprogramsrc.superauth_v3.api.SuperAuthAPIEvent; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; + +public class SuperAuthBeforeRegisterEvent extends SuperAuthAPIEvent { + + public SuperAuthBeforeRegisterEvent(AuthSettings authSettings, UserStorage userStorage, String user) { + super(authSettings, userStorage, user); + } + +} diff --git a/src/main/java/xyz/theprogramsrc/superauth_v3/api/others/UserPasswordChangeEvent.java b/src/main/java/xyz/theprogramsrc/superauth_v3/api/others/UserPasswordChangeEvent.java new file mode 100644 index 0000000..da290e6 --- /dev/null +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/api/others/UserPasswordChangeEvent.java @@ -0,0 +1,11 @@ +package xyz.theprogramsrc.superauth_v3.api.others; + +import xyz.theprogramsrc.superauth_v3.api.SuperAuthAPIEvent; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; + +public class UserPasswordChangeEvent extends SuperAuthAPIEvent { + public UserPasswordChangeEvent(AuthSettings authSettings, UserStorage userStorage, String user) { + super(authSettings, userStorage, user); + } +} diff --git a/src/main/java/xyz/theprogramsrc/superauth/bungee/SuperAuth.java b/src/main/java/xyz/theprogramsrc/superauth_v3/bungee/SuperAuth.java similarity index 90% rename from src/main/java/xyz/theprogramsrc/superauth/bungee/SuperAuth.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/bungee/SuperAuth.java index aa3566c..2a84024 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/bungee/SuperAuth.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/bungee/SuperAuth.java @@ -1,16 +1,16 @@ -package xyz.theprogramsrc.superauth.bungee; +package xyz.theprogramsrc.superauth_v3.bungee; import java.util.List; -import xyz.theprogramsrc.superauth.bungee.commands.CrackedCommand; -import xyz.theprogramsrc.superauth.bungee.commands.MainCommand; -import xyz.theprogramsrc.superauth.bungee.commands.PremiumCommand; -import xyz.theprogramsrc.superauth.bungee.listeners.PlayerListeners; -import xyz.theprogramsrc.superauth.bungee.listeners.blockers.ServerChangeBlocker; -import xyz.theprogramsrc.superauth.global.SessionStorage; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.global.vpn_blocker.VPNBlocker; +import xyz.theprogramsrc.superauth_v3.bungee.commands.CrackedCommand; +import xyz.theprogramsrc.superauth_v3.bungee.commands.MainCommand; +import xyz.theprogramsrc.superauth_v3.bungee.commands.PremiumCommand; +import xyz.theprogramsrc.superauth_v3.bungee.listeners.PlayerListeners; +import xyz.theprogramsrc.superauth_v3.bungee.listeners.blockers.ServerChangeBlocker; +import xyz.theprogramsrc.superauth_v3.global.SessionStorage; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.global.vpn_blocker.VPNBlocker; import xyz.theprogramsrc.supercoreapi.bungee.BungeePlugin; import xyz.theprogramsrc.supercoreapi.global.files.yml.YMLConfig; import xyz.theprogramsrc.supercoreapi.global.storage.DataBaseSettings; @@ -59,7 +59,7 @@ public void onPluginEnable() { new PlayerListeners(); this.log("Player Listener Loaded"); new MainCommand(); - this.log("Command '/superauth' registered (Only for console)"); + this.log("Command '/superauth_v3' registered (Only for console)"); if(this.blockedActions.contains("SERVER_CHANGE")){ new ServerChangeBlocker(); } @@ -124,8 +124,8 @@ public void loadSettings(){ if(!cfg.contains("MySQL.Host") || !cfg.contains("MySQL.Port") || !cfg.contains("MySQL.DataBase") || !cfg.contains("MySQL.UserName") || !cfg.contains("MySQL.Password") || !cfg.contains("MySQL.UseSSL")){ if(!cfg.contains("MySQL.Host")) cfg.add("MySQL.Host", "sql.example.com"); if(!cfg.contains("MySQL.Port")) cfg.add("MySQL.Port", "3306"); - if(!cfg.contains("MySQL.DataBase")) cfg.add("MySQL.DataBase", "superauth"); - if(!cfg.contains("MySQL.UserName")) cfg.add("MySQL.UserName", "superauth"); + if(!cfg.contains("MySQL.DataBase")) cfg.add("MySQL.DataBase", "superauth_v3"); + if(!cfg.contains("MySQL.UserName")) cfg.add("MySQL.UserName", "superauth_v3"); if(!cfg.contains("MySQL.Password")) cfg.add("MySQL.Password", Utils.randomPassword(16)); if(!cfg.contains("MySQL.UseSSL")) cfg.add("MySQL.UseSSL", false); if(!cfg.contains("MySQL.ConnectionUrl")) cfg.add("MySQL.ConnectionUrl", "jdbc:mysql://{Host}:{Port}/{Database}?useSSL={UseSSL}"); diff --git a/src/main/java/xyz/theprogramsrc/superauth/bungee/commands/CrackedCommand.java b/src/main/java/xyz/theprogramsrc/superauth_v3/bungee/commands/CrackedCommand.java similarity index 91% rename from src/main/java/xyz/theprogramsrc/superauth/bungee/commands/CrackedCommand.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/bungee/commands/CrackedCommand.java index ed72533..a990376 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/bungee/commands/CrackedCommand.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/bungee/commands/CrackedCommand.java @@ -1,13 +1,13 @@ -package xyz.theprogramsrc.superauth.bungee.commands; +package xyz.theprogramsrc.superauth_v3.bungee.commands; import java.util.ArrayList; import java.util.UUID; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.connection.ProxiedPlayer; -import xyz.theprogramsrc.superauth.bungee.SuperAuth; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.bungee.SuperAuth; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; import xyz.theprogramsrc.supercoreapi.bungee.commands.BungeeCommand; import xyz.theprogramsrc.supercoreapi.bungee.commands.CommandResult; import xyz.theprogramsrc.supercoreapi.bungee.utils.BungeeConsole; diff --git a/src/main/java/xyz/theprogramsrc/superauth/bungee/commands/MainCommand.java b/src/main/java/xyz/theprogramsrc/superauth_v3/bungee/commands/MainCommand.java similarity index 85% rename from src/main/java/xyz/theprogramsrc/superauth/bungee/commands/MainCommand.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/bungee/commands/MainCommand.java index 36b0025..7cf747b 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/bungee/commands/MainCommand.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/bungee/commands/MainCommand.java @@ -1,8 +1,8 @@ -package xyz.theprogramsrc.superauth.bungee.commands; +package xyz.theprogramsrc.superauth_v3.bungee.commands; import net.md_5.bungee.api.connection.ProxiedPlayer; -import xyz.theprogramsrc.superauth.bungee.SuperAuth; -import xyz.theprogramsrc.superauth.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.bungee.SuperAuth; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; import xyz.theprogramsrc.supercoreapi.bungee.commands.BungeeCommand; import xyz.theprogramsrc.supercoreapi.bungee.commands.CommandResult; import xyz.theprogramsrc.supercoreapi.bungee.utils.BungeeConsole; @@ -11,7 +11,7 @@ public class MainCommand extends BungeeCommand { @Override public String getCommand() { - return "superauth"; + return "superauth_v3"; } @Override diff --git a/src/main/java/xyz/theprogramsrc/superauth/bungee/commands/PremiumCommand.java b/src/main/java/xyz/theprogramsrc/superauth_v3/bungee/commands/PremiumCommand.java similarity index 91% rename from src/main/java/xyz/theprogramsrc/superauth/bungee/commands/PremiumCommand.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/bungee/commands/PremiumCommand.java index b3c9478..112876f 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/bungee/commands/PremiumCommand.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/bungee/commands/PremiumCommand.java @@ -1,13 +1,13 @@ -package xyz.theprogramsrc.superauth.bungee.commands; +package xyz.theprogramsrc.superauth_v3.bungee.commands; import java.util.ArrayList; import java.util.UUID; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.connection.ProxiedPlayer; -import xyz.theprogramsrc.superauth.bungee.SuperAuth; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.bungee.SuperAuth; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; import xyz.theprogramsrc.supercoreapi.bungee.commands.BungeeCommand; import xyz.theprogramsrc.supercoreapi.bungee.commands.CommandResult; import xyz.theprogramsrc.supercoreapi.bungee.utils.BungeeConsole; diff --git a/src/main/java/xyz/theprogramsrc/superauth/bungee/listeners/PlayerListeners.java b/src/main/java/xyz/theprogramsrc/superauth_v3/bungee/listeners/PlayerListeners.java similarity index 93% rename from src/main/java/xyz/theprogramsrc/superauth/bungee/listeners/PlayerListeners.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/bungee/listeners/PlayerListeners.java index b314384..f068721 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/bungee/listeners/PlayerListeners.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/bungee/listeners/PlayerListeners.java @@ -1,4 +1,4 @@ -package xyz.theprogramsrc.superauth.bungee.listeners; +package xyz.theprogramsrc.superauth_v3.bungee.listeners; import net.md_5.bungee.api.chat.TextComponent; import net.md_5.bungee.api.config.ServerInfo; @@ -9,11 +9,11 @@ import net.md_5.bungee.api.event.PreLoginEvent; import net.md_5.bungee.api.event.ServerConnectEvent; import net.md_5.bungee.event.EventHandler; -import xyz.theprogramsrc.superauth.bungee.SuperAuth; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.global.vpn_blocker.VPNBlocker; +import xyz.theprogramsrc.superauth_v3.bungee.SuperAuth; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.global.vpn_blocker.VPNBlocker; import xyz.theprogramsrc.supercoreapi.bungee.BungeeModule; import xyz.theprogramsrc.supercoreapi.global.utils.ServerUtils; diff --git a/src/main/java/xyz/theprogramsrc/superauth/bungee/listeners/blockers/ServerChangeBlocker.java b/src/main/java/xyz/theprogramsrc/superauth_v3/bungee/listeners/blockers/ServerChangeBlocker.java similarity index 84% rename from src/main/java/xyz/theprogramsrc/superauth/bungee/listeners/blockers/ServerChangeBlocker.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/bungee/listeners/blockers/ServerChangeBlocker.java index 5446ba4..cce03ab 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/bungee/listeners/blockers/ServerChangeBlocker.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/bungee/listeners/blockers/ServerChangeBlocker.java @@ -1,11 +1,11 @@ -package xyz.theprogramsrc.superauth.bungee.listeners.blockers; +package xyz.theprogramsrc.superauth_v3.bungee.listeners.blockers; import net.md_5.bungee.api.connection.ProxiedPlayer; import net.md_5.bungee.api.event.ServerConnectedEvent; import net.md_5.bungee.event.EventHandler; -import xyz.theprogramsrc.superauth.bungee.SuperAuth; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.bungee.SuperAuth; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; import xyz.theprogramsrc.supercoreapi.bungee.BungeeModule; import xyz.theprogramsrc.supercoreapi.global.utils.ServerUtils; diff --git a/src/main/java/xyz/theprogramsrc/superauth/global/CommandFilter.java b/src/main/java/xyz/theprogramsrc/superauth_v3/global/CommandFilter.java similarity index 88% rename from src/main/java/xyz/theprogramsrc/superauth/global/CommandFilter.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/global/CommandFilter.java index 5fcf62f..e50dc04 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/global/CommandFilter.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/global/CommandFilter.java @@ -1,5 +1,5 @@ -package xyz.theprogramsrc.superauth.global; - +package xyz.theprogramsrc.superauth_v3.global; +/* import xyz.theprogramsrc.supercoreapi.global.LogsFilter; public class CommandFilter extends LogsFilter { @@ -17,3 +17,4 @@ public String[] getExtraRequirements() { }; } } +*/ \ No newline at end of file diff --git a/src/main/java/xyz/theprogramsrc/superauth/global/SessionStorage.java b/src/main/java/xyz/theprogramsrc/superauth_v3/global/SessionStorage.java similarity index 87% rename from src/main/java/xyz/theprogramsrc/superauth/global/SessionStorage.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/global/SessionStorage.java index 69f34a1..fcaf8b6 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/global/SessionStorage.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/global/SessionStorage.java @@ -1,4 +1,4 @@ -package xyz.theprogramsrc.superauth.global; +package xyz.theprogramsrc.superauth_v3.global; import xyz.theprogramsrc.supercoreapi.SuperPlugin; import xyz.theprogramsrc.supercoreapi.global.storage.memory.MemoryStorage; diff --git a/src/main/java/xyz/theprogramsrc/superauth/global/hashing/Hashing.java b/src/main/java/xyz/theprogramsrc/superauth_v3/global/hashing/Hashing.java similarity index 96% rename from src/main/java/xyz/theprogramsrc/superauth/global/hashing/Hashing.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/global/hashing/Hashing.java index f0cf99b..0bef800 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/global/hashing/Hashing.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/global/hashing/Hashing.java @@ -1,4 +1,4 @@ -package xyz.theprogramsrc.superauth.global.hashing; +package xyz.theprogramsrc.superauth_v3.global.hashing; import java.security.NoSuchAlgorithmException; import java.security.SecureRandom; diff --git a/src/main/java/xyz/theprogramsrc/superauth/global/hashing/HashingMethod.java b/src/main/java/xyz/theprogramsrc/superauth_v3/global/hashing/HashingMethod.java similarity index 95% rename from src/main/java/xyz/theprogramsrc/superauth/global/hashing/HashingMethod.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/global/hashing/HashingMethod.java index c867036..cdfdc12 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/global/hashing/HashingMethod.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/global/hashing/HashingMethod.java @@ -1,4 +1,4 @@ -package xyz.theprogramsrc.superauth.global.hashing; +package xyz.theprogramsrc.superauth_v3.global.hashing; import java.math.BigInteger; import java.security.MessageDigest; diff --git a/src/main/java/xyz/theprogramsrc/superauth/global/languages/LBase.java b/src/main/java/xyz/theprogramsrc/superauth_v3/global/languages/LBase.java similarity index 99% rename from src/main/java/xyz/theprogramsrc/superauth/global/languages/LBase.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/global/languages/LBase.java index 4b4166f..cdeaafb 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/global/languages/LBase.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/global/languages/LBase.java @@ -1,4 +1,4 @@ -package xyz.theprogramsrc.superauth.global.languages; +package xyz.theprogramsrc.superauth_v3.global.languages; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/xyz/theprogramsrc/superauth/global/users/User.java b/src/main/java/xyz/theprogramsrc/superauth_v3/global/users/User.java similarity index 95% rename from src/main/java/xyz/theprogramsrc/superauth/global/users/User.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/global/users/User.java index 48b5960..0ccfd5e 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/global/users/User.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/global/users/User.java @@ -1,8 +1,8 @@ -package xyz.theprogramsrc.superauth.global.users; +package xyz.theprogramsrc.superauth_v3.global.users; import java.security.NoSuchAlgorithmException; -import xyz.theprogramsrc.superauth.global.hashing.Hashing; +import xyz.theprogramsrc.superauth_v3.global.hashing.Hashing; public class User { diff --git a/src/main/java/xyz/theprogramsrc/superauth/global/users/UserStorage.java b/src/main/java/xyz/theprogramsrc/superauth_v3/global/users/UserStorage.java similarity index 99% rename from src/main/java/xyz/theprogramsrc/superauth/global/users/UserStorage.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/global/users/UserStorage.java index c3e0d72..7ba297b 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/global/users/UserStorage.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/global/users/UserStorage.java @@ -1,6 +1,6 @@ -package xyz.theprogramsrc.superauth.global.users; +package xyz.theprogramsrc.superauth_v3.global.users; -import xyz.theprogramsrc.superauth.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; import xyz.theprogramsrc.supercoreapi.SuperPlugin; import xyz.theprogramsrc.supercoreapi.global.storage.DataBase; import xyz.theprogramsrc.supercoreapi.global.storage.DataBaseStorage; diff --git a/src/main/java/xyz/theprogramsrc/superauth/global/vpn_blocker/VPNBlocker.java b/src/main/java/xyz/theprogramsrc/superauth_v3/global/vpn_blocker/VPNBlocker.java similarity index 97% rename from src/main/java/xyz/theprogramsrc/superauth/global/vpn_blocker/VPNBlocker.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/global/vpn_blocker/VPNBlocker.java index f1575c3..3c40923 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/global/vpn_blocker/VPNBlocker.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/global/vpn_blocker/VPNBlocker.java @@ -1,4 +1,4 @@ -package xyz.theprogramsrc.superauth.global.vpn_blocker; +package xyz.theprogramsrc.superauth_v3.global.vpn_blocker; import xyz.theprogramsrc.supercoreapi.SuperPlugin; import xyz.theprogramsrc.supercoreapi.global.networking.ConnectionBuilder; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/SuperAuth.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/SuperAuth.java similarity index 89% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/SuperAuth.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/SuperAuth.java index 1ddb992..f2259af 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/SuperAuth.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/SuperAuth.java @@ -1,4 +1,4 @@ -package xyz.theprogramsrc.superauth.spigot; +package xyz.theprogramsrc.superauth_v3.spigot; import java.util.ArrayList; import java.util.LinkedHashMap; @@ -9,28 +9,28 @@ import org.bukkit.Bukkit; import org.bukkit.plugin.java.JavaPlugin; -import xyz.theprogramsrc.superauth.api.SuperAuthAPIEvent; -import xyz.theprogramsrc.superauth.api.SuperAuthAPIHandler; -import xyz.theprogramsrc.superauth.global.CommandFilter; -import xyz.theprogramsrc.superauth.global.SessionStorage; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.global.vpn_blocker.VPNBlocker; -import xyz.theprogramsrc.superauth.spigot.commands.AuthCommand; -import xyz.theprogramsrc.superauth.spigot.commands.LoginCommand; -import xyz.theprogramsrc.superauth.spigot.commands.RegisterCommand; -import xyz.theprogramsrc.superauth.spigot.commands.SuperAuthCommand; -import xyz.theprogramsrc.superauth.spigot.listeners.BlockActionsListener; -import xyz.theprogramsrc.superauth.spigot.listeners.IPSyncListener; -import xyz.theprogramsrc.superauth.spigot.listeners.MainListener; -import xyz.theprogramsrc.superauth.spigot.listeners.PreLoginListener; -import xyz.theprogramsrc.superauth.spigot.listeners.SkinSyncListener; -import xyz.theprogramsrc.superauth.spigot.memory.CaptchaMemory; -import xyz.theprogramsrc.superauth.spigot.memory.ForceLoginMemory; -import xyz.theprogramsrc.superauth.spigot.memory.WasRegisteredMemory; -import xyz.theprogramsrc.superauth.spigot.objects.AuthAction; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; -import xyz.theprogramsrc.superauth.spigot.storage.DatabaseMigration; +import xyz.theprogramsrc.superauth_v3.api.SuperAuthAPIEvent; +import xyz.theprogramsrc.superauth_v3.api.SuperAuthAPIHandler; +//import xyz.theprogramsrc.superauth_v3.global.CommandFilter; +import xyz.theprogramsrc.superauth_v3.global.SessionStorage; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.global.vpn_blocker.VPNBlocker; +import xyz.theprogramsrc.superauth_v3.spigot.commands.AuthCommand; +import xyz.theprogramsrc.superauth_v3.spigot.commands.LoginCommand; +import xyz.theprogramsrc.superauth_v3.spigot.commands.RegisterCommand; +import xyz.theprogramsrc.superauth_v3.spigot.commands.SuperAuthCommand; +import xyz.theprogramsrc.superauth_v3.spigot.listeners.BlockActionsListener; +import xyz.theprogramsrc.superauth_v3.spigot.listeners.IPSyncListener; +import xyz.theprogramsrc.superauth_v3.spigot.listeners.MainListener; +import xyz.theprogramsrc.superauth_v3.spigot.listeners.PreLoginListener; +import xyz.theprogramsrc.superauth_v3.spigot.listeners.SkinSyncListener; +import xyz.theprogramsrc.superauth_v3.spigot.memory.CaptchaMemory; +import xyz.theprogramsrc.superauth_v3.spigot.memory.ForceLoginMemory; +import xyz.theprogramsrc.superauth_v3.spigot.memory.WasRegisteredMemory; +import xyz.theprogramsrc.superauth_v3.spigot.objects.AuthAction; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; +import xyz.theprogramsrc.superauth_v3.spigot.storage.DatabaseMigration; import xyz.theprogramsrc.supercoreapi.global.Metrics; import xyz.theprogramsrc.supercoreapi.global.files.yml.YMLConfig; import xyz.theprogramsrc.supercoreapi.global.storage.DataBase; @@ -97,7 +97,7 @@ public void onPluginEnable() { filteredCommands.addAll(this.authSettings.getLoginAliases()); filteredCommands.addAll(this.authSettings.getRegisterAliases()); filteredCommands.addAll(this.authSettings.getAuthAliases()); - new CommandFilter(Utils.toStringArray(filteredCommands)).register(); + //new CommandFilter(Utils.toStringArray(filteredCommands)).register(); this.log("Loaded Command Filter"); new PreLoginListener(); this.log("Loaded Pre-Login Listener"); @@ -186,8 +186,8 @@ private void setupSettings(){ if(!cfg.contains("MySQL.Enabled")) cfg.add("MySQL.Enabled", false); if(!cfg.contains("MySQL.Host")) cfg.add("MySQL.Host", "sql.example.com"); if(!cfg.contains("MySQL.Port")) cfg.add("MySQL.Port", "3306"); - if(!cfg.contains("MySQL.DataBase")) cfg.add("MySQL.DataBase", "superauth"); - if(!cfg.contains("MySQL.UserName")) cfg.add("MySQL.UserName", "superauth"); + if(!cfg.contains("MySQL.DataBase")) cfg.add("MySQL.DataBase", "superauth_v3"); + if(!cfg.contains("MySQL.UserName")) cfg.add("MySQL.UserName", "superauth_v3"); if(!cfg.contains("MySQL.Password")) cfg.add("MySQL.Password", Utils.randomPassword(16)); if(!cfg.contains("MySQL.UseSSL")) cfg.add("MySQL.UseSSL", false); if(!cfg.contains("MySQL.ConnectionUrl")) cfg.add("MySQL.ConnectionUrl", "jdbc:mysql://{Host}:{Port}/{Database}?useSSL={UseSSL}"); @@ -272,7 +272,7 @@ public DataBaseSettings getDataBaseSettings() { private void updateChecker(){ if(!this.getSettingsStorage().getConfig().contains("UpdateChecker")) this.getSettingsStorage().getConfig().add("UpdateChecker", true); if(this.getSettingsStorage().getConfig().getBoolean("UpdateChecker")){ - new SongodaUpdateChecker("superauth-secure-your-users-and-server") { + new SongodaUpdateChecker("superauth_v3-secure-your-users-and-server") { @Override public void onFailCheck() { SuperAuth.this.log("&cError while checking for updates"); diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/commands/AuthCommand.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/commands/AuthCommand.java similarity index 83% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/commands/AuthCommand.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/commands/AuthCommand.java index b42a793..a6a6e98 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/commands/AuthCommand.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/commands/AuthCommand.java @@ -1,14 +1,14 @@ -package xyz.theprogramsrc.superauth.spigot.commands; +package xyz.theprogramsrc.superauth_v3.spigot.commands; import org.bukkit.entity.Player; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; -import xyz.theprogramsrc.superauth.spigot.guis.auth.IdentifyAuthGUI; -import xyz.theprogramsrc.superauth.spigot.objects.AuthMethod; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.guis.auth.IdentifyAuthGUI; +import xyz.theprogramsrc.superauth_v3.spigot.objects.AuthMethod; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; import xyz.theprogramsrc.supercoreapi.global.utils.Utils; import xyz.theprogramsrc.supercoreapi.spigot.commands.CommandResult; import xyz.theprogramsrc.supercoreapi.spigot.commands.SpigotCommand; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/commands/LoginCommand.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/commands/LoginCommand.java similarity index 88% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/commands/LoginCommand.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/commands/LoginCommand.java index 345f132..d7d911c 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/commands/LoginCommand.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/commands/LoginCommand.java @@ -1,20 +1,20 @@ -package xyz.theprogramsrc.superauth.spigot.commands; +package xyz.theprogramsrc.superauth_v3.spigot.commands; import java.security.NoSuchAlgorithmException; import org.bukkit.entity.Player; -import xyz.theprogramsrc.superauth.api.auth.SuperAuthAfterCaptchaEvent; -import xyz.theprogramsrc.superauth.api.auth.SuperAuthBeforeCaptchaEvent; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; -import xyz.theprogramsrc.superauth.spigot.managers.ActionManager; -import xyz.theprogramsrc.superauth.spigot.memory.CaptchaMemory; -import xyz.theprogramsrc.superauth.spigot.memory.WasRegisteredMemory; -import xyz.theprogramsrc.superauth.spigot.objects.AuthMethod; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; +import xyz.theprogramsrc.superauth_v3.api.auth.SuperAuthAfterCaptchaEvent; +import xyz.theprogramsrc.superauth_v3.api.auth.SuperAuthBeforeCaptchaEvent; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.managers.ActionManager; +import xyz.theprogramsrc.superauth_v3.spigot.memory.CaptchaMemory; +import xyz.theprogramsrc.superauth_v3.spigot.memory.WasRegisteredMemory; +import xyz.theprogramsrc.superauth_v3.spigot.objects.AuthMethod; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; import xyz.theprogramsrc.supercoreapi.global.utils.Utils; import xyz.theprogramsrc.supercoreapi.spigot.commands.CommandResult; import xyz.theprogramsrc.supercoreapi.spigot.commands.SpigotCommand; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/commands/RegisterCommand.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/commands/RegisterCommand.java similarity index 88% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/commands/RegisterCommand.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/commands/RegisterCommand.java index 2b2df84..daa2d63 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/commands/RegisterCommand.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/commands/RegisterCommand.java @@ -1,18 +1,18 @@ -package xyz.theprogramsrc.superauth.spigot.commands; +package xyz.theprogramsrc.superauth_v3.spigot.commands; import org.bukkit.entity.Player; -import xyz.theprogramsrc.superauth.api.auth.SuperAuthAfterCaptchaEvent; -import xyz.theprogramsrc.superauth.api.auth.SuperAuthBeforeCaptchaEvent; -import xyz.theprogramsrc.superauth.global.hashing.Hashing; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; -import xyz.theprogramsrc.superauth.spigot.managers.ActionManager; -import xyz.theprogramsrc.superauth.spigot.memory.CaptchaMemory; -import xyz.theprogramsrc.superauth.spigot.memory.WasRegisteredMemory; -import xyz.theprogramsrc.superauth.spigot.objects.AuthMethod; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; +import xyz.theprogramsrc.superauth_v3.api.auth.SuperAuthAfterCaptchaEvent; +import xyz.theprogramsrc.superauth_v3.api.auth.SuperAuthBeforeCaptchaEvent; +import xyz.theprogramsrc.superauth_v3.global.hashing.Hashing; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.managers.ActionManager; +import xyz.theprogramsrc.superauth_v3.spigot.memory.CaptchaMemory; +import xyz.theprogramsrc.superauth_v3.spigot.memory.WasRegisteredMemory; +import xyz.theprogramsrc.superauth_v3.spigot.objects.AuthMethod; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; import xyz.theprogramsrc.supercoreapi.global.utils.Utils; import xyz.theprogramsrc.supercoreapi.spigot.commands.CommandResult; import xyz.theprogramsrc.supercoreapi.spigot.commands.SpigotCommand; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/commands/SuperAuthCommand.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/commands/SuperAuthCommand.java similarity index 95% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/commands/SuperAuthCommand.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/commands/SuperAuthCommand.java index bfc83b1..df7b6a0 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/commands/SuperAuthCommand.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/commands/SuperAuthCommand.java @@ -1,15 +1,15 @@ -package xyz.theprogramsrc.superauth.spigot.commands; +package xyz.theprogramsrc.superauth_v3.spigot.commands; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; -import xyz.theprogramsrc.superauth.spigot.guis.account.MyAccountGUI; -import xyz.theprogramsrc.superauth.spigot.guis.admin.AdminGUI; -import xyz.theprogramsrc.superauth.spigot.managers.ActionManager; -import xyz.theprogramsrc.superauth.spigot.memory.ForceLoginMemory; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.guis.account.MyAccountGUI; +import xyz.theprogramsrc.superauth_v3.spigot.guis.admin.AdminGUI; +import xyz.theprogramsrc.superauth_v3.spigot.managers.ActionManager; +import xyz.theprogramsrc.superauth_v3.spigot.memory.ForceLoginMemory; import xyz.theprogramsrc.supercoreapi.global.translations.Base; import xyz.theprogramsrc.supercoreapi.spigot.commands.CommandResult; import xyz.theprogramsrc.supercoreapi.spigot.commands.precreated.SuperCoreAPICommand; @@ -30,7 +30,7 @@ public String getCommand() { @Override public String[] getAliases() { - return new String[]{"superauth"}; + return new String[]{"superauth_v3"}; } @Override @@ -40,7 +40,7 @@ public CommandResult onPlayerExecute(Player player, String[] args) { if(user.isAdmin()){ new AdminGUI(player); }else{ - if(!player.hasPermission("superauth.my-account")){ + if(!player.hasPermission("superauth_v3.my-account")){ this.getSuperUtils().sendMessage(player, "&c" + Base.NO_PERMISSION); }else{ new MyAccountGUI(player); diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/account/ChangePasswordGUI.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/account/ChangePasswordGUI.java similarity index 94% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/guis/account/ChangePasswordGUI.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/account/ChangePasswordGUI.java index ff92341..dd3aa18 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/account/ChangePasswordGUI.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/account/ChangePasswordGUI.java @@ -1,13 +1,13 @@ -package xyz.theprogramsrc.superauth.spigot.guis.account; +package xyz.theprogramsrc.superauth_v3.spigot.guis.account; import java.security.NoSuchAlgorithmException; import org.bukkit.entity.Player; -import xyz.theprogramsrc.superauth.global.hashing.Hashing; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.global.hashing.Hashing; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; import xyz.theprogramsrc.supercoreapi.global.translations.Base; import xyz.theprogramsrc.supercoreapi.libs.xseries.XMaterial; import xyz.theprogramsrc.supercoreapi.spigot.gui.Gui; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/account/MyAccountGUI.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/account/MyAccountGUI.java similarity index 93% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/guis/account/MyAccountGUI.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/account/MyAccountGUI.java index 567b54a..c92883c 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/account/MyAccountGUI.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/account/MyAccountGUI.java @@ -1,16 +1,16 @@ -package xyz.theprogramsrc.superauth.spigot.guis.account; +package xyz.theprogramsrc.superauth_v3.spigot.guis.account; import java.security.NoSuchAlgorithmException; import java.util.concurrent.atomic.AtomicBoolean; import org.bukkit.entity.Player; -import xyz.theprogramsrc.superauth.global.hashing.Hashing; -import xyz.theprogramsrc.superauth.global.hashing.HashingMethod; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; +import xyz.theprogramsrc.superauth_v3.global.hashing.Hashing; +import xyz.theprogramsrc.superauth_v3.global.hashing.HashingMethod; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; import xyz.theprogramsrc.supercoreapi.libs.xseries.XMaterial; import xyz.theprogramsrc.supercoreapi.spigot.dialog.Dialog; import xyz.theprogramsrc.supercoreapi.spigot.gui.Gui; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/admin/AdminGUI.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/admin/AdminGUI.java similarity index 94% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/guis/admin/AdminGUI.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/admin/AdminGUI.java index 5376fbb..ea5ed1e 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/admin/AdminGUI.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/admin/AdminGUI.java @@ -1,10 +1,10 @@ -package xyz.theprogramsrc.superauth.spigot.guis.admin; +package xyz.theprogramsrc.superauth_v3.spigot.guis.admin; import org.bukkit.entity.Player; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; import xyz.theprogramsrc.supercoreapi.global.translations.Base; import xyz.theprogramsrc.supercoreapi.libs.xseries.XMaterial; import xyz.theprogramsrc.supercoreapi.spigot.gui.Gui; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/admin/ChangePasswordGUI.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/admin/ChangePasswordGUI.java similarity index 95% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/guis/admin/ChangePasswordGUI.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/admin/ChangePasswordGUI.java index efa15ed..7b04cdf 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/admin/ChangePasswordGUI.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/admin/ChangePasswordGUI.java @@ -1,13 +1,13 @@ -package xyz.theprogramsrc.superauth.spigot.guis.admin; +package xyz.theprogramsrc.superauth_v3.spigot.guis.admin; import java.security.NoSuchAlgorithmException; import org.bukkit.entity.Player; -import xyz.theprogramsrc.superauth.global.hashing.Hashing; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.global.hashing.Hashing; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; import xyz.theprogramsrc.supercoreapi.global.translations.Base; import xyz.theprogramsrc.supercoreapi.libs.xseries.XMaterial; import xyz.theprogramsrc.supercoreapi.spigot.gui.Gui; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/admin/ManageUser.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/admin/ManageUser.java similarity index 91% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/guis/admin/ManageUser.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/admin/ManageUser.java index 5b146f0..e668924 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/admin/ManageUser.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/admin/ManageUser.java @@ -1,16 +1,16 @@ -package xyz.theprogramsrc.superauth.spigot.guis.admin; +package xyz.theprogramsrc.superauth_v3.spigot.guis.admin; import java.security.NoSuchAlgorithmException; import org.bukkit.entity.Player; -import xyz.theprogramsrc.superauth.global.hashing.Hashing; -import xyz.theprogramsrc.superauth.global.hashing.HashingMethod; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; +import xyz.theprogramsrc.superauth_v3.global.hashing.Hashing; +import xyz.theprogramsrc.superauth_v3.global.hashing.HashingMethod; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; import xyz.theprogramsrc.supercoreapi.libs.xseries.XMaterial; import xyz.theprogramsrc.supercoreapi.spigot.dialog.Dialog; import xyz.theprogramsrc.supercoreapi.spigot.gui.Gui; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/admin/UserBrowser.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/admin/UserBrowser.java similarity index 92% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/guis/admin/UserBrowser.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/admin/UserBrowser.java index 73c66c3..490075f 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/admin/UserBrowser.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/admin/UserBrowser.java @@ -1,13 +1,13 @@ -package xyz.theprogramsrc.superauth.spigot.guis.admin; +package xyz.theprogramsrc.superauth_v3.spigot.guis.admin; import java.util.Arrays; import org.bukkit.entity.Player; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; import xyz.theprogramsrc.supercoreapi.global.translations.Base; import xyz.theprogramsrc.supercoreapi.global.utils.Utils; import xyz.theprogramsrc.supercoreapi.libs.xseries.XMaterial; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/auth/CaptchaGUI.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/auth/CaptchaGUI.java similarity index 90% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/guis/auth/CaptchaGUI.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/auth/CaptchaGUI.java index 1ddabfa..f06cbd0 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/auth/CaptchaGUI.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/auth/CaptchaGUI.java @@ -1,4 +1,4 @@ -package xyz.theprogramsrc.superauth.spigot.guis.auth; +package xyz.theprogramsrc.superauth_v3.spigot.guis.auth; import java.util.Arrays; import java.util.HashMap; @@ -6,13 +6,13 @@ import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; -import xyz.theprogramsrc.superauth.api.auth.SuperAuthAfterCaptchaEvent; -import xyz.theprogramsrc.superauth.api.auth.SuperAuthBeforeCaptchaEvent; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; -import xyz.theprogramsrc.superauth.spigot.managers.ActionManager; -import xyz.theprogramsrc.superauth.spigot.memory.ForceLoginMemory; +import xyz.theprogramsrc.superauth_v3.api.auth.SuperAuthAfterCaptchaEvent; +import xyz.theprogramsrc.superauth_v3.api.auth.SuperAuthBeforeCaptchaEvent; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.managers.ActionManager; +import xyz.theprogramsrc.superauth_v3.spigot.memory.ForceLoginMemory; import xyz.theprogramsrc.supercoreapi.global.utils.Utils; import xyz.theprogramsrc.supercoreapi.libs.xseries.XMaterial; import xyz.theprogramsrc.supercoreapi.spigot.gui.Gui; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/auth/IdentifyAuthGUI.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/auth/IdentifyAuthGUI.java similarity index 69% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/guis/auth/IdentifyAuthGUI.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/auth/IdentifyAuthGUI.java index 396ff58..5c4e77c 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/auth/IdentifyAuthGUI.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/auth/IdentifyAuthGUI.java @@ -1,8 +1,8 @@ -package xyz.theprogramsrc.superauth.spigot.guis.auth; +package xyz.theprogramsrc.superauth_v3.spigot.guis.auth; import org.bukkit.entity.Player; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.spigot.managers.ActionManager; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.spigot.managers.ActionManager; public class IdentifyAuthGUI { diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/auth/LoginGUI.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/auth/LoginGUI.java similarity index 93% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/guis/auth/LoginGUI.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/auth/LoginGUI.java index 4be0f7b..2cfec5a 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/auth/LoginGUI.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/auth/LoginGUI.java @@ -1,17 +1,17 @@ -package xyz.theprogramsrc.superauth.spigot.guis.auth; +package xyz.theprogramsrc.superauth_v3.spigot.guis.auth; import java.security.NoSuchAlgorithmException; import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; -import xyz.theprogramsrc.superauth.spigot.managers.ActionManager; -import xyz.theprogramsrc.superauth.spigot.memory.ForceLoginMemory; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.managers.ActionManager; +import xyz.theprogramsrc.superauth_v3.spigot.memory.ForceLoginMemory; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; import xyz.theprogramsrc.supercoreapi.global.translations.Base; import xyz.theprogramsrc.supercoreapi.global.utils.Utils; import xyz.theprogramsrc.supercoreapi.libs.xseries.XMaterial; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/auth/RegisterGUI.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/auth/RegisterGUI.java similarity index 93% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/guis/auth/RegisterGUI.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/auth/RegisterGUI.java index 5a19dcb..30a539f 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/guis/auth/RegisterGUI.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/guis/auth/RegisterGUI.java @@ -1,16 +1,16 @@ -package xyz.theprogramsrc.superauth.spigot.guis.auth; +package xyz.theprogramsrc.superauth_v3.spigot.guis.auth; import java.security.NoSuchAlgorithmException; import org.bukkit.entity.Player; -import xyz.theprogramsrc.superauth.global.hashing.Hashing; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; -import xyz.theprogramsrc.superauth.spigot.managers.ActionManager; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; +import xyz.theprogramsrc.superauth_v3.global.hashing.Hashing; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.managers.ActionManager; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; import xyz.theprogramsrc.supercoreapi.global.translations.Base; import xyz.theprogramsrc.supercoreapi.global.utils.Utils; import xyz.theprogramsrc.supercoreapi.libs.xseries.XMaterial; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/handlers/AuthHandler.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/handlers/AuthHandler.java similarity index 85% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/handlers/AuthHandler.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/handlers/AuthHandler.java index f8ed92d..b1bf637 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/handlers/AuthHandler.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/handlers/AuthHandler.java @@ -1,16 +1,16 @@ -package xyz.theprogramsrc.superauth.spigot.handlers; +package xyz.theprogramsrc.superauth_v3.spigot.handlers; -import static xyz.theprogramsrc.superauth.spigot.objects.AuthMethod.COMMANDS; -import static xyz.theprogramsrc.superauth.spigot.objects.AuthMethod.GUI; +import static xyz.theprogramsrc.superauth_v3.spigot.objects.AuthMethod.COMMANDS; +import static xyz.theprogramsrc.superauth_v3.spigot.objects.AuthMethod.GUI; import org.bukkit.entity.Player; -import xyz.theprogramsrc.superauth.global.SessionStorage; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; -import xyz.theprogramsrc.superauth.spigot.managers.ActionManager; -import xyz.theprogramsrc.superauth.spigot.objects.AuthMethod; +import xyz.theprogramsrc.superauth_v3.global.SessionStorage; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.managers.ActionManager; +import xyz.theprogramsrc.superauth_v3.spigot.objects.AuthMethod; import xyz.theprogramsrc.supercoreapi.spigot.SpigotModule; public class AuthHandler extends SpigotModule { diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/handlers/CommandAuthHandler.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/handlers/CommandAuthHandler.java similarity index 83% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/handlers/CommandAuthHandler.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/handlers/CommandAuthHandler.java index 1e3d8ec..e43c800 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/handlers/CommandAuthHandler.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/handlers/CommandAuthHandler.java @@ -1,14 +1,14 @@ -package xyz.theprogramsrc.superauth.spigot.handlers; +package xyz.theprogramsrc.superauth_v3.spigot.handlers; import org.bukkit.entity.Player; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; -import xyz.theprogramsrc.superauth.spigot.managers.ActionManager; -import xyz.theprogramsrc.superauth.spigot.memory.CaptchaMemory; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.managers.ActionManager; +import xyz.theprogramsrc.superauth_v3.spigot.memory.CaptchaMemory; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; import xyz.theprogramsrc.supercoreapi.global.objects.RecurringTask; import xyz.theprogramsrc.supercoreapi.global.utils.Utils; import xyz.theprogramsrc.supercoreapi.spigot.SpigotModule; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/handlers/DialogAuthHandler.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/handlers/DialogAuthHandler.java similarity index 93% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/handlers/DialogAuthHandler.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/handlers/DialogAuthHandler.java index 97d06e3..ce76486 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/handlers/DialogAuthHandler.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/handlers/DialogAuthHandler.java @@ -1,4 +1,4 @@ -package xyz.theprogramsrc.superauth.spigot.handlers; +package xyz.theprogramsrc.superauth_v3.spigot.handlers; import java.security.NoSuchAlgorithmException; import java.util.concurrent.atomic.AtomicBoolean; @@ -6,16 +6,16 @@ import org.bukkit.entity.Player; import org.bukkit.scheduler.BukkitRunnable; -import xyz.theprogramsrc.superauth.api.auth.SuperAuthAfterCaptchaEvent; -import xyz.theprogramsrc.superauth.api.auth.SuperAuthBeforeCaptchaEvent; -import xyz.theprogramsrc.superauth.global.hashing.Hashing; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; -import xyz.theprogramsrc.superauth.spigot.managers.ActionManager; -import xyz.theprogramsrc.superauth.spigot.memory.ForceLoginMemory; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; +import xyz.theprogramsrc.superauth_v3.api.auth.SuperAuthAfterCaptchaEvent; +import xyz.theprogramsrc.superauth_v3.api.auth.SuperAuthBeforeCaptchaEvent; +import xyz.theprogramsrc.superauth_v3.global.hashing.Hashing; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.managers.ActionManager; +import xyz.theprogramsrc.superauth_v3.spigot.memory.ForceLoginMemory; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; import xyz.theprogramsrc.supercoreapi.global.utils.Utils; import xyz.theprogramsrc.supercoreapi.spigot.SpigotModule; import xyz.theprogramsrc.supercoreapi.spigot.dialog.Dialog; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/handlers/GUIAuthHandler.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/handlers/GUIAuthHandler.java similarity index 65% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/handlers/GUIAuthHandler.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/handlers/GUIAuthHandler.java index e13041c..39d3e16 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/handlers/GUIAuthHandler.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/handlers/GUIAuthHandler.java @@ -1,8 +1,8 @@ -package xyz.theprogramsrc.superauth.spigot.handlers; +package xyz.theprogramsrc.superauth_v3.spigot.handlers; import org.bukkit.entity.Player; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.spigot.guis.auth.IdentifyAuthGUI; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.spigot.guis.auth.IdentifyAuthGUI; import xyz.theprogramsrc.supercoreapi.spigot.SpigotModule; public class GUIAuthHandler extends SpigotModule { diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/listeners/BlockActionsListener.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/listeners/BlockActionsListener.java similarity index 97% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/listeners/BlockActionsListener.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/listeners/BlockActionsListener.java index 9bd85fb..0b44d15 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/listeners/BlockActionsListener.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/listeners/BlockActionsListener.java @@ -1,4 +1,4 @@ -package xyz.theprogramsrc.superauth.spigot.listeners; +package xyz.theprogramsrc.superauth_v3.spigot.listeners; import java.util.Arrays; import java.util.List; @@ -14,10 +14,10 @@ import org.bukkit.event.entity.EntityDamageEvent; import org.bukkit.event.player.*; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; -import xyz.theprogramsrc.superauth.spigot.objects.AuthMethod; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.objects.AuthMethod; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; import xyz.theprogramsrc.supercoreapi.spigot.SpigotModule; public class BlockActionsListener extends SpigotModule { diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/listeners/IPSyncListener.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/listeners/IPSyncListener.java similarity index 88% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/listeners/IPSyncListener.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/listeners/IPSyncListener.java index 84e92f5..b770da2 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/listeners/IPSyncListener.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/listeners/IPSyncListener.java @@ -1,13 +1,13 @@ -package xyz.theprogramsrc.superauth.spigot.listeners; +package xyz.theprogramsrc.superauth_v3.spigot.listeners; import java.util.LinkedList; import java.util.UUID; import org.bukkit.Bukkit; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; import xyz.theprogramsrc.supercoreapi.global.utils.Utils; import xyz.theprogramsrc.supercoreapi.spigot.SpigotModule; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/listeners/MainListener.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/listeners/MainListener.java similarity index 92% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/listeners/MainListener.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/listeners/MainListener.java index cb67c50..d207c04 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/listeners/MainListener.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/listeners/MainListener.java @@ -1,4 +1,4 @@ -package xyz.theprogramsrc.superauth.spigot.listeners; +package xyz.theprogramsrc.superauth_v3.spigot.listeners; import java.security.NoSuchAlgorithmException; import java.util.LinkedHashMap; @@ -13,14 +13,14 @@ import org.bukkit.event.player.PlayerJoinEvent; import org.bukkit.event.player.PlayerQuitEvent; -import xyz.theprogramsrc.superauth.global.SessionStorage; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; -import xyz.theprogramsrc.superauth.spigot.handlers.AuthHandler; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; -import xyz.theprogramsrc.superauth.spigot.storage.DatabaseMigration; +import xyz.theprogramsrc.superauth_v3.global.SessionStorage; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.handlers.AuthHandler; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; +import xyz.theprogramsrc.superauth_v3.spigot.storage.DatabaseMigration; import xyz.theprogramsrc.supercoreapi.global.utils.Utils; import xyz.theprogramsrc.supercoreapi.spigot.SpigotModule; import xyz.theprogramsrc.supercoreapi.spigot.utils.skintexture.SkinTexture; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/listeners/PreLoginListener.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/listeners/PreLoginListener.java similarity index 81% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/listeners/PreLoginListener.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/listeners/PreLoginListener.java index f6218ff..7196a62 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/listeners/PreLoginListener.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/listeners/PreLoginListener.java @@ -1,16 +1,16 @@ -package xyz.theprogramsrc.superauth.spigot.listeners; +package xyz.theprogramsrc.superauth_v3.spigot.listeners; import org.bukkit.event.EventHandler; import org.bukkit.event.EventPriority; import org.bukkit.event.player.AsyncPlayerPreLoginEvent; import org.bukkit.event.player.AsyncPlayerPreLoginEvent.Result; -import xyz.theprogramsrc.superauth.global.languages.LBase; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.global.vpn_blocker.VPNBlocker; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; -import xyz.theprogramsrc.superauth.spigot.storage.DatabaseMigration; +import xyz.theprogramsrc.superauth_v3.global.languages.LBase; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.global.vpn_blocker.VPNBlocker; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.storage.DatabaseMigration; import xyz.theprogramsrc.supercoreapi.spigot.SpigotModule; public class PreLoginListener extends SpigotModule { diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/listeners/SkinSyncListener.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/listeners/SkinSyncListener.java similarity index 90% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/listeners/SkinSyncListener.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/listeners/SkinSyncListener.java index 0a66ebe..1c00c90 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/listeners/SkinSyncListener.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/listeners/SkinSyncListener.java @@ -1,10 +1,10 @@ -package xyz.theprogramsrc.superauth.spigot.listeners; +package xyz.theprogramsrc.superauth_v3.spigot.listeners; import org.bukkit.Bukkit; import org.bukkit.entity.Player; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; import xyz.theprogramsrc.supercoreapi.global.utils.Utils; import xyz.theprogramsrc.supercoreapi.spigot.SpigotModule; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/managers/ActionManager.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/managers/ActionManager.java similarity index 87% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/managers/ActionManager.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/managers/ActionManager.java index 98794c8..0f48b44 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/managers/ActionManager.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/managers/ActionManager.java @@ -1,20 +1,20 @@ -package xyz.theprogramsrc.superauth.spigot.managers; +package xyz.theprogramsrc.superauth_v3.spigot.managers; import java.util.List; import org.bukkit.entity.Player; -import xyz.theprogramsrc.superauth.api.auth.SuperAuthAfterLoginEvent; -import xyz.theprogramsrc.superauth.api.auth.SuperAuthAfterRegisterEvent; -import xyz.theprogramsrc.superauth.api.auth.SuperAuthBeforeLoginEvent; -import xyz.theprogramsrc.superauth.api.auth.SuperAuthBeforeRegisterEvent; -import xyz.theprogramsrc.superauth.global.users.UserStorage; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; -import xyz.theprogramsrc.superauth.spigot.memory.CaptchaMemory; -import xyz.theprogramsrc.superauth.spigot.memory.ForceLoginMemory; -import xyz.theprogramsrc.superauth.spigot.memory.WasRegisteredMemory; -import xyz.theprogramsrc.superauth.spigot.objects.AuthAction; -import xyz.theprogramsrc.superauth.spigot.storage.AuthSettings; +import xyz.theprogramsrc.superauth_v3.api.auth.SuperAuthAfterLoginEvent; +import xyz.theprogramsrc.superauth_v3.api.auth.SuperAuthAfterRegisterEvent; +import xyz.theprogramsrc.superauth_v3.api.auth.SuperAuthBeforeLoginEvent; +import xyz.theprogramsrc.superauth_v3.api.auth.SuperAuthBeforeRegisterEvent; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.memory.CaptchaMemory; +import xyz.theprogramsrc.superauth_v3.spigot.memory.ForceLoginMemory; +import xyz.theprogramsrc.superauth_v3.spigot.memory.WasRegisteredMemory; +import xyz.theprogramsrc.superauth_v3.spigot.objects.AuthAction; +import xyz.theprogramsrc.superauth_v3.spigot.storage.AuthSettings; import xyz.theprogramsrc.supercoreapi.global.placeholders.Placeholder; import xyz.theprogramsrc.supercoreapi.global.placeholders.SpigotPlaceholderManager; import xyz.theprogramsrc.supercoreapi.libs.xseries.messages.Titles; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/memory/CaptchaMemory.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/memory/CaptchaMemory.java similarity index 60% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/memory/CaptchaMemory.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/memory/CaptchaMemory.java index ac4613b..2272e43 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/memory/CaptchaMemory.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/memory/CaptchaMemory.java @@ -1,7 +1,7 @@ -package xyz.theprogramsrc.superauth.spigot.memory; +package xyz.theprogramsrc.superauth_v3.spigot.memory; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; import xyz.theprogramsrc.supercoreapi.global.storage.memory.MemoryStorage; public class CaptchaMemory extends MemoryStorage { diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/memory/ForceLoginMemory.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/memory/ForceLoginMemory.java similarity index 71% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/memory/ForceLoginMemory.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/memory/ForceLoginMemory.java index 7c85943..cb21c56 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/memory/ForceLoginMemory.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/memory/ForceLoginMemory.java @@ -1,6 +1,6 @@ -package xyz.theprogramsrc.superauth.spigot.memory; +package xyz.theprogramsrc.superauth_v3.spigot.memory; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; import xyz.theprogramsrc.supercoreapi.global.storage.memory.MemoryStorage; public class ForceLoginMemory extends MemoryStorage { diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/memory/WasRegisteredMemory.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/memory/WasRegisteredMemory.java similarity index 71% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/memory/WasRegisteredMemory.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/memory/WasRegisteredMemory.java index fed89a6..50aae0b 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/memory/WasRegisteredMemory.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/memory/WasRegisteredMemory.java @@ -1,6 +1,6 @@ -package xyz.theprogramsrc.superauth.spigot.memory; +package xyz.theprogramsrc.superauth_v3.spigot.memory; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; import xyz.theprogramsrc.supercoreapi.global.storage.memory.MemoryStorage; public class WasRegisteredMemory extends MemoryStorage { diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/objects/AuthAction.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/objects/AuthAction.java similarity index 98% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/objects/AuthAction.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/objects/AuthAction.java index a01596b..152ec3c 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/objects/AuthAction.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/objects/AuthAction.java @@ -1,10 +1,10 @@ -package xyz.theprogramsrc.superauth.spigot.objects; +package xyz.theprogramsrc.superauth_v3.spigot.objects; import org.bukkit.Bukkit; import org.bukkit.Location; import org.bukkit.World; import org.bukkit.entity.Player; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; import xyz.theprogramsrc.supercoreapi.global.files.yml.YMLConfig; import xyz.theprogramsrc.supercoreapi.global.utils.Utils; import xyz.theprogramsrc.supercoreapi.spigot.SpigotModule; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/objects/AuthMethod.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/objects/AuthMethod.java similarity index 86% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/objects/AuthMethod.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/objects/AuthMethod.java index 71cabd7..628aeab 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/objects/AuthMethod.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/objects/AuthMethod.java @@ -1,4 +1,4 @@ -package xyz.theprogramsrc.superauth.spigot.objects; +package xyz.theprogramsrc.superauth_v3.spigot.objects; public enum AuthMethod { DIALOG, diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/storage/AuthSettings.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/storage/AuthSettings.java similarity index 98% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/storage/AuthSettings.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/storage/AuthSettings.java index 9f05deb..eaec194 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/storage/AuthSettings.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/storage/AuthSettings.java @@ -1,11 +1,11 @@ -package xyz.theprogramsrc.superauth.spigot.storage; +package xyz.theprogramsrc.superauth_v3.spigot.storage; import java.io.File; import java.util.List; -import xyz.theprogramsrc.superauth.global.hashing.HashingMethod; -import xyz.theprogramsrc.superauth.spigot.SuperAuth; -import xyz.theprogramsrc.superauth.spigot.objects.AuthMethod; +import xyz.theprogramsrc.superauth_v3.global.hashing.HashingMethod; +import xyz.theprogramsrc.superauth_v3.spigot.SuperAuth; +import xyz.theprogramsrc.superauth_v3.spigot.objects.AuthMethod; import xyz.theprogramsrc.supercoreapi.global.files.yml.YMLConfig; import xyz.theprogramsrc.supercoreapi.global.utils.Utils; diff --git a/src/main/java/xyz/theprogramsrc/superauth/spigot/storage/DatabaseMigration.java b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/storage/DatabaseMigration.java similarity index 92% rename from src/main/java/xyz/theprogramsrc/superauth/spigot/storage/DatabaseMigration.java rename to src/main/java/xyz/theprogramsrc/superauth_v3/spigot/storage/DatabaseMigration.java index 396a97b..5ed21e9 100644 --- a/src/main/java/xyz/theprogramsrc/superauth/spigot/storage/DatabaseMigration.java +++ b/src/main/java/xyz/theprogramsrc/superauth_v3/spigot/storage/DatabaseMigration.java @@ -1,4 +1,4 @@ -package xyz.theprogramsrc.superauth.spigot.storage; +package xyz.theprogramsrc.superauth_v3.spigot.storage; import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; @@ -7,8 +7,8 @@ import org.bukkit.event.EventPriority; import org.bukkit.event.player.PlayerJoinEvent; -import xyz.theprogramsrc.superauth.global.users.User; -import xyz.theprogramsrc.superauth.global.users.UserStorage; +import xyz.theprogramsrc.superauth_v3.global.users.User; +import xyz.theprogramsrc.superauth_v3.global.users.UserStorage; import xyz.theprogramsrc.supercoreapi.global.storage.DataBase; import xyz.theprogramsrc.supercoreapi.spigot.SpigotModule; diff --git a/src/main/kotlin/xyz/theprogramsrc/superauth/SuperAuth.kt b/src/main/kotlin/xyz/theprogramsrc/superauth/SuperAuth.kt new file mode 100644 index 0000000..11e35f5 --- /dev/null +++ b/src/main/kotlin/xyz/theprogramsrc/superauth/SuperAuth.kt @@ -0,0 +1,21 @@ +package xyz.theprogramsrc.superauth + +import org.bukkit.plugin.java.JavaPlugin +import xyz.theprogramsrc.superauth.api.SuperAuthAPI + +class SuperAuth: JavaPlugin(), SuperAuthAPI { + + companion object { + lateinit var instance: SuperAuthAPI + private set + } + + override fun onLoad() { + instance = this + } + + override fun onEnable() { + + } + +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/theprogramsrc/superauth/api/SuperAuthAPI.kt b/src/main/kotlin/xyz/theprogramsrc/superauth/api/SuperAuthAPI.kt new file mode 100644 index 0000000..2bf90bd --- /dev/null +++ b/src/main/kotlin/xyz/theprogramsrc/superauth/api/SuperAuthAPI.kt @@ -0,0 +1,5 @@ +package xyz.theprogramsrc.superauth.api + +interface SuperAuthAPI { + +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/theprogramsrc/superauth/api/objects/User.kt b/src/main/kotlin/xyz/theprogramsrc/superauth/api/objects/User.kt new file mode 100644 index 0000000..06764cd --- /dev/null +++ b/src/main/kotlin/xyz/theprogramsrc/superauth/api/objects/User.kt @@ -0,0 +1,28 @@ +package xyz.theprogramsrc.superauth.api.objects + +import xyz.theprogramsrc.superauth.global.AuthMethod +import xyz.theprogramsrc.supercoreapi.spigot.utils.skintexture.SkinTexture + +/** + * Representation of a user + * @param username The username of the user + * @param password The password of the user + * @param ip The ip of the user + * @param premium Whether the user is premium or not + * @param admin Whether the user is admin or not + * @param authorized Whether the user is authorized or not + * @param registered Whether the user is registered or not + * @param authMethod The auth method of the user + * @param skinTexture The skin texture of the user + */ +data class User( + val username: String, + val password: String, + val ip: String?, + val premium: Boolean, + val admin: Boolean, + val authorized: Boolean, + val registered: Boolean, + val authMethod: AuthMethod, + val skinTexture: SkinTexture?, +) diff --git a/src/main/kotlin/xyz/theprogramsrc/superauth/global/AuthMethod.kt b/src/main/kotlin/xyz/theprogramsrc/superauth/global/AuthMethod.kt new file mode 100644 index 0000000..702e5ac --- /dev/null +++ b/src/main/kotlin/xyz/theprogramsrc/superauth/global/AuthMethod.kt @@ -0,0 +1,21 @@ +package xyz.theprogramsrc.superauth.global + +/** + * Representation of an authentication method + */ +enum class AuthMethod { + /** + * Authentication with PIN GUI + */ + GUI, + + /** + * Authentication with Chat Password + */ + DIALOG, + + /** + * Authentication with Command Password + */ + COMMAND, +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/theprogramsrc/superauth/global/Hashing.kt b/src/main/kotlin/xyz/theprogramsrc/superauth/global/Hashing.kt new file mode 100644 index 0000000..edbf3de --- /dev/null +++ b/src/main/kotlin/xyz/theprogramsrc/superauth/global/Hashing.kt @@ -0,0 +1,52 @@ +package xyz.theprogramsrc.superauth.global + +import java.security.SecureRandom + +object Hashing { + + private val secureRandom = SecureRandom() + + private val hexChars = "0123456789ABCDEF".toCharArray() + private val numberChars = "0123456789".toCharArray() + private val alphaNumChars = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz".toCharArray() + + /** + * Generates a random hexadecimal string of the given length. + * + * @param length The length of the string to generate + * @return The generated string + */ + fun generateHex(length: Int = 32): String { + check(length > 0) { "Length must be greater than 0, but it was $length" } + return (0 until length).map { + hexChars[secureRandom.nextInt(hexChars.size)] + }.joinToString("") + } + + /** + * Generates a random number string of the given length. + * + * @param length The length of the string to generate + * @return The generated string + */ + fun generateNumbers(length: Int = 32): String { + check(length > 0) { "Length must be greater than 0, but it was $length" } + return (0 until length).map { + numberChars[secureRandom.nextInt(numberChars.size)] + }.joinToString("") + } + + /** + * Generates a random alphanumeric string of the given length. + * + * @param length The length of the string to generate + * @return The generated string + */ + fun generateAlphaNumeric(length: Int = 32): String { + check(length > 0) { "Length must be greater than 0, but it was $length" } + return (0 until length).map { + alphaNumChars[secureRandom.nextInt(alphaNumChars.size)] + }.joinToString("") + } + +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/theprogramsrc/superauth/global/hashing/BCryptHashing.kt b/src/main/kotlin/xyz/theprogramsrc/superauth/global/hashing/BCryptHashing.kt new file mode 100644 index 0000000..54882eb --- /dev/null +++ b/src/main/kotlin/xyz/theprogramsrc/superauth/global/hashing/BCryptHashing.kt @@ -0,0 +1,47 @@ +package xyz.theprogramsrc.superauth.global.hashing + +import at.favre.lib.crypto.bcrypt.BCrypt + +/** + * Representation of a BCrypt Hashing Algorithm + * + * @param version The version of the hashing algorithm + */ +open class BCryptHashing(version: BCrypt.Version = BCrypt.Version.VERSION_2A): HashingAlgorithm { + + private val hasher = BCrypt.with(version) + private val verifyer = BCrypt.verifyer(version) + + override fun hash(input: String): String = + hasher.hashToString(12, input.toCharArray()) + + override fun check(password: String, hash: String): Boolean = + verifyer.verifyStrict(password.toCharArray(), hash.toCharArray()).verified + + +} + +/** + * Representation of the BCrypt Hashing Algorithm with Version 2A + */ +class BCrypt2AHashing: BCryptHashing(BCrypt.Version.VERSION_2A) + +/** + * Representation of the BCrypt Hashing Algorithm with Version 2B + */ +class BCrypt2BHashing: BCryptHashing(BCrypt.Version.VERSION_2B) + +/** + * Representation of the BCrypt Hashing Algorithm with Version 2X + */ +class BCrypt2XHashing: BCryptHashing(BCrypt.Version.VERSION_2X) + +/** + * Representation of the BCrypt Hashing Algorithm with Version 2Y + */ +class BCrypt2YHashing: BCryptHashing(BCrypt.Version.VERSION_2Y) + +/** + * Representation of the BCrypt Hashing Algorithm with Version 2Y No Null Terminator + */ +class BCrypt2YNoNullTerminatorHashing: BCryptHashing(BCrypt.Version.VERSION_2Y_NO_NULL_TERMINATOR) \ No newline at end of file diff --git a/src/main/kotlin/xyz/theprogramsrc/superauth/global/hashing/HashingAlgorithm.kt b/src/main/kotlin/xyz/theprogramsrc/superauth/global/hashing/HashingAlgorithm.kt new file mode 100644 index 0000000..35d76e9 --- /dev/null +++ b/src/main/kotlin/xyz/theprogramsrc/superauth/global/hashing/HashingAlgorithm.kt @@ -0,0 +1,29 @@ +package xyz.theprogramsrc.superauth.global.hashing + +interface HashingAlgorithm { + + /** + * Checks if this algorithm is loaded and ready + * to use. + * + * @return true if loaded, false otherwise + */ + fun isLoaded(): Boolean = true + + /** + * Generates a hash from the given [input] + * + * @param input the input to hash + * @return the hash + */ + fun hash(input: String): String + + /** + * Checks if the given [password] matches the given [hash]. + * + * @param password the first string + * @param hash the second string + * @return true if the password matches the hash, false otherwise + */ + fun check(password: String, hash: String): Boolean +} \ No newline at end of file diff --git a/src/main/kotlin/xyz/theprogramsrc/superauth/global/hashing/ShaHashing.kt b/src/main/kotlin/xyz/theprogramsrc/superauth/global/hashing/ShaHashing.kt new file mode 100644 index 0000000..2a3fa91 --- /dev/null +++ b/src/main/kotlin/xyz/theprogramsrc/superauth/global/hashing/ShaHashing.kt @@ -0,0 +1,47 @@ +package xyz.theprogramsrc.superauth.global.hashing + +import java.math.BigInteger +import java.nio.charset.Charset +import java.security.MessageDigest + +/** + * Representation of the SHA Based Hashing Algorithm + * + * @param version The version of the hashing algorithm. Defaults to 'SHA-512' + */ +open class ShaHashing(private val version: String = "SHA-512"): HashingAlgorithm { + + override fun hash(input: String): String = MessageDigest.getInstance(version).let { digest -> + digest.reset() + digest.update(input.toByteArray(Charset.defaultCharset())) + digest.digest().let { bytes -> + String.format("%0${bytes.size shl 1}x", BigInteger(1, bytes)) + } + } + + override fun check(password: String, hash: String): Boolean = + MessageDigest.isEqual( + hash(password).toByteArray(Charset.defaultCharset()), + hash.toByteArray(Charset.defaultCharset()) + ) +} + +/** + * Representation of the Sha1 Hashing Algorithm + */ +class SHA1: ShaHashing("SHA-1") + +/** + * Representation of the Sha256 Hashing Algorithm + */ +class SHA256: ShaHashing("SHA-256") + +/** + * Representation of the Sha384 Hashing Algorithm + */ +class SHA384: ShaHashing("SHA-384") + +/** + * Representation of the Sha512 Hashing Algorithm + */ +class SHA512: ShaHashing() \ No newline at end of file diff --git a/src/main/resources/bungee.yml b/src/main/resources/bungee.yml index 8b332b9..b7ef87f 100644 --- a/src/main/resources/bungee.yml +++ b/src/main/resources/bungee.yml @@ -1,4 +1,4 @@ -main: xyz.theprogramsrc.superauth.bungee.SuperAuth +main: xyz.theprogramsrc.superauth_v3.bungee.SuperAuth name: SuperAuth version: "@version@" author: TheProgramSrc diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 152cd80..625ec4a 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,6 +1,6 @@ name: SuperAuth version: "@version@" -main: xyz.theprogramsrc.superauth.spigot.SuperAuth +main: xyz.theprogramsrc.superauth_v3.spigot.SuperAuth api-version: "1.13" authors: [TheProgramSrc] description: Secure your users and server