Compare commits

...

28 Commits

Author SHA1 Message Date
HaHaWTH 6ef4f0f3e3 Version b43 2024-03-09 23:41:03 +08:00
DGun Otto bb9c46b147 Revert MySQL dependency update 2024-02-27 13:34:18 +08:00
HaHaWTH 131d2429f9 Merge remote-tracking branch 'origin/master' 2024-02-26 01:30:28 +08:00
HaHaWTH d305fe6679 Commands 2024-02-26 01:30:10 +08:00
DGun Otto 35c801ae63 Merge pull request #109 from HaHaWTH/patch
Patch
2024-02-23 10:18:27 +08:00
DGun Otto b5a46d94de Merge branch 'master' into patch 2024-02-23 00:38:03 +08:00
DGun Otto 5a5992b353 Merge branch 'AuthMe:master' into patch 2024-02-23 00:35:05 +08:00
dependabot[bot] f56a23f4b7 Bump maven-install-plugin from 3.0.1 to 3.1.0 (#2643)
Bumps [maven-install-plugin](https://github.com/apache/maven-install-plugin) from 3.0.1 to 3.1.0.
- [Release notes](https://github.com/apache/maven-install-plugin/releases)
- [Commits](https://github.com/apache/maven-install-plugin/compare/maven-install-plugin-3.0.1...maven-install-plugin-3.1.0)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-install-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-22 11:44:00 +01:00
dependabot[bot] a57382f269 Bump maven-enforcer-plugin from 3.1.0 to 3.2.1 (#2681)
Bumps [maven-enforcer-plugin](https://github.com/apache/maven-enforcer) from 3.1.0 to 3.2.1.
- [Release notes](https://github.com/apache/maven-enforcer/releases)
- [Commits](https://github.com/apache/maven-enforcer/compare/enforcer-3.1.0...enforcer-3.2.1)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-enforcer-plugin
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-22 11:43:48 +01:00
dependabot[bot] 9380efdd3d Bump bcrypt from 0.9.0 to 0.10.2 (#2729)
Bumps [bcrypt](https://github.com/patrickfav/bcrypt) from 0.9.0 to 0.10.2.
- [Release notes](https://github.com/patrickfav/bcrypt/releases)
- [Changelog](https://github.com/patrickfav/bcrypt/blob/main/CHANGELOG)
- [Commits](https://github.com/patrickfav/bcrypt/compare/v0.9.0...v0.10.2)

---
updated-dependencies:
- dependency-name: at.favre.lib:bcrypt
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-22 11:43:17 +01:00
dependabot[bot] ad64370bf1 Bump net.essentialsx:EssentialsX from 2.20.0 to 2.20.1 (#2737)
Bumps [net.essentialsx:EssentialsX](https://github.com/EssentialsX/Essentials) from 2.20.0 to 2.20.1.
- [Release notes](https://github.com/EssentialsX/Essentials/releases)
- [Commits](https://github.com/EssentialsX/Essentials/compare/2.20.0...2.20.1)

---
updated-dependencies:
- dependency-name: net.essentialsx:EssentialsX
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-22 11:43:07 +01:00
dependabot[bot] 54bae76d27 Bump org.jacoco:jacoco-maven-plugin from 0.8.8 to 0.8.11 (#2756)
Bumps [org.jacoco:jacoco-maven-plugin](https://github.com/jacoco/jacoco) from 0.8.8 to 0.8.11.
- [Release notes](https://github.com/jacoco/jacoco/releases)
- [Commits](https://github.com/jacoco/jacoco/compare/v0.8.8...v0.8.11)

---
updated-dependencies:
- dependency-name: org.jacoco:jacoco-maven-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-22 11:42:54 +01:00
dependabot[bot] 93f1385c7a Bump com.mysql:mysql-connector-j from 8.0.33 to 8.2.0 (#2761)
Bumps [com.mysql:mysql-connector-j](https://github.com/mysql/mysql-connector-j) from 8.0.33 to 8.2.0.
- [Changelog](https://github.com/mysql/mysql-connector-j/blob/release/8.x/CHANGES)
- [Commits](https://github.com/mysql/mysql-connector-j/compare/8.0.33...8.2.0)

---
updated-dependencies:
- dependency-name: com.mysql:mysql-connector-j
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-22 11:42:40 +01:00
dependabot[bot] d5dbc7e5c7 Bump org.checkerframework:checker-qual from 3.26.0 to 3.40.0 (#2764)
Bumps [org.checkerframework:checker-qual](https://github.com/typetools/checker-framework) from 3.26.0 to 3.40.0.
- [Release notes](https://github.com/typetools/checker-framework/releases)
- [Changelog](https://github.com/typetools/checker-framework/blob/master/docs/CHANGELOG.md)
- [Commits](https://github.com/typetools/checker-framework/compare/checker-framework-3.26.0...checker-framework-3.40.0)

---
updated-dependencies:
- dependency-name: org.checkerframework:checker-qual
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-22 11:42:17 +01:00
dependabot[bot] 72bbb4ebaa Bump org.mariadb.jdbc:mariadb-java-client from 3.1.4 to 3.3.0 (#2765)
Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.1.4 to 3.3.0.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/3.1.4...3.3.0)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-22 11:41:57 +01:00
dependabot[bot] caf0d3f8ed Bump org.xerial:sqlite-jdbc from 3.42.0.0 to 3.44.0.0 (#2766)
Bumps [org.xerial:sqlite-jdbc](https://github.com/xerial/sqlite-jdbc) from 3.42.0.0 to 3.44.0.0.
- [Release notes](https://github.com/xerial/sqlite-jdbc/releases)
- [Changelog](https://github.com/xerial/sqlite-jdbc/blob/master/CHANGELOG)
- [Commits](https://github.com/xerial/sqlite-jdbc/compare/3.42.0.0...3.44.0.0)

---
updated-dependencies:
- dependency-name: org.xerial:sqlite-jdbc
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
2024-02-22 11:40:56 +01:00
DGun Otto 95726cc7f9 Update PostgreSQL to silence CVE-2024-1597 warning (#2778) 2024-02-22 11:36:18 +01:00
DGun Otto ca7a070e4c [ci skip] Update README 2024-02-22 02:03:48 +08:00
DGun Otto ab1d952070 [ci skip] Remove mcbbs link 2024-02-22 02:00:18 +08:00
DGun Otto 1ce64bbcdf Update PostgreSQL to resolve CVE-2024-1597 2024-02-21 13:24:55 +08:00
DGun Otto 1c38384ac7 Update PostgreSQL to resolve CVE-2024-1597
Bump org.postgresql:postgresql from 42.6.0 to 42.7.2
2024-02-21 13:22:50 +08:00
DGun Otto 90ff68eacd Merge pull request #107 from HaHaWTH/dependabot/maven/org.mariadb.jdbc-mariadb-java-client-3.3.3
Bump org.mariadb.jdbc:mariadb-java-client from 3.1.4 to 3.3.3
2024-02-21 13:14:39 +08:00
DGun Otto f7569f3eb1 Merge pull request #105 from HaHaWTH/dependabot/maven/org.apache.maven.plugins-maven-shade-plugin-3.5.2
Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.1 to 3.5.2
2024-02-21 13:14:03 +08:00
dependabot[bot] 77c289dc13 Bump org.mariadb.jdbc:mariadb-java-client from 3.1.4 to 3.3.3
Bumps [org.mariadb.jdbc:mariadb-java-client](https://github.com/mariadb-corporation/mariadb-connector-j) from 3.1.4 to 3.3.3.
- [Release notes](https://github.com/mariadb-corporation/mariadb-connector-j/releases)
- [Changelog](https://github.com/mariadb-corporation/mariadb-connector-j/blob/master/CHANGELOG.md)
- [Commits](https://github.com/mariadb-corporation/mariadb-connector-j/compare/3.1.4...3.3.3)

---
updated-dependencies:
- dependency-name: org.mariadb.jdbc:mariadb-java-client
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-21 04:33:40 +00:00
dependabot[bot] cca78be983 Bump org.postgresql:postgresql from 42.6.0 to 42.7.2
Bumps [org.postgresql:postgresql](https://github.com/pgjdbc/pgjdbc) from 42.6.0 to 42.7.2.
- [Release notes](https://github.com/pgjdbc/pgjdbc/releases)
- [Changelog](https://github.com/pgjdbc/pgjdbc/blob/master/CHANGELOG.md)
- [Commits](https://github.com/pgjdbc/pgjdbc/compare/REL42.6.0...REL42.7.2)

---
updated-dependencies:
- dependency-name: org.postgresql:postgresql
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-21 04:33:10 +00:00
dependabot[bot] c15575cb54 Bump org.apache.maven.plugins:maven-shade-plugin from 3.5.1 to 3.5.2
Bumps [org.apache.maven.plugins:maven-shade-plugin](https://github.com/apache/maven-shade-plugin) from 3.5.1 to 3.5.2.
- [Release notes](https://github.com/apache/maven-shade-plugin/releases)
- [Commits](https://github.com/apache/maven-shade-plugin/compare/maven-shade-plugin-3.5.1...maven-shade-plugin-3.5.2)

---
updated-dependencies:
- dependency-name: org.apache.maven.plugins:maven-shade-plugin
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
2024-02-21 04:32:53 +00:00
DGun Otto 81dd695999 Remove mirror repo 2024-02-20 21:04:50 +08:00
DGun Otto 3065b98456 ignore slf4j update 2024-02-14 16:24:00 +08:00
6 changed files with 17 additions and 18 deletions
+2
View File
@@ -12,3 +12,5 @@ updates:
- dependency-name: com.zaxxer:HikariCP
- dependency-name: "org.mockito:mockito-core" # Mockito 5 requires Java 11
versions: ">= 5"
- dependency-name: "org.slf4j:slf4j-simple"
versions: ">= 1.7.36"
+2 -2
View File
@@ -1,6 +1,6 @@
# AuthMeReReloaded
**"A fork of the best authentication plugin for the Bukkit modding API!⭐"**
MCBBS Link: [Click Here](https://www.mcbbs.net/forum.php?mod=viewthread&tid=1471495)
![Graph](https://bstats.org/signatures/bukkit/AuthMeReloaded-Fork.svg)
<p align="center">
<img src="https://img.shields.io/github/languages/code-size/HaHaWTH/AuthMeReReloaded.svg" alt="Code size"/>
@@ -34,7 +34,7 @@ MCBBS Link: [Click Here](https://www.mcbbs.net/forum.php?mod=viewthread&tid=1471
[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)
TODO: Implement HAProxy ip forward(Useful for Frp)
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!**
+7 -10
View File
@@ -164,7 +164,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
<version>3.1.0</version>
<version>3.2.1</version>
<executions>
<execution>
<id>enforce-environment</id>
@@ -217,7 +217,7 @@
<plugin>
<groupId>org.jacoco</groupId>
<artifactId>jacoco-maven-plugin</artifactId>
<version>0.8.8</version>
<version>0.8.11</version>
<executions>
<execution>
<id>pre-unit-test</id>
@@ -294,7 +294,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-shade-plugin</artifactId>
<version>3.5.1</version>
<version>3.5.2</version>
<executions>
<execution>
<id>shaded-jar</id>
@@ -484,7 +484,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<version>3.0.1</version>
<version>3.1.0</version>
</plugin>
<!-- Deploy the jars as artifacts into the remote repository -->
<plugin>
@@ -519,10 +519,6 @@
</build>
<repositories>
<repository>
<id>lss233-repo</id>
<url>https://crystal.app.lss233.com/repositories/minecraft/</url>
</repository>
<repository>
<id>opencollab-snapshot-main</id>
<url>https://repo.opencollab.dev/main/</url>
@@ -660,6 +656,7 @@
<version>2.2.2-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<!-- Jalu Injector -->
<dependency>
<groupId>ch.jalu</groupId>
@@ -754,7 +751,7 @@
<dependency>
<groupId>org.mariadb.jdbc</groupId>
<artifactId>mariadb-java-client</artifactId>
<version>3.1.4</version>
<version>3.3.3</version>
<optional>true</optional>
</dependency>
@@ -1071,7 +1068,7 @@
<dependency>
<groupId>org.postgresql</groupId>
<artifactId>postgresql</artifactId>
<version>42.6.0</version>
<version>42.7.2</version>
<optional>true</optional>
<exclusions>
<exclusion>
+1 -1
View File
@@ -75,7 +75,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 = "42";
private static String pluginBuildNumber = "43";
// Private instances
private EmailService emailService;
private CommandHandler commandHandler;
@@ -84,14 +84,14 @@ public final class CommandUtils {
* @return formatted command syntax incl. arguments
*/
public static String buildSyntax(CommandDescription command, List<String> correctLabels) {
String commandSyntax = ChatColor.WHITE + "/" + correctLabels.get(0) + ChatColor.YELLOW;
StringBuilder commandSyntax = new StringBuilder(ChatColor.WHITE + "/" + correctLabels.get(0) + ChatColor.YELLOW);
for (int i = 1; i < correctLabels.size(); ++i) {
commandSyntax += " " + correctLabels.get(i);
commandSyntax.append(" ").append(correctLabels.get(i));
}
for (CommandArgumentDescription argument : command.getArguments()) {
commandSyntax += " " + formatArgument(argument);
commandSyntax.append(" ").append(formatArgument(argument));
}
return commandSyntax;
return commandSyntax.toString();
}
/**
+1 -1
View File
@@ -3,7 +3,7 @@ authors: [${pluginDescription.authors}]
website: http://github.com/HaHaWTH/AuthMeReReloaded/
description: A fork of AuthMeReloaded that contains bug fixes
main: ${pluginDescription.main}
version: 5.6.0-FORK-b42
version: 5.6.0-FORK-b43
api-version: 1.13
softdepend:
- Vault