From 9f0b506d4219802ec825889207f4d4fe07fb2d42 Mon Sep 17 00:00:00 2001 From: KitsuShadow Date: Sat, 4 Jul 2015 23:13:55 -0400 Subject: [PATCH] inlay hammer --- .../medievalcraft/events/EventHandle.class | Bin 16416 -> 16421 bytes .../item/craftingtools/ForgeHammer.class | Bin 9534 -> 10899 bytes .../item/craftingtools/InlayHammer.class | Bin 7241 -> 14305 bytes .../tileents/ingots/TileIngotBase.class | Bin 3227 -> 3223 bytes ...ronFormNames$1.class => AnvilUtil$1.class} | Bin 1847 -> 1831 bytes .../medievalcraft/util/AnvilUtil$2.class | Bin 0 -> 1829 bytes ...ronFormNames$2.class => AnvilUtil$3.class} | Bin 1859 -> 1843 bytes .../kitsu/medievalcraft/util/AnvilUtil.class | Bin 0 -> 725 bytes .../medievalcraft/util/InlayTables$1.class | Bin 818 -> 899 bytes .../medievalcraft/util/InlayTables.class | Bin 1436 -> 1318 bytes .../medievalcraft/util/IronFormNames.class | Bin 626 -> 0 bytes .../medievalcraft/events/EventHandle.java | 3 +- .../item/craftingtools/ForgeHammer.java | 288 +++---- .../item/craftingtools/InlayHammer.java | 740 +++++++++--------- .../tileents/ingots/TileIngotBase.java | 4 +- .../{IronFormNames.java => AnvilUtil.java} | 25 +- .../kitsu/medievalcraft/util/InlayTables.java | 20 +- 17 files changed, 509 insertions(+), 571 deletions(-) rename bin/com/kitsu/medievalcraft/util/{IronFormNames$1.class => AnvilUtil$1.class} (77%) create mode 100644 bin/com/kitsu/medievalcraft/util/AnvilUtil$2.class rename bin/com/kitsu/medievalcraft/util/{IronFormNames$2.class => AnvilUtil$3.class} (73%) create mode 100644 bin/com/kitsu/medievalcraft/util/AnvilUtil.class delete mode 100644 bin/com/kitsu/medievalcraft/util/IronFormNames.class rename src/main/java/com/kitsu/medievalcraft/util/{IronFormNames.java => AnvilUtil.java} (66%) diff --git a/bin/com/kitsu/medievalcraft/events/EventHandle.class b/bin/com/kitsu/medievalcraft/events/EventHandle.class index ef8f3ffdac7fa2c50bbcadf3657a4f3aa2bfa551..442035228a3b59f725a91fcc2ee972a9c26fa052 100644 GIT binary patch delta 658 zcmXX@T}TsP6g}ro5oJc(Qnv}2S(jIM!3{vb|s>c6-HLV zOBnhGhZE7xY9oCyoEW_28|)7bT{)kGr>r%yj()Xf?y@%;*@XKCSa}buocltyuv13_J8jz}U5t0GEMl$D+#(89L0eM`+5xzw!m(asy1R25@ z!K$ClLNt2AI+8u3G#@JpJpBQ4w|t+YuSv*Z*V wa+=4aot4tTPU&Po&hVz3<*0P?vGj0UdO0I~T#$=@pK$?6`dEvwDxY`z5Aj%)Q~&?~ delta 633 zcmXYuPe>DR6vw~cw@fx>wAplnK3T)SxqK{S#M?o zPpIG4BW@!a*l1=G{DdJgG-^aQPny}Xt&Q=UjYE<6$Z*tz$80sTjUjc<+PAyY%u~2S zWX9sL(a4o(@^JQ?FqHgid$(_IJ~FWbK%y*#w<)ZpaP1kMY>QP~oy1-B+T+L>E>Gb> z8WZb?{?A-#`qfWQ2?NSmM zP3V$lC}}}Lg7_q@_#$oCln}m4JAOzfwxo-@Bus~#W}%#6nRK&C&ay#z*(-gF$vNJT h^Bk9cK9T`Gl?$Aa2%pQ)-)CHcNgrzwb`|t*{sD(Wi+}(C diff --git a/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class b/bin/com/kitsu/medievalcraft/item/craftingtools/ForgeHammer.class index 39b68e1b8b905641f2ffab12222bedfe7fd40414..cd9afc36e3fc3bc04473c358ec8cfdb8e30e648b 100644 GIT binary patch literal 10899 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 diff --git a/bin/com/kitsu/medievalcraft/item/craftingtools/InlayHammer.class b/bin/com/kitsu/medievalcraft/item/craftingtools/InlayHammer.class index b7a9eb071440a536254abdc3e2c0cb3b0e50513f..ebaa5c91c1742c3e83d429e2d0f94622c913bd2a 100644 GIT binary patch literal 14305 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 literal 7241 zcmeHMTXP&o75-+m@@iM(*p?&5ibYrx5~THI>>#AIWd~x}iZ@7B(8a>$Vn(|yX{_0q zWoA~k%q2h^?w1fCfWbfvNuY`cl1kPoQUyE*s(1)g@ert@_zS#o{kmr)jaFWjoGMx5j zoVmbtZQm$3wz+iLESH6sLQ=zBjtGph<%pO>fnpkxj#(BOIz}#6_l&YUq3cvLi~ zA+sQsrYduuSt5s4(9p(-p?OhU(9ph2jyYUxnYRKBch0)roCwX1h}mGswj`@|p6r2T zi<6dFcAb)j<0FlHk!->Ve1iyFJ|;On9DaUq;rcJ@p8MRplde-k& zV|8iVkDe6Xq2c~UQCB_>RsFy%Pnt72dXdwxeKg9lA(>^I*U(dkx#$TquogvN&KN@x zO-5h2uwTak9Mo_JU5G7e7}~U&#!jVhh*@2qvnQ&ST@qd!9?-B;9hEgF0HsRD{foTgSVBar$mxP{%PG=Ya{_@HFvo^z^RZHM!OA*6|*> z)iO?#;&M>+gxqGibVA3FOdvf>pp$0VoKp*@bPVHR<{lT$xZ|Q?TAqeIG|@Pz3V3e{ zk7(#ERxTN3x8xhMW!qp%@Jt$>n6v!ATQVM|>G5cwV+5nL9xe(mtQZIDw@=j{xi+}o zL3wDljj-^Xsg`Gi$K?fHPQyCK!KG2z1&TF?HO8p0Yzof^E6$^8P|tbE_3V-{E&mP{_-}Z4xc7VpQVon4nc%WGrvptlr-?ACGW+;xqG}V4U#|N>Ma+W_X%5EU!1V5dxxkLWPL zqnUD@sNB9#?|EEfo!c8M#gI!s>jXC+ua)eG;;xQOyvWKFY4v4oWW}sAQzy(b8SapV zTpi~IfT&(M!vj($6!($usmuIb;_nr{`YIO&2KxK*7X~iG26+y&;n>6xPP8wx9zMiT zs|x9QQ}IZX%XAhkTfk=p?mjVH9TP-`MJkMpVyP|DtrjQ%kx$Ck7hIJc{dmrC6;(c6y&=#TQnVqj~S6&k#)VS(iUCr-Xy0ics)I%!=jTE;c1}yTCTK6hkGw->iiu zuPo+a#x!Hrj6?WxZ^oe+hqbSW|Mxn18*fV)iYB}IY^nQ>Xhvq`qpTSj`OUhCPrPQ% zG;`*5?<@b)oXOx4`gmJZceqJ+yy~#MvC-{(<6gjH_;d=NVi#`1HlAwzs_Ue$<1=`i zt%2%t54SUH(5Tz@Y15w%|R!`t_DSTGLj@8R$!3o5i@N|40U!V#$o2z1MR>LmY zxm?Fa9bdv%Qus3aZmSpk6%#tXim$PU%GL+FknzUb*vv&y3uL#eL8rD&py01RmD;)*eT-&NyT}k6Hd{4*s zW$@Z#IwhnZ=t!eYcJ^qypjzl%4Hfaa&e9b}Bvt=d$4{i{%<7ud{G5)A)SQ`ct6otI z^V@(f#X9*1Wn{6JtS$U+fix1b&rB*IgQT8Brk>QJp6%+HhK{Wq19xDXdTz%K^<)o; z&n?u*W;Xxs;^;b(q=2#9P2831=z1A@a>*LrGM&r4ggrIvozA_8`)b%XoqH9=xsJm( z@y>9izlNhVJUE@(q5Zvvho*BioD8L2!RZ&MGJ!Mvo1>dxPdbUaN%dem+s$2^-HUxV zg8g`iZR24aBJW|0ky8)h;8DDfBMsx2h@k$1^3t*VfzD)SYv-04CXco&I#~)w`hk~l z{u*}Yy4t(+h-?2oPJZYnE+l_W*%pOq7efj3)7Ah{<%#78N5_=?tD%j^KCPjMlERdS zz%0Fzb90zi+meUHpeNPbMN(349t))8R^?%nN-3%ghqRn?Nu?E4A(bJD{rD(6v=hrc z@JZiu=2ANg;Eytfn*S;6=$?jKhwT3S~hqhez%Xso?LhI&i4NpDupTCjdmOmMC{07xu zP%;+C#A|3x{1!VCzr$|Q_a%O>tY{y=)?@tZz{SZIe5Z^P6@!eR9@7WOF jjb(f{i0|2k_}(DCKNH_yi0=*J`|F#+r{Q^(1wZ{SPJP1w diff --git a/bin/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.class b/bin/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.class index ed770e3258fa60383fbcdbe8b90980bb1cae2f57..0b781fdd7d18490b00861b44aa08bbfaaf32e8ab 100644 GIT binary patch delta 30 kcmbO&IbCu>F{9c<0SUg+lFS@^$Go!4oKPTZ3x}COfjqaysUfW#)vIWaezNa%5rB@&O5|!Ua_f ltr;1(g7Zs@l2hF>b5a=@_~3GrkF!)Vs-YUPIh*wiBLL<2Ax{7R delta 122 zcmZ3^x1CSm)W2Q(7#J9g7|Pfgm>3y!CJM;%dKTs9x#bt-`X%P37H>3jWMR_t0gCIQ oh^rV{Gcs@m=a&{Gr@Ce4q%txHp~z3(%~Hvzg<;(0Xx1}~0QvhS#{d8T diff --git a/bin/com/kitsu/medievalcraft/util/AnvilUtil$2.class b/bin/com/kitsu/medievalcraft/util/AnvilUtil$2.class new file mode 100644 index 0000000000000000000000000000000000000000..5777d8cf1e670ecf26ea53512a1e758b1a7a828f GIT binary patch literal 1829 zcma)+-E!MR6vzKcOx?KKI8A`^(L!mH)J{tb;j7>@kfaR`IBBTUl=8inwzd*kYb4p} zEAS4y14A$949sxBCHK4o@4yVhIlGoB=y(RtSh9XUpWU-(wdeQ0fBqG~3Wh~YIH!Lyv=SqJAUV<*_I z9+W^C2)uw7X^s6s;^11PX-W~uuv5F$K2&Z}f09(6M4ZfdftNU$GrYvMOp-v27RvU5 zz$=;EFm{wM+e-rTY|9+$$xcT_8-er`yG4P^?55e>Fpk&Bsw%L=YUWte=7fpXK|_XK zVB)R{yqd*XoW|7zUSnl;qpQts@OUc%Z)CioO+A^vCGa-$SxzC)VJAM;k(Xt7P2gSD zX64OPr<2tMR@n*;?nyVBZB5{P7Beh%Mk0+`7uaBFD$@7eqg*X-2;9uvo^@&5hXM_D zCwb7@e%RssKN9$up-F*Z`tKcq-Au&tI9t-5z$YwBZmp3>qgn#{kE6OW>hJq~p65W| z?&GMDNTcove8zH)GmE=AO8#BNF9g11Z;ISv-{LB#;a>}U!}_!d@6*e{XNYHQ3%G2| z>RM#d5G8Ow6LDY3Xq0DHz-M7sHxe90^={H>+#U4VD%!VwV794U863#S=jRbDBwast zu+$uP`2X8z>JCaRJ&0Vj<#TtL&YI9NA2|n8Ex!}WWDt?uwI|Gsk#(fiv1fUlFnyxF zMpKt>hHju^+W8%obhTFmo%Y55mpc`9I}BB{8OS(RF)mQsn513{x`SIG-HY@vFu&lG zmmcBd(nFMf!OXpfm@PcQGe6yb zePGdM4sBVqokLBFZspKzi|*vmrxtylLtj}WbI7x(lcFD~NE0}u>jrgZQ27eDh_kpv zt!p0Fv4A}+(hGbULsak`s`#GF54eKga20=05Bn3#_zN{>nhJeHBM2_MQ$~OuJrxkr YbpjfFbN?2Rp)p+t^yMzk8%3Xg0JN;r?EnA( literal 0 HcmV?d00001 diff --git a/bin/com/kitsu/medievalcraft/util/IronFormNames$2.class b/bin/com/kitsu/medievalcraft/util/AnvilUtil$3.class similarity index 73% rename from bin/com/kitsu/medievalcraft/util/IronFormNames$2.class rename to bin/com/kitsu/medievalcraft/util/AnvilUtil$3.class index dd805b293003c01b52367149c1cda06520dc33ef..b3557d673eb147801b6e170d6cff4a8b57e92b1d 100644 GIT binary patch delta 166 zcmX@ix0z4i)W2Q(7#J9g7z)@Km>3x}CJM-MJLZ*T=7g4H=BOBNv`J!N(((a{sv?P6 zGcs@m=a&{Gr@Ce4q%tz_!R02uVyR?Q11jf)3vKRWwPQ3jW?*43We{gDW6)wSXRu|k sWC&oeVn}ANW+-E@Vdw;k%w@1+*uY@VaD>5u;W~pO!z%`-$&Bny06x3y!CJM;%dlu#Ax#bt-`X%P37ONO-v`AuM((?hz z=%UG3Gcs@m=a&{Gr@Ce4q%txHp~z3Z$5P3t1=PliBD}ed)sE3rfq{iVi9wt}nL&#| xg~66VjUj+RogtY)gQ1K;lc5tRI+sD4VFQB>!x08uhU*M^46hjUCx2vf0s!?`F-8CY diff --git a/bin/com/kitsu/medievalcraft/util/AnvilUtil.class b/bin/com/kitsu/medievalcraft/util/AnvilUtil.class new file mode 100644 index 0000000000000000000000000000000000000000..05f5558321403cadc0e34073f6dcbbb257717346 GIT binary patch literal 725 zcma)4+e*Vg5ItLKV`HpZt(SVgAo^lZA6o=b#A4Bhs^H@`uDUkaK(Z|)(QhGD}C1Ggo0oVbCwk)q9gFXFe_O|1x15x6xHmHz?_&AnD--xLpcOB|afzM47o`6I(n)$^s2dY@rnbL)yB zdl=pb3!@C1{f)f7W21m^2SqpxxoTQ14~9txgUDH!>c7;kjS|KUdDcPRkmvd*@7XB# z$cqka9iYR5_#fSnvBBtU2dCeVsL6oiHNop z$0DYpv?zKP1DG|_5wZwnFhrOd{)MTBADDKHVL0R&A;u|j%vtK9aQ%$24ko%Nku}}H zOc!Oc<~vw;qLd7lNEVSLIYNUiV-kB<#1UC0YQB|Ju40XJnVKt*HmB56ff$?3=9lL4Eh_n@)->|83Y;Rco^gvL>U>lauN$Ni#_ww^GiU&iaZQT zAYtC3)Rf|q{Jd1K%;ZYOr;NIj-^9js>ff$?3=9lL44NCc@);+uVtmS|K6wIDFlR6WGXo<~Mt1TWCYk7sKo%2& zERYmpU;&c6K$4$900?D(s^owoJP_3k@(c<<9t(pakYr*|Vo(OtDh#S%Q8gf`0mNKD J)gaS>0027{4=Mlv diff --git a/bin/com/kitsu/medievalcraft/util/InlayTables.class b/bin/com/kitsu/medievalcraft/util/InlayTables.class index fc3beb931a51e23dcd55e260123e2ae94a3cc45b..1a8259c142def3f52c96de32cd95e3cff8167a78 100644 GIT binary patch delta 62 zcmbQky^KrX)W2Q(7#J9g80^>?m>3x}CNnZ?Y_!N=o_v#8pNWleG8aoFBje;2mPy=9 R4Aww}Obj**wv*#n?Evrb4a5Kd delta 146 zcmZ3+HHTZ^)W2Q(7#J9g7#!Idm>3x}CNnZ?Y_!N=7T{uFW)Np&U@6JSEM{cT@&QRO zT2EfUtk1-tIQb%TB_q>hZfixqKX4TrxV7(E@U}CTYl5Ai> cZU!qLn+KwR!G^&WEN=%U?HL>1{D=HXqdW5jLqZp7~yX4_#TmDC-E>7CtkhC(;F6b|MX z_Wy2k`_P4ts)u=$8H#PISOUX>hZz(dH2x>obWumu2rPRjp~z6_lhr{Uk3@QAX2ekI zCn1l{c`6P5ymW_2o`&LB+Kg{sabPCR;PsReDVfhQk&!U@rmvmCig_p@$D&!n)b|Uf zQNcx-Zam63q6)JbFYqs(P= 3 + rand.nextInt(3)){ - world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, forms.get(tileEnt.getStackInSlot(0).getItem()))); + if((block instanceof IngotBase)&&(block==ModBlocks.refinedIron)){ + TileIngotBase tile = (TileIngotBase) world.getTileEntity(x, y, z); + + if(tileEnt.getStackInSlot(0)==null){ + p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); + Main.sNet.sendToAll(new MsgPacket(true)); + Main.sNet.sendToAll(new MsgPacketLocX(x)); + Main.sNet.sendToAll(new MsgPacketLocY(y)); + Main.sNet.sendToAll(new MsgPacketLocZ(z)); + tile.hits++; stack.damageItem(1, p); - world.setBlock(x, y, z, Blocks.air, 0, 2); - if(tileEnt.getStackInSlot(0).getMaxStackSize() == 1){ - if(tileEnt.getStackInSlot(0).getItemDamage() == tileEnt.getStackInSlot(0).getMaxDamage()-1){ + if(tile.hits >= 4 + rand.nextInt(3)){ + world.setBlock(x, y, z, ModBlocks.ironPlate, 0, 2); + } + } + + if((tileEnt.getStackInSlot(0).getItem().equals(Items.flower_pot))||tileEnt.getStackInSlot(0).getItem().equals(Items.bucket)){ + p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); + Main.sNet.sendToAll(new MsgPacket(true)); + Main.sNet.sendToAll(new MsgPacketLocX(x)); + Main.sNet.sendToAll(new MsgPacketLocY(y)); + Main.sNet.sendToAll(new MsgPacketLocZ(z)); + tile.hits++; + stack.damageItem(1, p); + if(tile.hits >= 4 + rand.nextInt(3)){ + world.setBlock(x, y, z, Blocks.air, 0, 2); + + if(tileEnt.getStackInSlot(0).getItem().equals(Items.flower_pot)){ tileEnt.decrStackSize(0, 1); } - else {tileEnt.getStackInSlot(0).setItemDamage(tileEnt.getStackInSlot(0).getItemDamage()+1); - } + world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, new ItemStack(Items.bucket, 1))); } } - } - if((tileEnt.getStackInSlot(0).getItem() instanceof ClayForms)&&(tile.hot==true)&&(block!=ModBlocks.ironPlate)){ - p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); - Main.sNet.sendToAll(new MsgPacket(true)); - Main.sNet.sendToAll(new MsgPacketLocX(x)); - Main.sNet.sendToAll(new MsgPacketLocY(y)); - Main.sNet.sendToAll(new MsgPacketLocZ(z)); - tile.hits++; - if(tile.hits >= 3 + rand.nextInt(3)){ - world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, formsClay.get(tileEnt.getStackInSlot(0).getItem()))); - stack.damageItem(1, p); - world.setBlock(x, y, z, Blocks.air, 0, 2); - tileEnt.decrStackSize(0, 1); - tile.markForUpdate(); - } - } - } - - - - - /*if((block == blockToRun(block)) && (blockSub == ModBlocks.forgeAnvil) && (p.isSwingInProgress == false)){ - TileEntityAnvilForge tileEnt = (TileEntityAnvilForge) world.getTileEntity(x, y-1, z); - - if((tileEnt.getStackInSlot(0) == null) && (blockKey == 0)){ - if (rand.nextInt(2) == 0 ) { - tileRefIngot.hits++; - } - p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); - Main.sNet.sendToAll(new MsgPacket(true)); - Main.sNet.sendToAll(new MsgPacketlTicks(x)); - Main.sNet.sendToAll(new MsgPacketLocY(y)); - Main.sNet.sendToAll(new MsgPacketLocZ(z)); - - if(tileRefIngot.hits >= 4){ - tileRefIngot.hits = 0; - p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); - Main.sNet.sendToAll(new MsgPacket(true)); - Main.sNet.sendToAll(new MsgPacketlTicks(x)); - Main.sNet.sendToAll(new MsgPacketLocY(y)); - Main.sNet.sendToAll(new MsgPacketLocZ(z)); - world.setBlock(x, y, z, ModBlocks.ironPlate, 0, 2); - stack.damageItem(1, p); - } - } - if((tileEnt.getStackInSlot(0) != null)){ - if((tileEnt.getStackInSlot(0).getItem() == Items.flower_pot) && (blockKey == 0)){ - if (rand.nextInt(2) == 0 ) { - tileRefIngot.hits++; - } - p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); - Main.sNet.sendToAll(new MsgPacket(true)); - Main.sNet.sendToAll(new MsgPacketlTicks(x)); - Main.sNet.sendToAll(new MsgPacketLocY(y)); - Main.sNet.sendToAll(new MsgPacketLocZ(z)); - - if(tileRefIngot.hits >= 4){key - tileRefIngot.hits = 0; + //IRON FORMS + if(tileEnt.getStackInSlot(0)!=null){ + if((tileEnt.getStackInSlot(0).getItem() instanceof IronForms)&&(tile.hot==true)){ p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); Main.sNet.sendToAll(new MsgPacket(true)); - Main.sNet.sendToAll(new MsgPacketlTicks(x)); + Main.sNet.sendToAll(new MsgPacketLocX(x)); Main.sNet.sendToAll(new MsgPacketLocY(y)); Main.sNet.sendToAll(new MsgPacketLocZ(z)); - world.setBlock(x, y, z, Blocks.air, 0, 2); - tileEnt.decrStackSize(0, 1); - ItemStack bucket = new ItemStack(Items.bucket); - world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, bucket)); + tile.hits++; stack.damageItem(1, p); - } - } - } - - if(tileEnt.getStackInSlot(0) != null){ - Item checkItem = tileEnt.getStackInSlot(0).getItem(); - String displayName = tileEnt.getStackInSlot(0).getDisplayName(); - - if(displayName.equals(getTool(tileEnt.getStackInSlot(0)))){ - if(tileEnt.getStackInSlot(0).isItemDamaged() == true){ - p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); - Main.sNet.sendToAll(new MsgPacket(true)); - Main.sNet.sendToAll(new MsgPacketlTicks(x)); - Main.sNet.sendToAll(new MsgPacketLocY(y)); - Main.sNet.sendToAll(new MsgPacketLocZ(z)); - stack.damageItem(1, p); - if (rand.nextInt(2) == 0 ) { - tileRefIngot.hits++; - } - } - if(tileRefIngot.hits >= 4){ - tileRefIngot.hits=0; - checkItem.setDamage(tileEnt.getStackInSlot(0), 0); - world.setBlock(x, y, z, Blocks.air, 0, 2); - } - } - - if((blockKey == 3) && tileEnt.getStackInSlot(0).getItem().equals(ModItems.woodentoolHandle)){ - p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); - Main.sNet.sendToAll(new MsgPacket(true)); - Main.sNet.sendToAll(new MsgPacketlTicks(x)); - Main.sNet.sendToAll(new MsgPacketLocY(y)); - Main.sNet.sendToAll(new MsgPacketLocZ(z)); - - if (rand.nextInt(2) == 0 ) { - tilePlate.hits++; - } - if(tilePlate.hits >= 4){ - tilePlate.hits=0; - tileEnt.decrStackSize(0, 1); - world.setBlock(x, y, z, Blocks.air, 0, 2); - ItemStack ironForm = new ItemStack(ModItems.ironHandleForm); - world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, ironForm)); - } - } - - if((checkItem == getItem(checkItem)) || (checkItem == getItem3(checkItem)) || (checkItem == getItem2(checkItem).getItem())){ - if (rand.nextInt(2) == 0 ) { - if(blockKey == 0){ - tileRefIngot.hits++; - } - if(blockKey == 3){ - tilePlate.hits++; - } - } - p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); - Main.sNet.sendToAll(new MsgPacket(true)); - Main.sNet.sendToAll(new MsgPacketlTicks(x)); - Main.sNet.sendToAll(new MsgPacketLocY(y)); - Main.sNet.sendToAll(new MsgPacketLocZ(z)); - - if((blockKey == 0) && (checkItem == getItem(checkItem))){ - - if(tileRefIngot.hits >= 4){ - tileRefIngot.hits=0; - giveItem(key, world, x, y, z, p); - stack.damageItem(1, p); + if(tile.hits >= 4 + rand.nextInt(3)){ + world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, formsIron.get(tileEnt.getStackInSlot(0).getItem()))); + world.setBlock(x, y, z, Blocks.air, 0, 2); if(tileEnt.getStackInSlot(0).getMaxStackSize() == 1){ if(tileEnt.getStackInSlot(0).getItemDamage() == tileEnt.getStackInSlot(0).getMaxDamage()-1){ tileEnt.decrStackSize(0, 1); - } else {tileEnt.getStackInSlot(0).setItemDamage(tileEnt.getStackInSlot(0).getItemDamage()+1);} - } - if((tileEnt.getStackInSlot(0).getItem() == getItem3(checkItem))){ - tileEnt.decrStackSize(0, 1); - } - } - } - - if((blockKey == 0) && (checkItem == getItem3(checkItem))){ - if(tileRefIngot.hits >= 4){ - tileRefIngot.hits=0; - giveItem(key, world, x, y, z, p); - stack.damageItem(1, p); - if(tileEnt.getStackInSlot(0).getMaxStackSize() == 1){ - if(tileEnt.getStackInSlot(0).getItemDamage() == tileEnt.getStackInSlot(0).getMaxDamage()-1){ - tileEnt.decrStackSize(0, 1); - } else {tileEnt.getStackInSlot(0).setItemDamage(tileEnt.getStackInSlot(0).getItemDamage()+1);} - } - if((tileEnt.getStackInSlot(0).getItem() == getItem3(checkItem))){ - tileEnt.decrStackSize(0, 1); - } - } - } - if(blockKey == 3){ - p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); - Main.sNet.sendToAll(new MsgPacket(true)); - Main.sNet.sendToAll(new MsgPacketlTicks(x)); - Main.sNet.sendToAll(new MsgPacketLocY(y)); - Main.sNet.sendToAll(new MsgPacketLocZ(z)); - if((checkItem == getItem2(checkItem).getItem())){ - if(tilePlate.hits >= 3){ - tilePlate.hits=0; - giveItem(key, world, x, y, z, p); - stack.damageItem(1, p); - if(tileEnt.getStackInSlot(0).getItem() == getItem2(checkItem).getItem()){ - tileEnt.decrStackSize(0, 1); } + else {tileEnt.getStackInSlot(0).setItemDamage(tileEnt.getStackInSlot(0).getItemDamage()+1); + } + } + } + } + //CLAY FORMS + if((tileEnt.getStackInSlot(0).getItem() instanceof ClayForms)&&(tile.hot==true)){ + p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); + Main.sNet.sendToAll(new MsgPacket(true)); + Main.sNet.sendToAll(new MsgPacketLocX(x)); + Main.sNet.sendToAll(new MsgPacketLocY(y)); + Main.sNet.sendToAll(new MsgPacketLocZ(z)); + tile.hits++; + stack.damageItem(1, p); + if(tile.hits >= 4 + rand.nextInt(3)){ + world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, formsClay.get(tileEnt.getStackInSlot(0).getItem()))); + world.setBlock(x, y, z, Blocks.air, 0, 2); + tileEnt.decrStackSize(0, 1); + tile.markForUpdate(); + } + } + } + } + + if((block instanceof IngotBase)){ + TileIngotBase tile = (TileIngotBase) world.getTileEntity(x, y, z); + //REPAIR TOOLS + Item checkItem = tileEnt.getStackInSlot(0).getItem(); + String displayName = tileEnt.getStackInSlot(0).getDisplayName(); + if(tileEnt.getStackInSlot(0) != null){ + if(displayName.equals(getTool(tileEnt.getStackInSlot(0)))&&(tile.hot == true)&&(block==ModBlocks.refinedIron)){ + if(tileEnt.getStackInSlot(0).isItemDamaged() == true){ + p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); + Main.sNet.sendToAll(new MsgPacket(true)); + Main.sNet.sendToAll(new MsgPacketLocX(x)); + Main.sNet.sendToAll(new MsgPacketLocY(y)); + Main.sNet.sendToAll(new MsgPacketLocZ(z)); + stack.damageItem(1, p); + tile.hits++; + if(tile.hits >= 4 + rand.nextInt(3)){ + checkItem.setDamage(tileEnt.getStackInSlot(0), 0); + world.setBlock(x, y, z, Blocks.air, 0, 2); + } + } + } + } + //MAKE FORMS + if(tileEnt.getStackInSlot(0)!= null){ + if((makeForms.containsKey(tileEnt.getStackInSlot(0).getItem())==true)){ + if((tile.hot == true)&&(block==ModBlocks.ironPlate)){ + p.worldObj.playSoundAtEntity(p, Main.MODID + ":anvilhammer", 1.0F, 1.0F); + Main.sNet.sendToAll(new MsgPacket(true)); + Main.sNet.sendToAll(new MsgPacketLocX(x)); + Main.sNet.sendToAll(new MsgPacketLocY(y)); + Main.sNet.sendToAll(new MsgPacketLocZ(z)); + stack.damageItem(1, p); + tile.hits++; + if(tile.hits >= 4 + rand.nextInt(3)){ + world.spawnEntityInWorld(new EntityItem(world, x+0.5D, y+0.6D, z+0.5D, makeForms.get(tileEnt.getStackInSlot(0).getItem()))); + world.setBlock(x, y, z, Blocks.air, 0, 2); + tileEnt.decrStackSize(0, 1); + tile.markForUpdate(); } } } } } } - */ - } /* * ItemStack gladius0 = new ItemStack(ModItems.gladius); diff --git a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/InlayHammer.java b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/InlayHammer.java index a58e89d4..de80b0a9 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/craftingtools/InlayHammer.java +++ b/src/main/java/com/kitsu/medievalcraft/item/craftingtools/InlayHammer.java @@ -15,13 +15,15 @@ import com.kitsu.medievalcraft.block.ModBlocks; import com.kitsu.medievalcraft.item.ModItems; import com.kitsu.medievalcraft.tileents.ingots.TileEntityMyDiamond; import com.kitsu.medievalcraft.tileents.ingots.TileEntityMyEmerald; +import com.kitsu.medievalcraft.tileents.ingots.TileLapisIngot; +import com.kitsu.medievalcraft.tileents.ingots.TileRedstoneIngot; import com.kitsu.medievalcraft.tileents.machine.TileEntityAnvilForge; import com.kitsu.medievalcraft.util.CustomTab; import com.kitsu.medievalcraft.util.InlayTables; import cpw.mods.fml.common.registry.GameRegistry; -public class InlayHammer extends Item { +public class InlayHammer extends Item implements InlayTables{ private String name = "inlayHammer"; //private Item item; @@ -30,8 +32,8 @@ public class InlayHammer extends Item { public static boolean forgeHammerLeftClick; TileEntityMyDiamond tileDiamond; TileEntityMyEmerald tileEmerald; - //TileEntityHotRedstoneIngot tileRedstone; - //TileEntityHotLapisIngot tileLapis; + TileRedstoneIngot tileRedstone; + TileLapisIngot tileLapis; //TileEntityHotIronPlate tilePlate; Random rand; @@ -71,14 +73,16 @@ public class InlayHammer extends Item { if(block == ModBlocks.myEmerald){ tileEmerald = (TileEntityMyEmerald) world.getTileEntity(x, y, z); } - if(block == ModBlocks.hotRedstoneIngot){ - tileRedstone = (TileEntityHotRedstoneIngot) world.getTileEntity(x, y, z); + if(block == ModBlocks.redstoneIngot){ + tileRedstone = (TileRedstoneIngot) world.getTileEntity(x, y, z); } - if(block == ModBlocks.hotLapisIngot){ - tileLapis = (TileEntityHotLapisIngot) world.getTileEntity(x, y, z); + if(block == ModBlocks.lapisIngot){ + tileLapis = (TileLapisIngot) world.getTileEntity(x, y, z); } - if((block == blockToRun(block)) && (blockSub == ModBlocks.forgeAnvil) && (player.isSwingInProgress == false)){ + if((block == blockToRun(block)) + && (blockSub == ModBlocks.forgeAnvil) + && (player.isSwingInProgress == false)){ TileEntityAnvilForge tileAnvil = (TileEntityAnvilForge) world.getTileEntity(x, y-1, z); //DIAMOND BLOCK if(keyUpgrade == 0){ @@ -86,7 +90,7 @@ public class InlayHammer extends Item { if(tileAnvil.getStackInSlot(0) != null){ player.worldObj.playSoundAtEntity(player, Main.MODID + ":anvilhammer", 1.0F, 2.25F); - + if(tileAnvil.getStackInSlot(0).getItem().equals(ModItems.woodentoolHandle)){ if (rand.nextInt(2) == 0 ) { tileDiamond.hits++; @@ -101,11 +105,6 @@ public class InlayHammer extends Item { } if(tileAnvil.getStackInSlot(0).isItemEqual(new ItemStack(oneUpgradeCheck(tileAnvil.getStackInSlot(0).getItem())))){ - //System.out.println("Lvl 1 second upgrade"); - //System.out.println(keyCheckOne); - //System.out.println(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE")); - //ItemStack tempStack = tileAnvil.getStackInSlot(0); - //keyCHeckone is oneUpgrade check if(keyCheckOne == 0){ if (rand.nextInt(2) == 0 ) { tileDiamond.hits++; @@ -306,404 +305,409 @@ public class InlayHammer extends Item { if(keyUpgrade == 2){ if(tileAnvil.getStackInSlot(0) != null){ - player.worldObj.playSoundAtEntity(player, Main.MODID + ":anvilhammer", 1.0F, 2.25F); - if(tileAnvil.getStackInSlot(0).getItem().equals(ModItems.woodentoolHandle)){ - if (rand.nextInt(2) == 0 ) { - tileLapis.hits++; - } - if(tileLapis.hits >= 8){ - tileLapis.hits=0; - ItemStack resetStack = new ItemStack(ModItems.fortuneWoodRod); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } - } - if(tileAnvil.getStackInSlot(0).getItem().equals(ModItems.ironweaponHandle)){ - if (rand.nextInt(2) == 0 ) { - tileLapis.hits++; - } - if(tileLapis.hits >= 8){ - tileLapis.hits=0; - ItemStack resetStack = new ItemStack(ModItems.fortuneIronRod); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } - } - - if(tileAnvil.getStackInSlot(0).isItemEqual(new ItemStack(oneUpgradeCheck(tileAnvil.getStackInSlot(0).getItem())))){ - //System.out.println("Lvl 1 second upgrade"); - //System.out.println(keyCheckOne); - //System.out.println(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE")); - //ItemStack tempStack = tileAnvil.getStackInSlot(0); - //keyCHeckone is oneUpgrade check - if(keyCheckOne == 0){ + if(tileLapis.hot==true){ + player.worldObj.playSoundAtEntity(player, Main.MODID + ":anvilhammer", 1.0F, 2.25F); + if(tileAnvil.getStackInSlot(0).getItem().equals(ModItems.woodentoolHandle)){ if (rand.nextInt(2) == 0 ) { tileLapis.hits++; } if(tileLapis.hits >= 8){ tileLapis.hits=0; - if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("unbreaking")){ - Item reset = InlayTables.multiUpgrade.get(keyCheckOne+6); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } + ItemStack resetStack = new ItemStack(ModItems.fortuneWoodRod); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); } } - - if(keyCheckOne == 1){ + if(tileAnvil.getStackInSlot(0).getItem().equals(ModItems.ironweaponHandle)){ if (rand.nextInt(2) == 0 ) { tileLapis.hits++; } if(tileLapis.hits >= 8){ tileLapis.hits=0; - if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("unbreaking")){ - Item reset = InlayTables.multiUpgrade.get(keyCheckOne+6); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); + ItemStack resetStack = new ItemStack(ModItems.fortuneIronRod); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } + } + + if(tileAnvil.getStackInSlot(0).isItemEqual(new ItemStack(oneUpgradeCheck(tileAnvil.getStackInSlot(0).getItem())))){ + //System.out.println("Lvl 1 second upgrade"); + //System.out.println(keyCheckOne); + //System.out.println(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE")); + //ItemStack tempStack = tileAnvil.getStackInSlot(0); + //keyCHeckone is oneUpgrade check + if(keyCheckOne == 0){ + if (rand.nextInt(2) == 0 ) { + tileLapis.hits++; + } + if(tileLapis.hits >= 8){ + tileLapis.hits=0; + if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("unbreaking")){ + Item reset = InlayTables.multiUpgrade.get(keyCheckOne+6); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } + } + } + + if(keyCheckOne == 1){ + if (rand.nextInt(2) == 0 ) { + tileLapis.hits++; + } + if(tileLapis.hits >= 8){ + tileLapis.hits=0; + if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("unbreaking")){ + Item reset = InlayTables.multiUpgrade.get(keyCheckOne+6); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } + } + } + + if(keyCheckOne == 2){ + if (rand.nextInt(2) == 0 ) { + tileLapis.hits++; + } + if(tileLapis.hits >= 8){ + tileLapis.hits=0; + if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("unbreaking")){ + Item reset = InlayTables.multiUpgrade.get(keyCheckOne+6); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } + } + } + + if(keyCheckOne == 3){ + if (rand.nextInt(2) == 0 ) { + tileLapis.hits++; + } + if(tileLapis.hits >= 8){ + tileLapis.hits=0; + if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("effic")){ + Item reset = InlayTables.multiUpgrade.get(keyCheckOne); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } + } + } + + if(keyCheckOne == 4){ + if (rand.nextInt(2) == 0 ) { + tileLapis.hits++; + } + if(tileLapis.hits >= 8){ + tileLapis.hits=0; + if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("effic")){ + Item reset = InlayTables.multiUpgrade.get(keyCheckOne); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } + } + } + + if(keyCheckOne == 5){ + if (rand.nextInt(2) == 0 ) { + tileLapis.hits++; + } + if(tileLapis.hits >= 8){ + tileLapis.hits=0; + if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("effic")){ + Item reset = InlayTables.multiUpgrade.get(keyCheckOne); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } + } + } + + if(keyCheckOne == 6){ + if (rand.nextInt(2) == 0 ) { + tileLapis.hits++; + } + if(tileLapis.hits >= 8){ + tileLapis.hits=0; + if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("fortune")){ + Item reset = InlayTables.twoUpgrade.get(keyCheckOne); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } + } + } + + if(keyCheckOne == 7){ + if (rand.nextInt(2) == 0 ) { + tileLapis.hits++; + } + if(tileLapis.hits >= 8){ + tileLapis.hits=0; + if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("fortune")){ + Item reset = InlayTables.twoUpgrade.get(keyCheckOne); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } + } + } + + if(keyCheckOne == 8){ + if (rand.nextInt(2) == 0 ) { + tileLapis.hits++; + } + if(tileLapis.hits >= 8){ + tileLapis.hits=0; + if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("fortune")){ + Item reset = InlayTables.twoUpgrade.get(keyCheckOne); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } } } } - if(keyCheckOne == 2){ + if(tileAnvil.getStackInSlot(0).isItemEqual(new ItemStack(zeroUpgradeCheck(tileAnvil.getStackInSlot(0).getItem())))){ if (rand.nextInt(2) == 0 ) { tileLapis.hits++; } if(tileLapis.hits >= 8){ tileLapis.hits=0; - if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("unbreaking")){ - Item reset = InlayTables.multiUpgrade.get(keyCheckOne+6); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } + Item reset = InlayTables.oneUpgrade.get(keyCheck+6); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + resetStack.stackTagCompound.setInteger("UPGRADES", 1); + resetStack.stackTagCompound.setString("ENCHANTTYPE", "fortune"); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + //System.out.println(resetStack.stackTagCompound.getString("ENCHANTTYPE")); } } - - if(keyCheckOne == 3){ - if (rand.nextInt(2) == 0 ) { - tileLapis.hits++; - } - if(tileLapis.hits >= 8){ - tileLapis.hits=0; - if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("effic")){ - Item reset = InlayTables.multiUpgrade.get(keyCheckOne); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } - } - } - - if(keyCheckOne == 4){ - if (rand.nextInt(2) == 0 ) { - tileLapis.hits++; - } - if(tileLapis.hits >= 8){ - tileLapis.hits=0; - if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("effic")){ - Item reset = InlayTables.multiUpgrade.get(keyCheckOne); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } - } - } - - if(keyCheckOne == 5){ - if (rand.nextInt(2) == 0 ) { - tileLapis.hits++; - } - if(tileLapis.hits >= 8){ - tileLapis.hits=0; - if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("effic")){ - Item reset = InlayTables.multiUpgrade.get(keyCheckOne); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } - } - } - - if(keyCheckOne == 6){ - if (rand.nextInt(2) == 0 ) { - tileLapis.hits++; - } - if(tileLapis.hits >= 8){ - tileLapis.hits=0; - if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("fortune")){ - Item reset = InlayTables.twoUpgrade.get(keyCheckOne); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } - } - } - - if(keyCheckOne == 7){ - if (rand.nextInt(2) == 0 ) { - tileLapis.hits++; - } - if(tileLapis.hits >= 8){ - tileLapis.hits=0; - if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("fortune")){ - Item reset = InlayTables.twoUpgrade.get(keyCheckOne); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } - } - } - - if(keyCheckOne == 8){ - if (rand.nextInt(2) == 0 ) { - tileLapis.hits++; - } - if(tileLapis.hits >= 8){ - tileLapis.hits=0; - if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("fortune")){ - Item reset = InlayTables.twoUpgrade.get(keyCheckOne); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } - } - } - } - - if(tileAnvil.getStackInSlot(0).isItemEqual(new ItemStack(zeroUpgradeCheck(tileAnvil.getStackInSlot(0).getItem())))){ - if (rand.nextInt(2) == 0 ) { - tileLapis.hits++; - } - if(tileLapis.hits >= 8){ - tileLapis.hits=0; - Item reset = InlayTables.oneUpgrade.get(keyCheck+6); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - resetStack.stackTagCompound.setInteger("UPGRADES", 1); - resetStack.stackTagCompound.setString("ENCHANTTYPE", "fortune"); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - //System.out.println(resetStack.stackTagCompound.getString("ENCHANTTYPE")); - } } } } if(keyUpgrade == 3){ if(tileAnvil.getStackInSlot(0) != null){ - player.worldObj.playSoundAtEntity(player, Main.MODID + ":anvilhammer", 1.0F, 2.25F); - if(tileAnvil.getStackInSlot(0).getItem().equals(ModItems.ironweaponHandle)){ - if (rand.nextInt(2) == 0 ) { - tileRedstone.hits++; - } - if(tileRedstone.hits >= 8){ - tileRedstone.hits=0; - ItemStack resetStack = new ItemStack(ModItems.efficIronRod); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } - } + if(tileRedstone.hot==true){ + player.worldObj.playSoundAtEntity(player, Main.MODID + ":anvilhammer", 1.0F, 2.25F); - if(tileAnvil.getStackInSlot(0).isItemEqual(new ItemStack(oneUpgradeCheck(tileAnvil.getStackInSlot(0).getItem())))){ - //System.out.println("Lvl 1 second upgrade"); - //System.out.println(keyCheckOne); - //System.out.println(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE")); - //ItemStack tempStack = tileAnvil.getStackInSlot(0); - //keyCHeckone is oneUpgrade check - if(keyCheckOne == 0){ + if(tileAnvil.getStackInSlot(0).getItem().equals(ModItems.ironweaponHandle)){ if (rand.nextInt(2) == 0 ) { tileRedstone.hits++; } if(tileRedstone.hits >= 8){ tileRedstone.hits=0; - if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("unbreaking")){ - Item reset = InlayTables.multiUpgrade.get(keyCheckOne); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } + ItemStack resetStack = new ItemStack(ModItems.efficIronRod); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); } } - if(keyCheckOne == 1){ + if(tileAnvil.getStackInSlot(0).isItemEqual(new ItemStack(oneUpgradeCheck(tileAnvil.getStackInSlot(0).getItem())))){ + //System.out.println("Lvl 1 second upgrade"); + //System.out.println(keyCheckOne); + //System.out.println(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE")); + //ItemStack tempStack = tileAnvil.getStackInSlot(0); + //keyCHeckone is oneUpgrade check + if(keyCheckOne == 0){ + if (rand.nextInt(2) == 0 ) { + tileRedstone.hits++; + } + if(tileRedstone.hits >= 8){ + tileRedstone.hits=0; + if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("unbreaking")){ + Item reset = InlayTables.multiUpgrade.get(keyCheckOne); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } + } + } + + if(keyCheckOne == 1){ + if (rand.nextInt(2) == 0 ) { + tileRedstone.hits++; + } + if(tileRedstone.hits >= 8){ + tileRedstone.hits=0; + if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("unbreaking")){ + Item reset = InlayTables.multiUpgrade.get(keyCheckOne); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } + } + } + + if(keyCheckOne == 2){ + if (rand.nextInt(2) == 0 ) { + tileRedstone.hits++; + } + if(tileRedstone.hits >= 8){ + tileRedstone.hits=0; + if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("unbreaking")){ + Item reset = InlayTables.multiUpgrade.get(keyCheckOne); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } + } + } + + if(keyCheckOne == 3){ + if (rand.nextInt(2) == 0 ) { + tileRedstone.hits++; + } + if(tileRedstone.hits >= 8){ + tileRedstone.hits=0; + if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("effic")){ + Item reset = InlayTables.twoUpgrade.get(keyCheckOne); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } + } + } + + if(keyCheckOne == 4){ + if (rand.nextInt(2) == 0 ) { + tileRedstone.hits++; + } + if(tileRedstone.hits >= 8){ + tileRedstone.hits=0; + if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("effic")){ + Item reset = InlayTables.twoUpgrade.get(keyCheckOne); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } + } + } + + if(keyCheckOne == 5){ + if (rand.nextInt(2) == 0 ) { + tileRedstone.hits++; + } + if(tileRedstone.hits >= 8){ + tileRedstone.hits=0; + if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("effic")){ + Item reset = InlayTables.twoUpgrade.get(keyCheckOne); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } + } + } + + if(keyCheckOne == 6){ + if (rand.nextInt(2) == 0 ) { + tileRedstone.hits++; + } + if(tileRedstone.hits >= 8){ + tileRedstone.hits=0; + if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("fortune")){ + Item reset = InlayTables.multiUpgrade.get(keyCheckOne-3); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } + } + } + + if(keyCheckOne == 7){ + if (rand.nextInt(2) == 0 ) { + tileRedstone.hits++; + } + if(tileRedstone.hits >= 8){ + tileRedstone.hits=0; + if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("fortune")){ + Item reset = InlayTables.multiUpgrade.get(keyCheckOne-3); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } + } + } + + if(keyCheckOne == 8){ + if (rand.nextInt(2) == 0 ) { + tileRedstone.hits++; + } + if(tileRedstone.hits >= 8){ + tileRedstone.hits=0; + if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("fortune")){ + Item reset = InlayTables.multiUpgrade.get(keyCheckOne-3); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + } + } + } + + } + + if(tileAnvil.getStackInSlot(0).isItemEqual(new ItemStack(zeroUpgradeCheck(tileAnvil.getStackInSlot(0).getItem())))){ if (rand.nextInt(2) == 0 ) { tileRedstone.hits++; } if(tileRedstone.hits >= 8){ tileRedstone.hits=0; - if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("unbreaking")){ - Item reset = InlayTables.multiUpgrade.get(keyCheckOne); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } + Item reset = InlayTables.oneUpgrade.get(keyCheck+3); + ItemStack resetStack = new ItemStack(reset); + resetStack.stackTagCompound = new NBTTagCompound(); + resetStack.stackTagCompound.setInteger("UPGRADES", 1); + resetStack.stackTagCompound.setString("ENCHANTTYPE", "effic"); + tileAnvil.setInventorySlotContents(0, resetStack); + world.setBlock(x, y, z, Blocks.air, 0, 2); + stack.damageItem(1, player); + //System.out.println(resetStack.stackTagCompound.getString("ENCHANTTYPE")); } } - - if(keyCheckOne == 2){ - if (rand.nextInt(2) == 0 ) { - tileRedstone.hits++; - } - if(tileRedstone.hits >= 8){ - tileRedstone.hits=0; - if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("unbreaking")){ - Item reset = InlayTables.multiUpgrade.get(keyCheckOne); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } - } - } - - if(keyCheckOne == 3){ - if (rand.nextInt(2) == 0 ) { - tileRedstone.hits++; - } - if(tileRedstone.hits >= 8){ - tileRedstone.hits=0; - if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("effic")){ - Item reset = InlayTables.twoUpgrade.get(keyCheckOne); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } - } - } - - if(keyCheckOne == 4){ - if (rand.nextInt(2) == 0 ) { - tileRedstone.hits++; - } - if(tileRedstone.hits >= 8){ - tileRedstone.hits=0; - if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("effic")){ - Item reset = InlayTables.twoUpgrade.get(keyCheckOne); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } - } - } - - if(keyCheckOne == 5){ - if (rand.nextInt(2) == 0 ) { - tileRedstone.hits++; - } - if(tileRedstone.hits >= 8){ - tileRedstone.hits=0; - if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("effic")){ - Item reset = InlayTables.twoUpgrade.get(keyCheckOne); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } - } - } - - if(keyCheckOne == 6){ - if (rand.nextInt(2) == 0 ) { - tileRedstone.hits++; - } - if(tileRedstone.hits >= 8){ - tileRedstone.hits=0; - if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("fortune")){ - Item reset = InlayTables.multiUpgrade.get(keyCheckOne-3); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } - } - } - - if(keyCheckOne == 7){ - if (rand.nextInt(2) == 0 ) { - tileRedstone.hits++; - } - if(tileRedstone.hits >= 8){ - tileRedstone.hits=0; - if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("fortune")){ - Item reset = InlayTables.multiUpgrade.get(keyCheckOne-3); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } - } - } - - if(keyCheckOne == 8){ - if (rand.nextInt(2) == 0 ) { - tileRedstone.hits++; - } - if(tileRedstone.hits >= 8){ - tileRedstone.hits=0; - if(tileAnvil.getStackInSlot(0).stackTagCompound.getString("ENCHANTTYPE").equals("fortune")){ - Item reset = InlayTables.multiUpgrade.get(keyCheckOne-3); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - } - } - } - - } - - if(tileAnvil.getStackInSlot(0).isItemEqual(new ItemStack(zeroUpgradeCheck(tileAnvil.getStackInSlot(0).getItem())))){ - if (rand.nextInt(2) == 0 ) { - tileRedstone.hits++; - } - if(tileRedstone.hits >= 8){ - tileRedstone.hits=0; - Item reset = InlayTables.oneUpgrade.get(keyCheck+3); - ItemStack resetStack = new ItemStack(reset); - resetStack.stackTagCompound = new NBTTagCompound(); - resetStack.stackTagCompound.setInteger("UPGRADES", 1); - resetStack.stackTagCompound.setString("ENCHANTTYPE", "effic"); - tileAnvil.setInventorySlotContents(0, resetStack); - world.setBlock(x, y, z, Blocks.air, 0, 2); - stack.damageItem(1, player); - //System.out.println(resetStack.stackTagCompound.getString("ENCHANTTYPE")); - } } } } diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.java b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.java index 68bf5591..453a0604 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.java @@ -9,9 +9,9 @@ import net.minecraft.world.World; import com.kitsu.medievalcraft.block.ModBlocks; import com.kitsu.medievalcraft.tileents.machine.TileEntityAnvilForge; -import com.kitsu.medievalcraft.util.IronFormNames; +import com.kitsu.medievalcraft.util.AnvilUtil; -public class TileIngotBase extends TileEntity implements IronFormNames{ +public class TileIngotBase extends TileEntity implements AnvilUtil{ private String specName; public int hits = 0; diff --git a/src/main/java/com/kitsu/medievalcraft/util/IronFormNames.java b/src/main/java/com/kitsu/medievalcraft/util/AnvilUtil.java similarity index 66% rename from src/main/java/com/kitsu/medievalcraft/util/IronFormNames.java rename to src/main/java/com/kitsu/medievalcraft/util/AnvilUtil.java index 4b5e8330..bda49b38 100644 --- a/src/main/java/com/kitsu/medievalcraft/util/IronFormNames.java +++ b/src/main/java/com/kitsu/medievalcraft/util/AnvilUtil.java @@ -8,9 +8,9 @@ import net.minecraft.item.ItemStack; import com.kitsu.medievalcraft.block.ModBlocks; import com.kitsu.medievalcraft.item.ModItems; -public interface IronFormNames { +public interface AnvilUtil { - static final Hashtable forms = new Hashtable (){{ + static final Hashtable formsIron = new Hashtable (){{ put(ModItems.ironAxeForm, new ItemStack(ModItems.ironaxeHead, 1)); put(ModItems.ironBattleAxeForm, new ItemStack(ModItems.ironbattleaxeHead, 1)); @@ -29,6 +29,25 @@ public interface IronFormNames { }}; + static final Hashtable makeForms = new Hashtable (){{ + + put(ModItems.ironaxeHead, new ItemStack(ModItems.ironAxeForm, 1)); + put(ModItems.ironbattleaxeHead, new ItemStack(ModItems.ironBattleAxeForm, 1)); + put(ModItems.irondaggerBlade, new ItemStack(ModItems.ironDaggerForm, 1)); + put(ModItems.woodentoolHandle, new ItemStack(ModItems.ironHandleForm, 1)); + put(ModItems.ironhoeHead, new ItemStack(ModItems.ironHoeForm, 1)); + put(ModItems.ironlongswordBlade, new ItemStack(ModItems.ironLongswordForm, 1)); + put(ModItems.ironmaceHead, new ItemStack(ModItems.ironMaceHeadForm, 1)); + put(ModItems.ironpickaxeHead, new ItemStack(ModItems.ironPickaxeForm, 1)); + put(ModItems.ironRing, new ItemStack(ModItems.ironRingForm, 1)); + put(ModItems.ironsawBlade, new ItemStack(ModItems.ironSawBladeForm, 1)); + put(ModItems.ironsharpTip, new ItemStack(ModItems.ironSharpTipForm, 1)); + put(ModItems.ironshortswordBlade, new ItemStack(ModItems.ironShortSwordForm, 1)); + put(ModItems.ironspadeHead, new ItemStack(ModItems.ironSpadForm, 1)); + put(ModItems.ironspearTip, new ItemStack(ModItems.ironSpearTipForm, 1)); + + }}; + static final Hashtable formsClay = new Hashtable (){{ put(ModItems.cookedaxeHeadClayForm, new ItemStack(ModItems.ironaxeHead, 1)); @@ -48,4 +67,6 @@ public interface IronFormNames { }}; + + } diff --git a/src/main/java/com/kitsu/medievalcraft/util/InlayTables.java b/src/main/java/com/kitsu/medievalcraft/util/InlayTables.java index 43a71900..b2b5293d 100644 --- a/src/main/java/com/kitsu/medievalcraft/util/InlayTables.java +++ b/src/main/java/com/kitsu/medievalcraft/util/InlayTables.java @@ -8,19 +8,19 @@ import net.minecraft.item.Item; import com.kitsu.medievalcraft.block.ModBlocks; import com.kitsu.medievalcraft.item.ModItems; -public class InlayTables { +public interface InlayTables { - public static final Hashtable upgrade = new Hashtable (){{ + public static Hashtable upgrade = new Hashtable (){{ put(0, ModBlocks.myDiamond); put(1, ModBlocks.myEmerald); - //put(2, ModBlocks.hotLapisIngot); - //put(3, ModBlocks.hotRedstoneIngot); + put(2, ModBlocks.lapisIngot); + put(3, ModBlocks.redstoneIngot); //put(3, ModItems.battleAxe); }}; - public static final Hashtable zeroUpgrade = new Hashtable (){{ + public static Hashtable zeroUpgrade = new Hashtable (){{ put(0, ModItems.ironpickaxeHead); put(1, ModItems.ironspadeHead); @@ -40,7 +40,7 @@ public class InlayTables { }}; - public static final Hashtable oneUpgrade = new Hashtable (){{ + public static Hashtable oneUpgrade = new Hashtable (){{ put(0, ModItems.unbreakingOneHead); put(1, ModItems.unbreakingOneSpade); @@ -59,7 +59,7 @@ public class InlayTables { }}; - public static final Hashtable twoUpgrade = new Hashtable (){{ + public static Hashtable twoUpgrade = new Hashtable (){{ put(0, ModItems.unbreakingTwoHead); put(1, ModItems.unbreakingTwoSpade); @@ -78,7 +78,7 @@ public class InlayTables { }}; - public static final Hashtable multiUpgrade = new Hashtable (){{ + public static Hashtable multiUpgrade = new Hashtable (){{ put(0, ModItems.unbreakingOneEfficOneHead); put(1, ModItems.unbreakingOneEfficOneSpade); @@ -97,7 +97,7 @@ public class InlayTables { }}; - public static final Hashtable silkTouch = new Hashtable (){{ + public static Hashtable silkTouch = new Hashtable (){{ put(0, ModItems.silkTouchIronHead); put(1, ModItems.silkTouchIronSpade); @@ -107,7 +107,7 @@ public class InlayTables { }}; - public static final Hashtable enchantType = new Hashtable (){{ + public static Hashtable enchantType = new Hashtable (){{ put(0, "unbreaking"); put(1, "fortune");