From 2ce89feeabf005db999398b30d5493d6b6c59f1a Mon Sep 17 00:00:00 2001 From: Alex Spinks Date: Sun, 2 Aug 2015 18:26:16 +0100 Subject: [PATCH] It bops the ore with the pick or it gets the hose again. --- .../spiteful/avaritia/LudicrousEvents.java | 40 ++------ .../avaritia/items/ItemFracturedOre.java | 18 +++- .../avaritia/render/FracturedOreRenderer.java | 91 ++++++++++++++++-- .../avaritia/textures/items/unknown.png | Bin 0 -> 2966 bytes 4 files changed, 103 insertions(+), 46 deletions(-) create mode 100644 src/main/resources/assets/avaritia/textures/items/unknown.png 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; iKLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z0002NNkl*=FOY8vqlnA5HJxl|54mZ%Mu7NEH#!O7G=^dL*R_S^hg3bu=V- ziasmI66_oCpfe`Dfe?NkPumIfiI9|cH}R3H`Tc0k81s`tBh zhv&d?+S(UCemzLWJIbZux<^&zzJ^A6Ak`i`eem@!X}SXQ_uu#!0P|3t%^t;Fg8%>k M07*qoM6N<$g7Arfv;Y7A literal 0 HcmV?d00001