1.12.3
This commit is contained in:
parent
1dd7816c45
commit
918b7105f9
4 changed files with 23 additions and 8 deletions
|
|
@ -125,6 +125,7 @@ public class PlayerKits2 extends JavaPlugin {
|
||||||
serverVersion = ServerVersion.v1_20_R4;
|
serverVersion = ServerVersion.v1_20_R4;
|
||||||
break;
|
break;
|
||||||
case "1.21":
|
case "1.21":
|
||||||
|
case "1.21.1":
|
||||||
serverVersion = ServerVersion.v1_21_R1;
|
serverVersion = ServerVersion.v1_21_R1;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
|
|
|
||||||
|
|
@ -170,13 +170,6 @@ public class KitItemManager {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
List<String> flags = kitItem.getFlags();
|
|
||||||
if(flags != null) {
|
|
||||||
for(int i=0;i<flags.size();i++) {
|
|
||||||
meta.addItemFlags(ItemFlag.valueOf(flags.get(i)));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
item.setItemMeta(meta);
|
item.setItemMeta(meta);
|
||||||
|
|
||||||
//OTHER META
|
//OTHER META
|
||||||
|
|
@ -222,6 +215,22 @@ public class KitItemManager {
|
||||||
item = ItemUtils.setAttributes(plugin,item, attributes);
|
item = ItemUtils.setAttributes(plugin,item, attributes);
|
||||||
|
|
||||||
ServerVersion serverVersion = PlayerKits2.serverVersion;
|
ServerVersion serverVersion = PlayerKits2.serverVersion;
|
||||||
|
|
||||||
|
//Item Flags
|
||||||
|
meta = item.getItemMeta();
|
||||||
|
List<String> flags = kitItem.getFlags();
|
||||||
|
if(flags != null) {
|
||||||
|
for(String flag : flags) {
|
||||||
|
if (flag.equals("HIDE_ATTRIBUTES") && plugin.getDependencyManager().isPaper() &&
|
||||||
|
serverVersion.serverVersionGreaterEqualThan(serverVersion, ServerVersion.v1_21_R1)) {
|
||||||
|
//Fix PAPER HIDE_ATTRIBUTES
|
||||||
|
ItemUtils.addDummyAttribute(meta);
|
||||||
|
}
|
||||||
|
meta.addItemFlags(ItemFlag.valueOf(flag));
|
||||||
|
}
|
||||||
|
}
|
||||||
|
item.setItemMeta(meta);
|
||||||
|
|
||||||
if(!serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_20_R4)){
|
if(!serverVersion.serverVersionGreaterEqualThan(serverVersion,ServerVersion.v1_20_R4)){
|
||||||
List<String> nbtList = kitItem.getNbt();
|
List<String> nbtList = kitItem.getNbt();
|
||||||
item = ItemUtils.setNBT(plugin,item, nbtList);
|
item = ItemUtils.setNBT(plugin,item, nbtList);
|
||||||
|
|
|
||||||
|
|
@ -565,6 +565,11 @@ public class ItemUtils {
|
||||||
}
|
}
|
||||||
return item;
|
return item;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static void addDummyAttribute(ItemMeta meta){
|
||||||
|
AttributeModifier modifier = new AttributeModifier(UUID.randomUUID(),"",0,AttributeModifier.Operation.ADD_NUMBER,EquipmentSlot.FEET);
|
||||||
|
meta.addAttributeModifier(Attribute.GENERIC_GRAVITY, modifier);
|
||||||
|
}
|
||||||
|
|
||||||
public static KitItemBookData getBookData(ItemStack item){
|
public static KitItemBookData getBookData(ItemStack item){
|
||||||
KitItemBookData bookData = null;
|
KitItemBookData bookData = null;
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,5 @@
|
||||||
main: pk.ajneb97.PlayerKits2
|
main: pk.ajneb97.PlayerKits2
|
||||||
version: 1.12.2
|
version: 1.12.3
|
||||||
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