From d9c89e1dc68552cd9eb3f301223cf99f0a8b082e Mon Sep 17 00:00:00 2001 From: Dreeam <61569423+Dreeam-qwq@users.noreply.github.com> Date: Mon, 10 Jun 2024 06:15:48 +0800 Subject: [PATCH 01/14] Remove locale data from locale map when player quit to save mem --- src/main/java/fr/xephi/authme/listener/PlayerListener.java | 7 +++++++ src/main/java/fr/xephi/authme/util/message/I18NUtils.java | 4 ++++ 2 files changed, 11 insertions(+) diff --git a/src/main/java/fr/xephi/authme/listener/PlayerListener.java b/src/main/java/fr/xephi/authme/listener/PlayerListener.java index e435b9c2d..9b8a4525c 100644 --- a/src/main/java/fr/xephi/authme/listener/PlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/PlayerListener.java @@ -16,9 +16,11 @@ import fr.xephi.authme.settings.Settings; import fr.xephi.authme.settings.SpawnLoader; import fr.xephi.authme.settings.properties.HooksSettings; +import fr.xephi.authme.settings.properties.PluginSettings; import fr.xephi.authme.settings.properties.RegistrationSettings; import fr.xephi.authme.settings.properties.RestrictionSettings; import fr.xephi.authme.util.TeleportUtils; +import fr.xephi.authme.util.message.I18NUtils; import fr.xephi.authme.util.message.MiniMessageUtils; import org.bukkit.ChatColor; import org.bukkit.Location; @@ -248,6 +250,11 @@ public void onPlayerQuit(PlayerQuitEvent event) { } } + // Remove data from locale map when player quit + if (settings.getProperty(PluginSettings.I18N_MESSAGES)) { + I18NUtils.removeLocale(player.getUniqueId()); + } + if (antiBotService.wasPlayerKicked(player.getName())) { return; } diff --git a/src/main/java/fr/xephi/authme/util/message/I18NUtils.java b/src/main/java/fr/xephi/authme/util/message/I18NUtils.java index ff68b5abb..da1d6769b 100644 --- a/src/main/java/fr/xephi/authme/util/message/I18NUtils.java +++ b/src/main/java/fr/xephi/authme/util/message/I18NUtils.java @@ -60,6 +60,10 @@ public static void addLocale(UUID uuid, String locale) { PLAYER_LOCALE.put(uuid, locale); } + public static void removeLocale(UUID uuid) { + PLAYER_LOCALE.remove(uuid); + } + /** * Returns the AuthMe messages file language code, by given locale and settings. * Dreeam - Hard mapping, based on mc1.20.6, 5/29/2024 From 0fcc45039d64644241bf6181b904fd0dce3c025b Mon Sep 17 00:00:00 2001 From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> Date: Tue, 11 Jun 2024 07:28:13 +0800 Subject: [PATCH 02/14] Add openInventory method to API --- .../java/fr/xephi/authme/api/v3/AuthMeApi.java | 17 +++++++++++++++++ .../xephi/authme/listener/PlayerListener.java | 18 +++++++++++++++++- .../fr/xephi/authme/service/BukkitService.java | 6 +++++- .../authme/util/message/MiniMessageUtils.java | 12 +++++++++++- 4 files changed, 50 insertions(+), 3 deletions(-) diff --git a/src/main/java/fr/xephi/authme/api/v3/AuthMeApi.java b/src/main/java/fr/xephi/authme/api/v3/AuthMeApi.java index fd487d665..27743d5d5 100644 --- a/src/main/java/fr/xephi/authme/api/v3/AuthMeApi.java +++ b/src/main/java/fr/xephi/authme/api/v3/AuthMeApi.java @@ -15,6 +15,8 @@ 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; @@ -24,6 +26,8 @@ import java.util.Locale; import java.util.Optional; +import static fr.xephi.authme.listener.PlayerListener.PENDING_INVENTORIES; + /** * The current API of AuthMe. * @@ -32,6 +36,7 @@ * AuthMeApi authmeApi = AuthMeApi.getInstance(); * */ +@SuppressWarnings("unused") public class AuthMeApi { private static AuthMeApi singleton; @@ -256,6 +261,18 @@ public boolean registerPlayer(String playerName, String password) { 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. * diff --git a/src/main/java/fr/xephi/authme/listener/PlayerListener.java b/src/main/java/fr/xephi/authme/listener/PlayerListener.java index e435b9c2d..973b8e6c9 100644 --- a/src/main/java/fr/xephi/authme/listener/PlayerListener.java +++ b/src/main/java/fr/xephi/authme/listener/PlayerListener.java @@ -50,9 +50,12 @@ 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; @@ -93,6 +96,7 @@ public class PlayerListener implements Listener { @Inject private QuickCommandsProtectionManager quickCommandsProtectionManager; + public static List PENDING_INVENTORIES = new ArrayList<>(); // Lowest priority to apply fast protection checks @EventHandler(priority = EventPriority.LOWEST) @@ -489,6 +493,17 @@ public void onPlayerConsumeItem(PlayerItemConsumeEvent event) { } } + 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) { @@ -515,7 +530,8 @@ private boolean isInventoryWhitelisted(InventoryView inventory) { public void onPlayerInventoryOpen(InventoryOpenEvent event) { final HumanEntity player = event.getPlayer(); if (listenerService.shouldCancelEvent(player) - && !isInventoryWhitelisted(event.getView())) { + && !isInventoryWhitelisted(event.getView()) + && !isInventoryOpenedByApi(event.getInventory())) { event.setCancelled(true); /* diff --git a/src/main/java/fr/xephi/authme/service/BukkitService.java b/src/main/java/fr/xephi/authme/service/BukkitService.java index 45008a387..d78ea92e2 100644 --- a/src/main/java/fr/xephi/authme/service/BukkitService.java +++ b/src/main/java/fr/xephi/authme/service/BukkitService.java @@ -380,7 +380,11 @@ public void sendBungeeMessage(Player player, byte[] bytes) { * @param bytes the message */ public void sendVelocityMessage(Player player, byte[] bytes) { - player.sendPluginMessage(authMe, "authmevelocity:main", bytes); + if (player != null) { + player.sendPluginMessage(authMe, "authmevelocity:main", bytes); + } else { + Bukkit.getServer().sendPluginMessage(authMe, "authmevelocity:main", bytes); + } } diff --git a/src/main/java/fr/xephi/authme/util/message/MiniMessageUtils.java b/src/main/java/fr/xephi/authme/util/message/MiniMessageUtils.java index 5d7e62168..2fe728112 100644 --- a/src/main/java/fr/xephi/authme/util/message/MiniMessageUtils.java +++ b/src/main/java/fr/xephi/authme/util/message/MiniMessageUtils.java @@ -1,5 +1,6 @@ package fr.xephi.authme.util.message; +import fr.xephi.authme.util.Utils; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer; @@ -8,6 +9,15 @@ public class MiniMessageUtils { private static final MiniMessage miniMessage = MiniMessage.miniMessage(); + private static final BungeeComponentSerializer bungeeSerializer; + + static { + if (Utils.MAJOR_VERSION >= 16) { + bungeeSerializer = BungeeComponentSerializer.get(); + } else { + bungeeSerializer = BungeeComponentSerializer.legacy(); + } + } /** * Parse a MiniMessage string into a legacy string. @@ -28,7 +38,7 @@ public static String parseMiniMessageToLegacy(String message) { */ public static BaseComponent[] parseMiniMessageToBaseComponent(String message) { Component component = miniMessage.deserialize(message); - return BungeeComponentSerializer.legacy().serialize(component); + return bungeeSerializer.serialize(component); } private MiniMessageUtils() { From be97e7faa0523045fdf3d8e2da4f00382602cd57 Mon Sep 17 00:00:00 2001 From: DGun Otto <102713261+HaHaWTH@users.noreply.github.com> Date: Tue, 11 Jun 2024 21:43:35 +0800 Subject: [PATCH 03/14] Update maven.yml --- .github/workflows/maven.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index bdff351ae..78b3e0ee0 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -40,7 +40,9 @@ jobs: - mcVersion: '1.18.2' javaVersion: '17' - mcVersion: '1.20.4' - javaVersion: '21' + javaVersion: '21' + - mcVersion: '1.20.6' + javaVersion: '21' steps: - uses: HaHaWTH/minecraft-plugin-runtime-test@paper with: From 9b74cb5a0048743e2620f62f1f01e9267d3b485a Mon Sep 17 00:00:00 2001 From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> Date: Wed, 12 Jun 2024 01:45:57 +0800 Subject: [PATCH 04/14] Fix Folia join commands --- .../xephi/authme/settings/commandconfig/CommandManager.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/xephi/authme/settings/commandconfig/CommandManager.java b/src/main/java/fr/xephi/authme/settings/commandconfig/CommandManager.java index 1018da0a8..86f06aa8e 100644 --- a/src/main/java/fr/xephi/authme/settings/commandconfig/CommandManager.java +++ b/src/main/java/fr/xephi/authme/settings/commandconfig/CommandManager.java @@ -129,9 +129,9 @@ private void executeCommands(Player player, List commands if (predicate.test(cmd)) { long delay = cmd.getDelay(); if (delay > 0) { - bukkitService.scheduleSyncDelayedTask(() -> dispatchCommand(player, cmd), delay); + bukkitService.runTaskLater(player, () -> dispatchCommand(player, cmd), delay); } else { - dispatchCommand(player, cmd); + bukkitService.runTaskIfFolia(player, () -> dispatchCommand(player, cmd)); } } } From 5186d09116ca06dcbf348aaa5ddf9c9de2de4895 Mon Sep 17 00:00:00 2001 From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> Date: Tue, 18 Jun 2024 16:17:03 +0800 Subject: [PATCH 05/14] Revert some changes --- .../authme/util/message/MiniMessageUtils.java | 24 ------------------- 1 file changed, 24 deletions(-) diff --git a/src/main/java/fr/xephi/authme/util/message/MiniMessageUtils.java b/src/main/java/fr/xephi/authme/util/message/MiniMessageUtils.java index 2fe728112..36756c620 100644 --- a/src/main/java/fr/xephi/authme/util/message/MiniMessageUtils.java +++ b/src/main/java/fr/xephi/authme/util/message/MiniMessageUtils.java @@ -1,23 +1,11 @@ package fr.xephi.authme.util.message; -import fr.xephi.authme.util.Utils; import net.kyori.adventure.text.Component; import net.kyori.adventure.text.minimessage.MiniMessage; -import net.kyori.adventure.text.serializer.bungeecord.BungeeComponentSerializer; import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer; -import net.md_5.bungee.api.chat.BaseComponent; public class MiniMessageUtils { private static final MiniMessage miniMessage = MiniMessage.miniMessage(); - private static final BungeeComponentSerializer bungeeSerializer; - - static { - if (Utils.MAJOR_VERSION >= 16) { - bungeeSerializer = BungeeComponentSerializer.get(); - } else { - bungeeSerializer = BungeeComponentSerializer.legacy(); - } - } /** * Parse a MiniMessage string into a legacy string. @@ -29,18 +17,6 @@ public static String parseMiniMessageToLegacy(String message) { Component component = miniMessage.deserialize(message); return LegacyComponentSerializer.legacyAmpersand().serialize(component); } - - /** - * Parse a MiniMessage string into a BaseComponent. - * - * @param message The message to parse. - * @return The parsed message. - */ - public static BaseComponent[] parseMiniMessageToBaseComponent(String message) { - Component component = miniMessage.deserialize(message); - return bungeeSerializer.serialize(component); - } - private MiniMessageUtils() { } } From 5b52a0ff000267c06041d010b29d3aaa308f5d67 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 04:48:06 +0000 Subject: [PATCH 06/14] Bump org.apache.maven.plugins:maven-clean-plugin from 3.3.2 to 3.4.0 Bumps [org.apache.maven.plugins:maven-clean-plugin](https://github.com/apache/maven-clean-plugin) from 3.3.2 to 3.4.0. - [Release notes](https://github.com/apache/maven-clean-plugin/releases) - [Commits](https://github.com/apache/maven-clean-plugin/compare/maven-clean-plugin-3.3.2...maven-clean-plugin-3.4.0) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-clean-plugin dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7de8a2952..7117c1ecf 100644 --- a/pom.xml +++ b/pom.xml @@ -151,7 +151,7 @@ org.apache.maven.plugins maven-clean-plugin - 3.3.2 + 3.4.0 From 4df4a1fa4b721864672aa8865fcaa57a304e0be8 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 20 Jun 2024 04:48:58 +0000 Subject: [PATCH 07/14] Bump org.apache.maven.plugins:maven-jar-plugin from 3.4.1 to 3.4.2 Bumps [org.apache.maven.plugins:maven-jar-plugin](https://github.com/apache/maven-jar-plugin) from 3.4.1 to 3.4.2. - [Release notes](https://github.com/apache/maven-jar-plugin/releases) - [Commits](https://github.com/apache/maven-jar-plugin/compare/maven-jar-plugin-3.4.1...maven-jar-plugin-3.4.2) --- updated-dependencies: - dependency-name: org.apache.maven.plugins:maven-jar-plugin dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 7de8a2952..9b22fc3bb 100644 --- a/pom.xml +++ b/pom.xml @@ -199,7 +199,7 @@ org.apache.maven.plugins maven-jar-plugin - 3.4.1 + 3.4.2 From 7d255dfa3073db3771a9f918ac2bfe29d2438cba Mon Sep 17 00:00:00 2001 From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> Date: Thu, 27 Jun 2024 11:57:17 +0800 Subject: [PATCH 08/14] Sync with upstream & Bump version number --- pom.xml | 2 +- src/main/java/fr/xephi/authme/AuthMe.java | 4 ++-- .../xephi/authme/process/join/AsynchronousJoin.java | 4 +--- .../process/logout/ProcessSyncPlayerLogout.java | 4 +--- .../process/unregister/AsynchronousUnregister.java | 4 +--- .../java/fr/xephi/authme/service/BukkitService.java | 12 ++++++++++++ src/main/resources/plugin.yml | 5 ++++- 7 files changed, 22 insertions(+), 13 deletions(-) diff --git a/pom.xml b/pom.xml index 7de8a2952..937c234bf 100644 --- a/pom.xml +++ b/pom.xml @@ -699,7 +699,7 @@ - + com.maxmind.db maxmind-db-gson diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 8731693b2..780fcf6a3 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -74,9 +74,9 @@ public class AuthMe extends JavaPlugin { private static final int CLEANUP_INTERVAL = 5 * TICKS_PER_MINUTE; // Version and build number values - private static String pluginVersion = "5.6.0-Fork"; + private static String pluginVersion = "5.6.1-Fork"; private static final String pluginBuild = "b"; - private static String pluginBuildNumber = "50"; + private static String pluginBuildNumber = "51"; // Private instances private EmailService emailService; private CommandHandler commandHandler; diff --git a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java index dbfd9df06..424c49896 100644 --- a/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java +++ b/src/main/java/fr/xephi/authme/process/join/AsynchronousJoin.java @@ -29,8 +29,6 @@ import org.bukkit.GameMode; import org.bukkit.Server; import org.bukkit.entity.Player; -import org.bukkit.potion.PotionEffect; -import org.bukkit.potion.PotionEffectType; import javax.inject.Inject; import java.util.Locale; @@ -208,7 +206,7 @@ private void processJoinSync(Player player, boolean isAuthAvailable) { int blindTimeOut = (registrationTimeout <= 0) ? 99999 : registrationTimeout; // AuthMeReReloaded - Fix potion apply on Folia - bukkitService.runTaskIfFolia(player,() -> player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, blindTimeOut, 2))); + bukkitService.runTaskIfFolia(player, () -> player.addPotionEffect(bukkitService.createBlindnessEffect(blindTimeOut))); } commandManager.runCommandsOnJoin(player); }); diff --git a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncPlayerLogout.java b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncPlayerLogout.java index 6aeed332c..96865e21c 100644 --- a/src/main/java/fr/xephi/authme/process/logout/ProcessSyncPlayerLogout.java +++ b/src/main/java/fr/xephi/authme/process/logout/ProcessSyncPlayerLogout.java @@ -14,8 +14,6 @@ import fr.xephi.authme.settings.properties.RegistrationSettings; import fr.xephi.authme.settings.properties.RestrictionSettings; import org.bukkit.entity.Player; -import org.bukkit.potion.PotionEffect; -import org.bukkit.potion.PotionEffectType; import javax.inject.Inject; @@ -75,7 +73,7 @@ private void applyLogoutEffect(Player player) { // Apply Blindness effect if (service.getProperty(RegistrationSettings.APPLY_BLIND_EFFECT)) { int timeout = service.getProperty(RestrictionSettings.TIMEOUT) * TICKS_PER_SECOND; - player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, timeout, 2)); + player.addPotionEffect(bukkitService.createBlindnessEffect(timeout)); } // Set player's data to unauthenticated diff --git a/src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java b/src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java index b69b99304..caecd295e 100644 --- a/src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java +++ b/src/main/java/fr/xephi/authme/process/unregister/AsynchronousUnregister.java @@ -23,8 +23,6 @@ import fr.xephi.authme.settings.properties.RestrictionSettings; import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -import org.bukkit.potion.PotionEffect; -import org.bukkit.potion.PotionEffectType; import javax.inject.Inject; @@ -150,7 +148,7 @@ private void performPostUnregisterActions(String name, Player player) { private void applyBlindEffect(Player player) { if (service.getProperty(RegistrationSettings.APPLY_BLIND_EFFECT)) { int timeout = service.getProperty(RestrictionSettings.TIMEOUT) * TICKS_PER_SECOND; - player.addPotionEffect(new PotionEffect(PotionEffectType.BLINDNESS, timeout, 2)); + bukkitService.runTaskIfFolia(player, () -> player.addPotionEffect(bukkitService.createBlindnessEffect(timeout))); } } diff --git a/src/main/java/fr/xephi/authme/service/BukkitService.java b/src/main/java/fr/xephi/authme/service/BukkitService.java index d78ea92e2..8a8997955 100644 --- a/src/main/java/fr/xephi/authme/service/BukkitService.java +++ b/src/main/java/fr/xephi/authme/service/BukkitService.java @@ -18,6 +18,8 @@ import org.bukkit.entity.Entity; import org.bukkit.entity.Player; import org.bukkit.event.Event; +import org.bukkit.potion.PotionEffect; +import org.bukkit.potion.PotionEffectType; import javax.inject.Inject; import java.util.Collection; @@ -327,6 +329,16 @@ public E createAndCallEvent(Function eventSupplier return event; } + /** + * Creates a PotionEffect with blindness for the given duration in ticks. + * + * @param timeoutInTicks duration of the effect in ticks + * @return blindness potion effect + */ + public PotionEffect createBlindnessEffect(int timeoutInTicks) { + return new PotionEffect(PotionEffectType.BLINDNESS, timeoutInTicks, 2); + } + /** * Gets the world with the given name. * diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 7219d0b24..6d014c345 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -1,10 +1,13 @@ +# noinspection YAMLSchemaValidation name: ${pluginDescription.name} +# noinspection YAMLSchemaValidation authors: [${pluginDescription.authors}] website: https://github.com/HaHaWTH/AuthMeReReloaded/ description: A fork of AuthMeReloaded that contains bug fixes +# noinspection YAMLSchemaValidation main: ${pluginDescription.main} folia-supported: true -version: 5.6.0-FORK-b50 +version: 5.6.1-FORK-b51 api-version: 1.13 softdepend: - Vault From 7130d3989ca81e10249369bc8f47517e8415c927 Mon Sep 17 00:00:00 2001 From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> Date: Thu, 27 Jun 2024 12:02:24 +0800 Subject: [PATCH 09/14] Bump version number --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index f49364d17..122bc5c54 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ fr.xephi authme - 5.6.0-FORK + 5.6.1-FORK AuthMeReReloaded Fork of the first authentication plugin for the Bukkit API! From f25610c90b2d1d0356f4260f13f7bb3e8546dc70 Mon Sep 17 00:00:00 2001 From: HaHaWTH <102713261+HaHaWTH@users.noreply.github.com> Date: Thu, 27 Jun 2024 12:10:57 +0800 Subject: [PATCH 10/14] Fix workflow --- .github/workflows/maven.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/maven.yml b/.github/workflows/maven.yml index 78b3e0ee0..9a188235e 100644 --- a/.github/workflows/maven.yml +++ b/.github/workflows/maven.yml @@ -25,7 +25,7 @@ jobs: uses: actions/upload-artifact@v4 with: name: Download - path: ./target/AuthMe-5.6.0-FORK-Universal.jar + path: ./target/AuthMe-*-FORK-Universal.jar runtime-test: name: Plugin Runtime Test needs: [Build] From 9b0a4a003e863ad21cb8885161829728b98a3518 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kobe=20=E2=91=A7?= <102713261+HaHaWTH@users.noreply.github.com> Date: Sun, 30 Jun 2024 12:18:46 +0800 Subject: [PATCH 11/14] Bump version to 5.7.0-FORK --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 122bc5c54..3a6fb4169 100644 --- a/pom.xml +++ b/pom.xml @@ -6,7 +6,7 @@ fr.xephi authme - 5.6.1-FORK + 5.7.0-FORK AuthMeReReloaded Fork of the first authentication plugin for the Bukkit API! From c99fc5c3898dd715f643930a6fd53723dec31c53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kobe=20=E2=91=A7?= <102713261+HaHaWTH@users.noreply.github.com> Date: Sun, 30 Jun 2024 12:19:19 +0800 Subject: [PATCH 12/14] Update plugin.yml --- src/main/resources/plugin.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/plugin.yml b/src/main/resources/plugin.yml index 6d014c345..72e1ea9ba 100644 --- a/src/main/resources/plugin.yml +++ b/src/main/resources/plugin.yml @@ -7,7 +7,7 @@ description: A fork of AuthMeReloaded that contains bug fixes # noinspection YAMLSchemaValidation main: ${pluginDescription.main} folia-supported: true -version: 5.6.1-FORK-b51 +version: 5.7.0-FORK-b51 api-version: 1.13 softdepend: - Vault From 655c5ca42c8f53551f99f4efa840dc4960568f4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kobe=20=E2=91=A7?= <102713261+HaHaWTH@users.noreply.github.com> Date: Sun, 30 Jun 2024 12:20:05 +0800 Subject: [PATCH 13/14] Bump version to 5.7.0-Fork --- src/main/java/fr/xephi/authme/AuthMe.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/fr/xephi/authme/AuthMe.java b/src/main/java/fr/xephi/authme/AuthMe.java index 780fcf6a3..f2bff2dd7 100644 --- a/src/main/java/fr/xephi/authme/AuthMe.java +++ b/src/main/java/fr/xephi/authme/AuthMe.java @@ -74,7 +74,7 @@ public class AuthMe extends JavaPlugin { private static final int CLEANUP_INTERVAL = 5 * TICKS_PER_MINUTE; // Version and build number values - private static String pluginVersion = "5.6.1-Fork"; + private static String pluginVersion = "5.7.0-Fork"; private static final String pluginBuild = "b"; private static String pluginBuildNumber = "51"; // Private instances From 37e6e9feb699c1bb62690f2061a1d00cda233f61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 2 Jul 2024 05:07:13 +0000 Subject: [PATCH 14/14] Bump org.checkerframework:checker-qual from 3.40.0 to 3.45.0 Bumps [org.checkerframework:checker-qual](https://github.com/typetools/checker-framework) from 3.40.0 to 3.45.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.40.0...checker-framework-3.45.0) --- updated-dependencies: - dependency-name: org.checkerframework:checker-qual dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3a6fb4169..7fed3926d 100644 --- a/pom.xml +++ b/pom.xml @@ -1128,7 +1128,7 @@ org.checkerframework checker-qual - 3.40.0 + 3.45.0 test