sigonasr2/TwosideKeeper
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed Artifact Leveling bugs. Renamed the hopper and filter inventories

Browse Source 
that opened up for Bauble pouches and Filter Cube inventories.
This commit is contained in:
sigonasr2 2017-01-17 13:09:33 -06:00
parent f8a64d792d
commit 336a84e93d
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
TwosideKeeper.jar
View File

Binary file not shown.

1
src/sig/plugin/TwosideKeeper/HelperStructures/Common/BaublePouch.java
View File

@ -62,6 +62,7 @@ public class BaublePouch {
int id = getBaublePouchID(item); int id = getBaublePouchID(item);
Dropper d = getBaublePouchDropper(id); Dropper d = getBaublePouchDropper(id);
d.getChunk().load(); d.getChunk().load();
GenericFunctions.renameDropper(d, ChatColor.stripColor(((ItemUtils.hasDisplayName(item))?ItemUtils.getDisplayName(item):"Bauble Pouch #"+id)));
p.openInventory(d.getInventory()); p.openInventory(d.getInventory());
SoundUtils.playLocalSound(p, Sound.ITEM_ARMOR_EQUIP_LEATHER, 1.0f, 1.0f); SoundUtils.playLocalSound(p, Sound.ITEM_ARMOR_EQUIP_LEATHER, 1.0f, 1.0f);
} else { } else {

4
src/sig/plugin/TwosideKeeper/HelperStructures/Common/GenericFunctions.java
View File

@ -2408,7 +2408,7 @@ public class GenericFunctions {
//Check all equipment slots for this item. //Check all equipment slots for this item.
for (int i=0;i<p.getInventory().getSize();i++) { for (int i=0;i<p.getInventory().getSize();i++) {
TwosideKeeper.log("Checking item slot "+i, 5); TwosideKeeper.log("Checking item slot "+i, 5);
if (p.getInventory().getItem(i)!=null && p.getInventory().getItem(i).equals(item)) { if (p.getInventory().getItem(i)!=null && p.getInventory().getItem(i).isSimilar(item)) {
TwosideKeeper.log("Found item in slot "+i, 5); TwosideKeeper.log("Found item in slot "+i, 5);
return i; return i;
} }
@ -2417,7 +2417,7 @@ public class GenericFunctions {
//It might be in the armor slot. //It might be in the armor slot.
for (int i=0;i<p.getEquipment().getArmorContents().length;i++) { for (int i=0;i<p.getEquipment().getArmorContents().length;i++) {
TwosideKeeper.log("Checking armor slot "+i, 5); TwosideKeeper.log("Checking armor slot "+i, 5);
if (p.getEquipment().getArmorContents()[i]!=null && p.getEquipment().getArmorContents().equals(item)) { if (p.getEquipment().getArmorContents()[i]!=null && p.getEquipment().getArmorContents()[i].isSimilar(item)) {
TwosideKeeper.log("Found item in slot "+(i+900), 5); TwosideKeeper.log("Found item in slot "+(i+900), 5);
return i+900; return i+900;
} }

4
src/sig/plugin/TwosideKeeper/HelperStructures/Utils/ItemUtils.java
View File

@ -312,4 +312,8 @@ public class ItemUtils {
// TODO Auto-generated method stub // TODO Auto-generated method stub
return false; return false;
} }
public static boolean hasDisplayName(ItemStack item) {
return getDisplayName(item)!=null;
}
} }

15
src/sig/plugin/TwosideKeeper/TwosideKeeper.java
View File

@ -1748,13 +1748,13 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
//Arrow newar = p.getWorld().spawnArrow(p.getLocation(), p.getLocation().getDirection(), 1f, 12f); //Arrow newar = p.getWorld().spawnArrow(p.getLocation(), p.getLocation().getDirection(), 1f, 12f);
//GenericFunctions.setBowMode(p.getEquipment().getItemInMainHand(), BowMode.SNIPE); //GenericFunctions.setBowMode(p.getEquipment().getItemInMainHand(), BowMode.SNIPE);
//p.sendMessage("This is bow mode "+GenericFunctions.getBowMode(p.getEquipment().getItemInMainHand())); //p.sendMessage("This is bow mode "+GenericFunctions.getBowMode(p.getEquipment().getItemInMainHand()));
/*for (int i=0;i<p.getEquipment().getArmorContents().length;i++) { for (int i=0;i<p.getEquipment().getArmorContents().length;i++) {
if (GenericFunctions.isArtifactEquip(p.getEquipment().getArmorContents()[i]) && if (GenericFunctions.isArtifactEquip(p.getEquipment().getArmorContents()[i]) &&
GenericFunctions.isArtifactArmor(p.getEquipment().getArmorContents()[i])) { GenericFunctions.isArtifactArmor(p.getEquipment().getArmorContents()[i])) {
AwakenedArtifact.addPotentialEXP(p.getEquipment().getArmorContents()[i], 500, p); AwakenedArtifact.addPotentialEXP(p.getEquipment().getArmorContents()[i], 500, p);
} }
} }
*/
/*TwosideKeeper.log("Suppressed: "+GenericFunctions.isSuppressed(p),1); /*TwosideKeeper.log("Suppressed: "+GenericFunctions.isSuppressed(p),1);
TwosideKeeper.log("Suppression Time: "+GenericFunctions.getSuppressionTime(p), 1); TwosideKeeper.log("Suppression Time: "+GenericFunctions.getSuppressionTime(p), 1);
GenericFunctions.setSuppressionTime(p, 20); GenericFunctions.setSuppressionTime(p, 20);
@ -1922,8 +1922,8 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
p.spigot().sendMessage(ArtifactAbility.GenerateMenu(ArtifactItemType.getArtifactItemTypeFromItemStack(p.getInventory().getArmorContents()[Integer.parseInt(args[1])-900]).getUpgradePath(), CustomDamage.getBaseWeaponDamage(p.getInventory().getArmorContents()[Integer.parseInt(args[1])-900], p, null), p.getInventory().getArmorContents()[Integer.parseInt(args[1])-900],Integer.parseInt(args[1]))); p.spigot().sendMessage(ArtifactAbility.GenerateMenu(ArtifactItemType.getArtifactItemTypeFromItemStack(p.getInventory().getArmorContents()[Integer.parseInt(args[1])-900]).getUpgradePath(), CustomDamage.getBaseWeaponDamage(p.getInventory().getArmorContents()[Integer.parseInt(args[1])-900], p, null), p.getInventory().getArmorContents()[Integer.parseInt(args[1])-900],Integer.parseInt(args[1])));
} }
} else { } else {
if (p.getEquipment().getItemInMainHand()!=null && GenericFunctions.isArtifactEquip(p.getEquipment().getItemInMainHand())) { if (p.getInventory().getItem(Integer.parseInt(args[1]))!=null && GenericFunctions.isArtifactEquip(p.getInventory().getItem(Integer.parseInt(args[1])))) {
p.spigot().sendMessage(ArtifactAbility.GenerateMenu(ArtifactItemType.getArtifactItemTypeFromItemStack(p.getEquipment().getItemInMainHand()).getUpgradePath(), CustomDamage.getBaseWeaponDamage(p.getEquipment().getItemInMainHand(), p, null), p.getEquipment().getItemInMainHand())); p.spigot().sendMessage(ArtifactAbility.GenerateMenu(ArtifactItemType.getArtifactItemTypeFromItemStack(p.getInventory().getItem(Integer.parseInt(args[1]))).getUpgradePath(), CustomDamage.getBaseWeaponDamage(p.getInventory().getItem(Integer.parseInt(args[1])), p, null), p.getInventory().getItem(Integer.parseInt(args[1])),Integer.parseInt(args[1])));
} }
} }
} else } else
@ -4925,11 +4925,12 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
int cubeid = ItemCubeUtils.getItemCubeID(item); int cubeid = ItemCubeUtils.getItemCubeID(item);
Hopper targethopper = ItemCubeUtils.getFilterCubeHopper(cubeid); Hopper targethopper = ItemCubeUtils.getFilterCubeHopper(cubeid);
targethopper.getChunk().load(); targethopper.getChunk().load();
GenericFunctions.renameHopper(targethopper, ChatColor.stripColor(((ItemUtils.hasDisplayName(item))?ItemUtils.getDisplayName(item):"Filter Inventory ID#"+cubeid)));
ev.getWhoClicked().openInventory(targethopper.getInventory()); ev.getWhoClicked().openInventory(targethopper.getInventory());
SoundUtils.playLocalSound((Player)ev.getWhoClicked(), Sound.BLOCK_CHEST_LOCKED, 1.0f, 1.0f); SoundUtils.playLocalSound((Player)ev.getWhoClicked(), Sound.BLOCK_CHEST_LOCKED, 1.0f, 1.0f);
ev.setCancelled(true); ev.setCancelled(true);
return;
} }
return;
} }
//Check for a right-click for a Bauble Pouch. //Check for a right-click for a Bauble Pouch.
@ -9523,9 +9524,9 @@ public class TwosideKeeper extends JavaPlugin implements Listener {
} else { } else {
receiver.sendMessage("----------"); receiver.sendMessage("----------");
} }
TextComponent msg = DisplayPerks(p.getEquipment().getItemInMainHand(),ChatColor.LIGHT_PURPLE+""+ChatColor.BOLD+" Main Hand"+ChatColor.RESET,p,0,all);if (!msg.toPlainText().equalsIgnoreCase("")) { TextComponent msg = DisplayPerks(p.getEquipment().getItemInMainHand(),ChatColor.LIGHT_PURPLE+""+ChatColor.BOLD+" Main Hand"+ChatColor.RESET,p,GenericFunctions.CalculateSlot(p.getEquipment().getItemInMainHand(),p),all);if (!msg.toPlainText().equalsIgnoreCase("")) {
if (receiver instanceof Player) {((Player)receiver).spigot().sendMessage(msg);} else {receiver.sendMessage(msg.toPlainText());}}; if (receiver instanceof Player) {((Player)receiver).spigot().sendMessage(msg);} else {receiver.sendMessage(msg.toPlainText());}};
msg = DisplayPerks(p.getEquipment().getItemInOffHand(),ChatColor.LIGHT_PURPLE+""+ChatColor.BOLD+" Off Hand"+ChatColor.RESET,p,0,all);if (!msg.toPlainText().equalsIgnoreCase("")) { msg = DisplayPerks(p.getEquipment().getItemInOffHand(),ChatColor.LIGHT_PURPLE+""+ChatColor.BOLD+" Off Hand"+ChatColor.RESET,p,GenericFunctions.CalculateSlot(p.getEquipment().getItemInOffHand(),p),all);if (!msg.toPlainText().equalsIgnoreCase("")) {
if (receiver instanceof Player) {((Player)receiver).spigot().sendMessage(msg);} else {receiver.sendMessage(msg.toPlainText());}}; if (receiver instanceof Player) {((Player)receiver).spigot().sendMessage(msg);} else {receiver.sendMessage(msg.toPlainText());}};
msg = DisplayPerks(p.getEquipment().getHelmet(),ChatColor.LIGHT_PURPLE+""+ChatColor.BOLD+" Helmet"+ChatColor.RESET,p,903,all);if (!msg.toPlainText().equalsIgnoreCase("")) {if (receiver instanceof Player) {((Player)receiver).spigot().sendMessage(msg);} else {receiver.sendMessage(msg.toPlainText());}}; msg = DisplayPerks(p.getEquipment().getHelmet(),ChatColor.LIGHT_PURPLE+""+ChatColor.BOLD+" Helmet"+ChatColor.RESET,p,903,all);if (!msg.toPlainText().equalsIgnoreCase("")) {if (receiver instanceof Player) {((Player)receiver).spigot().sendMessage(msg);} else {receiver.sendMessage(msg.toPlainText());}};
msg = DisplayPerks(p.getEquipment().getChestplate(),ChatColor.LIGHT_PURPLE+""+ChatColor.BOLD+" Chestplate"+ChatColor.RESET,p,902,all);if (!msg.toPlainText().equalsIgnoreCase("")) {if (receiver instanceof Player) {((Player)receiver).spigot().sendMessage(msg);} else {receiver.sendMessage(msg.toPlainText());}}; msg = DisplayPerks(p.getEquipment().getChestplate(),ChatColor.LIGHT_PURPLE+""+ChatColor.BOLD+" Chestplate"+ChatColor.RESET,p,902,all);if (!msg.toPlainText().equalsIgnoreCase("")) {if (receiver instanceof Player) {((Player)receiver).spigot().sendMessage(msg);} else {receiver.sendMessage(msg.toPlainText());}};