From b0321dadef7defb0cd6ad96dd609f8b788acaf18 Mon Sep 17 00:00:00 2001 From: KitsuShadow Date: Sat, 30 Jan 2016 07:45:27 -0500 Subject: [PATCH] broken_firebox_decrement_code --- bin/com/kitsu/medievalcraft/Main.class | Bin 6777 -> 6842 bytes .../tileents/machine/TileEntityFirebox.class | Bin 10928 -> 10945 bytes bin/mcmod.info | 2 +- .../java/com/kitsu/medievalcraft/Main.java | 4 +-- .../tileents/machine/TileEntityFirebox.java | 26 +++++++++++------- src/main/resources/mcmod.info | 2 +- 6 files changed, 20 insertions(+), 14 deletions(-) diff --git a/bin/com/kitsu/medievalcraft/Main.class b/bin/com/kitsu/medievalcraft/Main.class index df738fb54da0e9ddd0f2516ea494d73f0b63188a..3cb7d0abfd24e123194b923ee0fbac8fdb928508 100644 GIT binary patch delta 778 zcmYLGO-~b16g{_;PG>r$(`gITA{4}mNKz!|mde791<_DknCN1XzF-Y)b!L!M<3i(7 zO~~80@E5oPliFZnVoY4PLUCgh6u-bv{6-YfHw7gxx%ZuW&b{xv+@qpxzQukQNrO{Rg@(w+qWo<9+6TDfQ<E|<=8hK2p zamcW8_#r8_Zg^Syb@>3;ed8l0V^$ zgwKS|N`GtU^0q}4U-3;r5=$z6qLHAPl{RMfvwVh`%yh_Q6~FmhsIldbN^n#)|5WM1 za6V%x&RJCeuany_`x4`S{sz zJmn`u55`A~ydAd+ITr6NWQy@V!?KJ))}v5>f)Z(jP-Q~4kUU^!^LE-cnIVSg6ymet z3HL@q>*%d8pLb~wQS~~S)}MIR(X9SlT1PMSd*1)(2IdZ3$LliQl<{#)40d6&h`SNw1JNx#CvXWS zuE4@o*eGKdcQArU6fuR?tm751qDHo4Ty1^P~&2Etp<4F@Q zYSO$H5BvjqvY6DSCMKBZ!JBw8et)3&jrf81fxcU+TxRmj{4&pEroL-+r+Ry>ejPxH z;tUd@lMlGV<=%5NP^n5PKjlwp^MuxX$(Yz*%o*c*O|v+~msHN@y%9d+_eJ-OW{w$I z(~SoNugx_J437x?{E*fY88xhuA&4ggk4>y=hG%?O8`Rx+L2%pk%#nPF;U%HZ-hvl& z#xH6j5MbmFbzwl z7GjKC!sKZ7cs4nnEsP~I)52^*AvekVvffQzen*eSeALFMl@Mrv`C{^*nJ<(wCDX_X zRwX}IgLUU7!j|%!&KD)s#b`63-BwCSr|v7U&>2Y{g!qwo)-7HMpB`@MQ`4%)S;JlJ zo_620p&n|F*@k+mJ$L_C*RXK-DqhvFSi^^k7$u=c#387>9ND_Z#CcelK?#>Ii5jMG z1Jk&P6G#Xuv~G@G1cVZ6;4D5t+{!*WUx~!KzRY4<72g_hwGn^S@Mo5s0rFHy;k!GA t(wg8MWKWPthc0puL_tvtS&*sSfnZ4?nLO+X#gNzsH%T_VR4@?V4nwJHDr diff --git a/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.class b/bin/com/kitsu/medievalcraft/tileents/machine/TileEntityFirebox.class index 06d6e98a8fb202df7e94a4a5f1c748b3683aec0e..4a2f389da251daff56e565bde20fc5fb5b217ad1 100644 GIT binary patch delta 1167 zcmZ8gT}+!*7=E5n`q7VXw54^7f+-mOq~%A{;rK6O+?9!$iI>J(Fa3#$I`tf?M!h-bInVpN@B5th8NM7nWo3lYs8n~oG;`!x=5 z(0t3;QV`&?8izSze&y`2jdEP!7*Q?sZnL4-b$o*72+MXnzD(4bDf=UWb(Xc;=;V~f zX_gY|Qd~E}5!q4UbLN}H70ol8)A&642v;ncn2g7b5j_#zT-A+`z7Z|pyr?-dI@+gV zgp~>xh37K+c6@VLWtejcmk5vft)s;By7CJnoU?I-7Zk?KCfB2Rt6VcjT{XcK8X7ma zCTd9sQWMvBNfL#Ienk&Ql1uB+gtWS;aZ6fNw)9KJ>cyDKB)1h_AxdN$F`27;!Tj14 zDqrDsjW5a?wuqr$i-tGj!qm%5D@>UIcVqD@^bwl4RWKPfrgbA3-M``f$nN|BBlr=M z_zAQ48T0tnoT^Hs4si??0K-LtzI*8ReTaI8{aq+-K0SDJaNLID2zVunSdOjun{7JM zw&vL8+sL;M*4+{H^57L~BMQa(Q1tj6R{Q}w0T+*6REYPv&sVu7##@OhzQ)qO#(NT)^&zSiCKU#b{{q$H@z_*VQ(~a8iIEarq zgnJC_uhhNH@i90!F488@&T|NI5+P1ulGB*w3>L(vz0C7Sa~^MSL6iyOZ7$*iF5@#s X@qjD%hB17{3;3R^v~a`htl#<*%(U^P delta 1109 zcmZ8gT})eL7=9jCde(9VJy7{Kz+?m44saPvC`11LTVO(2)wLYTS*;u>gTt7cj%uP; zUhO0^+-xpJZfxuXZAiRv(ac?WV@yoE&};8DjTc52zYh`<&6j+6-uHQ*_wUPhfA-$& zy>C5kH>%mGGRQ9b2ak{4H??|K5Bn7M5|wtQxUxWHKL_j)ZOS>Ma+o9bZSC~Y9*(IT z=Y;*E*5wLwO5r4NLd1J-mS{pU&GYtfNn7QN%2`$t?nGKQ;|pdwv7~U0sJ7>|^7ff@ z+H^C*sLGcyK$Ip8OZq~(Wvr!iGpsKgNBJt@n46p&a3jQeg>gH>>f+7x+M=5=Minj) zRWe<0ByG5kC#F~D|YDul6td>#BSYB888dF5Ux|K>S$w?m_ zs~8PR;gU*IQV!X%bgZaMOGlxpU(w?W8;K>ua#7=Dm1}Y|WnEu2Q!7a~EnZQ$L6pmG z#1b}n)&8k8Tx0N>%Ih+RYr)j78S%BW=>08jDZF71dYkJq^b@KWerUrmBf7a^h;pm( z=g+itw4IK(#`oU!eo?GFMhL%Q2EQYUKX4I$+T#sY>!)~19AM1<0K@*z;qw%K1jWm? z+=1b_3(oDj1;~bt1Cturj((BrMSb`p^NQQ(z|?ntkKM@vV*t|9zg@M!SEXFYdDJV+14$ z1$H^O14YBFY#`6kU52E^KvobhN!Xpq3T0#)<^Hc2$@4-fU&-_0w$wb7RP2z7)++;vW&Aw!et4=brP=bbN%0tH>BS+pY`qY&8!&fa8c*s z1y}?JJ#exFh4i9^WvFKbnplMZpFulo(aGa|=w$;2*@SsMhwJp=7XA2;0er$!$g>$= zvjyL=^= burnTime){ decrStackSize(0, 1); this.ticks=0; @@ -249,29 +250,30 @@ public class TileEntityFirebox extends TileEntity implements IInventory{ } } private static double fuelMulti(int i, ItemStack stack){ + double a=0; if(stack!=null){ if(stack.stackSize<=15){ - return 0.25; + a=0.25; } if(stack.stackSize>=16 && stack.stackSize<=31){ - return 0.5; + a=0.5; } if(stack.stackSize>=32 && stack.stackSize<=47){ - return 0.75; + a=0.75; } if(stack.stackSize>=48){ - return 1; + a=1; } } - return 0.0d; + return a; } - public static int getItemBurnTime(ItemStack p_145952_0_) + public static int getItemBurnTime(ItemStack stack) { - if (p_145952_0_ == null) + if (stack == null) { return 0; } - Item item = p_145952_0_.getItem(); + Item item = stack.getItem(); if (item instanceof ItemBlock && Block.getBlockFromItem(item) != Blocks.air) { @@ -291,6 +293,7 @@ public class TileEntityFirebox extends TileEntity implements IInventory{ { return 16000; } + } if (item instanceof ItemTool && ((ItemTool)item).getToolMaterialName().equals("WOOD")) return 200; @@ -301,11 +304,14 @@ public class TileEntityFirebox extends TileEntity implements IInventory{ if (item == Items.lava_bucket) return 20000; if (item == Item.getItemFromBlock(Blocks.sapling)) return 100; if (item == Items.blaze_rod) return 2400; - return GameRegistry.getFuelValue(p_145952_0_); + return GameRegistry.getFuelValue(stack); } public static boolean isItemFuel(ItemStack stack) { - return getItemBurnTime(stack) > 0; + if(getItemBurnTime(stack)>0){ + return true; + } else + return false; } public void isFurnace(World world, int x, int y, int z){ if(world.getBlock(x, y+1, z).equals(Blocks.furnace)&&(world.getBlockMetadata(x, y, z)==1)){ diff --git a/src/main/resources/mcmod.info b/src/main/resources/mcmod.info index 18a9e0f5..edc9b5da 100644 --- a/src/main/resources/mcmod.info +++ b/src/main/resources/mcmod.info @@ -3,7 +3,7 @@ "modid": "kitsumedievalcraft", "name": "ForgeCraft", "description": "ForgeCraft", - "version": "{2.3.1}", + "version": "{2.3.4}", "mcversion": "{1.7.10}", "url": "http://www.minecraftforum.net/forums/mapping-and-modding/minecraft-mods/wip-mods/2296334-wip-kitsus-forgecraft-blacksmith-style-forging", "updateUrl": "https://bitbucket.org/kitsushadow/kitsus-forgecraft/downloads",