improve injection

Author: burdoto

src/core/main/java/org/comroid/mcsd/core/module/console/McsdCommandModule.java

@@ -27,7 +27,6 @@
 @Getter
 @ToString
 @FieldDefaults(level = AccessLevel.PRIVATE)
-@Component.Requires(ConsoleModule.class)
 public class McsdCommandModule extends ServerModule<McsdCommandModulePrototype> implements Command.Handler {
     public static final Pattern McsdPattern = ConsoleModule.commandPattern("mcsd");
     final Command.Manager cmdr = new Command.Manager(this);

src/core/main/java/org/comroid/mcsd/core/module/discord/DiscordModule.java

@@ -43,7 +43,6 @@
 @Log
 @Getter
 @ToString
-@Component.Requires(UpdateModule.class)
 @FieldDefaults(level = AccessLevel.PRIVATE)
 public final class LocalExecutionModule extends ConsoleModule<LocalExecutionModulePrototype> {
     public static final Pattern DonePattern = pattern("Done \\((?<time>[\\d.]+)s\\).*\\r?\\n?.*?");

src/core/main/java/org/comroid/mcsd/core/module/local/LocalExecutionModule.java

@@ -23,16 +23,16 @@
 @Getter
 @ToString
 @FieldDefaults(level = AccessLevel.PRIVATE)
-@Component.Requires(ConsoleModule.class)
 public class ConsolePlayerEventModule extends PlayerEventModule<ConsolePlayerEventModulePrototype> {
+    private @Inject ConsoleModule<?> console;
+
     public ConsolePlayerEventModule(Server server, ConsolePlayerEventModulePrototype proto) {
         super(server, proto);
     }
 
     @Override
     @SuppressWarnings({"RedundantSuppression", "RedundantTypeArguments", "RedundantCast"}) // intellij is being weird
     protected Event.Bus<PlayerEvent> initEventBus() {
-        ConsoleModule<?> console = server.component(ConsoleModule.class).orElseThrow(() -> new InitFailed("No Console module is loaded"));
         //noinspection unchecked
         return console.getBus()
                 .<Matcher>mapData(str -> Stream.of(ChatPattern, BroadcastPattern, JoinLeavePattern, AchievementPattern)

src/core/main/java/org/comroid/mcsd/core/module/player/ConsolePlayerEventModule.java

@@ -17,7 +17,6 @@
 @Getter
 @ToString
 @FieldDefaults(level = AccessLevel.PRIVATE)
-@Component.Requires({ConsoleModule.class, PlayerEventModule.class})
 public class ForceOpModule extends ServerModule<ForceOpModulePrototype> {
     private @Inject ConsoleModule<ConsoleModulePrototype> console;
     private @Inject PlayerEventModule<PlayerEventModulePrototype> events;

src/core/main/java/org/comroid/mcsd/core/module/player/ForceOpModule.java

@@ -13,10 +13,9 @@
 
 import static org.comroid.mcsd.core.util.ApplicationContextProvider.bean;
 
-@Component.Requires(ConsolePlayerEventModule.class)
 public class PlayerListModule extends ServerModule<PlayerListModulePrototype> {
     private final Set<User> players = new HashSet<>();
-    private ConsolePlayerEventModule chat;
+    private @Inject PlayerEventModule<?> chat;
     private UserRepo users;
 
     public PlayerListModule(Server server, PlayerListModulePrototype proto) {
@@ -25,7 +24,6 @@ public PlayerListModule(Server server, PlayerListModulePrototype proto) {
 
     @Override
     protected void $initialize() {
-        chat = server.component(ConsolePlayerEventModule.class).assertion();
         users = bean(UserRepo.class);
 
         chat.getBus().filterData(e->e.getType().hasFlag(PlayerEvent.Type.JoinLeave))

src/core/main/java/org/comroid/mcsd/core/module/player/PlayerListModule.java

@@ -38,21 +38,15 @@
 @Getter
 @ToString
 @FieldDefaults(level = AccessLevel.PRIVATE)
-@Component.Requires(LocalShellModule.class)
 public class BackupModule extends ServerModule<BackupModulePrototype> {
     public static final Pattern SaveCompletePattern = ConsoleModule.pattern("Saved the game");
     final AtomicReference<CompletableFuture<File>> currentBackup = new AtomicReference<>(CompletableFuture.completedFuture(null));
-    @Component.Inject ConsoleModule<?> consoleModule;
+    private @Inject ConsoleModule<?> consoleModule;
 
     public BackupModule(Server server, BackupModulePrototype proto) {
         super(server, proto);
     }
 
-    @Override
-    protected void $initialize() {
-        consoleModule = server.component(ConsoleModule.class).assertion();
-    }
-
     @Override
     protected void $tick() {
         var status = server.component(StatusModule.class).assertion().getCurrentStatus().getStatus();

src/core/main/java/org/comroid/mcsd/core/module/status/BackupModule.java

@@ -27,20 +27,14 @@
 @Getter
 @ToString
 @FieldDefaults(level = AccessLevel.PRIVATE)
-@Component.Requires({FileModule.class, StatusModule.class})
 public class UpdateModule extends ServerModule<UpdateModulePrototype> {
     final AtomicReference<@Nullable CompletableFuture<Boolean>> updateRunning = new AtomicReference<>();
-    @Inject FileModule<?> files;
+    private @Inject FileModule<?> files;
 
     public UpdateModule(Server server, UpdateModulePrototype proto) {
         super(server, proto);
     }
 
-    @Override
-    protected void $initialize() {
-        files= server.component(FileModule.class).assertion();
-    }
-
     @Override
     protected void $tick() {
         if ((proto.getUpdatePeriod() == null || proto.getLastUpdate().plus(proto.getUpdatePeriod()).isAfter(now()))

src/core/main/java/org/comroid/mcsd/core/module/status/UpdateModule.java

@@ -22,21 +22,14 @@
 @Getter
 @ToString
 @FieldDefaults(level = AccessLevel.PRIVATE)
-@Component.Requires({LocalExecutionModule.class, StatusModule.class})
 public class UptimeModule extends ServerModule<UptimeModulePrototype> {
-    LocalExecutionModule execution;
-    StatusModule statusModule;
+    private @Inject LocalExecutionModule execution;
+    private @Inject StatusModule statusModule;
 
     public UptimeModule(Server server, UptimeModulePrototype proto) {
         super(server, proto);
     }
 
-    @Override
-    protected void $initialize() {
-        execution = component(LocalExecutionModule.class).assertion();
-        statusModule = component(StatusModule.class).assertion();
-    }
-
     @Override
     protected void $tick() {
         pushUptime();