Add new reward event

api/src/main/java/de/erethon/dungeonsxl/api/event/group/GroupCollectRewardEvent.java

@@ -0,0 +1,92 @@
+/*
+ * Copyright (C) 2014-2020 Daniel Saukel
+ *
+ * This library is free software: you can redistribute it and/or modify it under the
+ * terms of the GNU Lesser General Public License as published by the Free Software
+ * Foundation, either version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNULesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License along with
+ * this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+package de.erethon.dungeonsxl.api.event.group;
+
+import de.erethon.dungeonsxl.api.Reward;
+import de.erethon.dungeonsxl.api.player.PlayerGroup;
+import org.bukkit.entity.Player;
+import org.bukkit.event.Cancellable;
+import org.bukkit.event.HandlerList;
+
+/**
+ * Fired when a group collects a reward.
+ * <p>
+ * In the default implementation, this happens when a player opens a reward chest.
+ *
+ * @author Daniel Saukel
+ */
+public class GroupCollectRewardEvent extends GroupEvent implements Cancellable {
+
+    private static final HandlerList handlers = new HandlerList();
+    private boolean cancelled;
+
+    private Player collector;
+    private Reward reward;
+
+    public GroupCollectRewardEvent(PlayerGroup group, Player collector, Reward reward) {
+        super(group);
+        this.collector = collector;
+        this.reward = reward;
+    }
+
+    /**
+     * Returns the player who collected the reward.
+     * <p>
+     * Note that this may be null if addons add a way to give rewards that cannot be attributed to one collector.
+     *
+     * @return the player who collected the reward
+     */
+    public Player getCollector() {
+        return collector;
+    }
+
+    /**
+     * Returns the reward the group collected.
+     *
+     * @return the reward the group collected
+     */
+    public Reward getReward() {
+        return reward;
+    }
+
+    /**
+     * Sets the reward the group collected.
+     *
+     * @param reward the reward
+     */
+    public void setReward(Reward reward) {
+        this.reward = reward;
+    }
+
+    @Override
+    public HandlerList getHandlers() {
+        return handlers;
+    }
+
+    public static HandlerList getHandlerList() {
+        return handlers;
+    }
+
+    @Override
+    public boolean isCancelled() {
+        return cancelled;
+    }
+
+    @Override
+    public void setCancelled(boolean cancelled) {
+        this.cancelled = cancelled;
+    }
+
+}

api/src/main/java/de/erethon/dungeonsxl/api/event/group/GroupEvent.java

@@ -12,31 +12,31 @@
  * You should have received a copy of the GNU Lesser General Public License along with
  * this program. If not, see <http://www.gnu.org/licenses/>.
  */
-package de.erethon.dungeonsxl.api.event.dungeon;
+package de.erethon.dungeonsxl.api.event.group;
 
-import de.erethon.dungeonsxl.api.dungeon.Dungeon;
+import de.erethon.dungeonsxl.api.player.PlayerGroup;
 import org.bukkit.event.Event;
 
 /**
- * Superclass for events involving {@link Dungeon}s.
+ * Superclass for events involving DungeonsXL groups.
  *
  * @author Daniel Saukel
  */
-public abstract class DungeonEvent extends Event {
+public abstract class GroupEvent extends Event {
 
-    protected Dungeon dungeon;
+    protected PlayerGroup group;
 
-    protected DungeonEvent(Dungeon dungeon) {
+    protected GroupEvent(PlayerGroup group) {
-        this.dungeon = dungeon;
+        this.group = group;
     }
 
     /**
-     * Returns the dungeon involved in this event.
+     * Returns the group involved in this event.
      *
-     * @return the dungeon involved in this event
+     * @return the group involved in this event
      */
-    public Dungeon getDungeon() {
+    public PlayerGroup getGroup() {
-        return dungeon;
+        return group;
     }
 
 }

core/src/main/java/de/erethon/dungeonsxl/event/reward/RewardAdditionEvent.java

@@ -1,72 +0,0 @@
-/*
- * Copyright (C) 2012-2020 Frank Baumann
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package de.erethon.dungeonsxl.event.reward;
-
-import de.erethon.dungeonsxl.api.Reward;
-import de.erethon.dungeonsxl.player.DGroup;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-
-/**
- * @author Daniel Saukel
- */
-public class RewardAdditionEvent extends RewardEvent implements Cancellable {
-
-    private static final HandlerList handlers = new HandlerList();
-    private boolean cancelled;
-
-    private DGroup dGroup;
-
-    public RewardAdditionEvent(Reward reward, DGroup dGroup) {
-        super(reward);
-        this.dGroup = dGroup;
-    }
-
-    /**
-     * @return the dGroup
-     */
-    public DGroup getDGroup() {
-        return dGroup;
-    }
-
-    /**
-     * @param dGroup the dGroup to set
-     */
-    public void setDGroup(DGroup dGroup) {
-        this.dGroup = dGroup;
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    @Override
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-
-}

core/src/main/java/de/erethon/dungeonsxl/event/reward/RewardEvent.java

@@ -1,47 +0,0 @@
-/*
- * Copyright (C) 2012-2020 Frank Baumann
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package de.erethon.dungeonsxl.event.reward;
-
-import de.erethon.dungeonsxl.api.Reward;
-import org.bukkit.event.Event;
-
-/**
- * @author Daniel Saukel
- */
-public abstract class RewardEvent extends Event {
-
-    protected Reward reward;
-
-    public RewardEvent(Reward reward) {
-        this.reward = reward;
-    }
-
-    /**
-     * @return the reward
-     */
-    public Reward getReward() {
-        return reward;
-    }
-
-    /**
-     * @param reward the reward to set
-     */
-    public void setReward(Reward reward) {
-        this.reward = reward;
-    }
-
-}

core/src/main/java/de/erethon/dungeonsxl/event/reward/RewardRegistrationEvent.java

@@ -1,54 +0,0 @@
-/*
- * Copyright (C) 2012-2020 Frank Baumann
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-package de.erethon.dungeonsxl.event.reward;
-
-import de.erethon.dungeonsxl.api.Reward;
-import org.bukkit.event.Cancellable;
-import org.bukkit.event.HandlerList;
-
-/**
- * @author Daniel Saukel
- */
-public class RewardRegistrationEvent extends RewardEvent implements Cancellable {
-
-    private static final HandlerList handlers = new HandlerList();
-    private boolean cancelled;
-
-    public RewardRegistrationEvent(Reward reward) {
-        super(reward);
-    }
-
-    @Override
-    public HandlerList getHandlers() {
-        return handlers;
-    }
-
-    public static HandlerList getHandlerList() {
-        return handlers;
-    }
-
-    @Override
-    public boolean isCancelled() {
-        return cancelled;
-    }
-
-    @Override
-    public void setCancelled(boolean cancelled) {
-        this.cancelled = cancelled;
-    }
-
-}