Merge branch 'master-big-events'

core/src/main/java/eu/mhsl/craftattack/spawn/core/Main.java

@@ -10,6 +10,7 @@ import org.bukkit.plugin.java.JavaPlugin;
 import org.reflections.Reflections;
 
 import java.lang.reflect.ParameterizedType;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.logging.Level;
@@ -49,7 +50,7 @@ public final class Main extends JavaPlugin {
         Main.logger().info(String.format("Loaded %d repositories!", this.repositoryLoader.getRepositories().size()));
 
         Main.logger().info("Loading appliances...");
-        this.appliances = this.findSubtypesOf(Appliance.class).stream()
+        this.appliances = new ArrayList<>(this.findSubtypesOf(Appliance.class).stream()
             .filter(applianceClass -> !disabledAppliances.contains(applianceClass.getSimpleName()))
             .filter(appliance -> {
                 Appliance.Flags flags = appliance.getAnnotation(Appliance.Flags.class);
@@ -63,14 +64,17 @@ public final class Main extends JavaPlugin {
                     throw new RuntimeException(String.format("Failed to create instance of '%s'", applianceClass.getName()), e);
                 }
             })
-            .toList();
+            .toList());
         Main.logger().info(String.format("Loaded %d appliances!", this.appliances.size()));
 
         Main.logger().info("Initializing appliances...");
-        this.appliances.forEach(appliance -> {
-            appliance.onEnable();
-            appliance.initialize(this);
-        });
+        this.appliances.stream()
+            .filter(appliance -> {
+                Appliance.Flags flags = appliance.getClass().getAnnotation(Appliance.Flags.class);
+                if(flags == null) return true;
+                return flags.autoload();
+            })
+            .forEach(appliance -> appliance.enableSequence(this));
         Main.logger().info(String.format("Initialized %d appliances!", this.appliances.size()));
 
         if(Configuration.pluginConfig.getBoolean("httpServerEnabled", true)) {
@@ -85,17 +89,34 @@ public final class Main extends JavaPlugin {
     @Override
     public void onDisable() {
         Main.logger().info("Disabling appliances...");
-        this.appliances.forEach(appliance -> {
-            Main.logger().info("Disabling " + appliance.getClass().getSimpleName());
-            appliance.onDisable();
-            appliance.destruct(this);
-        });
+        this.appliances.forEach(appliance -> appliance.disableSequence(this));
 
         HandlerList.unregisterAll(this);
         Bukkit.getScheduler().cancelTasks(this);
         Main.logger().info("Disabled " + this.appliances.size() + " appliances!");
     }
 
+    public Appliance restartAppliance(Class<? extends Appliance> applianceClass) {
+        Appliance oldAppliance = this.appliances.stream()
+            .filter(appliance -> appliance.getClass().equals(applianceClass))
+            .findFirst()
+            .orElseThrow();
+        oldAppliance.disableSequence(this);
+        this.appliances.remove(oldAppliance);
+        Appliance newAppliance = this.createApplianceInstance(applianceClass);
+        this.appliances.add(newAppliance);
+        newAppliance.enableSequence(this);
+        return newAppliance;
+    }
+
+    private Appliance createApplianceInstance(Class<? extends Appliance> applianceClass) {
+        try {
+            return applianceClass.getDeclaredConstructor().newInstance();
+        } catch(Exception e) {
+            throw new RuntimeException(String.format("Failed to create instance of '%s'", applianceClass.getName()), e);
+        }
+    }
+
     public <T extends Appliance> T getAppliance(Class<T> clazz) {
         return this.appliances.stream()
             .filter(clazz::isInstance)

core/src/main/java/eu/mhsl/craftattack/spawn/core/appliance/Appliance.java

@@ -28,6 +28,7 @@ public abstract class Appliance {
     @Retention(RetentionPolicy.RUNTIME)
     public @interface Flags {
         boolean enabled() default true;
+        boolean autoload() default true;
     }
 
     private String localConfigPath;
@@ -101,9 +102,20 @@ public abstract class Appliance {
     }
 
     public void destruct(@NotNull JavaPlugin plugin) {
+        if(this.listeners == null) return;
         this.listeners.forEach(HandlerList::unregisterAll);
     }
 
+    public void enableSequence(JavaPlugin plugin) {
+        this.onEnable();
+        this.initialize(plugin);
+    }
+
+    public void disableSequence(JavaPlugin plugin) {
+        this.onDisable();
+        this.destruct(plugin);
+    }
+
     protected <T extends Appliance> T queryAppliance(Class<T> clazz) {
         return Main.instance().getAppliance(clazz);
     }