From 7b72c26d8ef528b79434a4fea66dff28ad444240 Mon Sep 17 00:00:00 2001 From: Arnaud Guerquin Date: Thu, 31 Dec 2015 17:48:47 +0100 Subject: [PATCH] Start split Server/Client event --- src/core/event/AbilityEvent.java | 2 +- src/core/event/ClientEvent.java | 10 ++++++++++ src/core/event/CreationEvent.java | 2 +- src/core/event/DeathEvent.java | 2 +- src/core/event/EmptyEvent.java | 2 +- src/core/event/Event.java | 11 ----------- src/core/event/FailedEvent.java | 2 +- src/core/event/MapInit.java | 2 +- src/core/event/MoveEvent.java | 2 +- src/core/event/ServerEvent.java | 10 ++++++++++ src/core/event/StairsEvent.java | 26 -------------------------- 11 files changed, 27 insertions(+), 44 deletions(-) create mode 100644 src/core/event/ClientEvent.java create mode 100644 src/core/event/ServerEvent.java delete mode 100644 src/core/event/StairsEvent.java diff --git a/src/core/event/AbilityEvent.java b/src/core/event/AbilityEvent.java index ed3365c..6c28949 100644 --- a/src/core/event/AbilityEvent.java +++ b/src/core/event/AbilityEvent.java @@ -12,7 +12,7 @@ import java.util.List; /** * Created by dupriez on 19/12/15. */ -public class AbilityEvent implements core.event.Event { +public class AbilityEvent implements ClientEvent,ServerEvent { private static final long serialVersionUID = 1L; private int potentialCasterCharacterID; diff --git a/src/core/event/ClientEvent.java b/src/core/event/ClientEvent.java new file mode 100644 index 0000000..d9b5005 --- /dev/null +++ b/src/core/event/ClientEvent.java @@ -0,0 +1,10 @@ +package core.event; + +/** + * Only used to add some security between event. Those event can be sent by the server to the client. + * @author Guerquin Arnaud + * + */ +public interface ClientEvent extends Event { + +} diff --git a/src/core/event/CreationEvent.java b/src/core/event/CreationEvent.java index 95e75a1..e718103 100644 --- a/src/core/event/CreationEvent.java +++ b/src/core/event/CreationEvent.java @@ -8,7 +8,7 @@ import core.gamestate.GameContent; * @author Guerquin Arnaud * */ -public class CreationEvent implements Event { +public class CreationEvent implements ClientEvent { private static final long serialVersionUID = 1L; diff --git a/src/core/event/DeathEvent.java b/src/core/event/DeathEvent.java index b10354a..ce7e491 100644 --- a/src/core/event/DeathEvent.java +++ b/src/core/event/DeathEvent.java @@ -7,7 +7,7 @@ import core.gamestate.GameContent; * @author Guerquin Arnaud * */ -public class DeathEvent implements Event { +public class DeathEvent implements ClientEvent { private static final long serialVersionUID = 1L; @Override diff --git a/src/core/event/EmptyEvent.java b/src/core/event/EmptyEvent.java index 3b2d307..30b9ea9 100644 --- a/src/core/event/EmptyEvent.java +++ b/src/core/event/EmptyEvent.java @@ -8,7 +8,7 @@ import core.gamestate.GameContent; * @author Guerquin Arnaud * */ -public class EmptyEvent implements Event { +public class EmptyEvent implements ClientEvent,ServerEvent { private static final long serialVersionUID = 1L; public static final EmptyEvent empty=new EmptyEvent(); diff --git a/src/core/event/Event.java b/src/core/event/Event.java index 304fc98..5821f22 100644 --- a/src/core/event/Event.java +++ b/src/core/event/Event.java @@ -14,17 +14,6 @@ public interface Event extends NetworkObject{ static final long serialVersionUID = 1L; public static final int infinity = -1; - - - /** - * Give a modified version of the first event using the second. - * @param event the event applied to this. Can't be null. - * @return true if a modification happened. - */ - public default boolean alter(Event event){ - return false; - } - boolean execute(GameContent gameContent); diff --git a/src/core/event/FailedEvent.java b/src/core/event/FailedEvent.java index e7cf06e..2dec351 100644 --- a/src/core/event/FailedEvent.java +++ b/src/core/event/FailedEvent.java @@ -8,7 +8,7 @@ import core.gamestate.GameContent; * @author Guerquin Arnaud * */ -public class FailedEvent implements Event{ +public class FailedEvent implements ClientEvent,ServerEvent{ private static final long serialVersionUID = 1L; static final public Event failed=new FailedEvent(); diff --git a/src/core/event/MapInit.java b/src/core/event/MapInit.java index 8a5d742..c60478d 100644 --- a/src/core/event/MapInit.java +++ b/src/core/event/MapInit.java @@ -11,7 +11,7 @@ import gameloop.DummyLocalGameLoop; * An Event that changes the map and the gameState * */ -public class MapInit implements Event { +public class MapInit implements ClientEvent { private static final long serialVersionUID = 1L; private GameContent gameContent; diff --git a/src/core/event/MoveEvent.java b/src/core/event/MoveEvent.java index 76cd67f..4c63082 100644 --- a/src/core/event/MoveEvent.java +++ b/src/core/event/MoveEvent.java @@ -12,7 +12,7 @@ import core.zone.Translation; * @author Guerquin Arnaud * */ -public class MoveEvent implements Event { +public class MoveEvent implements ClientEvent,ServerEvent { private static final long serialVersionUID = 1L; private int targetID; diff --git a/src/core/event/ServerEvent.java b/src/core/event/ServerEvent.java new file mode 100644 index 0000000..1a7e82a --- /dev/null +++ b/src/core/event/ServerEvent.java @@ -0,0 +1,10 @@ +package core.event; + +/** + * Only used to add some security between event. Those event can be sent by the client to the server. + * @author Guerquin Arnaud + * + */ +public interface ServerEvent extends Event { + +} diff --git a/src/core/event/StairsEvent.java b/src/core/event/StairsEvent.java deleted file mode 100644 index 1cd8986..0000000 --- a/src/core/event/StairsEvent.java +++ /dev/null @@ -1,26 +0,0 @@ -package core.event; - - -import core.gamestate.GameContent; -import gameloop.GameStarter; - -//created by Theodore LOPEZ just for tests on stairs - -public class StairsEvent implements Event { - - private static final long serialVersionUID = 1L; - public StairsEvent(){ - } - - @Override - public boolean execute(GameContent gameContent) { - GameStarter.leaveGame(); - return true; - } - - @Override - public Event resolve(GameContent gameContent) { - return this; - } - -} -- GitLab