From e947ea0a8f698b218f4d10fec72e95039ed13029 Mon Sep 17 00:00:00 2001 From: aidancbrady Date: Sun, 11 Jun 2017 10:59:25 -0700 Subject: [PATCH] Updated IC2 API --- .../api/energy/prefab/BasicSinkSource.class | Bin 4800 -> 4751 bytes .../api/energy/prefab/BasicSinkSource.java | 16 ++++++-------- .../ic2/api/energy/prefab/BasicSource.class | Bin 4391 -> 4328 bytes .../ic2/api/energy/prefab/BasicSource.java | 10 ++++----- .../ic2/api/energy/tile/IEnergySource.java | 20 ++++++++++-------- 5 files changed, 22 insertions(+), 24 deletions(-) diff --git a/src/api/java/ic2/api/energy/prefab/BasicSinkSource.class b/src/api/java/ic2/api/energy/prefab/BasicSinkSource.class index ca5b5762556d8486fd5603424a10f9a92a18cf93..d81177d462e648d1ddc31412da21fee6ebe6dd07 100644 GIT binary patch literal 4751 zcmbtWS$Esk5&j@9kVr_jbF!qLM&%mpE1G#ulZ9jV!B`Y$s{DKqN%LA^{cz zt+@NX?`zto`|{Ltx|}*n`_RWe^f&di{pJE(1S2X>`@kV^acAcHX1RC%@vp!B4Zvmm zHiv0^Xawiri)f7?Ks%3n*v;|vB@y>!%ZEjLM7DfX#K&^@I6g6qPs;MAM0{GrXGDBf z#OFkOUc?tfd{M-gM0{CPY6Y8Y-g?#_l| z`x>;ehFr^Q`xQG}$Ufz`PH6{}y{fI@&%uPK@gc*n);^)AH$C!^}XSNU>rytqQS{Vo5`$>Fo;L(e=Qp?A)-L z3W$oz_cWX>bb&bTmS>g)b0By-^iI9*1|8qmuo#ckuIJaQ<{gm>F~n`g(QH`3wt2no zRd&|AR>w(3X=#{@Y4jV@kZO7i-TBy_1gkoJpyOo?`Ia3>FvI+&3t_$jmHtur)|dSw zH9IKT4a=?C)g_e^IxNgGf`;SXwJSkq@j{%j03^uIVs@0(BV};q3yVgC+tXpo)Tn~JK9(rVA909K30yph%g@kB_N-E%lAR%P4rh2Z&kFrC0|m}Lr8t_!8v7Z{k%?&<%sTQ-lhTWnD2DYhmBPjvpELF<#N} z69YfR&kWdDGEl{uZ2Y;1Ul^FjB?G_2B^|#q@N4{r$7Ff&a?HGe4cszt8+QymhvyBv zfcF}B5$`kbei0wQ2Mt(aeN(Jg7d7dt#W2Rd#K-WMicE&z6O z%%0p3W;rSko;Vt&589#nQo|$rdrOQwbj@fu*|8Kmp*5V^uiw{Z8qV$i_Hf^7n2py@ zA^`Rvt7W1C!Vd4Nkm{<<<7(J(TY=?P7?#QIWf5(QLc)DKTTaDn^gf2C+M3){Qr*4t zn!S1EfGbLnU5m5m3&S8ckk~LnxSduX>m7_YcwMn$8rDm^N(*wdr>8l%Ok)V=@d#yF z8h|rUT6%#0Q{e560_7~O|IOlDVGmmIc=`c`ipMh#koptS$1{IHW(ZGai?1R( zk$w3Uj1(ubuR{MLRZ=KYo<^4P8085VIEisg(8Xyyj!De%%T@K=#G`nOZ*;^jCY{R@ zdyN3)Ng$@xlYq?7!VwN_m#F(Dt{#QnW=yjjOvQks_HqOf>tB8%bwmBkeOog<5B zvN%r+7wB~6by+;||FF2y$KuI|#otMMgv{oPbC1sMG1QUQHYLT`;v~69*$k<&$*I*R$oPsvb|T!>MV7^NdgO$N z#jdS@B_c&K#mbyiu_#L@3XH^XvA{rxk5sQT$JOqqk)y2%lyC-1%GWuTuJl2tB&Q-@ zIhL^$-H>9Jh4xQOq==wIy|7!ZFa}b(V`IfXBgbF9_8N@ecUgsBpH*IraA)L&cP!o+ zS$U4ErD=@f^R!T?JV1V|XCsWv8d1MT*(oX(Mi;GtXHZtQ4ZJIAAOp|xDb3Xt+=#qL zlL^)gVGjK+2JucG#7r0BYL}?VAas=TJ!~Pr7Za6lVlDE#NPZIGyyADUMtx84QLAtX|tXZpgfo7=;YgS4|< zZB8#;?Uc%2ws>(5`Br-I+!-+r6lcR@yhGx-9yenE7IP(Cx5GRN%%<*C7xIi@ElpB+G%YMwfIn*Ra(Z)P3< literal 4800 zcmbtW`F9&v75>Ir#+JrO>c&Z2lhjL$Wx4INA#npPp|KTHf#amuNz+1su{4$^mS)6g z6gNQG_kE{8+4s_OSW_2%;2eJCZ{h&oeWT5jsZkF<=xXM@cklh~z2ALv|M~B~{T;v= zyqv)_f+0+yDdN@;cJW*mxA8%F{ZNMD!y=xSa~~1$QQ7#Ih>vIR34Bt-rv~w9+53!$ z&x-h*h|i1of`~7Q_>zb(i};F&uZmE1>0ugQ6Y+Hs-w^Rl5#JK=Z5`jy@m(D+==h$7 z!G`1RY&f>BK`Uy=G`yx?vcrXJ_;S_TRoev(>Bk(`2`*@u&#k(4VAdShF8S70Ukf?i1*Hq+8j8z>k>iD6CY{L#Dfnk-Cxv)lo zBEhii^>83n537Gq#SRK~&2r0j`I4#!9p~oA3Bz%3+NGeqcsd%n0&>Z1)>fEux3X9$ zh}Lk~@u}r_?uzf#nDIFHJzA`?Rr8usW&M^{4Xg_3lO?EbAcR8(AK}`Stu5Q{;>?tN zYqyOrnJWk-hefp~PI+J33^uIFnpLCeqq(`&o7OGMtXgixTn~JK9(rVf909K3G!N}> zgP5#`N~-c#Hg9S;d6&}uat@W9MrqsfCBUg@GM&J#nMDdk+r`4%GfYhT^yL3IEr*Ai z4K}Cr6Wfxh;F3|Y+-u#{A*A|(K112?)|NIjtVD6Un}Nw47Gv3~)mioOVl>e)N0?~ew#vdMWp<_?vqA;WUEXfG zJJ;N*XE74;h^raLy=7IMvK6onY0q6%d+BC9T*-vwS>atrvPABrhlDu>=J6u~Z^W#D z9AFd%x_*_T>`3$hHBlhGwVHR6N;T@!5@}Lu{Lp4nA?=mrR*T+V~@wTPNovmSP zzkW}{X_(l*cXtPCn2Rzg767}EygAVZVTWI>Fw`}h7uTTUHUi5nF)ibr&qwQ6DmkAvh}~r6<%s+kpS4z@Y*UP(H}FKXX6L|8x2I+#a<2 zXz~sQ@}sFcNaX*7OzxjWN}S+fJi>o@I)gV6f;_Pa30j^6a8f-91Q%3^7CI$Zz+-r;ieQ0zZ&M{$P{l|H8dVG_ z+JfRwS`}kdig6BURgA}VTx^H4gymK^7idVTna+=sNy3l;#gL3zeU!nTS8$Gnr#f)b zD6r<7jd7`C>v^(4_%KZ-j;kybg@!qDa4?@E0mVlmpCdiHR6M4r_Bb+FA_)sPNrO{Z zQBEgFSDNcMoo+eJV2me(hC;bCw1445f>7R$Ct6{hmsRc^Iz;Yg`7Wtm}0qO&T@*$Tsq5@C~3mXw*02-!}QSrwZ^un`+kA{tSp2TePoB(C9l3(bT4 zmvkgX4*wyN47W!$5h6HpQNHvo)ov#Da3rcc(xcq+OJz<7G0OM!r_9NsrThrXAk^2@ zy*v_)x!1Se0nVAErT#E!8Fu0P9_~FzJKfRdFw@aasQRVzvwJw&pEjqUIPKB?v^hS- zX&>u0N65V1xVy+XceS)lMjcXr562Hu?iP&mTAb?>UB({dnuA`9>#_b^a~h3veP4gB zInc(q9`DaJXVZ@B9;&?IAf9#;&Y?C=`(%H>ISqG!w{NOFoH|IkTP{w~G0OM%r_AX) WMtPz?Wlrre%9DL4Q_WX5PvgJj<$bvT diff --git a/src/api/java/ic2/api/energy/prefab/BasicSinkSource.java b/src/api/java/ic2/api/energy/prefab/BasicSinkSource.java index f9f936f6c..3936ca843 100644 --- a/src/api/java/ic2/api/energy/prefab/BasicSinkSource.java +++ b/src/api/java/ic2/api/energy/prefab/BasicSinkSource.java @@ -21,9 +21,9 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy this.sinkTier = sinkTier; this.sourceTier = sourceTier; - this.sourcePower = EnergyNet.instance.getPowerFromTier(sourceTier); + double power = EnergyNet.instance.getPowerFromTier(sourceTier); - if (getCapacity() < sourcePower) setCapacity(sourcePower); + if (getCapacity() < power) setCapacity(power); } public BasicSinkSource(ILocatable parent, double capacity, int sinkTier, int sourceTier) { @@ -31,9 +31,9 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy this.sinkTier = sinkTier; this.sourceTier = sourceTier; - this.sourcePower = EnergyNet.instance.getPowerFromTier(sourceTier); + double power = EnergyNet.instance.getPowerFromTier(sourceTier); - if (getCapacity() < sourcePower) setCapacity(sourcePower); + if (getCapacity() < power) setCapacity(power); } public BasicSinkSource(World world, BlockPos pos, double capacity, int sinkTier, int sourceTier) { @@ -41,9 +41,9 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy this.sinkTier = sinkTier; this.sourceTier = sourceTier; - this.sourcePower = EnergyNet.instance.getPowerFromTier(sourceTier); + double power = EnergyNet.instance.getPowerFromTier(sourceTier); - if (getCapacity() < sourcePower) setCapacity(sourcePower); + if (getCapacity() < power) setCapacity(power); } /** @@ -66,7 +66,6 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy if (getCapacity() < power) setCapacity(power); this.sourceTier = tier; - this.sourcePower = power; } // energy net interface >> @@ -90,7 +89,7 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy @Override public double getOfferedEnergy() { - return Math.min(energyStored, sourcePower); + return energyStored; } @Override @@ -112,5 +111,4 @@ public abstract class BasicSinkSource extends BasicEnergyTile implements IEnergy protected int sinkTier; protected int sourceTier; - protected double sourcePower; } diff --git a/src/api/java/ic2/api/energy/prefab/BasicSource.class b/src/api/java/ic2/api/energy/prefab/BasicSource.class index aa23817177762383bd48e39eacee79a5966dca8b..aec40ce5dd52174534324ca8f160c9d8ffcdf494 100644 GIT binary patch literal 4328 zcmb7GYj+e`72P-eN;;JRB4H9E5tu=`3x=A(@iAsZNkT9h0-6BM_@Yu>Ns4q=wbj*R z@HryPLww+i<#PGO$k;(;?f#KBrk0-x5aFUc|*({G2apMT`}Ji z^L;Tt5TgSz7JWCe z8lLYup}iJakym$JKk}kG)(Rgl>c{E1h3a(%mr}+@j~4v+Sm4xxO2&-?5sZyJoLiGj_{!mVno9LURg*X0Rp6jVwpDvw7KWY7#p6cNC^79TJ|u7FY|yHxjN%W)tuEy@Yoa zX3{Ec1!28r-4HvSBHX5eR>O`qteJY?Y+emo$s7d@QkYBudSfZ%ngK;Sk@Cq1TEb6C zc)*NXZWPP7qRX4F=vs}q4KHe4)RM0R3YWSPBz2HVTMMzr1;=rlQ4nS(bJ1@%=Bc&6 zK3#pC%7?DwdbdUGlO5Uii>WYF^9YK(z*qQaR%$&{C>&gOqbqA`Zs^uxc2uQOWs%FZ z(B9e^%2(#3CyRC?XiMXa5Y?*#A#8LRU0RJ+?DZwP!A?C~sV?5KZ`)Sg_SdcDD3q)e zhUvyic`?Q3>9l)QWauA*bPHTry`^w;4`_E`sX@!xu)}q-IFarrFLE2!0*!9p={eE4 zxZ{2NeZ0kasNLdPmG#ACN@X}?IJSSSJ33_7I&z8!^*q3==R?<>?JT7OY^FHOGP}X8 z#Xh@7hUwEqh;rSx@>a-HR)VFO6@~dUZ+|ti_=Uxo4H`|Btu~z&I>UuRhpt_l4}*pd zd$OOf?2M7XpWSHto7en$U^5do1V_uBf7`BmH9KM*ih;kVzZKifc%&S+&^*@$8?k4P zIxAgc-~@hZ;24gV@G}EH$1h5FXyBLlm4R7Tx z-C(&=_wk9#E4%&PSiPG>EDd+`-D^W!_M8|B&+g2a+Hn;ocH?`NiNdkn-}bIMg=)I~ znFP3oSncs05^j9<#HlX1+%E<_zZKcO!=xwE+gP$I(vN$?L@Gx2W4u*em6J!hv%CLt zZ5{3Iw~^vIC83#X10$Z&jS)i2SSa&*YTybQ)(cpr3?Lp14DJfnx=n<>)BX{|G9SV3qJ< zPUSczgkQ=eT>9XIJrdp|;W{VwIaBbSgwK6&!XNJvemNohn28NC3DZ1%rn-$mbF7d^ zT!?(>{>{m+o%nto&yqeIDSfM-vOtC2@HQ@!}TOr*+vqHA!B-813#i;gv z6J^|`!1vgI_ch&P>>5Vt(4EqRxcTC+uKs`~RD}8u#&ewevpAnH_&k3FJCOggSlxT{ zM0;GQdWEV4i9T_@$(u zN_xW?N$1=kMsd1Y+dg>8~+D|bTYI6 literal 4391 zcmbVOX?xt{6+IfyVvpq{q}d#k;KZ1W6+li%Q^1fmwqr0jPN6?@B8+lpLw3PJOo2O^au1e^=W(VD|u!t3p3@*mGtVK`<{F6d6$3v=O6zBa2#J0 zF^H8O+=5CEs_=T@qb8q^7ij`9b#V#BG~~zCB3AK4H?GOZlVbiL=8s~Y67#f}KZ&_6 z=FeiD5%a7V6^(HR@tm0F#k?TqMKLdldAWdB3V5}E*ED29*9kOe(;9L$e^tFtYRKQ` zdTw}1gHf9CoY1Vgo?{2rVrYhL#c{mQ4X>H=d_ALH$0nyoE;87JUv@NXpP~0`qq^V( z^VULzBRgk&+p1i&0$0A{!ECtf)-?>xxb|_=s=21)Il-<%eXq40~d>HpsU z1-zkQJXx7lKd6+=OJc_oBpa-nS+&AtbG+i)E9d=sJV#D}Gz=sF?Xfg;)qED}aKa}g zXaR2)@D?+!J7HA1dDY%*N%g1Csk&kPj4JcIui=4K3F6vIcg^X@AOHO!hanT8!a>R~R zDUDF6#d2V+t`B8PlcK}CRrMPpmOi4|>p%#FE~B#x;k>mpYgMVvU8RwkE7n!ZtXSTX zITr?!m4;rru~TkD@m4x*TnQ=lk3dQS=N7JLIIsz{v9YW{-CnkWC9*i2)RP-JRdbp~ z$#-m0>YQKqKJ)|L;@s1ybA8I1;?iVgIHcQ_ccC@fW0jlb6c5&OJF}h&9A~1re6~|e zQJ6WZ!6`>R8%KKS(?Uq)T3^N0fT_&;v*Ys`rjoq9h0x?5He} z*9L{ywlCc&s?l*9-qvv#Lj}B}<6XR0!23Erz=t|+#juXwV@k*G@Sr$;B<5ospJ2Fv zPj!5T&oykDo;cnXRmUvO={S!^bo>%?I_7af$3oX>{Uk&{m z@oj5H!{Ek$n-`&mk)#+>32;HN_50RIIMLw~r8?_y^XPWHdT4nzlO9O!Y4H|GKW-HL zi5RV)(Y|$F&Q+0WYcu9TJJ8yE69tHvola)aR)*9qIdQ&7c6yZ6`nuiL+U3sjFrxf< zuJhn8O>*hu5HBBtV26=GR`kpZOjab!=K#lV!x7pNzrNsjj!)A#T3UlP_fnG0OLwp#7H)*#eFgaJ)+#h3j3ZT)TfPSC?E@$hAVQ9;fra zm+Og6x&E}t^<>QTOO_>1{-egx+eg;WW9-hY7dH3*6gEHsA^Ol@-&R?`CluKes_3K5 z!j9r+xLc7O#XY!J6?T-~!)y{cCw#b=gZ~r0+U2&ID;u#k@`udC0Lyr zE{cx7Mekn|ao<*P^~f)d%gYrWjAKl&@WQCqc$7hoEZsm+iV#sNs=9x`#6DDE_NedP zCcR!vvm?Br;~_j82Q<|;xXQjpCYj}@ZESLJm@H;+HU{4jgS&R>e`~Uc3iOvYXjcT? zaavBJP4ljyFA2WX29D^TyUBF6%sM*T7cbR=ar9O99{98JIW36!3x0z`R+efDd*6Cd^ek H&z1iHDPv2h diff --git a/src/api/java/ic2/api/energy/prefab/BasicSource.java b/src/api/java/ic2/api/energy/prefab/BasicSource.java index 41ca69209..9efba8de7 100644 --- a/src/api/java/ic2/api/energy/prefab/BasicSource.java +++ b/src/api/java/ic2/api/energy/prefab/BasicSource.java @@ -96,7 +96,7 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource { super(parent, capacity); this.tier = tier; - this.power = EnergyNet.instance.getPowerFromTier(tier); + double power = EnergyNet.instance.getPowerFromTier(tier); if (getCapacity() < power) setCapacity(power); } @@ -105,7 +105,7 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource { super(parent, capacity); this.tier = tier; - this.power = EnergyNet.instance.getPowerFromTier(tier); + double power = EnergyNet.instance.getPowerFromTier(tier); if (getCapacity() < power) setCapacity(power); } @@ -114,7 +114,7 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource { super(world, pos, capacity); this.tier = tier; - this.power = EnergyNet.instance.getPowerFromTier(tier); + double power = EnergyNet.instance.getPowerFromTier(tier); if (getCapacity() < power) setCapacity(power); } @@ -130,7 +130,6 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource { if (getCapacity() < power) setCapacity(power); this.tier = tier; - this.power = power; } // energy net interface >> @@ -142,7 +141,7 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource { @Override public double getOfferedEnergy() { - return Math.min(energyStored, power); + return energyStored; } @Override @@ -163,5 +162,4 @@ public class BasicSource extends BasicEnergyTile implements IEnergySource { } protected int tier; - protected double power; } diff --git a/src/api/java/ic2/api/energy/tile/IEnergySource.java b/src/api/java/ic2/api/energy/tile/IEnergySource.java index 44b952a56..03c1ebd0f 100644 --- a/src/api/java/ic2/api/energy/tile/IEnergySource.java +++ b/src/api/java/ic2/api/energy/tile/IEnergySource.java @@ -2,25 +2,27 @@ package ic2.api.energy.tile; /** * Allows a tile entity (mostly a generator) to emit energy. - * + * * See ic2/api/energy/usage.txt for an overall description of the energy net api. */ public interface IEnergySource extends IEnergyEmitter { /** - * Energy output provided by the source this tick. - * This is typically Math.min(stored energy, max output/tick). - * + * Maximum energy output provided by the source this tick, typically the stored energy. + * + *

The value will be limited to the source tier's power multiplied with the packet count + * (see {@link IMultiEnergySource}, default 1). + * * @note Modifying the energy net from this method is disallowed. - * + * * @return Energy offered this tick */ double getOfferedEnergy(); /** * Draw energy from this source's buffer. - * - * If the source doesn't have a buffer, this is a no-op. - * + * + *

If the source doesn't have a buffer, this may be a no-op. + * * @param amount amount of EU to draw, may be negative */ void drawEnergy(double amount); @@ -28,7 +30,7 @@ public interface IEnergySource extends IEnergyEmitter { /** * Determine the tier of this energy source. * 1 = LV, 2 = MV, 3 = HV, 4 = EV etc. - * + * * @note Modifying the energy net from this method is disallowed. * * @return tier of this energy source