Skip to content

Support servers config in ServerRegistrationListener #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RobotHanzo merged 3 commits into from
Jan 31, 2026
Merged

Support servers config in ServerRegistrationListener #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cbd1bbd
Initial plan
Copilot Jan 31, 2026
1e94b0e
Add support for servers configuration in ServerRegistrationListener
Copilot Jan 31, 2026
0c44b63
Add clarifying comment for duplicate serverName parameter
Copilot Jan 31, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 22 additions & 3 deletions ...src/main/java/com/convallyria/forcepack/velocity/listener/ServerRegistrationListener.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,35 @@ public ServerRegistrationListener(ForcePackVelocity plugin) {
public void onServerRegistered(ServerRegisteredEvent event) {
RegisteredServer registeredServer = event.registeredServer();
String serverName = registeredServer.getServerInfo().getName();
VelocityConfig groups = plugin.getConfig().getConfig("groups");

if (groups == null) return;

// Check if we already have packs for this server
boolean hasPack = plugin.getResourcePacks().stream()
.anyMatch(pack -> pack.getServer().equals(serverName));

if (hasPack) return;

// Check the "servers" configuration first
VelocityConfig servers = plugin.getConfig().getConfig("servers");
if (servers != null) {
VelocityConfig serverConfig = servers.getConfig(serverName);
Comment on lines +32 to +34
Copy link

Copilot AI Jan 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

VelocityConfig servers is declared here, but later in the method (inside the groups loop) there is also a List<String> servers local variable. Java does not allow redeclaring a local variable name in an inner scope, so this will fail to compile. Rename one of them (e.g., serversConfig for the config section, or serverPatterns for the list).

Suggested change
VelocityConfig servers = plugin.getConfig().getConfig("servers");
if (servers != null) {
VelocityConfig serverConfig = servers.getConfig(serverName);
VelocityConfig serversConfig = plugin.getConfig().getConfig("servers");
if (serversConfig != null) {
VelocityConfig serverConfig = serversConfig.getConfig(serverName);

Copilot uses AI. Check for mistakes.
if (serverConfig != null) {
plugin.log("New server %s matches servers configuration, adding resource packs...", serverName);

final Map<String, VelocityConfig> configs = plugin.getPackConfigs(serverConfig, serverName);

configs.forEach((id, config) -> {
if (config == null) return;
// serverName is used both as the config name and target server name
plugin.registerResourcePackForServer(config, id, serverName, "server", plugin.getConfig().getBoolean("verify-resource-packs"), serverName, null);
});
return;
}
Comment on lines +43 to +46
Copy link

Copilot AI Jan 31, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The return; after handling a servers.<serverName> match prevents groups configs from ever being applied to dynamically-registered servers that also have a direct servers entry. ForcePackVelocity.loadResourcePacks() loads both groups and servers (it calls addResourcePacks(..., "groups") and then addResourcePacks(..., "servers")), so this introduces inconsistent behavior between startup/reload and dynamic registration. Consider removing the early return (register server packs, then still check groups), or update the initialization path if servers is meant to override groups.

Copilot uses AI. Check for mistakes.
}

// Check the "groups" configuration
VelocityConfig groups = plugin.getConfig().getConfig("groups");
if (groups == null) return;

for (String groupName : groups.getKeys()) {
VelocityConfig groupConfig = groups.getConfig(groupName);
List<String> servers = groupConfig.getStringList("servers");
Expand Down
Loading