Refactor event names

- add ParkourOpenStateChanteEvent

Author: Dabsunter

src/main/java/fr/dabsunter/darkour/api/event/ParkourEvent.java

@@ -0,0 +1,25 @@
+package fr.dabsunter.darkour.api.event;
+
+import fr.dabsunter.darkour.api.parkour.Parkour;
+import org.bukkit.event.Event;
+
+/**
+ * Represents a parkour related event
+ */
+public abstract class ParkourEvent extends Event {
+	protected Parkour parkour;
+
+	protected ParkourEvent(Parkour parkour) {
+		super();
+		this.parkour = parkour;
+	}
+
+	/**
+	 * Returns the parkour involved in this event
+	 *
+	 * @return Parkour which is involved in this event
+	 */
+	public Parkour getParkour() {
+		return parkour;
+	}
+}

src/main/java/fr/dabsunter/darkour/api/event/ParkourOpenStateChangeEvent.java

@@ -0,0 +1,57 @@
+package fr.dabsunter.darkour.api.event;
+
+import fr.dabsunter.darkour.api.parkour.Parkour;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+
+/**
+ * Fired when a new parkour is about to be open or not to public
+ */
+public class ParkourOpenStateChangeEvent extends ParkourEvent implements Cancellable {
+	private static final HandlerList handlers = new HandlerList();
+	private boolean isCancelled = false;
+
+	private boolean open;
+
+	public ParkourOpenStateChangeEvent(Parkour parkour, boolean open) {
+		super(parkour);
+		this.open = open;
+	}
+
+	/**
+	 * Returns whether or not the parkour will be open to public
+	 *
+	 * @return true if the parkour will be opened, false otherwise
+	 */
+	public boolean isOpen() {
+		return open;
+	}
+
+	/**
+	 * Sets whether or not the parkour will be open to public
+	 *
+	 * @param open will be opened
+	 */
+	public void setOpen(boolean open) {
+		this.open = open;
+	}
+
+	@Override
+	public boolean isCancelled() {
+		return this.isCancelled;
+	}
+
+	@Override
+	public void setCancelled(boolean cancel) {
+		this.isCancelled = cancel;
+	}
+
+	@Override
+	public HandlerList getHandlers() {
+		return handlers;
+	}
+
+	public static HandlerList getHandlerList() {
+		return handlers;
+	}
+}

src/main/java/fr/dabsunter/darkour/api/event/PlayerParkourEndedEvent.java renamed to src/main/java/fr/dabsunter/darkour/api/event/TraceurEndedEvent.java

@@ -8,11 +8,11 @@
 /**
  * Fired when a traceur finish a parkour
  */
