Release diff: master → previous_release #34
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,133 @@ | ||
| package md.thomas.asyncanticheat.bukkit; | ||
|
|
||
| import md.thomas.hopper.Dependency; | ||
| import md.thomas.hopper.FailurePolicy; | ||
| import md.thomas.hopper.LogLevel; | ||
| import md.thomas.hopper.bukkit.BukkitHopper; | ||
| import md.thomas.hopper.version.UpdatePolicy; | ||
| import org.bukkit.Bukkit; | ||
| import org.bukkit.plugin.Plugin; | ||
| import org.jetbrains.annotations.NotNull; | ||
|
|
||
| import java.io.File; | ||
| import java.util.logging.Logger; | ||
| import java.util.regex.Pattern; | ||
|
|
||
| /** | ||
| * Handles automatic downloading of PacketEvents using Hopper. | ||
| * <p> | ||
| * Downloaded plugins are automatically loaded at runtime without requiring a server restart. | ||
| */ | ||
| public final class AacHopper { | ||
|
|
||
| private static boolean downloadComplete = false; | ||
| private static boolean requiresRestart = false; | ||
| private static boolean enabled = true; | ||
|
|
||
| // Matches: packetevents.jar, packetevents-spigot-2.7.0.jar, PacketEvents-2.7.0.jar | ||
| private static final Pattern PACKETEVENTS_PATTERN = Pattern.compile( | ||
| "(?i)^packetevents([-_][\\w.-]*)?\\.jar$" | ||
| ); | ||
|
|
||
| private AacHopper() {} | ||
|
|
||
| /** | ||
| * Registers PacketEvents dependency with Hopper. | ||
| * Should be called in the plugin constructor. | ||
| * | ||
| * @param plugin the plugin instance | ||
| */ | ||
| public static void register(@NotNull Plugin plugin) { | ||
| Logger logger = plugin.getLogger(); | ||
|
|
||
| // Check if auto-download is disabled via system property (config not loaded in constructor) | ||
| if (Boolean.getBoolean("asyncanticheat.skipDependencyDownload")) { | ||
| enabled = false; | ||
| logger.info("Auto-download of dependencies is disabled"); | ||
| return; | ||
| } | ||
|
|
||
| BukkitHopper.register(plugin, deps -> { | ||
| // Check if PacketEvents is already installed | ||
| boolean hasPacketEvents = pluginJarExists(PACKETEVENTS_PATTERN); | ||
|
|
||
| if (!hasPacketEvents) { | ||
| // Primary source: Modrinth (auto-detects platform) | ||
| deps.require(Dependency.modrinth("packetevents") | ||
| .name("PacketEvents") | ||
| .minVersion("2.7.0") | ||
| .updatePolicy(UpdatePolicy.MINOR) | ||
| .onFailure(FailurePolicy.FAIL) | ||
| .build()); | ||
|
|
||
| // Fallback source: GitHub releases | ||
| deps.require(Dependency.github("retrooper/packetevents") | ||
| .name("PacketEvents") | ||
| .minVersion("2.7.0") | ||
| .assetPattern("*-spigot-*.jar") | ||
| .updatePolicy(UpdatePolicy.MINOR) | ||
| .onFailure(FailurePolicy.WARN_SKIP) | ||
| .build()); | ||
| } | ||
|
There was a problem hiding this comment. GitHub fallback unreachable when Modrinth download failsThe dependency registration intends to use GitHub as a fallback for Modrinth, but this won't work as coded. The Modrinth dependency uses |
||
| }); | ||
| } | ||
|
|
||
| /** | ||
| * Downloads all registered dependencies and automatically loads them. | ||
| * Should be called in the plugin's onLoad() method. | ||
| * | ||
| * @param plugin the plugin instance | ||
| * @return true if all dependencies are satisfied and loaded | ||
| */ | ||
| public static boolean download(@NotNull Plugin plugin) { | ||
| if (!enabled) { | ||
| downloadComplete = true; | ||
| return true; | ||
| } | ||
|
|
||
| Logger logger = plugin.getLogger(); | ||
| BukkitHopper.DownloadAndLoadResult result = BukkitHopper.downloadAndLoad(plugin, LogLevel.QUIET); | ||
|
|
||
| downloadComplete = true; | ||
| requiresRestart = !result.noRestartRequired(); | ||
|
|
||
| if (requiresRestart) { | ||
| logger.warning("Some dependencies require a server restart to load:"); | ||
| for (var failed : result.loadResult().failed()) { | ||
| logger.warning(" - " + failed.path().getFileName() + ": " + failed.error()); | ||
| } | ||
| } | ||
|
|
||
| return !requiresRestart; | ||
| } | ||
|
|
||
| /** | ||
| * @return true if a restart is required to load newly downloaded dependencies | ||
| */ | ||
| public static boolean requiresRestart() { | ||
| return requiresRestart; | ||
| } | ||
|
|
||
| /** | ||
| * @return true if the download phase has completed | ||
| */ | ||
| public static boolean isDownloadComplete() { | ||
| return downloadComplete; | ||
| } | ||
|
|
||
| /** | ||
| * Checks if a plugin jar file exists in the plugins folder using a regex pattern. | ||
| */ | ||
| private static boolean pluginJarExists(Pattern pattern) { | ||
| File pluginsFolder = Bukkit.getPluginsFolder(); | ||
| if (pluginsFolder == null || !pluginsFolder.exists()) { | ||
| return false; | ||
| } | ||
|
|
||
| File[] files = pluginsFolder.listFiles((dir, name) -> | ||
| pattern.matcher(name).matches() | ||
| ); | ||
|
|
||
| return files != null && files.length > 0; | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,3 +1,3 @@ | ||
| pluginVersion=0.4.1 | ||
|
|
||
|
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Static
enabledflag not reset on plugin reloadThe static
enabledfield is initialized totruebut only set tofalsewhen theskipDependencyDownloadsystem property is true. If the plugin is reloaded without a server restart (e.g., via a plugin manager), and the property was previously set to true but is now false/unset,enabledremainsfalsefrom the previous load. This causes dependency downloading to be incorrectly skipped because theregister()method never resetsenabledback totruewhen the property is false.