mirror/Slimefun4
mirror/Slimefun4
1
Fork 0
mirror of https://github.com/StarWishsama/Slimefun4.git synced 2024-09-20 11:45:51 +00:00
Code Releases Activity

Doing the requested changes.

Browse Source
This commit is contained in:
LinoxGH 2019-08-30 23:39:14 +03:00 committed by GitHub
parent 9818d8bb08
commit 60977a01c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/me/mrCookieSlime/Slimefun/Setup/SlimefunSetup.java
View File

@ -867,7 +867,7 @@ public final class SlimefunSetup {
.register(true); .register(true);
new SlimefunItem(Categories.MAGIC, SlimefunItems.STAFF_STORM, "STAFF_ELEMENTAL_STORM", RecipeType.ANCIENT_ALTAR, new SlimefunItem(Categories.MAGIC, SlimefunItems.STAFF_STORM, "STAFF_ELEMENTAL_STORM", RecipeType.ANCIENT_ALTAR,
new ItemStack[] {SlimefunItems.RUNE_AIR, SlimefunItems.RUNE_WATER, SlimefunItems.ENDER_LUMP_3, SlimefunItems.STAFF_WATER, SlimefunItems.STAFF_WIND, SlimefunItems.MAGIC_SUGAR, SlimefunItems.ENDER_LUMP_3, SlimefunItems.RUNE_WATER, SlimefunItems.RUNE_AIR}) new ItemStack[] {SlimefunItems.RUNE_AIR, SlimefunItems.RUNE_WATER, SlimefunItems.ENDER_LUMP_3, SlimefunItems.MAGIC_SUGAR, SlimefunItems.STAFF_WIND, SlimefunItems.MAGIC_SUGAR, SlimefunItems.ENDER_LUMP_3, SlimefunItems.RUNE_WATER, SlimefunItems.RUNE_AIR})
.register(true, new ItemInteractionHandler() { .register(true, new ItemInteractionHandler() {
@Override @Override
@ -875,9 +875,10 @@ public final class SlimefunSetup {
//Not checking if lores equals because we need a special one for that. //Not checking if lores equals because we need a special one for that.
if (SlimefunManager.isItemSimiliar(item, SlimefunItems.STAFF_STORM, false)) { if (SlimefunManager.isItemSimiliar(item, SlimefunItems.STAFF_STORM, false)) {
if (!item.hasItemMeta()) return false;
ItemMeta itemM = item.getItemMeta(); ItemMeta itemM = item.getItemMeta();
if (!itemM.hasLore()) return false;
List<String> itemML = itemM.getLore(); List<String> itemML = itemM.getLore();
if (itemML == null) return false;
ItemStack SFitem = SlimefunItems.STAFF_STORM; ItemStack SFitem = SlimefunItems.STAFF_STORM;
ItemMeta SFitemM = SFitem.getItemMeta(); ItemMeta SFitemM = SFitem.getItemMeta();
@ -900,40 +901,33 @@ public final class SlimefunSetup {
p.setFoodLevel(event.getFoodLevel()); p.setFoodLevel(event.getFoodLevel());
} }
for (int i = 0; i < itemML.size(); i++) { boolean itemBroke = false;
boolean correctLore = false; switch (itemML.get(3)) {
switch (itemML.get(i)) {
case "&e5 Uses &7left": case "&e5 Uses &7left":
itemML.set(i, "&e4 Uses &7left"); itemML.set(3, "&e4 Uses &7left");
correctLore = true;
break; break;
case "&e4 Uses &7left": case "&e4 Uses &7left":
itemML.set(i, "&e3 Uses &7left"); itemML.set(3, "&e3 Uses &7left");
correctLore = true;
break; break;
case "&e3 Uses &7left": case "&e3 Uses &7left":
itemML.set(i, "&e2 Uses &7left"); itemML.set(3, "&e2 Uses &7left");
correctLore = true;
break; break;
case "&e2 Uses &7left": case "&e2 Uses &7left":
itemML.set(i, "&e1 Uses &7left"); itemML.set(3, "&e1 Use &7left");
correctLore = true;
break; break;
case "&e1 Uses &7left": case "&e1 Use &7left":
if (e.getParentEvent().getHand() == EquipmentSlot.HAND) { item = null;
p.getInventory().setItemInMainHand(null);
} else {
p.getInventory().setItemInOffHand(null);
}
p.playSound(p.getLocation(), Sound.ENTITY_ITEM_BREAK, 1, 1); p.playSound(p.getLocation(), Sound.ENTITY_ITEM_BREAK, 1, 1);
correctLore = true;
break; break;
} }
if (correctLore) break;
} if (item != null) {
// Saving the changes to lore and item. // Saving the changes to lore and item.
itemM.setLore(itemML); itemM.setLore(itemML);
item.setItemMeta(itemM); item.setItemMeta(itemM);
}
//Saving the item.
if (e.getParentEvent().getHand() == EquipmentSlot.HAND) { if (e.getParentEvent().getHand() == EquipmentSlot.HAND) {
p.getInventory().setItemInMainHand(item); p.getInventory().setItemInMainHand(item);
} else { } else {