From 5670fed1e99adcd7d8c78528716967792e946a02 Mon Sep 17 00:00:00 2001 From: Charles Date: Mon, 7 Jan 2019 20:27:04 +0800 Subject: [PATCH] 1.0.0-SNAPSHOT-U184 + Updated method variables to allow for VariablePanelHandler + Fixed imports on AutoSpawnCustomSettingsEditorPanel --- .../autospawns/IAutoSpawnCustomSettingsHandler.java | 3 ++- .../epicbosses/autospawns/handlers/IntervalSpawnHandler.java | 3 ++- .../epicbosses/autospawns/types/IntervalSpawnElement.java | 5 +++-- .../panel/autospawns/AutoSpawnCustomSettingsEditorPanel.java | 4 +--- pom.xml | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/autospawns/IAutoSpawnCustomSettingsHandler.java b/plugin-modules/Core/src/com/songoda/epicbosses/autospawns/IAutoSpawnCustomSettingsHandler.java index 50e6eb2..886e619 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/autospawns/IAutoSpawnCustomSettingsHandler.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/autospawns/IAutoSpawnCustomSettingsHandler.java @@ -1,6 +1,7 @@ package com.songoda.epicbosses.autospawns; import com.songoda.epicbosses.skills.interfaces.ICustomSettingAction; +import com.songoda.epicbosses.utils.panel.base.handlers.VariablePanelHandler; import java.util.List; @@ -11,6 +12,6 @@ import java.util.List; */ public interface IAutoSpawnCustomSettingsHandler { - List getCustomSettingActions(AutoSpawn autoSpawn); + List getCustomSettingActions(AutoSpawn autoSpawn, VariablePanelHandler variablePanelHandler); } diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/autospawns/handlers/IntervalSpawnHandler.java b/plugin-modules/Core/src/com/songoda/epicbosses/autospawns/handlers/IntervalSpawnHandler.java index 7f143f7..3466e81 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/autospawns/handlers/IntervalSpawnHandler.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/autospawns/handlers/IntervalSpawnHandler.java @@ -12,6 +12,7 @@ import com.songoda.epicbosses.holder.autospawn.ActiveIntervalAutoSpawnHolder; import com.songoda.epicbosses.listeners.IBossDeathHandler; import com.songoda.epicbosses.utils.*; import com.songoda.epicbosses.utils.panel.base.ClickAction; +import com.songoda.epicbosses.utils.panel.base.handlers.VariablePanelHandler; import org.bukkit.Location; import org.bukkit.entity.Player; import org.bukkit.event.inventory.ClickType; @@ -88,7 +89,7 @@ public class IntervalSpawnHandler { return Arrays.asList("&7Click here to update the location", "&7of this interval spawn section.", "&7", "&7This will ask you to put something in chat", "&7in the specific format of the new", "&7location."); } - public ClickAction getPlaceholderAction(IntervalSpawnElement intervalSpawnElement) { + public ClickAction getPlaceholderAction(IntervalSpawnElement intervalSpawnElement, AutoSpawn autoSpawn, VariablePanelHandler variablePanelHandler) { return event -> {}; } diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/autospawns/types/IntervalSpawnElement.java b/plugin-modules/Core/src/com/songoda/epicbosses/autospawns/types/IntervalSpawnElement.java index 1ab3bb5..be75b88 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/autospawns/types/IntervalSpawnElement.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/autospawns/types/IntervalSpawnElement.java @@ -9,6 +9,7 @@ import com.songoda.epicbosses.managers.AutoSpawnManager; import com.songoda.epicbosses.skills.interfaces.ICustomSettingAction; import com.songoda.epicbosses.utils.StringUtils; import com.songoda.epicbosses.utils.panel.base.ClickAction; +import com.songoda.epicbosses.utils.panel.base.handlers.VariablePanelHandler; import lombok.Getter; import lombok.Setter; import org.bukkit.Location; @@ -38,12 +39,12 @@ public class IntervalSpawnElement implements IAutoSpawnCustomSettingsHandler { } @Override - public List getCustomSettingActions(AutoSpawn autoSpawn) { + public List getCustomSettingActions(AutoSpawn autoSpawn, VariablePanelHandler variablePanelHandler) { List clickActions = new ArrayList<>(); ItemStack clickStack = new ItemStack(Material.IRON_BLOCK); ClickAction lastBossKilledAction = this.intervalSpawnHandler.getSpawnAfterLastBossIsKilledAction(this); ClickAction locationAction = this.intervalSpawnHandler.getLocationAction(this); - ClickAction placeholderAction = this.intervalSpawnHandler.getPlaceholderAction(this); + ClickAction placeholderAction = this.intervalSpawnHandler.getPlaceholderAction(this, autoSpawn, variablePanelHandler); ClickAction spawnRateAction = this.intervalSpawnHandler.getSpawnRateAction(this, autoSpawn); clickActions.add(AutoSpawnManager.createAutoSpawnAction("Spawn After Last Boss Is Killed", getSpawnAfterLastBossIsKilled()+"", this.intervalSpawnHandler.getSpawnAfterLastBossIsKilledExtraInformation(), clickStack.clone(), lastBossKilledAction)); diff --git a/plugin-modules/Core/src/com/songoda/epicbosses/panel/autospawns/AutoSpawnCustomSettingsEditorPanel.java b/plugin-modules/Core/src/com/songoda/epicbosses/panel/autospawns/AutoSpawnCustomSettingsEditorPanel.java index 07e18fa..c4bf66b 100644 --- a/plugin-modules/Core/src/com/songoda/epicbosses/panel/autospawns/AutoSpawnCustomSettingsEditorPanel.java +++ b/plugin-modules/Core/src/com/songoda/epicbosses/panel/autospawns/AutoSpawnCustomSettingsEditorPanel.java @@ -3,10 +3,8 @@ package com.songoda.epicbosses.panel.autospawns; import com.songoda.epicbosses.CustomBosses; import com.songoda.epicbosses.api.BossAPI; import com.songoda.epicbosses.autospawns.AutoSpawn; -import com.songoda.epicbosses.managers.AutoSpawnManager; import com.songoda.epicbosses.managers.BossPanelManager; import com.songoda.epicbosses.skills.interfaces.ICustomSettingAction; -import com.songoda.epicbosses.utils.ObjectUtils; import com.songoda.epicbosses.utils.itemstack.ItemStackUtils; import com.songoda.epicbosses.utils.panel.Panel; import com.songoda.epicbosses.utils.panel.base.ClickAction; @@ -39,7 +37,7 @@ public class AutoSpawnCustomSettingsEditorPanel extends VariablePanelHandler customButtons = autoSpawn.getIntervalSpawnData().getCustomSettingActions(autoSpawn); + List customButtons = autoSpawn.getIntervalSpawnData().getCustomSettingActions(autoSpawn, this); if(customButtons == null || customButtons.isEmpty()) return; diff --git a/pom.xml b/pom.xml index b1a9514..3bd796f 100644 --- a/pom.xml +++ b/pom.xml @@ -19,7 +19,7 @@ - 1.0.0-U183 + 1.0.0-U184 EpicBosses com.songoda.epicbosses.CustomBosses AMinecraftDev