diff --git a/.classpath b/.classpath
index 43a0b04..4b2c53f 100644
--- a/.classpath
+++ b/.classpath
@@ -1,40 +1,30 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/me/TheTealViper/enderbank/BankStorage.java b/src/me/TheTealViper/enderbank/BankStorage.java
index b1326af..5eede12 100644
--- a/src/me/TheTealViper/enderbank/BankStorage.java
+++ b/src/me/TheTealViper/enderbank/BankStorage.java
@@ -188,6 +188,7 @@ public class BankStorage {
public void save() {
pf.set("inventory", null);
for(int i = 0;i < items.size();i++) {
+ if(items.get(i) == null) {continue;}
pf.set("inventory." + i, items.get(i));
}
pf.set("unlockedPages", unlockedPages);
@@ -220,6 +221,9 @@ public class BankStorage {
}
//Second check for same items
+ if(items.get(i) ==null) {
+ continue;
+ }
if(items.get(i).isSimilar(pItem)) { //If there is empty space in the bank
ItemStack bItem = items.get(i);
int bAmount = bItem.getAmount();
@@ -338,7 +342,10 @@ public class BankStorage {
this.itemIdentifiers = new ArrayList();
for(int i = 0;i < items.size();i++) {
ItemStack item = items.get(i);
-
+ if(item == null)
+ {
+ continue;
+ }
if(itemIdentifiers.size() < 54) {
boolean found = false;
diff --git a/src/me/TheTealViper/enderbank/utils/ItemCreator.java b/src/me/TheTealViper/enderbank/utils/ItemCreator.java
index 47b290a..61a110d 100644
--- a/src/me/TheTealViper/enderbank/utils/ItemCreator.java
+++ b/src/me/TheTealViper/enderbank/utils/ItemCreator.java
@@ -51,34 +51,34 @@ public class ItemCreator implements Listener{
for(String enchantmentString : enchantmentStrings){
String enchantment = enchantmentString.split(":")[0];
int level = Integer.valueOf(enchantmentString.split(":")[1]);
- if(enchantment.equalsIgnoreCase("arrowdamage")){
- item.addEnchantment(Enchantment.ARROW_DAMAGE, level);
- }else if(enchantment.equalsIgnoreCase("arrowfire")){
- item.addUnsafeEnchantment(Enchantment.ARROW_FIRE, level);
- }else if(enchantment.equalsIgnoreCase("arrowinfinite")){
- item.addUnsafeEnchantment(Enchantment.ARROW_INFINITE, level);
- }else if(enchantment.equalsIgnoreCase("arrowknockback")){
- item.addUnsafeEnchantment(Enchantment.ARROW_KNOCKBACK, level);
+ if(enchantment.equalsIgnoreCase("power")){
+ item.addEnchantment(Enchantment.POWER, level);
+ }else if(enchantment.equalsIgnoreCase("flame")){
+ item.addUnsafeEnchantment(Enchantment.FLAME, level);
+ }else if(enchantment.equalsIgnoreCase("infinity")){
+ item.addUnsafeEnchantment(Enchantment.INFINITY, level);
+ }else if(enchantment.equalsIgnoreCase("punch")){
+ item.addUnsafeEnchantment(Enchantment.PUNCH, level);
}else if(enchantment.equalsIgnoreCase("damage")){
- item.addUnsafeEnchantment(Enchantment.DAMAGE_ALL, level);
- }else if(enchantment.equalsIgnoreCase("digspeed")){
- item.addUnsafeEnchantment(Enchantment.DIG_SPEED, level);
- }else if(enchantment.equalsIgnoreCase("durability")){
- item.addUnsafeEnchantment(Enchantment.DURABILITY, level);
+ item.addUnsafeEnchantment(Enchantment.SHARPNESS, level);
+ }else if(enchantment.equalsIgnoreCase("efficiency")){
+ item.addUnsafeEnchantment(Enchantment.EFFICIENCY, level);
+ }else if(enchantment.equalsIgnoreCase("unbreaking")){
+ item.addUnsafeEnchantment(Enchantment.UNBREAKING, level);
}else if(enchantment.equalsIgnoreCase("fireaspect")){
item.addUnsafeEnchantment(Enchantment.FIRE_ASPECT, level);
}else if(enchantment.equalsIgnoreCase("knockback")){
item.addUnsafeEnchantment(Enchantment.KNOCKBACK, level);
- }else if(enchantment.equalsIgnoreCase("lootbonusblock")){
- item.addUnsafeEnchantment(Enchantment.LOOT_BONUS_BLOCKS, level);
- }else if(enchantment.equalsIgnoreCase("lootbonusmob")){
- item.addUnsafeEnchantment(Enchantment.LOOT_BONUS_MOBS, level);
- }else if(enchantment.equalsIgnoreCase("luck")){
- item.addUnsafeEnchantment(Enchantment.LUCK, level);
+ }else if(enchantment.equalsIgnoreCase("fortune")){
+ item.addUnsafeEnchantment(Enchantment.FORTUNE, level);
+ }else if(enchantment.equalsIgnoreCase("looting")){
+ item.addUnsafeEnchantment(Enchantment.LOOTING, level);
+ }else if(enchantment.equalsIgnoreCase("luckofthesea")){
+ item.addUnsafeEnchantment(Enchantment.LUCK_OF_THE_SEA, level);
}else if(enchantment.equalsIgnoreCase("protectionfall")){
- item.addUnsafeEnchantment(Enchantment.PROTECTION_FALL, level);
+ item.addUnsafeEnchantment(Enchantment.FEATHER_FALLING, level);
}else if(enchantment.equalsIgnoreCase("protectionfire")){
- item.addUnsafeEnchantment(Enchantment.PROTECTION_FALL, level);
+ item.addUnsafeEnchantment(Enchantment.FIRE_PROTECTION, level);
}else if(enchantment.equalsIgnoreCase("silktouch")){
item.addUnsafeEnchantment(Enchantment.SILK_TOUCH, level);
}
diff --git a/src/me/TheTealViper/enderbank/utils/LoadItemstackFromConfig.java b/src/me/TheTealViper/enderbank/utils/LoadItemstackFromConfig.java
index 6028c12..f478345 100644
--- a/src/me/TheTealViper/enderbank/utils/LoadItemstackFromConfig.java
+++ b/src/me/TheTealViper/enderbank/utils/LoadItemstackFromConfig.java
@@ -87,26 +87,26 @@ public class LoadItemstackFromConfig {
String enchantmentName = enchantmentString.split(":")[0];
int enchantmentLevel = Integer.valueOf(enchantmentString.split(":")[1]);
switch(enchantmentName) {
- case "arrowdamage":
- meta.addEnchant(Enchantment.ARROW_DAMAGE, enchantmentLevel, true);
+ case "power":
+ meta.addEnchant(Enchantment.POWER, enchantmentLevel, true);
break;
- case "arrowfire":
- meta.addEnchant(Enchantment.ARROW_FIRE, enchantmentLevel, true);
+ case "flame":
+ meta.addEnchant(Enchantment.FLAME, enchantmentLevel, true);
break;
- case "arrowinfinite":
- meta.addEnchant(Enchantment.ARROW_INFINITE, enchantmentLevel, true);
+ case "infinity":
+ meta.addEnchant(Enchantment.INFINITY, enchantmentLevel, true);
break;
- case "arrowknockback":
- meta.addEnchant(Enchantment.ARROW_KNOCKBACK, enchantmentLevel, true);
+ case "punch":
+ meta.addEnchant(Enchantment.PUNCH, enchantmentLevel, true);
break;
- case "damage":
- meta.addEnchant(Enchantment.DAMAGE_ALL, enchantmentLevel, true);
+ case "sharpness":
+ meta.addEnchant(Enchantment.SHARPNESS, enchantmentLevel, true);
break;
- case "digspeed":
- meta.addEnchant(Enchantment.DIG_SPEED, enchantmentLevel, true);
+ case "efficiency":
+ meta.addEnchant(Enchantment.EFFICIENCY, enchantmentLevel, true);
break;
- case "durability":
- meta.addEnchant(Enchantment.DURABILITY, enchantmentLevel, true);
+ case "unbreaking":
+ meta.addEnchant(Enchantment.UNBREAKING, enchantmentLevel, true);
break;
case "fireaspect":
meta.addEnchant(Enchantment.FIRE_ASPECT, enchantmentLevel, true);
@@ -114,20 +114,20 @@ public class LoadItemstackFromConfig {
case "knockback":
meta.addEnchant(Enchantment.KNOCKBACK, enchantmentLevel, true);
break;
- case "lootbonusblock":
- meta.addEnchant(Enchantment.LOOT_BONUS_BLOCKS, enchantmentLevel, true);
+ case "fortune":
+ meta.addEnchant(Enchantment.FORTUNE, enchantmentLevel, true);
break;
- case "lootbonusmob":
- meta.addEnchant(Enchantment.LOOT_BONUS_MOBS, enchantmentLevel, true);
+ case "looting":
+ meta.addEnchant(Enchantment.LOOTING, enchantmentLevel, true);
break;
- case "luck":
- meta.addEnchant(Enchantment.LUCK, enchantmentLevel, true);
+ case "luckofthesea":
+ meta.addEnchant(Enchantment.LUCK_OF_THE_SEA, enchantmentLevel, true);
break;
- case "protectionfall":
- meta.addEnchant(Enchantment.PROTECTION_FALL, enchantmentLevel, true);
+ case "featherfall":
+ meta.addEnchant(Enchantment.FEATHER_FALLING, enchantmentLevel, true);
break;
case "protectionfire":
- meta.addEnchant(Enchantment.PROTECTION_FALL, enchantmentLevel, true);
+ meta.addEnchant(Enchantment.FIRE_PROTECTION, enchantmentLevel, true);
break;
case "silktouch":
meta.addEnchant(Enchantment.SILK_TOUCH, enchantmentLevel, true);