Goldenwere/GibsoniaCraft
Archived
1
0
Fork 0
Code Activity

changed fortune arraylist to hashmap in order to drop appropriate items rather than the blocks themselves

Browse source
This commit is contained in:
lightling 2019-09-19 14:38:05 -04:00
parent d049ef51d5
commit 144f52ba96
2 changed files with 34 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -90,10 +90,21 @@ public class BlockListener implements Listener
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.containsKey(blockMat)
|| enchantments.containsKey(Enchantment.LOOT_BONUS_BLOCKS) && exc && BlockRef.ValidExcavatorFortune.contains(blockMat)) || enchantments.containsKey(Enchantment.LOOT_BONUS_BLOCKS) && exc && BlockRef.ValidExcavatorFortune.containsKey(blockMat))
{ {
double level = tool.getEnchantmentLevel(Enchantment.LOOT_BONUS_BLOCKS); double level = tool.getEnchantmentLevel(Enchantment.LOOT_BONUS_BLOCKS);
Material drop;
// Determine drop
if (ham)
{
drop = BlockRef.ValidHammerFortune.get(blockMat);
}
else
{
drop = BlockRef.ValidExcavatorFortune.get(blockMat);
}
// 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,7 +112,7 @@ 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, new ItemStack(blockMat)); b.getWorld().dropItemNaturally(blockLoc, new ItemStack(drop));
b.setType(Material.AIR); b.setType(Material.AIR);
} }
@ -117,14 +128,13 @@ 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, new ItemStack(blockMat)); b.getWorld().dropItemNaturally(blockLoc, new ItemStack(drop, 1));
b.setType(Material.AIR); b.setType(Material.AIR);
} }
else if (rng >= 25 && rng < 50) else if (rng >= 25 && rng < 50)
{ {
b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat)); b.getWorld().dropItemNaturally(blockLoc, new ItemStack(drop, 2));
b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat));
b.setType(Material.AIR); b.setType(Material.AIR);
} }
@ -140,22 +150,19 @@ 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, new ItemStack(blockMat)); b.getWorld().dropItemNaturally(blockLoc, new ItemStack(drop, 1));
b.setType(Material.AIR); b.setType(Material.AIR);
} }
else if (rng >= 20 && rng < 40) else if (rng >= 20 && rng < 40)
{ {
b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat)); b.getWorld().dropItemNaturally(blockLoc, new ItemStack(drop, 2));
b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat));
b.setType(Material.AIR); b.setType(Material.AIR);
} }
else if (rng >= 40 && rng < 60) else if (rng >= 40 && rng < 60)
{ {
b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat)); b.getWorld().dropItemNaturally(blockLoc, new ItemStack(drop, 3));
b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat));
b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat));
b.setType(Material.AIR); b.setType(Material.AIR);
} }
@ -166,8 +173,8 @@ public class BlockListener implements Listener
} }
} }
else if (enchantments.containsKey(Enchantment.SILK_TOUCH) && ham && BlockRef.ValidHammerFortune.contains(blockMat) else if (enchantments.containsKey(Enchantment.SILK_TOUCH) && ham && BlockRef.ValidHammerFortune.containsKey(blockMat)
|| enchantments.containsKey(Enchantment.SILK_TOUCH) && exc && BlockRef.ValidExcavatorFortune.contains(blockMat)) || enchantments.containsKey(Enchantment.SILK_TOUCH) && exc && BlockRef.ValidExcavatorFortune.containsKey(blockMat))
{ {
b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat)); b.getWorld().dropItemNaturally(blockLoc, new ItemStack(blockMat));
b.setType(Material.AIR); b.setType(Material.AIR);

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

@ -1,8 +1,10 @@
package lightling.gibsoniacraft.util; package lightling.gibsoniacraft.util;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import org.bukkit.Material; import org.bukkit.Material;
import org.bukkit.inventory.ItemStack;
/** /**
* Contains constant blocks and items of a certain type * Contains constant blocks and items of a certain type
@ -130,24 +132,24 @@ public class BlockRef
}}; }};
/** /**
* A list of all valid blocks that fortune affects on hammers * Stores all valid blocks that fortune affects on hammers and matches them with their corresponding items
*/ */
public static ArrayList<Material> ValidHammerFortune = new ArrayList<Material>() public static HashMap<Material, Material> ValidHammerFortune = new HashMap<Material, Material>()
{{ {{
add(Material.COAL_ORE); put(Material.COAL_ORE, Material.COAL);
add(Material.DIAMOND_ORE); put(Material.DIAMOND_ORE, Material.DIAMOND);
add(Material.EMERALD_ORE); put(Material.EMERALD_ORE, Material.EMERALD);
add(Material.NETHER_QUARTZ_ORE); put(Material.NETHER_QUARTZ_ORE, Material.QUARTZ);
add(Material.LAPIS_ORE); put(Material.LAPIS_ORE, Material.LAPIS_LAZULI);
add(Material.GLOWSTONE); put(Material.GLOWSTONE, Material.GLOWSTONE_DUST);
}}; }};
/** /**
* A list of all valid blocks that fortune affects on excavators * Stores all valid blocks that fortune affects on excavators and matches them with their corresponding items
*/ */
public static ArrayList<Material> ValidExcavatorFortune = new ArrayList<Material>() public static HashMap<Material, Material> ValidExcavatorFortune = new HashMap<Material, Material>()
{{ {{
add(Material.GRAVEL); put(Material.GRAVEL, Material.FLINT);
}}; }};
/** /**