From 32bbec84f37b01555397a18738ed4394383e9d13 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Fri, 2 Nov 2018 20:34:26 +0100 Subject: [PATCH] new missile part textures, analyzer, battery fix, stray safes --- assets/hbm/lang/de_DE.lang | 6 +- assets/hbm/lang/en_US.lang | 6 +- assets/hbm/textures/items/analyzer.png | Bin 0 -> 225 bytes assets/hbm/textures/items/fuel_tank_large.png | Bin 230 -> 269 bytes .../textures/items/fuel_tank_large_alt.png | Bin 0 -> 203 bytes .../hbm/textures/items/fuel_tank_medium.png | Bin 277 -> 362 bytes .../textures/items/fuel_tank_medium_alt.png | Bin 0 -> 278 bytes assets/hbm/textures/items/fuel_tank_small.png | Bin 285 -> 292 bytes .../textures/items/fuel_tank_small_alt.png | Bin 0 -> 291 bytes .../hbm/textures/items/grenade_if_antioch.png | Bin 0 -> 326 bytes .../textures/items/grenade_if_antioch_alt.png | Bin 0 -> 341 bytes assets/hbm/textures/items/plan_c.png | Bin 245 -> 207 bytes assets/hbm/textures/items/plan_c_alt.png | Bin 0 -> 245 bytes assets/hbm/textures/items/thruster_large.png | Bin 288 -> 461 bytes .../hbm/textures/items/thruster_large_alt.png | Bin 0 -> 288 bytes assets/hbm/textures/items/thruster_medium.png | Bin 272 -> 399 bytes .../textures/items/thruster_medium_alt.png | Bin 0 -> 272 bytes assets/hbm/textures/items/thruster_small.png | Bin 263 -> 326 bytes .../hbm/textures/items/thruster_small_alt.png | Bin 0 -> 263 bytes assets/hbm/textures/items/warhead_mirv.png | Bin 187 -> 256 bytes .../hbm/textures/items/warhead_mirv_alt.png | Bin 0 -> 187 bytes assets/hbm/textures/items/warhead_nuclear.png | Bin 240 -> 276 bytes .../textures/items/warhead_thermo_endo.png | Bin 231 -> 249 bytes .../items/warhead_thermo_endo_alt.png | Bin 0 -> 231 bytes .../hbm/textures/items/warhead_thermo_exo.png | Bin 231 -> 246 bytes .../textures/items/warhead_thermo_exo_alt.png | Bin 0 -> 231 bytes com/hbm/blocks/ModBlocks.java | 15 +- com/hbm/blocks/machine/MachineBattery.java | 16 +- .../blocks/machine/MachineTransformer.java | 19 ++- com/hbm/handler/FluidTypeHandler.java | 2 +- com/hbm/interfaces/IFluidAcceptor.java | 8 +- com/hbm/interfaces/IFluidContainer.java | 11 ++ com/hbm/interfaces/IFluidDuct.java | 4 + com/hbm/interfaces/IFluidSource.java | 4 +- com/hbm/inventory/MachineRecipes.java | 8 +- .../gui/GUIScreenTemplateFolder.java | 2 +- com/hbm/items/ModItems.java | 3 + com/hbm/items/tool/ItemAnalyzer.java | 137 ++++++++++++++++++ com/hbm/items/tool/ItemAssemblyTemplate.java | 12 +- com/hbm/items/weapon/ItemClip.java | 4 + com/hbm/lib/HbmChestContents.java | 76 ++++++++++ com/hbm/lib/HbmWorldGen.java | 56 ++++++- com/hbm/lib/Library.java | 37 +++-- com/hbm/main/CraftingManager.java | 18 ++- com/hbm/main/MainRegistry.java | 6 + .../conductor/TileEntityFluidDuct.java | 5 + .../conductor/TileEntityGasDuct.java | 5 + .../conductor/TileEntityGasDuctSolid.java | 5 + .../conductor/TileEntityOilDuct.java | 5 + .../conductor/TileEntityOilDuctSolid.java | 5 + .../tileentity/machine/TileEntityAMSBase.java | 17 ++- .../machine/TileEntityAMSEmitter.java | 17 ++- .../machine/TileEntityAMSLimiter.java | 14 +- .../machine/TileEntityFWatzCore.java | 16 +- .../machine/TileEntityFusionMultiblock.java | 16 +- .../machine/TileEntityLockableBase.java | 8 + .../machine/TileEntityMachineBattery.java | 15 +- .../machine/TileEntityMachineCMBFactory.java | 17 ++- .../machine/TileEntityMachineChemplant.java | 39 ++--- .../machine/TileEntityMachineCoal.java | 14 +- .../machine/TileEntityMachineDiesel.java | 14 +- .../machine/TileEntityMachineFluidTank.java | 19 +-- .../machine/TileEntityMachineGasCent.java | 14 +- .../machine/TileEntityMachineGasFlare.java | 14 +- .../machine/TileEntityMachineGenerator.java | 15 +- .../machine/TileEntityMachineInserter.java | 38 ++--- .../machine/TileEntityMachineOilWell.java | 13 +- .../machine/TileEntityMachinePuF6Tank.java | 22 +++ .../machine/TileEntityMachinePumpjack.java | 13 +- .../TileEntityMachineReactorSmall.java | 15 +- .../machine/TileEntityMachineRefinery.java | 40 ++--- .../TileEntityMachineSeleniumEngine.java | 14 +- .../machine/TileEntityMachineTransformer.java | 44 +++++- .../machine/TileEntityMachineTurbofan.java | 14 +- .../machine/TileEntityMachineUF6Tank.java | 22 +++ .../machine/TileEntityReactorMultiblock.java | 15 +- .../machine/TileEntityWatzCore.java | 12 +- 77 files changed, 775 insertions(+), 211 deletions(-) create mode 100644 assets/hbm/textures/items/analyzer.png create mode 100644 assets/hbm/textures/items/fuel_tank_large_alt.png create mode 100644 assets/hbm/textures/items/fuel_tank_medium_alt.png create mode 100644 assets/hbm/textures/items/fuel_tank_small_alt.png create mode 100644 assets/hbm/textures/items/grenade_if_antioch.png create mode 100644 assets/hbm/textures/items/grenade_if_antioch_alt.png create mode 100644 assets/hbm/textures/items/plan_c_alt.png create mode 100644 assets/hbm/textures/items/thruster_large_alt.png create mode 100644 assets/hbm/textures/items/thruster_medium_alt.png create mode 100644 assets/hbm/textures/items/thruster_small_alt.png create mode 100644 assets/hbm/textures/items/warhead_mirv_alt.png create mode 100644 assets/hbm/textures/items/warhead_thermo_endo_alt.png create mode 100644 assets/hbm/textures/items/warhead_thermo_exo_alt.png create mode 100644 com/hbm/items/tool/ItemAnalyzer.java diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index a261b4444..979cc0cd5 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -1505,6 +1505,7 @@ item.thruster_large.name=Großes Raketentriebwerk item.wand_k.name=Konstruktions-Zauberstab item.wand_s.name=Struktur-Zauberstab item.wand_d.name=Debug-Zauberstab +item.analyzer.name=Analysierer item.screwdriver.name=Schraubenzieher item.overfuse.name=Singularitätsschraubenzieher @@ -1576,7 +1577,10 @@ item.cape_ayy.name=Ayys Cape tile.machine_converter_he_rf.name=HE zu RF Konverter tile.machine_converter_rf_he.name=RF zu HE Konverter -tile.machine_transformer.name=Transformator +tile.machine_transformer.name=10k-20Hz-Transformator +tile.machine_transformer_dnt.name=DNT-20Hz-Transformator +tile.machine_transformer_20.name=10k-1Hz-Transformator +tile.machine_transformer_dnt_20.name=DNT-1Hz-Transformator tile.vent_chlorine.name=Chlorgas-Auslass tile.vent_cloud.name=Wolken-Auslass diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index a3ec2e672..c89004653 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -1505,6 +1505,7 @@ item.thruster_large.name=Large Thruster item.wand_k.name=Construction Wand item.wand_s.name=Structure Wand item.wand_d.name=Debug Wand +item.analyzer.name=Analyzer item.screwdriver.name=Screwdriver item.overfuse.name=Singularity Screwdriver @@ -1576,7 +1577,10 @@ item.cape_ayy.name=Ayy's Cape tile.machine_converter_he_rf.name=HE to RF Converter tile.machine_converter_rf_he.name=RF to HE Converter -tile.machine_transformer.name=Transformer +tile.machine_transformer.name=10k-20Hz Transformer +tile.machine_transformer_dnt.name=DNT-20Hz Transformer +tile.machine_transformer_20.name=10k-1Hz Transformer +tile.machine_transformer_dnt_20.name=DNT-1Hz Transformer tile.vent_chlorine.name=Chlorine Vent tile.vent_cloud.name=Cloud Vent diff --git a/assets/hbm/textures/items/analyzer.png b/assets/hbm/textures/items/analyzer.png new file mode 100644 index 0000000000000000000000000000000000000000..3e8428316072b1417cbb724d6c87ac9aceb338d8 GIT binary patch literal 225 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfh|FkDO zhb@E|4yCu2dq44KD!Jg*{A%+n#Wf$^AHMTdxLEf6)vYsCg7ZW9zA0%cB{?2#crJEr zfl}#T7wgTr@*X*f66vq*=g($uNLH@m7IbLe8|@N)=3XPO`m*1=JB0c|YBaWA5|>&X Vp2QZqBM<0C22WQ%mvv4FO#lEpQ|kZ# literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/fuel_tank_large.png b/assets/hbm/textures/items/fuel_tank_large.png index f643d11fcff43aac6a1e7708f5fcb3b0656d14a7..1a6b4cb1b030ef808573c800921c2c4b076ae720 100644 GIT binary patch delta 240 zcmV0gVEXC4X~5NmK|32nc)#WQYI&0K`c|K~y-6rIS4h!!QhmUrPwsS#qcz zq+8c4S$dQV9(tEfg`OjGAaZQgBvVU`Wk~P?FS7jc^kbkFa>vZo@*9cUqgr>mdKI;Vst01%r? A*8l(j diff --git a/assets/hbm/textures/items/fuel_tank_large_alt.png b/assets/hbm/textures/items/fuel_tank_large_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..198a444303934539787a00b8e1a685db8de72dce GIT binary patch literal 203 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf-8&u1Tv>^PcC5`BeK6c3sQdd=K= zZRaDK@FYRSr7Q-~*|$aCZxmwgF$@S@q%xh2;T@mDIZ5O0jE#*Q58lm?TqPydA}yn~ yp7)-AK?uV?(Ym08-}lYcc3HmX$lUZ_64osnoe~VXMT&v0VeoYIb6Mw<&;$UzUq-+H literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/fuel_tank_medium.png b/assets/hbm/textures/items/fuel_tank_medium.png index b47f324e03b46861b866b5f79b8d284b95a411d2..a7cd568d9e00437189813e6521828d401e8dc9e3 100644 GIT binary patch delta 334 zcmV-U0kQs-0_p;gC4X~5NmK|32nc)#WQYI&0U=35K~y-6rIRs^gD?<9Usel=AcE7- zr{yeZxD0Jd3cB1NW$M%v2vO1)fn^L*wsI5;qm7i`+4JXV{56Izwc9FWS@xXgnR%XB zmW9jZ;`FXAvn+dho`>go_`VN-)|$3$S(b&OD0Z8G^ZERY zs;Vf<^40hA4hVt(DJA1LqO~SXQ-l!QZa3PtrLJoZhl4e-1u&2>43SbIgdj;0lu|TJ zvuXzTbp>NUCd6r)oXyS&T-xvVn>7p2_x-=HaU8b+Q54blJwgb}G))r#!!Qtrp;cRD z5JeHb@6&bNYe$KUj>n^Qb^_i(Cd7|3kWxBL<_Q2wsck@>=R31V?=ll8rK~N44?ol6 g@!)>HZ+gGd9~9JC7b14RX#?gROuk;~OV4LM&OXx9FLy~TU~$q~z#OG$uchF?X(;>PfS7W$eVy_7+4H_#&U()B zf67VTHCxpkLPHsP9?!6;J}>FY(y%P^&kLW%dkoiZU6$V4mbhSD_O5li9TZi(7OeWg za(dH+@3st|ZI;IgFxN1J9)Edw1s1g~ae58(7=x#)pUXO@geCwU+HZpZ literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/fuel_tank_small.png b/assets/hbm/textures/items/fuel_tank_small.png index 2b0f3a17db3f2f20a295d0f69badf70f9c763b4e..d2ac3f1dc23f5c12e3394d6df8f0d8dc2b3e41f9 100644 GIT binary patch delta 264 zcmV+j0r&o$0;B?vC4X~5NmK|32nc)#WQYI&0NY7KK~y-6&5H|S8~`H1 zzVD=I8l(*tye@fVmSu=Y;Ei_BwyoD%HGfs4gltP4zy)iV%9K$wbrle%9-Fe zj!zav!8A>mnIOUa`%WZD5-l-$LRD3PR+i<@PJmx1vFp0P7#sc{cmlSpa40@wfm O002ovPDHLkU;%=QWpttd delta 256 zcmV+b0ssD_0-XYoC4Xl@O+f$vv5yPRWM*{v^@!h;CnIc%Hv*z*Ct;Ivj5tGMw10000UeDU3)9e>HEig2+V4lxG^Z#?1V$?qdbA9+J m_eW&kKcBG27HZk~FL_s_h46{l{xAjllEKr}&t;ucLK6Vx^KPyH literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/grenade_if_antioch.png b/assets/hbm/textures/items/grenade_if_antioch.png new file mode 100644 index 0000000000000000000000000000000000000000..f615dd11bde196d7bbf80d6ab9dbc45fde9df763 GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJtM=93Yk-Zine*WIEGmGCnrdlEU=mL(Efzs&wm0^;y?cXw`b-^W_|zp(}yg!%qGc( zM1eD`22x8Zg82{E3&aJnA2f)b$b0aW&;&(=^>5~L9yD-vcoh8kW3^z8f`=l9vNVGc zONz!O?+v&3E|t_RWsrD&ZBMH-laatPp*`ywZgLqh9BHd$bxG#t=LtW+0#LT=By}Z;C1rt33 zJtM=93Yk-ZijI1^IEGmGFP&`2#bhYpTD*Q|r})h<#}saV#WJ(F162p3Hf;IMG)=kx z!}Jt$&ZMryX*vI9&!4F>Bl1P3o?&bHfu|Yg4pqt*>)x>y_%%QGOJPQrAm@TTMGERU zb$8En9ye`UwQRzoPz9N%wf%}5uPLYr<~=mdI*!PC{xWt~$(697GnfoA{! literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/plan_c.png b/assets/hbm/textures/items/plan_c.png index 0a44d83179874a478d27c7c7577f3e954de57015..ee5d88d0dfcb8a7d1bdbacc63b8f55282796f15d 100644 GIT binary patch delta 163 zcmV;U09^m|0nY)DG=GLkL_t(IjqTB~4Z<)K1ki`X4os3R4HZKm(jq2GN0%Y!>DYh` zGKFcrCC5={k`7L?zVCcrK7aGaYV4K{8dAw$U%a!%hIA(#N$*%$ul@VF`G&U8p23IM zBb8|;vC12Us8?LjFFa?G08TjITxdNyjCfT3*60rdfpG=Ho~L_t(Ijm45N4#F@DMITY`&^vVR#@<69u_Dfpxrbop6y4dn z_YT?F%aW9j6^m~DQWQJi|HqOIN8{uXJ*=9~PVLX5itfM@c;x)zm~BB1YXmwed>NA^ z-=mlW75_t*Pn2#$AxHCzhec`uni33#h`>3=H{dPY08G{Z;6j@3WXy`Ft#q^*DA|fx z4N2nQR_zdj8Kc*x6;6D|=q^$*OCl<$E|SIGRX!dc7c(U1rooMF00000NkvXXu0mjf DvJ73Q diff --git a/assets/hbm/textures/items/plan_c_alt.png b/assets/hbm/textures/items/plan_c_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..0a44d83179874a478d27c7c7577f3e954de57015 GIT binary patch literal 245 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf*0F<#F=|x_20St}#5A^*-fH*NU|zTO>7Zc17}fK6()LR-jpO@%3e* sel^Em=mi;iD`~CJn{@PEsGXd=xUtIfWe0onfbM4SboFyt=akR{05UORzyJUM literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/thruster_large.png b/assets/hbm/textures/items/thruster_large.png index ee64287d35a35539afcad69ca9fee68497426ca1..b93646e4ff7f6ef3a51fe7151bd0f1a3948446c5 100644 GIT binary patch delta 434 zcmV;j0Zsm(0?h-EC4X~5NmK|32nc)#WQYI&0fb3JK~y-6rI0a8BT*EEzmdF5&;)jk zgbOkFbtJnJU>5DsWh`(&IOc8A9;QKhcP|!`GU8p z+kL@WL$O%$d=CInEPfyiXL)*h@HWrQm9W-ejGlY~z$@L|txP*%b8|PC3UEO#V0CqS c;_SQh1}Waix!*5u<^TWy07*qoM6N<$f+9rCMF0Q* delta 259 zcmV+e0sQ{W1E2zsC4Xl@O+f$vv5yPk-rE-XsyW@6N$ z3x(l%NjAuBVT*_qEoQe!1s2MW0)!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=Lb|X&(p;* z#KM2+gp0g~6?j;Ug_JjN`W!GgbFeQ@_N7X4j%ujAA7}rb<{v^6_j5RBtUW35__x%1 zZTAJLGm1||y`I+azb-l;XhJ}UpwVqhmWC5z2g}SDBLc%(lpBJ&u0$>UUT6Q;u4Uo8 zH>~z|8zdDv+t}S5Zt@#W&f#u-Sm|kYA~&(SLqs=iy9cY-seY!`;Jpv7>PHA@1_~bf dU|Uqn@ciV#=_%iNQh_dI@O1TaS?83{1ORKNW1s*4 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/thruster_medium.png b/assets/hbm/textures/items/thruster_medium.png index b480e5999438a175c4008aa1d2b143f2549c903f..c880ffed8c9b748215619a23d2a18432a8e3c3b3 100644 GIT binary patch delta 371 zcmV-(0gV2T0*?cbC4X~5NmK|32nc)#WQYI&0Y*tgK~y-6wUMz(!%!54|40oX7_mAP z6v0<;u!Amr0H;hYB|$EP?tKC0E`=^xx*7<5gN#|a_z*%t$PlcgC-)StlObtyiy)rm z-g7wjJO6(!@E;*OPmP37Klw-qB|J~H^%^=z9l*>8=kwOyBYz!$nXB{Dxzws{rH+J9 z`NFGdjm6n7O(Gz$^@n-Cbw_;_<%9@2*erI(;$f z)(%=ol0+?{2+u))>12Y3!2o4h;%&LyTc&o2Ps8C}t?eiF3Q3YE%d%kGHj1JE5n&NU zxb62*mL-B9_-vhmdhGhvDv0A)^?JR=bRxoLvjGu7N{KAXFdmPqcbz(*+wCIHa}W_M z%W6zouh)=L!f_nE0su(URN1zT)oRt4Y?>ydl<K0tr)%N}=z5%ukr*^0x RGjad`002ovPDHLkV1ih{s!RX? delta 243 zcmeBYp1?FgwLaa^*O7r?V?XzwL{_kaQqvt*~>jTT;sHp?4^ zxmr7oJOftVI_~-4MBikWC&CLkip~XjSIXuy_cm1a2)6mi zn=+ezznA|wj3Jp>Y4anN1pf`i0$n%y*jE4Q5*EpM&UTw|&s^y>Q9klV*$Pf1GlZxA r;E{gB^rkFNU~2)R;BDS}$}bsYA06Bg6T|ZZ=rjgTS3j3^P6!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=Lb~N=jq}Y zV&T8G{~+%H1s-O}PQe>3yb^7eHw<&Nb{csGth{yH^TCO}$u3WX7jhJx3-Yp@|1pNs z^+U8n_S-|}MAZ+3WbbXL>=A79kvC;F{eCb1aTr4~v(n~AED8P_iUqoE^s%k})g>&F z^PKHA_mp2U$UZu_BPNFD2he2< Mp00i_>zopr0Aj*iXaE2J literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/thruster_small.png b/assets/hbm/textures/items/thruster_small.png index 30c695f3093f974bc84294424ca52f9bedc742f3..f1881cd3c56a1a151d64d269527402b46dd95750 100644 GIT binary patch delta 298 zcmV+_0oDG80>%Q6C4X~5NmK|32nc)#WQYI&0R2fsK~y-6&5<#Rgg_8Q-z?pYns}0l z4FqY}dl(NGn+SUhQv*X!;UyM4!~`ygNZaBD%ZkpZ3~aI=8oHXQSHHU8UrTE}2SG5O z<-DC08)E?YxZMsRy8x~A{C>Tnlmb9Wc?j7B7-LXUF7f*QD1Wi{I875@jom+s>@ZjQB(>o%8DRhQAH)C-IR!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=Lb~N>gnPb zV&T7Z!fD7-VouD%_!7i8oeS@mC*~v3?imm}(hU%|+MCQ)fy!D#Z zZUN0*k_(P%r3fXg*;=-vl}l2NZ?@pJ*+w=DJrAz3JaF@gm?^8d>h*Qr0?CB`U*(T5 z@L94Il(wZGnV_i<_nd9j(ThA`ip~f4<|#1mOMJ<=&hIGCoznO3fevEuboFyt=akR{ E0D9I}egFUf literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/warhead_mirv.png b/assets/hbm/textures/items/warhead_mirv.png index 9c01939b8e15f2a570adec272c27155be69629d9..37e9abf9b8345c593c87a8547e75bb74e3b6e420 100644 GIT binary patch delta 212 zcmV;_04x8y0e}LKG=H~AL_t(IjkS_54#F@Lhd&6(DoT(@Dr-pIb&yC-z!^9Jk}EC2 z)FLrs3xZY^F_>A$fMw6MX?}mcJ{WUEB#KD<^kzELWY*)3_Z}eTc|I8>K~g|OqP4a; z8)N8VF&=|gcf9w65Pla>N}-hMP0*?!BGDKFz+!Wwsw&E|L``d*eRqc1srk O0000m^maH$#(U#J|)?1*dYl3T1sh|qQC?o*;M1&00>D%PDHLkV1hmqJ@Wtn diff --git a/assets/hbm/textures/items/warhead_mirv_alt.png b/assets/hbm/textures/items/warhead_mirv_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..9c01939b8e15f2a570adec272c27155be69629d9 GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfQ$+eHw;*a%n1WhE?xTxj4?r;=VaMOshdGj6r&Bm iV2w70Pj~7sEXEVOv0G*KR@gZJ0000Cky2vYHbMy1d?jSFBmiQJ z-H@SYmV_kC3^Qx4b3eaeS(Y4DG)YB2Qw2EZFf&33m7dq=20divc}5a3#&U-im*4m) ye-Q9?#8*jncpmY{x~|8WLbJ+1RhU+dzrq7hhfNftKu3ZA0000%tC4X~5NmK|32nc)#WQYI&0I*3!K~y-6%~C-M!Y~jVlV!c6Id~TF z2_pD8AK=N8FY^(ey(E{0H1*I@)b3UV1qVWw&F(N^2KXgb+he=lo!Y4xGqr4d1>-%I zn}bTC6674k`Wd7?kV8%p#wHLsm0%_{2l;l6($pwTLJ0wv^HqK{uYTcO{3$_7*HKS% zLUe(7F*s0~?r2Vk3UZDhb|9|$+kK|sJ_D~5=s{xln1ecqb7GKyK1`Oo<&wk@eFZlW W7Ez{3Ey$w)0000-L1P>`6JSE84fTB2a0XP{@9V_fG4RFmrI;uvD#pZw$he|uMn)e1b?GyHz>AA0fV z1dzjVTI%Zm@S-?|V?THfYH?gzlVvQ~!ztOM$l!cPfjOb=fXU<>1`p#7woH}NtRmHk zA0!xzQ?4)w@iHV%P&DZAHs(kcRgwFj&cLvG;_9aly0TJ$HZpj+`njxgN@xNAA525k diff --git a/assets/hbm/textures/items/warhead_thermo_endo_alt.png b/assets/hbm/textures/items/warhead_thermo_endo_alt.png new file mode 100644 index 0000000000000000000000000000000000000000..e519298dcd68049115bcb27658f42409bff5ef37 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=Lb}i>gnPb zV&R|sb>i_VfIEG_Ccn)fDTw0T5EZM^;*`&yD zNP#(_?SRST90m{L4z^5{)2t%Zi60~wj8m>K2=Ou`PEa)H@iyj27FCh^pU%LrdgAJ* U54y5afEF@%y85}Sb4q9e01#_M`~Uy| literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/warhead_thermo_exo.png b/assets/hbm/textures/items/warhead_thermo_exo.png index b452b4c44a4848ff5919b7e79d2b9ae99a77826c..6ad93152e4647e05f340b3b1f1c79f3e8b5cbd21 100644 GIT binary patch delta 217 zcmV;~04D$E0rmlqC4X~5NmK|32nc)#WQYI&0If+xK~y-6&5|(-!Y~kpUqWb`c4>#= z-*FN;^bb2ZcJ1E~(GEgFNOKM%XuT5$72gzck1t2w1HP%TuW0Nmdgam5VCYIpO@X|% z*lnx`5dl+3?0G384eCte-L1P>`6JSE84fTB2a0XP{@9V_fG4RFmrI;uvD#pZw$he|uMn)e1cEU!MNsKlI|! z2_T1K{!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXPIMM=Lb}i>gnPb zV&R|s(i{^LLN;?W5phhzS>^#AqBo-92dC7VJ8mi#O-(3cQ4VsU0@ zab!Ed)0nAtlVL)d0PiJ_Y1|s$4m~hrNIS8DQALX3kb-l9#Pl?QV_F_I|IRZod}iFg UOJ}0*f1rg7p00i_>zopr0II%7)c^nh literal 0 HcmV?d00001 diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java index 31ac6189c..2290acfe5 100644 --- a/com/hbm/blocks/ModBlocks.java +++ b/com/hbm/blocks/ModBlocks.java @@ -336,6 +336,9 @@ public class ModBlocks { public static Block fluid_duct; public static Block machine_transformer; + public static Block machine_transformer_20; + public static Block machine_transformer_dnt; + public static Block machine_transformer_dnt_20; public static Block bomb_multi_large; public static final int guiID_bomb_multi_large = 18; @@ -828,8 +831,11 @@ public class ModBlocks { gas_duct_solid = new GasDuctSolid(Material.iron).setBlockName("gas_duct_solid").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":gas_duct_solid"); gas_duct = new BlockGasDuct(Material.iron).setBlockName("gas_duct").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":gas_duct_icon"); fluid_duct = new BlockFluidDuct(Material.iron).setBlockName("fluid_duct").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fluid_duct_icon"); - - machine_transformer = new MachineTransformer(Material.iron).setBlockName("machine_transformer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_transformer"); + + machine_transformer = new MachineTransformer(Material.iron, 10000L, 1).setBlockName("machine_transformer").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_transformer_iron"); + machine_transformer_dnt = new MachineTransformer(Material.iron, 1000000000000000L, 1).setBlockName("machine_transformer_dnt").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_transformer"); + machine_transformer_20 = new MachineTransformer(Material.iron, 10000L, 20).setBlockName("machine_transformer_20").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_transformer_iron"); + machine_transformer_dnt_20 = new MachineTransformer(Material.iron, 1000000000000000L, 20).setBlockName("machine_transformer_dnt_20").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_transformer"); machine_satlinker = new MachineSatLinker(Material.iron).setBlockName("machine_satlinker").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.missileTab).setBlockTextureName(RefStrings.MODID + ":machine_satlinker_side"); machine_telelinker = new MachineTeleLinker(Material.iron).setBlockName("machine_telelinker").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.nukeTab).setBlockTextureName(RefStrings.MODID + ":machine_telelinker_side"); @@ -1021,7 +1027,7 @@ public class ModBlocks { dummy_block_vault = new DummyBlockVault(Material.iron).setBlockName("dummy_block_vault").setHardness(10.0F).setResistance(10000.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_block_blast = new DummyBlockBlast(Material.iron).setBlockName("dummy_block_blast").setHardness(10.0F).setResistance(10000.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); dummy_block_gascent = new DummyBlockMachine(Material.iron, guiID_gascent, machine_gascent).setBlockName("dummy_block_gascent").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); - dummy_block_uf6 = new DummyBlockMachine(Material.iron, guiID_uf6_tank, machine_uf6_tank).setBlockName("dummy_block_uf6").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); + dummy_block_uf6 = new DummyBlockMachine(Material.iron, guiID_uf6_tank, machine_uf6_tank).setBlockName("dummy_block_uf6").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_titanium"); dummy_block_puf6 = new DummyBlockMachine(Material.iron, guiID_puf6_tank, machine_puf6_tank).setBlockName("dummy_block_puf6").setHardness(5.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":block_steel"); ntm_dirt = new BlockNTMDirt().setBlockName("ntm_dirt").setHardness(0.5F).setStepSound(Block.soundTypeGravel).setCreativeTab(null).setBlockTextureName("dirt"); @@ -1305,6 +1311,9 @@ public class ModBlocks { GameRegistry.registerBlock(machine_schrabidium_battery, machine_schrabidium_battery.getUnlocalizedName()); GameRegistry.registerBlock(machine_dineutronium_battery, machine_dineutronium_battery.getUnlocalizedName()); GameRegistry.registerBlock(machine_transformer, machine_transformer.getUnlocalizedName()); + GameRegistry.registerBlock(machine_transformer_20, machine_transformer_20.getUnlocalizedName()); + GameRegistry.registerBlock(machine_transformer_dnt, machine_transformer_dnt.getUnlocalizedName()); + GameRegistry.registerBlock(machine_transformer_dnt_20, machine_transformer_dnt_20.getUnlocalizedName()); GameRegistry.registerBlock(machine_converter_he_rf, machine_converter_he_rf.getUnlocalizedName()); GameRegistry.registerBlock(machine_converter_rf_he, machine_converter_rf_he.getUnlocalizedName()); GameRegistry.registerBlock(machine_electric_furnace_off, machine_electric_furnace_off.getUnlocalizedName()); diff --git a/com/hbm/blocks/machine/MachineBattery.java b/com/hbm/blocks/machine/MachineBattery.java index f6a5b8497..2a9c69030 100644 --- a/com/hbm/blocks/machine/MachineBattery.java +++ b/com/hbm/blocks/machine/MachineBattery.java @@ -140,23 +140,9 @@ public class MachineBattery extends BlockContainer { @Override public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileEntityMachineBattery(); + return new TileEntityMachineBattery(maxPower); } - @Override - public void onNeighborBlockChange(World p_149695_1_, int x, int y, int z, Block p_149695_5_) - { - TileEntityMachineBattery entity = (TileEntityMachineBattery) p_149695_1_.getTileEntity(x, y, z); - if (p_149695_1_.isBlockIndirectlyGettingPowered(x, y, z)) - { - entity.conducts = true; - } - else - { - entity.conducts = false; - } - } - @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int side, float hitX, float hitY, float hitZ) { if(world.isRemote) diff --git a/com/hbm/blocks/machine/MachineTransformer.java b/com/hbm/blocks/machine/MachineTransformer.java index c48f70587..40ddb6792 100644 --- a/com/hbm/blocks/machine/MachineTransformer.java +++ b/com/hbm/blocks/machine/MachineTransformer.java @@ -15,20 +15,31 @@ import net.minecraft.util.IIcon; import net.minecraft.world.World; public class MachineTransformer extends BlockContainer { + + long buffer; + int delay; @SideOnly(Side.CLIENT) private IIcon iconTop; - public MachineTransformer(Material p_i45394_1_) { + public MachineTransformer(Material p_i45394_1_, long b, int d) { super(p_i45394_1_); + buffer = b; + delay = d; } @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { - this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_transformer_top"); - this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_transformer"); + if(this == ModBlocks.machine_transformer || this == ModBlocks.machine_transformer_20) { + this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_transformer_top_iron"); + this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_transformer_iron"); + } + if(this == ModBlocks.machine_transformer_dnt || this == ModBlocks.machine_transformer_dnt_20) { + this.iconTop = iconRegister.registerIcon(RefStrings.MODID + ":machine_transformer_top"); + this.blockIcon = iconRegister.registerIcon(RefStrings.MODID + ":machine_transformer"); + } } @Override @@ -39,6 +50,6 @@ public class MachineTransformer extends BlockContainer { @Override public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileEntityMachineTransformer(); + return new TileEntityMachineTransformer(buffer, delay); } } diff --git a/com/hbm/handler/FluidTypeHandler.java b/com/hbm/handler/FluidTypeHandler.java index 4b2c0be61..ca659ff74 100644 --- a/com/hbm/handler/FluidTypeHandler.java +++ b/com/hbm/handler/FluidTypeHandler.java @@ -8,7 +8,7 @@ public class FluidTypeHandler { NONE (0x888888, 8947848, 0, 1, 1, "hbmfluid.none"), WATER (0x3333FF, 3355647, 1, 1, 1, "hbmfluid.water"), - STEAM (0xe5e5e5, 15066597, 9, 1, 1, "hbmfluid.steam"), + STEAM (0xe5e5e5, 15066597, 9, 2, 1, "hbmfluid.steam"), COOLANT (0xd8fcff, 14220543, 2, 1, 1, "hbmfluid.coolant"), LAVA (0xFF3300, 16724736, 3, 1, 1, "hbmfluid.lava"), diff --git a/com/hbm/interfaces/IFluidAcceptor.java b/com/hbm/interfaces/IFluidAcceptor.java index abc355db5..42dfda4a8 100644 --- a/com/hbm/interfaces/IFluidAcceptor.java +++ b/com/hbm/interfaces/IFluidAcceptor.java @@ -2,12 +2,8 @@ package com.hbm.interfaces; import com.hbm.handler.FluidTypeHandler.FluidType; -public interface IFluidAcceptor { +public interface IFluidAcceptor extends IFluidContainer { - void setAFluidFill(int i, FluidType type); - - int getAFluidFill(FluidType type); - - int getMaxAFluidFill(FluidType type); + int getMaxFluidFill(FluidType type); } diff --git a/com/hbm/interfaces/IFluidContainer.java b/com/hbm/interfaces/IFluidContainer.java index f134cef58..9fc527bbf 100644 --- a/com/hbm/interfaces/IFluidContainer.java +++ b/com/hbm/interfaces/IFluidContainer.java @@ -1,13 +1,24 @@ package com.hbm.interfaces; +import java.util.List; + import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.inventory.FluidTank; public interface IFluidContainer { //Args: fill, what the fill should be set to; index, index for array if there are multiple tanks public void setFillstate(int fill, int index); + + //Args: fill: what the fill should be set to; type, what type the tank in question has + void setFluidFill(int fill, FluidType type); //Args: type, what the type should be set to; index, index for array if there are multiple tanks public void setType(FluidType type, int index); + + public List getTanks(); + + //Args: type, what type the tank in question has + int getFluidFill(FluidType type); } diff --git a/com/hbm/interfaces/IFluidDuct.java b/com/hbm/interfaces/IFluidDuct.java index 06d6f546d..da4fd3d15 100644 --- a/com/hbm/interfaces/IFluidDuct.java +++ b/com/hbm/interfaces/IFluidDuct.java @@ -1,5 +1,9 @@ package com.hbm.interfaces; +import com.hbm.handler.FluidTypeHandler.FluidType; + public interface IFluidDuct { + + public FluidType getType(); } diff --git a/com/hbm/interfaces/IFluidSource.java b/com/hbm/interfaces/IFluidSource.java index 29e81d3d1..bfc68b260 100644 --- a/com/hbm/interfaces/IFluidSource.java +++ b/com/hbm/interfaces/IFluidSource.java @@ -4,15 +4,13 @@ import java.util.List; import com.hbm.handler.FluidTypeHandler.FluidType; -public interface IFluidSource { +public interface IFluidSource extends IFluidContainer { void fillFluidInit(FluidType type); void fillFluid(int x, int y, int z, boolean newTact, FluidType type); boolean getTact(); - int getSFluidFill(FluidType type); - void setSFluidFill(int i, FluidType type); List getFluidList(FluidType type); void clearFluidList(FluidType type); diff --git a/com/hbm/inventory/MachineRecipes.java b/com/hbm/inventory/MachineRecipes.java index d0b19162d..682df397d 100644 --- a/com/hbm/inventory/MachineRecipes.java +++ b/com/hbm/inventory/MachineRecipes.java @@ -2869,7 +2869,7 @@ public class MachineRecipes { list.add(new ItemStack(ModItems.ingot_combine_steel, 32)); list.add(new ItemStack(ModItems.coil_magnetized_tungsten, 8)); break; - case HE_TO_RF: + /*case HE_TO_RF: list.add(new ItemStack(ModItems.ingot_steel, 4)); list.add(new ItemStack(ModItems.plate_steel, 4)); list.add(new ItemStack(ModItems.coil_copper, 2)); @@ -2880,7 +2880,7 @@ public class MachineRecipes { list.add(new ItemStack(ModItems.plate_steel, 4)); list.add(new ItemStack(ModItems.coil_copper, 2)); list.add(new ItemStack(ModItems.coil_copper_torus, 1)); - break; + break;*/ case SHREDDER: list.add(new ItemStack(ModItems.ingot_steel, 2)); list.add(new ItemStack(ModItems.plate_steel, 4)); @@ -4177,12 +4177,12 @@ public class MachineRecipes { case BATTERY_D: output = new ItemStack(ModBlocks.machine_dineutronium_battery, 1); break; - case HE_TO_RF: + /*case HE_TO_RF: output = new ItemStack(ModBlocks.machine_converter_he_rf, 1); break; case RF_TO_HE: output = new ItemStack(ModBlocks.machine_converter_rf_he, 1); - break; + break;*/ case SHREDDER: output = new ItemStack(ModBlocks.machine_shredder, 1); break; diff --git a/com/hbm/inventory/gui/GUIScreenTemplateFolder.java b/com/hbm/inventory/gui/GUIScreenTemplateFolder.java index e048e9a00..9bdd886b0 100644 --- a/com/hbm/inventory/gui/GUIScreenTemplateFolder.java +++ b/com/hbm/inventory/gui/GUIScreenTemplateFolder.java @@ -68,7 +68,7 @@ public class GUIScreenTemplateFolder extends GuiScreen { } int getPageCount() { - return (int)Math.ceil(stacks.size() / (5 * 7)); + return (int)Math.ceil((stacks.size() - 1) / (5 * 7)); } public void updateScreen() { diff --git a/com/hbm/items/ModItems.java b/com/hbm/items/ModItems.java index 2538bf194..40989ee57 100644 --- a/com/hbm/items/ModItems.java +++ b/com/hbm/items/ModItems.java @@ -1141,6 +1141,7 @@ public class ModItems { public static Item wand; public static Item wand_s; public static Item wand_d; + public static Item analyzer; public static Item cape_test; public static Item cape_radiation; @@ -2290,6 +2291,7 @@ public class ModItems { wand = new ItemWand().setUnlocalizedName("wand_k").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setFull3D().setTextureName(RefStrings.MODID + ":wand"); wand_s = new ItemWandS().setUnlocalizedName("wand_s").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setFull3D().setTextureName(RefStrings.MODID + ":wand_s"); wand_d = new ItemWandD().setUnlocalizedName("wand_d").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setFull3D().setTextureName(RefStrings.MODID + ":wand_d"); + analyzer = new ItemAnalyzer().setUnlocalizedName("analyzer").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setFull3D().setTextureName(RefStrings.MODID + ":analyzer"); nuke_starter_kit = new ItemStarterKit().setUnlocalizedName("nuke_starter_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":nuke_starter_kit"); nuke_advanced_kit = new ItemStarterKit().setUnlocalizedName("nuke_advanced_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":nuke_advanced_kit"); @@ -3931,6 +3933,7 @@ public class ModItems { GameRegistry.registerItem(wand, wand.getUnlocalizedName()); GameRegistry.registerItem(wand_s, wand_s.getUnlocalizedName()); GameRegistry.registerItem(wand_d, wand_d.getUnlocalizedName()); + GameRegistry.registerItem(analyzer, analyzer.getUnlocalizedName()); //GameRegistry.registerItem(remote, remote.getUnlocalizedName()); GameRegistry.registerItem(euphemium_stopper, euphemium_stopper.getUnlocalizedName()); GameRegistry.registerItem(polaroid, polaroid.getUnlocalizedName()); diff --git a/com/hbm/items/tool/ItemAnalyzer.java b/com/hbm/items/tool/ItemAnalyzer.java new file mode 100644 index 000000000..458ae6893 --- /dev/null +++ b/com/hbm/items/tool/ItemAnalyzer.java @@ -0,0 +1,137 @@ +package com.hbm.items.tool; + +import java.util.List; + +import com.hbm.interfaces.IConsumer; +import com.hbm.interfaces.IFluidContainer; +import com.hbm.interfaces.IFluidDuct; +import com.hbm.interfaces.ISource; +import com.hbm.inventory.FluidTank; +import com.hbm.tileentity.conductor.TileEntityPylonRedWire; +import com.hbm.tileentity.machine.TileEntityDummy; +import com.hbm.tileentity.machine.TileEntityLockableBase; + +import net.minecraft.block.Block; +import net.minecraft.client.resources.I18n; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.inventory.ISidedInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentText; +import net.minecraft.world.World; + +public class ItemAnalyzer extends Item { + + @Override + public boolean onItemUse(ItemStack stack, EntityPlayer player, World world, int x, int y, int z, int b, float f0, float f1, float f2) + { + Block block = world.getBlock(x, y, z); + TileEntity te = world.getTileEntity(x, y, z); + + if(!world.isRemote) { + player.addChatMessage(new ChatComponentText( + "Block: " + I18n.format(block.getUnlocalizedName() + ".name") + " (" + block.getUnlocalizedName() + ")" + )); + + player.addChatMessage(new ChatComponentText( + "Meta: " + world.getBlockMetadata(x, y, z) + )); + + if(te == null) { + player.addChatMessage(new ChatComponentText( + "Tile Entity: none")); + } else { + + if(te instanceof TileEntityDummy) { + + player.addChatMessage(new ChatComponentText( + "Dummy Block, references TE at " + ((TileEntityDummy)te).targetX + " / " + ((TileEntityDummy)te).targetY + " / " + ((TileEntityDummy)te).targetZ)); + + te = world.getTileEntity(((TileEntityDummy)te).targetX, ((TileEntityDummy)te).targetY, ((TileEntityDummy)te).targetZ); + } + + String[] parts = te.toString().split("\\."); + + if(parts.length == 0) + parts = new String[]{"error"}; + + String post = parts[parts.length - 1]; + String name = post.split("@")[0]; + + player.addChatMessage(new ChatComponentText( + "Tile Entity: " + name)); + + if(te instanceof IInventory) { + + player.addChatMessage(new ChatComponentText( + "Slots: " + ((IInventory)te).getSizeInventory())); + } + + if(te instanceof IConsumer) { + + player.addChatMessage(new ChatComponentText( + "Electricity: " + ((IConsumer)te).getPower() + " HE")); + } else if(te instanceof ISource) { + + player.addChatMessage(new ChatComponentText( + "Electricity: " + ((ISource)te).getSPower() + " HE")); + } + + if(te instanceof IFluidContainer) { + + player.addChatMessage(new ChatComponentText( + "Fluid Tanks:")); + + List tanks = ((IFluidContainer)te).getTanks(); + + for(int i = 0; i < tanks.size(); i++) { + player.addChatMessage(new ChatComponentText( + " *Tank " + (i + 1) + ": " + tanks.get(i).getFill() + "mB " + I18n.format(tanks.get(i).getTankType().getUnlocalizedName()))); + } + } + + if(te instanceof IFluidDuct) { + + player.addChatMessage(new ChatComponentText( + "Duct Type: " + I18n.format(((IFluidDuct)te).getType().getUnlocalizedName()))); + } + + if(te instanceof TileEntityPylonRedWire) { + + player.addChatMessage(new ChatComponentText( + "Connections:")); + + List connections = ((TileEntityPylonRedWire)te).connected; + + for(int i = 0; i < connections.size(); i++) { + player.addChatMessage(new ChatComponentText( + " *" + connections.get(i).xCoord + " / " + connections.get(i).yCoord + " / " + connections.get(i).zCoord)); + } + } + + if(te instanceof TileEntityLockableBase) { + + player.addChatMessage(new ChatComponentText( + "Locked: " + ((TileEntityLockableBase)te).isLocked())); + + if(((TileEntityLockableBase)te).isLocked()) { + + player.addChatMessage(new ChatComponentText( + "Pins: " + ((TileEntityLockableBase)te).getPins())); + player.addChatMessage(new ChatComponentText( + "Pick Chance: " + (((TileEntityLockableBase)te).getMod() * 100D) + "%")); + } + } + } + + player.addChatMessage(new ChatComponentText( + "----------------------------" + )); + } + + return true; + } + +} diff --git a/com/hbm/items/tool/ItemAssemblyTemplate.java b/com/hbm/items/tool/ItemAssemblyTemplate.java index c9344ffde..08b0d998b 100644 --- a/com/hbm/items/tool/ItemAssemblyTemplate.java +++ b/com/hbm/items/tool/ItemAssemblyTemplate.java @@ -167,8 +167,8 @@ public class ItemAssemblyTemplate extends Item { BATTERY_L, BATTERY_S, BATTERY_D, - HE_TO_RF, - RF_TO_HE, + //HE_TO_RF, + //RF_TO_HE, SHREDDER, DERRICK, PUMPJACK, @@ -634,10 +634,10 @@ public class ItemAssemblyTemplate extends Item { return 800; case BATTERY_D: return 1600; - case HE_TO_RF: - return 150; - case RF_TO_HE: - return 150; + //case HE_TO_RF: + // return 150; + //case RF_TO_HE: + // return 150; case SHREDDER: return 200; case DERRICK: diff --git a/com/hbm/items/weapon/ItemClip.java b/com/hbm/items/weapon/ItemClip.java index b09f1f60b..3258a2b0a 100644 --- a/com/hbm/items/weapon/ItemClip.java +++ b/com/hbm/items/weapon/ItemClip.java @@ -286,6 +286,10 @@ public class ItemClip extends Item { player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_nightmare2_ammo, 3)); if(player.inventory.hasItem(ModItems.gun_revolver_pip)) player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_revolver_pip_ammo, 12)); + if(player.inventory.hasItem(ModItems.gun_calamity)) + player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_calamity_ammo, 16)); + if(player.inventory.hasItem(ModItems.gun_calamity_dual)) + player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_calamity_ammo, 32)); if(player.inventory.hasItem(ModItems.gun_rpg)) player.inventory.addItemStackToInventory(new ItemStack(ModItems.gun_rpg_ammo, 3)); if(player.inventory.hasItem(ModItems.gun_stinger)) diff --git a/com/hbm/lib/HbmChestContents.java b/com/hbm/lib/HbmChestContents.java index 6fa674809..4f920c3a1 100644 --- a/com/hbm/lib/HbmChestContents.java +++ b/com/hbm/lib/HbmChestContents.java @@ -4,6 +4,7 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; +import com.hbm.items.special.ItemBattery; import net.minecraft.init.Items; import net.minecraft.item.Item; @@ -231,6 +232,73 @@ public class HbmChestContents { new WeightedRandomChestContent(ModItems.powder_niobium, 0, 1, 32, 1), new WeightedRandomChestContent(ModItems.powder_tennessine, 0, 1, 32, 1), new WeightedRandomChestContent(ModItems.powder_cerium, 0, 1, 32, 1) }; + + private static WeightedRandomChestContent[] vault1 = new WeightedRandomChestContent[] { + new WeightedRandomChestContent(Items.gold_ingot, 0, 3, 14, 1), + new WeightedRandomChestContent(ModItems.pin, 0, 8, 8, 1), + new WeightedRandomChestContent(ModItems.gun_calamity, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.bottle_quantum, 0, 1, 3, 1), + new WeightedRandomChestContent(ModItems.ingot_advanced_alloy, 0, 4, 12, 1), + new WeightedRandomChestContent(ModItems.gun_calamity_ammo, 0, 24, 48, 1), + new WeightedRandomChestContent(ModItems.circuit_red_copper, 0, 6, 12, 1), + new WeightedRandomChestContent(ModItems.gas_mask_m65, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.grenade_if_he, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.grenade_if_incendiary, 0, 1, 1, 1), + new WeightedRandomChestContent(Items.diamond, 0, 1, 2, 1) }; + + private static WeightedRandomChestContent[] vault2 = new WeightedRandomChestContent[] { + new WeightedRandomChestContent(ModItems.ingot_desh, 0, 2, 6, 1), + new WeightedRandomChestContent(ItemBattery.getFullBattery(ModItems.battery_advanced_cell_4), 1, 1, 1), + new WeightedRandomChestContent(ModItems.powder_desh_mix, 0, 1, 5, 1), + new WeightedRandomChestContent(Items.diamond, 0, 3, 6, 1), + new WeightedRandomChestContent(ModItems.gun_fatman_ammo, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.ammo_container, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.grenade_nuclear, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.grenade_smart, 0, 1, 6, 1), + new WeightedRandomChestContent(ModItems.powder_yellowcake, 0, 16, 24, 1), + new WeightedRandomChestContent(ModItems.gun_uzi, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.gun_uzi_silencer, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.clip_uzi, 0, 1, 3, 1), + new WeightedRandomChestContent(ModItems.circuit_red_copper, 0, 12, 16, 1), + new WeightedRandomChestContent(ModItems.circuit_gold, 0, 2, 6, 1) }; + + private static WeightedRandomChestContent[] vault3 = new WeightedRandomChestContent[] { + new WeightedRandomChestContent(ModItems.ingot_desh, 0, 6, 16, 1), + new WeightedRandomChestContent(ItemBattery.getFullBattery(ModItems.battery_lithium), 1, 1, 1), + new WeightedRandomChestContent(ModItems.powder_power, 0, 1, 5, 1), + new WeightedRandomChestContent(ModItems.sat_chip, 0, 1, 1, 1), + new WeightedRandomChestContent(Items.diamond, 0, 5, 9, 1), + new WeightedRandomChestContent(ModItems.warhead_nuclear, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.gun_fatman_ammo, 0, 1, 3, 1), + new WeightedRandomChestContent(ModItems.ammo_container, 0, 1, 4, 1), + new WeightedRandomChestContent(ModItems.grenade_nuclear, 0, 1, 2, 1), + new WeightedRandomChestContent(ModItems.grenade_mirv, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.powder_yellowcake, 0, 26, 42, 1), + new WeightedRandomChestContent(ModItems.ingot_u235, 0, 3, 6, 1), + new WeightedRandomChestContent(ModItems.gun_fatman, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.gun_revolver_pip, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.clip_revolver_pip, 0, 2, 4, 1), + new WeightedRandomChestContent(ModItems.circuit_red_copper, 0, 18, 32, 1), + new WeightedRandomChestContent(ModItems.circuit_gold, 0, 6, 12, 1), + new WeightedRandomChestContent(ModItems.nugget_schrabidium, 0, 6, 12, 1) }; + + private static WeightedRandomChestContent[] vault4 = new WeightedRandomChestContent[] { + new WeightedRandomChestContent(ModItems.ammo_container, 0, 3, 6, 1), + new WeightedRandomChestContent(ModItems.clip_fatman, 0, 2, 3, 1), + new WeightedRandomChestContent(ModItems.gun_mirv_ammo, 0, 2, 3, 1), + new WeightedRandomChestContent(ModItems.gun_mirv, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.gun_fatman, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.gun_proto, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.gun_b92, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.ingot_combine_steel, 0, 16, 28, 1), + new WeightedRandomChestContent(ModItems.nugget_schrabidium, 0, 8, 18, 1), + new WeightedRandomChestContent(ModItems.man_core, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.boy_kit, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.nuke_starter_kit, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.weaponized_starblaster_cell, 0, 1, 1, 1), + new WeightedRandomChestContent(ModItems.warhead_mirv, 0, 1, 1, 1), + new WeightedRandomChestContent(ItemBattery.getFullBattery(ModItems.battery_schrabidium_cell), 1, 1, 1), + new WeightedRandomChestContent(ModItems.powder_nitan_mix, 0, 16, 32, 1) }; /** * @param i @@ -267,6 +335,14 @@ public class HbmChestContents { return spaceship; case 9: return powder; + case 10: + return vault1; + case 11: + return vault2; + case 12: + return vault3; + case 13: + return vault4; } return null; diff --git a/com/hbm/lib/HbmWorldGen.java b/com/hbm/lib/HbmWorldGen.java index 58a9967a0..a93607c17 100644 --- a/com/hbm/lib/HbmWorldGen.java +++ b/com/hbm/lib/HbmWorldGen.java @@ -4,6 +4,7 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.main.MainRegistry; +import com.hbm.tileentity.machine.TileEntitySafe; import com.hbm.world.Antenna; import com.hbm.world.Barrel; import com.hbm.world.Bunker; @@ -371,12 +372,14 @@ public class HbmWorldGen implements IWorldGenerator { int z = j + rand.nextInt(16); int y = world.getHeightValue(x, z); - if(world.getBlock(x, y, z).canPlaceTorchOnTop(world, x, y, z)) + if(world.getBlock(x, y, z).canPlaceTorchOnTop(world, x, y, z)) { world.setBlock(x, y + 1, z, ModBlocks.mine_ap); - if(MainRegistry.enableDebugMode) - MainRegistry.logger.info("[Debug] Successfully spawned landmine at " + x + " " + (y + 1) +" " + z); + if(MainRegistry.enableDebugMode) + MainRegistry.logger.info("[Debug] Successfully spawned landmine at " + x + " " + (y + 1) +" " + z); + } } + if (MainRegistry.enableRad && rand.nextInt(MainRegistry.radfreq) == 0 && biome == BiomeGenBase.desert) { for (int a = 0; a < 1; a++) { @@ -394,6 +397,53 @@ public class HbmWorldGen implements IWorldGenerator { MainRegistry.logger.info("[Debug] Successfully spawned raditation hotspot at " + x + " " + z); } } + + if (MainRegistry.enableVaults && rand.nextInt(/*MainRegistry.vaultfreq*/ 1) == 0) { + int x = i + rand.nextInt(16); + int z = j + rand.nextInt(16); + int y = world.getHeightValue(x, z); + + if(world.getBlock(x, y, z).canPlaceTorchOnTop(world, x, y, z)) { + world.setBlock(x, y + 1, z, ModBlocks.safe, rand.nextInt(4) + 2, 2); + + switch(rand.nextInt(10)) { + case 0: + case 1: + case 2: + case 3: + ((TileEntitySafe)world.getTileEntity(x, y + 1, z)).setPins(rand.nextInt(999) + 1); + ((TileEntitySafe)world.getTileEntity(x, y + 1, z)).setMod(1); + ((TileEntitySafe)world.getTileEntity(x, y + 1, z)).lock(); + WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(10), (TileEntitySafe)world.getTileEntity(x, y + 1, z), rand.nextInt(4) + 3); + break; + case 4: + case 5: + case 6: + ((TileEntitySafe)world.getTileEntity(x, y + 1, z)).setPins(rand.nextInt(999) + 1); + ((TileEntitySafe)world.getTileEntity(x, y + 1, z)).setMod(0.1); + ((TileEntitySafe)world.getTileEntity(x, y + 1, z)).lock(); + WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(11), (TileEntitySafe)world.getTileEntity(x, y + 1, z), rand.nextInt(3) + 2); + break; + case 7: + case 8: + ((TileEntitySafe)world.getTileEntity(x, y + 1, z)).setPins(rand.nextInt(999) + 1); + ((TileEntitySafe)world.getTileEntity(x, y + 1, z)).setMod(0.02); + ((TileEntitySafe)world.getTileEntity(x, y + 1, z)).lock(); + WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(12), (TileEntitySafe)world.getTileEntity(x, y + 1, z), rand.nextInt(3) + 1); + break; + case 9: + ((TileEntitySafe)world.getTileEntity(x, y + 1, z)).setPins(rand.nextInt(999) + 1); + ((TileEntitySafe)world.getTileEntity(x, y + 1, z)).setMod(0.0); + ((TileEntitySafe)world.getTileEntity(x, y + 1, z)).lock(); + WeightedRandomChestContent.generateChestContents(rand, HbmChestContents.getLoot(13), (TileEntitySafe)world.getTileEntity(x, y + 1, z), rand.nextInt(2) + 1); + break; + } + + if(MainRegistry.enableDebugMode) + MainRegistry.logger.info("[Debug] Successfully spawned safe at " + x + " " + (y + 1) +" " + z); + } + + } } if (rand.nextInt(25) == 0) { diff --git a/com/hbm/lib/Library.java b/com/hbm/lib/Library.java index 5a4d3745d..0a45e7d2b 100644 --- a/com/hbm/lib/Library.java +++ b/com/hbm/lib/Library.java @@ -37,6 +37,7 @@ import com.hbm.tileentity.conductor.TileEntityWireCoated; import com.hbm.tileentity.machine.TileEntityDummy; import com.hbm.tileentity.machine.TileEntityMachineBattery; import com.hbm.tileentity.machine.TileEntityMachineFluidTank; +import com.hbm.tileentity.machine.TileEntityMachineTransformer; import net.minecraft.block.Block; import net.minecraft.entity.Entity; @@ -382,15 +383,7 @@ public class Library { public static boolean checkFluidConnectables(World world, int x, int y, int z, FluidType type) { TileEntity tileentity = world.getTileEntity(x, y, z); - if(tileentity != null && tileentity instanceof TileEntityFluidDuct && ((TileEntityFluidDuct)tileentity).type == type) - return true; - if(tileentity != null && tileentity instanceof TileEntityOilDuct && ((TileEntityOilDuct)tileentity).type == type) - return true; - if(tileentity != null && tileentity instanceof TileEntityGasDuct && ((TileEntityGasDuct)tileentity).type == type) - return true; - if(tileentity != null && tileentity instanceof TileEntityOilDuctSolid && ((TileEntityOilDuctSolid)tileentity).type == type) - return true; - if(tileentity != null && tileentity instanceof TileEntityGasDuctSolid && ((TileEntityGasDuctSolid)tileentity).type == type) + if(tileentity != null && tileentity instanceof IFluidDuct && ((IFluidDuct)tileentity).getType() == type) return true; if((tileentity != null && (tileentity instanceof IFluidAcceptor || tileentity instanceof IFluidSource)) || @@ -947,15 +940,21 @@ public class Library { } } - if(tileentity instanceof IConsumer && newTact && !(tileentity instanceof TileEntityMachineBattery && ((TileEntityMachineBattery)tileentity).conducts)) + //TE will not be added as consumer if: + // -TE is the source (will not send to itself) + // -TE is already full + // -TE is a battery set to output only + // -TE as well as source are transformers of the same frequency + if(tileentity instanceof IConsumer && newTact && !(tileentity instanceof TileEntityMachineBattery && ((TileEntityMachineBattery)tileentity).conducts) && + tileentity != that && ((IConsumer)tileentity).getPower() < ((IConsumer)tileentity).getMaxPower() && + !(tileentity instanceof TileEntityMachineTransformer && that instanceof TileEntityMachineTransformer && + ((TileEntityMachineTransformer)tileentity).delay == ((TileEntityMachineTransformer)that).delay)) { that.getList().add((IConsumer)tileentity); } if(!newTact) { - //TODO: fix energy distr. quirks - int size = that.getList().size(); if(size > 0) { @@ -1217,18 +1216,18 @@ public class Library { int size = that.getFluidList(type).size(); if(size > 0) { - int part = that.getSFluidFill(type) / size; + int part = that.getFluidFill(type) / size; for(IFluidAcceptor consume : that.getFluidList(type)) { - if(consume.getAFluidFill(type) < consume.getMaxAFluidFill(type)) + if(consume.getFluidFill(type) < consume.getMaxFluidFill(type)) { - if(consume.getMaxAFluidFill(type) - consume.getAFluidFill(type) >= part) + if(consume.getMaxFluidFill(type) - consume.getFluidFill(type) >= part) { - that.setSFluidFill(that.getSFluidFill(type)-part, type); - consume.setAFluidFill(consume.getAFluidFill(type) + part, type); + that.setFluidFill(that.getFluidFill(type)-part, type); + consume.setFluidFill(consume.getFluidFill(type) + part, type); } else { - that.setSFluidFill(that.getSFluidFill(type) - (consume.getMaxAFluidFill(type) - consume.getAFluidFill(type)), type); - consume.setAFluidFill(consume.getMaxAFluidFill(type), type); + that.setFluidFill(that.getFluidFill(type) - (consume.getMaxFluidFill(type) - consume.getFluidFill(type)), type); + consume.setFluidFill(consume.getMaxFluidFill(type), type); } } } diff --git a/com/hbm/main/CraftingManager.java b/com/hbm/main/CraftingManager.java index 070ceeb49..99c8bef60 100644 --- a/com/hbm/main/CraftingManager.java +++ b/com/hbm/main/CraftingManager.java @@ -88,7 +88,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.gunpowder, 3), new Object[] { "dustSulfur", "dustSalpeter", Items.coal })); GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(Items.gunpowder, 3), new Object[] { "dustSulfur", "dustSalpeter", new ItemStack(Items.coal, 1, 1) })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cell_empty, 6), new Object[] { "SSS", "G G", "SSS", 'S', "plateSteel", 'G', Item.getItemFromBlock(Blocks.glass_pane) })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.cell_empty, 6), new Object[] { "SSS", "G G", "SSS", 'S', "plateSteel", 'G', "paneGlass" })); //GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.cell_uf6, 1), new Object[] { ModItems.cell_empty, "dustUranium", "dustFluorite", "dustFluorite", "dustFluorite", Items.water_bucket })); //GameRegistry.addRecipe(new ShapelessOreRecipe(new ItemStack(ModItems.cell_puf6, 1), new Object[] { ModItems.cell_empty, "dustPlutonium", "dustFluorite", "dustFluorite", "dustFluorite", Items.water_bucket })); GameRegistry.addRecipe(new ItemStack(ModItems.cell_deuterium, 8), new Object[] { "DDD", "DTD", "DDD", 'D', ModItems.cell_empty, 'T', ModItems.mike_deut }); @@ -557,9 +557,9 @@ public class CraftingManager { //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_deuterium), 1), new Object[] { "TIT", "RFR", "CCC", 'T', ModItems.tank_steel, 'I', "ingotTitanium", 'R', ModItems.wire_red_copper, 'F', Item.getItemFromBlock(ModBlocks.machine_difurnace_off), 'C', ModItems.coil_tungsten })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_battery), 1), new Object[] { "TST", "RIR", "TLT", 'T', "ingotTungsten", 'I', "ingotRedstoneAlloy", 'R', ModItems.wire_red_copper, 'S', "blockSulfur", 'L', "blockLead" })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_battery), 1), new Object[] { "TLT", "RIR", "TST", 'T', "ingotTungsten", 'I', "ingotRedstoneAlloy", 'R', ModItems.wire_red_copper, 'S', "blockSulfur", 'L', "blockLead" })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_coal_off), 1), new Object[] { "STS", "SCS", "SFS", 'S', "ingotSteel", 'T', ModItems.tank_steel, 'C', "ingotRedstoneAlloy", 'F', Blocks.furnace })); - //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_converter_he_rf), 1), new Object[] { "SSS", "CRC", "SSS", 'S', "ingotSteel", 'C', ModItems.coil_copper, 'R', ModItems.coil_copper_torus })); - //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_converter_rf_he), 1), new Object[] { "SSS", "CRC", "SSS", 'S', ModItems.ingot_beryllium, 'C', ModItems.coil_copper, 'R', ModItems.coil_copper_torus }); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_coal_off, 1), new Object[] { "STS", "SCS", "SFS", 'S', "ingotSteel", 'T', ModItems.tank_steel, 'C', "ingotRedstoneAlloy", 'F', Blocks.furnace })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_converter_he_rf, 1), new Object[] { "SSS", "CRB", "SSS", 'S', "ingotSteel", 'C', ModItems.coil_copper, 'R', ModItems.coil_copper_torus, 'B', "blockRedstone" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_converter_rf_he, 1), new Object[] { "SSS", "BRC", "SSS", 'S', ModItems.ingot_beryllium, 'C', ModItems.coil_copper, 'R', ModItems.coil_copper_torus, 'B', "blockRedstone" })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_schrabidium_transmutator), 1), new Object[] { "TST", "ARA", "BBB", 'S', ModItems.nugget_schrabidium , 'T', "ingotTitanium", 'A', Item.getItemFromBlock(ModBlocks.factory_advanced_hull), 'R', Item.getItemFromBlock(ModBlocks.machine_reactor), 'B', Item.getItemFromBlock(ModBlocks.machine_battery) })); //GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_diesel), 1), new Object[] { "HTH", "PRP", "SFS", 'S', "ingotSteel", 'T', ModItems.tank_steel, 'H', ModItems.hull_small_steel, 'P', Item.getItemFromBlock(Blocks.piston), 'R', "ingotRedstoneAlloy", 'F', Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off) })); //GameRegistry.addRecipe(new ItemStack(Item.getItemFromBlock(ModBlocks.machine_shredder), 1), new Object[] { "SHS", "MBM", "CFC", 'H', ModItems.hull_big_steel, 'S', ModBlocks.steel_beam, 'M', ModItems.motor, 'B', Blocks.iron_bars, 'C', ModBlocks.red_wire_coated, 'F', Item.getItemFromBlock(ModBlocks.machine_electric_furnace_off) }); @@ -1240,14 +1240,14 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModItems.powder_desh_mix, 9), new Object[] { ModItems.powder_actinium, ModItems.powder_actinium, ModItems.powder_lanthanium, ModItems.powder_lanthanium, ModItems.powder_cerium, ModItems.powder_cobalt, ModItems.powder_lithium, ModItems.powder_neodymium, ModItems.powder_niobium }); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.dynosphere_base), new Object[] { "RPR", "PBP", "RPR", 'R', "dustRedAlloy", 'P', "plateSteel", 'B', "blockRedstone" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.dynosphere_base), new Object[] { "RPR", "PBP", "RPR", 'R', "dustRedstoneAlloy", 'P', "plateSteel", 'B', "blockRedstone" })); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.dynosphere_desh), new Object[] { "RPR", "PBP", "RPR", 'R', ModItems.powder_desh_mix, 'P', "ingotDesh", 'B', ModItems.dynosphere_base })); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.dynosphere_schrabidium), new Object[] { "RPR", "PBP", "RPR", 'R', ModItems.powder_power, 'P', "ingotSchrabidium", 'B', ModItems.dynosphere_desh_charged })); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.dynosphere_euphemium), new Object[] { "RPR", "PBP", "RPR", 'R', ModItems.powder_nitan_mix, 'P', "ingotEuphemium", 'B', ModItems.dynosphere_schrabidium_charged })); GameRegistry.addRecipe(new ShapedOreRecipe(ItemBattery.getEmptyBattery(ModItems.dynosphere_dineutronium), new Object[] { "RPR", "PBP", "RPR", 'R', ModItems.powder_spark_mix, 'P', "ingotDineutronium", 'B', ModItems.dynosphere_euphemium_charged })); //Temporary Crappy Recipes - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_pip, 1), new Object[] { " G ", "SSP", " TI", 'G', Blocks.glass_pane, 'S', "plateSteel", 'P', ModItems.mechanism_revolver_2, 'T', ModItems.wire_tungsten, 'I', "ingotPolymer" })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_pip, 1), new Object[] { " G ", "SSP", " TI", 'G', "paneGlass", 'S', "plateSteel", 'P', ModItems.mechanism_revolver_2, 'T', ModItems.wire_tungsten, 'I', "ingotPolymer" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_revolver_pip_ammo, 1), new Object[] { "S", "G", "C", 'S', "plateSteel", 'G', Items.gunpowder, 'C', "plateCopper" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.plate_dineutronium, 4), new Object[] { "PIP", "IDI", "PIP", 'P', ModItems.powder_spark_mix, 'I', "ingotDineutronium", 'D', "ingotDesh" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.plate_desh, 4), new Object[] { "PIP", "IDI", "PIP", 'P', ModItems.powder_polymer, 'I', "ingotDesh", 'D', "ingotDuraSteel" })); @@ -1289,7 +1289,10 @@ public class CraftingManager { GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.machine_spp_bottom), new Object[] { ModBlocks.machine_spp_top }); GameRegistry.addShapelessRecipe(new ItemStack(ModBlocks.machine_spp_top), new Object[] { ModBlocks.machine_spp_bottom }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_b93), new Object[] { "PCE", "SEB", "PCE", 'P', "plateDineutronium", 'C', ModItems.weaponized_starblaster_cell, 'E', ModItems.component_emitter, 'B', ModItems.gun_b92, 'S', ModItems.singularity_spark })); - GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_transformer), new Object[] { "SDS", "MCM", "MCM", 'S', ModItems.ingot_starmetal, 'D', "ingotDesh", 'M', ModBlocks.fusion_conductor, 'C', ModItems.circuit_targeting_tier6 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_transformer), new Object[] { "SDS", "MCM", "MCM", 'S', "ingotIron", 'D', "ingotRedstoneAlloy", 'M',ModItems.coil_advanced_alloy, 'C', ModItems.circuit_copper })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_transformer_20), new Object[] { "SDS", "MCM", "MCM", 'S', "ingotIron", 'D', "ingotRedstoneAlloy", 'M', ModItems.coil_copper, 'C', ModItems.circuit_copper })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_transformer_dnt), new Object[] { "SDS", "MCM", "MCM", 'S', ModItems.ingot_starmetal, 'D', "ingotDesh", 'M', ModBlocks.fwatz_conductor, 'C', ModItems.circuit_targeting_tier6 })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.machine_transformer_dnt_20), new Object[] { "SDS", "MCM", "MCM", 'S', ModItems.ingot_starmetal, 'D', "ingotDesh", 'M', ModBlocks.fusion_conductor, 'C', ModItems.circuit_targeting_tier6 })); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.bottle_sparkle), new Object[] { ModItems.bottle_quantum, Items.carrot, Items.gold_nugget }); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.grenade_nuke), new Object[] { "CGC", "CGC", "PAP", 'C', ModBlocks.det_charge, 'G', ModItems.grenade_mk2, 'P', "plateAdvanced", 'A', Blocks.anvil })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModBlocks.radiobox), new Object[] { "-C-", "8OI", "EUE", '-', ModItems.plate_polymer, 'C', ModItems.circuit_targeting_tier4, '8', ModItems.coil_gold, 'O', ModItems.pellet_rtg, 'I', ModItems.fuse, 'E', "plateSteel", 'U', ModItems.rtg_unit })); @@ -1312,6 +1315,7 @@ public class CraftingManager { GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_calamity, 1), new Object[] { " PI", "BBM", " PI", 'P', "plateIron", 'B', ModItems.pipes_steel, 'M', ModItems.mechanism_rifle_1, 'I', "ingotSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_calamity_dual, 1), new Object[] { "BBM", " PI", "BBM", 'P', "plateIron", 'B', ModItems.pipes_steel, 'M', ModItems.mechanism_rifle_1, 'I', "ingotSteel" })); GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.gun_calamity_ammo, 8), new Object[] { "S", "C", "G", 'S', "plateSteel", 'C', "plateCopper", 'G', Items.gunpowder })); + GameRegistry.addRecipe(new ShapedOreRecipe(new ItemStack(ModItems.analyzer, 1), new Object[] { " S ", "SGS", " S ", 'S', "plateSteel", 'G', "paneGlassColorless" })); GameRegistry.addShapelessRecipe(new ItemStack(Items.paper, 1), new Object[] { new ItemStack(ModItems.assembly_template, 1, OreDictionary.WILDCARD_VALUE) }); GameRegistry.addShapelessRecipe(new ItemStack(Items.paper, 1), new Object[] { new ItemStack(ModItems.chemistry_template, 1, OreDictionary.WILDCARD_VALUE) }); diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index d6aa22421..9ff93b2c0 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -476,6 +476,7 @@ public class MainRegistry public static boolean enableMeteorTails = true; public static boolean enableSpecialMeteors = true; public static boolean enableBomberShortMode = false; + public static boolean enableVaults = true; public static int uraniumSpawn = 7; public static int titaniumSpawn = 8; @@ -523,6 +524,7 @@ public class MainRegistry public static int broadcaster = 5000; public static int minefreq = 64; public static int radfreq = 5000; + public static int vaultfreq = 2500; public static int meteorStrikeChance = 20 * 60 * 180; public static int meteorShowerChance = 20 * 60 * 5; public static int meteorShowerDuration = 6000; @@ -1554,6 +1556,7 @@ public class MainRegistry enableMeteorTails = config.get(Configuration.CATEGORY_GENERAL, "1.12_enableMeteorTails", true).getBoolean(true); enableSpecialMeteors = config.get(Configuration.CATEGORY_GENERAL, "1.13_enableSpecialMeteors", false).getBoolean(false); enableBomberShortMode = config.get(Configuration.CATEGORY_GENERAL, "1.14_enableBomberShortMode", false).getBoolean(false); + enableVaults = config.get(Configuration.CATEGORY_GENERAL, "1.15_enableVaultSpawn", true).getBoolean(true); Property PuraniumSpawn = config.get(Configuration.CATEGORY_GENERAL, "2.00_uraniumSpawnrate", 7); PuraniumSpawn.comment = "Ammount of uranium ore veins per chunk"; @@ -1677,6 +1680,9 @@ public class MainRegistry Property propRad = config.get(Configuration.CATEGORY_GENERAL, "4.15_radHotsoptSpawn", 5000); propRad.comment = "Spawn radiation hotspot on every nTH chunk"; radfreq = propRad.getInt(); + Property propVault = config.get(Configuration.CATEGORY_GENERAL, "4.16_vaultSpawn", 2500); + propVault.comment = "Spawn locked safe on every nTH chunk"; + vaultfreq = propVault.getInt(); Property propMeteorStrikeChance = config.get(Configuration.CATEGORY_GENERAL, "5.00_meteorStrikeChance", 20 * 60 * 180); propMeteorStrikeChance.comment = "The probability of a meteor spawning (an average of once every nTH ticks)"; diff --git a/com/hbm/tileentity/conductor/TileEntityFluidDuct.java b/com/hbm/tileentity/conductor/TileEntityFluidDuct.java index cf9b56422..46b86e90e 100644 --- a/com/hbm/tileentity/conductor/TileEntityFluidDuct.java +++ b/com/hbm/tileentity/conductor/TileEntityFluidDuct.java @@ -76,4 +76,9 @@ public class TileEntityFluidDuct extends TileEntity implements IFluidDuct { { return 65536.0D; } + + @Override + public FluidType getType() { + return type; + } } diff --git a/com/hbm/tileentity/conductor/TileEntityGasDuct.java b/com/hbm/tileentity/conductor/TileEntityGasDuct.java index 4377a440f..315e98d73 100644 --- a/com/hbm/tileentity/conductor/TileEntityGasDuct.java +++ b/com/hbm/tileentity/conductor/TileEntityGasDuct.java @@ -77,4 +77,9 @@ public class TileEntityGasDuct extends TileEntity implements IFluidDuct { { return 65536.0D; } + + @Override + public FluidType getType() { + return type; + } } diff --git a/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java b/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java index 775867e3d..67f55dc7d 100644 --- a/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java +++ b/com/hbm/tileentity/conductor/TileEntityGasDuctSolid.java @@ -15,4 +15,9 @@ public class TileEntityGasDuctSolid extends TileEntity implements IFluidDuct { public FluidType type = FluidType.GAS; public List uoteab = new ArrayList(); + @Override + public FluidType getType() { + return type; + } + } diff --git a/com/hbm/tileentity/conductor/TileEntityOilDuct.java b/com/hbm/tileentity/conductor/TileEntityOilDuct.java index 2fed9f5cb..03658112c 100644 --- a/com/hbm/tileentity/conductor/TileEntityOilDuct.java +++ b/com/hbm/tileentity/conductor/TileEntityOilDuct.java @@ -77,4 +77,9 @@ public class TileEntityOilDuct extends TileEntity implements IFluidDuct { { return 65536.0D; } + + @Override + public FluidType getType() { + return type; + } } diff --git a/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java b/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java index 31a024b4e..dc5d7cb26 100644 --- a/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java +++ b/com/hbm/tileentity/conductor/TileEntityOilDuctSolid.java @@ -16,4 +16,9 @@ public class TileEntityOilDuctSolid extends TileEntity implements IFluidDuct { public FluidType type = FluidType.OIL; public List uoteab = new ArrayList(); + @Override + public FluidType getType() { + return type; + } + } diff --git a/com/hbm/tileentity/machine/TileEntityAMSBase.java b/com/hbm/tileentity/machine/TileEntityAMSBase.java index 3e2a33a25..c653c0c4e 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSBase.java +++ b/com/hbm/tileentity/machine/TileEntityAMSBase.java @@ -565,7 +565,7 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS } @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -579,7 +579,7 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS } @Override - public void setAFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -591,7 +591,7 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS } @Override - public int getAFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -672,4 +672,15 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS { return 65536.0D; } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tanks[0]); + list.add(tanks[1]); + list.add(tanks[2]); + list.add(tanks[3]); + + return list; + } } diff --git a/com/hbm/tileentity/machine/TileEntityAMSEmitter.java b/com/hbm/tileentity/machine/TileEntityAMSEmitter.java index a111636c8..fd9945988 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSEmitter.java +++ b/com/hbm/tileentity/machine/TileEntityAMSEmitter.java @@ -1,5 +1,8 @@ package com.hbm.tileentity.machine; +import java.util.ArrayList; +import java.util.List; + import com.hbm.entity.particle.EntityGasFlameFX; import com.hbm.explosion.ExplosionLarge; import com.hbm.handler.FluidTypeHandler.FluidType; @@ -379,13 +382,13 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, } @Override - public void setAFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } @Override - public int getAFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tank.getTankType().name())) return tank.getFill(); else @@ -393,7 +396,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, } @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tank.getTankType().name())) return tank.getMaxFill(); else @@ -421,4 +424,12 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, { return 65536.0D; } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tank); + + return list; + } } diff --git a/com/hbm/tileentity/machine/TileEntityAMSLimiter.java b/com/hbm/tileentity/machine/TileEntityAMSLimiter.java index 912d78add..c2d7c88ff 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSLimiter.java +++ b/com/hbm/tileentity/machine/TileEntityAMSLimiter.java @@ -397,13 +397,13 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, } @Override - public void setAFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } @Override - public int getAFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tank.getTankType().name())) return tank.getFill(); else @@ -411,7 +411,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, } @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tank.getTankType().name())) return tank.getMaxFill(); else @@ -440,4 +440,12 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, return 65536.0D; } + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tank); + + return list; + } + } diff --git a/com/hbm/tileentity/machine/TileEntityFWatzCore.java b/com/hbm/tileentity/machine/TileEntityFWatzCore.java index 47a33812b..29756a8e0 100644 --- a/com/hbm/tileentity/machine/TileEntityFWatzCore.java +++ b/com/hbm/tileentity/machine/TileEntityFWatzCore.java @@ -437,7 +437,7 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, } @Override - public void setAFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[1].getTankType().name())) tanks[1].setFill(i); else if(type.name().equals(tanks[2].getTankType().name())) @@ -445,7 +445,7 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, } @Override - public int getAFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[1].getTankType().name())) return tanks[1].getFill(); else if(type.name().equals(tanks[2].getTankType().name())) @@ -455,7 +455,7 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, } @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[1].getTankType().name())) return tanks[1].getMaxFill(); else if(type.name().equals(tanks[2].getTankType().name())) @@ -463,4 +463,14 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, else return 0; } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tanks[0]); + list.add(tanks[1]); + list.add(tanks[2]); + + return list; + } } diff --git a/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java b/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java index cbf6978bf..3fe8f1c6a 100644 --- a/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java +++ b/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java @@ -1260,7 +1260,7 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve } @Override - public void setAFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -1270,7 +1270,7 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve } @Override - public int getAFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -1282,7 +1282,7 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve } @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -1293,4 +1293,14 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve return 0; } + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tanks[0]); + list.add(tanks[1]); + list.add(tanks[2]); + + return list; + } + } diff --git a/com/hbm/tileentity/machine/TileEntityLockableBase.java b/com/hbm/tileentity/machine/TileEntityLockableBase.java index e45e4d445..87e278a70 100644 --- a/com/hbm/tileentity/machine/TileEntityLockableBase.java +++ b/com/hbm/tileentity/machine/TileEntityLockableBase.java @@ -34,10 +34,18 @@ public abstract class TileEntityLockableBase extends TileEntity { lock = pins; } + public int getPins() { + return lock; + } + public void setMod(double mod) { lockMod = mod; } + public double getMod() { + return lockMod; + } + @Override public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); diff --git a/com/hbm/tileentity/machine/TileEntityMachineBattery.java b/com/hbm/tileentity/machine/TileEntityMachineBattery.java index f5dece727..b69c5a47f 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineBattery.java +++ b/com/hbm/tileentity/machine/TileEntityMachineBattery.java @@ -35,8 +35,9 @@ public class TileEntityMachineBattery extends TileEntity implements ISidedInvent private String customName; - public TileEntityMachineBattery() { + public TileEntityMachineBattery(long maxPower) { slots = new ItemStack[2]; + this.maxPower = maxPower; } @Override @@ -216,8 +217,10 @@ public class TileEntityMachineBattery extends TileEntity implements ISidedInvent @Override public void updateEntity() { - if(worldObj.getBlock(xCoord, yCoord, zCoord) instanceof MachineBattery) { + if(worldObj.getBlock(xCoord, yCoord, zCoord) instanceof MachineBattery && !worldObj.isRemote) { this.maxPower = ((MachineBattery)worldObj.getBlock(xCoord, yCoord, zCoord)).maxPower; + + conducts = worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord); if(this.conducts) { @@ -231,12 +234,10 @@ public class TileEntityMachineBattery extends TileEntity implements ISidedInvent ffgeuaInit(); } - if(!worldObj.isRemote) { - power = Library.chargeTEFromItems(slots, 0, power, maxPower); - power = Library.chargeItemsFromTE(slots, 1, power, maxPower); + power = Library.chargeTEFromItems(slots, 0, power, maxPower); + power = Library.chargeItemsFromTE(slots, 1, power, maxPower); - PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power)); - } + PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power)); } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java b/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java index df17a2f06..556681b6b 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java +++ b/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java @@ -1,5 +1,8 @@ package com.hbm.tileentity.machine; +import java.util.ArrayList; +import java.util.List; + import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IConsumer; import com.hbm.interfaces.IFluidAcceptor; @@ -331,18 +334,26 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv } @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; } @Override - public int getAFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public void setAFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tank); + + return list; + } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineChemplant.java b/com/hbm/tileentity/machine/TileEntityMachineChemplant.java index 1541b1873..3e0f25164 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineChemplant.java +++ b/com/hbm/tileentity/machine/TileEntityMachineChemplant.java @@ -810,34 +810,24 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve } @Override - public void setAFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) tanks[1].setFill(i); - } - - @Override - public int getAFluidFill(FluidType type) { - if(type.name().equals(tanks[0].getTankType().name())) - return tanks[0].getFill(); - else if(type.name().equals(tanks[1].getTankType().name())) - return tanks[1].getFill(); - else - return 0; - } - - @Override - public void setSFluidFill(int i, FluidType type) { - if(type.name().equals(tanks[2].getTankType().name())) + else if(type.name().equals(tanks[2].getTankType().name())) tanks[2].setFill(i); else if(type.name().equals(tanks[3].getTankType().name())) tanks[3].setFill(i); } @Override - public int getSFluidFill(FluidType type) { - if(type.name().equals(tanks[2].getTankType().name())) + public int getFluidFill(FluidType type) { + if(type.name().equals(tanks[0].getTankType().name())) + return tanks[0].getFill(); + else if(type.name().equals(tanks[1].getTankType().name())) + return tanks[1].getFill(); + else if(type.name().equals(tanks[2].getTankType().name())) return tanks[2].getFill(); else if(type.name().equals(tanks[3].getTankType().name())) return tanks[3].getFill(); @@ -846,7 +836,7 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve } @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -917,4 +907,15 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve if(type.name().equals(tanks[3].getTankType().name())) list2.clear(); } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tanks[0]); + list.add(tanks[1]); + list.add(tanks[2]); + list.add(tanks[3]); + + return list; + } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineCoal.java b/com/hbm/tileentity/machine/TileEntityMachineCoal.java index 686b1ded9..5edf77b0a 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineCoal.java +++ b/com/hbm/tileentity/machine/TileEntityMachineCoal.java @@ -350,18 +350,18 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory } @Override - public void setAFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } @Override - public int getAFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; } @@ -374,4 +374,12 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory public void setType(FluidType type, int index) { tank.setTankType(type); } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tank); + + return list; + } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineDiesel.java b/com/hbm/tileentity/machine/TileEntityMachineDiesel.java index bfc8b92f4..a1725e7de 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineDiesel.java +++ b/com/hbm/tileentity/machine/TileEntityMachineDiesel.java @@ -345,18 +345,26 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento } @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; } @Override - public int getAFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public void setAFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tank); + + return list; + } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java b/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java index cbed3b551..3e2223119 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java +++ b/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java @@ -241,7 +241,7 @@ public class TileEntityMachineFluidTank extends TileEntity implements ISidedInve } @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; } @@ -272,12 +272,12 @@ public class TileEntityMachineFluidTank extends TileEntity implements ISidedInve } @Override - public int getAFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public void setAFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } @@ -293,13 +293,10 @@ public class TileEntityMachineFluidTank extends TileEntity implements ISidedInve } @Override - public int getSFluidFill(FluidType type) { - return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; - } - - @Override - public void setSFluidFill(int i, FluidType type) { - if(type.name().equals(tank.getTankType().name())) - tank.setFill(i); + public List getTanks() { + List list = new ArrayList(); + list.add(tank); + + return list; } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineGasCent.java b/com/hbm/tileentity/machine/TileEntityMachineGasCent.java index 0d0207cb0..97fe4ed0a 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineGasCent.java +++ b/com/hbm/tileentity/machine/TileEntityMachineGasCent.java @@ -351,19 +351,27 @@ public class TileEntityMachineGasCent extends TileEntity implements ISidedInvent } @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; } @Override - public int getAFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public void setAFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tank); + + return list; + } + } diff --git a/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java b/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java index 9d91cdd0a..d1af80e12 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java +++ b/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java @@ -312,18 +312,26 @@ public class TileEntityMachineGasFlare extends TileEntity implements ISidedInven } @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; } @Override - public int getAFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public void setAFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tank); + + return list; + } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineGenerator.java b/com/hbm/tileentity/machine/TileEntityMachineGenerator.java index debe1822a..70a432e4d 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineGenerator.java +++ b/com/hbm/tileentity/machine/TileEntityMachineGenerator.java @@ -589,7 +589,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve } @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -599,7 +599,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve } @Override - public void setAFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -607,7 +607,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve } @Override - public int getAFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -627,4 +627,13 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve if(index < 2 && tanks[index] != null) tanks[index].setTankType(type); } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tanks[0]); + list.add(tanks[1]); + + return list; + } } \ No newline at end of file diff --git a/com/hbm/tileentity/machine/TileEntityMachineInserter.java b/com/hbm/tileentity/machine/TileEntityMachineInserter.java index ab99d0363..6105a31e6 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineInserter.java +++ b/com/hbm/tileentity/machine/TileEntityMachineInserter.java @@ -294,7 +294,7 @@ public class TileEntityMachineInserter extends TileEntity implements ISidedInven } @Override - public void setAFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -304,7 +304,7 @@ public class TileEntityMachineInserter extends TileEntity implements ISidedInven } @Override - public int getAFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -316,29 +316,7 @@ public class TileEntityMachineInserter extends TileEntity implements ISidedInven } @Override - public void setSFluidFill(int i, FluidType type) { - if(type.name().equals(tanks[0].getTankType().name())) - tanks[0].setFill(i); - else if(type.name().equals(tanks[1].getTankType().name())) - tanks[1].setFill(i); - else if(type.name().equals(tanks[2].getTankType().name())) - tanks[2].setFill(i); - } - - @Override - public int getSFluidFill(FluidType type) { - if(type.name().equals(tanks[0].getTankType().name())) - return tanks[0].getFill(); - else if(type.name().equals(tanks[1].getTankType().name())) - return tanks[1].getFill(); - else if(type.name().equals(tanks[2].getTankType().name())) - return tanks[2].getFill(); - - return 0; - } - - @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -369,4 +347,14 @@ public class TileEntityMachineInserter extends TileEntity implements ISidedInven if(type.name().equals(tanks[2].getTankType().name())) list3.clear(); } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tanks[0]); + list.add(tanks[1]); + list.add(tanks[2]); + + return list; + } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineOilWell.java b/com/hbm/tileentity/machine/TileEntityMachineOilWell.java index 9947a80de..6620b1540 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineOilWell.java +++ b/com/hbm/tileentity/machine/TileEntityMachineOilWell.java @@ -477,7 +477,7 @@ public class TileEntityMachineOilWell extends TileEntity implements ISidedInvent } @Override - public int getSFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -487,7 +487,7 @@ public class TileEntityMachineOilWell extends TileEntity implements ISidedInvent } @Override - public void setSFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -523,4 +523,13 @@ public class TileEntityMachineOilWell extends TileEntity implements ISidedInvent tanks[index].setTankType(type); } + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tanks[0]); + list.add(tanks[1]); + + return list; + } + } diff --git a/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java b/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java index 8086d7592..45e39e1cf 100644 --- a/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java +++ b/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java @@ -1,5 +1,8 @@ package com.hbm.tileentity.machine; +import java.util.ArrayList; +import java.util.List; + import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidTank; @@ -216,4 +219,23 @@ public class TileEntityMachinePuF6Tank extends TileEntity implements ISidedInven public void setType(FluidType type, int index) { tank.setTankType(type); } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tank); + + return list; + } + + @Override + public int getFluidFill(FluidType type) { + return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; + } + + @Override + public void setFluidFill(int i, FluidType type) { + if(type.name().equals(tank.getTankType().name())) + tank.setFill(i); + } } diff --git a/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java b/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java index 36f81cc94..4b38494f0 100644 --- a/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java +++ b/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java @@ -503,7 +503,7 @@ public class TileEntityMachinePumpjack extends TileEntity implements ISidedInven } @Override - public int getSFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -513,7 +513,7 @@ public class TileEntityMachinePumpjack extends TileEntity implements ISidedInven } @Override - public void setSFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -548,4 +548,13 @@ public class TileEntityMachinePumpjack extends TileEntity implements ISidedInven if(index < 2 && tanks[index] != null) tanks[index].setTankType(type); } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tanks[0]); + list.add(tanks[1]); + + return list; + } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java b/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java index 75c63eae8..3046620cc 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java +++ b/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java @@ -599,7 +599,7 @@ public class TileEntityMachineReactorSmall extends TileEntity } @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { if (type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else if (type.name().equals(tanks[1].getTankType().name())) @@ -609,7 +609,7 @@ public class TileEntityMachineReactorSmall extends TileEntity } @Override - public void setAFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if (type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if (type.name().equals(tanks[1].getTankType().name())) @@ -617,7 +617,7 @@ public class TileEntityMachineReactorSmall extends TileEntity } @Override - public int getAFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { if (type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if (type.name().equals(tanks[1].getTankType().name())) @@ -638,6 +638,15 @@ public class TileEntityMachineReactorSmall extends TileEntity tanks[index].setTankType(type); } + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tanks[0]); + list.add(tanks[1]); + + return list; + } + @Override public AxisAlignedBB getRenderBoundingBox() { return TileEntity.INFINITE_EXTENT_AABB; diff --git a/com/hbm/tileentity/machine/TileEntityMachineRefinery.java b/com/hbm/tileentity/machine/TileEntityMachineRefinery.java index 0aeb5c555..b0b47d9d0 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineRefinery.java +++ b/com/hbm/tileentity/machine/TileEntityMachineRefinery.java @@ -360,8 +360,10 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven } @Override - public int getSFluidFill(FluidType type) { - if(type.name().equals(tanks[1].getTankType().name())) + public int getFluidFill(FluidType type) { + if(type.name().equals(tanks[0].getTankType().name())) + return tanks[0].getFill(); + else if(type.name().equals(tanks[1].getTankType().name())) return tanks[1].getFill(); else if(type.name().equals(tanks[2].getTankType().name())) return tanks[2].getFill(); @@ -374,8 +376,10 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven } @Override - public void setSFluidFill(int i, FluidType type) { - if(type.name().equals(tanks[1].getTankType().name())) + public void setFluidFill(int i, FluidType type) { + if(type.name().equals(tanks[0].getTankType().name())) + tanks[0].setFill(i); + else if(type.name().equals(tanks[1].getTankType().name())) tanks[1].setFill(i); else if(type.name().equals(tanks[2].getTankType().name())) tanks[2].setFill(i); @@ -411,21 +415,7 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven } @Override - public void setAFluidFill(int i, FluidType type) { - if(type.name().equals(tanks[0].getTankType().name())) - tanks[0].setFill(i); - } - - @Override - public int getAFluidFill(FluidType type) { - if(type.name().equals(tanks[0].getTankType().name())) - return tanks[0].getFill(); - else - return 0; - } - - @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else @@ -443,6 +433,18 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven if(index < 5 && tanks[index] != null) tanks[index].setTankType(type); } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tanks[0]); + list.add(tanks[1]); + list.add(tanks[2]); + list.add(tanks[3]); + list.add(tanks[4]); + + return list; + } @Override public AxisAlignedBB getRenderBoundingBox() { diff --git a/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java b/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java index 42e7afa9c..999f1ae19 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java +++ b/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java @@ -362,18 +362,26 @@ public class TileEntityMachineSeleniumEngine extends TileEntity implements ISide } @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; } @Override - public int getAFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public void setAFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tank); + + return list; + } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineTransformer.java b/com/hbm/tileentity/machine/TileEntityMachineTransformer.java index d4b40d7c3..06f4bf5ea 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineTransformer.java +++ b/com/hbm/tileentity/machine/TileEntityMachineTransformer.java @@ -16,30 +16,64 @@ import net.minecraft.tileentity.TileEntity; public class TileEntityMachineTransformer extends TileEntity implements ISource, IConsumer { public long power; - public static final long maxPower = 1000000000000000L; + public long maxPower = 10000; + public int delay = 1; public List list = new ArrayList(); boolean tact; + int age; + + public TileEntityMachineTransformer(long buffer, int d) { + maxPower = buffer; + delay = d; + } @Override public void readFromNBT(NBTTagCompound nbt) { super.readFromNBT(nbt); this.power = nbt.getLong("powerTime"); + this.maxPower = nbt.getLong("maxPower"); + this.delay = nbt.getInteger("delay"); } @Override public void writeToNBT(NBTTagCompound nbt) { super.writeToNBT(nbt); nbt.setLong("powerTime", power); + nbt.setLong("maxPower", maxPower); + nbt.setInteger("delay", delay); } @Override public void updateEntity() { - tact = true; - ffgeuaInit(); - tact = false; - ffgeuaInit(); + + if(!worldObj.isRemote) { + + age++; + + if(age == delay) { + + maxPower /= (20D / delay); + long saved = 0; + + if(power > maxPower) { + saved = power - maxPower; + power = maxPower; + } + + tact = true; + ffgeuaInit(); + tact = false; + ffgeuaInit(); + + age = 0; + + maxPower *= (20D / delay); + + power += saved; + } + } } @Override diff --git a/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java b/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java index de02605ae..4c222f0c7 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java +++ b/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java @@ -545,17 +545,17 @@ public class TileEntityMachineTurbofan extends TileEntity implements ISidedInven } @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; } @Override - public int getAFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; } @Override - public void setAFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tank.getTankType().name())) tank.setFill(i); } @@ -571,4 +571,12 @@ public class TileEntityMachineTurbofan extends TileEntity implements ISidedInven { return 65536.0D; } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tank); + + return list; + } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java b/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java index baa2d5af9..ac696d466 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java +++ b/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java @@ -1,5 +1,8 @@ package com.hbm.tileentity.machine; +import java.util.ArrayList; +import java.util.List; + import com.hbm.handler.FluidTypeHandler.FluidType; import com.hbm.interfaces.IFluidContainer; import com.hbm.inventory.FluidTank; @@ -218,4 +221,23 @@ public class TileEntityMachineUF6Tank extends TileEntity implements ISidedInvent public void setType(FluidType type, int index) { tank.setTankType(type); } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tank); + + return list; + } + + @Override + public int getFluidFill(FluidType type) { + return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0; + } + + @Override + public void setFluidFill(int i, FluidType type) { + if(type.name().equals(tank.getTankType().name())) + tank.setFill(i); + } } diff --git a/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java b/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java index edd91ef77..e1558ad48 100644 --- a/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java +++ b/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java @@ -717,7 +717,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv } @Override - public void setAFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) tanks[0].setFill(i); else if(type.name().equals(tanks[1].getTankType().name())) @@ -725,7 +725,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv } @Override - public int getAFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -735,7 +735,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv } @Override - public int getMaxAFluidFill(FluidType type) { + public int getMaxFluidFill(FluidType type) { if(type.name().equals(tanks[0].getTankType().name())) return tanks[0].getMaxFill(); else if(type.name().equals(tanks[1].getTankType().name())) @@ -743,4 +743,13 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv else return 0; } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tanks[0]); + list.add(tanks[1]); + + return list; + } } diff --git a/com/hbm/tileentity/machine/TileEntityWatzCore.java b/com/hbm/tileentity/machine/TileEntityWatzCore.java index 7e2e5bd12..f6002ce2d 100644 --- a/com/hbm/tileentity/machine/TileEntityWatzCore.java +++ b/com/hbm/tileentity/machine/TileEntityWatzCore.java @@ -747,11 +747,11 @@ public class TileEntityWatzCore extends TileEntity implements ISidedInventory, I Library.transmitFluid(x, y, z, newTact, this, worldObj, type); } @Override - public int getSFluidFill(FluidType type) { + public int getFluidFill(FluidType type) { return tank.getFill(); } @Override - public void setSFluidFill(int i, FluidType type) { + public void setFluidFill(int i, FluidType type) { tank.setFill(i); } @Override @@ -762,4 +762,12 @@ public class TileEntityWatzCore extends TileEntity implements ISidedInventory, I public void clearFluidList(FluidType type) { list1.clear(); } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tank); + + return list; + } }