From cd6e81b9d04326931e1c1994892c09f523256c73 Mon Sep 17 00:00:00 2001 From: Command <57562364+commandrod@users.noreply.github.com> Date: Wed, 31 Aug 2022 15:09:32 +0300 Subject: [PATCH 1/3] Delete .idea directory --- .idea/artifacts/EventTools_jar.xml | 9 -- .idea/compiler.xml | 22 ---- .idea/encodings.xml | 7 - .idea/jarRepositories.xml | 35 ----- ...ven__co_aikar_acf_paper_0_5_1_SNAPSHOT.xml | 13 -- ...Maven__com_google_code_gson_gson_2_8_8.xml | 13 -- .../Maven__com_google_guava_guava_21_0.xml | 13 -- ...oglecode_json_simple_json_simple_1_1_1.xml | 13 -- .../Maven__commons_lang_commons_lang_2_6.xml | 13 -- ...c_paper_paper_api_1_17_1_R0_1_SNAPSHOT.xml | 13 -- .../Maven__it_unimi_dsi_fastutil_8_2_2.xml | 13 -- .idea/libraries/Maven__junit_junit_4_10.xml | 13 -- .../Maven__net_kyori_adventure_api_4_9_3.xml | 13 -- .../Maven__net_kyori_adventure_key_4_9_3.xml | 13 -- ...yori_adventure_text_minimessage_4_11_0.xml | 13 -- ...i_adventure_text_serializer_gson_4_9_3.xml | 13 -- ...adventure_text_serializer_legacy_4_9_3.xml | 13 -- ..._adventure_text_serializer_plain_4_9_3.xml | 13 -- ...Maven__net_kyori_examination_api_1_3_0.xml | 13 -- ...en__net_kyori_examination_string_1_3_0.xml | 13 -- ...en__net_md_5_bungeecord_chat_1_16_R0_4.xml | 13 -- ..._apache_logging_log4j_log4j_api_2_14_1.xml | 13 -- ...g_checkerframework_checker_qual_3_18_0.xml | 13 -- .../Maven__org_hamcrest_hamcrest_core_1_1.xml | 13 -- ...aven__org_jetbrains_annotations_22_0_0.xml | 13 -- .../libraries/Maven__org_ow2_asm_asm_9_1.xml | 13 -- .../Maven__org_ow2_asm_asm_analysis_9_1.xml | 13 -- .../Maven__org_ow2_asm_asm_commons_9_1.xml | 13 -- .../Maven__org_ow2_asm_asm_tree_9_1.xml | 13 -- ...aven__org_projectlombok_lombok_1_18_24.xml | 13 -- .../Maven__org_slf4j_slf4j_api_1_7_30.xml | 13 -- .../Maven__org_yaml_snakeyaml_1_28.xml | 13 -- .idea/misc.xml | 18 --- .idea/modules.xml | 8 -- .idea/uiDesigner.xml | 124 ------------------ .idea/vcs.xml | 6 - .idea/workspace.xml | 95 -------------- 37 files changed, 688 deletions(-) delete mode 100644 .idea/artifacts/EventTools_jar.xml delete mode 100644 .idea/compiler.xml delete mode 100644 .idea/encodings.xml delete mode 100644 .idea/jarRepositories.xml delete mode 100644 .idea/libraries/Maven__co_aikar_acf_paper_0_5_1_SNAPSHOT.xml delete mode 100644 .idea/libraries/Maven__com_google_code_gson_gson_2_8_8.xml delete mode 100644 .idea/libraries/Maven__com_google_guava_guava_21_0.xml delete mode 100644 .idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml delete mode 100644 .idea/libraries/Maven__commons_lang_commons_lang_2_6.xml delete mode 100644 .idea/libraries/Maven__io_papermc_paper_paper_api_1_17_1_R0_1_SNAPSHOT.xml delete mode 100644 .idea/libraries/Maven__it_unimi_dsi_fastutil_8_2_2.xml delete mode 100644 .idea/libraries/Maven__junit_junit_4_10.xml delete mode 100644 .idea/libraries/Maven__net_kyori_adventure_api_4_9_3.xml delete mode 100644 .idea/libraries/Maven__net_kyori_adventure_key_4_9_3.xml delete mode 100644 .idea/libraries/Maven__net_kyori_adventure_text_minimessage_4_11_0.xml delete mode 100644 .idea/libraries/Maven__net_kyori_adventure_text_serializer_gson_4_9_3.xml delete mode 100644 .idea/libraries/Maven__net_kyori_adventure_text_serializer_legacy_4_9_3.xml delete mode 100644 .idea/libraries/Maven__net_kyori_adventure_text_serializer_plain_4_9_3.xml delete mode 100644 .idea/libraries/Maven__net_kyori_examination_api_1_3_0.xml delete mode 100644 .idea/libraries/Maven__net_kyori_examination_string_1_3_0.xml delete mode 100644 .idea/libraries/Maven__net_md_5_bungeecord_chat_1_16_R0_4.xml delete mode 100644 .idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_14_1.xml delete mode 100644 .idea/libraries/Maven__org_checkerframework_checker_qual_3_18_0.xml delete mode 100644 .idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml delete mode 100644 .idea/libraries/Maven__org_jetbrains_annotations_22_0_0.xml delete mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_9_1.xml delete mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_analysis_9_1.xml delete mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_commons_9_1.xml delete mode 100644 .idea/libraries/Maven__org_ow2_asm_asm_tree_9_1.xml delete mode 100644 .idea/libraries/Maven__org_projectlombok_lombok_1_18_24.xml delete mode 100644 .idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml delete mode 100644 .idea/libraries/Maven__org_yaml_snakeyaml_1_28.xml delete mode 100644 .idea/misc.xml delete mode 100644 .idea/modules.xml delete mode 100644 .idea/uiDesigner.xml delete mode 100644 .idea/vcs.xml delete mode 100644 .idea/workspace.xml diff --git a/.idea/artifacts/EventTools_jar.xml b/.idea/artifacts/EventTools_jar.xml deleted file mode 100644 index c5508ea..0000000 --- a/.idea/artifacts/EventTools_jar.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - $PROJECT_DIR$/../../../MC Test servers/Core/plugins - - - - - - \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml deleted file mode 100644 index 979a612..0000000 --- a/.idea/compiler.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml deleted file mode 100644 index aa00ffa..0000000 --- a/.idea/encodings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml deleted file mode 100644 index e0264b5..0000000 --- a/.idea/jarRepositories.xml +++ /dev/null @@ -1,35 +0,0 @@ - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__co_aikar_acf_paper_0_5_1_SNAPSHOT.xml b/.idea/libraries/Maven__co_aikar_acf_paper_0_5_1_SNAPSHOT.xml deleted file mode 100644 index b8e7bda..0000000 --- a/.idea/libraries/Maven__co_aikar_acf_paper_0_5_1_SNAPSHOT.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_8.xml b/.idea/libraries/Maven__com_google_code_gson_gson_2_8_8.xml deleted file mode 100644 index 1da2fef..0000000 --- a/.idea/libraries/Maven__com_google_code_gson_gson_2_8_8.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_google_guava_guava_21_0.xml b/.idea/libraries/Maven__com_google_guava_guava_21_0.xml deleted file mode 100644 index a923456..0000000 --- a/.idea/libraries/Maven__com_google_guava_guava_21_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml b/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml deleted file mode 100644 index f3f3738..0000000 --- a/.idea/libraries/Maven__com_googlecode_json_simple_json_simple_1_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml b/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml deleted file mode 100644 index 2ec8376..0000000 --- a/.idea/libraries/Maven__commons_lang_commons_lang_2_6.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__io_papermc_paper_paper_api_1_17_1_R0_1_SNAPSHOT.xml b/.idea/libraries/Maven__io_papermc_paper_paper_api_1_17_1_R0_1_SNAPSHOT.xml deleted file mode 100644 index 762a985..0000000 --- a/.idea/libraries/Maven__io_papermc_paper_paper_api_1_17_1_R0_1_SNAPSHOT.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__it_unimi_dsi_fastutil_8_2_2.xml b/.idea/libraries/Maven__it_unimi_dsi_fastutil_8_2_2.xml deleted file mode 100644 index fc8525d..0000000 --- a/.idea/libraries/Maven__it_unimi_dsi_fastutil_8_2_2.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__junit_junit_4_10.xml b/.idea/libraries/Maven__junit_junit_4_10.xml deleted file mode 100644 index ed8bf5f..0000000 --- a/.idea/libraries/Maven__junit_junit_4_10.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_kyori_adventure_api_4_9_3.xml b/.idea/libraries/Maven__net_kyori_adventure_api_4_9_3.xml deleted file mode 100644 index 9ae42b2..0000000 --- a/.idea/libraries/Maven__net_kyori_adventure_api_4_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_kyori_adventure_key_4_9_3.xml b/.idea/libraries/Maven__net_kyori_adventure_key_4_9_3.xml deleted file mode 100644 index 4624751..0000000 --- a/.idea/libraries/Maven__net_kyori_adventure_key_4_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_kyori_adventure_text_minimessage_4_11_0.xml b/.idea/libraries/Maven__net_kyori_adventure_text_minimessage_4_11_0.xml deleted file mode 100644 index a59d7d8..0000000 --- a/.idea/libraries/Maven__net_kyori_adventure_text_minimessage_4_11_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_kyori_adventure_text_serializer_gson_4_9_3.xml b/.idea/libraries/Maven__net_kyori_adventure_text_serializer_gson_4_9_3.xml deleted file mode 100644 index 6c700b9..0000000 --- a/.idea/libraries/Maven__net_kyori_adventure_text_serializer_gson_4_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_kyori_adventure_text_serializer_legacy_4_9_3.xml b/.idea/libraries/Maven__net_kyori_adventure_text_serializer_legacy_4_9_3.xml deleted file mode 100644 index 9cf863b..0000000 --- a/.idea/libraries/Maven__net_kyori_adventure_text_serializer_legacy_4_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_kyori_adventure_text_serializer_plain_4_9_3.xml b/.idea/libraries/Maven__net_kyori_adventure_text_serializer_plain_4_9_3.xml deleted file mode 100644 index a32993e..0000000 --- a/.idea/libraries/Maven__net_kyori_adventure_text_serializer_plain_4_9_3.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_kyori_examination_api_1_3_0.xml b/.idea/libraries/Maven__net_kyori_examination_api_1_3_0.xml deleted file mode 100644 index 5b4190e..0000000 --- a/.idea/libraries/Maven__net_kyori_examination_api_1_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_kyori_examination_string_1_3_0.xml b/.idea/libraries/Maven__net_kyori_examination_string_1_3_0.xml deleted file mode 100644 index 7b7a7c3..0000000 --- a/.idea/libraries/Maven__net_kyori_examination_string_1_3_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__net_md_5_bungeecord_chat_1_16_R0_4.xml b/.idea/libraries/Maven__net_md_5_bungeecord_chat_1_16_R0_4.xml deleted file mode 100644 index 9a850ea..0000000 --- a/.idea/libraries/Maven__net_md_5_bungeecord_chat_1_16_R0_4.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_14_1.xml b/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_14_1.xml deleted file mode 100644 index 700b41b..0000000 --- a/.idea/libraries/Maven__org_apache_logging_log4j_log4j_api_2_14_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_checkerframework_checker_qual_3_18_0.xml b/.idea/libraries/Maven__org_checkerframework_checker_qual_3_18_0.xml deleted file mode 100644 index 1b0182f..0000000 --- a/.idea/libraries/Maven__org_checkerframework_checker_qual_3_18_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml b/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml deleted file mode 100644 index acdf443..0000000 --- a/.idea/libraries/Maven__org_hamcrest_hamcrest_core_1_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_jetbrains_annotations_22_0_0.xml b/.idea/libraries/Maven__org_jetbrains_annotations_22_0_0.xml deleted file mode 100644 index f350de5..0000000 --- a/.idea/libraries/Maven__org_jetbrains_annotations_22_0_0.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml deleted file mode 100644 index 67127c2..0000000 --- a/.idea/libraries/Maven__org_ow2_asm_asm_9_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_analysis_9_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_analysis_9_1.xml deleted file mode 100644 index a177d6a..0000000 --- a/.idea/libraries/Maven__org_ow2_asm_asm_analysis_9_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_commons_9_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_commons_9_1.xml deleted file mode 100644 index ae10a76..0000000 --- a/.idea/libraries/Maven__org_ow2_asm_asm_commons_9_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_ow2_asm_asm_tree_9_1.xml b/.idea/libraries/Maven__org_ow2_asm_asm_tree_9_1.xml deleted file mode 100644 index fbcb2ce..0000000 --- a/.idea/libraries/Maven__org_ow2_asm_asm_tree_9_1.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_24.xml b/.idea/libraries/Maven__org_projectlombok_lombok_1_18_24.xml deleted file mode 100644 index d43fa18..0000000 --- a/.idea/libraries/Maven__org_projectlombok_lombok_1_18_24.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml b/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml deleted file mode 100644 index 02b6812..0000000 --- a/.idea/libraries/Maven__org_slf4j_slf4j_api_1_7_30.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/libraries/Maven__org_yaml_snakeyaml_1_28.xml b/.idea/libraries/Maven__org_yaml_snakeyaml_1_28.xml deleted file mode 100644 index 1f853f7..0000000 --- a/.idea/libraries/Maven__org_yaml_snakeyaml_1_28.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml deleted file mode 100644 index 1518e28..0000000 --- a/.idea/misc.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml deleted file mode 100644 index 0e8908a..0000000 --- a/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/.idea/uiDesigner.xml b/.idea/uiDesigner.xml deleted file mode 100644 index 2b63946..0000000 --- a/.idea/uiDesigner.xml +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml deleted file mode 100644 index 16399a1..0000000 --- a/.idea/workspace.xml +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - { - "keyToString": { - "project.structure.last.edited": "Artifacts", - "project.structure.proportion": "0.15", - "project.structure.side.proportion": "0.2", - "settings.editor.selected.configurable": "inlay.hints" - } -} - - - - - - - - - - - - - - - - - - 1659578155313 - - - - \ No newline at end of file From 6cd046840da45f745fcac0d1dd84c81de90af092 Mon Sep 17 00:00:00 2001 From: Command <57562364+commandrod@users.noreply.github.com> Date: Wed, 31 Aug 2022 15:10:32 +0300 Subject: [PATCH 2/3] Update .gitignore --- .gitignore | 99 ++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 92 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 7b10210..4788b4b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,12 @@ -# IntelliJ stuff -target/ -test/ +# User-specific stuff +.idea/ + +*.iml +*.ipr +*.iws + +# IntelliJ +out/ # Compiled class file *.class @@ -11,9 +17,6 @@ test/ # BlueJ files *.ctxt -# Mobile Tools for Java (J2ME) -.mtj.tmp/ - # Package Files # *.jar *.war @@ -25,4 +28,86 @@ test/ # virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml hs_err_pid* -replay_pid* + +*~ + +# temporary files which can be created if a process still has a handle open of a deleted file +.fuse_hidden* + +# KDE directory preferences +.directory + +# Linux trash folder which might appear on any partition or disk +.Trash-* + +# .nfs files are created when an open file is removed but is still being accessed +.nfs* + +# General +.DS_Store +.AppleDouble +.LSOverride + +# Icon must end with two \r +Icon + +# Thumbnails +._* + +# Files that might appear in the root of a volume +.DocumentRevisions-V100 +.fseventsd +.Spotlight-V100 +.TemporaryItems +.Trashes +.VolumeIcon.icns +.com.apple.timemachine.donotpresent + +# Directories potentially created on remote AFP share +.AppleDB +.AppleDesktop +Network Trash Folder +Temporary Items +.apdisk + +# Windows thumbnail cache files +Thumbs.db +Thumbs.db:encryptable +ehthumbs.db +ehthumbs_vista.db + +# Dump file +*.stackdump + +# Folder config file +[Dd]esktop.ini + +# Recycle Bin used on file shares +$RECYCLE.BIN/ + +# Windows Installer files +*.cab +*.msi +*.msix +*.msm +*.msp + +# Windows shortcuts +*.lnk + +target/ + +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next + +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +.mvn/wrapper/maven-wrapper.jar +.flattened-pom.xml + +# Common working directory +run/ From 57a60a25c4acb69058e1c1bc4299607cc7572630 Mon Sep 17 00:00:00 2001 From: Command <57562364+commandrod@users.noreply.github.com> Date: Wed, 31 Aug 2022 15:45:16 +0300 Subject: [PATCH 3/3] fixed some bugs --- .../eventtools/api/commands/TargetedCommand.java | 14 ++++---------- .../eventtools/commands/HealCommand.java | 16 ++++++---------- .../eventtools/commands/SpawnCommand.java | 2 +- .../eventtools/listeners/MuteChatListener.java | 5 +++-- .../commandrod/eventtools/utils/Replacement.java | 2 +- 5 files changed, 15 insertions(+), 24 deletions(-) diff --git a/src/main/java/me/commandrod/eventtools/api/commands/TargetedCommand.java b/src/main/java/me/commandrod/eventtools/api/commands/TargetedCommand.java index 73c9331..02b19ad 100644 --- a/src/main/java/me/commandrod/eventtools/api/commands/TargetedCommand.java +++ b/src/main/java/me/commandrod/eventtools/api/commands/TargetedCommand.java @@ -4,22 +4,16 @@ import co.aikar.commands.annotation.Default; import co.aikar.commands.annotation.Optional; import co.aikar.commands.bukkit.contexts.OnlinePlayer; -import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; -public abstract class TargetedCommand extends BaseCommand { +public abstract class TargetedCommand extends BaseCommand { - public abstract void handle(T sender, OnlinePlayer args); + public abstract void handle(Player sender, OnlinePlayer args); @Default - public void targetedCommand(T sender, @Optional OnlinePlayer target) { - if (sender == null) return; + public void targetedCommand(Player sender, @Optional OnlinePlayer target) { if (target == null) { - if (!(sender instanceof Player player)) { - sender.sendMessage("EventTools > You must provide a player in order to execute this command."); - return; - } - handle(sender, new OnlinePlayer(player)); + handle(sender, new OnlinePlayer(sender)); return; } handle(sender, target); diff --git a/src/main/java/me/commandrod/eventtools/commands/HealCommand.java b/src/main/java/me/commandrod/eventtools/commands/HealCommand.java index f90b52d..9caa1c7 100644 --- a/src/main/java/me/commandrod/eventtools/commands/HealCommand.java +++ b/src/main/java/me/commandrod/eventtools/commands/HealCommand.java @@ -11,7 +11,6 @@ import net.kyori.adventure.text.Component; import org.bukkit.attribute.Attribute; import org.bukkit.attribute.AttributeInstance; -import org.bukkit.command.CommandSender; import org.bukkit.entity.Player; import org.bukkit.potion.PotionEffect; import org.bukkit.potion.PotionEffectType; @@ -20,18 +19,13 @@ @CommandAlias("heal") @CommandPermission("eventtools.heal") -public class HealCommand extends TargetedCommand { +public class HealCommand extends TargetedCommand { @Dependency private ConfigManager configManager; - public void handle(CommandSender sender, @Optional OnlinePlayer args) { - Player player; - if (!(sender instanceof Player)) { - player = args.getPlayer(); - } else { - player = (Player) sender; - } + public void handle(Player sender, @Optional OnlinePlayer args) { + Player player = args.getPlayer(); AttributeInstance attribute = player.getAttribute(Attribute.GENERIC_MAX_HEALTH); player.setHealth(attribute == null ? 20 : attribute.getBaseValue()); @@ -46,7 +40,9 @@ public void handle(CommandSender sender, @Optional OnlinePlayer args) { Component msg = configManager.getMessages().PREFIX.append( configManager.getTranslatedMessage("heal", "You healed %player%!") - .replaceText(Replacement.builder().replace("%player%", player.getName()).build()) + .replaceText(Replacement.builder() + .replace("%player%", player.getName()) + .build()) ); if (configManager.isEmpty(msg)) return; diff --git a/src/main/java/me/commandrod/eventtools/commands/SpawnCommand.java b/src/main/java/me/commandrod/eventtools/commands/SpawnCommand.java index a8503ea..c3d86e1 100644 --- a/src/main/java/me/commandrod/eventtools/commands/SpawnCommand.java +++ b/src/main/java/me/commandrod/eventtools/commands/SpawnCommand.java @@ -14,7 +14,7 @@ @CommandAlias("eventspawn|espawn") @CommandPermission("eventtools.spawn") -public class SpawnCommand extends TargetedCommand { +public class SpawnCommand extends TargetedCommand { @Dependency private ConfigManager configManager; diff --git a/src/main/java/me/commandrod/eventtools/listeners/MuteChatListener.java b/src/main/java/me/commandrod/eventtools/listeners/MuteChatListener.java index f92add2..d22ea9d 100644 --- a/src/main/java/me/commandrod/eventtools/listeners/MuteChatListener.java +++ b/src/main/java/me/commandrod/eventtools/listeners/MuteChatListener.java @@ -25,9 +25,10 @@ public void onChat(AsyncChatEvent event) { "%player%: %message%") .replaceText(Replacement.builder() .replace("%player%", player.getName()) + .build()) + .replaceText(Replacement.builder() .replace("%message%", event.message()) - .build() - ) + .build()) ); if (configManager.isEmpty(msg)) return; diff --git a/src/main/java/me/commandrod/eventtools/utils/Replacement.java b/src/main/java/me/commandrod/eventtools/utils/Replacement.java index 4ff1550..43874f1 100644 --- a/src/main/java/me/commandrod/eventtools/utils/Replacement.java +++ b/src/main/java/me/commandrod/eventtools/utils/Replacement.java @@ -26,7 +26,7 @@ public Replacement replace(@RegExp String placeholder, String value) { } public Replacement replace(@RegExp String placeholder, ComponentLike value) { - this.replacementBuilder.match(placeholder).replacement(value); + this.replacementBuilder.match(placeholder).replacement(value.asComponent()); return this; }