From d6d38030252af0ae4956aaedb984e1a10bf004a2 Mon Sep 17 00:00:00 2001 From: Mathieu Strypsteen Date: Mon, 16 Sep 2024 20:41:45 +0200 Subject: [PATCH] Remove test events --- .../gent/zeus/mc13dtl/events/EventRunner.java | 6 ---- .../mc13dtl/events/catalog/SuicideEvent.java | 2 -- .../mc13dtl/events/catalog/TestEvent.java | 28 ------------------- .../mc13dtl/events/catalog/TestEvent2.java | 27 ------------------ .../zeus/mc13dtl/group/SetScoreCommand.java | 2 -- 5 files changed, 65 deletions(-) delete mode 100644 src/main/java/gent/zeus/mc13dtl/events/catalog/TestEvent.java delete mode 100644 src/main/java/gent/zeus/mc13dtl/events/catalog/TestEvent2.java diff --git a/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java b/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java index fcc835c..39586c3 100644 --- a/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java +++ b/src/main/java/gent/zeus/mc13dtl/events/EventRunner.java @@ -10,12 +10,8 @@ import org.bukkit.scoreboard.Team; import java.util.List; import java.util.ArrayList; import java.util.OptionalDouble; -import java.util.Set; -import java.util.stream.Collectors; import gent.zeus.mc13dtl.MC13DTL; -import gent.zeus.mc13dtl.events.catalog.TestEvent; -import gent.zeus.mc13dtl.events.catalog.TestEvent2; public class EventRunner implements Runnable { static List currentEvents = new ArrayList<>(); @@ -41,8 +37,6 @@ public class EventRunner implements Runnable { Difficulty difficulty = difficulties.get(i); switch ((int) day) { case 0 -> new SuicideEvent(team, difficulty, getDayScore()); - case 1 -> new TestEvent(team, difficulty, getDayScore()); - case 2 -> new TestEvent2(team, difficulty, getDayScore()); } } world.getPersistentDataContainer().set(eventKey, PersistentDataType.LONG, day); diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/SuicideEvent.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/SuicideEvent.java index 69da48c..cb3d237 100644 --- a/src/main/java/gent/zeus/mc13dtl/events/catalog/SuicideEvent.java +++ b/src/main/java/gent/zeus/mc13dtl/events/catalog/SuicideEvent.java @@ -6,10 +6,8 @@ import gent.zeus.mc13dtl.events.Event; import net.kyori.adventure.text.Component; import org.bukkit.event.EventHandler; import org.bukkit.event.entity.PlayerDeathEvent; -import org.bukkit.event.player.PlayerInteractEvent; import org.bukkit.scoreboard.Team; - public class SuicideEvent extends Event { // Time left for team member to commit suicide in seconds. private long timeLeft; diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/TestEvent.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/TestEvent.java deleted file mode 100644 index 5025de3..0000000 --- a/src/main/java/gent/zeus/mc13dtl/events/catalog/TestEvent.java +++ /dev/null @@ -1,28 +0,0 @@ -package gent.zeus.mc13dtl.events.catalog; - -import gent.zeus.mc13dtl.events.Difficulty; -import org.bukkit.event.EventHandler; -import org.bukkit.event.player.PlayerInteractEvent; -import org.bukkit.scoreboard.Team; - -import gent.zeus.mc13dtl.events.Event; - -public class TestEvent extends Event { - public TestEvent(Team team, Difficulty difficulty, int scoreOnSuccess) { - super(team, difficulty, scoreOnSuccess); - } - - @Override - protected String getMessage() { - return "test"; - } - - @EventHandler - public void onPlayerInteract(PlayerInteractEvent event) { - if (event.getPlayer() == null) { - return; - } - eventSuccess(); - } - -} diff --git a/src/main/java/gent/zeus/mc13dtl/events/catalog/TestEvent2.java b/src/main/java/gent/zeus/mc13dtl/events/catalog/TestEvent2.java deleted file mode 100644 index 0e85ed5..0000000 --- a/src/main/java/gent/zeus/mc13dtl/events/catalog/TestEvent2.java +++ /dev/null @@ -1,27 +0,0 @@ -package gent.zeus.mc13dtl.events.catalog; - -import gent.zeus.mc13dtl.events.Difficulty; -import org.bukkit.event.EventHandler; -import org.bukkit.event.player.PlayerInteractEvent; -import org.bukkit.scoreboard.Team; - -import gent.zeus.mc13dtl.events.Event; - -public class TestEvent2 extends Event { - public TestEvent2(Team team, Difficulty difficulty, int scoreOnSuccess) { - super(team, difficulty, scoreOnSuccess); - } - - @Override - protected String getMessage() { - return "Super difficult event!"; - } - - @EventHandler - public void onPlayerInteract(PlayerInteractEvent event) { - if (event.getPlayer() == null) { - return; - } - eventSuccess(); - } -} diff --git a/src/main/java/gent/zeus/mc13dtl/group/SetScoreCommand.java b/src/main/java/gent/zeus/mc13dtl/group/SetScoreCommand.java index 410cf71..9c5d0b1 100644 --- a/src/main/java/gent/zeus/mc13dtl/group/SetScoreCommand.java +++ b/src/main/java/gent/zeus/mc13dtl/group/SetScoreCommand.java @@ -3,8 +3,6 @@ package gent.zeus.mc13dtl.group; import gent.zeus.mc13dtl.MC13DTL; import io.papermc.paper.command.brigadier.BasicCommand; import io.papermc.paper.command.brigadier.CommandSourceStack; -import org.bukkit.Bukkit; -import org.bukkit.entity.Player; import org.bukkit.scoreboard.Team; import org.jetbrains.annotations.NotNull;