From 54aee93dc912281e245d29a4efd5a6e7baca1a17 Mon Sep 17 00:00:00 2001 From: kitsushadow Date: Fri, 3 Jul 2015 05:54:36 -0400 Subject: [PATCH] Forge Logic double check --- .../medievalcraft/block/machines/Forge.class | Bin 11251 -> 11699 bytes .../packethandle/forge/MsgHandleForge.class | Bin 1403 -> 1410 bytes .../blocks/machine/ForgeRenderer.class | Bin 3988 -> 4300 bytes .../tileents/ingots/TileIngotBase.class | Bin 3178 -> 3176 bytes .../tileents/machine/TileForge.class | Bin 6058 -> 6734 bytes .../medievalcraft/block/machines/Forge.java | 56 +++++++++++------- .../packethandle/forge/MsgHandleForge.java | 2 +- .../blocks/machine/ForgeRenderer.java | 47 +++++++++++---- .../tileents/ingots/TileIngotBase.java | 2 +- .../tileents/machine/TileForge.java | 24 +++++--- 10 files changed, 90 insertions(+), 41 deletions(-) diff --git a/bin/com/kitsu/medievalcraft/block/machines/Forge.class b/bin/com/kitsu/medievalcraft/block/machines/Forge.class index aafeb109dcf93994e505d1382c9463682a842233..beed8883ad821ede64a8c463c6c5550985be496d 100644 GIT binary patch delta 5555 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 WQBvd)N~+@FUw*SFX((1Qp#KlGK1}!k delta 5156 zcmb7Id3aP+vj5e+oxXj$Pm`UbLlVQD4MABaO2Du@GNM62Fz66ENfQ!6Iws97Hct`8 zg>gBe1_eQ7Q6ozT9W<eP1X zviYu`Cq(SO_~s4(*K0Nd8X;5ej)>osy3UXX%{dMeb8)YMc?6gI!gO6DFdz33Y^Bw= zd!~DR9s*4?u>kiQ_+LVI8POqDjoIujw-Lu?JMNlya}Ps-W0Aqp+OSTT+Lo<=WYb#|56ilXA8_J^3j- zZD1)OqRc(h-MidfQPO+toNAwEy1+AdR_?N=*yduHz;k$Bp0X!fS74=q7o>2+C$GYb z1f#O5w8B?jp|t0wjaS-V7FdlnGRKidJ>_k#j&h|LEvGqpcW{pNxr?UV;;tO$W_#qb zj!EVQY%;Kskjke`4HKxtW|=9nty|DwARsG6AAKv{kS~b=)<$eMuuUEpo%J2qDRpP2 zb+^D&cC)^Ny#|_OfwQB&5AVv^&hDKL;5`Ee3DLo$&G40$_a5c0p6XMZ3%rjH zjc~mRpiJqQ;IQKaP8#@vkSyniC$p)4 z$Cq+ycz=@_UkiMLb#hI3vTXsr75EPSkO#wWH1Gp{GVr4ekI3kVf5Oi0sxB?|j4Jh+ z_yxZjI3veIq*(A9{v~}8qcohAJ0b>0;&+@E5O~p!i@XGvq=+1<6KOIpa^wv*vJkAp z%1b>JK08*BRbUm;6tXcQQ$=EA+ISl|SZu7PYNn^kBqxO%)IlzfOx7bPQtpUMwMJ8{ zK{4{X$V9y(#YsohtyULxGAKb7L?!8olqCI8eavg9vq32;9hE0Oj0*ol7fNEIrj%BB za=f!lG*dT0-Blu6N~`lKOmb0AL8(f}Qsi})+gT!APzGhnzR?41&2+7x-qc6_5}i}H zg{~LWSNX+JG^47D50uN9XU7)0){aIRAZQ@o200ng0hsfS*;RjZ0TH&oo=LT zg9cxfz16Ot6<$kFD^yrC~1PAPeJP~{0<~f4q61Nny!ZX`9vfS(T1uY(F z8RDv0W*L0&;Cpt&lV8vR;-+FKsoV;dQPs-5pphO>mT`kgPLsB5tHbf)*=R zbeQU{9_KC@=AB;Yol#M&&hn6;hgDdVGe=bTN_}%eQEQ|}1udb!$c1rP=Hv9FK~E4; zWM+Iy7zdK1{4TDGt&x@rdYYb*9piJX%LF|~&&x^iaqiKyLeLA!X9o8|?sIpVywxf} zFSeoOE85F~R=1%|RPIJNBDZ2DCzH2o4)-H^RnTixE04qvvaT02lV-^n zR}(eM&sSZ8;?2)_5nqBdCcY*^}fAt z7W9oOw6JPlY0)%A`9DFY6~$4`?Yy9HM$t5nPg(YzpnoXKjB0mfIcrw3KM49!$(n`b z?zx_VDlhNxPx{56pJiTRFAJTa?Q%h4&o1=4pl!506!6w*tqEdgEQ(eXBqlrBqqgLTw(R_M?F{;wWwlA3>Ft{#Y5Kn!UA|~LLFpKB7m9z zmbbu{Hn9R7ck{C&!uXlTD#xG)ZbLte#f=z;KQVPwXe0P1p@3g`Pk1nc?NF$M4b*~Y zDkD9JN*Pô(S6%WQMcokN>##9~DkC)Wq^_HX5FiDB`)w9>4duBb>2T&itn|0Wg zv=w^-*uM*n{O(_aFiY)1osyUnz=x|Y9o1`t3a^}C0&jOGx*#9jFag)`+0+TrL;BHr zfWG*I%~1#Fi?uk+)@bOBBf$eG6K&AXBaD(YmN|+~Lv~vIJ^8v}-|Gij{C8{@nzQUG z05!`CIqw!oAN6z{1*l(WO%rBb5$ew#32F*Z z|15C@IzzCY21N{g5hGmAe1?|ETWFAr{rINK!H)plP=j=r@CWE7CeTeQk;Kbf&Op1p z+0x+?EVZt%0FA0aPV4S_F)*}C6EZUzX>@)DbLdv}xLrN&2yq+e&H&vtfnWFxy;{^P z!EUpTL z{@;ZnWa@tkh2mcJn%*`P{x-2tp$O^WP$=+UghFo#g^LSpih7h9W24rHOz1iN*&A8+YXu}3dMlU{|r`h4uu7vWv~3GCOO!2x{>4(i+SfxZ)m^gZ}Qf0sL} z>c0Egk=!&}yDy`b>w{6t^}(p+`e4*@eK1nJneQe20F`rZ_FIE+Iu@!6iHQ}AY(doy zMkbv44)RhZi+068x`(RZU>8rJYHs!pcJy83V>Tbmhk5dEJv;e%Yzo~K+BUu@A^^&1dsP@Nqlvof z18i%_;WA=voVHn}%WT5g^m-%(Xm&K+TNX|83kTWT6CCXcVlB2QT10Gs?u)Qb9^j01 z`dubh@5`_Ue+M{Srs}4#&SLIQ!M>NcD9&EEBxzBcqi{*AWl@|cT+)cfe3!|U9n0ce z)eUq%S6@~K_3~g1I=VUp=+ElqkpMlmiyjZqQ_=M7pm0}*kVQ3*$Ayiz!wCc zB1loEVCu^DVlQPVh1_M8rOPknEVNOq&1D2=&8mw(1%0Ku_bcfwFxJ{YuV0x`%8b5#rX|}9&`r1~-%1EjayISpuX5t2HGg6RcKwDLulkPRRqQ znr=giXkLq=L+N`Frq`x(_KeQhO*?8ZAY&`-s-r!t`KD!bOJ*JIT>~Q$PuFG!=s+EP zpx!96mKh%_n7yEuS01iGT*fXs9H67o^w$7=UZd9RQ>^3u5bt<^zG%-o8DgCb(3e-U z>gcOAutpTuX4DZ6F-D|ysDh^yyfsC^Z+TFPpAZ~JkoW-FQUDvkgveeNz<%eK$ zq;T4+?C9G@i>0NPbIQ=oGNV^#*T6Ph?J}1_++H{Q8*VU>p=r9NW`F*w*TRseaVq~m DwB7gG diff --git a/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForge.class b/bin/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForge.class index 042304f58165f028325e0cba477a690a559f0e69..e0efc34ee97b7aebb48e16f9b350bef88564e24c 100644 GIT binary patch delta 22 dcmey()x^D_kcpF{I5Q>HH?<^jb1@SKGXPp22POaj delta 15 WcmZqT{>`t-}`;L-}~&N-G`0D-R0%T2w*ycrQTn?-sAVynM!&<@tJ_2j*Xxr)O!EIK*$sF)-fo~G8)-SRBXmp1zUJP znIyGg8{e;#4*97|jJE^f`O zB@;AC;wN-GDOjptl{N-LZL<6Oe%0L(Kwnl8PDLwvQG zmeO0d!}w6Ba70H0M|rzC*fC>C43>NQ2@NOkrh=3Fgqp3kp_jqw%%018)lBO&!8@(v zExgUswLW{ zZqP#vde|XiCm@|>jaFbd2^m4NKtV#Nd}$5~S=9tFS{<&V7~x_^kRhf_S2yfYj5&hb z|78s#Wr3ljOd2VdPBJoJr@fG?$AsW!jH4Yx9`b3X0}?ukrxEl(PA>|ks!@!0cGyiF zcDW-Q#T1uA&558Wrw6m>EvL7#8}lNlcBrNZmY&7$uH#s_+@VIW%4s**9al8Vm5Tz5a$2E5~&}>!@|tR#PqmBl??M&TxY((4f8W% z=4Zss*L9t2kJ*=D!&5fwBWq$-UnidqI~1l!Nk*1D2vPlGCRCJ|(wV5|i82|~3q(;J5%wZ#sb*w$5BB3FGU{bA(29h=m`g#ypIAde!qn4a zNy>8i>&{0$O=+5}3^pEer{UBoxoN4URC5FeCR$Q0%0B2ebSDi+ilQggVm7wX_*OQy z$70(k-iY8-56*OBSOo98dXW1%K4K8w2g3c{FE)yL7424&xohYaUP~3~!AQC~vdD}) zG?1?w;YJf(ZGOy03s#|(u8<9c1`S8m812FrcNBcMNM?(|_TdsfH|pL;F)A}!hYw#8 xRYE=^_E$uT!uH{7EF|wKbgb~6LJCyi8{%3F@2QafMqUC-620SF`XK?|{R`e`y5s-= delta 1867 zcmZ8iYgANK6#fn~bMM?c2Sfs8R8U?zGoS;CLZSjPA}AY?{A;8&)(nJ=iFO4 z$L8xd|GIn?z*77e(}#1-VQ;X5A+4duyU*+HkN5-bWib+B)NUy!=>4J9QU>ygI5y8=!9d%GLGk+6S2hX?f>8?aGindc~t*sNlcSZ#Kgny^K5 zn~Q53(ZcZnwlXLKHK9oQ598qbeR@SR^C-!#vZp z6JDWPT*@wv4*0}M%aFAiT^!x;i))rLwp-k_IA>O4vyL7FCBY$vN{1M<%oWW_K~4|$ zaD=g!XzUK{^MzX?-f)B>s@2es{VMi}Q%Y&+01hxDhkd~gU${P48}{}R)oi;=_A!n_ z*vMe*3bgF<27H|wp1`1rsBo)gro(tr_*GBduczg6Myb3_bw!U-`HRs*r_s-G9KrMA zhFaYsJ-)zkRPt&gUPFENXst$!<3))l_j<#-YeV6!eI4G2Pe(P5aU7QxO5qC0T)$_ik~#6b{Jy}4u`Wr{H*2MDs)^x zoMQqBQKm0bF5@E=S45wlXZjdd#R+|bHi^$vd`dMc&MMhLwPl(<#}^{kR-s+Tmnv>B z6bU;kqDa3&nmB1Y6jhNXPXa}oBum|hnhM?Msm!Uj%X4P*bixdrYMgpAjh;!f8SW!( zHB5%heg)}mX|pDfc@gsrIopsITp)82a_Os659E;BTtxE>803Wx?X<5wvaoTK$j>s@DCQ-wd>j@3u8>Ws0COqCEIN?cQaPh)YJIkjj570B;Uub8Y6;XhMl#JKnaW54buPPB7)L|l7@FyA zrMGPqJK|`!Yo<6lucL_~?rF1YaReNh=1gS@pFl4~Os*)065BZX%oh>iJjxR|IEu$5 znvS7#Je7{8ZMHa`-DaWz2@Fd|Bl06iktv!C5^ITjz(G6bq>HJL?#9K`+;l4yV+%^? zYFLULScaV_MJJ($P=-O2V+a*^2CFbkS&yJ9YH(3!@D-b;f)d9GoHY1};S_DN+^-l; zlVmoeGbG89iQz2v8uAgmgqJChR|vI&{fQx!P85^3$uy}h!Zot`iG#FP%hlONi&FZW z6A5)iSsCUGOC0A`STn3=z|-+|%8Zl*-pR09&PnzBJykK(52n-vK8$0043|c+AdXLn z$BIk1#_%7q)=(7yHAJ0tA?dBj_N56o2;;j+Ov57coq9I#IYa#ZwQt+*G z2W~S++A$UWKP35alTwy->c`i(Wsu~@H#Ey+VBeA?>GI<{k}QUF8(tz#MY}ThQcm4*!|7kt| diff --git a/bin/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.class b/bin/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.class index 8e4d2cba802f6ad6ad746af5b7f1e7ad648b194e..7449d7c09da56fae436fed09e3d4bcda59aac2f1 100644 GIT binary patch delta 26 icmaDQ@j_z5W@b*-wEUvo|(uZkB6IcBU zlCIz<7&paQ6Bh>5l?yj+H1WM~WnB1HlzML4;D+4f-1GX*`Mx`I%X~ViKH0ke0Kfqn zuBqqs0TqNV8ouHi!MkW%PO^|GI)refn$kmhGMS9dd6C8s4L_?zJ)BTE*wWA>26{5K zGnFf*mk1*f(V8mQj+xIE>~zVx?3fFpX0|%w3b_aq%l`hsb~Y>al+D(%6(Gjs%BNe_5?b&R4sq7_=H-6XKZYb?%4waVF|IbF&YoEfKNTlu(3JrqzV*-Pl%p{|iZdkD%^0m&5zQshi@ zPJsGFDJT;BSbRCmoNzeBVvL={#H%;;vlO`VQEz%Gw;}TZVzCB3rDAo=A7gVa!REpt zDKSTL5MzNP8 z8T;`Ir}^8dJmEKd6}T7{!X|t?)Zp`nJqdAc?g2GC#>DtWjlGE8U>oYt(W* z4eI-^a1W}#IF9!?i4QH6i8hgrN~Y9NDLhumw1w9eDZIAG YF+@W&Kp}n>p;rcN@3lXox%&D=U!8qE pUOD+M%6Mv?@-0 2.0D) + { + return 1; + } + + if ((double)p_150071_2_ - d0 > 0.0D) + { + return 0; + } + } + + int l = MathHelper.floor_double((double)(p_150071_4_.rotationYaw * 4.0F / 360.0F) + 0.5D) & 3; + return l == 0 ? 2 : (l == 1 ? 5 : (l == 2 ? 3 : (l == 3 ? 4 : 0))); + } + @Override public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack p_149689_6_) { - if(!world.isRemote){ - world.setBlockMetadataWithNotify(x, y, z, (MathHelper.floor_double((player.rotationYaw * 4F) / 360F + 0.5D) & 3), 2); - System.out.println(world.getBlockMetadata(x, y, z)); - } + int l = determineOrientation(world, x, y, z, player); + world.setBlockMetadataWithNotify(x, y, z, l, 2); + System.out.println(world.getBlockMetadata(x, y, z)); + world.markBlockForUpdate(x, y, z); } @@ -98,35 +119,22 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ if(world.isRemote){ MovingObjectPosition mop = Minecraft.getMinecraft().renderViewEntity.rayTrace(5, 1.0F); c = (int)mop.sideHit; - Main.sNet.sendToServer(new MsgPacketForge((int) c)); - System.out.println("Client"); - System.out.println(c); - System.out.println(world.getBlockMetadata(x, y, z)); - } if(!world.isRemote){ - System.out.println("Server"); - System.out.println(c); - System.out.println(world.getBlockMetadata(x, y, z)); if(player.inventory.getCurrentItem()!=null){ if((player.inventory.getCurrentItem().getItem()==Item.getItemFromBlock(Blocks.torch))|| (player.inventory.getCurrentItem().getItem()==Items.flint_and_steel)|| (player.inventory.getCurrentItem().getItem()==ModItems.fireBow) ){ tileEnt.isOn=true; + System.out.println(tileEnt.isOn); } } - if(c==1){ + if(sideMeta==1){ if(player.inventory.getCurrentItem()!=null){ if(player.inventory.getCurrentItem().getItem()==Items.coal){ - if(tileEnt.getStackInSlot(1)==null){ - if(player.inventory.getCurrentItem()!=null){ - tileEnt.setInventorySlotContents(1, player.inventory.getCurrentItem()); - player.inventory.setInventorySlotContents(player.inventory.currentItem, null); - } - } if(tileEnt.getStackInSlot(1)!=null){ ItemStack pStack = player.inventory.getCurrentItem().copy(); ItemStack sStack = tileEnt.getStackInSlot(1).copy(); @@ -139,6 +147,10 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ } } } + if(tileEnt.getStackInSlot(1)==null){ + tileEnt.setInventorySlotContents(1, player.inventory.getCurrentItem()); + player.inventory.setInventorySlotContents(player.inventory.currentItem, null); + } } return true; } @@ -161,7 +173,7 @@ public class Forge extends BlockContainer implements TileForgePlaceables{ return true; } } - if(c!=0 && c!=1){ + if(sideMeta == world.getBlockMetadata(x, y, z)){ if(player.inventory.getCurrentItem()!=null){ if(tileEnt.getStackInSlot(0)==null){ System.out.println(); diff --git a/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForge.java b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForge.java index 9cd5962d..19fec3cc 100644 --- a/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForge.java +++ b/src/main/java/com/kitsu/medievalcraft/packethandle/forge/MsgHandleForge.java @@ -12,7 +12,7 @@ public class MsgHandleForge implements IMessageHandler @Override public IMessage onMessage(MsgPacketForge message, MessageContext ctx) { - Forge.c = message.caseType; + Forge.sideMeta = message.caseType; return null; } } diff --git a/src/main/java/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.java b/src/main/java/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.java index a0a17618..984b4e11 100644 --- a/src/main/java/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.java +++ b/src/main/java/com/kitsu/medievalcraft/renderer/blocks/machine/ForgeRenderer.java @@ -26,10 +26,8 @@ import cpw.mods.fml.client.FMLClientHandler; public class ForgeRenderer extends TileEntitySpecialRenderer { - private final Random rand = new Random(); - private double r = rand.nextDouble(); EntityItem entItem = null; - EntityItem entCoal = null; + EntityItem entItem1 = null; public static final ResourceLocation MODEL = new ResourceLocation("kitsumedievalcraft:models/SingleForge.obj"); public static final ResourceLocation TEXTURE = new ResourceLocation("kitsumedievalcraft:models/SingleForge.png"); @@ -44,6 +42,31 @@ public class ForgeRenderer extends TileEntitySpecialRenderer { renderBlock(tileEntity, tile.getWorldObj(), tile.xCoord,tile.yCoord, tile.zCoord, ModBlocks.forge); + if(tileEntity.getStackInSlot(1) != null){ + entItem1 = new EntityItem(tileEntity.getWorldObj(), x, y, z, tileEntity.getStackInSlot(1)); + GL11.glPushMatrix(); + this.entItem1.hoverStart = 0.0F; + RenderItem.renderInFrame = true; + GL11.glScalef(0.5f, 0.1f, 0.5f); + GL11.glRotatef(90, 1, 0, 0); + RenderManager.instance.renderEntityWithPosYaw(entItem1, 1.0D, 0.8D, -10.0D, 0.0F, 0.0F); + + RenderManager.instance.renderEntityWithPosYaw(entItem1, 1.25D, 1.0D, -10.0D, 0.0F, 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entItem1, 1.25D, 0.5D, -10.0D, 0.0F, 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entItem1, 0.7D, 0.6D, -10.0D, 0.0F, 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entItem1, 0.7D, 1.0D, -10.0D, 0.0F, 0.0F); + + RenderManager.instance.renderEntityWithPosYaw(entItem1, 1.5D, 0.75D, -10.0D, 0.0F, 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entItem1, 1.0D, 1.2D, -10.0D, 0.0F, 0.0F); + RenderManager.instance.renderEntityWithPosYaw(entItem1, 0.98D, 0.35D, -10.0D, 0.0F, 0.0F); + //RenderManager.instance.renderEntityWithPosYaw(entItem1, 0.5D, 0.7D, -10.0D, 0.0F, 0.0F); + + RenderItem.renderInFrame = false; + GL11.glPopMatrix(); + tileEntity.markForUpdate(); + tileEntity.markDirty(); + } + if(tileEntity.getStackInSlot(0) != null){ entItem = new EntityItem(tileEntity.getWorldObj(), x, y, z, tileEntity.getStackInSlot(0)); GL11.glPushMatrix(); @@ -54,10 +77,13 @@ public class ForgeRenderer extends TileEntitySpecialRenderer { RenderManager.instance.renderEntityWithPosYaw(entItem, 0.55D, 0.25D, 0.5D, 0.0F, 0.0F); RenderItem.renderInFrame = false; GL11.glPopMatrix(); + tileEntity.markForUpdate(); + tileEntity.markDirty(); } - tileEntity.markForUpdate(); - tileEntity.markDirty(); + + //tileEntity.markForUpdate(); + //tileEntity.markDirty(); GL11.glPopMatrix(); @@ -69,16 +95,17 @@ public class ForgeRenderer extends TileEntitySpecialRenderer { GL11.glScalef(scale, scale, scale); GL11.glTranslatef(1.0F, 1.0F, 1.0F); int dir = world.getBlockMetadata(i, j, k); - if(dir == 0){ - GL11.glRotated(90F, 0.0, 1.0F, 0.0F); + //System.out.println(dir); + if(dir == 4){ + GL11.glRotated(-180F, 0.0, 1.0F, 0.0F); } - if(dir == 1){ + if(dir == 5){ } if(dir == 2){ - GL11.glRotated(-90F, 0.0, 1.0F, 0.0F); + GL11.glRotated(90F, 0.0, 1.0F, 0.0F); } if(dir == 3){ - GL11.glRotated(180F, 0.0, 1.0F, 0.0F); + GL11.glRotated(-90F, 0.0, 1.0F, 0.0F); } FMLClientHandler.instance().getClient().renderEngine.bindTexture(TEXTURE); 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 cc640398..bcc39c44 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/ingots/TileIngotBase.java @@ -49,7 +49,7 @@ public class TileIngotBase extends TileEntity { private void coolDown(World world, int x, int y, int z){ if(!world.isRemote){ - if((world.getBlock(x, y-1, z)!=ModBlocks.firebox)&&(this.hot==true)){ + if((world.getBlock(x, y-1, z)!=ModBlocks.forge)&&(this.hot==true)){ coolTicks--; if(coolTicks <= 0){ this.hot=false; 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 13919160..bf9ca4f3 100644 --- a/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java +++ b/src/main/java/com/kitsu/medievalcraft/tileents/machine/TileForge.java @@ -1,7 +1,6 @@ package com.kitsu.medievalcraft.tileents.machine; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Items; import net.minecraft.inventory.IInventory; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -12,7 +11,8 @@ import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import com.kitsu.medievalcraft.block.ModBlocks; +import com.kitsu.medievalcraft.block.ingots.IngotBase; +import com.kitsu.medievalcraft.tileents.ingots.TileIngotBase; public class TileForge extends TileEntity implements IInventory{ private String tileForgeName; @@ -193,10 +193,7 @@ public class TileForge extends TileEntity implements IInventory{ int x = this.xCoord; int y = this.yCoord; int z = this.zCoord; - if(!world.isRemote){ - if(!world.isRemote){ - - } + heatIngot(world, x, y, z); /*if(world.getBlock(x, y+1, z).equals(Blocks.air)||this.getStackInSlot(0)==null){ this.isOn = false; } @@ -215,9 +212,22 @@ public class TileForge extends TileEntity implements IInventory{ //isFurnace(world, x, y, z); //isCrucible(world, x, y, z); //isIngot(world, x, y, z); - } + if (worldObj.isRemote) return; } + + private void heatIngot(World world, int x, int y, int z){ + if(!world.isRemote){ + if(world.getBlock(x, y+1, z) instanceof IngotBase){ + TileIngotBase tile = (TileIngotBase) world.getTileEntity(x, y+1, z); + if(tile.hot==false){ + tile.heatTicks--; + System.out.println(tile.hot); + System.out.println(tile.heatTicks); + } + } + } + } }