Compare commits

...

30 Commits

Author SHA1 Message Date
HaHaWTH f63f00fade Update maven.yml 2023-04-06 21:43:55 +08:00
HaHaWTH 19c18987f6 Update maven.yml 2023-04-06 21:14:09 +08:00
HaHaWTH db1650c27f Update maven.yml 2023-04-06 20:59:28 +08:00
HaHaWTH f45696f82f Update maven.yml 2023-04-06 20:56:39 +08:00
HaHaWTH 1c1879ea01 Update maven.yml 2023-04-06 20:48:00 +08:00
HaHaWTH 812762db25 Merge branch 'Stabrinai:master' into master 2023-04-06 20:36:22 +08:00
Sattera a4bf7adb60 添加对 floodgate 的支持 2023-04-06 09:42:12 +08:00
Sattera 11c5237950 Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/fr/xephi/authme/listener/PlayerListener.java
2023-04-06 09:38:13 +08:00
Sattera bc43afe3d0 添加对 floodgate 的支持 2023-04-06 09:37:57 +08:00
HaHaWTH ced3d17537 Update README.md 2023-04-06 02:19:03 +08:00
HaHaWTH d9b3c59f30 Update maven.yml 2023-04-06 01:58:08 +08:00
HaHaWTH 8c286ceceb Update maven.yml 2023-04-06 01:54:54 +08:00
HaHaWTH 2ce6b066cc Update maven.yml 2023-04-06 01:52:50 +08:00
HaHaWTH 585b69ecd2 Update maven.yml 2023-04-06 01:50:33 +08:00
HaHaWTH 17187b05c1 Update maven.yml 2023-04-06 01:49:05 +08:00
HaHaWTH 6f193f05ce Update maven.yml 2023-04-06 01:47:55 +08:00
HaHaWTH a626265b09 Update maven.yml 2023-04-06 01:42:51 +08:00
HaHaWTH bda8613f93 Update .gitignore 2023-04-06 01:19:09 +08:00
HaHaWTH 44136bb91f Update maven.yml 2023-04-06 01:08:45 +08:00
HaHaWTH 69514738f7 Update maven.yml 2023-04-06 01:01:54 +08:00
HaHaWTH 220b31bb99 Update maven.yml 2023-04-06 00:59:20 +08:00
HaHaWTH 3b58a0acc9 Update maven.yml 2023-04-06 00:57:06 +08:00
HaHaWTH 5efa360cb2 Update README.md 2023-04-06 00:25:56 +08:00
HaHaWTH 2269c93dee Update maven.yml 2023-04-06 00:22:41 +08:00
HaHaWTH bf6233c024 Update maven.yml 2023-04-05 23:32:01 +08:00
HaHaWTH 3cc6f535a8 Update maven.yml 2023-04-05 22:01:32 +08:00
HaHaWTH 95d9edddeb Merge branch 'Stabrinai:master' into master 2023-04-05 21:05:10 +08:00
Sattera 4a559a7ccf Merge remote-tracking branch 'origin/master'
# Conflicts:
#	src/main/java/fr/xephi/authme/listener/PlayerListener.java
2023-04-05 20:25:10 +08:00
Sattera baaabb22d4 添加对 floodgate 的支持 2023-04-05 20:24:55 +08:00
HaHaWTH 9e39f4a186 Create maven-publish.yml 2023-04-05 18:56:36 +08:00
5 changed files with 46 additions and 11 deletions
+34
View File
@@ -0,0 +1,34 @@
# This workflow will build a package using Maven and then publish it to GitHub packages when a release is created
# For more information see: https://github.com/actions/setup-java/blob/main/docs/advanced-usage.md#apache-maven-with-a-settings-path
name: Maven Package
on:
release:
types: [created]
jobs:
build:
runs-on: ubuntu-latest
permissions:
contents: read
packages: write
steps:
- uses: actions/checkout@v3
- name: Set up JDK 11
uses: actions/setup-java@v3
with:
java-version: '11'
distribution: 'temurin'
server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
settings-path: ${{ github.workspace }} # location for the settings.xml file
- name: Build with Maven
run: mvn -B package --file pom.xml
- name: Publish to GitHub Packages Apache Maven
run: mvn deploy -s $GITHUB_WORKSPACE/settings.xml
env:
GITHUB_TOKEN: ${{ github.token }}
+5 -4
View File
@@ -1,4 +1,4 @@
name: Java CI name: Java CI
on: on:
push: push:
@@ -7,11 +7,11 @@ on:
- master - master
jobs: jobs:
build_and_test: Build:
strategy: strategy:
matrix: matrix:
jdkversion: [11] jdkversion: [11]
runs-on: ubuntu-latest runs-on: windows-latest
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- uses: actions/setup-java@v3 - uses: actions/setup-java@v3
@@ -19,5 +19,6 @@ jobs:
distribution: 'temurin' distribution: 'temurin'
java-version: ${{ matrix.jdkversion }} java-version: ${{ matrix.jdkversion }}
cache: 'maven' cache: 'maven'
- name: Build with Maven - name: 使用Maven构建
run: mvn -V -B clean package --file pom.xml run: mvn -V -B clean package --file pom.xml
+1 -1
View File
@@ -24,7 +24,7 @@ hs_err_pid*
# Include the project's code style settings file # Include the project's code style settings file
!.idea/codeStyleSettings.xml !.idea/codeStyleSettings.xml
/target/class/
# File-based project format: # File-based project format:
*.ipr *.ipr
*.iws *.iws
+4 -4
View File
@@ -1,12 +1,12 @@
# AuthMeReloaded # AuthMeReReloaded
**"The best authentication plugin for the Bukkit modding API!"** **"A Fork of Authme that contains many bug fixes!"**
**请前往Releases下载最新版本**
<img src="wallpaper.png?raw=true" alt="AuthMeLogo"/> <img src="wallpaper.png?raw=true" alt="AuthMeLogo"/>
| Type | Badges | | Type | Badges |
|-------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------| |-------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|
| **General:** | ![](https://tokei.rs/b1/github/AuthMe/AuthMeReloaded?category=code) ![](https://tokei.rs/b1/github/AuthMe/AuthMeReloaded?category=files) | | **General:** | ![](https://tokei.rs/b1/github/AuthMe/AuthMeReloaded?category=code) ![](https://tokei.rs/b1/github/AuthMe/AuthMeReloaded?category=files) |
| **Code quality:** | [![Code Climate](https://codeclimate.com/github/AuthMe/AuthMeReloaded/badges/gpa.svg)](https://codeclimate.com/github/AuthMe/AuthMeReloaded) [![Coverage status](https://coveralls.io/repos/AuthMe-Team/AuthMeReloaded/badge.svg?branch=master&service=github)](https://coveralls.io/github/AuthMe-Team/AuthMeReloaded?branch=master) | | **代码质量:** | [![Code Climate](https://codeclimate.com/github/AuthMe/AuthMeReloaded/badges/gpa.svg)](https://codeclimate.com/github/AuthMe/AuthMeReloaded) [![Coverage status](https://coveralls.io/repos/AuthMe-Team/AuthMeReloaded/badge.svg?branch=master&service=github)](https://coveralls.io/github/AuthMe-Team/AuthMeReloaded?branch=master) |
| **Jenkins CI:** | [![Jenkins Status](https://img.shields.io/website-up-down-green-red/http/shields.io.svg?label=ci.codemc.org)](https://ci.codemc.org/) [![Build Status](https://ci.codemc.org/buildStatus/icon?job=AuthMe/AuthMeReloaded)](https://ci.codemc.org/job/AuthMe/job/AuthMeReloaded) ![Build Tests](https://img.shields.io/jenkins/t/https/ci.codemc.org/job/AuthMe/job/AuthMeReloaded.svg) | | **Jenkins CI:** | [![Jenkins Status](https://img.shields.io/website-up-down-green-red/http/shields.io.svg?label=ci.codemc.org)](https://ci.codemc.org/) [![Build Status](https://ci.codemc.org/buildStatus/icon?job=AuthMe/AuthMeReloaded)](https://ci.codemc.org/job/AuthMe/job/AuthMeReloaded) ![Build Tests](https://img.shields.io/jenkins/t/https/ci.codemc.org/job/AuthMe/job/AuthMeReloaded.svg) |
| **Other CIs:** | [![Build Status](https://www.travis-ci.com/AuthMe/AuthMeReloaded.svg?branch=master)](https://www.travis-ci.com/AuthMe/AuthMeReloaded) | | **Other CIs:** | [![Build Status](https://www.travis-ci.com/AuthMe/AuthMeReloaded.svg?branch=master)](https://www.travis-ci.com/AuthMe/AuthMeReloaded) |
@@ -94,7 +94,7 @@ public class PlayerListener implements Listener {
private PermissionsManager permissionsManager; private PermissionsManager permissionsManager;
@Inject @Inject
private QuickCommandsProtectionManager quickCommandsProtectionManager; private QuickCommandsProtectionManager quickCommandsProtectionManager;
FloodgateApi Floodgate = org.geysermc.floodgate.api.FloodgateApi.getInstance();
// Lowest priority to apply fast protection checks // Lowest priority to apply fast protection checks
@EventHandler(priority = EventPriority.LOWEST) @EventHandler(priority = EventPriority.LOWEST)
public void onAsyncPlayerPreLoginEventLowest(AsyncPlayerPreLoginEvent event) { public void onAsyncPlayerPreLoginEventLowest(AsyncPlayerPreLoginEvent event) {
@@ -113,7 +113,7 @@ public class PlayerListener implements Listener {
if (validationService.isUnrestricted(name)) { if (validationService.isUnrestricted(name)) {
return; return;
} }
if (settings.getProperty(RestrictionSettings.HOOK_FLOODGATE_PLAYER) && FloodgateApi.getInstance().isFloodgateId(event.getUniqueId())){ if (settings.getProperty(RestrictionSettings.HOOK_FLOODGATE_PLAYER) && Floodgate.isFloodgateId(event.getUniqueId())){
return; return;
} }
// Non-blocking checks // Non-blocking checks