refactor: follow liskov substitution principle in modules

Author: zetastormy

src/main/java/me/zetastormy/akropolis/module/LifeCycle.java

@@ -0,0 +1,27 @@
+/*
+ * This file is part of Akropolis
+ *
+ * Copyright (c) 2025 DevBlook Team and others
+ *
+ * Akropolis free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Akropolis is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Akropolis. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package me.zetastormy.akropolis.module;
+
+public interface LifeCycle {
+
+    default void onEnable() {}
+
+    default void onDisable() {}
+}

src/main/java/me/zetastormy/akropolis/module/Module.java

@@ -19,20 +19,21 @@
 
 package me.zetastormy.akropolis.module;
 
-import me.zetastormy.akropolis.AkropolisPlugin;
-import me.zetastormy.akropolis.config.ConfigType;
-import me.zetastormy.akropolis.cooldown.CooldownManager;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.UUID;
+
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.configuration.file.FileConfiguration;
 import org.bukkit.entity.Player;
 import org.bukkit.event.Listener;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.UUID;
+import me.zetastormy.akropolis.AkropolisPlugin;
+import me.zetastormy.akropolis.config.ConfigType;
+import me.zetastormy.akropolis.cooldown.CooldownManager;
 
-public abstract class Module implements Listener {
+public class Module implements Listener {
     private final AkropolisPlugin plugin;
     private final ModuleType moduleType;
     private List<String> disabledWorlds;
@@ -84,8 +85,4 @@ public void executeActions(Player player, List<String> actions) {
     public ModuleType getModuleType() {
         return moduleType;
     }
-
-    public abstract void onEnable();
-
-    public abstract void onDisable();
 }

src/main/java/me/zetastormy/akropolis/module/ModuleManager.java

@@ -111,7 +111,10 @@ public void loadModules(AkropolisPlugin plugin) {
         for (Module module : modules.values()) {
             try {
                 module.setDisabledWorlds(disabledWorlds);
-                module.onEnable();
+
+                if (module instanceof LifeCycle) {
+                    ((LifeCycle) module).onEnable();
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 plugin.getLogger().severe("There was an error loading the " + module.getModuleType() + " module");
@@ -128,7 +131,10 @@ public void unloadModules() {
         for (Module module : modules.values()) {
             try {
                 HandlerList.unregisterAll(module);
-                module.onDisable();
+
+                if (module instanceof LifeCycle) {
+                    ((LifeCycle) module).onDisable();
+                }
             } catch (Exception e) {
                 e.printStackTrace();
                 plugin.getLogger()

src/main/java/me/zetastormy/akropolis/module/modules/chat/AntiSwear.java

@@ -30,12 +30,13 @@
 import me.zetastormy.akropolis.Permissions;
 import me.zetastormy.akropolis.config.ConfigType;
 import me.zetastormy.akropolis.config.Message;
+import me.zetastormy.akropolis.module.LifeCycle;
 import me.zetastormy.akropolis.module.Module;
 import me.zetastormy.akropolis.module.ModuleType;
 import me.zetastormy.akropolis.util.text.TextUtil;
 import net.kyori.adventure.text.Component;
 
-public class AntiSwear extends Module {
+public class AntiSwear extends Module implements LifeCycle {
     private List<String> blockedWords;
 
     public AntiSwear(AkropolisPlugin plugin) {
@@ -47,11 +48,6 @@ public void onEnable() {
         blockedWords = getConfig(ConfigType.SETTINGS).getStringList("anti_swear.blocked_words");
     }
 
-    @Override
-    public void onDisable() {
-        // TODO: Refactor to follow Liskov Substitution principle.
-    }
-
     @EventHandler
     public void onPlayerChat(AsyncChatEvent event) {
         Player player = event.getPlayer();

src/main/java/me/zetastormy/akropolis/module/modules/chat/AutoBroadcast.java

@@ -33,12 +33,13 @@
 
 import me.zetastormy.akropolis.AkropolisPlugin;
 import me.zetastormy.akropolis.config.ConfigType;
+import me.zetastormy.akropolis.module.LifeCycle;
 import me.zetastormy.akropolis.module.Module;
 import me.zetastormy.akropolis.module.ModuleType;
 import me.zetastormy.akropolis.util.text.PlaceholderUtil;
 import net.kyori.adventure.text.Component;
 
-public class AutoBroadcast extends Module implements Runnable {
+public class AutoBroadcast extends Module implements Runnable, LifeCycle {
     private Map<Integer, List<String>> broadcasts;
     private int broadcastTask = 0;
     private int count = 0;

src/main/java/me/zetastormy/akropolis/module/modules/chat/ChatCommandBlock.java

@@ -29,10 +29,11 @@
 import me.zetastormy.akropolis.Permissions;
 import me.zetastormy.akropolis.config.ConfigType;
 import me.zetastormy.akropolis.config.Message;
+import me.zetastormy.akropolis.module.LifeCycle;
 import me.zetastormy.akropolis.module.Module;
 import me.zetastormy.akropolis.module.ModuleType;
 
-public class ChatCommandBlock extends Module {
+public class ChatCommandBlock extends Module implements LifeCycle {
     private List<String> blockedCommands;
 
     public ChatCommandBlock(AkropolisPlugin plugin) {
@@ -44,11 +45,6 @@ public void onEnable() {
         blockedCommands = getConfig(ConfigType.SETTINGS).getStringList("command_block.blocked_commands");
     }
 
-    @Override
-    public void onDisable() {
-        // TODO: Refactor to follow Liskov Substitution principle.
-    }
-
     @EventHandler
     public void onPlayerCommandPreprocess(PlayerCommandPreprocessEvent event) {
         Player player = event.getPlayer();

src/main/java/me/zetastormy/akropolis/module/modules/chat/ChatLock.java

@@ -19,18 +19,20 @@
 
 package me.zetastormy.akropolis.module.modules.chat;
 
+import org.bukkit.entity.Player;
+import org.bukkit.event.EventHandler;
+import org.bukkit.event.EventPriority;
+
 import io.papermc.paper.event.player.AsyncChatEvent;
 import me.zetastormy.akropolis.AkropolisPlugin;
 import me.zetastormy.akropolis.Permissions;
 import me.zetastormy.akropolis.config.ConfigType;
 import me.zetastormy.akropolis.config.Message;
+import me.zetastormy.akropolis.module.LifeCycle;
 import me.zetastormy.akropolis.module.Module;
 import me.zetastormy.akropolis.module.ModuleType;
-import org.bukkit.entity.Player;
-import org.bukkit.event.EventHandler;
-import org.bukkit.event.EventPriority;
 
-public class ChatLock extends Module {
+public class ChatLock extends Module implements LifeCycle {
     private boolean isChatLocked;
 
     public ChatLock(AkropolisPlugin plugin) {

src/main/java/me/zetastormy/akropolis/module/modules/chat/groups/ChatGroups.java

@@ -33,13 +33,14 @@
 import io.papermc.paper.event.player.AsyncChatEvent;
 import me.zetastormy.akropolis.AkropolisPlugin;
 import me.zetastormy.akropolis.config.ConfigType;
+import me.zetastormy.akropolis.module.LifeCycle;
 import me.zetastormy.akropolis.module.Module;
 import me.zetastormy.akropolis.module.ModuleType;
 import me.zetastormy.akropolis.util.text.TextUtil;
 import net.kyori.adventure.text.Component;
 import net.kyori.adventure.text.serializer.legacy.LegacyComponentSerializer;
 
-public class ChatGroups extends Module {
+public class ChatGroups extends Module implements LifeCycle {
     private final Map<String, ChatGroup> chatGroups = new HashMap<>();
 
     public ChatGroups(AkropolisPlugin plugin) {

src/main/java/me/zetastormy/akropolis/module/modules/hologram/HologramManager.java

@@ -19,26 +19,28 @@
 
 package me.zetastormy.akropolis.module.modules.hologram;
 
-import me.zetastormy.akropolis.AkropolisPlugin;
-import me.zetastormy.akropolis.config.ConfigHandler;
-import me.zetastormy.akropolis.config.ConfigType;
-import me.zetastormy.akropolis.module.Module;
-import me.zetastormy.akropolis.module.ModuleType;
-import me.zetastormy.akropolis.util.text.TextUtil;
-import net.kyori.adventure.text.Component;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
+
 import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.World;
 import org.bukkit.configuration.ConfigurationSection;
 import org.bukkit.entity.ArmorStand;
 import org.bukkit.entity.Entity;
 
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Set;
+import me.zetastormy.akropolis.AkropolisPlugin;
+import me.zetastormy.akropolis.config.ConfigHandler;
+import me.zetastormy.akropolis.config.ConfigType;
+import me.zetastormy.akropolis.module.LifeCycle;
+import me.zetastormy.akropolis.module.Module;
+import me.zetastormy.akropolis.module.ModuleType;
+import me.zetastormy.akropolis.util.text.TextUtil;
+import net.kyori.adventure.text.Component;
 
-public class HologramManager extends Module {
+public class HologramManager extends Module implements LifeCycle {
     private Set<Hologram> holograms;
     private ConfigHandler dataConfig;
     private ConfigurationSection hologramsSection;

src/main/java/me/zetastormy/akropolis/module/modules/hotbar/HotbarManager.java

@@ -33,14 +33,15 @@
 
 import me.zetastormy.akropolis.AkropolisPlugin;
 import me.zetastormy.akropolis.config.ConfigType;
+import me.zetastormy.akropolis.module.LifeCycle;
 import me.zetastormy.akropolis.module.Module;
 import me.zetastormy.akropolis.module.ModuleType;
 import me.zetastormy.akropolis.module.modules.hotbar.items.CustomItem;
 import me.zetastormy.akropolis.module.modules.hotbar.items.FightMode;
 import me.zetastormy.akropolis.module.modules.hotbar.items.PlayerHider;
 import me.zetastormy.akropolis.util.ItemStackBuilder;
 
-public class HotbarManager extends Module {
+public class HotbarManager extends Module implements LifeCycle {
     private List<HotbarItem> hotbarItems;
     private Set<UUID> players;