Goldenwere/GibsoniaCraft
Archived
1
0
Fork 0
Code Activity

added fortune enchantment to GetSurroundingBlocks

Browse source
This commit is contained in:
lightling 2019-09-18 21:40:14 -04:00
parent d3268afef5
commit 5a02b6ee66
2 changed files with 101 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -7,6 +7,7 @@ import org.bukkit.block.BlockFace;
import org.bukkit.entity.Player; import org.bukkit.entity.Player;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Map;
import org.bukkit.Location; import org.bukkit.Location;
@ -66,11 +67,12 @@ public class BlockListener implements Listener
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, item);
// Grab durability information // Grab durability and enchantment information
ItemMeta meta = item.getItemMeta(); ItemMeta meta = item.getItemMeta();
Damageable dMeta = (Damageable)meta; Damageable dMeta = (Damageable)meta;
int currDur = dMeta.getDamage(); int currDur = dMeta.getDamage();
int maxDur = item.getType().getMaxDurability(); int maxDur = item.getType().getMaxDurability();
Map<Enchantment, Integer> enchantments = item.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;
@ -82,23 +84,94 @@ public class BlockListener implements Listener
// Iterates through to break surrounding blocks // Iterates through to break surrounding blocks
for (Block b : blocks) for (Block b : blocks)
{ {
// Handle snow Location blockLoc = b.getLocation();
if (b.getType() == Material.SNOW) boolean exc = ToolUtil.IsExcavator(item);
boolean ham = ToolUtil.IsHammer(item);
Material blockMat = b.getType();
// Handle Fortune enchantment
if (enchantments.containsKey(Enchantment.LOOT_BONUS_BLOCKS) && ham && BlockRef.ValidHammerFortune.contains(blockMat)
|| enchantments.containsKey(Enchantment.LOOT_BONUS_BLOCKS) && exc && BlockRef.ValidExcavatorFortune.contains(blockMat))
{ {
@SuppressWarnings("deprecation") double level = item.getEnchantmentLevel(Enchantment.LOOT_BONUS_BLOCKS);
final ItemStack snow = new ItemStack(Material.SNOWBALL, 1 + b.getData());
b.getWorld().dropItemNaturally(b.getLocation(), snow); // Wiki: "Fortune I gives a 33% chance to multiply drops by 2"
if (level == 1)
{
double rng = (Math.random() * 100) + 1;
if (rng >= 0 && rng < 33)
{
b.getWorld().dropItemNaturally(blockLoc, item);
} }
b.breakNaturally(); b.breakNaturally();
} }
// Wiki: "Fortune II gives a chance to multiply drops by 2 or 3 (25% chance each...)"
else if (level == 2)
{
double rng = (Math.random() * 100) + 1;
if (rng >= 0 && rng < 25)
{
b.getWorld().dropItemNaturally(blockLoc, item);
}
else if (rng >= 25 && rng < 50)
{
b.getWorld().dropItemNaturally(blockLoc, item);
b.getWorld().dropItemNaturally(blockLoc, item);
}
b.breakNaturally();
}
// Wiki: "Fortune III gives a chance to multiply drops by 2, 3, or 4 (20% chance each...)"
else
{
double rng = (Math.random() * 100) + 1;
if (rng >= 0 && rng < 20)
{
b.getWorld().dropItemNaturally(blockLoc, item);
}
else if (rng >= 20 && rng < 40)
{
b.getWorld().dropItemNaturally(blockLoc, item);
b.getWorld().dropItemNaturally(blockLoc, item);
}
else if (rng >= 40 && rng < 60)
{
b.getWorld().dropItemNaturally(blockLoc, item);
b.getWorld().dropItemNaturally(blockLoc, item);
b.getWorld().dropItemNaturally(blockLoc, item);
}
b.breakNaturally();
}
}
// Handle snow
else if (blockMat == Material.SNOW && exc)
{
@SuppressWarnings("deprecation")
final ItemStack snow = new ItemStack(Material.SNOWBALL, 1 + b.getData());
b.getWorld().dropItemNaturally(blockLoc, snow);
}
// In all other cases, break naturally
else
{
b.breakNaturally();
}
}
// Used for determining durability loss // Used for determining durability loss
int addToDamage = 1; int addToDamage = 1;
// Do extra damage to durability if extra blocks were broken // Do extra damage to durability if extra blocks were broken
if (success && !item.getEnchantments().containsKey(Enchantment.DURABILITY)) if (success && !enchantments.containsKey(Enchantment.DURABILITY))
{ {
addToDamage = 2; addToDamage = 2;
@ -109,7 +182,7 @@ public class BlockListener implements Listener
} }
} }
else if (item.getEnchantments().containsKey(Enchantment.DURABILITY)) else if (enchantments.containsKey(Enchantment.DURABILITY))
{ {
double level = item.getEnchantmentLevel(Enchantment.DURABILITY); double level = item.getEnchantmentLevel(Enchantment.DURABILITY);
double chance = 100 / (level + 1); double chance = 100 / (level + 1);

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

@ -126,4 +126,24 @@ public class BlockRef
add(Material.GOLDEN_AXE); add(Material.GOLDEN_AXE);
add(Material.DIAMOND_AXE); add(Material.DIAMOND_AXE);
}}; }};
/**
* A list of all valid blocks that fortune affects on hammers
*/
public static ArrayList<Material> ValidHammerFortune = new ArrayList<Material>()
{{
add(Material.COAL_ORE);
add(Material.DIAMOND_ORE);
add(Material.EMERALD_ORE);
add(Material.NETHER_QUARTZ_ORE);
add(Material.LAPIS_ORE);
}};
/**
* A list of all valid blocks that fortune affects on excavators
*/
public static ArrayList<Material> ValidExcavatorFortune = new ArrayList<Material>()
{{
add(Material.GRAVEL);
}};
} }