diff --git a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java index a475c75..d5dbdff 100644 --- a/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java +++ b/src/main/java/fox/spiteful/avaritia/LudicrousEvents.java @@ -2,6 +2,7 @@ package fox.spiteful.avaritia; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import fox.spiteful.avaritia.items.ItemArmorInfinity; +import fox.spiteful.avaritia.items.ItemFracturedOre; import fox.spiteful.avaritia.items.LudicrousItems; import fox.spiteful.avaritia.items.tools.ItemPickaxeInfinity; import fox.spiteful.avaritia.items.tools.ItemSwordInfinity; @@ -32,6 +33,7 @@ import net.minecraftforge.oredict.OreDictionary; import org.apache.logging.log4j.Level; import java.util.ArrayList; +import java.util.List; import java.util.Random; import static net.minecraftforge.event.entity.player.PlayerEvent.BreakSpeed; @@ -70,40 +72,8 @@ public class LudicrousEvents { } } } - - /*@SubscribeEvent - public void extraLuck(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){ - ArrayList adds = new ArrayList(); - ArrayList 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) && FurnaceRecipes.smelting().getSmeltingResult(drop) != null - && drop.getItem() != Item.getItemFromBlock(Blocks.netherrack) - && !(FurnaceRecipes.smelting().getSmeltingResult(drop).getItem() instanceof ItemBlock)){ - ItemStack smelt = FurnaceRecipes.smelting().getSmeltingResult(drop).copy(); - smelt.stackSize = Math.min(drop.stackSize * 10, drop.getMaxStackSize()); - adds.add(smelt); - removals.add(drop); - } - } - for(ItemStack add : adds) - event.drops.add(add); - for(ItemStack rem : removals) - event.drops.remove(rem); - event.dropChance = 1.0F; - } - } - }*/ + @SubscribeEvent public void extraLuck(HarvestDropsEvent event){ if(event.harvester == null) return; @@ -112,22 +82,26 @@ public class LudicrousEvents { ItemStack held = event.harvester.getHeldItem(); if(held.getItem() == LudicrousItems.infinity_pickaxe){ if(event.block.getMaterial() == Material.rock){ + List adds = 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 emulatedOres = new ArrayList(); protected static Map nameMapping = new HashMap(); + public static IIcon unknownIcon; public ItemFracturedOre() { this.setCreativeTab(Avaritia.tab); @@ -43,13 +46,13 @@ public class ItemFracturedOre extends Item { @Override public void getSubItems(Item item, CreativeTabs tab, List list) { - for (ItemStack stack : emulatedOres) { + // for debug purposes only - don't want these cluttering up the tab. + /*for (ItemStack stack : emulatedOres) { list.add(getStackForOre(stack, 1)); - } + }*/ } public ItemStack getStackForOre(ItemStack orestack, int stacksize) { - //NBTTagCompound oretag = orestack.writeToNBT(new NBTTagCompound()); NBTTagCompound oretag = NameStack.saveStackToNBT(orestack); ItemStack outstack = new ItemStack(this, stacksize, 0); @@ -84,6 +87,14 @@ public class ItemFracturedOre extends Item { return 0; } + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister ir) { + super.registerIcons(ir); + + this.unknownIcon = ir.registerIcon("avaritia:unknown"); + } + // ######################################## public static void brushUpUncomfortablyAgainstTheOreDictionary() { @@ -117,7 +128,6 @@ public class ItemFracturedOre extends Item { for (String name : toRegister.keySet()) { Collection stacks = toRegister.get(name); for (ItemStack stack : stacks) { - //ItemStack orestack = ItemStack.loadItemStackFromNBT(stack.getTagCompound().getCompoundTag(OREKEY)); ItemStack orestack = NameStack.loadFromNBT(stack.getTagCompound().getCompoundTag(OREKEY)).getStack(); int[] oreids = OreDictionary.getOreIDs(orestack); for (int i=0; i