EpicKnarvik97/mcMMO
EpicKnarvik97/mcMMO
1
0
Fork 0
mirror of https://github.com/mcMMO-Dev/mcMMO.git synced 2024-11-25 22:56:45 +01:00
Code Issues Projects Releases Wiki Activity

Wire missing NMS

Browse Source
This commit is contained in:
nossr50 2020-06-30 11:35:36 -07:00
parent 420477149e
commit 75f404f387
5 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Changelog.txt
View File

@ -35,6 +35,7 @@ Version 2.1.131
Netherite now requires 100 Salvage skill (by default configs) in order to salvage 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: NOTES:

1
src/main/java/com/gmail/nossr50/config/skills/salvage/SalvageConfig.java
View File

@ -8,7 +8,6 @@ import com.gmail.nossr50.mcMMO;
import com.gmail.nossr50.skills.salvage.salvageables.Salvageable; import com.gmail.nossr50.skills.salvage.salvageables.Salvageable;
import com.gmail.nossr50.skills.salvage.salvageables.SalvageableFactory; import com.gmail.nossr50.skills.salvage.salvageables.SalvageableFactory;
import com.gmail.nossr50.util.ItemUtils; import com.gmail.nossr50.util.ItemUtils;
import com.gmail.nossr50.util.MaterialMapStore;
import com.gmail.nossr50.util.skills.SkillUtils; import com.gmail.nossr50.util.skills.SkillUtils;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.configuration.ConfigurationSection; import org.bukkit.configuration.ConfigurationSection;

3
src/main/java/com/gmail/nossr50/util/compat/layers/PlayerAttackCooldownExploitPreventionLayer.java
View File

@ -56,6 +56,7 @@ public class PlayerAttackCooldownExploitPreventionLayer extends AbstractCompatib
case NMS_1_13_2: case NMS_1_13_2:
case NMS_1_14_4: case NMS_1_14_4:
case NMS_1_15_2: case NMS_1_15_2:
case NMS_1_16_1:
return true; return true;
default: default:
return false; return false;
@ -189,6 +190,8 @@ public class PlayerAttackCooldownExploitPreventionLayer extends AbstractCompatib
return wireNMS("dY", "s", "dZ", "getHandle"); return wireNMS("dY", "s", "dZ", "getHandle");
case NMS_1_15_2: case NMS_1_15_2:
return wireNMS("ex", "s", "ey", "getHandle"); return wireNMS("ex", "s", "ey", "getHandle");
case NMS_1_16_1:
return wireNMS("eR", "getAttackCooldown", "resetAttackCooldown", "getHandle");
default: default:
break; break;
} }

4
src/main/java/com/gmail/nossr50/util/nms/NMSConstants.java
View File

@ -48,8 +48,8 @@ public class NMSConstants {
return "v1_14_R1"; return "v1_14_R1";
case NMS_1_15_2: case NMS_1_15_2:
return "v1_15_R1"; return "v1_15_R1";
case NMS_1_16: case NMS_1_16_1:
break; return "v1_16_R1";
case UNSUPPORTED: case UNSUPPORTED:
break; break;
} }

2
src/main/java/com/gmail/nossr50/util/nms/NMSVersion.java
View File

@ -17,7 +17,7 @@ public enum NMSVersion {
NMS_1_15_2("1.15.2"), NMS_1_15_2("1.15.2"),
//1.16 //1.16
NMS_1_16("1.16"), NMS_1_16_1("1.16.1"),
//Version not known to this build of mcMMO //Version not known to this build of mcMMO
UNSUPPORTED("unsupported"); UNSUPPORTED("unsupported");