Compare commits
13 Commits
dependabot
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
b630df850f | ||
|
|
da99cad206 | ||
|
|
22027b5fdd | ||
|
|
7f00c4183f | ||
|
|
2bde2fd8ac | ||
|
|
48a48f0c07 | ||
|
|
a70d1d7268 | ||
|
|
5cc4167e4f | ||
|
|
b9e2514556 | ||
|
|
0b11781329 | ||
|
|
645d11ea54 | ||
|
|
3e87b9f44a | ||
|
|
a6dc4514f2 |
2
.github/workflows/maven.yml
vendored
2
.github/workflows/maven.yml
vendored
@ -41,7 +41,7 @@ jobs:
|
||||
javaVersion: '17'
|
||||
- mcVersion: '1.20.4'
|
||||
javaVersion: '21'
|
||||
- mcVersion: '1.21'
|
||||
- mcVersion: '1.21.1'
|
||||
javaVersion: '21'
|
||||
steps:
|
||||
- uses: HaHaWTH/minecraft-plugin-runtime-test@paper
|
||||
|
||||
17
README.md
17
README.md
@ -27,15 +27,14 @@
|
||||
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......
|
||||
13. **Velocity support (See [Velocity Support](./vc-support.md))**
|
||||
14. Support Virtual Threads caching
|
||||
15. Automatically fix portal stuck issue
|
||||
16. Automatically login for Bedrock players(configurable)
|
||||
17. Fix shulker box crash bug on legacy versions(MC 1.13-)
|
||||
18. **H2 database support**
|
||||
19. **100% compatibility with original authme and extensions**
|
||||
20. More......
|
||||
|
||||
**Download links:**
|
||||
[Releases](https://github.com/HaHaWTH/AuthMeReReloaded/releases/latest)
|
||||
|
||||
35
pom.xml
35
pom.xml
@ -67,7 +67,7 @@
|
||||
<maven.minimumVersion>3.6.3</maven.minimumVersion>
|
||||
|
||||
<!-- Dependencies versions -->
|
||||
<spigot.version>1.20.6-R0.1-SNAPSHOT</spigot.version>
|
||||
<spigot.version>1.21.1-R0.1-SNAPSHOT</spigot.version>
|
||||
|
||||
<!-- Versioning properties -->
|
||||
<project.outputName>AuthMe</project.outputName>
|
||||
@ -111,7 +111,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-javadoc-plugin</artifactId>
|
||||
<version>3.10.1</version>
|
||||
<version>3.11.1</version>
|
||||
<configuration>
|
||||
<failOnError>false</failOnError>
|
||||
<failOnWarnings>false</failOnWarnings>
|
||||
@ -509,7 +509,7 @@
|
||||
<plugin>
|
||||
<groupId>org.apache.maven.plugins</groupId>
|
||||
<artifactId>maven-site-plugin</artifactId>
|
||||
<version>3.12.1</version>
|
||||
<version>3.21.0</version>
|
||||
</plugin>
|
||||
<!-- Publish coveralls test coverage reports, not included in the build cycle by default -->
|
||||
<plugin>
|
||||
@ -631,8 +631,9 @@
|
||||
|
||||
<!-- Multiverse Repo -->
|
||||
<repository>
|
||||
<id>onarandombox-repo-releases</id>
|
||||
<url>https://repo.onarandombox.com/content/repositories/multiverse/</url>
|
||||
<id>multiverse-multiverse-releases</id>
|
||||
<name>Multiverse Repository</name>
|
||||
<url>https://repo.onarandombox.com/multiverse-releases</url>
|
||||
<releases>
|
||||
<enabled>true</enabled>
|
||||
</releases>
|
||||
@ -640,22 +641,6 @@
|
||||
<enabled>false</enabled>
|
||||
</snapshots>
|
||||
</repository>
|
||||
<repository>
|
||||
<id>onarandombox-repo-snapshots</id>
|
||||
<url>https://repo.onarandombox.com/content/repositories/multiverse-snapshots/</url>
|
||||
<releases>
|
||||
<enabled>false</enabled>
|
||||
</releases>
|
||||
<snapshots>
|
||||
<enabled>true</enabled>
|
||||
</snapshots>
|
||||
</repository>
|
||||
|
||||
<!-- FoliaLib -->
|
||||
<repository>
|
||||
<id>devmart-other</id>
|
||||
<url>https://nexuslite.gcnt.net/repos/other/</url>
|
||||
</repository>
|
||||
|
||||
<repository>
|
||||
<id>opencollab-snapshot</id>
|
||||
@ -784,7 +769,7 @@
|
||||
<dependency>
|
||||
<groupId>com.mysql</groupId>
|
||||
<artifactId>mysql-connector-j</artifactId>
|
||||
<version>9.1.0</version>
|
||||
<version>8.0.33</version>
|
||||
<optional>true</optional>
|
||||
</dependency>
|
||||
<dependency>
|
||||
@ -984,8 +969,8 @@
|
||||
<!-- Multi World plugin, https://www.spigotmc.org/resources/multiverse-core.390/ -->
|
||||
<dependency>
|
||||
<groupId>com.onarandombox.multiversecore</groupId>
|
||||
<artifactId>Multiverse-Core</artifactId>
|
||||
<version>4.3.1</version>
|
||||
<artifactId>multiverse-core</artifactId>
|
||||
<version>4.3.14</version>
|
||||
<type>jar</type>
|
||||
<scope>provided</scope>
|
||||
<exclusions>
|
||||
@ -1158,7 +1143,7 @@
|
||||
<dependency>
|
||||
<groupId>org.xerial</groupId>
|
||||
<artifactId>sqlite-jdbc</artifactId>
|
||||
<version>3.46.1.2</version>
|
||||
<version>3.47.1.0</version>
|
||||
<scope>test</scope>
|
||||
</dependency>
|
||||
<dependency>
|
||||
|
||||
@ -15,8 +15,6 @@ import fr.xephi.authme.util.PlayerUtils;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.Location;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.inventory.Inventory;
|
||||
import org.bukkit.inventory.InventoryView;
|
||||
|
||||
import javax.inject.Inject;
|
||||
import java.time.Instant;
|
||||
@ -26,8 +24,6 @@ import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Optional;
|
||||
|
||||
import static fr.xephi.authme.listener.PlayerListener.PENDING_INVENTORIES;
|
||||
|
||||
/**
|
||||
* The current API of AuthMe.
|
||||
*
|
||||
@ -261,18 +257,6 @@ public class AuthMeApi {
|
||||
return dataSource.saveAuth(auth);
|
||||
}
|
||||
|
||||
/**
|
||||
* Open an inventory for the given player at any time.
|
||||
*
|
||||
* @param player The player to open the inventory for
|
||||
* @param inventory The inventory to open
|
||||
* @return The inventory view
|
||||
*/
|
||||
public InventoryView openInventory(Player player, Inventory inventory) {
|
||||
PENDING_INVENTORIES.add(inventory);
|
||||
return player.openInventory(inventory);
|
||||
}
|
||||
|
||||
/**
|
||||
* Force a player to login, i.e. the player is logged in without needing his password.
|
||||
*
|
||||
|
||||
@ -52,12 +52,9 @@ import org.bukkit.event.player.PlayerMoveEvent;
|
||||
import org.bukkit.event.player.PlayerQuitEvent;
|
||||
import org.bukkit.event.player.PlayerRespawnEvent;
|
||||
import org.bukkit.event.player.PlayerShearEntityEvent;
|
||||
import org.bukkit.inventory.Inventory;
|
||||
import org.bukkit.inventory.InventoryView;
|
||||
|
||||
import javax.inject.Inject;
|
||||
import java.util.ArrayList;
|
||||
import java.util.List;
|
||||
import java.util.Locale;
|
||||
import java.util.Set;
|
||||
|
||||
@ -98,8 +95,6 @@ public class PlayerListener implements Listener {
|
||||
@Inject
|
||||
private QuickCommandsProtectionManager quickCommandsProtectionManager;
|
||||
|
||||
public static List<Inventory> PENDING_INVENTORIES = new ArrayList<>();
|
||||
|
||||
// Lowest priority to apply fast protection checks
|
||||
@EventHandler(priority = EventPriority.LOWEST)
|
||||
public void onAsyncPlayerPreLoginEventLowest(AsyncPlayerPreLoginEvent event) {
|
||||
@ -500,17 +495,6 @@ public class PlayerListener implements Listener {
|
||||
}
|
||||
}
|
||||
|
||||
private boolean isInventoryOpenedByApi(Inventory inventory) {
|
||||
if (inventory == null) {
|
||||
return false;
|
||||
}
|
||||
if (PENDING_INVENTORIES.contains(inventory)) {
|
||||
PENDING_INVENTORIES.remove(inventory);
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
@SuppressWarnings("all")
|
||||
private boolean isInventoryWhitelisted(InventoryView inventory) {
|
||||
if (inventory == null) {
|
||||
@ -537,8 +521,7 @@ public class PlayerListener implements Listener {
|
||||
public void onPlayerInventoryOpen(InventoryOpenEvent event) {
|
||||
final HumanEntity player = event.getPlayer();
|
||||
if (listenerService.shouldCancelEvent(player)
|
||||
&& !isInventoryWhitelisted(event.getView())
|
||||
&& !isInventoryOpenedByApi(event.getInventory())) {
|
||||
&& !isInventoryWhitelisted(event.getView())) {
|
||||
event.setCancelled(true);
|
||||
|
||||
/*
|
||||
@ -556,12 +539,4 @@ public class PlayerListener implements Listener {
|
||||
event.setCancelled(true);
|
||||
}
|
||||
}
|
||||
// @EventHandler(priority = EventPriority.LOWEST)
|
||||
// public void onSwitchHand(PlayerSwapHandItemsEvent event) {
|
||||
// Player player = event.getPlayer();
|
||||
// if (!player.isSneaking() || !player.hasPermission("keybindings.use"))
|
||||
// return;
|
||||
// event.setCancelled(true);
|
||||
// Bukkit.dispatchCommand(event.getPlayer(), "help");
|
||||
// }
|
||||
}
|
||||
|
||||
@ -1,14 +1,10 @@
|
||||
package fr.xephi.authme.listener;
|
||||
|
||||
import fr.xephi.authme.settings.Settings;
|
||||
import fr.xephi.authme.settings.properties.PluginSettings;
|
||||
import org.bukkit.Bukkit;
|
||||
import org.bukkit.entity.Player;
|
||||
import org.bukkit.event.EventHandler;
|
||||
import org.bukkit.event.EventPriority;
|
||||
import org.bukkit.event.Listener;
|
||||
import org.bukkit.event.entity.EntityPickupItemEvent;
|
||||
import org.bukkit.event.player.PlayerSwapHandItemsEvent;
|
||||
|
||||
import javax.inject.Inject;
|
||||
|
||||
@ -26,12 +22,4 @@ public class PlayerListenerHigherThan18 implements Listener {
|
||||
}
|
||||
}
|
||||
|
||||
@EventHandler(priority = EventPriority.LOWEST)
|
||||
public void onSwitchHand(PlayerSwapHandItemsEvent event) {
|
||||
Player player = event.getPlayer();
|
||||
if (player.isSneaking() && player.hasPermission("keybindings.use") && settings.getProperty(PluginSettings.MENU_UNREGISTER_COMPATIBILITY)) {
|
||||
event.setCancelled(true);
|
||||
Bukkit.dispatchCommand(event.getPlayer(), "help");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@ -17,7 +17,7 @@ public final class HooksSettings implements SettingsHolder {
|
||||
|
||||
@Comment("Do we need to hook with PlaceholderAPI for AuthMe placeholders?")
|
||||
public static final Property<Boolean> PLACEHOLDER_API =
|
||||
newProperty("Hooks.placeholderapi", true);
|
||||
newProperty("Hooks.placeholderapi", false);
|
||||
|
||||
@Comment("Do we need to hook with BungeeCord?")
|
||||
public static final Property<Boolean> BUNGEECORD =
|
||||
|
||||
@ -11,13 +11,6 @@ import static ch.jalu.configme.properties.PropertyInitializer.newLowercaseString
|
||||
import static ch.jalu.configme.properties.PropertyInitializer.newProperty;
|
||||
|
||||
public final class PluginSettings implements SettingsHolder {
|
||||
@Comment({
|
||||
"Should we execute /help command when unregistered players press Shift+F?",
|
||||
"This keeps compatibility with some menu plugins",
|
||||
"If you are using TrMenu, don't enable this because TrMenu already implemented this."
|
||||
})
|
||||
public static final Property<Boolean> MENU_UNREGISTER_COMPATIBILITY =
|
||||
newProperty("3rdPartyFeature.compatibility.menuPlugins", false);
|
||||
|
||||
@Comment({
|
||||
"Send i18n messages to player based on their client settings, this option will override `settings.messagesLanguage`",
|
||||
|
||||
@ -1,10 +1,13 @@
|
||||
package fr.xephi.authme.task;
|
||||
|
||||
import com.google.gson.JsonObject;
|
||||
import com.google.gson.JsonParser;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.io.InputStreamReader;
|
||||
import java.net.HttpURLConnection;
|
||||
import java.net.URI;
|
||||
import java.net.URL;
|
||||
import java.util.Scanner;
|
||||
|
||||
public class Updater {
|
||||
private final String currentVersion;
|
||||
@ -32,14 +35,16 @@ public class Updater {
|
||||
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
|
||||
conn.setConnectTimeout(10000);
|
||||
conn.setReadTimeout(10000);
|
||||
Scanner scanner = new Scanner(conn.getInputStream());
|
||||
String response = scanner.useDelimiter("\\Z").next();
|
||||
scanner.close();
|
||||
String latestVersion = response.substring(response.indexOf("tag_name") + 11);
|
||||
latestVersion = latestVersion.substring(0, latestVersion.indexOf("\""));
|
||||
this.latestVersion = latestVersion;
|
||||
isUpdateAvailable = !currentVersion.equals(latestVersion);
|
||||
return isUpdateAvailable;
|
||||
conn.setRequestMethod("GET");
|
||||
conn.setRequestProperty("Accept", "application/vnd.github+json");
|
||||
try (InputStreamReader reader = new InputStreamReader(conn.getInputStream())) {
|
||||
JsonObject jsonObject = new JsonParser().parse(reader).getAsJsonObject();
|
||||
String latest = jsonObject.get("tag_name").getAsString();
|
||||
latestVersion = latest;
|
||||
isUpdateAvailable = !currentVersion.equals(latest);
|
||||
reader.close();
|
||||
return isUpdateAvailable;
|
||||
}
|
||||
} catch (IOException ignored) {
|
||||
this.latestVersion = null;
|
||||
isUpdateAvailable = false;
|
||||
|
||||
@ -104,7 +104,7 @@
|
||||
<td>
|
||||
<p style="color:#b0adc5;">© 2024 HomoCraft. All rights reserved.</p>
|
||||
<a href="1919810.com" target="_blank"
|
||||
style="text-decoration: none; font-size: 16px">wdsj.in</a>
|
||||
style="text-decoration: none; font-size: 16px">example.com</a>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@ -110,7 +110,7 @@
|
||||
<td>
|
||||
<p style="color:#b0adc5;">© 2024 HomoCraft. All rights reserved.</p>
|
||||
<a href="1919810.com" target="_blank"
|
||||
style="text-decoration: none; font-size: 16px">wdsj.in</a>
|
||||
style="text-decoration: none; font-size: 16px">example.com</a>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@ -103,7 +103,7 @@
|
||||
<td>
|
||||
<p style="color:#b0adc5;">© 2024 HomoCraft. All rights reserved.</p>
|
||||
<a href="1919810.com" target="_blank"
|
||||
style="text-decoration: none; font-size: 16px">wdsj.in</a>
|
||||
style="text-decoration: none; font-size: 16px">example.com</a>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@ -101,7 +101,7 @@
|
||||
<td>
|
||||
<p style="color:#b0adc5;">© 2024 HomoCraft. All rights reserved.</p>
|
||||
<a href="1919810.com" target="_blank"
|
||||
style="text-decoration: none; font-size: 16px">wdsj.in</a>
|
||||
style="text-decoration: none; font-size: 16px">example.com</a>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
@ -103,7 +103,7 @@
|
||||
<td>
|
||||
<p style="color:#b0adc5;">© 2024 HomoCraft. All rights reserved.</p>
|
||||
<a href="1919810.com" target="_blank"
|
||||
style="text-decoration: none; font-size: 16px">wdsj.in</a>
|
||||
style="text-decoration: none; font-size: 16px">example.com</a>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user