From c1ef01dd0cbef7baf8bc6ece7839bde2949731fa Mon Sep 17 00:00:00 2001 From: kitsushadow Date: Thu, 9 Jul 2015 06:13:43 -0400 Subject: [PATCH] Refactor Tools --- .classpath | 118 +++++++++--------- .../2.0/taskArtifacts/cache.properties.lock | Bin 17 -> 17 bytes .gradle/2.0/taskArtifacts/fileHashes.bin | Bin 249840 -> 249840 bytes .gradle/2.0/taskArtifacts/fileSnapshots.bin | Bin 1733417 -> 1733417 bytes .gradle/2.0/taskArtifacts/taskArtifacts.bin | Bin 31523 -> 31523 bytes .gradle/gradle.log | 2 +- .settings/org.eclipse.jdt.core.prefs | 2 +- .../block/machines/Firebox.class | Bin 10183 -> 9915 bytes .../medievalcraft/block/machines/Forge.class | Bin 12352 -> 12388 bytes .../kitsu/medievalcraft/item/ModItems.class | Bin 23391 -> 23123 bytes .../item/tools/CustomIronPick.class | Bin 2317 -> 2391 bytes .../tileents/machine/TileEntityFirebox.class | Bin 11046 -> 10947 bytes .../tileents/machine/TileForge.class | Bin 10182 -> 10277 bytes .../medievalcraft/block/machines/Firebox.java | 22 +--- .../medievalcraft/block/machines/Forge.java | 3 +- .../kitsu/medievalcraft/item/ModItems.java | 9 +- .../item/tools/CustomIronPick.java | 21 +++- .../tileents/machine/TileEntityFirebox.java | 15 +-- .../tileents/machine/TileForge.java | 6 +- 19 files changed, 95 insertions(+), 103 deletions(-) diff --git a/.classpath b/.classpath index c3151cc0..770a4f99 100644 --- a/.classpath +++ b/.classpath @@ -4,63 +4,63 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/.gradle/2.0/taskArtifacts/cache.properties.lock b/.gradle/2.0/taskArtifacts/cache.properties.lock index 2a9e5a257400a531541d691c825fba8b6b250372..a976c386e33a4e0d193b17269be36e4aba9282c3 100644 GIT binary patch literal 17 VcmZS9*&j0BY(sgK>k5?EN82u0?F=d0)e+&0XZBLhD1Y)M`>2l1S8v!o1CTsuz delta 120 zcmew`pZ~*r{)R1#WwIhU#?c!Xz`!ROME&@qI&pfJEMpXs3}YflW=^yY+w>o@jILTr xf(!@rrpk4*M=m`2+Gm$(c>Dtf21Y-GQB2t&4K4exw5Q840x{F}bUEhEjQ}0DA_M>c diff --git a/.gradle/2.0/taskArtifacts/fileSnapshots.bin b/.gradle/2.0/taskArtifacts/fileSnapshots.bin index 0e7f60bde69b9c7bb0179beada37a85d4611b729..c820cd63d7f5bd579ed2f9074067855017aa4277 100644 GIT binary patch delta 362 zcmZ4aEOX_v%n34D0m2Ln3=%*L1inc?A{5MI2#g2PMG&^n4G?>xTLjD5t{l;g8*{}c z9^juWClSmqrTD3QpK=yNncup}84?PU7f475OvqOBIhHzgK19O5bMpp?2u6Xg6Z*GG zKFHyLhz87SLLC6sk+=KNL7l%`M(jdwVBT-@C~( zq!lJ#kd_eet<>M7+;++tBH@!c`GIu9WAQl5+aUhleV#)0R9#S{80G&T_5C8xG delta 356 zcmZ4aEOX_v%n34De(M+*7$krg2m)pRi7+se!6y?)heOx_?|^jSM7IbQE}itsjT>{t zCm!IREGH2>xl=-1pySmijVT>ommzBXJ15VOP}qDyB7kwSg;avT|K1ztCjI_887eC^ zd4kjo0jZFUf28{YmqG-6ZcJ8?4iM1W&7aL+-SiJ47#Ke}Lt0_-4rvJi=i;?q^5J%D z5DDL;$tR>0CdpI?q%M#M-O+scB1AkucyfWv8f?m0UnG%%ml>DK+FQftU$~L#Oy%K0mPg@%mu{UK+FTgyg0qd diff --git a/.gradle/2.0/taskArtifacts/taskArtifacts.bin b/.gradle/2.0/taskArtifacts/taskArtifacts.bin index 1041809aceecbb5b4674caa824135c27405972d1..ed6df8f811d526ce0a49620e5a810b5fa21362aa 100644 GIT binary patch delta 172 zcmZ4djdAfe#tm13gqAU98>~4WJ$qhgs06$G4#UIeCjSq1pS&yBbn~?!Nk&ZuAdszJ zk&tx8n1O-uH4r}r;z!I9_uuWlzLoujjHY+^+if$I_e^FC(VNWcCpft!G+^`O5J!mC zb-bMM-@sZI1GUWt;#tf(Qy;Zd<~Mkx)l8{OG@NaAU{Z+wM#O$h);Mn0|p delta 160 zcmZ4djdAfe#tm13n3gkdP70P}6fp3=ck2C_7~{vM#UDE{OG!-rAM8GPXRw(#0}xbe z=O&#oW?*1^4aAQ@n0d2ts3W7`od$y`0eikp42}&G$nTd|+B2CkL~k;$Uz%|IN6T+u zEsKH5XM-^FW|43~MnQ*z2FtIyeb(>(zcoBXFC_WEq!9hdcf&;|-}bX$o~A6ZSvTUF F5&+vHJ4OHi diff --git a/.gradle/gradle.log b/.gradle/gradle.log index d455d3c1..06b35f0b 100644 --- a/.gradle/gradle.log +++ b/.gradle/gradle.log @@ -12,4 +12,4 @@ BUILD SUCCESSFUL -Total time: 20.183 secs +Total time: 18.262 secs diff --git a/.settings/org.eclipse.jdt.core.prefs b/.settings/org.eclipse.jdt.core.prefs index de427fdc..e9fd7947 100644 --- a/.settings/org.eclipse.jdt.core.prefs +++ b/.settings/org.eclipse.jdt.core.prefs @@ -1,5 +1,5 @@ # -#Wed Jul 08 13:16:19 EDT 2015 +#Thu Jul 09 02:11:36 EDT 2015 org.eclipse.jdt.core.compiler.debug.localVariable=generate org.eclipse.jdt.core.compiler.compliance=1.6 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve diff --git a/bin/com/kitsu/medievalcraft/block/machines/Firebox.class b/bin/com/kitsu/medievalcraft/block/machines/Firebox.class index d1cc82e3cd9f5782600b33224a57086575f0c845..c27aa7fe9bffbf6326c409ed64ae7510dce17717 100644 GIT binary patch delta 4579 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 Shv^9a<^O`B*BH^qp#KjxLRs4Y diff --git a/bin/com/kitsu/medievalcraft/block/machines/Forge.class b/bin/com/kitsu/medievalcraft/block/machines/Forge.class index 3e4fafb3f5e9468641412eef567f76ac9b5fa604..36871b7f1f09ebf39e700a722973e3c411348ae7 100644 GIT binary patch delta 3328 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 Cgmkz7 diff --git a/bin/com/kitsu/medievalcraft/item/ModItems.class b/bin/com/kitsu/medievalcraft/item/ModItems.class index 1db15d5927d4a6068b96683068eb6ac39cca78a3..3cbed531c061d40f146d14d0d30d7921a9c325e4 100644 GIT binary patch delta 721 zcmYL{&2LOm7{=ez^R{#6_N1-xk%)~2iNr=E;yvd?E$+Sf{hsHZ=PvH2=j_8X=Dh#&>J0#F z!+9UnF=&_3*4D)><<6i5F+VWeDIj+b z67#_oP8QdyctAjpiU;MoVARPQc|br)$ssu&-02jJJR%^i`4Uu8kg#&f24Q9w==FUj2Y z^>Q}YEFl&p zMLKYn!AALG^XghA^0=kkUGQ*s6+XYfXrYFC2wt-0*Qj)?3SW$l6D;dw6}}nW<6&}H zr>pSQ=w1)gT4(8yzAAi_ZTY|uEfi>BzlZyDSfucvUN}VhFoD)3(q+9+A$^QM>tWI- z^};FABLrHHksenIbNN6EEnJ{*(!=vQoTBhDEy$&OU;};fG=X(05%l{X-Dm2jB9`CCfiaVjv#8IVQW6&tn>pbkQ zwkH(4#h^(*uEDO{+sm^Hov_!$NhRImKm4WmNP{)}+xite>?+JewoiD=s#|Q_lZKC3 ztZB($Erplbvey_S97@BdEY=flpdfLCaAO+2@XDCS`#Fm(R35N#zbsp+Jd}nHJQ4G> z(SdO)kJ{KF%T6kf%LBU!_fU{HLHGn6n8lNX`zT17-@;}j&GAbdkkxJfugLE=fmx8;O8gzr+w6gAHoA^rE#pZXum ztYC$#v3 z^ow8Y2YS?V`~m(bk9Q_HoDjOTe#mBC?%ey_=RSAl?|=UI3&2O%w-95PulRN6K&r6m z)J0W_L+(}rUQ>=#qV6c)cSEPp43%Fm2EMm0D+dX-jD|sjs-*pP@F&Tz=ox+%n3m9h@q7*td84B<0CORn#7a1;e z*XKb~x>XVMW0GOSXycSLZYPk&l&;4mhS4{XSk@NPHm=|UQUY%@gjbE?J0dvcp2k%h z*YF`jzw%qkVK|@3p4F4)DQhFAORag@5-(LV5Unx~mq@0o&HAngh*XyfpDJk~lsT!4 z=IzC}+Ls~2tx{BVBO4-5GWCq2QfHwt^whZ`(L@RBwB`vvuU3m*%@639^gV_r-E}rV zbhB+LUODJ)CgCZmj+}b2eHqN4KI9fsae{a%;M~x(1Vu6rnvPFhry&G-m&Kx-0P$za;l{Y*_e~VY161`7#a-i#9f~#bCA5WtgCT zh&Z5isRI!4fk~ZV&^TG)jkf3q_IbEmt5GExrvHNyUF!5klLS>4Wf@9po%^2WD?@Rt%d3>?AQgFD z6KbFnpPPO&sECJBck;;Tr|E`PFWve@&l5qxfA0D*&TZ#jVfYxM+qplHew>c|OtJ|>aDCCt+5<(5;-;RelsEF9dVka{#vk9my7x3JI# z@r>r$S7I*p@$dK~hK?u++5=`VfUCyyLd){Ra{`~^uJN3}JuDgP1n%R3L6ATJUr>q+ z%Xrw1HcS5+Nv!8r{WZC0IzSh)#%{NE+YuPP#8-gS1)2iOB&F3#{CX04btp;`aKc&0Y93^i!{|doW;Co fVvV(SPh!RJ)WnM6nLY)MUHaGWP6YycOX+_BYms#X delta 976 zcmZWmOHUI~7(I8U?LZlDECMZ19u}%hD-}>w>Z9NTQK$$g;tR)iz(S{^?cig@FEFvW zdtI35#*HLYqtQs*xi;}0%VY>lt{4xEMBXSYCuW^uuCSbB@Z=oRVhEMDf-G4!XMFW4YSB>s6d$aC z#?X*iD>=3`QM3!wxy))U2uFn%K5^TlLP3q6Zp|uM5G?;5_qC#3K^sr8m>fn2FR(FR zmx^xeb8&Y)d zkcvYHlAe<3%$bj!wW67(t!gohqY92N^wPHB$dsL(poK~*j$wpBtE!*3?QGgET1K8B zTHcCgh4|wtPKX)RvF-en;h4pok@w>iMirzO`ZD()B`iBzN-SCVM8>u(yO1cF%ej(M ze3BR^?wRdG#TZT#PPJ(kg#d>B@|O@x^2^d5{!?1=$d=*o?;gjO#mX-%m)H05mzQ~#8G3jZYvIr2dRak^hn2x~ z36d~`oR@?h6g{+FErc(1ls%_hrkK*>@1W{|U7Ogg>zioQV-+;b>l+AF&^fPvL}Ve* z`wsi4tXI%q!Jud!-b7N5y~oM7F2fl*ql6AL5$kT$t)m$lx!;T+IuODTS}}q)ddPO1 zrLnFmInH66GLqqnW$x`fO-dwl0vEQ$#wm)PB)<_S1f9>Vbh>D2wY!bRa1ra1R1$kG z(74!B+rU)3f|*xPJg?z#f#e-Py*p%S|72r{9kpyk;xh`*49Nl_TKgnL*?h5iC@iKN2- diff --git a/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.class b/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.class index 8c6cdc74baa6b39b35fdddebbef245f835006daf..2898798bee8d43affb9a970a0e20272a2da3e57e 100644 GIT binary patch delta 1304 zcmYjQTTEP46kUsXF~emZyk`a&1{h|zLz$NMLrN(HsRbV`EntE02&oj5s7M<5z*tSy z^rtz|2K}&p*py&`t?d+}KZ>CrHTuyXV@#;g7~5L4Rbzd-?*L7I&Ru)&bN60*?{!We zSlR#Xi%#{btHj~J2vapW=~73X2n{|iA7VcD89-X^XizjIEuwA|2*~e`4g{Ph#m6o=UoXuX1ee|o9 zw0;IuLHdfgp3yiXt{dr>CHKXQa&f(^@fG^tyP0vD61kdnG+X+zk4{ZZ?3|n$ov?F( zag7({%Cp(er_A9~*kA$Bubbld^%BC-+`LS4oM!VW_!HPy&n>E1MqJ0%h@ z4;g=G=a>~|?mW^rT<2J5vcy@^b5`=35RlUctDI}dz*Vuo##|Y`!5(~zgZK^w5~^A! zgCGjU5?Ta$Acr8riKGNd5@bpslOQu11e=jmRxa^7_(Sfe19IOAyF>=>rC6At*yXjX zqQh&cU#32f9eUq+ESiTdV9{$?X8AF%#-c$$v5EAP100>I%rX= zp=hOuY@_>GnT0W;z zpjrPx$i^c!dQ$&{!{_ta9S+R_yYV{K*GJkad~NM?_%2UL;Fy%jV;tMJ6VXLw&CI{14191cU$p delta 1392 zcmZuwYiyHc6n>ud>vi9@cHOPreQnpS-P(;^*u}xdE^Y}oWf!ZAFiL^3F>nlmk_ZtM zHU7}NiDdXgqJfBL1cZVyF(L+km=F`Azf6eNc!@D0Q$v(^zHZJ${qyyC&w1YGJEvu|*Ti%(F*CkxHa0OmF&kSowL3AnSErLMLfbYm zlO)R3S(i7^FSx@&H}kE`Bb+#;3Q()@|9DOw8&mV4-?7r!wfk7J77gSxmV1 zCUzvZ?wd-cg@^ZS9iJ7&s?gxzpr{sS4c3ep^irK=ELTUeLvEwKN}W~o5vK8p8KT%= zIt*GsXElS$=4`gq=nONWdIZ+#j54Mkakg6;bS`6~ddJz!W_8QiU|FGaCA(C_73L~+ zm|nHVWwrOR-^xB|fI8>$sE1t}n5C|}+SsdXxu7vG z02|BzUXGNM=4&Zx#}N{!Z8i?J^VCz!okM;)yGXG)9Vr%tO)1>^02S$=$(&-z=zmFz zH#F@8ss%5pR-{$kkwXhHdB#xiFDOV6!vCKq&q6EQY}07iB=m3!b^kW?Gu*g|BK#tS-x8zq=*6#CgWoXZ!0(9THpXyA?eGu!Tck*f zq&-~DR#?;J+L7@G;-=f;!;xOTPyFR7Op9PDT?%fH-7*f$tSzQOpc^9JW#B#1c4_9IryKsQL zIL1DlVn5#C-FTY=xW?7$q0m9v)O={nP#geVe|tXw)bs1M+H727 zl+zkt^9>PvW;^lW!67GZkK0M2Byz9PwepKp6$5;$@g3j0_l?rqa~krHuX2G)3Kt1| z#2UA1$DHA0ZJU+qPmgL`<_e*t?B`A_lq0q5Pan4_vhQ=(?}Mk2vG*hbty$10Lt)CFBX0|EVGGa8>eq{A6y6 zM@qOZVheJ`wyg;8AxhbXMz$l$4z$pO$;U|Y2`1QuDR$!pd$2+a-`R^l?89FU;DCcT z<`9ESpiJ~@IK3X_2;;8M3{gWTn4us-@MS0@NXpO^K{9TM(j54Y5N(Pa;Z6kPrbzj? Fbpm}+YAyf( delta 465 zcmY+9%PT~26vw~cxp%sEu4~+4kWex&6cQ<~VmDG=F@<87A+MRuke#iabiLo>%?@=J z7M9ff1GdVaz)nqmhDkQ3&-r%F_j}HH&r`RSOg%gTsN>D8*5q0IXpFYl}K8;#{PsIZGeJ}M=P(lctSic4Iw#X=f0k$C zMy}YmkGbSK9!VnPEO;xd2MmBcP}z$z_Mw3TXyqU}8N?`uFvVfSIf50ABEd0O z3?a!dUKqg}C-Kf{xP?#s&&%+@D?0H!bu diff --git a/src/main/java/com/kitsu/medievalcraft/block/machines/Firebox.java b/src/main/java/com/kitsu/medievalcraft/block/machines/Firebox.java index 59802efc..05010756 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/machines/Firebox.java +++ b/src/main/java/com/kitsu/medievalcraft/block/machines/Firebox.java @@ -59,23 +59,6 @@ public class Firebox extends BlockContainer{ 1.0F, 1.00F, 1.0F); } - @Override - public void updateTick(World world, int x, int y, int z, Random rand) { - if(!world.isRemote){ - if(world.getBlockMetadata(x, y, z)==1){ - //this.setLightLevel(9999); - this.setLightLevel(1F); - //this.setLightOpacity(0); - //System.out.println(this.getLightValue()+" "+this.getLightOpacity()); - } - if(world.getBlockMetadata(x, y, z)==0){ - //this.setLightLevel(9999); - this.setLightLevel(0F); - //this.setLightOpacity(0); - //System.out.println(this.getLightValue()+" "+this.getLightOpacity()); - } - } - } @Override public boolean isFlammable(IBlockAccess world, int x, int y, int z, ForgeDirection face){ @@ -122,9 +105,8 @@ public class Firebox extends BlockContainer{ (player.inventory.getCurrentItem().getItem()==Items.flint_and_steel)|| (player.inventory.getCurrentItem().getItem()==ModItems.fireBow) ){ - world.setBlockMetadataWithNotify(x, y, z, 1, 2); - //world.notifyBlockChange(x, y, z, this); - world.scheduleBlockUpdate(x, y, z, this, 10); + world.setBlockMetadataWithNotify(x, y, z, 1, 3); + this.setLightLevel(1f); player.inventory.getCurrentItem().damageItem(1, player); if(world.getBlock(x, y, z).equals(Blocks.air)){ world.setBlock(x, y+1, z, Blocks.fire, 0, 2); diff --git a/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java b/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java index 1d6df06e..586ed260 100644 --- a/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java +++ b/src/main/java/com/kitsu/medievalcraft/block/machines/Forge.java @@ -162,7 +162,8 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ (player.inventory.getCurrentItem().getItem()==Items.flint_and_steel)|| (player.inventory.getCurrentItem().getItem()==ModItems.fireBow)){ if(world.getBlockMetadata(x, y, z)<=3){ - world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)+4, 2); + world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)+4, 3); + this.setLightLevel(1f); } tileEnt.markForUpdate(); if(tileEnt.getStackInSlot(1)!=null){ diff --git a/src/main/java/com/kitsu/medievalcraft/item/ModItems.java b/src/main/java/com/kitsu/medievalcraft/item/ModItems.java index 7ff3e725..c4dd49e0 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/ModItems.java +++ b/src/main/java/com/kitsu/medievalcraft/item/ModItems.java @@ -756,11 +756,16 @@ public final class ModItems { GameRegistry.registerItem(battleAxe = new ItemBattleAxe("battleAxe", heavymacemat), "battleAxe"); GameRegistry.registerItem(customIronPick = new CustomIronPick("customIronPick", customWoodNormal), "customIronPick"); - GameRegistry.registerItem(customStrongIronPick = new CustomStrongIronPick("customStrongIronPick", customWoodStrong), "customStrongIronPick"); + GameRegistry.registerItem(customStrongIronPick = new CustomIronPick("customStrongIronPick", customWoodStrong), "customStrongIronPick"); + GameRegistry.registerItem(customWeakIronPick = new CustomIronPick("customWeakIronPick", customWoodWeak), "customWeakIronPick"); + GameRegistry.registerItem(customHandleIronPick = new CustomIronPick("customHandleIronPick", customIronToolRodNormal), "customHandleIronPick"); + GameRegistry.registerItem(customHandleStrongIronPick = new CustomIronPick("customHandleStrongIronPick", customIronToolRodStrong), "customHandleStrongIronPick"); + +/* GameRegistry.registerItem(customStrongIronPick = new CustomStrongIronPick("customStrongIronPick", customWoodStrong), "customStrongIronPick"); GameRegistry.registerItem(customWeakIronPick = new CustomWeakIronPick("customWeakIronPick", customWoodWeak), "customWeakIronPick"); GameRegistry.registerItem(customHandleIronPick = new CustomHandleIronPick("customHandleIronPick", customIronToolRodNormal), "customHandleIronPick"); GameRegistry.registerItem(customHandleStrongIronPick = new CustomHandleStrongIronPick("customHandleStrongIronPick", customIronToolRodStrong), "customHandleStrongIronPick"); - + */ GameRegistry.registerItem(customIronShovel = new CustomIronShovel("customIronShovel", customWoodNormal), "customIronShovel"); GameRegistry.registerItem(customStrongIronShovel = new CustomStrongIronShovel("customStrongIronShovel", customWoodStrong), "customStrongIronShovel"); GameRegistry.registerItem(customWeakIronShovel = new CustomWeakIronShovel("customWeakIronShovel", customWoodWeak), "customWeakIronShovel"); diff --git a/src/main/java/com/kitsu/medievalcraft/item/tools/CustomIronPick.java b/src/main/java/com/kitsu/medievalcraft/item/tools/CustomIronPick.java index 7d133a07..b6213986 100644 --- a/src/main/java/com/kitsu/medievalcraft/item/tools/CustomIronPick.java +++ b/src/main/java/com/kitsu/medievalcraft/item/tools/CustomIronPick.java @@ -1,5 +1,8 @@ package com.kitsu.medievalcraft.item.tools; +import java.util.List; + +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.init.Items; import net.minecraft.item.Item; import net.minecraft.item.ItemPickaxe; @@ -14,18 +17,26 @@ import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; public class CustomIronPick extends ItemPickaxe{ - private String name = "customIronPick"; - private Item item; + //private String name = "customIronPick"; + //private Item item; public CustomIronPick(String name, ToolMaterial mat) { super(mat); - item = this; + //item = this; setUnlocalizedName(name); setCreativeTab(CustomTab.MedievalCraftTab); setTextureName(Main.MODID + ":" + name); - this.toolMaterial = ModItems.customWoodNormal; - GameRegistry.registerItem(this, name); + //this.toolMaterial = ModItems.customWoodNormal; + //GameRegistry.registerItem(this, name); } + + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean par4) + { + list.add(""); + } + + @Override public int getItemEnchantability () { return 0; diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.java b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.java index 9e3ef071..a7cd2c31 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.java @@ -220,22 +220,13 @@ public class TileEntityFirebox extends TileEntity implements IInventory{ } private void fireboxMaint(World world, int x, int y, int z){ - if(world.getBlockMetadata(x, y, z)==0&&world.getBlock(x, y+1, z).equals(Blocks.fire)){ - //world.setBlock(x, y+1, z, Blocks.air, 0, 2); - - world.scheduleBlockUpdate(x, y, z, world.getBlock(x,y,z), 10); - } - if((this.getStackInSlot(0)==null)){ - world.setBlockMetadataWithNotify(x, y, z, 0, 2); - world.scheduleBlockUpdate(x, y, z, world.getBlock(x, y, z), 10); + if((this.getStackInSlot(0)==null)&&(world.getBlockMetadata(x, y, z)==1)){ + world.setBlockMetadataWithNotify(x, y, z, 0, 3); + world.getBlock(x, y, z).setLightLevel(0f); } if(world.getBlockMetadata(x, y, z)==1 && world.getBlock(x, y+1, z).equals(Blocks.air)){ world.setBlock(x, y+1, z, Blocks.fire, 0, 2); } - if(world.getBlockMetadata(x, y, z)==1){ - //this.worldObj.markBlockForUpdate(x, y, z); - world.scheduleBlockUpdate(x, y, z, world.getBlock(x,y,z), 10); - } } private void fireboxFuelDec(World world, int x, int y, int z, ItemStack stack, int time){ if(world.getBlock(x, y+1, z).equals(Blocks.fire)){ diff --git a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java index d4646424..7b66a334 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java @@ -335,12 +335,14 @@ public class TileForge extends TileEntity implements IInventory{ private void forgeMaint(World world, int x, int y, int z){ if(this.getStackInSlot(0)==null){ if(world.getBlockMetadata(x, y, z)>=4&&world.getBlockMetadata(x, y, z)<=7){ - world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)-4, 2); + world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)-4, 3); + world.getBlock(x, y, z).setLightLevel(0f); } } if(this.getStackInSlot(0)==null){ if(world.getBlockMetadata(x, y, z)>7){ - world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)-8, 2); + world.setBlockMetadataWithNotify(x, y, z, world.getBlockMetadata(x, y, z)-8, 3); + world.getBlock(x, y, z).setLightLevel(0f); } } if(this.getStackInSlot(1)==null){