From df94126ea8842edc5ef787d1350e6380c24647ae Mon Sep 17 00:00:00 2001 From: Alex Spinks Date: Wed, 5 Aug 2015 05:07:45 +0100 Subject: [PATCH] Funky stuff for infinity metal tonk --- .../spiteful/avaritia/LudicrousEvents.java | 64 ++++++++-------- .../avaritia/compat/ticon/Tonkers.java | 6 +- .../avaritia/compat/ticon/TonkersEvents.java | 76 +++++++++++++++++++ 3 files changed, 115 insertions(+), 31 deletions(-) create mode 100644 src/main/java/fox/spiteful/avaritia/compat/ticon/TonkersEvents.java diff --git a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java index ee51d39..d618282 100644 --- a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java +++ b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java @@ -76,40 +76,16 @@ public class LudicrousEvents { } @SubscribeEvent - public void extraLuck(HarvestDropsEvent event){ - if(event.harvester == null) + public void handleExtraLuck(HarvestDropsEvent event) { + if(event.harvester == null) return; if(event.harvester.getHeldItem() == null) return; ItemStack held = event.harvester.getHeldItem(); - if(held.getItem() == LudicrousItems.infinity_pickaxe){ - if(event.block.getMaterial() == Material.rock){ - List adds = new ArrayList(); - List removals = new ArrayList(); - for(ItemStack drop : event.drops){ - if(drop.getItem() != Item.getItemFromBlock(event.block) && !(drop.getItem() instanceof ItemBlock)){ - drop.stackSize = Math.min(drop.stackSize * 4, drop.getMaxStackSize()); - } - else if(drop.getItem() == Item.getItemFromBlock(event.block)) - { - ItemFracturedOre ifo = (ItemFracturedOre)LudicrousItems.fractured_ore; - int[] oreids = OreDictionary.getOreIDs(drop); - for (int i=0; i adds = new ArrayList(); + List removals = new ArrayList(); + for(ItemStack drop : event.drops){ + if(drop.getItem() != Item.getItemFromBlock(event.block) && !(drop.getItem() instanceof ItemBlock)){ + drop.stackSize = Math.min(drop.stackSize * mult, drop.getMaxStackSize()); + } + else if(drop.getItem() == Item.getItemFromBlock(event.block)) + { + ItemFracturedOre ifo = (ItemFracturedOre)LudicrousItems.fractured_ore; + int[] oreids = OreDictionary.getOreIDs(drop); + for (int i=0; i