GabrielTofvesson/SpigotInvTweaks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Loft configuration behaviour for magnet command

Browse Source
This commit is contained in:
Gabriel Tofvesson 2021-05-04 05:55:18 +02:00
parent 3ab058adfb
commit 69e827dc08
1 changed files with 8 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/dev/w1zzrd/invtweaks/command/MagnetCommandExecutor.java
View File

@ -24,18 +24,13 @@ import static dev.w1zzrd.invtweaks.InvTweaksPlugin.LOG_PLUGIN_NAME;
/** /**
* Handler for executions of /magnet command * Handler for executions of /magnet command
*/ */
public class MagnetCommandExecutor implements CommandExecutor { public class MagnetCommandExecutor extends ConfigurableCommandExecutor<MagnetConfig> {
private static final Logger logger = Bukkit.getLogger(); private static final Logger logger = Bukkit.getLogger();
private static final String CONFIG_PATH = "magnet";
private final Plugin plugin;
private MagnetConfig config;
private final DataStore data; private final DataStore data;
private final MagnetData magnetData; private final MagnetData magnetData;
private int divIndex = 0; private int divIndex = 0;
private BukkitTask refreshTask = null; private BukkitTask refreshTask = null;
@ -44,20 +39,10 @@ public class MagnetCommandExecutor implements CommandExecutor {
* Initialize the magnet executor and manger * Initialize the magnet executor and manger
* @param plugin Owner plugin for this executor * @param plugin Owner plugin for this executor
*/ */
public MagnetCommandExecutor(final Plugin plugin, final DataStore data) { public MagnetCommandExecutor(final Plugin plugin, final String path, final DataStore data) {
this.plugin = plugin; super(plugin, path);
this.data = data; this.data = data;
this.magnetData = data.loadData("magnets", MagnetData::blank); this.magnetData = data.loadData("magnets", MagnetData::blank);
// Don't call reloadConfig to ensure we don't leak `this` during construction (a bit pedantic)
config = loadConfig(plugin);
}
/**
* Reload magnet command configuration
*/
public void reloadConfig() {
config = loadConfig(plugin);
} }
@Override @Override
@ -189,6 +174,9 @@ public class MagnetCommandExecutor implements CommandExecutor {
* disabled. * disabled.
*/ */
public void updateMagnetismTask(final boolean checkOnline) { public void updateMagnetismTask(final boolean checkOnline) {
final MagnetConfig config = getConfig();
final Plugin plugin = getPlugin();
if (refreshTask == null && (!checkOnline || magnetData.onlineMagnets() > 0) && plugin.isEnabled()) { if (refreshTask == null && (!checkOnline || magnetData.onlineMagnets() > 0) && plugin.isEnabled()) {
refreshTask = Bukkit.getScheduler().runTaskTimer(plugin, this::taskApplyMagnetism, 0, config.getInterval()); refreshTask = Bukkit.getScheduler().runTaskTimer(plugin, this::taskApplyMagnetism, 0, config.getInterval());
logger.info(LOG_PLUGIN_NAME + " Activated magnetism check task"); logger.info(LOG_PLUGIN_NAME + " Activated magnetism check task");
@ -210,6 +198,8 @@ public class MagnetCommandExecutor implements CommandExecutor {
final List<UUID> activeMagnets = magnetData.getOnlineMagnetsView(); final List<UUID> activeMagnets = magnetData.getOnlineMagnetsView();
final int size = activeMagnets.size(); final int size = activeMagnets.size();
final MagnetConfig config = getConfig();
final int subdivide = config.getSubdivide(); final int subdivide = config.getSubdivide();
final double sqRadius = config.getRadius(); final double sqRadius = config.getRadius();
@ -264,16 +254,4 @@ public class MagnetCommandExecutor implements CommandExecutor {
public void onDisable() { public void onDisable() {
data.storeData("magnets", magnetData); data.storeData("magnets", magnetData);
} }
/**
* Load magnet configuration data for given plugin
* @param plugin Plugin for which to load configuration for
* @return Configuration from persistent data if available, else default configuration values
*/
private static MagnetConfig loadConfig(final Plugin plugin) {
return (MagnetConfig) plugin.getConfig().get(
CONFIG_PATH,
MagnetConfig.getDefault(plugin, CONFIG_PATH)
);
}
} }