Goldenwere/GibsoniaCraft
Archived
1
0
Fork 0
Code Activity

changed reference from "item" to "tool" in GetSurroundingBlocks (item is too vague)

Browse source
This commit is contained in:
lightling 2019-09-18 22:13:00 -04:00
parent 22732afb1d
commit d049ef51d5
2 changed files with 44 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

67
plugin/src/lightling/gibsoniacraft/util/BlockListener.java
View file

@ -46,8 +46,8 @@ public class BlockListener implements Listener
{ {
// Grab current tool information // Grab current tool information
Player player = bbEvent.getPlayer(); Player player = bbEvent.getPlayer();
ItemStack item = player.getInventory().getItemInMainHand(); ItemStack tool = player.getInventory().getItemInMainHand();
Material itemType = item.getType(); Material toolType = tool.getType();
// Grab the current block information // Grab the current block information
Block block = bbEvent.getBlock(); Block block = bbEvent.getBlock();
@ -55,7 +55,7 @@ public class BlockListener implements Listener
// Only do extra block-breaking if the player is not sneaking (method of disabling) or if the player doesn't have the appropriate tools // Only do extra block-breaking if the player is not sneaking (method of disabling) or if the player doesn't have the appropriate tools
if (player != null && (player instanceof Player)) if (player != null && (player instanceof Player))
{ {
if (player.isSneaking() || !ToolUtil.IsExcavatable(item, block.getType()) && !ToolUtil.IsHammerable(item, block.getType())) if (player.isSneaking() || !ToolUtil.IsExcavatable(tool, block.getType()) && !ToolUtil.IsHammerable(tool, block.getType()))
{ {
return; return;
} }
@ -65,14 +65,14 @@ public class BlockListener implements Listener
String pName = player.getName(); String pName = player.getName();
PlayerInteractListener pListener = gcPlugin.GetPlayerInteractListener(); PlayerInteractListener pListener = gcPlugin.GetPlayerInteractListener();
BlockFace blockFace = pListener.GetFaceByName(pName); BlockFace blockFace = pListener.GetFaceByName(pName);
ArrayList<Block> blocks = ToolUtil.GetSurroundingBlocks(blockFace, block, item); ArrayList<Block> blocks = ToolUtil.GetSurroundingBlocks(blockFace, block, tool);
// Grab durability and enchantment information // Grab durability and enchantment information
ItemMeta meta = item.getItemMeta(); ItemMeta meta = tool.getItemMeta();
Damageable dMeta = (Damageable)meta; Damageable dMeta = (Damageable)meta;
int currDur = dMeta.getDamage(); int currDur = dMeta.getDamage();
int maxDur = item.getType().getMaxDurability(); int maxDur = tool.getType().getMaxDurability();
Map<Enchantment, Integer> enchantments = item.getEnchantments(); Map<Enchantment, Integer> enchantments = tool.getEnchantments();
// Used in determining if an extra block was broken (for durability) // Used in determining if an extra block was broken (for durability)
boolean success = false; boolean success = false;
@ -85,15 +85,15 @@ public class BlockListener implements Listener
for (Block b : blocks) for (Block b : blocks)
{ {
Location blockLoc = b.getLocation(); Location blockLoc = b.getLocation();
boolean exc = ToolUtil.IsExcavator(item); boolean exc = ToolUtil.IsExcavator(tool);
boolean ham = ToolUtil.IsHammer(item); boolean ham = ToolUtil.IsHammer(tool);
Material blockMat = b.getType(); Material blockMat = b.getType();
// Handle Fortune enchantment // Handle Fortune enchantment
if (enchantments.containsKey(Enchantment.LOOT_BONUS_BLOCKS) && ham && BlockRef.ValidHammerFortune.contains(blockMat) if (enchantments.containsKey(Enchantment.LOOT_BONUS_BLOCKS) && ham && BlockRef.ValidHammerFortune.contains(blockMat)
|| enchantments.containsKey(Enchantment.LOOT_BONUS_BLOCKS) && exc && BlockRef.ValidExcavatorFortune.contains(blockMat)) || enchantments.containsKey(Enchantment.LOOT_BONUS_BLOCKS) && exc && BlockRef.ValidExcavatorFortune.contains(blockMat))
{ {
double level = item.getEnchantmentLevel(Enchantment.LOOT_BONUS_BLOCKS); double level = tool.getEnchantmentLevel(Enchantment.LOOT_BONUS_BLOCKS);
// Wiki: "Fortune I gives a 33% chance to multiply drops by 2" // Wiki: "Fortune I gives a 33% chance to multiply drops by 2"
if (level == 1) if (level == 1)
@ -101,10 +101,14 @@ public class BlockListener implements Listener
double rng = (Math.random() * 100) + 1; double rng = (Math.random() * 100) + 1;
if (rng >= 0 && rng < 33) if (rng >= 0 && rng < 33)
{ {
b.getWorld().dropItemNaturally(blockLoc, item); b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat));
b.setType(Material.AIR);
} }
b.breakNaturally(); else
{
b.breakNaturally();
}
} }
// Wiki: "Fortune II gives a chance to multiply drops by 2 or 3 (25% chance each...)" // Wiki: "Fortune II gives a chance to multiply drops by 2 or 3 (25% chance each...)"
@ -113,16 +117,21 @@ public class BlockListener implements Listener
double rng = (Math.random() * 100) + 1; double rng = (Math.random() * 100) + 1;
if (rng >= 0 && rng < 25) if (rng >= 0 && rng < 25)
{ {
b.getWorld().dropItemNaturally(blockLoc, item); b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat));
b.setType(Material.AIR);
} }
else if (rng >= 25 && rng < 50) else if (rng >= 25 && rng < 50)
{ {
b.getWorld().dropItemNaturally(blockLoc, item); b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat));
b.getWorld().dropItemNaturally(blockLoc, item); b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat));
b.setType(Material.AIR);
} }
b.breakNaturally(); else
{
b.breakNaturally();
}
} }
// Wiki: "Fortune III gives a chance to multiply drops by 2, 3, or 4 (20% chance each...)" // Wiki: "Fortune III gives a chance to multiply drops by 2, 3, or 4 (20% chance each...)"
@ -131,23 +140,29 @@ public class BlockListener implements Listener
double rng = (Math.random() * 100) + 1; double rng = (Math.random() * 100) + 1;
if (rng >= 0 && rng < 20) if (rng >= 0 && rng < 20)
{ {
b.getWorld().dropItemNaturally(blockLoc, item); b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat));
b.setType(Material.AIR);
} }
else if (rng >= 20 && rng < 40) else if (rng >= 20 && rng < 40)
{ {
b.getWorld().dropItemNaturally(blockLoc, item); b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat));
b.getWorld().dropItemNaturally(blockLoc, item); b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat));
b.setType(Material.AIR);
} }
else if (rng >= 40 && rng < 60) else if (rng >= 40 && rng < 60)
{ {
b.getWorld().dropItemNaturally(blockLoc, item); b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat));
b.getWorld().dropItemNaturally(blockLoc, item); b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat));
b.getWorld().dropItemNaturally(blockLoc, item); b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat));
b.setType(Material.AIR);
} }
b.breakNaturally(); else
{
b.breakNaturally();
}
} }
} }
@ -183,7 +198,7 @@ public class BlockListener implements Listener
addToDamage = 2; addToDamage = 2;
// Diamond tools take less damage // Diamond tools take less damage
if (itemType == Material.DIAMOND_PICKAXE || itemType == Material.DIAMOND_SHOVEL) if (toolType == Material.DIAMOND_PICKAXE || toolType == Material.DIAMOND_SHOVEL)
{ {
addToDamage = 1; addToDamage = 1;
} }
@ -191,7 +206,7 @@ public class BlockListener implements Listener
else if (enchantments.containsKey(Enchantment.DURABILITY)) else if (enchantments.containsKey(Enchantment.DURABILITY))
{ {
double level = item.getEnchantmentLevel(Enchantment.DURABILITY); double level = tool.getEnchantmentLevel(Enchantment.DURABILITY);
double chance = 100 / (level + 1); double chance = 100 / (level + 1);
double rng = (Math.random() * 100) + 1; double rng = (Math.random() * 100) + 1;
if (rng >= chance) if (rng >= chance)
@ -202,7 +217,7 @@ public class BlockListener implements Listener
// Update durability // Update durability
dMeta.setDamage(currDur + addToDamage); dMeta.setDamage(currDur + addToDamage);
item.setItemMeta(meta); tool.setItemMeta(meta);
} }
/** /**

3
plugin/src/lightling/gibsoniacraft/util/BlockRef.java
View file

@ -47,6 +47,7 @@ public class BlockRef
add(Material.NETHERRACK); add(Material.NETHERRACK);
add(Material.NETHER_QUARTZ_ORE); add(Material.NETHER_QUARTZ_ORE);
add(Material.OBSIDIAN); add(Material.OBSIDIAN);
add(Material.GLOWSTONE);
}}; }};
/** /**
@ -138,6 +139,7 @@ public class BlockRef
add(Material.EMERALD_ORE); add(Material.EMERALD_ORE);
add(Material.NETHER_QUARTZ_ORE); add(Material.NETHER_QUARTZ_ORE);
add(Material.LAPIS_ORE); add(Material.LAPIS_ORE);
add(Material.GLOWSTONE);
}}; }};
/** /**
@ -170,6 +172,7 @@ public class BlockRef
add(Material.PACKED_ICE); add(Material.PACKED_ICE);
add(Material.NETHER_QUARTZ_ORE); add(Material.NETHER_QUARTZ_ORE);
add(Material.GLOWSTONE);
}}; }};
/** /**