Skip to content

auto detect all worlds #48

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

Open
JustCheburek wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

auto detect all worlds #48

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
88 changes: 74 additions & 14 deletions src/main/java/me/zetastormy/akropolis/module/ModuleManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@
import org.bukkit.Bukkit;
import org.bukkit.World;
import org.bukkit.configuration.file.FileConfiguration;
import org.bukkit.event.EventHandler;
import org.bukkit.event.HandlerList;
import org.bukkit.event.Listener;
import org.bukkit.event.world.WorldLoadEvent;
import org.bukkit.event.world.WorldUnloadEvent;

import me.zetastormy.akropolis.AkropolisPlugin;
import me.zetastormy.akropolis.config.ConfigType;
Expand All @@ -55,10 +59,12 @@
import me.zetastormy.akropolis.module.modules.world.SongPlayerManager;
import me.zetastormy.akropolis.module.modules.world.WorldProtect;

public class ModuleManager {
public class ModuleManager implements Listener {
private final Map<ModuleType, Module> modules = new EnumMap<>(ModuleType.class);
private AkropolisPlugin plugin;
private List<String> disabledWorlds;
private List<String> configuredWorldsList;
private boolean invertWorldList;

public void loadModules(AkropolisPlugin plugin) {
this.plugin = plugin;
Expand All @@ -67,19 +73,20 @@ public void loadModules(AkropolisPlugin plugin) {
unloadModules();

FileConfiguration config = plugin.getConfigManager().getFile(ConfigType.SETTINGS).get();
disabledWorlds = config.getStringList("disabled-worlds.worlds");

if (config.getBoolean("disabled-worlds.invert")) {
List<String> newDisabledWorlds = new ArrayList<>();

for (World world : Bukkit.getWorlds()) {
newDisabledWorlds.add(world.getName());
}

disabledWorlds = newDisabledWorlds;

for (String world : config.getStringList("disabled-worlds.worlds")) {
disabledWorlds.remove(world);
configuredWorldsList = new ArrayList<>(config.getStringList("disabled-worlds.worlds"));
invertWorldList = config.getBoolean("disabled-worlds.invert");

// Recalculate disabled worlds based on current loaded worlds
updateDisabledWorldsList();

// Register this listener to handle dynamic world loading
plugin.getServer().getPluginManager().registerEvents(this, plugin);

// Log enabled and disabled worlds
List<String> enabledWorlds = new ArrayList<>();
for (World world : Bukkit.getWorlds()) {
if (!disabledWorlds.contains(world.getName())) {
enabledWorlds.add(world.getName());
}
}

Expand Down Expand Up @@ -127,7 +134,60 @@ public void loadModules(AkropolisPlugin plugin) {
plugin.getLogger().log(Level.INFO, "Loaded {0} plugin modules.", modules.size());
}

private void updateDisabledWorldsList() {
List<String> newDisabledWorlds = new ArrayList<>();

if (invertWorldList) {
// Invert mode: whitelist (configured worlds are ENABLED, others are DISABLED)
for (World world : Bukkit.getWorlds()) {
String worldName = world.getName();
if (!configuredWorldsList.contains(worldName)) {
newDisabledWorlds.add(worldName);
}
}
} else {
// Normal mode: blacklist (configured worlds are DISABLED)
newDisabledWorlds.addAll(configuredWorldsList);
}

disabledWorlds = newDisabledWorlds;
}

@EventHandler
public void onWorldLoad(WorldLoadEvent event) {
String worldName = event.getWorld().getName();

if (invertWorldList) {
// In invert mode, new worlds should be disabled unless in config
if (!configuredWorldsList.contains(worldName)) {
disabledWorlds.add(worldName);
} else {
// Remove from disabled if it wasn't already (just to be safe)
disabledWorlds.remove(worldName);
}
} else {
// In normal mode, remove from disabled if it's not explicitly configured
if (!configuredWorldsList.contains(worldName)) {
disabledWorlds.remove(worldName);
}
}

// Update all modules with the new disabled worlds list
for (Module module : modules.values()) {
module.setDisabledWorlds(disabledWorlds);
}
}

@EventHandler
public void onWorldUnload(WorldUnloadEvent event) {
String worldName = event.getWorld().getName();
disabledWorlds.remove(worldName);
}

public void unloadModules() {
// Unregister this listener
HandlerList.unregisterAll((Listener) this);

for (Module module : modules.values()) {
try {
HandlerList.unregisterAll(module);
Expand Down