From feafee9fab2b83d9f67741bde5a1e07920106cfe Mon Sep 17 00:00:00 2001 From: hilburn Date: Sun, 7 Dec 2014 22:21:16 +0000 Subject: [PATCH] RF Node Update --- build.properties | 2 +- .../tileentities/TileEntityRFNode.java | 24 +++++++++++++++--- .../stevesaddons/textures/blocks/cable_rf.png | Bin 0 -> 3375 bytes 3 files changed, 22 insertions(+), 4 deletions(-) create mode 100644 src/main/resources/assets/stevesaddons/textures/blocks/cable_rf.png diff --git a/build.properties b/build.properties index fe94e15..ef7c143 100644 --- a/build.properties +++ b/build.properties @@ -4,5 +4,5 @@ version.forge=10.13.2.1231 version.minecraft=1.7.10 version.mod.major=0 version.mod.minor=5 -version.mod.revis=2 +version.mod.revis=4 version.nei=1.0.3.62 \ No newline at end of file diff --git a/src/main/java/stevesaddons/tileentities/TileEntityRFNode.java b/src/main/java/stevesaddons/tileentities/TileEntityRFNode.java index 213fc04..9ebc257 100644 --- a/src/main/java/stevesaddons/tileentities/TileEntityRFNode.java +++ b/src/main/java/stevesaddons/tileentities/TileEntityRFNode.java @@ -51,7 +51,11 @@ private void loadManagers() { TileEntity te = worldObj.getTileEntity(manager.getX(), manager.getY(), manager.getZ()); if (te instanceof TileEntityManager) - managers.add((TileEntityManager) te); + { + TileEntityManager tileEntityManager = (TileEntityManager) te; + tileEntityManager.updateInventories(); + managers.add(tileEntityManager); + } } } addManagers=null; @@ -198,9 +202,16 @@ public int receiveEnergy(ForgeDirection from, int maxReceive, boolean simulate) if (from != ForgeDirection.UNKNOWN) { if (!inputSides[from.ordinal()]) return 0; + Set outputs = new HashSet(); + int outputPacket = toReceive/connections.size(); for (TileEntityRFNode connected : connections) { - toReceive-=connected.receiveEnergy(ForgeDirection.UNKNOWN,toReceive,simulate); + if (connected.receiveEnergy(ForgeDirection.UNKNOWN,outputPacket,true)>0) outputs.add(connected); + } + outputPacket = maxReceive/outputs.size(); + for (TileEntityRFNode connected : outputs) + { + toReceive-=connected.receiveEnergy(ForgeDirection.UNKNOWN,outputPacket,simulate); if (toReceive==0) return maxReceive; } } @@ -229,9 +240,16 @@ public int extractEnergy(ForgeDirection from, int maxExtract, boolean simulate) if (from != ForgeDirection.UNKNOWN) { if (!outputSides[from.ordinal()]) return 0; + int outputPacket = toExtract/connections.size(); + Set inputs = new HashSet(); for (TileEntityRFNode connected : connections) { - toExtract-=connected.extractEnergy(ForgeDirection.UNKNOWN,toExtract,simulate); + if (connected.extractEnergy(ForgeDirection.UNKNOWN,outputPacket,true)>0) inputs.add(connected); + } + outputPacket = toExtract/inputs.size(); + for (TileEntityRFNode connected : inputs) + { + toExtract-=connected.extractEnergy(ForgeDirection.UNKNOWN,outputPacket,simulate); if (toExtract==0) return maxExtract; } } diff --git a/src/main/resources/assets/stevesaddons/textures/blocks/cable_rf.png b/src/main/resources/assets/stevesaddons/textures/blocks/cable_rf.png new file mode 100644 index 0000000000000000000000000000000000000000..d3f39e672f101eeaefa381cab99b3ef830b662e2 GIT binary patch literal 3375 zcmV+~4bbw5P)KLZ*U+IBfRsybQWXdwQbLP>6pAqfylh#{fb6;Z(vMMVS~$e@S=j*ftg6;Uhf59&ghTmgWD0l;*T zI709Y^p6lP1rIRMx#05C~cW=H_Aw*bJ-5DT&Z2n+x)QHX^p z00esgV8|mQcmRZ%02D^@S3L16t`O%c004NIvOKvYIYoh62rY33S640`D9%Y2D-rV&neh&#Q1i z007~1e$oCcFS8neI|hJl{-P!B1ZZ9hpmq0)X0i`JwE&>$+E?>%_LC6RbVIkUx0b+_+BaR3cnT7Zv!AJxW zizFb)h!jyGOOZ85F;a?DAXP{m@;!0_IfqH8(HlgRxt7s3}k3K`kFu>>-2Q$QMFfPW!La{h336o>X zu_CMttHv6zR;&ZNiS=X8v3CR#fknUxHUxJ0uoBa_M6WNWeqIg~6QE69c9o#eyhGvpiOA@W-aonk<7r1(?fC{oI5N*U!4 zfg=2N-7=cNnjjOr{yriy6mMFgG#l znCF=fnQv8CDz++o6_Lscl}eQ+l^ZHARH>?_s@|##Rr6KLRFA1%Q+=*RRWnoLsR`7U zt5vFIcfW3@?wFpwUVxrVZ>QdQz32KIeJ}k~{cZZE^+ya? z2D1z#2HOnI7(B%_ac?{wFUQ;QQA1tBKtrWrm0_3Rgps+?Jfqb{jYbcQX~taRB;#$y zZN{S}1|}gUOHJxc?wV3fxuz+mJ4`!F$IZ;mqRrNsHJd##*D~ju=bP7?-?v~|cv>vB zsJ6IeNwVZxrdjT`yl#bBIa#GxRa#xMMy;K#CDyyGyQdMSxlWT#tDe?p!?5wT$+oGt z8L;Kp2HUQ-ZMJ=3XJQv;x5ci*?vuTfeY$;({XGW_huIFR9a(?@3)XSs8O^N5RyOM=TTmp(3=8^+zpz2r)C z^>JO{deZfso3oq3?Wo(Y?l$ge?uXo;%ru`Vo>?<<(8I_>;8Eq#KMS9gFl*neeosSB zfoHYnBQIkwkyowPu(zdms`p{<7e4kra-ZWq<2*OsGTvEV%s0Td$hXT+!*8Bnh2KMe zBmZRodjHV?r+_5^X9J0WL4jKW`}lf%A-|44I@@LTvf1rHjG(ze6+w@Jt%Bvjts!X0 z?2xS?_ve_-kiKB_KiJlZ$9G`c^=E@oNG)mWWaNo-3TIW8)$Hg0Ub-~8?KhvJ>$ z3*&nim@mj(aCxE5!t{lw7O5^0EIO7zOo&c6l<+|iDySBWCGrz@C5{St!X3hAA}`T4 z(TLbXTq+(;@<=L8dXnssyft|w#WSTW<++3>sgS%(4NTpeI-VAqb|7ssJvzNHgOZVu zaYCvgO_R1~>SyL=cFU|~g|hy|Zi}}s9+d~lYqOB71z9Z$wnC=pR9Yz4DhIM>Wmjgu z&56o6maCpC&F##y%G;1PobR9i?GnNg;gYtchD%p19a!eQtZF&3JaKv33gZ<8D~47E ztUS1iwkmDaPpj=$m#%)jCVEY4fnLGNg2A-`YwHVD3gv};>)hAvT~AmqS>Lr``i7kw zJ{5_It`yrBmlc25DBO7E8;5VoznR>Ww5hAaxn$2~(q`%A-YuS64wkBy=9dm`4cXeX z4c}I@?e+FW+b@^RDBHV(wnMq2zdX3SWv9u`%{xC-q*U}&`cyXV(%rRT*Z6MH?i+i& z_B8C(+grT%{XWUQ+f@NoP1R=AW&26{v-dx)iK^-Nmiuj8txj!m?Z*Ss1N{dh4z}01 z)YTo*JycSU)+_5r4#yw9{+;i4Ee$peRgIj+;v;ZGdF1K$3E%e~4LaI(jC-u%2h$&R z9cLXcYC@Xwnns&bn)_Q~Te?roKGD|d-g^8;+aC{{G(1^(O7m37Y1-+6)01cN&y1aw zoqc{T`P^XJqPBbIW6s}d4{z_f5Om?vMgNQEJG?v2T=KYd^0M3I6IZxbny)%vZR&LD zJpPl@Psh8QyPB@KTx+@RdcC!KX7}kEo;S|j^u2lU7XQ}Oo;f|;z4Ll+_r>@1-xl3| zawq-H%e&ckC+@AhPrP6BKT#_XdT7&;F71j}Joy zkC~6lh7E@6o;W@^IpRNZ{ptLtL(gQ-CY~4mqW;US7Zxvm_|@yz&e53Bp_lTPlfP|z zrTyx_>lv@x#=^!PzR7qqF<$gm`|ZJZ+;<)Cqu&ot2z=0000WV@Og>004R=004l4008;_004mL004C`008P>0026e000+nl3&F} z00077Nkl5^IPvFS_>+wv~7#KkIn{6r;{-eu#`}dQKl*P z_xDG}DvG*~=v~**G!1{@eDbQ}i|&N$tHS!K^5W?Q^Of?;`i4>pW_DzqRP;zIB1kE* z`!l%sdP4K}gs$y)vJ!^3ld)|n9p#ED2@!JB5E0ZvMNRo_ze9ihz;~Z6QB!{W`7Oy3 zIp?GMIcEfr%jGH_8FVKdM9{V^+wGQV+oB&Q@3BiF!p+T^zVAsXkyH|=i*rNYX<-T002ovPDHLk FV1gv9OZ@-< literal 0 HcmV?d00001