From 75f404f387cbaf51ea77e246eb9e66a01c3526d9 Mon Sep 17 00:00:00 2001
From: nossr50 <nossr50@gmail.com>
Date: Tue, 30 Jun 2020 11:35:36 -0700
Subject: [PATCH] Wire missing NMS

---
 Changelog.txt                                                 | 1 +
 .../gmail/nossr50/config/skills/salvage/SalvageConfig.java    | 1 -
 .../layers/PlayerAttackCooldownExploitPreventionLayer.java    | 3 +++
 src/main/java/com/gmail/nossr50/util/nms/NMSConstants.java    | 4 ++--
 src/main/java/com/gmail/nossr50/util/nms/NMSVersion.java      | 2 +-
 5 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/Changelog.txt b/Changelog.txt
index 3ed607cb7..79363e0f9 100644
--- a/Changelog.txt
+++ b/Changelog.txt
@@ -35,6 +35,7 @@ Version 2.1.131
 
 
     Netherite now requires 100 Salvage skill (by default configs) in order to salvage
+    Added the missing NMS wiring (it should be noted NMS isn't currently being used in mcMMO, but the framework is there. Working on a sideproject involving this...)
 
     NOTES:
 
diff --git a/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java b/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java
index a9823ceba..bd1fd9819 100644
--- a/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java
+++ b/src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java
@@ -8,7 +8,6 @@ import com.gmail.nossr50.mcMMO;
 import com.gmail.nossr50.skills.salvage.salvageables.Salvageable;
 import com.gmail.nossr50.skills.salvage.salvageables.SalvageableFactory;
 import com.gmail.nossr50.util.ItemUtils;
-import com.gmail.nossr50.util.MaterialMapStore;
 import com.gmail.nossr50.util.skills.SkillUtils;
 import org.bukkit.Material;
 import org.bukkit.configuration.ConfigurationSection;
diff --git a/src/main/java/com/gmail/nossr50/util/compat/layers/PlayerAttackCooldownExploitPreventionLayer.java b/src/main/java/com/gmail/nossr50/util/compat/layers/PlayerAttackCooldownExploitPreventionLayer.java
index e21182d2c..46769536f 100644
--- a/src/main/java/com/gmail/nossr50/util/compat/layers/PlayerAttackCooldownExploitPreventionLayer.java
+++ b/src/main/java/com/gmail/nossr50/util/compat/layers/PlayerAttackCooldownExploitPreventionLayer.java
@@ -56,6 +56,7 @@ public class PlayerAttackCooldownExploitPreventionLayer extends AbstractCompatib
             case NMS_1_13_2:
             case NMS_1_14_4:
             case NMS_1_15_2:
+            case NMS_1_16_1:
                 return true;
             default:
                 return false;
@@ -189,6 +190,8 @@ public class PlayerAttackCooldownExploitPreventionLayer extends AbstractCompatib
                 return wireNMS("dY", "s", "dZ", "getHandle");
             case NMS_1_15_2:
                 return wireNMS("ex", "s", "ey", "getHandle");
+            case NMS_1_16_1:
+                return wireNMS("eR", "getAttackCooldown", "resetAttackCooldown", "getHandle");
             default:
                 break;
         }
diff --git a/src/main/java/com/gmail/nossr50/util/nms/NMSConstants.java b/src/main/java/com/gmail/nossr50/util/nms/NMSConstants.java
index ee94153cf..6f740e084 100644
--- a/src/main/java/com/gmail/nossr50/util/nms/NMSConstants.java
+++ b/src/main/java/com/gmail/nossr50/util/nms/NMSConstants.java
@@ -48,8 +48,8 @@ public class NMSConstants {
                 return "v1_14_R1";
             case NMS_1_15_2:
                 return "v1_15_R1";
-            case NMS_1_16:
-                break;
+            case NMS_1_16_1:
+                return "v1_16_R1";
             case UNSUPPORTED:
                 break;
         }
diff --git a/src/main/java/com/gmail/nossr50/util/nms/NMSVersion.java b/src/main/java/com/gmail/nossr50/util/nms/NMSVersion.java
index 165cb8a07..51251c47a 100644
--- a/src/main/java/com/gmail/nossr50/util/nms/NMSVersion.java
+++ b/src/main/java/com/gmail/nossr50/util/nms/NMSVersion.java
@@ -17,7 +17,7 @@ public enum NMSVersion {
     NMS_1_15_2("1.15.2"),
 
     //1.16
-    NMS_1_16("1.16"),
+    NMS_1_16_1("1.16.1"),
 
     //Version not known to this build of mcMMO
     UNSUPPORTED("unsupported");