From a495883369f8f56f17c65c4ae327e84a88f6f057 Mon Sep 17 00:00:00 2001 From: Allink Date: Fri, 2 Jun 2023 23:10:51 +0100 Subject: [PATCH] Squash annotation test patch into base patch --- ...-Add-command-block-player-edit-event.patch | 28 +++--- .../api/0005-Make-annotation-test-pass.patch | 98 ------------------- 2 files changed, 14 insertions(+), 112 deletions(-) delete mode 100644 patches/api/0005-Make-annotation-test-pass.patch diff --git a/patches/api/0004-Add-command-block-player-edit-event.patch b/patches/api/0004-Add-command-block-player-edit-event.patch index 89fbd70..510ffac 100644 --- a/patches/api/0004-Add-command-block-player-edit-event.patch +++ b/patches/api/0004-Add-command-block-player-edit-event.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Add command block player edit event diff --git a/src/main/java/me/totalfreedom/scissors/event/block/CommandBlockPlayerEditEvent.java b/src/main/java/me/totalfreedom/scissors/event/block/CommandBlockPlayerEditEvent.java new file mode 100644 -index 0000000000000000000000000000000000000000..ce6f6cbbdc82dc0b4e9c9d1f35fa79465dd97867 +index 0000000000000000000000000000000000000000..eed9a93475aa32992dc28b6677a0fab154a4fa38 --- /dev/null +++ b/src/main/java/me/totalfreedom/scissors/event/block/CommandBlockPlayerEditEvent.java @@ -0,0 +1,72 @@ @@ -31,7 +31,7 @@ index 0000000000000000000000000000000000000000..ce6f6cbbdc82dc0b4e9c9d1f35fa7946 + private String newCommand; + private final CommandBlock commandBlock; + -+ public CommandBlockPlayerEditEvent(Player player, String oldCommand, String newCommand, CommandBlock commandBlock) ++ public CommandBlockPlayerEditEvent(@NotNull Player player, @NotNull String oldCommand, @NotNull String newCommand, @NotNull CommandBlock commandBlock) + { + this.player = player; + this.oldCommand = oldCommand; @@ -39,27 +39,27 @@ index 0000000000000000000000000000000000000000..ce6f6cbbdc82dc0b4e9c9d1f35fa7946 + this.commandBlock = commandBlock; + } + -+ public String getNewCommand() ++ public @NotNull String getNewCommand() + { + return this.newCommand; + } + -+ public String getOldCommand() ++ public @NotNull String getOldCommand() + { + return this.oldCommand; + } + -+ public void setNewCommand(final String newCommand) ++ public void setNewCommand(@NotNull String newCommand) + { + this.newCommand = newCommand; + } + -+ public Player getPlayer() ++ public @NotNull Player getPlayer() + { + return this.player; + } + -+ public CommandBlock getCommandBlock() ++ public @NotNull CommandBlock getCommandBlock() + { + return this.commandBlock; + } @@ -84,7 +84,7 @@ index 0000000000000000000000000000000000000000..ce6f6cbbdc82dc0b4e9c9d1f35fa7946 +} diff --git a/src/main/java/me/totalfreedom/scissors/event/block/CommandMinecartPlayerEditEvent.java b/src/main/java/me/totalfreedom/scissors/event/block/CommandMinecartPlayerEditEvent.java new file mode 100644 -index 0000000000000000000000000000000000000000..655814b19c1e2e8b25e133190664a250867ad6f2 +index 0000000000000000000000000000000000000000..9cc63909e8fb83984e4a0d0803e81a27cda65f88 --- /dev/null +++ b/src/main/java/me/totalfreedom/scissors/event/block/CommandMinecartPlayerEditEvent.java @@ -0,0 +1,73 @@ @@ -110,7 +110,7 @@ index 0000000000000000000000000000000000000000..655814b19c1e2e8b25e133190664a250 + private String newCommand; + private final CommandMinecart commandMinecart; + -+ public CommandMinecartPlayerEditEvent(Player player, String oldCommand, String newCommand, CommandMinecart commandMinecart) ++ public CommandMinecartPlayerEditEvent(@NotNull Player player, @NotNull String oldCommand, @NotNull String newCommand, @NotNull CommandMinecart commandMinecart) + { + this.player = player; + this.oldCommand = oldCommand; @@ -118,27 +118,27 @@ index 0000000000000000000000000000000000000000..655814b19c1e2e8b25e133190664a250 + this.commandMinecart = commandMinecart; + } + -+ public String getNewCommand() ++ public @NotNull String getNewCommand() + { + return this.newCommand; + } + -+ public String getOldCommand() ++ public @NotNull String getOldCommand() + { + return this.oldCommand; + } + -+ public void setNewCommand(final String newCommand) ++ public void setNewCommand(@NotNull String newCommand) + { + this.newCommand = newCommand; + } + -+ public Player getPlayer() ++ public @NotNull Player getPlayer() + { + return this.player; + } + -+ public CommandMinecart getCommandMinecart() ++ public @NotNull CommandMinecart getCommandMinecart() + { + return this.commandMinecart; + } diff --git a/patches/api/0005-Make-annotation-test-pass.patch b/patches/api/0005-Make-annotation-test-pass.patch deleted file mode 100644 index 5508bf1..0000000 --- a/patches/api/0005-Make-annotation-test-pass.patch +++ /dev/null @@ -1,98 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: Allink -Date: Fri, 2 Jun 2023 21:57:30 +0100 -Subject: [PATCH] Make annotation test pass - - -diff --git a/src/main/java/me/totalfreedom/scissors/event/block/CommandBlockPlayerEditEvent.java b/src/main/java/me/totalfreedom/scissors/event/block/CommandBlockPlayerEditEvent.java -index ce6f6cbbdc82dc0b4e9c9d1f35fa79465dd97867..eed9a93475aa32992dc28b6677a0fab154a4fa38 100644 ---- a/src/main/java/me/totalfreedom/scissors/event/block/CommandBlockPlayerEditEvent.java -+++ b/src/main/java/me/totalfreedom/scissors/event/block/CommandBlockPlayerEditEvent.java -@@ -19,7 +19,7 @@ public class CommandBlockPlayerEditEvent extends Event implements Cancellable - private String newCommand; - private final CommandBlock commandBlock; - -- public CommandBlockPlayerEditEvent(Player player, String oldCommand, String newCommand, CommandBlock commandBlock) -+ public CommandBlockPlayerEditEvent(@NotNull Player player, @NotNull String oldCommand, @NotNull String newCommand, @NotNull CommandBlock commandBlock) - { - this.player = player; - this.oldCommand = oldCommand; -@@ -27,27 +27,27 @@ public class CommandBlockPlayerEditEvent extends Event implements Cancellable - this.commandBlock = commandBlock; - } - -- public String getNewCommand() -+ public @NotNull String getNewCommand() - { - return this.newCommand; - } - -- public String getOldCommand() -+ public @NotNull String getOldCommand() - { - return this.oldCommand; - } - -- public void setNewCommand(final String newCommand) -+ public void setNewCommand(@NotNull String newCommand) - { - this.newCommand = newCommand; - } - -- public Player getPlayer() -+ public @NotNull Player getPlayer() - { - return this.player; - } - -- public CommandBlock getCommandBlock() -+ public @NotNull CommandBlock getCommandBlock() - { - return this.commandBlock; - } -diff --git a/src/main/java/me/totalfreedom/scissors/event/block/CommandMinecartPlayerEditEvent.java b/src/main/java/me/totalfreedom/scissors/event/block/CommandMinecartPlayerEditEvent.java -index 655814b19c1e2e8b25e133190664a250867ad6f2..9cc63909e8fb83984e4a0d0803e81a27cda65f88 100644 ---- a/src/main/java/me/totalfreedom/scissors/event/block/CommandMinecartPlayerEditEvent.java -+++ b/src/main/java/me/totalfreedom/scissors/event/block/CommandMinecartPlayerEditEvent.java -@@ -20,7 +20,7 @@ public class CommandMinecartPlayerEditEvent extends Event implements Cancellable - private String newCommand; - private final CommandMinecart commandMinecart; - -- public CommandMinecartPlayerEditEvent(Player player, String oldCommand, String newCommand, CommandMinecart commandMinecart) -+ public CommandMinecartPlayerEditEvent(@NotNull Player player, @NotNull String oldCommand, @NotNull String newCommand, @NotNull CommandMinecart commandMinecart) - { - this.player = player; - this.oldCommand = oldCommand; -@@ -28,27 +28,27 @@ public class CommandMinecartPlayerEditEvent extends Event implements Cancellable - this.commandMinecart = commandMinecart; - } - -- public String getNewCommand() -+ public @NotNull String getNewCommand() - { - return this.newCommand; - } - -- public String getOldCommand() -+ public @NotNull String getOldCommand() - { - return this.oldCommand; - } - -- public void setNewCommand(final String newCommand) -+ public void setNewCommand(@NotNull String newCommand) - { - this.newCommand = newCommand; - } - -- public Player getPlayer() -+ public @NotNull Player getPlayer() - { - return this.player; - } - -- public CommandMinecart getCommandMinecart() -+ public @NotNull CommandMinecart getCommandMinecart() - { - return this.commandMinecart; - }