1.2.2
This commit is contained in:
parent
7b6fc59673
commit
84ab6c8d96
4 changed files with 11 additions and 5 deletions
|
|
@ -276,6 +276,8 @@ public class InventoryManager {
|
||||||
for(String c : sep) {
|
for(String c : sep) {
|
||||||
if(c.startsWith("msg %player% ")) {
|
if(c.startsWith("msg %player% ")) {
|
||||||
inventoryPlayer.getPlayer().sendMessage(MessagesManager.getColoredMessage(c.replace("msg %player% ", "")));
|
inventoryPlayer.getPlayer().sendMessage(MessagesManager.getColoredMessage(c.replace("msg %player% ", "")));
|
||||||
|
}else if(c.equals("close_inventory")){
|
||||||
|
inventoryPlayer.getPlayer().closeInventory();
|
||||||
}else{
|
}else{
|
||||||
Bukkit.dispatchCommand(sender, c.replace("%player%", inventoryPlayer.getPlayer().getName()));
|
Bukkit.dispatchCommand(sender, c.replace("%player%", inventoryPlayer.getPlayer().getName()));
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -21,15 +21,17 @@ public class NMSManager {
|
||||||
//Classes
|
//Classes
|
||||||
version.addClass("CraftItemStack",Class.forName("org.bukkit.craftbukkit."+serverVersion+".inventory.CraftItemStack"));
|
version.addClass("CraftItemStack",Class.forName("org.bukkit.craftbukkit."+serverVersion+".inventory.CraftItemStack"));
|
||||||
if(!serverVersionGreaterEqualThan(ServerVersion.v1_13_R1)) {
|
if(!serverVersionGreaterEqualThan(ServerVersion.v1_13_R1)) {
|
||||||
//Lower than 1.13
|
//1.12 or lower
|
||||||
version.addClass("NBTTagList",Class.forName("net.minecraft.server."+serverVersion+".NBTTagList"));
|
version.addClass("NBTTagList",Class.forName("net.minecraft.server."+serverVersion+".NBTTagList"));
|
||||||
}
|
}
|
||||||
if(serverVersionGreaterEqualThan(ServerVersion.v1_17_R1)){
|
if(serverVersionGreaterEqualThan(ServerVersion.v1_17_R1)){
|
||||||
|
//1.17 or greater
|
||||||
version.addClass("ItemStackNMS",Class.forName("net.minecraft.world.item.ItemStack"));
|
version.addClass("ItemStackNMS",Class.forName("net.minecraft.world.item.ItemStack"));
|
||||||
version.addClass("NBTTagCompound",Class.forName("net.minecraft.nbt.NBTTagCompound"));
|
version.addClass("NBTTagCompound",Class.forName("net.minecraft.nbt.NBTTagCompound"));
|
||||||
version.addClass("MojangsonParser",Class.forName("net.minecraft.nbt.MojangsonParser"));
|
version.addClass("MojangsonParser",Class.forName("net.minecraft.nbt.MojangsonParser"));
|
||||||
version.addClass("NBTBase",Class.forName("net.minecraft.nbt.NBTBase"));
|
version.addClass("NBTBase",Class.forName("net.minecraft.nbt.NBTBase"));
|
||||||
}else{
|
}else{
|
||||||
|
//1.16 or lower
|
||||||
version.addClass("ItemStackNMS",Class.forName("net.minecraft.server."+serverVersion+".ItemStack"));
|
version.addClass("ItemStackNMS",Class.forName("net.minecraft.server."+serverVersion+".ItemStack"));
|
||||||
version.addClass("NBTTagCompound",Class.forName("net.minecraft.server."+serverVersion+".NBTTagCompound"));
|
version.addClass("NBTTagCompound",Class.forName("net.minecraft.server."+serverVersion+".NBTTagCompound"));
|
||||||
version.addClass("MojangsonParser",Class.forName("net.minecraft.server."+serverVersion+".MojangsonParser"));
|
version.addClass("MojangsonParser",Class.forName("net.minecraft.server."+serverVersion+".MojangsonParser"));
|
||||||
|
|
@ -40,13 +42,14 @@ public class NMSManager {
|
||||||
version.addMethod("asNMSCopy",version.getClassRef("CraftItemStack").getMethod("asNMSCopy",ItemStack.class));
|
version.addMethod("asNMSCopy",version.getClassRef("CraftItemStack").getMethod("asNMSCopy",ItemStack.class));
|
||||||
version.addMethod("asBukkitCopy",version.getClassRef("CraftItemStack").getMethod("asBukkitCopy",version.getClassRef("ItemStackNMS")));
|
version.addMethod("asBukkitCopy",version.getClassRef("CraftItemStack").getMethod("asBukkitCopy",version.getClassRef("ItemStackNMS")));
|
||||||
if(!serverVersionGreaterEqualThan(ServerVersion.v1_13_R1)){
|
if(!serverVersionGreaterEqualThan(ServerVersion.v1_13_R1)){
|
||||||
//Lower than 1.13
|
//1.12 or lower
|
||||||
version.addMethod("getList",version.getClassRef("NBTTagCompound").getMethod("getList",String.class,int.class));
|
version.addMethod("getList",version.getClassRef("NBTTagCompound").getMethod("getList",String.class,int.class));
|
||||||
version.addMethod("listSize",version.getClassRef("NBTTagList").getMethod("size"));
|
version.addMethod("listSize",version.getClassRef("NBTTagList").getMethod("size"));
|
||||||
version.addMethod("listGet",version.getClassRef("NBTTagList").getMethod("get",int.class));
|
version.addMethod("listGet",version.getClassRef("NBTTagList").getMethod("get",int.class));
|
||||||
version.addMethod("listAdd",version.getClassRef("NBTTagList").getMethod("add",version.getClassRef("NBTBase")));
|
version.addMethod("listAdd",version.getClassRef("NBTTagList").getMethod("add",version.getClassRef("NBTBase")));
|
||||||
}
|
}
|
||||||
if(!serverVersionGreaterEqualThan(ServerVersion.v1_18_R1)){
|
if(!serverVersionGreaterEqualThan(ServerVersion.v1_18_R1)){
|
||||||
|
//1.17 or lower
|
||||||
version.addMethod("hasTag",version.getClassRef("ItemStackNMS").getMethod("hasTag"));
|
version.addMethod("hasTag",version.getClassRef("ItemStackNMS").getMethod("hasTag"));
|
||||||
version.addMethod("getTag",version.getClassRef("ItemStackNMS").getMethod("getTag"));
|
version.addMethod("getTag",version.getClassRef("ItemStackNMS").getMethod("getTag"));
|
||||||
version.addMethod("setTag",version.getClassRef("ItemStackNMS").getMethod("setTag",version.getClassRef("NBTTagCompound")));
|
version.addMethod("setTag",version.getClassRef("ItemStackNMS").getMethod("setTag",version.getClassRef("NBTTagCompound")));
|
||||||
|
|
@ -71,6 +74,7 @@ public class NMSManager {
|
||||||
version.addMethod("hasKeyOfType",version.getClassRef("NBTTagCompound").getMethod("hasKeyOfType",String.class,int.class));
|
version.addMethod("hasKeyOfType",version.getClassRef("NBTTagCompound").getMethod("hasKeyOfType",String.class,int.class));
|
||||||
version.addMethod("parse",version.getClassRef("MojangsonParser").getMethod("parse",String.class));
|
version.addMethod("parse",version.getClassRef("MojangsonParser").getMethod("parse",String.class));
|
||||||
}else{
|
}else{
|
||||||
|
//1.18 or greater
|
||||||
String methodName = null;
|
String methodName = null;
|
||||||
switch(serverVersion){
|
switch(serverVersion){
|
||||||
case v1_18_R1: methodName = "r"; break;
|
case v1_18_R1: methodName = "r"; break;
|
||||||
|
|
@ -337,6 +341,6 @@ public class NMSManager {
|
||||||
|
|
||||||
|
|
||||||
private boolean serverVersionGreaterEqualThan(ServerVersion version){
|
private boolean serverVersionGreaterEqualThan(ServerVersion version){
|
||||||
return serverVersion.ordinal() > version.ordinal();
|
return serverVersion.ordinal() >= version.ordinal();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -40,7 +40,7 @@ requirements:
|
||||||
- '&8Status: &7$%vault_eco_balance% %status_symbol_price%'
|
- '&8Status: &7$%vault_eco_balance% %status_symbol_price%'
|
||||||
- ''
|
- ''
|
||||||
- '&fYou need level 20+'
|
- '&fYou need level 20+'
|
||||||
- '&8Status: &7$%player_level% %status_symbol_requirement_1%'
|
- '&8Status: &7%player_level% %status_symbol_requirement_1%'
|
||||||
extra_requirements:
|
extra_requirements:
|
||||||
- "%player_level% >= 20"
|
- "%player_level% >= 20"
|
||||||
display:
|
display:
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
main: pk.ajneb97.PlayerKits2
|
main: pk.ajneb97.PlayerKits2
|
||||||
version: 1.2.1
|
version: 1.2.2
|
||||||
name: PlayerKits2
|
name: PlayerKits2
|
||||||
api-version: 1.13
|
api-version: 1.13
|
||||||
softdepend: [Vault,PlaceholderAPI]
|
softdepend: [Vault,PlaceholderAPI]
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue