Browse Source

Wire missing NMS

nossr50 5 years ago
parent
commit
75f404f387

+ 1 - 0
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:
 

+ 0 - 1
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;

+ 3 - 0
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;
         }

+ 2 - 2
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;
         }

+ 1 - 1
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");