-public class PlayerParkourEndedEvent extends PlayerParkourEvent {
+public class TraceurEndedEvent extends TraceurEvent {
 	private static final HandlerList handlers = new HandlerList();
 	private int chrono;
 
-	public PlayerParkourEndedEvent(Traceur traceur, Parkour parkour, int chrono) {
+	public TraceurEndedEvent(Traceur traceur, Parkour parkour, int chrono) {
 		super(traceur, parkour);
 		this.chrono = chrono;
 	}

src/main/java/fr/dabsunter/darkour/api/event/PlayerParkourEvent.java renamed to src/main/java/fr/dabsunter/darkour/api/event/TraceurEvent.java

@@ -5,13 +5,13 @@
 import org.bukkit.event.player.PlayerEvent;
 
 /**
- * Represents a parkour related event
+ * Represents a traceur related event
  */
-public abstract class PlayerParkourEvent extends PlayerEvent {
+public abstract class TraceurEvent extends PlayerEvent {
 	protected Traceur traceur;
 	protected Parkour parkour;
 
-	protected PlayerParkourEvent(Traceur traceur, Parkour parkour) {
+	protected TraceurEvent(Traceur traceur, Parkour parkour) {
 		super(traceur.getPlayer());
 		this.traceur = traceur;
 		this.parkour = parkour;

src/main/java/fr/dabsunter/darkour/api/event/PlayerParkourReachCheckpointEvent.java renamed to src/main/java/fr/dabsunter/darkour/api/event/TraceurReachCheckpointEvent.java

@@ -9,12 +9,12 @@
 /**
  * Fired when a traceur reach a checkpoint
  */
-public class PlayerParkourReachCheckpointEvent extends PlayerParkourEvent implements Cancellable {
+public class TraceurReachCheckpointEvent extends TraceurEvent implements Cancellable {
 	private static final HandlerList handlers = new HandlerList();
 	private Checkpoint checkpoint;
 	private boolean isCancelled = false;
 
-	public PlayerParkourReachCheckpointEvent(Traceur traceur, Parkour parkour, Checkpoint checkpoint) {
+	public TraceurReachCheckpointEvent(Traceur traceur, Parkour parkour, Checkpoint checkpoint) {
 		super(traceur, parkour);
 		this.checkpoint = checkpoint;
 	}

src/main/java/fr/dabsunter/darkour/api/event/PlayerParkourStartEvent.java renamed to src/main/java/fr/dabsunter/darkour/api/event/TraceurStartEvent.java

@@ -5,11 +5,14 @@
 import org.bukkit.event.Cancellable;
 import org.bukkit.event.HandlerList;
 
-public class PlayerParkourStartEvent extends PlayerParkourEvent implements Cancellable {
+/**
+ * Fired when a traceur is about to enter the traceur mode
+ */
+public class TraceurStartEvent extends TraceurEvent implements Cancellable {
 	private static final HandlerList handlers = new HandlerList();
 	private boolean isCancelled = false;
 
-	public PlayerParkourStartEvent(Traceur traceur, Parkour parkour) {
+	public TraceurStartEvent(Traceur traceur, Parkour parkour) {
 		super(traceur, parkour);
 	}
 

src/main/java/fr/dabsunter/darkour/api/event/PlayerParkourStopEvent.java renamed to src/main/java/fr/dabsunter/darkour/api/event/TraceurStopEvent.java

@@ -8,12 +8,12 @@
 /**
  * Fired when a traceur is about to leave the traceur mode
  */
-public class PlayerParkourStopEvent extends PlayerParkourEvent implements Cancellable {
+public class TraceurStopEvent extends TraceurEvent implements Cancellable {
 	private static final HandlerList handlers = new HandlerList();
 	private boolean isSuccess;
 	private boolean isCancelled = false;
 
-	public PlayerParkourStopEvent(Traceur traceur, Parkour parkour, boolean isSuccess) {
+	public TraceurStopEvent(Traceur traceur, Parkour parkour, boolean isSuccess) {
 		super(traceur, parkour);
 		this.isSuccess = isSuccess;
 	}

src/main/java/fr/dabsunter/darkour/entity/DarkTraceur.java

@@ -2,10 +2,10 @@
 
 import fr.dabsunter.darkour.DarkourUtils;
 import fr.dabsunter.darkour.api.entity.Traceur;
-import fr.dabsunter.darkour.api.event.PlayerParkourEndedEvent;
-import fr.dabsunter.darkour.api.event.PlayerParkourReachCheckpointEvent;
-import fr.dabsunter.darkour.api.event.PlayerParkourStartEvent;
-import fr.dabsunter.darkour.api.event.PlayerParkourStopEvent;
+import fr.dabsunter.darkour.api.event.TraceurEndedEvent;
+import fr.dabsunter.darkour.api.event.TraceurReachCheckpointEvent;
+import fr.dabsunter.darkour.api.event.TraceurStartEvent;
+import fr.dabsunter.darkour.api.event.TraceurStopEvent;
 import fr.dabsunter.darkour.api.parkour.Parkour;
 import fr.dabsunter.darkour.api.parkour.Position;
 import fr.dabsunter.darkour.parkour.DarkCheckpoint;
@@ -68,8 +68,8 @@ public void setLastValidPosition(DarkPosition lastValidPosition) {
 			stopParkour(true);
 		} else {
 			if (lastValidPosition.getType() == Position.Type.CHECKPOINT) {
-				PlayerParkourReachCheckpointEvent event =
-						new PlayerParkourReachCheckpointEvent(this, currentParkour, (DarkCheckpoint) lastValidPosition);
+				TraceurReachCheckpointEvent event =
+						new TraceurReachCheckpointEvent(this, currentParkour, (DarkCheckpoint) lastValidPosition);
 				Bukkit.getPluginManager().callEvent(event);
 				if (event.isCancelled())
 					return;
@@ -99,7 +99,7 @@ public void startParkour(Parkour parkour) {
 			if (isInParkour())
 				throw new IllegalStateException("Traceur is already in parkour and is not allowed to leave it");
 		}
-		PlayerParkourStartEvent event = new PlayerParkourStartEvent(this, parkour);
+		TraceurStartEvent event = new TraceurStartEvent(this, parkour);
 		Bukkit.getPluginManager().callEvent(event);
 		if (event.isCancelled())
 			return;
@@ -126,15 +126,15 @@ public void startParkour(Parkour parkour) {
 	public void stopParkour(boolean success) {
 		if (!isInParkour())
 			throw new IllegalStateException("Traceur is not in parkour");
-		PlayerParkourStopEvent stopEvent = new PlayerParkourStopEvent(this, currentParkour, success);
+		TraceurStopEvent stopEvent = new TraceurStopEvent(this, currentParkour, success);
 		Bukkit.getPluginManager().callEvent(stopEvent);
 		if (stopEvent.isCancelled())
 			return;
 
 		int chrono = stopChrono();
 		playerState.restore();
 		if (stopEvent.isSuccess()) {
-			PlayerParkourEndedEvent endedEvent = new PlayerParkourEndedEvent(this, currentParkour, chrono);
+			TraceurEndedEvent endedEvent = new TraceurEndedEvent(this, currentParkour, chrono);
 			Bukkit.getPluginManager().callEvent(endedEvent);
 			player.sendMessage(Trein.multiline(Trein.format(PARKOUR_CHAT_SUCCESS,
 					"PLAYER", player.getName(),

src/main/java/fr/dabsunter/darkour/parkour/DarkParkour.java

@@ -1,10 +1,12 @@
 package fr.dabsunter.darkour.parkour;
 
 import fr.dabsunter.darkour.DarkourPlugin;
+import fr.dabsunter.darkour.api.event.ParkourOpenStateChangeEvent;
 import fr.dabsunter.darkour.api.parkour.Checkpoint;
 import fr.dabsunter.darkour.api.parkour.Parkour;
 import fr.dabsunter.darkour.api.parkour.PreventedDamages;
 import fr.dabsunter.darkour.entity.DarkTraceur;
+import org.bukkit.Bukkit;
 import org.bukkit.Location;
 import org.bukkit.configuration.ConfigurationSection;
 
@@ -86,9 +88,13 @@ public boolean isOpen() {
 	}
 
 	public void setOpen(boolean open) {
-		if (!open)
+		ParkourOpenStateChangeEvent event = new ParkourOpenStateChangeEvent(this, open);
+		Bukkit.getPluginManager().callEvent(event);
+		if (event.isCancelled())
+			return;
+		if (!event.isOpen())
 			stopEveryone(this);
-		this.open = open;
+		this.open = event.isOpen();
 	}
 
 	@Override