From 174862d96d8ec9a5e04e3799cb803fec17f22f7d Mon Sep 17 00:00:00 2001 From: "Luis C.M" <42545778+c0508383@users.noreply.github.com> Date: Fri, 25 Nov 2022 17:32:35 -0600 Subject: [PATCH] Made faction, quest, dialog, and gui events extend IPlayerEvent instead. --- java/noppes/npcs/api/event/ICustomGuiEvent.java | 4 +--- java/noppes/npcs/api/event/IDialogEvent.java | 4 +--- java/noppes/npcs/api/event/IFactionEvent.java | 4 +--- java/noppes/npcs/api/event/IQuestEvent.java | 5 +---- 4 files changed, 4 insertions(+), 13 deletions(-) diff --git a/java/noppes/npcs/api/event/ICustomGuiEvent.java b/java/noppes/npcs/api/event/ICustomGuiEvent.java index b1292bc..6ea7211 100644 --- a/java/noppes/npcs/api/event/ICustomGuiEvent.java +++ b/java/noppes/npcs/api/event/ICustomGuiEvent.java @@ -5,9 +5,7 @@ import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.gui.ICustomGui; import noppes.npcs.api.item.IItemStack; -public interface ICustomGuiEvent extends ICustomNPCsEvent { - - IPlayer getPlayer(); +public interface ICustomGuiEvent extends IPlayerEvent { ICustomGui getGui(); diff --git a/java/noppes/npcs/api/event/IDialogEvent.java b/java/noppes/npcs/api/event/IDialogEvent.java index f03afe8..efe0d73 100644 --- a/java/noppes/npcs/api/event/IDialogEvent.java +++ b/java/noppes/npcs/api/event/IDialogEvent.java @@ -4,9 +4,7 @@ import cpw.mods.fml.common.eventhandler.Cancelable; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.data.IDialog; -public interface IDialogEvent extends ICustomNPCsEvent { - - IPlayer getPlayer(); +public interface IDialogEvent extends IPlayerEvent { IDialog getDialog(); diff --git a/java/noppes/npcs/api/event/IFactionEvent.java b/java/noppes/npcs/api/event/IFactionEvent.java index f911661..d021e45 100644 --- a/java/noppes/npcs/api/event/IFactionEvent.java +++ b/java/noppes/npcs/api/event/IFactionEvent.java @@ -4,9 +4,7 @@ import cpw.mods.fml.common.eventhandler.Cancelable; import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.data.IFaction; -public interface IFactionEvent extends ICustomNPCsEvent { - - IPlayer getPlayer(); +public interface IFactionEvent extends IPlayerEvent { IFaction getFaction(); diff --git a/java/noppes/npcs/api/event/IQuestEvent.java b/java/noppes/npcs/api/event/IQuestEvent.java index a7e871b..997c377 100644 --- a/java/noppes/npcs/api/event/IQuestEvent.java +++ b/java/noppes/npcs/api/event/IQuestEvent.java @@ -1,13 +1,10 @@ package noppes.npcs.api.event; import cpw.mods.fml.common.eventhandler.Cancelable; -import noppes.npcs.api.entity.IPlayer; import noppes.npcs.api.handler.data.IQuest; import noppes.npcs.api.item.IItemStack; -public interface IQuestEvent extends ICustomNPCsEvent { - - IPlayer getPlayer(); +public interface IQuestEvent extends IPlayerEvent { IQuest getQuest();