From f11ea407f198f2e8fc1e3ac7e7083c08fcab113e Mon Sep 17 00:00:00 2001 From: HbmMods Date: Sun, 5 Apr 2020 19:09:03 +0200 Subject: [PATCH] dynamic barrels, extended fluid properties, new textures --- assets/hbm/lang/de_DE.lang | 8 +- assets/hbm/lang/en_US.lang | 8 +- assets/hbm/textures/blocks/barrel_Iron.png | Bin 0 -> 1046 bytes .../hbm/textures/blocks/barrel_antimatter.png | Bin 0 -> 966 bytes .../hbm/textures/blocks/barrel_corroded.png | Bin 0 -> 2655 bytes assets/hbm/textures/blocks/barrel_plastic.png | Bin 0 -> 1114 bytes assets/hbm/textures/blocks/barrel_red.png | Bin 584 -> 1060 bytes assets/hbm/textures/blocks/barrel_steel.png | Bin 0 -> 926 bytes assets/hbm/textures/blocks/barrel_yellow.png | Bin 1075 -> 1269 bytes .../hbm/textures/gui/storage/gui_barrel.png | Bin 0 -> 2842 bytes .../gui/{ => storage}/gui_battery.png | Bin .../textures/gui/{ => storage}/gui_tank.png | Bin assets/hbm/textures/items/ingot_aluminium.png | Bin 415 -> 445 bytes assets/hbm/textures/items/ingot_copper.png | Bin 386 -> 400 bytes .../hbm/textures/items/neutron_reflector.png | Bin 319 -> 325 bytes assets/hbm/textures/items/plate2grayscale.png | Bin 0 -> 358 bytes assets/hbm/textures/items/plate_aluminium.png | Bin 393 -> 0 bytes .../textures/items/plate_aluminium_old.png | Bin 470 -> 0 bytes assets/hbm/textures/items/plate_aluminum.png | Bin 0 -> 380 bytes assets/hbm/textures/items/plate_copper.png | Bin 366 -> 382 bytes assets/hbm/textures/items/plate_desh.png | Bin 291 -> 416 bytes .../hbm/textures/items/plate_dineutronium.png | Bin 323 -> 447 bytes assets/hbm/textures/items/plate_euphemium.png | Bin 387 -> 452 bytes assets/hbm/textures/items/plate_kevlar.png | Bin 362 -> 404 bytes assets/hbm/textures/items/plate_mixed.png | Bin 398 -> 480 bytes assets/hbm/textures/items/plate_polymer.png | Bin 263 -> 350 bytes assets/hbm/textures/items/plate_steel_old.png | Bin 474 -> 0 bytes .../hbm/textures/items/plate_titanium_old.png | Bin 480 -> 0 bytes assets/hbm/textures/items/powder_copper.png | Bin 360 -> 374 bytes com/hbm/blocks/ModBlocks.java | 27 +++- com/hbm/blocks/bomb/CheaterVirus.java | 5 +- com/hbm/blocks/bomb/CheaterVirusSeed.java | 8 ++ com/hbm/blocks/bomb/CrystalVirus.java | 4 +- com/hbm/blocks/machine/BlockFluidBarrel.java | 122 ++++++++++++++++++ com/hbm/handler/FluidTypeHandler.java | 55 ++++++-- com/hbm/inventory/FluidTank.java | 5 +- com/hbm/inventory/gui/GUIMachineBattery.java | 2 +- .../inventory/gui/GUIMachineFluidTank.java | 2 +- com/hbm/items/special/ItemBlockLore.java | 38 ++++++ com/hbm/items/special/ItemTaintBlock.java | 8 -- com/hbm/main/MainRegistry.java | 5 +- .../bomb/TileEntityCompactLauncher.java | 2 +- .../bomb/TileEntityLaunchTable.java | 2 +- .../tileentity/machine/TileEntityAMSBase.java | 2 +- .../machine/TileEntityAMSEmitter.java | 2 +- .../machine/TileEntityAMSLimiter.java | 2 +- .../tileentity/machine/TileEntityBarrel.java | 103 +++++++++++++++ .../machine/TileEntityCoreEmitter.java | 8 +- .../machine/TileEntityCoreInjector.java | 4 +- .../machine/TileEntityCoreReceiver.java | 2 +- .../machine/TileEntityFWatzCore.java | 2 +- .../machine/TileEntityFusionMultiblock.java | 2 +- .../machine/TileEntityMachineBoiler.java | 2 +- .../TileEntityMachineBoilerElectric.java | 2 +- .../machine/TileEntityMachineCMBFactory.java | 2 +- .../machine/TileEntityMachineChemplant.java | 2 +- .../machine/TileEntityMachineCoal.java | 2 +- .../machine/TileEntityMachineDiesel.java | 2 +- .../machine/TileEntityMachineFluidTank.java | 2 +- .../machine/TileEntityMachineGasCent.java | 2 +- .../machine/TileEntityMachineGasFlare.java | 2 +- .../machine/TileEntityMachineGenerator.java | 2 +- .../machine/TileEntityMachineInserter.java | 6 +- .../machine/TileEntityMachineOilWell.java | 2 +- .../machine/TileEntityMachinePuF6Tank.java | 2 +- .../machine/TileEntityMachinePumpjack.java | 2 +- .../TileEntityMachineReactorLarge.java | 3 +- .../TileEntityMachineReactorSmall.java | 2 +- .../TileEntityMachineReactorSmallOld.java | 2 +- .../machine/TileEntityMachineRefinery.java | 2 +- .../TileEntityMachineSeleniumEngine.java | 2 +- .../machine/TileEntityMachineTurbine.java | 2 +- .../machine/TileEntityMachineTurbofan.java | 2 +- .../machine/TileEntityMachineUF6Tank.java | 2 +- .../machine/TileEntityReactorMultiblock.java | 2 +- .../machine/TileEntitySoyuzLauncher.java | 2 +- .../machine/TileEntityWatzCore.java | 2 +- 77 files changed, 405 insertions(+), 78 deletions(-) create mode 100644 assets/hbm/textures/blocks/barrel_Iron.png create mode 100644 assets/hbm/textures/blocks/barrel_antimatter.png create mode 100644 assets/hbm/textures/blocks/barrel_corroded.png create mode 100644 assets/hbm/textures/blocks/barrel_plastic.png create mode 100644 assets/hbm/textures/blocks/barrel_steel.png create mode 100644 assets/hbm/textures/gui/storage/gui_barrel.png rename assets/hbm/textures/gui/{ => storage}/gui_battery.png (100%) rename assets/hbm/textures/gui/{ => storage}/gui_tank.png (100%) create mode 100644 assets/hbm/textures/items/plate2grayscale.png delete mode 100644 assets/hbm/textures/items/plate_aluminium.png delete mode 100644 assets/hbm/textures/items/plate_aluminium_old.png create mode 100644 assets/hbm/textures/items/plate_aluminum.png delete mode 100644 assets/hbm/textures/items/plate_steel_old.png delete mode 100644 assets/hbm/textures/items/plate_titanium_old.png create mode 100644 com/hbm/blocks/machine/BlockFluidBarrel.java create mode 100644 com/hbm/items/special/ItemBlockLore.java create mode 100644 com/hbm/tileentity/machine/TileEntityBarrel.java diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang index 717e31c06..225e7b11e 100644 --- a/assets/hbm/lang/de_DE.lang +++ b/assets/hbm/lang/de_DE.lang @@ -2255,10 +2255,10 @@ item.ams_muzzle.name=Strahlenemissions-Mündung item.ams_lens.name=Stabilisierer-Linse -item.ams_core_sing.name=Vibrierende Singularität (AMS-Kern) -item.ams_core_wormhole.name=Winziges Wurmloch (AMS-Kern) -item.ams_core_eyeofharmony.name=Auge der Harmonie (AMS-Kern) -item.ams_core_thingy.name=Dings (AMS-Kern) +item.ams_core_sing.name=Vibrierende Singularität (AMS/DFC-Kern) +item.ams_core_wormhole.name=Winziges Wurmloch (AMS/DFC-Kern) +item.ams_core_eyeofharmony.name=Auge der Harmonie (AMS/DFC-Kern) +item.ams_core_thingy.name=Dings (AMS/DFC-Kern) item.crystal_energy.name=Energiekristall item.pellet_coolant.name=Kühlcluster diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang index 37a4af8f1..bc2caba4d 100644 --- a/assets/hbm/lang/en_US.lang +++ b/assets/hbm/lang/en_US.lang @@ -2255,10 +2255,10 @@ item.ams_muzzle.name=Ray-Emission Muzzle item.ams_lens.name=Stabilizer Lens -item.ams_core_sing.name=Vibrant Singularity (AMS Core) -item.ams_core_wormhole.name=Tiny Wormhole (AMS Core) -item.ams_core_eyeofharmony.name=Eye of Harmony (AMS Core) -item.ams_core_thingy.name=Thingy (AMS Core) +item.ams_core_sing.name=Vibrant Singularity (AMS/DFC Core) +item.ams_core_wormhole.name=Tiny Wormhole (AMS/DFC Core) +item.ams_core_eyeofharmony.name=Eye of Harmony (AMS/DFC Core) +item.ams_core_thingy.name=Thingy (AMS/DFC Core) item.crystal_energy.name=Energy Crystal item.pellet_coolant.name=Coolant Cluster diff --git a/assets/hbm/textures/blocks/barrel_Iron.png b/assets/hbm/textures/blocks/barrel_Iron.png new file mode 100644 index 0000000000000000000000000000000000000000..9d731cbf692fa433b65143cedf442cf901ec7b4c GIT binary patch literal 1046 zcmV+x1nK*UP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TC`xN9B6tz+;>C-nf(ZTtf(RbHc^1419*R^{ zT9ICghho#FHQl61liln(@7rvxQlV2QJHkHL%b@W?;MtRz;Oo+Ns;#Vu z$rzN+=V^O;n>^2>blPN2E|(+M_2|dqB3+%hMl$?2ALb5M05b6D+airmOp)*VBA6QK zx=#2W++$*Re)aMNwQH+%eQJVa__6}@LA!6j4qIDWJb_}dNZD*wL^4g8Oop!&5ot^a z(MD)w`Ld7}z#bNeGKU|>gn-%ES(=}p=RR1)_XBCZEaU|kCiTSPL;B%m*rM0#@uVu1 z3QbNs z6gZ+$g#l#wGLT=yo=dG(i|->3V*;2AtkLOoc6^U`%JO9)Ex`HN5NY=~{pE6*s?{n- zv)OD?yWJ+oao859?FZq@LV6!~bnk9Z6AR8X4W0;qMT!Z+Du^~FJXR{v(&sO9R!mxk zf9M<8^u-H7yAxInj6~_f;@j(2`=YOqvq^^kcJ8B`fQNT(2TrraK0I-}M4L{Nio?U~ zQIx#;`Z{&HT{<#U;8bHVs>IhWmCtYru&^K<4}WJR>I3{ipDKLq^7(UtDf|dhMwGHl zI;_u;KfArIxWbLd7104y;|1Ibs8;zfw)xT>!{CI&0*ToOu{(@z<~?u zh259~U#iB}9^9G^pc194G&V}MofU)o)Yx=H`8rCq)ipjTV!%)#&t6oCFIPszM|5Ua zg}-MR-Tl9HKV>dX{vTx&B?>?qQMwpH{J+Ya3Vd;CtQf!xlq#GIv0(DTWAJ0tXYc^E z_^H#UPRwM~4U8_?rYx6%S_)#T3mr*E$aviNu7DWN?BkV3| zD)FWN(5QycO#d+w0dXS{5H}J5aU&5BHxdDHBM}fc5&>}|5fC>L0r7(97dPmEwzmds Q2><{907*qoM6N<$f}+3X2LJ#7 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/blocks/barrel_antimatter.png b/assets/hbm/textures/blocks/barrel_antimatter.png new file mode 100644 index 0000000000000000000000000000000000000000..0af2f9c6077b26ac2a23607ff550fcef59ae116b GIT binary patch literal 966 zcmV;%13CPOP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!T`{ z6HypFlT02>lfEp4bR&hT&}!5YN`w-qC=@LSQVIp3D{&|I147Y1ATIm~;^PPCLMpUD zYl#H9&~AjPAbnW-%DZ`t_gotg>B28AW)^cG+j|T?_s8*}U<#GrHgV@{K!}|I<#>dAY;V&*O8k+Er5DQ49Qr7j-TWoG_qPx3W zZ^$%F1Ofq+%Vijbp|5RiZQ=gM0463TAmL{+8IgeB;Shj7#%SHRb_K~~0wd?nAdwis z;K?X1#bdZIdh7sM@NTF{rr3yA68beu&|`Z)z9CMexJq0#s;i> z9?Y(kFGWik@Or&^&Qf?@KaVGsVLYqF@ZeJrS1*sj@Atz{JZ@gfmqILnn_x5}otut)^?bQ(Z$Of zK}!M{)k>wJOQXNPUpq`Tn}yHk!=bvqwzdX8qk9A?UjnfJMvnfiqgt=y@tBDhw+69v zcN7mt8`>6odU{aU-qv#|Ukb4RHXt6lm#-J}`b~NnY2_~OGAsD<{fBlJZnOz0UkY&} zo1LAt?wt6Fi)T;kgUHfgL*jw-sEroYh8cC%dE(JBhK7b9;Y%BtSU@tFv`VFtp7Y+O zRUVgqMm8J{L&8^QLndHmW=8dpynbjj8pZzpzOG5G`D1hqMvcvgYu2-q_(m)i(<%5f zB7bM)xbK|8H>{`kta`nMhWhxFQ|$iSRkiAe>GkN8Ru0*8{P3Ax9R-iqr>;APZ@jua zYWaO8BH<8<#UhI3D!48c^9Y4PunZGcqplucXy48i%KCe!@Qp+wq4UEg!wV7B+Bs4k z!5ZX)n)S)1L^y@-mXPfwG(A0SF))@_Fi+s;;gsY^xT}#>14+(-{RP@m(8r z&%pnlfp|P_aY8jD@J|-&i)*%QzI4#8sGi^-FDLQc60*I7rlzKJ3DKH3_V)JbQ%-fX zET)hnZ)OS^1t;;fjgmmC;z%54Wlc1BPT`ARXq*P|JF(N?3a}fl0K4G|up6!byWtA3 o8?FGm;R>)Dt^m8?3a}TzFWv?}Wo?y;UjP6A07*qoM6N<$f(t~u!~g&Q literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/blocks/barrel_corroded.png b/assets/hbm/textures/blocks/barrel_corroded.png new file mode 100644 index 0000000000000000000000000000000000000000..be6deafca930cec610cebd77313e3eb2ed5e09e4 GIT binary patch literal 2655 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 N002ovPDHLkV1iPCDS`k1 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/blocks/barrel_plastic.png b/assets/hbm/textures/blocks/barrel_plastic.png new file mode 100644 index 0000000000000000000000000000000000000000..0d3dd9543bce38daf11de01a1df7a369cc908e2a GIT binary patch literal 1114 zcmV-g1f~0lP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D1Mf*hK~!i%?U=c8 z)Ibo1TiRReJq$j|WITZ%fGVnZ0wMw+A|!W4N=C{PkVC{HIk0ir>?N(VE3N3SwX?Ml zSq>;s=&zcZqkE*jrh6n$O5*(dJYO!CHtu%2634OizVFLsvymi8B+qjRg24Kx&n{#* z97?<0mR74JS(fRzWBoc^i!vE)KA%e%hVt$6+fp+5+rAWd8SUogMiz^O^;cI{*3V`$ zqg`KLn{wmvSbDvl2^j=^8I8u;_p~3%qr*d`1=8ts%n1E{fBS~}qqG9f`VLr`=6Rm= z$H&KJaez>)2P#;z*_1}Z-?pZ%`$j{#G)={CG~`efDvJks;7<@fP6@2;l%$8|Zv_Q} zPro0iLJhNcyWO(2K5#+X$3f_2(zyQV=V3F`*ipb6y*8F&O)o%Qkv*`Q|X2BE%ijop)QFBp8+Qv za3QqcfI9VG)Gp1a?A0V@ywI5cBXgG)+z>6B9PeQc1Nj=3Fp`{?|eX;m9@!0GNY) zB?uKjb!8plb5#iIN6}K^Wsz?2PMT&`0RKuFMHs3p>5-x}7!2g}^wdJi&7mC~9htHS zj*#p_;LRp8K?$ECv?5h%Vb;IBz1_a${_ytiHoTCrD>`7G=1?Vm@9gaC_cZd4!F%`N zyN2e*@-m@OT)Kkdexh+qY`QRTaa|>TpFvU1I~JRaaTA-E)1a{qZ`Js{7q35Q2<2MJ z`_c;rrZo(twad#(v%q}zQ|B!S=Rc&;q=Ht5-+OcMH79G3J;)3cC$6=)j8y4TAg*ib zH8|GlStWiAqvA^n0w6P@k6A6 z>2zwYLt7pK6U=NP2Kn%)8o#dl<`OjR=?4W2%vr|*PGiRF^~%;O#ZSE5-QAf+FtL&Q z3*dv@-E+{MRyBU#xrYs*US}BtSF&*<4}lL$RE^(H;^O4v7L7i2QSlH!&&daDB6U@b z-+TV*qh2L48H}EA50=MzqXZlzT(_7{B#w&0ktB1yHFnj_)#3MEzW7NJ`x(O}aX46#{-Fa{Sg47?AjO}E;M}HdW^`1L3!2uim3?_o= zFpnqAJCfeL_q?Mg2bTEv>6USlWO@b|--q6$`4;XVLH4Q*Hww{xeTJ8Z$GE?{1snd? zXOrRU!a9J%CmZIM=efIIE44a%X{>*)mQ z^*XB6s${Z^APBUbNTxXZ6^bq27S;j4 z4-m(RmY-UtEaEuUNv*H1V`pdQ-Pn!zmaq>%;CY^Al7Ib73T!-2(^NA`ZI`BMw&mO4 zMgfFjs1Hm;-vucbAuN+U;R^{*F9F)Rksvp1r{!9- z-TC@*;hU2_&0ctVQ?|VEwE~G~ikqymY`g~jp6*i!Znzk|P!P+F<)<0S6W?jxUo@q% zhksKcep+8bAfI`*{P%2>7DdpqXk7#s%vCm*3qDseElJBJ;n1qMGvtD)%|&Wu93wB3mN$NB zH^fh6xq$FwpHA>XT2~l^$V{rM9wtLiN`L1IB~N^pT63fvW#I;*H%98paYf2Exu~Ky zAZT%U<2#3|3x+=19mZl`K0c{0z@fOLHCyMX*CHI9o?%|1AIjGi^_VBV+9*rH$mIp7 zJ)0z9QmQE!Gyj*W>Hm4*7bsAmK!E}U3KS?%pg@5F|4#t_0iG(|%g?BqSpWb400>D% JPDHLkV1l`@`ECFJ delta 559 zcmV+~0?_@W2*?DGB!2{RLP=Bz2nYy#2xN!=00I9=L_t(&f$f*EZrd;rKp#&mr5Z3g z_yaO@HQdc>{~DF3|F)Wu$q9`KEGU5yUs|O$=XswB&h@vPk#!wUm z)>@o%k5a-!$zEq|e*9dWmz>}jvg*!<%=P|K&P z!LE9~ADJ)RJUf+t31xX0n}6JaxcYRrv);lzZN}nD^I><8=DlVa9Fwm3^0m}dY002ovPDHLkV1n_X5G4Qr diff --git a/assets/hbm/textures/blocks/barrel_steel.png b/assets/hbm/textures/blocks/barrel_steel.png new file mode 100644 index 0000000000000000000000000000000000000000..db69798a5ecdc10a0978674020e52c7e26aebdfd GIT binary patch literal 926 zcmV;P17ZA$P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!TKEX8y~=h8^NU@xCpK)4S}rkB$7Tyq07EVc2*Et;--{>P>4bZ(P-5C zahl)JThijf6Og$r^TBxTo%`LH^PO|<852ZNBo`Vr9!lE_|597eEw3Gjg1Yl@L&BywzIPnk#@jd*D9Y&Kar(9TKFd?CpH1)aycRj zJalbsO)f7lWqEm7=e(@dYRUcmy(}y&=$r%S6F(T$rKVs!B7bM)xiw$-!PeGRl*wdN z4VL~)SHN<}P)k&Z02cVf*Dge>gY3ZJat~w78XTwGCw|C;jsO_b&aix7TFISHbZYUPQCmgk@Qp30c^|x0p@k<;c_;NZ# zOifK;dU{&tSSnt_Gv^z^JOD&ctJQV+S<5VoTCJu|4Sx&_U}R)ueXc#e8QKT{a9vk3 z$uTGe9=!HEPczEec3h_|z6sh2ARdqF3+p0-Gcz+fvd-ybI-S;x1`0!%@=ef20Cki~ zB|Qsjm=4exmd47;iZo;^la`8{Dc=mn0r-`FWZ4_K{Qdp?7#<$hY!-_}R4Nq|3I#0- zYI{3;Q-2tTeB;;S{@9njh(ugL6!=$O^5gA^LXm ztH@>3Xv$L8L)6y-&X`>4p**pjH!92hNeh+70-;zZ0LwR({9qGs5x9 z1zn!=pWoGug%NY?>+8e2pZu+JpIs@#5#vEdsO8McRz4lz9A6snJ89oum4Ew&g*C-D#k18e14#{9CdV;C8yK&-CQ;! z%i@SM)sU2jk3R7jUOM?3R)z4x)nl?$e}BqG6HzB(u_&JGKMYs0vMf?}@W4KOAq_1q z6|nE&EN@ertr;o*E(u{TN$0W+G?Ituj;Tq$E~R0@t@RYK4oqr9>m{E z``gOs#{aEbWsB%0zKs9L77ya>bAMoTd`{2VFq>p+8$KnDFC})v-&6Z+3Qn?-_6E(QUZ4m8pQ^!;O_dPC ztWV9#4*X8ox32&Ev`?Ka7ON^>k6IjP?RGqF-&sQLp|p&P=*=Wl`dE+M#8(-09Bw4O zZq0#g$qGuHQmR^DRygO0%ykn#M2HX}LWBqrB1DJ~Awq=se**Xy>jKOlI;pQ&00000 LNkvXXu0mjfp5R=I delta 1054 zcmV+(1mXMj39|^0B!2{RLP=Bz2nYy#2xN!=00ZhtL_t(&f$f;jiWNr`hrg=oI`{V6 zaUniHqN`bmWD}nv&yYnR+hmcTi0Cekj=B~jfvoZb+2#Sv%78)wfjHp8$!0Xeo$g!R zrz(s7GndIg?1>En=^xz1?f&kmI#s8BRdo#mb@2PANmcvr&VM-|QI;!Il~q`gxs1c& zkT?5p*xK4+2>>p=n=42q6sShiY&F&N&i^zw&Kj zj2L6E){;`f7(-pxSZn!kexDG+V1B6V&>yHOQ6niOE?l_4#>NIB!fZBUHk^VG!#PKcu^GV_sq31Q5_z6uojo=G&iy!T0(D(eRTVE@yr8No zmdhp9TF#w2hcSi_R{x0~ErE4U?`pVnmJk9(QM6@aFn^fA{7?-pp`t9BA7&X>u3X{r z<;yIWOHxYxLhVZBH2mlZltqb%aB<@SBEoz=M^zD#z7wj7b8;$v^aS?y_E1&!_xDL8 zqDHKPBO+Sm2z)Ig4`+RYg@fEDGwXMztn{inGLLFLz(!tm{Xm z8>JW{)_*o@e0{`170wi&IqMJ+M1;j+1Lv}Sr)&;mHOu88A%x~^bH;evOp)Wxqqm66 z$n%`;S)S*J%((ODEzUW-`2Jnf$jN+H0_*%(@vVq(@9_Z!xUut!`FxJ|p4oiHY(C@0 z&MORX@9_bdI~pBpo4P#CJLmfIPREZK->PcAv40o?U)=t++2X63FK_>bF|_Xtsu5Ks z^UbtcXPeVz%XbbVB6#n6e$4oG=gE>7W4p1y!&{eni+XtL5-Bw&$rvL$PnLM`tlHaD zv$&3|FUIDXs#2CEUOZ#R&$4z(j5RpxIDh^;pI`e01AM#l5#DF0wYbcYVq$Z#*^GdA z@_%{G=H>#`h;tS&tilQrVRLgq2o;$-7&X56ZhM}N+t&Rjhd|=1&+=ool?YXJqRp*e z5C4sSpYhH2_ZDf0Z2^O9Zfrg~Zd)S4*WdgBz=N9?2_aBbHL8ji-`}#<`A&JBzZ3sH zq2K~RaKoSe$u2#lO|1?G-=YLNs}f``WL_I YZ)CY~1(){_IRF3v07*qoM6N<$g0~qIs{jB1 diff --git a/assets/hbm/textures/gui/storage/gui_barrel.png b/assets/hbm/textures/gui/storage/gui_barrel.png new file mode 100644 index 0000000000000000000000000000000000000000..322db0b1eed6a9109f5be427766419853cb41746 GIT binary patch literal 2842 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 QwJ+Hi>znCS=r~3H6Hva!umAu6 literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/gui/gui_battery.png b/assets/hbm/textures/gui/storage/gui_battery.png similarity index 100% rename from assets/hbm/textures/gui/gui_battery.png rename to assets/hbm/textures/gui/storage/gui_battery.png diff --git a/assets/hbm/textures/gui/gui_tank.png b/assets/hbm/textures/gui/storage/gui_tank.png similarity index 100% rename from assets/hbm/textures/gui/gui_tank.png rename to assets/hbm/textures/gui/storage/gui_tank.png diff --git a/assets/hbm/textures/items/ingot_aluminium.png b/assets/hbm/textures/items/ingot_aluminium.png index 1cdce6dfceeaffe9e971636f0b0087fe2a7caf9d..963b869d4f0c6d25e2a0e28c0a5d12dbc04b33d2 100644 GIT binary patch delta 368 zcmV-$0gwKl1HA)~R)11SL_t(IPh))YQyj}YzWu@T$;Xo`2uFc01pojm9 z13(;@As`ok*l7VM1D^wsR(~`}L_t(IPopFObmo@&IhYiv+U2v@B#^EdM z1yK}HY?=mq-{+|KQ(6J4)Y${CU*QGY}uX7cJd&JxEl*tQL> z>uy3>mVxJanCF>9h-sQ22m!~YIsgCw diff --git a/assets/hbm/textures/items/ingot_copper.png b/assets/hbm/textures/items/ingot_copper.png index 86c00337d374052f3b66b575fff9574076d69982..8f771cf7a1567c8c2fa48b278bc67fcfb7b70c6c 100644 GIT binary patch delta 373 zcmV-*0gC>D1CRrdB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000iZ z000iZ0XPLyBme*bB}qg zI}8l-{{Lr$@UR$wO_PeH1em^a`~{dsHUw+{E=^zGe1~wLfPY(r6HJ2)f*HbS#K7>s z)svs$`R$KjNsva60+_AHhDh0HKv@h78~aW&+5OD}{6igAwfYYZw zf^7$hfdINDC=(3e=>TSkj35KUllS;FAp?|z1Ty3hl#NdlGQdcQqyh?aBLf2fL18a0)wC*5Hv;OUHTuKorFMWYI1CC5~&N3F4vn&AQ;kc6wY`W;+)jV z8tYxY_k5h^{k{VS{*B5BbUA^Z@4G)i##eT>0my}YU2P8?(|>n<18r;;0Jy&k0C))d zm=JdnB&7tf)dT_fpsVen2{>>|n+kC;v4My5rnoc*X z&O_5%*@It9>P#xm@{-4RA{Rp6$}c8$DTXe^K7ZN2t2gjVgUv9jWLE$H002ovPDHLk FV1fV>pm+cP diff --git a/assets/hbm/textures/items/neutron_reflector.png b/assets/hbm/textures/items/neutron_reflector.png index ce45a91bad762bfff9edfaeaec79d221ab9320de..804f105a8b340bbd659101a950e6e8fa56271f6e 100644 GIT binary patch delta 260 zcmV+f0sH>H0>uK5Nq@fp01m$aI0aKA0002mNkl%|rfc3>6s zLJibFSGEA51LMU4*!`?y6v0i_fB7iR`@@KcG13#gHve0X0o5b4ZM$!*>ngV8MMVIL zhhZQoC3)}3IhWp-Ko`KVxa&GvmL>T#O-0aY26-}y*&(GAVSOLp@e%h9YRNV4`<{$3 z-wy7QOO9e|Z3-4m(?qm3jw6K-_Jo>qGK5*A4nPGFn*ecA?#E;vWSRjF1jm@?nY7k; zJav>Or^QF7-&g}dNCqsw3)PDRXAlaZycjA1SPX(n#n3I_w}{?hztHn)QZIr40000< KMNUMnLSTXsnQ$fm delta 254 zcmV1)~Nq@iq01m(bYSxJf0002gNklrrOvFjj$PO!SObHxKigXa*v0Gs0JgSC5`N&o-=07*qoM6N<$ Eg0&lQ)&Kwi diff --git a/assets/hbm/textures/items/plate2grayscale.png b/assets/hbm/textures/items/plate2grayscale.png new file mode 100644 index 0000000000000000000000000000000000000000..06b7ea0a9d4ebb515185e4a757547f5abe83109e GIT binary patch literal 358 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc!QY-Pjv*HQTPOMQxi|>8osMbX=CJlwD&&*i zSk6^mz?r@&*PzW0~)ZKi$A{-=JS^l#=YwRrE> zQ-T=}ISK^G9DicLcej&ownpOVO+W4#@Wgd5TCi%>j=bApj~|_NQ%JmCnkjR9sWr1; zmG9*om(>rlHfc?g+mJi^lF8if4s+MAsrKBnoAccAI)BSzjYS4L*C+fk$O>&Mn3ftc zP1X1El8@34b|-wX>DQm=A+ccE$=dtH61Df3EtO<$8t_a};mljPE<3K#C+u)SF;}=! z!^uy#yt^&`uqWuh+V##L(n6F&X%|;>^uhFwxaEJQ-u{vx6a@?h22WQ%mvv4FO#mSo BjZFXm literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/plate_aluminium.png b/assets/hbm/textures/items/plate_aluminium.png deleted file mode 100644 index 0222abc00305d636ec91e5a46a0a6a4ffed5b9f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 393 zcmV;40e1e0P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY0Uk+2K~y+TrIWvo zMNklj$KHel4I(rYI*+080&4HFl|S>{gM-BIKOYs zAp}X1;1%BX>%aMxAWhQ^$6lUzdIS!IVMuk?br407K*i3b;4x@f77W7xs;WZMG$+YP za393QilV?g&-4uEC_!0ORfmKGR~-=!BP^SyiE2L1Ez7bkj$^QGo4RV6MhkE;hD1@M z!L{qUV45bZ>k5Wpywg{}t@*xxbm7H#WgN!=UDu&)TPTWxc7V_k@;u*US%x48U>rw! zz+ns`80`BVmSusuuIXNqB*O6$A0^lg`7TJ4PflOqUh-3rISCMyc%Db$vMlM|Rgn22 nKv05Rp9Psq!C!dsZv^-NGX$Xd+gg3O00000NkvXXu0mjfI02ly diff --git a/assets/hbm/textures/items/plate_aluminium_old.png b/assets/hbm/textures/items/plate_aluminium_old.png deleted file mode 100644 index c89c632537cc7bef9d8c5268c5c539c819d83dce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 470 zcmV;{0V)28P)N2bZe?^J zG%heMHD!e|WdHyHR7pfZR5(w~l39+zKnz5=|E&UH5j%u^y+B9=gq@_&vl{winD3dA zTCKz`yUOj-|3MT*s#dES3i7Gf)9dv#8jV!1*F~)don?{c2K><3H%Vp(xuJw9t#a648j>n_g?Y5fDrY4h#sdF?Bx)3Ds z@p#xd91hy;b^_<~+3xv#Zb}@@1K$LO!=chNRhDHsolbf_pDKz%m&?T(U<Ucc14tNIl``xUdh#Py;>Gb<6ART|(?N-<8)w)pt zHOzvdo6W|Gkn3n3Oqd{&@tY)x*?3Fmn?nw-Ah5d_Ew!;l@+v+ma6(JMua#^ra(Yrn?z1a|9$Y z-V|_>N@O?+3@phm;pnK!PC{xWt~$(69A2LhqnL# literal 0 HcmV?d00001 diff --git a/assets/hbm/textures/items/plate_copper.png b/assets/hbm/textures/items/plate_copper.png index 770e03a4c3becfcc752dcec181a1092dc4c19aa7..b2ea38cd86b73c840dc3a3c99029573eeffdfccb 100644 GIT binary patch delta 305 zcmV-10nYyJ0{#M!R(}&oL_t(IPh(_fXJ?=UFhOau0Z|5M|NQwMgrQs%fY%E!O*txH zF2mtF3=GTI*%=``2*BzBn2jKfAgp330TvJQyVh{(n!1l>nO#vlRqDieYRJ zfbsb?X>fSJae?6$@Ph|y}*E(CXsAfK^r@~$F)un4R7pltFpGHAzH4R5(wiQ!#GBKoH!MXj2*C52S%2B6URP{30KqaFe_vG)VCW zQs)JfAgE$jH0A?XP$0KR%g)+o;lq~{j5OZe^UdsO&o<0V_kX}^kQl>Hb^gL^>hu;c zaQP+6c@Qv9CK{JggYG`?<^<^c8Uz#$23kM#`xhjTL_3aO%nQ+_XY#gO;JSU zVxjNtal3MeSANp@N9vhS4bZ(jo#=Tw)r~N+U0t#54Dq`V)5H}iLdS@*tcrls8RAde z22LQk(%v`j{F+05gJgm@XguF}K7+Cs@d}6RwSh_|&G3fo7fR%h7 jh!~s>tOI`<{12iF=_4~1P{cC-00000NkvXXu0mjf6tS`b delta 264 zcmV+j0r&o(1ET_vB!2{RLP=Bz2nYy#2xN!=007!aL_t(IjlGgR3c^4TM&CkO+Z;eF zEpmaay@Pmx2x)SK^frN&^f`u|y_HQs?X?JqZD1@C(flm=DV%Cy_PrUtUHC^C5Cbw9 z6s<*qpi`o3Ab_tmcwViyk7Kq!oEi$+B&rX59S+sTAbyg-`D_Jezm4UR z&#=q!D9V7WT$gziwIp1;0B!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pGR7pfZR5(wik}*rfKoEuB77BtOtVk>@RY(`Gun?@$&Dk8J z5d91O0h@?mky0Cffe1nhtt^CeDeOeWaJX^=Q)sc?Oxz>cOMkTRH9HyReQ!32&|2d^ zY6S?fsK?|y*Pm~ff{O+<0?0h)uE2F&q-lyQ%edbJ8UYxy<2d{*rR1{>R0C9#l~O<5 zQUszNL8_o3pe;Fip5$|T;&Ip`d7g)(!%n$DHJL<7%h@c~cg}0gNFs9-Md&}>VsMuQ zy|lIk-}e#6F@F!3b(?B3hhc~>b&pl7mjFu7^Bh4C@F0Oqs%@;YgGhEVnW@h&aeR7{KgEISppPExjf$ce zN#=opYX3nSh|G4fQ4L^ZK)Y%KA9%+L9!8Rl8UaQIL>?P7nMuC_{ub~Jkq_I%hb?gx P00000NkvXXu0mjfQ68}p delta 296 zcmV+@0oVS&1H%H4B!2{RLP=Bz2nYy#2xN!=008<)L_t(IjlGc}Z^BRzfWN0FaHu61 znkEF%UocmNE25nSMW&h{I~a}-kSH|p3=Tn%`wvUnO-$?ubYl7@$jZ95VXfejC+^;T z-`&fD>x3bvQxUYCsSGEFT!|_M!FKvsmX*4hJw5=h38(%G7Jo_9C2+8R17O){=1LS8 zveHMwFibUkZC(Jlxo@TFrfCA8wdS~+qri|x`;H(8GLj-NiX!4T=JVqj<+GLrBW$OS z>$(|95eVQhIBnqb#DWpOH@O4?Y+3%yF~nz`{P{}1i|tIM(e6p@wkuE u=apy4aB?UE<{?W;f>}ugFfFMFmXB}ev7FnW+bCQB0000=#qI&=`ac5xCn2S+!dgDzbK|AB>ULcpyUa1b)pp_yvP6zKHKx%GyZCegtI zA@^S1`ObSUF_cpDAJqaLj5F2TZF23-?+h*~R0)8&bI_qytA9md7*Z5PJg)+k0AjW* zi+j^F`CSJp0QBTIj(?_W0fgCdxh#NkKwYv9k{Pt+ICOhCqy`#2SvQIqvrV%DF9{h~S$gk)?R$hGK>%jhn}0WNz$Y?Hia6_QFPq?EhR`Tnx5pX<$P@0A>(2jb|U81&cMYpJ0RsBDx{SPQ|7X%m4zE zSU@&}kVY6lF+2bSK!!+3Nr5#VzJ3@ihD{?3U>E=bAVWa5;?oENSPdWrP?#GT7y!O& VqR&ru+Ef4l002ovPDHLkV1h~Qc*y_& diff --git a/assets/hbm/textures/items/plate_kevlar.png b/assets/hbm/textures/items/plate_kevlar.png index cf32dbb30da7d9a0fb687c3c8f5b54d4b64ad947..5c7efbb19c077486a4d4f8d6e9dbe8c9077ceab6 100644 GIT binary patch delta 377 zcmV-<0fzqS0+a)gB!2;OQb$4nuFf3k00004XF*Lt006O%3;baP00009a7bBm000id z000id0mpBsWB>pGDM>^@R5(wilCf%pKoExK0;z(9l}CDe@d*NXgn$-m8PHA$d54sC z79o`uiUjTj0(lHkf?yRvG<}N6%_e)?>UwwN{$_S%|L=EZcYlS5aE>ni>c4e1V6g?) zbx~0iwvOX?#TF7t0c18!6UK1_RaK#`YxZ3RngO_(OizzjaC7$t@2|J;vbmOm1i-$z zX&UId4m3>@s^@tEXg9=ZG99MmX-$#@bX|uq48gW-WPflJf*@d% zq~7T2wk^>X)|bz_TOe~3MS__m+` zSM~CugIw7M;O#vm2wvF+7>xrAy+*s$q)`t!K6}RZ%v1+MB?Cswh-DQ0>>z3X=upXY zvYwcL^Z6G5-AD&lN|)%^RxDQzF!UN?wkQP)el^Ley4SJXuCM?A002ovPDHLkV1hD3n@j)z diff --git a/assets/hbm/textures/items/plate_mixed.png b/assets/hbm/textures/items/plate_mixed.png index 8a5273f53d4d3864d35e3108e884ead9bb48fad2..768dff6af58d0cc7896631d229ab0db28b0aa6bd 100644 GIT binary patch delta 454 zcmV;%0XhDT1KpGbxA})R5(wilD|vCKorNnCw8+-6iZPQsV%mkgl=LH^&b$r=-?J&<+`dqR@(FNvTMMGw+=V{eO`t*e`^;_j2#^e%uKu zB}UQM&-!nT39z-nG4|+CLMQ76mBoYZ2#;t2rA*CIB3qN5X()_iJM#Jd~CJns<(jchQ w0SccJe%ZYW1bFg5)pzi~*g2qI0e=hl2A|l&8fvH4p#T5?07*qoM6N<$f+I@BKL7v# delta 371 zcmV-(0gV3O1C9fbB!2{RLP=Bz2nYy#2xN!=00BiwL_t(IjpdTRO9F8i#y^Mj2Xu&m zSQMHL{on>6TvBdnxt1IbY-nj{>>rT3s6U{wxlJJmT7u&Ch9H8Y91bI+1Hmui=IJ7Xst z79nBVP^$s3`)rUvDTQg8#N!84Diy-;l6JdIso4bJ9JJ9B9gyt}Fv|l-CPVpo70>gi z*HeVyCvZPKJ!hDC)s{vPNvG2ii^T-y2lER#^hpF^GQTOR5(wqlCcegFc3wL3;;;f2s$Wf*n|a`f*n|bndqPcQ6dl( zZIXY=MaI|>O7aU1+xOo;3+PuluX>W_d3V=!`F)xuYoGA|=6^iTDT*Q*$C3KJ=Y13C zw4s`P-=}TcxVCL;1RVf2vs(3u-heA+wZ?HwRaMdLTXWMi9PGec6a{5jM#C^%GS_uY z%d#+lC&0Zx#34YR%;&e{k)Zss{f#l9=vgoi7nLv87$OsS#$Y%b7h#n<6 V-pnc3oFM=J002ovPDHLkV1k|qj|cz& delta 235 zcmV-Un;y;Qq2z_T5AB7Wl5Nl z-~)8d(Y9??@+~NWB}r2Q<|GdwhzQ4V;G9D#g;J{68)N9Yj%01y@ZLXT0uf=J=i)?T z3;@t!0`fy!VJmOu!{UICrge5Ro7vq3`?i48_F* lFe|AA6UiO$Lvk0at{1aup9~iZ>-7Kt002ovPDHLkV1k0QW7+@! diff --git a/assets/hbm/textures/items/plate_steel_old.png b/assets/hbm/textures/items/plate_steel_old.png deleted file mode 100644 index 502eafcc0148c32fe81059069f10716fe161f4b4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 474 zcmV<00VV#4P)N2bZe?^J zG%heMHD!e|WdHyHSV=@dR5(w~l39+zKnz4VM%Wd0NC-O@U=dr`61e|O3O%c#KZg09 zv1D0^U3Qh*h5uuN!9bNtMZI26)oN9(R!iM(_v4*TM^O~1R;!6x2lG}cl{B4Bt#C4# zSfh5kZD0VS(MXL(!y3W;z@WYBrk+!%)NF(AYVcH>QxJ z@P5CW@ArGH*K0kWPo-&UaXcOy69@B#ZW8@|U)$|g$Kz3_(@9yD>G62zd_LO%WWmyWB>DadP)FZ#xzy!y zv1v4b4ZEP}VzIC$)H;|qHcS%A=-q5KCgV+=Z=4!l%fY-C=v&`%Nx=)~DNdf5wL4vi)Lx&tmO2m%9evNV04GXFR-n0~#)Ke9sM1;&i!t9=Sf QZU6uP07*qoM6N<$f?S2hPyhe` diff --git a/assets/hbm/textures/items/plate_titanium_old.png b/assets/hbm/textures/items/plate_titanium_old.png deleted file mode 100644 index c42e7a74e42b750630e14798a30bb8f19f32d6b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 480 zcmV<60U!Q}P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D0a!^yK~y+T&5}uu z!cYuEx&JE63Ns{xnF}z8DNG4msnD}N{6*92ZcCPx*kxDwyYPQ(Fc_#(si@cMsamb7 z)oQ8R?S8z|=_raK)oL|S>tNnWrIM!8sTEEp6Km9Nw+#$nG#aVVXjo*BgL$I?6N<&6 z@;ujkKDTDG*-VGSLCt1UVHj#S92z?Z^TrgC6yEQ5^ZkCW^?I%6^QkmVEsn=yW8z@m z&`qM>?`yl=>UccrbUG=^GCdv-ozG_*fGpTLm^bJ`8~Ur&>NA<|>-DPLZfB7i_TpgP z=o-hdO+Yi?+wEpjU_?Y-k|f_>0qW>mE|#y^Nmx(YdM%V-kk)_(=mnV#B#Z8EXc8|dcFR$0s2WI0i8HoM=yH;%%QQwUw6QT z1wmi{PL`(cQ|2E>2Gg&X_(xVKya1Q*usQ>crRe|w002ovPDHLkV1fVu01xsNq@lr01m+cxRGn^0003CNklAl0+2`NdP_=s6+oC|v$^Ze?(Fm&r4)Wa#pJK? z{|0@>Q4Dh|f*zDbFZsL;1GOA`s;x_lHKhtTH3|d7yCZJbhkv=XAm5QwIZY-nhOR!( z{q#Ox|E55uMq>}7=^Adgg<8FesSh+duBm!QVTG*ZO_Vkv`Mi(87JlAPkwWQW7ISt5 z$}cliE1>jn=;E-tX!)EfN;ugcc$g$>*bIF=Ws$~xNf5HgC*nIWI{}ksnh#1PEYm=c z-I2`*5($z7Brh}T1|-Qv7J0*LH7^rC4KdRC5(~e|f>aIg1dl!ihSsg(AOHXW07*qo IM6N<$g5FPqB>(^b delta 296 zcmV+@0oVTa0_XyeNq@os01m#|@vv@ndpZ?h>p2gpEGsGsQ}n*~G>H6Sn zfNnjcM2lTTaU4>TG~`*-^w@9|v?XuN5Rh-8Vk|XBg_;4w)GTB*Zxaz`QtL9bRsiX1 z*>XHlEgxG|2{va^TS}kL(DzeTX}B*4N>=&6L*gPaH~GmdEHgmSz9WVKAOavMKt`?y ufTV>sY{Ps#y&?ZbUFv;__GTX%HAF8{6Rz|V7qz1R0000 0) + { + int j1 = this.field_149933_a.nextInt(21) + 10; + + if (j1 > itemstack.stackSize) + { + j1 = itemstack.stackSize; + } + + itemstack.stackSize -= j1; + EntityItem entityitem = new EntityItem(p_149749_1_, p_149749_2_ + f, p_149749_3_ + f1, p_149749_4_ + f2, new ItemStack(itemstack.getItem(), j1, itemstack.getItemDamage())); + + if (itemstack.hasTagCompound()) + { + entityitem.getEntityItem().setTagCompound((NBTTagCompound)itemstack.getTagCompound().copy()); + } + + float f3 = 0.05F; + entityitem.motionX = (float)this.field_149933_a.nextGaussian() * f3; + entityitem.motionY = (float)this.field_149933_a.nextGaussian() * f3 + 0.2F; + entityitem.motionZ = (float)this.field_149933_a.nextGaussian() * f3; + p_149749_1_.spawnEntityInWorld(entityitem); + } + } + } + + p_149749_1_.func_147453_f(p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_); + } + } + + super.breakBlock(p_149749_1_, p_149749_2_, p_149749_3_, p_149749_4_, p_149749_5_, p_149749_6_); + } + +} diff --git a/com/hbm/handler/FluidTypeHandler.java b/com/hbm/handler/FluidTypeHandler.java index 6e92c5713..a0e70b732 100644 --- a/com/hbm/handler/FluidTypeHandler.java +++ b/com/hbm/handler/FluidTypeHandler.java @@ -8,18 +8,18 @@ public class FluidTypeHandler { NONE (0x888888, 0, 1, 1, "hbmfluid.none"), WATER (0x3333FF, 1, 1, 1, "hbmfluid.water"), - STEAM (0xe5e5e5, 9, 2, 1, "hbmfluid.steam"), - HOTSTEAM (0xE7D6D6, 1, 1, 2, "hbmfluid.hotsteam"), - SUPERHOTSTEAM (0xE7B7B7, 2, 1, 2, "hbmfluid.superhotsteam"), + STEAM (0xe5e5e5, 9, 2, 1, "hbmfluid.steam", true, false, false), + HOTSTEAM (0xE7D6D6, 1, 1, 2, "hbmfluid.hotsteam", true, false, false), + SUPERHOTSTEAM (0xE7B7B7, 2, 1, 2, "hbmfluid.superhotsteam", true, false, false), COOLANT (0xd8fcff, 2, 1, 1, "hbmfluid.coolant"), - LAVA (0xFF3300, 3, 1, 1, "hbmfluid.lava"), + LAVA (0xFF3300, 3, 1, 1, "hbmfluid.lava", true, false, false), DEUTERIUM (0x0000FF, 4, 1, 1, "hbmfluid.deuterium"), TRITIUM (0x000099, 5, 1, 1, "hbmfluid.tritium"), OIL (0x020202, 6, 1, 1, "hbmfluid.oil"), - HOTOIL (0x300900, 8, 2, 1, "hbmfluid.hotoil"), + HOTOIL (0x300900, 8, 2, 1, "hbmfluid.hotoil", true, false, false), HEAVYOIL (0x141312, 2, 2, 1, "hbmfluid.heavyoil"), BITUMEN (0x1f2426, 3, 2, 1, "hbmfluid.bitumen"), @@ -45,21 +45,21 @@ public class FluidTypeHandler { NITAN (0x8018ad, 15, 2, 1, "hbmfluid.nitan"), - UF6 (0xD1CEBE, 14, 1, 1, "hbmfluid.uf6"), - PUF6 (0x4C4C4C, 15, 1, 1, "hbmfluid.puf6"), - SAS3 (0x4ffffc, 14, 2, 1, "hbmfluid.sas3"), + UF6 (0xD1CEBE, 14, 1, 1, "hbmfluid.uf6", false, true, false), + PUF6 (0x4C4C4C, 15, 1, 1, "hbmfluid.puf6", false, true, false), + SAS3 (0x4ffffc, 14, 2, 1, "hbmfluid.sas3", false, true, false), - AMAT (0x010101, 0, 2, 1, "hbmfluid.amat"), - ASCHRAB (0xb50000, 1, 2, 1, "hbmfluid.aschrab"), + AMAT (0x010101, 0, 2, 1, "hbmfluid.amat", false, false, true), + ASCHRAB (0xb50000, 1, 2, 1, "hbmfluid.aschrab", false, false, true), - ACID (0xfff7aa, 10, 2, 1, "hbmfluid.acid"), - WATZ (0x86653E, 11, 2, 1, "hbmfluid.watz"), + ACID (0xfff7aa, 10, 2, 1, "hbmfluid.acid", false, true, false), + WATZ (0x86653E, 11, 2, 1, "hbmfluid.watz", false, true, false), CRYOGEL (0x32ffff, 0, 1, 2, "hbmfluid.cryogel"), HYDROGEN (0x4286f4, 3, 1, 2, "hbmfluid.hydrogen"), OXYGEN (0x98bdf9, 4, 1, 2, "hbmfluid.oxygen"), XENON (0xba45e8, 5, 1, 2, "hbmfluid.xenon"), - BALEFIRE (0x28e02e, 6, 1, 2, "hbmfluid.balefire"); + BALEFIRE (0x28e02e, 6, 1, 2, "hbmfluid.balefire", true, true, false); //Approximate HEX Color of the fluid, used for pipe rendering @@ -72,6 +72,12 @@ public class FluidTypeHandler { private int sheetID; //Unlocalized string ID of the fluid private String name; + //Whether the fluid counts is too hot for certain tanks + private boolean hot; + //Whether the fluid counts as corrosive and requires a steel tank + private boolean corrosive; + //Whether the fluid is antimatter and requires magnetic storage + private boolean antimatter; private FluidType(int color, int x, int y, int sheet, String name) { this.color = color; @@ -80,6 +86,17 @@ public class FluidTypeHandler { this.name = name; this.sheetID = sheet; } + + private FluidType(int color, int x, int y, int sheet, String name, boolean hot, boolean corrosive, boolean antimatter) { + this.color = color; + this.textureX = x; + this.textureY = y; + this.name = name; + this.sheetID = sheet; + this.hot = hot; + this.corrosive = corrosive; + this.antimatter = antimatter; + } public int getColor() { return this.color; @@ -123,6 +140,18 @@ public class FluidTypeHandler { public String getName() { return this.toString(); } + + public boolean isHot() { + return hot; + } + + public boolean isCorrosive() { + return corrosive; + } + + public boolean isAntimatter() { + return antimatter; + } }; //More stuff to follow. diff --git a/com/hbm/inventory/FluidTank.java b/com/hbm/inventory/FluidTank.java index 8b84130c9..76595f40e 100644 --- a/com/hbm/inventory/FluidTank.java +++ b/com/hbm/inventory/FluidTank.java @@ -12,6 +12,7 @@ import com.hbm.lib.RefStrings; import com.hbm.packet.PacketDispatcher; import com.hbm.packet.TEFluidPacket; +import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraft.client.resources.I18n; import net.minecraft.item.ItemStack; @@ -72,9 +73,9 @@ public class FluidTank { } //Called on TE update - public void updateTank(int x, int y, int z) { + public void updateTank(int x, int y, int z, int dim) { - PacketDispatcher.wrapper.sendToAll(new TEFluidPacket(x, y, z, fluid, index, type)); + PacketDispatcher.wrapper.sendToAllAround(new TEFluidPacket(x, y, z, fluid, index, type), new TargetPoint(dim, x, y, z, 100)); } //Fills tank from canisters diff --git a/com/hbm/inventory/gui/GUIMachineBattery.java b/com/hbm/inventory/gui/GUIMachineBattery.java index 6139ac1aa..4068751ae 100644 --- a/com/hbm/inventory/gui/GUIMachineBattery.java +++ b/com/hbm/inventory/gui/GUIMachineBattery.java @@ -13,7 +13,7 @@ import com.hbm.tileentity.machine.TileEntityMachineBattery; public class GUIMachineBattery extends GuiInfoContainer { - private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_battery.png"); + private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/storage/gui_battery.png"); private TileEntityMachineBattery diFurnace; public GUIMachineBattery(InventoryPlayer invPlayer, TileEntityMachineBattery tedf) { diff --git a/com/hbm/inventory/gui/GUIMachineFluidTank.java b/com/hbm/inventory/gui/GUIMachineFluidTank.java index 69149c6e8..04c14766f 100644 --- a/com/hbm/inventory/gui/GUIMachineFluidTank.java +++ b/com/hbm/inventory/gui/GUIMachineFluidTank.java @@ -14,7 +14,7 @@ import net.minecraft.util.ResourceLocation; public class GUIMachineFluidTank extends GuiInfoContainer { - private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/gui_tank.png"); + private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/storage/gui_tank.png"); private TileEntityMachineFluidTank tank; public GUIMachineFluidTank(InventoryPlayer invPlayer, TileEntityMachineFluidTank tedf) { diff --git a/com/hbm/items/special/ItemBlockLore.java b/com/hbm/items/special/ItemBlockLore.java new file mode 100644 index 000000000..2c00fa200 --- /dev/null +++ b/com/hbm/items/special/ItemBlockLore.java @@ -0,0 +1,38 @@ +package com.hbm.items.special; + +import java.util.List; + +import com.hbm.blocks.ModBlocks; +import com.hbm.blocks.generic.RedBarrel; + +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; + +public class ItemBlockLore extends ItemBlock { + + public ItemBlockLore(Block p_i45328_1_) { + super(p_i45328_1_); + } + + @Override + public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { + + if(this.field_150939_a instanceof RedBarrel) + list.add("Static fluid barrel"); + + if(this.field_150939_a == ModBlocks.barrel_plastic) + list.add("Cannot store hot fluids"); + + if(this.field_150939_a == ModBlocks.barrel_iron) + list.add("Will leak when corrosive fluids are stored"); + + if(this.field_150939_a == ModBlocks.barrel_steel) + list.add("Can hold corrosive fluids"); + + if(this.field_150939_a == ModBlocks.barrel_antimatter) + list.add("Can store antimatter"); + } + +} diff --git a/com/hbm/items/special/ItemTaintBlock.java b/com/hbm/items/special/ItemTaintBlock.java index 0676cd247..d8d42b741 100644 --- a/com/hbm/items/special/ItemTaintBlock.java +++ b/com/hbm/items/special/ItemTaintBlock.java @@ -14,8 +14,6 @@ import net.minecraft.util.IIcon; public class ItemTaintBlock extends ItemBlock { - private static final String __OBFID = "CL_00000075"; - public ItemTaintBlock(Block p_i45358_1_) { super(p_i45358_1_); @@ -23,18 +21,12 @@ public class ItemTaintBlock extends ItemBlock this.setHasSubtypes(true); } - /** - * Gets an icon index based on an item's damage value - */ @SideOnly(Side.CLIENT) public IIcon getIconFromDamage(int p_77617_1_) { return this.field_150939_a.func_149735_b(2, BlockTaint.func_150032_b(p_77617_1_)); } - /** - * Returns the metadata of the block which this Item (ItemBlock) can place - */ public int getMetadata(int p_77647_1_) { return p_77647_1_; diff --git a/com/hbm/main/MainRegistry.java b/com/hbm/main/MainRegistry.java index a8f292ec8..46bb49c67 100644 --- a/com/hbm/main/MainRegistry.java +++ b/com/hbm/main/MainRegistry.java @@ -228,10 +228,11 @@ public class MainRegistry public static boolean enableBomberShortMode = false; public static boolean enableVaults = true; public static boolean enableRads = true; - public static boolean enableCataclysm = true; + public static boolean enableCataclysm = false; public static boolean enableExtendedLogging = false; public static boolean enableHardcoreTaint = false; public static boolean enableGuns = true; + public static boolean enableVirus = true; public static int uraniumSpawn = 6; public static int thoriumSpawn = 7; @@ -534,6 +535,7 @@ public class MainRegistry GameRegistry.registerTileEntity(TileEntityCableSwitch.class, "tileentity_he_switch"); GameRegistry.registerTileEntity(TileEntitySoyuzLauncher.class, "tileentity_soyuz_launcher"); GameRegistry.registerTileEntity(TileEntityTesla.class, "tileentity_tesla_coil"); + GameRegistry.registerTileEntity(TileEntityBarrel.class, "tileentity_fluid_barrel"); EntityRegistry.registerModEntity(EntityRocket.class, "entity_rocket", 0, this, 250, 1, true); EntityRegistry.registerModEntity(EntityNukeExplosion.class, "entity_nuke_explosion", 1, this, 250, 1, true); @@ -1541,6 +1543,7 @@ public class MainRegistry enableExtendedLogging = config.get(CATEGORY_GENERAL, "1.18_enableExtendedLogging", false).getBoolean(false); enableHardcoreTaint = config.get(CATEGORY_GENERAL, "1.19_enableHardcoreTaint", false).getBoolean(false); enableGuns = config.get(CATEGORY_GENERAL, "1.20_enableGuns", true).getBoolean(true); + enableVirus = config.get(CATEGORY_GENERAL, "1.21_enableVirus", false).getBoolean(false); final String CATEGORY_OREGEN = "02_ores"; Property PuraniumSpawn = config.get(CATEGORY_OREGEN, "2.00_uraniumSpawnrate", 6); diff --git a/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java b/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java index cc8564018..0315e4615 100644 --- a/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java +++ b/com/hbm/tileentity/bomb/TileEntityCompactLauncher.java @@ -167,7 +167,7 @@ public class TileEntityCompactLauncher extends TileEntity implements ISidedInven tanks[1].loadTank(2, 3, slots); for (int i = 0; i < 2; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); power = Library.chargeTEFromItems(slots, 5, power, maxPower); diff --git a/com/hbm/tileentity/bomb/TileEntityLaunchTable.java b/com/hbm/tileentity/bomb/TileEntityLaunchTable.java index 8f06b66f0..0c901b82d 100644 --- a/com/hbm/tileentity/bomb/TileEntityLaunchTable.java +++ b/com/hbm/tileentity/bomb/TileEntityLaunchTable.java @@ -169,7 +169,7 @@ public class TileEntityLaunchTable extends TileEntity implements ISidedInventory tanks[1].loadTank(2, 3, slots); for (int i = 0; i < 2; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); power = Library.chargeTEFromItems(slots, 5, power, maxPower); diff --git a/com/hbm/tileentity/machine/TileEntityAMSBase.java b/com/hbm/tileentity/machine/TileEntityAMSBase.java index 35e9eb7de..5239f0bb9 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSBase.java +++ b/com/hbm/tileentity/machine/TileEntityAMSBase.java @@ -260,7 +260,7 @@ public class TileEntityAMSBase extends TileEntity implements ISidedInventory, IS tanks[3].setType(6, 7, slots); for(int i = 0; i < 4; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); int f1 = 0, f2 = 0, f3 = 0, f4 = 0; int booster = 0; diff --git a/com/hbm/tileentity/machine/TileEntityAMSEmitter.java b/com/hbm/tileentity/machine/TileEntityAMSEmitter.java index 7c279954c..95fb53ed6 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSEmitter.java +++ b/com/hbm/tileentity/machine/TileEntityAMSEmitter.java @@ -217,7 +217,7 @@ public class TileEntityAMSEmitter extends TileEntity implements ISidedInventory, if(!locked) { tank.setType(0, 1, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if(power > 0) { //" - (maxHeat / 2)" offsets center to 50% instead of 0% diff --git a/com/hbm/tileentity/machine/TileEntityAMSLimiter.java b/com/hbm/tileentity/machine/TileEntityAMSLimiter.java index 8e848868d..9161ebea5 100644 --- a/com/hbm/tileentity/machine/TileEntityAMSLimiter.java +++ b/com/hbm/tileentity/machine/TileEntityAMSLimiter.java @@ -219,7 +219,7 @@ public class TileEntityAMSLimiter extends TileEntity implements ISidedInventory, if(!locked) { tank.setType(0, 1, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if(power > 0) { //" - (maxHeat / 2)" offsets center to 50% instead of 0% diff --git a/com/hbm/tileentity/machine/TileEntityBarrel.java b/com/hbm/tileentity/machine/TileEntityBarrel.java new file mode 100644 index 000000000..ed1046218 --- /dev/null +++ b/com/hbm/tileentity/machine/TileEntityBarrel.java @@ -0,0 +1,103 @@ +package com.hbm.tileentity.machine; + +import java.util.ArrayList; +import java.util.List; + +import com.hbm.handler.FluidTypeHandler.FluidType; +import com.hbm.interfaces.IFluidAcceptor; +import com.hbm.interfaces.IFluidSource; +import com.hbm.inventory.FluidTank; +import com.hbm.lib.Library; +import com.hbm.tileentity.TileEntityMachineBase; + +public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcceptor, IFluidSource { + + public FluidTank tank; + public int mode = 0; + public int age = 0; + public List list = new ArrayList(); + + public TileEntityBarrel(int capacity) { + super(6); + tank = new FluidTank(FluidType.NONE, capacity, 0); + } + + @Override + public String getName() { + return "container.barrel"; + } + + @Override + public void updateEntity() { + + if(!worldObj.isRemote) { + + tank.setType(0, 1, slots); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); + } + } + + @Override + public void setFillstate(int fill, int index) { + tank.setFill(fill); + } + + @Override + public void setType(FluidType type, int index) { + tank.setTankType(type); + } + + @Override + public int getMaxFluidFill(FluidType type) { + return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0; + } + + @Override + public void fillFluidInit(FluidType type) { + fillFluid(this.xCoord, this.yCoord + 1, this.zCoord, getTact(), type); + fillFluid(this.xCoord, this.yCoord - 1, this.zCoord, getTact(), type); + } + + @Override + public void fillFluid(int x, int y, int z, boolean newTact, FluidType type) { + Library.transmitFluid(x, y, z, newTact, this, worldObj, type); + } + + @Override + public boolean getTact() { + if (age >= 0 && age < 10) { + return true; + } + + return false; + } + + @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); + } + + @Override + public List getFluidList(FluidType type) { + return this.list; + } + + @Override + public void clearFluidList(FluidType type) { + this.list.clear(); + } + + @Override + public List getTanks() { + List list = new ArrayList(); + list.add(tank); + + return list; + } +} diff --git a/com/hbm/tileentity/machine/TileEntityCoreEmitter.java b/com/hbm/tileentity/machine/TileEntityCoreEmitter.java index 20b8c23b7..470e61ee7 100644 --- a/com/hbm/tileentity/machine/TileEntityCoreEmitter.java +++ b/com/hbm/tileentity/machine/TileEntityCoreEmitter.java @@ -53,7 +53,7 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements ICon watts = MathHelper.clamp_int(watts, 1, 100); long demand = maxPower * watts / 2000; - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); beam = 0; @@ -109,6 +109,12 @@ public class TileEntityCoreEmitter extends TileEntityMachineBase implements ICon if(b != Blocks.air) { + if(b.getMaterial().isLiquid()) { + worldObj.playSoundEffect(x + 0.5, y + 0.5, z + 0.5, "random.fizz", 1.0F, 1.0F); + worldObj.setBlockToAir(x, y, z); + break; + } + float hardness = b.getExplosionResistance(null); if(hardness < 6000 && worldObj.rand.nextInt(20) == 0) { worldObj.func_147480_a(x, y, z, false); diff --git a/com/hbm/tileentity/machine/TileEntityCoreInjector.java b/com/hbm/tileentity/machine/TileEntityCoreInjector.java index 8724008b1..dc256cb9a 100644 --- a/com/hbm/tileentity/machine/TileEntityCoreInjector.java +++ b/com/hbm/tileentity/machine/TileEntityCoreInjector.java @@ -88,8 +88,8 @@ public class TileEntityCoreInjector extends TileEntityMachineBase implements IFl this.markDirty(); - tanks[0].updateTank(xCoord, yCoord, zCoord); - tanks[1].updateTank(xCoord, yCoord, zCoord); + tanks[0].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); + tanks[1].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); NBTTagCompound data = new NBTTagCompound(); data.setInteger("beam", beam); diff --git a/com/hbm/tileentity/machine/TileEntityCoreReceiver.java b/com/hbm/tileentity/machine/TileEntityCoreReceiver.java index b8457ec2a..a877e2da8 100644 --- a/com/hbm/tileentity/machine/TileEntityCoreReceiver.java +++ b/com/hbm/tileentity/machine/TileEntityCoreReceiver.java @@ -43,7 +43,7 @@ public class TileEntityCoreReceiver extends TileEntityMachineBase implements ISo if (!worldObj.isRemote) { - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); power += joules * 5000; diff --git a/com/hbm/tileentity/machine/TileEntityFWatzCore.java b/com/hbm/tileentity/machine/TileEntityFWatzCore.java index f28908f37..054bf268a 100644 --- a/com/hbm/tileentity/machine/TileEntityFWatzCore.java +++ b/com/hbm/tileentity/machine/TileEntityFWatzCore.java @@ -347,7 +347,7 @@ public class TileEntityFWatzCore extends TileEntity implements ISidedInventory, tanks[2].loadTank(4, 6, slots); for(int i = 0; i < 3; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } if(this.isRunning() && (tanks[1].getFill() <= 0 || tanks[2].getFill() <= 0 || !hasFuse() || getSingularityType() == 0) || cooldown || !this.isStructureValid(worldObj)) diff --git a/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java b/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java index e85c76d36..8aaadf3f7 100644 --- a/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java +++ b/com/hbm/tileentity/machine/TileEntityFusionMultiblock.java @@ -989,7 +989,7 @@ public class TileEntityFusionMultiblock extends TileEntity implements ISidedInve tanks[2].loadTank(3, 11, slots); for(int i = 0; i < 3; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if(slots[2] != null && slots[2].getItem() == ModItems.tritium_deuterium_cake) { diff --git a/com/hbm/tileentity/machine/TileEntityMachineBoiler.java b/com/hbm/tileentity/machine/TileEntityMachineBoiler.java index 969ab0229..7c6776ba0 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineBoiler.java +++ b/com/hbm/tileentity/machine/TileEntityMachineBoiler.java @@ -239,7 +239,7 @@ public class TileEntityMachineBoiler extends TileEntity implements ISidedInvento tanks[1].unloadTank(5, 6, slots); for(int i = 0; i < 2; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); boolean flag1 = false; diff --git a/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java b/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java index 98b41ea00..52fc4667e 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java +++ b/com/hbm/tileentity/machine/TileEntityMachineBoilerElectric.java @@ -249,7 +249,7 @@ public class TileEntityMachineBoilerElectric extends TileEntity implements ISide tanks[1].unloadTank(5, 6, slots); for(int i = 0; i < 2; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if(heat > 2000) { heat -= 30; diff --git a/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java b/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java index 556681b6b..afaacfdf6 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java +++ b/com/hbm/tileentity/machine/TileEntityMachineCMBFactory.java @@ -288,7 +288,7 @@ public class TileEntityMachineCMBFactory extends TileEntity implements ISidedInv power = Library.chargeTEFromItems(slots, 0, power, maxPower); tank.loadTank(2, 5, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if (canProcess()) { process(); diff --git a/com/hbm/tileentity/machine/TileEntityMachineChemplant.java b/com/hbm/tileentity/machine/TileEntityMachineChemplant.java index 6c1ed0983..0e50d890d 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineChemplant.java +++ b/com/hbm/tileentity/machine/TileEntityMachineChemplant.java @@ -307,7 +307,7 @@ public class TileEntityMachineChemplant extends TileEntity implements ISidedInve tanks[3].unloadTank(10, 12, slots); for(int i = 0; i < 4; i++) { - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } FluidStack[] inputs = MachineRecipes.getFluidInputFromTempate(slots[4]); diff --git a/com/hbm/tileentity/machine/TileEntityMachineCoal.java b/com/hbm/tileentity/machine/TileEntityMachineCoal.java index 008128e5a..27c2aa3da 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineCoal.java +++ b/com/hbm/tileentity/machine/TileEntityMachineCoal.java @@ -236,7 +236,7 @@ public class TileEntityMachineCoal extends TileEntity implements ISidedInventory //Water tank.loadTank(0, 3, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); //Battery Item power = Library.chargeItemsFromTE(slots, 2, power, maxPower); diff --git a/com/hbm/tileentity/machine/TileEntityMachineDiesel.java b/com/hbm/tileentity/machine/TileEntityMachineDiesel.java index 5ba356582..a5948aa71 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineDiesel.java +++ b/com/hbm/tileentity/machine/TileEntityMachineDiesel.java @@ -222,7 +222,7 @@ public class TileEntityMachineDiesel extends TileEntity implements ISidedInvento //Tank Management tank.setType(3, 4, slots); tank.loadTank(0, 1, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); FluidType type = tank.getTankType(); if(type.name().equals(FluidType.NITAN.name())) diff --git a/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java b/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java index f0b9a2d4d..5bb557b9f 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java +++ b/com/hbm/tileentity/machine/TileEntityMachineFluidTank.java @@ -206,7 +206,7 @@ public class TileEntityMachineFluidTank extends TileEntity implements ISidedInve tank.loadTank(2, 3, slots); tank.setType(0, 1, slots); tank.unloadTank(4, 5, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineGasCent.java b/com/hbm/tileentity/machine/TileEntityMachineGasCent.java index 97fe4ed0a..a5aba4f27 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineGasCent.java +++ b/com/hbm/tileentity/machine/TileEntityMachineGasCent.java @@ -283,7 +283,7 @@ public class TileEntityMachineGasCent extends TileEntity implements ISidedInvent power = Library.chargeTEFromItems(slots, 0, power, maxPower); tank.setType(1, 2, slots); tank.loadTank(3, 4, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if(canProcess()) { diff --git a/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java b/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java index 74d199cd0..b3cdef8c3 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java +++ b/com/hbm/tileentity/machine/TileEntityMachineGasFlare.java @@ -221,7 +221,7 @@ public class TileEntityMachineGasFlare extends TileEntity implements ISidedInven if(!worldObj.isRemote) { tank.loadTank(1, 2, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if(tank.getFill() >= 10) { tank.setFill(tank.getFill() - 10); diff --git a/com/hbm/tileentity/machine/TileEntityMachineGenerator.java b/com/hbm/tileentity/machine/TileEntityMachineGenerator.java index 70a432e4d..f75eb8a2b 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineGenerator.java +++ b/com/hbm/tileentity/machine/TileEntityMachineGenerator.java @@ -290,7 +290,7 @@ public class TileEntityMachineGenerator extends TileEntity implements ISidedInve tanks[1].loadTank(10, 13, slots); for(int i = 0; i < 2; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); //Batteries power = Library.chargeItemsFromTE(slots, 11, power, powerMax); diff --git a/com/hbm/tileentity/machine/TileEntityMachineInserter.java b/com/hbm/tileentity/machine/TileEntityMachineInserter.java index 6105a31e6..30e968532 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineInserter.java +++ b/com/hbm/tileentity/machine/TileEntityMachineInserter.java @@ -221,9 +221,9 @@ public class TileEntityMachineInserter extends TileEntity implements ISidedInven tanks[0].setType(1, 2, slots); tanks[1].setType(4, 5, slots); tanks[2].setType(7, 8, slots); - tanks[0].updateTank(xCoord, yCoord, zCoord); - tanks[1].updateTank(xCoord, yCoord, zCoord); - tanks[2].updateTank(xCoord, yCoord, zCoord); + tanks[0].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); + tanks[1].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); + tanks[2].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } } diff --git a/com/hbm/tileentity/machine/TileEntityMachineOilWell.java b/com/hbm/tileentity/machine/TileEntityMachineOilWell.java index 245fdeac3..16d3f5589 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineOilWell.java +++ b/com/hbm/tileentity/machine/TileEntityMachineOilWell.java @@ -250,7 +250,7 @@ public class TileEntityMachineOilWell extends TileEntity implements ISidedInvent this.tanks[1].unloadTank(3, 4, slots); for(int i = 0; i < 2; i++) { - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } power = Library.chargeTEFromItems(slots, 0, power, maxPower); diff --git a/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java b/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java index 45e39e1cf..4338ad233 100644 --- a/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java +++ b/com/hbm/tileentity/machine/TileEntityMachinePuF6Tank.java @@ -194,7 +194,7 @@ public class TileEntityMachinePuF6Tank extends TileEntity implements ISidedInven { tank.loadTank(0, 1, slots); tank.unloadTank(2, 3, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } } diff --git a/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java b/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java index 8dd2c6994..3a38c87b3 100644 --- a/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java +++ b/com/hbm/tileentity/machine/TileEntityMachinePumpjack.java @@ -253,7 +253,7 @@ public class TileEntityMachinePumpjack extends TileEntity implements ISidedInven this.tanks[1].unloadTank(3, 4, slots); for(int i = 0; i < 2; i++) { - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } power = Library.chargeTEFromItems(slots, 0, power, maxPower); diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java b/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java index 990bbb51a..0598c1859 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java +++ b/com/hbm/tileentity/machine/TileEntityMachineReactorLarge.java @@ -195,6 +195,7 @@ public class TileEntityMachineReactorLarge extends TileEntity NBTTagList list = new NBTTagList(); tanks[0].writeToNBT(nbt, "water"); tanks[1].writeToNBT(nbt, "coolant"); + tanks[2].writeToNBT(nbt, "steam"); nbt.setInteger("type", type.getID()); for (int i = 0; i < slots.length; i++) { @@ -525,7 +526,7 @@ public class TileEntityMachineReactorLarge extends TileEntity } for (int i = 0; i < 3; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if(worldObj.getBlock(xCoord, yCoord, zCoord - 2) == ModBlocks.reactor_ejector && worldObj.getBlockMetadata(xCoord, yCoord, zCoord - 2) == 2) tryEjectInto(xCoord, yCoord, zCoord - 3); diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java b/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java index 1266fecfb..1e834620d 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java +++ b/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java @@ -419,7 +419,7 @@ public class TileEntityMachineReactorSmall extends TileEntity } for (int i = 0; i < 3; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, rods, 0)); PacketDispatcher.wrapper.sendToAll(new AuxGaugePacket(xCoord, yCoord, zCoord, retracting ? 1 : 0, 1)); diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java b/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java index 13cb7e7d8..9116c1c55 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java +++ b/com/hbm/tileentity/machine/TileEntityMachineReactorSmallOld.java @@ -371,7 +371,7 @@ public class TileEntityMachineReactorSmallOld extends TileEntity } for (int i = 0; i < 2; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); // Batteries power = Library.chargeItemsFromTE(slots, 11, power, powerMax); diff --git a/com/hbm/tileentity/machine/TileEntityMachineRefinery.java b/com/hbm/tileentity/machine/TileEntityMachineRefinery.java index 33fd96d0b..ea636ac54 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineRefinery.java +++ b/com/hbm/tileentity/machine/TileEntityMachineRefinery.java @@ -295,7 +295,7 @@ public class TileEntityMachineRefinery extends TileEntity implements ISidedInven tanks[4].unloadTank(9, 10, slots); for(int i = 0; i < 5; i++) { - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } if(sulfur >= maxSulfur) { diff --git a/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java b/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java index e35fc9adf..762027ba0 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java +++ b/com/hbm/tileentity/machine/TileEntityMachineSeleniumEngine.java @@ -227,7 +227,7 @@ public class TileEntityMachineSeleniumEngine extends TileEntity implements ISide //Tank Management tank.setType(11, 12, slots); tank.loadTank(9, 10, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); FluidType type = tank.getTankType(); if(type.name().equals(FluidType.NITAN.name())) diff --git a/com/hbm/tileentity/machine/TileEntityMachineTurbine.java b/com/hbm/tileentity/machine/TileEntityMachineTurbine.java index f54bcb15b..d85ab0559 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineTurbine.java +++ b/com/hbm/tileentity/machine/TileEntityMachineTurbine.java @@ -251,7 +251,7 @@ public class TileEntityMachineTurbine extends TileEntity implements ISidedInvent tanks[1].unloadTank(5, 6, slots); for(int i = 0; i < 2; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); PacketDispatcher.wrapper.sendToAll(new AuxElectricityPacket(xCoord, yCoord, zCoord, power)); } diff --git a/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java b/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java index 72a8a210d..049c1e504 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java +++ b/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java @@ -238,7 +238,7 @@ public class TileEntityMachineTurbofan extends TileEntity implements ISidedInven //Tank Management tank.loadTank(0, 1, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); isRunning = false; diff --git a/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java b/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java index ac696d466..a9a1fd157 100644 --- a/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java +++ b/com/hbm/tileentity/machine/TileEntityMachineUF6Tank.java @@ -196,7 +196,7 @@ public class TileEntityMachineUF6Tank extends TileEntity implements ISidedInvent { tank.loadTank(0, 1, slots); tank.unloadTank(2, 3, slots); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); } } diff --git a/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java b/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java index 10692b8c2..a8ef702e0 100644 --- a/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java +++ b/com/hbm/tileentity/machine/TileEntityReactorMultiblock.java @@ -221,7 +221,7 @@ public class TileEntityReactorMultiblock extends TileEntity implements ISidedInv tanks[1].loadTank(32, 33, slots); for(int i = 0; i < 2; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); if(hasFuse()) diff --git a/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java b/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java index 58e6d33f8..d6b82b955 100644 --- a/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java +++ b/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java @@ -149,7 +149,7 @@ public class TileEntitySoyuzLauncher extends TileEntity implements ISidedInvento tanks[1].loadTank(2, 3, slots); for (int i = 0; i < 2; i++) - tanks[i].updateTank(xCoord, yCoord, zCoord); + tanks[i].updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); power = Library.chargeTEFromItems(slots, 5, power, maxPower); diff --git a/com/hbm/tileentity/machine/TileEntityWatzCore.java b/com/hbm/tileentity/machine/TileEntityWatzCore.java index 61c1ef21f..8293436fd 100644 --- a/com/hbm/tileentity/machine/TileEntityWatzCore.java +++ b/com/hbm/tileentity/machine/TileEntityWatzCore.java @@ -574,7 +574,7 @@ public class TileEntityWatzCore extends TileEntity implements ISidedInventory, I power = Library.chargeItemsFromTE(slots, 37, power, maxPower); - tank.updateTank(xCoord, yCoord, zCoord); + tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId); tank.unloadTank(36, 39, slots); if(slots[36] != null && slots[36].getItem() == ModItems.titanium_filter && slots[36].getItemDamage() + 100 <= slots[36].getMaxDamage())