Compare commits
26 Commits
b46
...
multipaper
| Author | SHA1 | Date | |
|---|---|---|---|
| 3cffd16ff2 | |||
| 3d1392f0e1 | |||
| 548be5042d | |||
| e9fd7fd80f | |||
| e44cd3edc6 | |||
| 219a7a3493 | |||
| 6876a6dd9f | |||
| d04a69f481 | |||
| dfa8317706 | |||
| 555514f7dd | |||
| 74633937bc | |||
| 948736b5ea | |||
| 5e54b8b105 | |||
| 0d818dd00f | |||
| 22586e601f | |||
| 9938df3c28 | |||
| ec2e8d3654 | |||
| 71a9c0c98f | |||
| 54cef57ea5 | |||
| 73c1116047 | |||
| abb85f005d | |||
| c2cd561e27 | |||
| 12880a5cfd | |||
| b5a8df2c4e | |||
| a035ba0a4b | |||
| bf6de0e161 |
@@ -47,8 +47,10 @@ body:
|
||||
description: Which server implementation are you using?
|
||||
multiple: false
|
||||
options:
|
||||
- Standalone server (no proxy)
|
||||
- Standalone(Spigot)
|
||||
- Standalone(Folia)
|
||||
- BungeeCord
|
||||
- Velocity
|
||||
validations:
|
||||
required: true
|
||||
|
||||
@@ -60,6 +62,9 @@ body:
|
||||
options:
|
||||
- SQLite
|
||||
- MySQL
|
||||
- H2
|
||||
- MariaDB
|
||||
- PostgreSQL
|
||||
validations:
|
||||
required: true
|
||||
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
name: Feature request
|
||||
description: Suggest an idea for AuthMe
|
||||
labels: 'Type: enhancement'
|
||||
labels: 'enhancement'
|
||||
|
||||
body:
|
||||
- type: markdown
|
||||
|
||||
@@ -25,7 +25,7 @@ jobs:
|
||||
uses: actions/upload-artifact@v3.1.2
|
||||
with:
|
||||
name: Download
|
||||
path: ./target/AuthMe-5.6.0-FORK-Spigot-Universal.jar
|
||||
path: ./target/AuthMe-5.6.0-FORK-Universal.jar
|
||||
runtime-test:
|
||||
name: Plugin Runtime Test
|
||||
needs: [Build]
|
||||
@@ -37,8 +37,8 @@ jobs:
|
||||
javaVersion: '8'
|
||||
- mcVersion: '1.12.2'
|
||||
javaVersion: '8'
|
||||
- mcVersion: '1.20.2'
|
||||
javaVersion: '20'
|
||||
- mcVersion: '1.20.1'
|
||||
javaVersion: '17'
|
||||
steps:
|
||||
- uses: HaHaWTH/minecraft-plugin-runtime-test@paper
|
||||
with:
|
||||
|
||||
@@ -1,53 +1 @@
|
||||
# AuthMeReReloaded
|
||||
**"A fork of the best authentication plugin for the Bukkit modding API!⭐"**
|
||||
|
||||
[English](https://github.com/HaHaWTH/AuthMeReReloaded) | [简体中文](https://github.com/HaHaWTH/AuthMeReReloaded/blob/master/README-zh.md)
|
||||
|
||||

|
||||
<p align="center">
|
||||
<img src="https://img.shields.io/github/languages/code-size/HaHaWTH/AuthMeReReloaded.svg" alt="Code size"/>
|
||||
<img src="https://img.shields.io/github/repo-size/HaHaWTH/AuthMeReReloaded.svg" alt="GitHub repo size"/>
|
||||
<img src="https://www.codefactor.io/repository/github/hahawth/authmerereloaded/badge" alt="CodeFactor" />
|
||||
<img src="https://img.shields.io/github/downloads/HaHaWTH/AuthMeReReloaded/total" alt="Downloads" />
|
||||
</p>
|
||||
|
||||
**Detailed Changes:**
|
||||
1. Improved mail sending logic & support more emails
|
||||
2. Shutdown mail sending(When server is closed, email you)
|
||||
3. Legacy bug fixes
|
||||
4. Anti Ghost Player(Doubled login bug)
|
||||
5. Use the best performance method by server brand
|
||||
6. Bedrock Compatibility(Floodgate needed)(based on UUID)
|
||||
7. Update checker
|
||||
8. Integrated GUI Captcha feature(Bedrock compatibility & ProtocolLib needed)(70% Asynchronous)
|
||||
9. Improved listeners
|
||||
10. Player login logic improvement to reduce lag
|
||||
11. Automatically purge bot data
|
||||
12. **Folia support (in active testing)**
|
||||
13. Offhand Menu compatibility(Thats amazing)
|
||||
14. **Velocity support (See [Velocity Support](./vc-support.md))**
|
||||
15. Support Virtual Threads caching
|
||||
16. Automatically fix portal stuck issue
|
||||
17. Automatically login for Bedrock players(configurable)
|
||||
18. Fix shulker box crash bug on legacy versions(MC 1.13-)
|
||||
19. **H2 database support**
|
||||
20. **100% compatibility with original authme and extensions**
|
||||
21. More......
|
||||
|
||||
**Download links:**
|
||||
[Releases](https://github.com/HaHaWTH/AuthMeReReloaded/releases/latest)
|
||||
[Actions(Dev builds, use at your own risk!)](https://github.com/HaHaWTH/AuthMeReReloaded/actions/workflows/maven.yml)
|
||||
|
||||
If you are using FRP(内网穿透) for your server, this plugin may help [HAProxy-Detector](https://github.com/HaHaWTH/HAProxy-Detector)
|
||||
|
||||
**Pull Requests and suggestions are welcome!**
|
||||
|
||||
<picture>
|
||||
<source
|
||||
media="(prefers-color-scheme: dark)"
|
||||
srcset="
|
||||
https://api.star-history.com/svg?repos=HaHaWTH/AuthMeReReloaded&type=Date&theme=dark
|
||||
"
|
||||
/>
|
||||
<img alt="Star History Chart" src="https://api.star-history.com/svg?repos=HaHaWTH/AuthMeReReloaded&type=Date" />
|
||||
</picture>
|
||||
**This branch adds Multipaper support, requires Java17 or higher**
|
||||
@@ -82,54 +82,11 @@
|
||||
<pluginDescription.authors>sgdc3, games647, Hex3l, krusic22</pluginDescription.authors>
|
||||
</properties>
|
||||
|
||||
<!-- Jenkins profile -->
|
||||
<profiles>
|
||||
<!-- Set the buildNumber using the jenkins env. variable -->
|
||||
<profile>
|
||||
<id>jenkins</id>
|
||||
<activation>
|
||||
<property>
|
||||
<name>env.BUILD_NUMBER</name>
|
||||
</property>
|
||||
</activation>
|
||||
<properties>
|
||||
<project.buildNumber>${env.BUILD_NUMBER}</project.buildNumber>
|
||||
</properties>
|
||||
</profile>
|
||||
<!-- Skip long hash tests, reduce the test time of 20-30 seconds -->
|
||||
<profile>
|
||||
<id>skipLongHashTests</id>
|
||||
<activation>
|
||||
<property>
|
||||
<name>skipLongHashTests</name>
|
||||
</property>
|
||||
</activation>
|
||||
<properties>
|
||||
<project.skipExtendedHashTests>true</project.skipExtendedHashTests>
|
||||
</properties>
|
||||
</profile>
|
||||
<!-- Skip javadoc generation for faster local build -->
|
||||
<profile>
|
||||
<id>skipJavadocGeneration</id>
|
||||
<build>
|
||||
<plugins>
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<configuration>
|
||||
<skip>true</skip>
|
||||
</configuration>
|
||||
</plugin>
|
||||
</plugins>
|
||||
</build>
|
||||
</profile>
|
||||
</profiles>
|
||||
|
||||
<build>
|
||||
<defaultGoal>clean package</defaultGoal>
|
||||
<!-- Little hack to make the shade plugin output a file with the right name -->
|
||||
<finalName>${project.finalNameBase}-noshade</finalName>
|
||||
|
||||
<resources>
|
||||
<resource>
|
||||
<directory>.</directory>
|
||||
@@ -222,7 +179,7 @@
|
||||
<plugin>
|
||||
<groupId>org.jacoco</groupId>
|
||||
<artifactId>jacoco-maven-plugin</artifactId>
|
||||
<version>0.8.11</version>
|
||||
<version>0.8.12</version>
|
||||
<executions>
|
||||
<execution>
|
||||
<id>pre-unit-test</id>
|
||||
@@ -282,7 +239,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-source-plugin</artifactId>
|
||||
<version>3.3.0</version>
|
||||
<version>3.3.1</version>
|
||||
<configuration>
|
||||
<finalName>${project.finalNameBase}</finalName>
|
||||
</configuration>
|
||||
@@ -308,6 +265,7 @@
|
||||
<goal>shade</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<finalName>${project.finalNameBase}-Lite</finalName>
|
||||
<artifactSet>
|
||||
<excludes>
|
||||
<!-- Guava -->
|
||||
@@ -366,6 +324,16 @@
|
||||
<shadedPattern>fr.xephi.authme.libs.com.github.benmanes.caffeine</shadedPattern>
|
||||
</relocation>
|
||||
</relocations>
|
||||
<filters>
|
||||
<filter>
|
||||
<artifact>*:*</artifact>
|
||||
<excludes>
|
||||
<exclude>META-INF/*.SF</exclude>
|
||||
<exclude>META-INF/*.DSA</exclude>
|
||||
<exclude>META-INF/*.RSA</exclude>
|
||||
</excludes>
|
||||
</filter>
|
||||
</filters>
|
||||
</configuration>
|
||||
</execution>
|
||||
<execution>
|
||||
@@ -375,7 +343,7 @@
|
||||
<goal>shade</goal>
|
||||
</goals>
|
||||
<configuration>
|
||||
<finalName>${project.finalNameBase}-Spigot-Universal</finalName>
|
||||
<finalName>${project.finalNameBase}-Universal</finalName>
|
||||
<relocations>
|
||||
<relocation>
|
||||
<pattern>com.google.common</pattern>
|
||||
@@ -441,6 +409,10 @@
|
||||
<pattern>com.github.benmanes.caffeine</pattern>
|
||||
<shadedPattern>fr.xephi.authme.libs.com.github.benmanes.caffeine</shadedPattern>
|
||||
</relocation>
|
||||
<relocation>
|
||||
<pattern>com.github.puregero.multilib</pattern>
|
||||
<shadedPattern>fr.xephi.authme.libs.com.github.puregero.multilib</shadedPattern>
|
||||
</relocation>
|
||||
</relocations>
|
||||
</configuration>
|
||||
</execution>
|
||||
@@ -671,6 +643,12 @@
|
||||
</snapshots>
|
||||
</repository>
|
||||
|
||||
<!-- MultiLib -->
|
||||
<repository>
|
||||
<id>clojars</id>
|
||||
<url>https://repo.clojars.org</url>
|
||||
</repository>
|
||||
|
||||
<!-- ProtocolLib Repo -->
|
||||
<repository>
|
||||
<id>dmulloy2-repo-releases</id>
|
||||
@@ -1218,6 +1196,14 @@
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- MultiLib -->
|
||||
<dependency>
|
||||
<groupId>com.github.puregero</groupId>
|
||||
<artifactId>multilib</artifactId>
|
||||
<version>1.1.13</version>
|
||||
<scope>compile</scope>
|
||||
</dependency>
|
||||
|
||||
<!-- JDBC drivers for datasource integration tests -->
|
||||
<dependency>
|
||||
<groupId>org.xerial</groupId>
|
||||
|
||||
@@ -80,7 +80,7 @@ public class AuthMe extends JavaPlugin {
|
||||
// Version and build number values
|
||||
private static String pluginVersion = "5.6.0-Fork";
|
||||
private static final String pluginBuild = "b";
|
||||
private static String pluginBuildNumber = "46";
|
||||
private static String pluginBuildNumber = "47";
|
||||
// Private instances
|
||||
private EmailService emailService;
|
||||
private CommandHandler commandHandler;
|
||||
|
||||
@@ -15,6 +15,7 @@ import fr.xephi.authme.process.register.executors.PasswordRegisterParams;
|
||||
import fr.xephi.authme.process.register.executors.RegistrationMethod;
|
||||
import fr.xephi.authme.process.register.executors.TwoFactorRegisterParams;
|
||||
import fr.xephi.authme.security.HashAlgorithm;
|
||||
import fr.xephi.authme.service.BukkitService;
|
||||
import fr.xephi.authme.service.CommonService;
|
||||
import fr.xephi.authme.service.ValidationService;
|
||||
import fr.xephi.authme.settings.properties.EmailSettings;
|
||||
@@ -24,8 +25,6 @@ import org.bukkit.entity.Player;
|
||||
|
||||
import javax.inject.Inject;
|
||||
import java.util.List;
|
||||
import java.util.Timer;
|
||||
import java.util.TimerTask;
|
||||
|
||||
import static fr.xephi.authme.process.register.RegisterSecondaryArgument.CONFIRMATION;
|
||||
import static fr.xephi.authme.process.register.RegisterSecondaryArgument.EMAIL_MANDATORY;
|
||||
@@ -46,6 +45,9 @@ public class RegisterCommand extends PlayerCommand {
|
||||
@Inject
|
||||
private CommonService commonService;
|
||||
|
||||
@Inject
|
||||
private BukkitService bukkitService;
|
||||
|
||||
@Inject
|
||||
private DataSource dataSource;
|
||||
|
||||
@@ -175,20 +177,15 @@ public class RegisterCommand extends PlayerCommand {
|
||||
} else if (isSecondArgValidForEmailRegistration(player, arguments)) {
|
||||
management.performRegister(RegistrationMethod.EMAIL_REGISTRATION,
|
||||
EmailRegisterParams.of(player, email));
|
||||
Timer timer = new Timer();
|
||||
timer.schedule(new TimerTask() {
|
||||
@Override
|
||||
public void run() {
|
||||
if (commonService.getProperty(RegistrationSettings.UNREGISTER_ON_EMAIL_VERIFICATION_FAILURE) && commonService.getProperty(RegistrationSettings.UNREGISTER_AFTER_MINUTES) > 0) {
|
||||
bukkitService.runTaskLater(player, () -> {
|
||||
if (dataSource.getAuth(player.getName()) != null) {
|
||||
if (dataSource.getAuth(player.getName()).getLastLogin() == null) {
|
||||
management.performUnregisterByAdmin(null, player.getName(), player);
|
||||
timer.cancel();
|
||||
}
|
||||
} else {
|
||||
timer.cancel();
|
||||
}
|
||||
}
|
||||
}, 600000);
|
||||
}, 60 * 20 * commonService.getProperty(RegistrationSettings.UNREGISTER_AFTER_MINUTES));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -29,7 +29,7 @@ import static fr.xephi.authme.datasource.SqlDataSourceUtils.logSqlException;
|
||||
/**
|
||||
* H2 data source.
|
||||
*/
|
||||
@SuppressWarnings({"checkstyle:AbbreviationAsWordInName"}) // Justification: Class name cannot be changed anymore
|
||||
@SuppressWarnings({"all"}) // Justification: Class name cannot be changed anymore
|
||||
public class H2 extends AbstractSqlDataSource {
|
||||
|
||||
private final ConsoleLogger logger = ConsoleLoggerFactory.get(H2.class);
|
||||
|
||||
@@ -41,6 +41,7 @@ public class MySQL extends AbstractSqlDataSource {
|
||||
private boolean useSsl;
|
||||
private boolean serverCertificateVerification;
|
||||
private boolean allowPublicKeyRetrieval;
|
||||
private String mariaDbSslMode;
|
||||
private String host;
|
||||
private String port;
|
||||
private String username;
|
||||
@@ -121,6 +122,7 @@ public class MySQL extends AbstractSqlDataSource {
|
||||
this.useSsl = settings.getProperty(DatabaseSettings.MYSQL_USE_SSL);
|
||||
this.serverCertificateVerification = settings.getProperty(DatabaseSettings.MYSQL_CHECK_SERVER_CERTIFICATE);
|
||||
this.allowPublicKeyRetrieval = settings.getProperty(DatabaseSettings.MYSQL_ALLOW_PUBLIC_KEY_RETRIEVAL);
|
||||
this.mariaDbSslMode = settings.getProperty(DatabaseSettings.MARIADB_SSL_MODE);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -145,12 +147,19 @@ public class MySQL extends AbstractSqlDataSource {
|
||||
ds.setDriverClassName(this.getDriverClassName());
|
||||
|
||||
// Request mysql over SSL
|
||||
if (this instanceof MariaDB) {
|
||||
ds.addDataSourceProperty("sslMode", mariaDbSslMode);
|
||||
} else {
|
||||
ds.addDataSourceProperty("useSSL", String.valueOf(useSsl));
|
||||
|
||||
// Disabling server certificate verification on need
|
||||
if (!serverCertificateVerification) {
|
||||
ds.addDataSourceProperty("verifyServerCertificate", String.valueOf(false));
|
||||
} // Disabling server certificate verification on need
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
// Disabling server certificate verification on need
|
||||
if (allowPublicKeyRetrieval) {
|
||||
ds.addDataSourceProperty("allowPublicKeyRetrieval", String.valueOf(true));
|
||||
}
|
||||
|
||||
@@ -79,6 +79,7 @@ public class DataSourceProvider implements Provider<DataSource> {
|
||||
break;
|
||||
case H2:
|
||||
dataSource = new H2(settings, dataFolder);
|
||||
logger.warning("You are using H2 database, which is still in development!\nMake sure to backup and report any issues you encounter on GitHub!");
|
||||
break;
|
||||
default:
|
||||
throw new UnsupportedOperationException("Unknown data source type '" + dataSourceType + "'");
|
||||
|
||||
@@ -39,14 +39,16 @@ public class BedrockAutoLoginListener implements Listener {
|
||||
return settings.getProperty(HooksSettings.HOOK_FLOODGATE_PLAYER) && settings.getProperty(SecuritySettings.FORCE_LOGIN_BEDROCK) && org.geysermc.floodgate.api.FloodgateApi.getInstance().isFloodgateId(uuid) && getServer().getPluginManager().getPlugin("floodgate") != null;
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.HIGHEST)
|
||||
@EventHandler(priority = EventPriority.MONITOR)
|
||||
public void onPlayerJoin(PlayerJoinEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
String name = event.getPlayer().getName();
|
||||
UUID uuid = event.getPlayer().getUniqueId();
|
||||
bukkitService.runTaskLater(player, () -> {
|
||||
if (isBedrockPlayer(uuid) && !authmeApi.isAuthenticated(player) && authmeApi.isRegistered(name)) {
|
||||
authmeApi.forceLogin(player);
|
||||
messages.send(player, MessageKey.BEDROCK_AUTO_LOGGED_IN);
|
||||
}
|
||||
},20L);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,5 +1,6 @@
|
||||
package fr.xephi.authme.listener;
|
||||
|
||||
import com.github.puregero.multilib.MultiLib;
|
||||
import fr.xephi.authme.AuthMe;
|
||||
import fr.xephi.authme.api.v3.AuthMeApi;
|
||||
import fr.xephi.authme.data.auth.PlayerCache;
|
||||
@@ -81,7 +82,11 @@ class ListenerService implements SettingsDependent {
|
||||
*/
|
||||
|
||||
public boolean shouldCancelEvent(Player player) {
|
||||
|
||||
if (MultiLib.isMultiPaper()) {
|
||||
if (MultiLib.isExternalPlayer(player)) {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
return player != null && !checkAuth(player.getName()) && !PlayerUtils.isNpc(player);
|
||||
}
|
||||
public boolean shouldCancelInvEvent(Player player) {
|
||||
|
||||
@@ -19,6 +19,7 @@ import fr.xephi.authme.service.bungeecord.BungeeSender;
|
||||
import fr.xephi.authme.service.bungeecord.MessageType;
|
||||
import fr.xephi.authme.service.velocity.VMessageType;
|
||||
import fr.xephi.authme.service.velocity.VelocitySender;
|
||||
import fr.xephi.authme.settings.Settings;
|
||||
import fr.xephi.authme.settings.commandconfig.CommandManager;
|
||||
import fr.xephi.authme.settings.properties.HooksSettings;
|
||||
import fr.xephi.authme.settings.properties.RegistrationSettings;
|
||||
@@ -47,6 +48,9 @@ public class AsynchronousJoin implements AsynchronousProcess {
|
||||
@Inject
|
||||
private Server server;
|
||||
|
||||
@Inject
|
||||
private Settings settings;
|
||||
|
||||
@Inject
|
||||
private DataSource database;
|
||||
|
||||
@@ -157,11 +161,11 @@ public class AsynchronousJoin implements AsynchronousProcess {
|
||||
// As described at https://www.spigotmc.org/wiki/bukkit-bungee-plugin-messaging-channel/
|
||||
// "Keep in mind that you can't send plugin messages directly after a player joins."
|
||||
bukkitService.scheduleSyncDelayedTask(() ->
|
||||
bungeeSender.sendAuthMeBungeecordMessage(player, MessageType.LOGIN), 5L);
|
||||
bungeeSender.sendAuthMeBungeecordMessage(player, MessageType.LOGIN), settings.getProperty(HooksSettings.PROXY_SEND_DELAY));
|
||||
}
|
||||
if (velocitySender.isEnabled()) {
|
||||
bukkitService.scheduleSyncDelayedTask(() ->
|
||||
velocitySender.sendAuthMeVelocityMessage(player, VMessageType.LOGIN), 5L);
|
||||
velocitySender.sendAuthMeVelocityMessage(player, VMessageType.LOGIN), settings.getProperty(HooksSettings.PROXY_SEND_DELAY));
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -28,6 +28,7 @@ import fr.xephi.authme.service.bungeecord.BungeeSender;
|
||||
import fr.xephi.authme.service.bungeecord.MessageType;
|
||||
import fr.xephi.authme.service.velocity.VMessageType;
|
||||
import fr.xephi.authme.service.velocity.VelocitySender;
|
||||
import fr.xephi.authme.settings.Settings;
|
||||
import fr.xephi.authme.settings.properties.DatabaseSettings;
|
||||
import fr.xephi.authme.settings.properties.EmailSettings;
|
||||
import fr.xephi.authme.settings.properties.HooksSettings;
|
||||
@@ -83,7 +84,8 @@ public class AsynchronousLogin implements AsynchronousProcess {
|
||||
|
||||
@Inject
|
||||
private SessionService sessionService;
|
||||
|
||||
@Inject
|
||||
private Settings settings;
|
||||
@Inject
|
||||
private BungeeSender bungeeSender;
|
||||
@Inject
|
||||
@@ -310,11 +312,11 @@ public class AsynchronousLogin implements AsynchronousProcess {
|
||||
// As described at https://www.spigotmc.org/wiki/bukkit-bungee-plugin-messaging-channel/
|
||||
// "Keep in mind that you can't send plugin messages directly after a player joins."
|
||||
bukkitService.scheduleSyncDelayedTask(() ->
|
||||
bungeeSender.sendAuthMeBungeecordMessage(player, MessageType.LOGIN), 5L);
|
||||
bungeeSender.sendAuthMeBungeecordMessage(player, MessageType.LOGIN), settings.getProperty(HooksSettings.PROXY_SEND_DELAY));
|
||||
}
|
||||
if (velocitySender.isEnabled()) {
|
||||
bukkitService.scheduleSyncDelayedTask(() ->
|
||||
velocitySender.sendAuthMeVelocityMessage(player, VMessageType.LOGIN), 5L);
|
||||
velocitySender.sendAuthMeVelocityMessage(player, VMessageType.LOGIN), settings.getProperty(HooksSettings.PROXY_SEND_DELAY));
|
||||
}
|
||||
|
||||
// As the scheduling executes the Task most likely after the current
|
||||
|
||||
@@ -167,6 +167,10 @@ public class BukkitService implements SettingsDependent {
|
||||
return getScheduler().runTaskLater(task, delay);
|
||||
}
|
||||
|
||||
public MyScheduledTask runTaskLater(Entity entity, Runnable task, long delay) {
|
||||
return getScheduler().runTaskLater(entity, task, delay);
|
||||
}
|
||||
|
||||
/**
|
||||
* Schedules this task to run asynchronously or immediately executes it based on
|
||||
* AuthMe's configuration.
|
||||
|
||||
@@ -31,7 +31,17 @@ public final class DatabaseSettings implements SettingsHolder {
|
||||
public static final Property<String> MYSQL_PORT =
|
||||
newProperty("DataSource.mySQLPort", "3306");
|
||||
|
||||
@Comment("Connect to MySQL database over SSL")
|
||||
@Comment({"Replacement of Mysql's useSsl (for MariaDB only).",
|
||||
"- disable: No SSL",
|
||||
"- trust: Trust blindly (no validation)",
|
||||
"- verify_ca: Encryption, certificates validation, BUT no hostname verification",
|
||||
"- verify_full: Encryption, certificate validation and hostname validation",
|
||||
"Read more: https://bit.ly/mariadb-sslmode"})
|
||||
public static final Property<String> MARIADB_SSL_MODE =
|
||||
newProperty("DataSource.MariaDbSslMode", "disabled");
|
||||
|
||||
@Comment({"Connect to MySQL database over SSL",
|
||||
"If you're using MariaDB, use sslMode instead"})
|
||||
public static final Property<Boolean> MYSQL_USE_SSL =
|
||||
newProperty("DataSource.mySQLUseSSL", true);
|
||||
|
||||
@@ -39,12 +49,13 @@ public final class DatabaseSettings implements SettingsHolder {
|
||||
"We would not recommend to set this option to false.",
|
||||
"Set this option to false at your own risk if and only if you know what you're doing"})
|
||||
public static final Property<Boolean> MYSQL_CHECK_SERVER_CERTIFICATE =
|
||||
newProperty( "DataSource.mySQLCheckServerCertificate", true );
|
||||
newProperty( "DataSource.mySQLCheckServerCertificate", true);
|
||||
|
||||
@Comment({"Authorize client to retrieve RSA server public key.",
|
||||
"Advanced option, ignore if you don't know what it means."})
|
||||
"Advanced option, ignore if you don't know what it means.",
|
||||
"If you are using MariaDB, use MariaDbSslMode instead."})
|
||||
public static final Property<Boolean> MYSQL_ALLOW_PUBLIC_KEY_RETRIEVAL =
|
||||
newProperty( "DataSource.mySQLAllowPublicKeyRetrieval", true );
|
||||
newProperty( "DataSource.mySQLAllowPublicKeyRetrieval", true);
|
||||
|
||||
@Comment("Username to connect to the MySQL database")
|
||||
public static final Property<String> MYSQL_USERNAME =
|
||||
|
||||
@@ -22,6 +22,12 @@ public final class HooksSettings implements SettingsHolder {
|
||||
public static final Property<Boolean> VELOCITY =
|
||||
newProperty("Hooks.velocity", false);
|
||||
|
||||
@Comment({"How many ticks should we wait before sending login info to proxy?",
|
||||
"Change this to higher if your player has high ping.",
|
||||
"See: https://www.spigotmc.org/wiki/bukkit-bungee-plugin-messaging-channel/"})
|
||||
public static final Property<Long> PROXY_SEND_DELAY =
|
||||
newProperty("Hooks.proxySendDelay", 10L);
|
||||
|
||||
@Comment({"Hook into floodgate.",
|
||||
"This must be true if you want to use other bedrock features."
|
||||
})
|
||||
|
||||
@@ -46,6 +46,16 @@ public final class RegistrationSettings implements SettingsHolder {
|
||||
newProperty(RegisterSecondaryArgument.class, "settings.registration.secondArg",
|
||||
RegisterSecondaryArgument.CONFIRMATION);
|
||||
|
||||
@Comment({
|
||||
"Should we unregister the player when he didn't verify the email?",
|
||||
"This only works if you enabled email registration."})
|
||||
public static final Property<Boolean> UNREGISTER_ON_EMAIL_VERIFICATION_FAILURE =
|
||||
newProperty("settings.registration.email.unregisterOnEmailVerificationFailure", false);
|
||||
|
||||
@Comment({"How many minutes should we wait before unregister the player",
|
||||
"when he didn't verify the email?"})
|
||||
public static final Property<Long> UNREGISTER_AFTER_MINUTES =
|
||||
newProperty("settings.registration.email.unregisterAfterMinutes", 10L);
|
||||
@Comment({
|
||||
"Do we force kick a player after a successful registration?",
|
||||
"Do not use with login feature below"})
|
||||
|
||||
@@ -4,7 +4,7 @@ website: http://github.com/HaHaWTH/AuthMeReReloaded/
|
||||
description: A fork of AuthMeReloaded that contains bug fixes
|
||||
main: ${pluginDescription.main}
|
||||
folia-supported: true
|
||||
version: 5.6.0-FORK-b46
|
||||
version: 5.6.0-FORK-b47
|
||||
api-version: 1.13
|
||||
softdepend:
|
||||
- Vault
|
||||
|
||||
Reference in New Issue
Block a user