Skip to content

Commit e45aa85

Browse files
refactor: clean up config - rename fields, remove redundant server fields, drop migrations
- Rename QueueTypeConfiguration.order → priority (higher = higher priority) - Rename QueueTypeConfiguration.slots → reservedSlots for clarity - Mark singular queueServer/targetServer/sourceServer as @ignore (use queue groups instead) - Remove ConfigMigrator and all migration code (no released version to migrate from) - Fix rebuildKickWhenDownServers to use resolved queue groups with fallback values - Fix postProcess order: build types and groups before resolving kick-when-down servers - Simplify QueueEnvironment by removing singular-field fallbacks - Update all tests to use queue group helpers instead of removed singular accessors Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
1 parent 62c1590 commit e45aa85

10 files changed

Lines changed: 182 additions & 685 deletions

File tree

shared/src/main/java/net/pistonmaster/pistonqueue/shared/config/Config.java

Lines changed: 62 additions & 189 deletions
Large diffs are not rendered by default.

shared/src/main/java/net/pistonmaster/pistonqueue/shared/config/ConfigMigrator.java

Lines changed: 0 additions & 116 deletions
This file was deleted.

shared/src/main/java/net/pistonmaster/pistonqueue/shared/plugin/PistonQueuePlugin.java

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import de.exlll.configlib.YamlConfigurations;
2626
import net.pistonmaster.pistonqueue.shared.chat.MessageType;
2727
import net.pistonmaster.pistonqueue.shared.config.Config;
28-
import net.pistonmaster.pistonqueue.shared.config.ConfigMigrator;
2928
import net.pistonmaster.pistonqueue.shared.queue.QueueGroup;
3029
import net.pistonmaster.pistonqueue.shared.queue.QueueListenerShared;
3130
import net.pistonmaster.pistonqueue.shared.queue.QueueType;
@@ -71,18 +70,7 @@ public interface PistonQueuePlugin {
7170

7271
default void scheduleTasks(QueueListenerShared queueListener) {
7372
Config config = getConfiguration();
74-
QueueGroup resolvedDefaultGroup = config.getDefaultGroup();
75-
if (resolvedDefaultGroup == null) {
76-
List<QueueType> queueTypes = config.getAllQueueTypes();
77-
resolvedDefaultGroup = new QueueGroup(
78-
"default",
79-
Collections.singletonList(config.queueServer()),
80-
Collections.singletonList(config.targetServer()),
81-
config.enableSourceServer() ? Collections.singletonList(config.sourceServer()) : Collections.emptyList(),
82-
queueTypes
83-
);
84-
}
85-
final QueueGroup defaultGroup = resolvedDefaultGroup;
73+
final QueueGroup defaultGroup = config.getDefaultGroup();
8674
// Sends the position message and updates tab on an interval in chat
8775
schedule(() -> {
8876
boolean targetsOnline = defaultGroup.targetServers().stream().anyMatch(queueListener.getServerStatusManager().getOnlineServers()::contains);
@@ -305,8 +293,7 @@ default void processConfig(Path dataDirectory) {
305293
}
306294
}
307295

308-
default void loadConfig(Path file) throws IOException {
309-
ConfigMigrator.migrate(file);
296+
default void loadConfig(Path file) {
310297
Config loaded = YamlConfigurations.update(
311298
file,
312299
Config.class,

shared/src/main/java/net/pistonmaster/pistonqueue/shared/queue/QueueType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public class QueueType {
4747
private final AtomicInteger playersWithTypeInTarget = new AtomicInteger();
4848
private final String name;
4949
@Setter
50-
private volatile int order;
50+
private volatile int priority;
5151
@Setter
5252
private String permission;
5353
@Setter

shared/src/main/java/net/pistonmaster/pistonqueue/shared/queue/logic/QueueEnvironment.java

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@
2525
import net.pistonmaster.pistonqueue.shared.queue.QueueGroup;
2626
import net.pistonmaster.pistonqueue.shared.queue.QueueType;
2727

28-
import java.util.List;
2928
import java.util.Objects;
3029
import java.util.Set;
3130
import java.util.function.Supplier;
@@ -57,20 +56,7 @@ public Set<String> onlineServers() {
5756
}
5857

5958
public QueueGroup defaultGroup() {
60-
Config config = config();
61-
QueueGroup group = config.getDefaultGroup();
62-
if (group != null) {
63-
return group;
64-
}
65-
66-
List<QueueType> queueTypes = config.getAllQueueTypes();
67-
return new QueueGroup(
68-
"default",
69-
List.of(config.queueServer()),
70-
List.of(config.targetServer()),
71-
config.enableSourceServer() ? List.of(config.sourceServer()) : List.of(),
72-
queueTypes
73-
);
59+
return config().getDefaultGroup();
7460
}
7561

7662
public QueueGroup resolveGroupForTarget(String server) {
@@ -86,9 +72,6 @@ public QueueGroup resolveGroupForType(QueueType type) {
8672
}
8773

8874
public String defaultTarget(QueueGroup group) {
89-
if (group.targetServers().isEmpty()) {
90-
return config().targetServer();
91-
}
9275
return group.targetServers().getFirst();
9376
}
9477

0 commit comments

Comments
 (0)