From 64ad990db83cc7539cba617f786cbd2ef318b194 Mon Sep 17 00:00:00 2001
From: Zeshan Aslam <zeshan12aslam@gmail.com>
Date: Sat, 12 Jun 2021 18:42:20 -0400
Subject: [PATCH] Added v1_17_R1 support

---
 src/com/zeshanaslam/actionhealth/Main.java            |  2 +-
 .../zeshanaslam/actionhealth/config/ConfigStore.java  |  2 +-
 .../zeshanaslam/actionhealth/support/NewAction.java   | 11 +++++++++++
 .../zeshanaslam/actionhealth/utils/HealthUtil.java    |  4 +++-
 src/com/zeshanaslam/actionhealth/utils/Metrics.java   |  2 +-
 5 files changed, 17 insertions(+), 4 deletions(-)
 create mode 100644 src/com/zeshanaslam/actionhealth/support/NewAction.java

diff --git a/src/com/zeshanaslam/actionhealth/Main.java b/src/com/zeshanaslam/actionhealth/Main.java
index c91387a..79576ff 100644
--- a/src/com/zeshanaslam/actionhealth/Main.java
+++ b/src/com/zeshanaslam/actionhealth/Main.java
@@ -7,10 +7,10 @@ import com.zeshanaslam.actionhealth.commands.HealthCommand;
 import com.zeshanaslam.actionhealth.config.ConfigStore;
 import com.zeshanaslam.actionhealth.events.HealthListeners;
 import com.zeshanaslam.actionhealth.utils.HealthUtil;
+import com.zeshanaslam.actionhealth.utils.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.plugin.java.JavaPlugin;
 import org.bukkit.scheduler.BukkitTask;
-import org.bstats.bukkit.Metrics;
 
 import java.io.File;
 import java.util.ArrayList;
diff --git a/src/com/zeshanaslam/actionhealth/config/ConfigStore.java b/src/com/zeshanaslam/actionhealth/config/ConfigStore.java
index 9e44edc..1d28300 100644
--- a/src/com/zeshanaslam/actionhealth/config/ConfigStore.java
+++ b/src/com/zeshanaslam/actionhealth/config/ConfigStore.java
@@ -3,10 +3,10 @@ package com.zeshanaslam.actionhealth.config;
 import com.zeshanaslam.actionhealth.LookThread;
 import com.zeshanaslam.actionhealth.Main;
 import com.zeshanaslam.actionhealth.action.ActionStore;
+import com.zeshanaslam.actionhealth.utils.Metrics;
 import org.bukkit.Bukkit;
 import org.bukkit.ChatColor;
 import org.bukkit.scheduler.BukkitTask;
-import org.bstats.bukkit.Metrics;
 
 import java.util.ArrayList;
 import java.util.HashMap;
diff --git a/src/com/zeshanaslam/actionhealth/support/NewAction.java b/src/com/zeshanaslam/actionhealth/support/NewAction.java
new file mode 100644
index 0000000..b201a07
--- /dev/null
+++ b/src/com/zeshanaslam/actionhealth/support/NewAction.java
@@ -0,0 +1,11 @@
+package com.zeshanaslam.actionhealth.support;
+
+import net.md_5.bungee.api.ChatMessageType;
+import net.md_5.bungee.api.chat.TextComponent;
+import org.bukkit.entity.Player;
+
+public class NewAction {
+    public NewAction(Player player, String message) throws ClassNotFoundException {
+        player.spigot().sendMessage(ChatMessageType.ACTION_BAR, new TextComponent(message));
+    }
+}
diff --git a/src/com/zeshanaslam/actionhealth/utils/HealthUtil.java b/src/com/zeshanaslam/actionhealth/utils/HealthUtil.java
index ab8e9ca..251ab92 100644
--- a/src/com/zeshanaslam/actionhealth/utils/HealthUtil.java
+++ b/src/com/zeshanaslam/actionhealth/utils/HealthUtil.java
@@ -268,7 +268,9 @@ public class HealthUtil {
         message = ChatColor.translateAlternateColorCodes('&', message);
 
         try {
-            if (plugin.configStore.mcVersion.equals("v1_16_R1") || plugin.configStore.mcVersion.equals("v1_16_R2") || plugin.configStore.mcVersion.equals("v1_16_R3")) {
+            if (plugin.configStore.mcVersion.equals("v1_17_R1")) {
+                new NewAction(player, message);
+            } else if (plugin.configStore.mcVersion.equals("v1_16_R1") || plugin.configStore.mcVersion.equals("v1_16_R2") || plugin.configStore.mcVersion.equals("v1_16_R3")) {
                 new PreAction(player, message);
             } else if (plugin.configStore.mcVersion.equals("v1_12_R1") || plugin.configStore.mcVersion.startsWith("v1_13") || plugin.configStore.mcVersion.startsWith("v1_14_") || plugin.configStore.mcVersion.startsWith("v1_15_")) {
                 new LegacyPreAction(player, message);
diff --git a/src/com/zeshanaslam/actionhealth/utils/Metrics.java b/src/com/zeshanaslam/actionhealth/utils/Metrics.java
index 922f712..805ef85 100644
--- a/src/com/zeshanaslam/actionhealth/utils/Metrics.java
+++ b/src/com/zeshanaslam/actionhealth/utils/Metrics.java
@@ -1,4 +1,4 @@
-package org.bstats.bukkit;
+package com.zeshanaslam.actionhealth.utils;
 
 import java.io.BufferedReader;
 import java.io.ByteArrayOutputStream;