Added InterfaceListener.kt and converted a few interfaces over to it

This commit is contained in:
Ceikry
2021-03-15 01:12:07 -05:00
parent ad1bbaa5b4
commit 35cbb7f2f4
18 changed files with 301 additions and 256 deletions
@@ -5,6 +5,7 @@ import core.game.node.entity.player.link.InterfaceManager;
import core.net.packet.PacketRepository;
import core.net.packet.context.InterfaceContext;
import core.net.packet.out.Interface;
import rs09.game.interaction.InterfaceListeners;
/**
* Represents a component.
@@ -53,6 +54,7 @@ public class Component {
*/
public void open(Player player) {
InterfaceManager manager = player.getInterfaceManager();
InterfaceListeners.runOpen(player,this);
if (definition == null) {
PacketRepository.send(Interface.class, new InterfaceContext(player, manager.getWindowPaneId(), manager.getDefaultChildId(), getId(), false));
if (plugin != null) {
@@ -82,6 +84,7 @@ public class Component {
* @return {@code True} if the component can be closed.
*/
public boolean close(Player player) {
InterfaceListeners.runClose(player,this);
if (closeEvent != null && !closeEvent.close(player, this)) {
return false;
}
@@ -21,7 +21,7 @@ import core.game.world.map.Location;
import core.game.world.map.RegionManager;
import core.game.world.update.flag.context.Animation;
import core.plugin.Plugin;
import rs09.game.interaction.Listeners;
import rs09.game.interaction.InteractionListeners;
import java.util.List;
@@ -147,7 +147,7 @@ public final class DragonSlayerPlugin extends OptionHandler {
player.getPacketDispatch().sendMessage("You need to complete the Dragon Slayer Quest in order to wear this.");
return true;
}
Listeners.run(node.getId(),0,"equip",player,node);
InteractionListeners.run(node.getId(),0,"equip",player,node);
break;
case 742:
if (player.getQuestRepository().getQuest("Dragon Slayer").getStage(player) == 40 && (player.getInventory().containsItem(DragonSlayer.ELVARG_HEAD) || player.getInventory().containsItem(DragonSlayer.ELVARG_HEAD))) {
@@ -17,7 +17,7 @@ import core.game.node.object.GameObject;
import core.game.system.task.Pulse;
import core.game.world.map.Location;
import core.plugin.Plugin;
import rs09.game.interaction.Listeners;
import rs09.game.interaction.InteractionListeners;
import rs09.game.world.GameWorld;
/**
@@ -94,7 +94,7 @@ public final class LostCityPlugin extends OptionHandler {
player.getPacketDispatch().sendMessage("You need to have completed the Lost City quest in order to wield that weapon.");
return true;
}
return Listeners.run(node.getId(),0,"equip",player,node);
return InteractionListeners.run(node.getId(),0,"equip",player,node);
}
return true;
}
@@ -11,7 +11,7 @@ import core.game.world.update.flag.player.FaceLocationFlag;
import core.net.packet.PacketRepository;
import core.net.packet.context.InteractionOptionContext;
import core.net.packet.out.InteractionOption;
import rs09.game.interaction.Listeners;
import rs09.game.interaction.InteractionListeners;
import rs09.game.system.SystemLogger;
import rs09.game.world.GameWorld;
@@ -106,7 +106,7 @@ public class Interaction {
if (player.getLocks().isInteractionLocked() || player.getZoneMonitor().interact(node, option)) {
return true;
}
if(Listeners.run(node.getId(),0,option.getName(),player,node)){
if(InteractionListeners.run(node.getId(),0,option.getName(),player,node)){
return true;
}
if (option.getHandler() == null || !option.getHandler().handle(player, node, option.getName().toLowerCase())) {
@@ -22,7 +22,7 @@ import core.net.packet.out.ContainerPacket;
import core.plugin.Initializable;
import core.plugin.Plugin;
import rs09.game.content.global.action.EquipHandler;
import rs09.game.interaction.Listeners;
import rs09.game.interaction.InteractionListeners;
import rs09.game.world.GameWorld;
/**
@@ -81,7 +81,7 @@ public final class EquipmentInterface extends ComponentPlugin {
GameWorld.getPulser().submit(new Pulse(1, p) {
@Override
public boolean pulse() {
Listeners.run(item.getId(),0,"equip",p, item);
InteractionListeners.run(item.getId(),0,"equip",p, item);
return true;
}
});
@@ -191,7 +191,7 @@ public final class EquipmentInterface extends ComponentPlugin {
if (item == null) {
return;
}
if(Listeners.run(item.getId(),0,"operate",player,item)){
if(InteractionListeners.run(item.getId(),0,"operate",player,item)){
return;
}
OptionHandler handler = item.getOperateHandler();