From 79a08930d9867d04afe123c2fe8db9e46e63f397 Mon Sep 17 00:00:00 2001
From: HbmMods <hbmmods@gmail.com>
Date: Thu, 9 Apr 2020 19:57:09 +0200
Subject: [PATCH] finished dynamic barrels, more textues

---
 assets/hbm/lang/de_DE.lang                    |   7 +
 assets/hbm/lang/en_US.lang                    |   7 +
 assets/hbm/models/blocks/antenna_top.obj      | 147 ++++++++++++++++++
 assets/hbm/models/{ => blocks}/barrel.obj     |   0
 assets/hbm/models/{ => blocks}/beam.obj       |   0
 assets/hbm/models/{ => blocks}/pole.obj       |   0
 assets/hbm/models/{ => blocks}/scaffold.obj   |   0
 .../hbm/models/{ => blocks}/taperecorder.obj  |   0
 .../{barrel_Iron.png => barrel_iron.png}      | Bin
 assets/hbm/textures/blocks/block_waste.png    | Bin 324 -> 447 bytes
 .../textures/blocks/block_waste_painted.png   | Bin 0 -> 549 bytes
 assets/hbm/textures/blocks/deco_pole_top.png  | Bin 373 -> 548 bytes
 assets/hbm/textures/blocks/waste_log_side.png | Bin 595 -> 779 bytes
 assets/hbm/textures/blocks/waste_log_top.png  | Bin 571 -> 815 bytes
 assets/hbm/textures/items/ammo_rocket.png     | Bin 327 -> 317 bytes
 assets/hbm/textures/items/ammo_rocket_emp.png | Bin 265 -> 325 bytes
 .../hbm/textures/items/ammo_rocket_glare.png  | Bin 328 -> 319 bytes
 assets/hbm/textures/items/ammo_rocket_he.png  | Bin 275 -> 333 bytes
 .../textures/items/ammo_rocket_incendiary.png | Bin 292 -> 331 bytes
 .../textures/items/ammo_rocket_nuclear.png    | Bin 324 -> 346 bytes
 .../textures/items/ammo_rocket_shrapnel.png   | Bin 283 -> 327 bytes
 .../hbm/textures/items/ammo_rocket_sleek.png  | Bin 244 -> 286 bytes
 .../hbm/textures/items/ammo_rocket_toxic.png  | Bin 308 -> 340 bytes
 ...plate_aluminum.png => plate_aluminium.png} | Bin
 .../textures/models/misc/danger_diamond.png   | Bin 0 -> 7168 bytes
 com/hbm/blocks/ModBlocks.java                 |   2 +-
 com/hbm/blocks/generic/DecoPoleTop.java       |  40 +----
 com/hbm/blocks/machine/BlockFluidBarrel.java  |  16 ++
 .../entity/grenade/EntityGrenadePulse.java    |   2 -
 com/hbm/explosion/ExplosionChaos.java         |   4 +-
 com/hbm/handler/FluidTypeHandler.java         |  97 +++++++-----
 com/hbm/handler/GUIHandler.java               |  18 +++
 .../inventory/container/ContainerBarrel.java  |  87 +++++++++++
 .../container/ContainerCoreEmitter.java       |  15 ++
 .../container/ContainerCoreReceiver.java      |  15 ++
 com/hbm/inventory/gui/GUIBarrel.java          |  70 +++++++++
 com/hbm/items/special/ItemBlockLore.java      |  27 +++-
 com/hbm/main/ClientProxy.java                 |   3 +-
 com/hbm/main/ResourceManager.java             |  11 +-
 com/hbm/packet/AuxButtonPacket.java           |   8 +
 com/hbm/render/block/RenderAntennaTop.java    |  70 +++++++++
 com/hbm/render/block/RenderFence.java         |   8 +-
 .../render/tileentity/RenderFluidBarrel.java  |  46 ++++++
 .../render/tileentity/RendererObjTester.java  |  15 +-
 com/hbm/render/util/DiamondPronter.java       | 115 ++++++++++++++
 com/hbm/render/util/EnumSymbol.java           |  20 +++
 .../tileentity/machine/TileEntityBarrel.java  |  87 ++++++++++-
 .../TileEntityMachineReactorSmall.java        |   4 +-
 48 files changed, 830 insertions(+), 111 deletions(-)
 create mode 100644 assets/hbm/models/blocks/antenna_top.obj
 rename assets/hbm/models/{ => blocks}/barrel.obj (100%)
 rename assets/hbm/models/{ => blocks}/beam.obj (100%)
 rename assets/hbm/models/{ => blocks}/pole.obj (100%)
 rename assets/hbm/models/{ => blocks}/scaffold.obj (100%)
 rename assets/hbm/models/{ => blocks}/taperecorder.obj (100%)
 rename assets/hbm/textures/blocks/{barrel_Iron.png => barrel_iron.png} (100%)
 create mode 100644 assets/hbm/textures/blocks/block_waste_painted.png
 rename assets/hbm/textures/items/{plate_aluminum.png => plate_aluminium.png} (100%)
 create mode 100644 assets/hbm/textures/models/misc/danger_diamond.png
 create mode 100644 com/hbm/inventory/container/ContainerBarrel.java
 create mode 100644 com/hbm/inventory/gui/GUIBarrel.java
 create mode 100644 com/hbm/render/block/RenderAntennaTop.java
 create mode 100644 com/hbm/render/tileentity/RenderFluidBarrel.java
 create mode 100644 com/hbm/render/util/DiamondPronter.java
 create mode 100644 com/hbm/render/util/EnumSymbol.java

diff --git a/assets/hbm/lang/de_DE.lang b/assets/hbm/lang/de_DE.lang
index 225e7b11e..00eb695da 100644
--- a/assets/hbm/lang/de_DE.lang
+++ b/assets/hbm/lang/de_DE.lang
@@ -469,6 +469,13 @@ container.reactorSmall=Atomreaktor
 tile.machine_controller.name=Reaktorfernsteuerung
 container.reactorControl=Reaktorfernsteuerung
 
+tile.barrel_plastic.name=Sicheres Fass™
+tile.barrel_corroded.name=Verrostetes Fass
+tile.barrel_iron.name=Eisenfass
+tile.barrel_steel.name=Stahlfass
+tile.barrel_antimatter.name=Magnetischer Antimaterie-Behälter
+container.barrel=Fass
+
 tile.broadcaster_pc.name=Korrupter Sender
 
 tile.radiobox.name=Rosenberg Ungeziefervernichter
diff --git a/assets/hbm/lang/en_US.lang b/assets/hbm/lang/en_US.lang
index bc2caba4d..526fb71f9 100644
--- a/assets/hbm/lang/en_US.lang
+++ b/assets/hbm/lang/en_US.lang
@@ -469,6 +469,13 @@ container.reactorSmall=Nuclear Reactor
 tile.machine_controller.name=Reactor Remote Control Block
 container.reactorControl=Reactor Remote Control Block
 
+tile.barrel_plastic.name=Safe Barrel™
+tile.barrel_corroded.name=Corroded Barrel
+tile.barrel_iron.name=Iron Barrel
+tile.barrel_steel.name=Steel Barrel
+tile.barrel_antimatter.name=Magnetic Antimatter Container
+container.barrel=Barrel
+
 tile.broadcaster_pc.name=Corrupted Broadcaster
 
 tile.radiobox.name=Rosenberg Pest Control Box
diff --git a/assets/hbm/models/blocks/antenna_top.obj b/assets/hbm/models/blocks/antenna_top.obj
new file mode 100644
index 000000000..893224b1f
--- /dev/null
+++ b/assets/hbm/models/blocks/antenna_top.obj
@@ -0,0 +1,147 @@
+# Blender v2.76 (sub 0) OBJ File: 'antenna_top.blend'
+# www.blender.org
+o Cube_Cube.001
+v -0.375000 0.000000 0.375000
+v -0.375000 0.500000 0.375000
+v -0.375000 0.000000 -0.375000
+v -0.375000 0.500000 -0.375000
+v 0.375000 0.000000 0.375000
+v 0.375000 0.500000 0.375000
+v 0.375000 0.000000 -0.375000
+v 0.375000 0.500000 -0.375000
+v -0.250000 1.250000 -0.250000
+v -0.250000 1.250000 -0.500000
+v -0.500000 1.250000 -0.500000
+v -0.500000 1.250000 -0.250000
+v -0.500000 0.250000 -0.250000
+v -0.500000 0.250000 -0.500000
+v -0.250000 0.250000 -0.250000
+v -0.250000 0.250000 -0.500000
+v -0.125000 0.500000 -0.125000
+v 0.125000 0.500000 -0.125000
+v -0.125000 0.500000 0.125000
+v 0.125000 0.500000 0.125000
+v 0.125000 0.625000 -0.125000
+v 0.125000 0.625000 0.125000
+v -0.125000 0.625000 -0.125000
+v -0.125000 0.625000 0.125000
+v -0.250000 1.250000 0.500000
+v -0.250000 1.250000 0.250000
+v -0.500000 1.250000 0.250000
+v -0.500000 1.250000 0.500000
+v -0.500000 0.250000 0.500000
+v -0.500000 0.250000 0.250000
+v -0.250000 0.250000 0.500000
+v -0.250000 0.250000 0.250000
+v 0.500000 1.250000 -0.250000
+v 0.500000 1.250000 -0.500000
+v 0.250000 1.250000 -0.500000
+v 0.250000 1.250000 -0.250000
+v 0.250000 0.250000 -0.250000
+v 0.250000 0.250000 -0.500000
+v 0.500000 0.250000 -0.250000
+v 0.500000 0.250000 -0.500000
+v 0.500000 1.250000 0.500000
+v 0.500000 1.250000 0.250000
+v 0.250000 1.250000 0.250000
+v 0.250000 1.250000 0.500000
+v 0.250000 0.250000 0.500000
+v 0.250000 0.250000 0.250000
+v 0.500000 0.250000 0.500000
+v 0.500000 0.250000 0.250000
+vt 0.600000 0.000000
+vt 0.600000 0.400000
+vt -0.000000 0.400000
+vt 0.000122 0.000122
+vt 0.600000 1.000000
+vt 0.000000 1.000000
+vt 0.800000 0.000000
+vt 0.800000 0.800000
+vt 0.600000 0.800000
+vt 0.600000 0.600000
+vt 0.800000 0.100000
+vt 0.999906 0.000094
+vt 1.000000 0.000000
+vt 0.800000 0.600000
+vt 1.000000 0.300000
+vt 0.800000 0.300000
+vt -0.000000 -0.000000
+vt 0.000100 0.999900
+vt 1.000000 0.100000
+vn -1.000000 0.000000 0.000000
+vn 0.000000 0.000000 -1.000000
+vn 1.000000 0.000000 0.000000
+vn 0.000000 0.000000 1.000000
+vn 0.000000 -1.000000 0.000000
+vn 0.000000 1.000000 0.000000
+s off
+f 4/1/1 3/2/1 1/3/1
+f 8/1/2 7/2/2 3/3/2
+f 6/3/3 5/4/3 7/1/3
+f 2/3/4 1/4/4 5/1/4
+f 3/3/5 7/2/5 5/5/5
+f 8/5/6 4/6/6 2/3/6
+f 13/7/1 12/8/1 11/9/1
+f 16/7/3 10/8/3 9/9/3
+f 14/7/2 11/8/2 10/9/2
+f 15/7/4 9/8/4 12/9/4
+f 10/8/6 11/9/6 12/10/6
+f 22/11/3 20/7/3 18/12/3
+f 23/11/1 17/7/1 19/13/1
+f 24/11/4 19/7/4 20/12/4
+f 21/11/2 18/7/2 17/13/2
+f 13/10/5 14/14/5 16/8/5
+f 21/15/6 23/16/6 24/11/6
+f 29/7/1 28/8/1 27/9/1
+f 32/7/3 26/8/3 25/9/3
+f 30/7/2 27/8/2 26/9/2
+f 31/7/4 25/8/4 28/9/4
+f 26/8/6 27/9/6 28/10/6
+f 29/10/5 30/14/5 32/8/5
+f 37/7/1 36/8/1 35/9/1
+f 40/7/3 34/8/3 33/9/3
+f 38/7/2 35/8/2 34/9/2
+f 39/7/4 33/8/4 36/9/4
+f 34/8/6 35/9/6 36/10/6
+f 37/10/5 38/14/5 40/8/5
+f 45/7/1 44/8/1 43/9/1
+f 48/7/3 42/8/3 41/9/3
+f 46/7/2 43/8/2 42/9/2
+f 47/7/4 41/8/4 44/9/4
+f 42/8/6 43/9/6 44/10/6
+f 45/10/5 46/14/5 48/8/5
+f 2/17/1 4/1/1 1/3/1
+f 4/17/2 8/1/2 3/3/2
+f 8/2/3 6/3/3 7/1/3
+f 6/2/4 2/3/4 5/1/4
+f 1/18/5 3/3/5 5/5/5
+f 6/2/6 8/5/6 2/3/6
+f 14/1/1 13/7/1 11/9/1
+f 15/1/3 16/7/3 9/9/3
+f 16/1/2 14/7/2 10/9/2
+f 13/1/4 15/7/4 12/9/4
+f 9/14/6 10/8/6 12/10/6
+f 21/19/3 22/11/3 18/12/3
+f 24/19/1 23/11/1 19/13/1
+f 22/19/4 24/11/4 20/12/4
+f 23/19/2 21/11/2 17/13/2
+f 15/9/5 13/10/5 16/8/5
+f 22/19/6 21/15/6 24/11/6
+f 30/1/1 29/7/1 27/9/1
+f 31/1/3 32/7/3 25/9/3
+f 32/1/2 30/7/2 26/9/2
+f 29/1/4 31/7/4 28/9/4
+f 25/14/6 26/8/6 28/10/6
+f 31/9/5 29/10/5 32/8/5
+f 38/1/1 37/7/1 35/9/1
+f 39/1/3 40/7/3 33/9/3
+f 40/1/2 38/7/2 34/9/2
+f 37/1/4 39/7/4 36/9/4
+f 33/14/6 34/8/6 36/10/6
+f 39/9/5 37/10/5 40/8/5
+f 46/1/1 45/7/1 43/9/1
+f 47/1/3 48/7/3 41/9/3
+f 48/1/2 46/7/2 42/9/2
+f 45/1/4 47/7/4 44/9/4
+f 41/14/6 42/8/6 44/10/6
+f 47/9/5 45/10/5 48/8/5
diff --git a/assets/hbm/models/barrel.obj b/assets/hbm/models/blocks/barrel.obj
similarity index 100%
rename from assets/hbm/models/barrel.obj
rename to assets/hbm/models/blocks/barrel.obj
diff --git a/assets/hbm/models/beam.obj b/assets/hbm/models/blocks/beam.obj
similarity index 100%
rename from assets/hbm/models/beam.obj
rename to assets/hbm/models/blocks/beam.obj
diff --git a/assets/hbm/models/pole.obj b/assets/hbm/models/blocks/pole.obj
similarity index 100%
rename from assets/hbm/models/pole.obj
rename to assets/hbm/models/blocks/pole.obj
diff --git a/assets/hbm/models/scaffold.obj b/assets/hbm/models/blocks/scaffold.obj
similarity index 100%
rename from assets/hbm/models/scaffold.obj
rename to assets/hbm/models/blocks/scaffold.obj
diff --git a/assets/hbm/models/taperecorder.obj b/assets/hbm/models/blocks/taperecorder.obj
similarity index 100%
rename from assets/hbm/models/taperecorder.obj
rename to assets/hbm/models/blocks/taperecorder.obj
diff --git a/assets/hbm/textures/blocks/barrel_Iron.png b/assets/hbm/textures/blocks/barrel_iron.png
similarity index 100%
rename from assets/hbm/textures/blocks/barrel_Iron.png
rename to assets/hbm/textures/blocks/barrel_iron.png
diff --git a/assets/hbm/textures/blocks/block_waste.png b/assets/hbm/textures/blocks/block_waste.png
index 8c9c10d4f9f0a33cb0f4f362165ba59934e019f3..ba7a9d711fd8d8ce2ffc333ae9593e191358c27b 100644
GIT binary patch
delta 397
zcmV;80doGt0>1;0Bnkm@Qb$4nuFf3kks%v@zyJUazyWI3i3tDz0aQsuK~y+TJ<>_8
z!axiJ(4>I?f(_zIEOY+@ut!LI=JCHyA-r(Pc6scyeczu>r^#e8olcL(W7l<`&!=r$
z9{O^*G)*&~&*|s$x!rEt&1SRP?bzh?dLaRFMx#;i?RHB(d^jA60N(rkzFx17$K!r~
zzhg5w{{{&r5|9h=!DADqG~H>1*XwosL?&Hg5F|SF0D8Gxp3i4ERcOu2cs#E3rpcgT
zOVifI=FEiHLUklN$wpc%7Fl3OuN{K3dgei>3)J{vIN#4Cp%S+yLgYIfFW?=3n3(~f
zO_4%M6jd`)Y^~Fs$Wa*J$qQEJ@1W^;7)+2-8_uhddZjFv{bsY-YPI?XhWDv6lv*?d
zRjM}unReLk_hMNwvk5sp4HNl=p{eo!HjSENNaG=ZigbOrjELuH0cYSzTVOb8m%23v
r$t0FjmF6ODB8=qE_sb+yU#*mXQlcp=HFY2R00000NkvXXu0mjf_}{yj

delta 276
zcmV+v0qg$11H=N5B#|)~f589%4#5Gqk!$S$000<tMObuGZ)S9NVRB^vaA9d~bS`dX
zbRaY?F)lS^M_5t-006>CL_t(IPkoU=4#OY}1oMj`^-zfuhyMS49W%y3sO?Ch_Iejc
zbB#$~*uE#$g<=HK+xu%Hr6pQtK<T-#g~y~sGkJpQ0dA(&Zb5q)e?@AoIkR9zXQ~La
z_dC$zV9Y9-_Bv1CaT{XXLC216I0HZ?T@w^nbcp~z1~h$zlMUdEKy3aafWrdA8IV7(
zfitdDp9YlDwLo{xK%L-NcEuVpz{Aa??!$Puf`$n2@rc?}kg?u<MFxNhsvrp#^`FLI
aj1L9@TGIhUu;Ty#3IG5}MNUMnLSTXheRS>s

diff --git a/assets/hbm/textures/blocks/block_waste_painted.png b/assets/hbm/textures/blocks/block_waste_painted.png
new file mode 100644
index 0000000000000000000000000000000000000000..b128bc2e7449e3af06d13a2e81d76ee21e43359a
GIT binary patch
literal 549
zcmV+=0^0qFP)<h;3K|Lk000e1NJLTq000mG000mO0ssI2kdbIM00001b5ch_0Itp)
z=>Px#1ZP1_K>z@;j|==^1poj532;bRa{vGizW@LZzX3P}QzQTY0lG;<K~y+TJ(9~x
z!%z^0o0EIfMK6e2@M-L_r9}j36)6h7l@}0nq2SZFD~O>K1-ofek|t^5cQWWtn9Q8{
z=X#FO@Ao&Gjcwbm>qb%JI8IrXhGB4mjN`agtNFf<%=0`9L!;O0EtgAdu-ok*p%7!5
zrs&)4R^riDtChk5uPBNnNwO?U(-bx)hwBQW0|Fo`zz-hw`05LjFsdU--05^U#07{%
zDlx$D{1bULT}U!yqtO^$gy@r-AL7YHab;PSrW2}^<NLIAI$e;AvZL__O%qw>IbIaq
z5;GA^-Mw}@jv}b94_)GMKi%%5KtfU(N#}Y1G!Vscv)Od3f)wGCEdehG_+SD{ntQ%G
z(53Y@yQ-SYu6mGa5bE_h+a`rE7z}2!8K<~4@eh!YOehN^x953Wu@YO3favsdaycgj
z6JpA(0lg*Z1Ynb+)oRI>XlZi&O$(Hg+l0Wm9va{vlDBj`eCIR>0?T!?qL9&P3|ZCC
zttt$Pk{;#d{*V(E&$FY*+vAbcCn*_qYKETAb-S>!c|0rx2HPXwfA;_aEtuRtKZc_d
nB$0shxGBY2cvs@mx2DuD6}UTqg#?K}00000NkvXXu0mjfLY?hZ

literal 0
HcmV?d00001

diff --git a/assets/hbm/textures/blocks/deco_pole_top.png b/assets/hbm/textures/blocks/deco_pole_top.png
index f0ea8ef39a8cdf90a6577968608c22c0c32ca9b1..e3fb41bfb61d08ec258ec75a906d02db436ecb98 100644
GIT binary patch
literal 548
zcmV+<0^9wGP)<h;3K|Lk000e1NJLTq000yK000yS1^@s6jfou%00004b3#c}2nYxW
zd<bNS0005oNkl<ZIE|f?L2}|S5Jg{GvJD=C3l<z;mK<RY5YEgja)4P=#W_;gDoNPt
zStK|xW|ELzO5MNu_y1p>o_?uw4iO>GbMidLT8oI#wk;yUr9_11=RfZccgogv&33y5
zAj>k0F^CA>`$_Zhc>D<K6)?s~N(q3J5`Eu)I`kpn>2$(-KZ1@Q))GQMRmZ=!Z9fNG
zEEcTSYf?&x2&zh!WjN<3isGhuu~@L%?KFe{Kv|aT_xqchS^($Vmnnr1SglsHZOi$5
zo^B{2)O9_osj2|P7>P07G+$VF?=i;Q70zDl@s(0lthG4jP*v)>o&vtSyxgUHt#(QY
zV+_tY=JOvcmrK0&bX_+EY?_A6W<yE|RmB(s+*foypEC>t-uoNF-vFxWLzJtk8tqh;
z<rFZ+$l-7p2QGEl^!o53f^&}5YDEa)z9_0njPbu&&hz{Ru<w<w>ktu!VVD9wn&m7j
z==&ZKp{lC;lpo3RFbp(JL)UdU=lJ~-bq?|zM81*bqA2LP4r2_~TIw3M+lG`9$K&ZW
zdjEm}6UrBnX0zFt6k`nM^ZR_?f5V3%1lH>{ZQH)Z6Ap(HF}_iL)Q8vG8)Hy~7_V;l
ms1K{E#Cty)TLg-Nal^kjCr>tHw##4u0000<MNUMnLSTX@6Zqu-

literal 373
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl
z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33
zJ+nVO$@hV3o_V@BhFJJ7ooLI~<RH-cok{M%v17NcwMhIko4~rWVe7(83%<menaw-Q
zT`|${z3OJZtc}MWDNpXdd7ODp#~)UGMHa?yZmX8BSmm|nyT~*V|G?{8pH%uKdVUni
zz3p`$EYxV_8W<1}WaAn+EnYm>hV|6~u{7_l<qk@AJYZTj`s=o`qF76-2FVw-yZtYk
z^p?cBGYWjTq3`n7w!A2EAJZE<)>jIJ5~n;ktgp2k=h<^#=&K>a`<D3T=I5U^7uC(`
z6J%M@&&V||Y5GA6xwMp<ZR}I~8P=|RaKQT88J!2^M{F6dye)Hxm{%MN^f7~{tDnm{
Hr-UW|1+|YC

diff --git a/assets/hbm/textures/blocks/waste_log_side.png b/assets/hbm/textures/blocks/waste_log_side.png
index 517c9dc2b63a063d5b20fcd5a4ce2e238260f686..fa1518e2194bd974b9661e7f8e92558bf88101b5 100644
GIT binary patch
delta 766
zcmV<a0s;Ng1d9fc8Gi-<001BJ|6u?C00eVFNmK|32nc)#WQYI&0>Vi|K~y-6C6ZZh
z^F#muXV>=;+qvBKOG{e>2#NpyGf)vo@Ck|#qD_<LsGZpHxw|~{bsk3ZFyd~tGL~)e
z<!Zsp>l==3BWw%Tc35w=tZuF`298BR9EL3NE4r>FOD6oc-hUu(Z*z<>9F8SPnt~Jn
zTrH>AmW3b2ydOT$+TaHP>-C!L_MP8;|C6#jBM<wM=5is=bKc)~*tX5_SYU)iN=bP-
zv6xR07><Vnceh`-%9niq?LAs+WZSg>R8_@%He;G4D5cr&j~HV}CKHzP8GYX~j3e7a
z!M`tS+UCMMi+_=EoM2fNi^YPXEa>_H-}C4Og%E<F@0d(d4B*%nj_$dhCzMr<ZAoOB
zWhkY2{`(oFp}sVLK?p&XWk}oM>6a$}hG8U(Bg(2F@@-B{kF2T+Fl1SZ=Xq4;8l^P8
zYvb9H&D$F{*ZHSZN*vo}62}Z$VzfaXjt7+12w~B89e<W(Gpdnp6rAdYI1Xvs7Gogr
zU5c`zx-_)?$SjSJtLr7k80zyG$8~W%A1Nin&~yLIJ=#DNMF7~2!@jKWU6=13?`Ve+
zS)I<zvJ@>0lPE->u%yN1QuD{xub(g25+MYR6#Vq#4~$y#*YiK@w>#u~KBMb;vN)!y
zFASpwz<($O80Klrs6Lq%4rvl&OX!Dzo0}Z@vfePNk=M-zfHa9PM)UA^kMFx|_XTBD
zBZa{8Jbr%qm9Fo3T;+U}XXL}fJ$?}2xgPUrN>QB1^PIpB5JIBVKp1!!V~C@WvF}jh
z$l>G6Y&u1LoNC&pCG>riRs_C_=X&gRJDR4$b$4C1y8_qsXxj#W&<~hoDM=h6+skL3
zuq3YQQPmBvZyUnEMH`Jkvs}y>)kt+|NYaFlbIpFYW3gN!?rvA6Yg^(dLI^=OjNDu;
wS#P$eQIRAuUE6-XB5jP(xUK_Q(GHsb0bhq}bWw#6#sB~S07*qoM6N<$f-qQfmH+?%

delta 581
zcmV-L0=oT+2GazP8Gix*005AYXf^-<00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000SaNLh0L01m?d01m?e$8V@)0000ObVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@N
zWrZ?j0005RNkl<ZI8Qy2$F9Oa3`Ix$0iyS8qaX-fgit~eVt<8_(94p4pu?xXGctNv
zOvd(H`}*37FPqI43Wd+-Q>)buheN;L$C*l{GMP*|oi<Gq=jC$QY&O&BR0ER9q+uB4
za=FoHJfBZ_?Rg#-FyrxfFc<*flw2wrjV2O_R;#sMuV1eh9ukj6Be_uFAE2`oi$wzQ
zc)Zzc;^o66v3~&M0@d&L+itf3t6VNefF4$>l>oStxKt|PCkiD1@AuobZJmxVlsLmM
z#0x7L;9WkS2Y?=(PN!b4^Arjs)kP^3iA47M{p0aiE|*|<+U<5Z2`v^2%d!9fJ06c}
zx7$&a7#C5NI+&u8bWCwgMk&n`btQH_pRd;|TH(Qj41Z^@*MmC6Nhf#>ka56|0f9jc
zdf>x}@R+>5-EKbsT=h?>?RE?1e!o{L6~=-GG3N6*y%K`0;1#V1fY+zfi3Uh1T>+TQ
zW^@Im;c$p&GMT7qwJKrMq%;6_gp_z#8FZru%vdajN2aNuE~7wD)Ib*GV*?mJWvKwb
zb=}|Q@jl^|ic}B)JRQejMC>9If*=suY=9<8VzGVSM>I?tm7OOSQ{%*hp=p|b=Xafr
T(3m1900000NkvXXu0mjfRzUZ2

diff --git a/assets/hbm/textures/blocks/waste_log_top.png b/assets/hbm/textures/blocks/waste_log_top.png
index 7fa742c905551c8816a74c36e9f48976e8e7d6f7..9cccd4e413f065c83bc70f55421668899a67f82c 100644
GIT binary patch
delta 803
zcmV+;1Kj+(1g{2=8Gi-<001BJ|6u?C00eVFNmK|32nc)#WQYI&0_I6XK~y-6CDGec
z8&v?n;omuX_L|KNQXoKxP_6jF4Ek8q@sD?$;k`<k+E!W{NwT}y-R%8xeCVI>%_okJ
zXSytFmdgc2Q4obY78eT~%cAc)imD>d3$k=i*K0;&AJ_3ffPa(*>U4g}{AAAI;S|F#
zc>462#rYZ0E+I`*hNB5}-C$oj3_OoGNw~OJ@bvV=`gx7&yB5<@JU+f<d2vp#-9X>)
z^m&D4+33C}2m<CO$NY4ALl``B|Htplj!xLcJJgHW0a6%*QNsKbF0Wn^MLU+uOEh3v
z7Nf}&LrVU7_kRykN}jh7=gV&x4TnfmnV6;`juV0~qAV*sZvX<yq96zYwAKhAkWw<6
z%@7DizK`z@P<7jq<pr+mqI=C|8}RYN2b5`InHIi3AdDhR(`30^Qsf1%UVTfl&q$IK
zX(~lomYAlZX<HVHbB3c4H#axj{&>sj*%?1vUlRraQhy4ns$#R*AQ4!Wg<L(aaUF*+
ziWrYZbZtkG=X71i{rx@f|9(%`_ejGa&vJ^gAWio~aZC_K$hK+m1|F{K;y5;0o^vpr
zQr9(I+Y%=+<MEj3WP<Cu*tSjEwg@3;ng*4md)Dg>)5(POW{WZms=8w6``rC}M;s>%
zJeMNRnSV~Fv|Yn!JZ3obnT$s$twBghy3cUE0j6oP*#^Y%J<E#)UsfwLf~M=RZ422N
zq)9@Oq--`@l<nA5Wyx+A@$%}5UTc2)^%p+<`vu?k`OY7H_2)T37%}i%r2JZHS{8CL
z9^tqyWl>_=7KR~6vmD295K=Nfol{j6N-44|<A1;BHBH@s*7RM6%JTxtcJN%6H*fyL
zb6xg%PE}Rxc02A~zvkiLfy2W?j$X{j^OB}(sp^`#X%N@f-|NA^M=1j-1kz9lKnOva
zWt<!xp@A?A(OTm=4s}zbHLO-ERGOwpdb++NiT5;3gGO*LolsU4?;hV`nkGt_NGWK$
h4ji;b2#ICe{12~eb;8pwfxZ9$002ovPDHLkV1fiae*ORe

delta 557
zcmV+|0@D4j2D=218Gix*005AYXf^-<00DDSM?wIu&K&6g000DMK}|sb0I`n?{9y$E
z000SaNLh0L01m?d01m?e$8V@)0000ObVXQnQ*UN;cVTj60B~VxZgehgWpp4kE-)@N
zWrZ?j00053Nkl<ZI8RlQ&91>v6onh_pot1GG4})}qBKELrGKcui?K(Lh-jN=48)b9
zSG=n4*d@7ZaI*H^XYIdpw0u5q7>1^4oS@h1RVo!s;JWT$Fu)v-$Ak)nLa|s>_lCn^
zzu)Hszi&Xg-R|jh67zPu&1N&4*=$y2@;tB6Xf&Hm%d$3`jqm&Qdfm2d2p&PJ)f$aP
zWKS!!+imLpynpfc!S#B@oKB~U#R3i2RQhVQdOn}2KnxdQX#>P@jAt^L5JG^5sWfJS
z?RGm-5+*>k!{PAlN3zi5KLO$U{Vu~W-+VrQKA(~p0ljenqFMq>LtwpLql8Fr@FYpX
zFgzZQ6c=T=Tuz6k7WclTAUL_V-|yiN(=-_--4gr3#(&H7+wB%594wbh^avi02d$Dq
z2^`1afe6S>C=D=ya3)58Ni>(ssi8@XO=3O*bCVK}bOjI)VsCI=*OdT9rqyc215t-r
zr6nM{VsB);TrONzTS8E))zEZ0oo^=$69fS!&%!q$q#gleG8t9)^X;fWn4c$R6h)kJ
v0i;_hl_pB^8sy;H!uj)XLLg22hG7^l0^}Fso7E*b00000NkvXXu0mjf$@B5c

diff --git a/assets/hbm/textures/items/ammo_rocket.png b/assets/hbm/textures/items/ammo_rocket.png
index 21192e91d268a9af5290dd79e1cd959b8112f980..7fec643532ca3f27fe10eb2a05d06f55b3a0ee98 100644
GIT binary patch
delta 274
zcmV+t0qy?B0=)u|G=KC-L_t(Ijm45Nio!q?hQBOR*jogI#S<*rrC7le$W*4<J199s
z$~i?sV6CR`0O<lb!WIK|+F5KTysZ+(XxyyL{?&UA{*Qm=J@{`0O_3=juj4TQ%i}TV
zb#(ONH;dJZx7my`4CN`n`EcO-bYe0ZktE4rNUKaK`I=6pD1Qp6s!E1Hl;3<@E`grU
zC2|gcIF13t7}NVFsyndO27mz6b^R;k2H-=YD8f1S5ONpLP2xXC=lRu|djVa@WV<D{
zmQSF}bNS1yptY7XO{EOOc00|jJWSANz2CC~*lc*$x=n&HgF}!hC4Q3O&O4B&%zgR+
YBKvMF!Lfoq01E&B07*qoM6N<$g4d3N(EtDd

delta 284
zcmV+%0ptF?0>=W7G=Kg{L_t(Ijm?p*a>76qM$h69nU#G31Q}v76=W(XRUICnZxGXW
zh}gHlM8qSIOckkNKrk32G9t`ic2*F#Rm)IH_)+CkyR&o8o_jC+cZ55P`hEM<Yy!}m
zOhj$PNgBtO?S2n{Qp(;9*i{v~s$$%3qqV*nasYhJ=VBQI7=L2`&{~sa*;UA&UgJ2n
z0KV^26a`XBlv1@bIs1?#i7m?#&+`B-LTbs*<QVd{SnztXp~jh70MaxS0LB<zRx7mD
zOuJpa2ZLX8xw>y>^1j(H3qz!obn={!JQo)YT%Ol!0KQtSgUKumZ#MuKMv+|x0nWtz
iepiN3WL-Otl@%WbyI#^$Ezm#!0000<MNUMnLSTYJ)_v0e

diff --git a/assets/hbm/textures/items/ammo_rocket_emp.png b/assets/hbm/textures/items/ammo_rocket_emp.png
index 2049797c5af5a05f79ca36d7a6615427cf281de5..57f7b245e6ab3bb2f6395ac74a61dce83387f65a 100644
GIT binary patch
delta 282
zcmV+#0p<RQ0>uK5G=Ka_L_t(Ijm43%O2beThQC{cZU&?zh9dL<E>^e?a3O>E5Dvb8
zOV-YgcIgXr=;jL)w>&_GLU70ngalWI(uU)p7JHjW)5SC0d*J{0&N=YkrG6gc=|bv@
z0RY*<ooY=u)%*P!UXAEq4$<?aoCJ8^Z1`B$)aL_?F-JjmfPYndueNV1RK4Zq<r!=3
zQILaKecu<YH9-&%h9OCkkfv$tPR`s$RaGj>G6Bf*9BVCrv_X1J&2I>v=TQ{JpW_@D
zG?@T9ll9}%-kBQ>T$8dadA+{HT1$U6>2zk`Yq3!jiJmVdj$<*#NGHg6x{xMFCkq$S
gDeOW{3b)lKIuo~bHfW*@(*OVf07*qoM6N<$f<zL7$p8QV

delta 221
zcmV<303!dz0*L~UG=IQJL_t(Ijm^=$3BxcDhT&K4jplIW;ucV97xHQz!(FsN7VrY8
zU0CUa2e=f5{1_!ffj|ya9O8Spli+_UMn!cy1ywzDmkR*i`;U=3kP@VXI~+(UeT<mL
zMnn{#u4@3=wq+OwlgZ_QN2F;Q=6S|iO9<g5lD+7<PM2l5O;+*_c`5JLvDOlfM=<6o
zQ)RLMOw(il)^+7Hj@!fbJ*D4_h^UAtF{*P;z4uCt1<3iVd&D_cHpLz(3-6Hc!oRF5
X%@<#rEVM?_00000NkvXXu0mjfz#L_u

diff --git a/assets/hbm/textures/items/ammo_rocket_glare.png b/assets/hbm/textures/items/ammo_rocket_glare.png
index 45f1c8d19f813722c5de57a34ecc8f16e9142c33..2da9af3c18a0f82bdf6b6c3160d187045b350ebf 100644
GIT binary patch
delta 276
zcmV+v0qg$A0>1)~G=KI<L_t(Ijm46&YQj(yhQBL!a4dv!2L}m-uDa{gA)C16861O;
z;E+)|`T{`^m#prg`U)8u5K2j&z(U}3X{A~(=DPS#=fM3x&iU_wdrSQmnbz{?c>p|@
zrLsEC)cV^zjYf2OJ#u5@Cct68=c}rCXt!BRr;Q;;Wm-$s?SIPKaw+fItu%q0OfaZx
z75Dpm6a{5b5QL%AI!8t0v8>}*a$~MeVof{KT0UnpI=+wbeKxBVlllDLdu;;@>RLs+
zoeY2aAPiZ6yd=rVH(LP!uW70P83JAu5u_;_AWsr;xs{8VIE9;OEiS<}f;gGaAvc+A
a`UXWAeK^D9?F}mc0000<MNUMnLSTaR8GtDO

delta 285
zcmV+&0pk9@0>}c8G=Kj|L_t(Ijm?p}Y63wRM$bCaEewK?#(-f8n^Yp~BP48Lsg0%N
z6|7RGvaqsEX`vRDVjf{ZtkR^4pp78N!WIk4q?(|+td~l^YA(!~^YO#2<JiTpR5DMy
z9RS{H<z&7{BzL&^l@frDcH3MHSPH>X2*$M<Q5aqfIZ|!a>wgB|p-=!oOUYZWcd}0E
z(n88Yu+8UjmEyhA$%N#R2cM&n^BBkc?Dqg?>tvFXbzG%*>Gx9;N*NrQ0IW9~Dw7FO
z81mI@5)_L^HfQH;O<se5x$omDMR_owu~;}K4Q!rgGXSQZ_ir-y{mTsix>}p>Y87i@
jf4?eSt&Od7Ul#cTlTubH`l*+#00000NkvXXu0mjf%H@Y1

diff --git a/assets/hbm/textures/items/ammo_rocket_he.png b/assets/hbm/textures/items/ammo_rocket_he.png
index cfe3181ef16db8d9171fc452fc433bdb6ccd222e..be341237de25244e76e2706b314023fde0b7e1a9 100644
GIT binary patch
delta 291
zcmV+;0o?wR0?h)DGk*aDNkl<ZIE}@Up-#h46o$VpXcXawikm=!SneBC9fK$u1A_1Z
z7}P>07lOj@5E%3jGgp=H0M}Gjlr%w20Tmaqbgb(-x*2|T?n%y<|NiH|e=Dep;Q+7p
zXZ7{XZ~rg#79aioF-M2HJU-yJ0(^ZIe3w&{f+&hQLFRzbJ%7RL+my0|@#G2-=>%!~
zRcq~yF({=7!w_pNNs_c?va{UCvMhjE25FiiA^^S((f}+%j4|YSz810)u<QhwL(b2V
z+M0XK(K^IAM^O|U?A;+EJUvIXHFr9gD%jJL7v4W^vDQ*KS?i$E<wb^bj`1X}IoU|V
p0bXnE<2d%4Tpa33$X3H``T@TkWw4cM1Lpt$002ovPDHLkV1hv#hnN5W

delta 232
zcmV<E02lww0+RxeGk*ZeNkl<ZIE~HGF$%&k6vpv?-Ak@vrw;D|aqbY0;SD^2gJW;u
zXcuRfj-B-Y9pWGodVuFpkXou3LGZyNJi_<mg}~pGuTees9g~|4hs(7;opT=}58xL1
zUaTx3gpZMAIEaV>q-hF3p68ThnM~xSfgzG*8ExBQjG?Nkmtn}{MNt&$y?<=-4tXh$
zpJR++zpY5-&zado7J#N{5`eDj*lmu45Lm7qvEPh{sEDYqQERO_=hW8`$mxKN5o>MS
i7GoqTJVw3>|FrIRTV5a2W#M)J0000<MNUMnLSTXs@NQNB

diff --git a/assets/hbm/textures/items/ammo_rocket_incendiary.png b/assets/hbm/textures/items/ammo_rocket_incendiary.png
index 80d5c2a9b732572f4d247a58617b8fdb9732c2c8..06c6ad7896ff9d420366b5697d7d36fcf7acbef2 100644
GIT binary patch
delta 289
zcmV++0p9+k0?PuBGk*aBNkl<ZIE}@Uu}T9$6h+Sl3$YNpVPzT%!8kv#-Be-0#@Z&o
zU@7DS0xA89)M)}@HQoHcKv+n(xJ)Ia3I-XAurZtL#!VV;_2$7l+_~?;e=91BL60CV
z*7ft`xBr(q+mG)3EjRHcuaAV20LxF$>T7|xf+R^=K{kNlJAaX#FIauUH1yG0w}R~b
zRZ1C@QV1c4;}~NM*4oBQ&UPDlo=33GAj>ke)&QXivIp3PD5WTh;vl3Ju<HcaK%RuH
zthrM&TY)&|@ZNJh8=<vk?32oxTOCXp?8EsRA9pVpV<?>*bWp0_&2i2#U8WT$M`_R_
nNGU^_rs0@Ntr~@#G~A>gqcCO%+Pg}%00000NkvXXu0mjfLTZLc

delta 249
zcmV<V00#fd0;B?vGk*ZvNkl<ZIE}@Tv5mq&5JjH}5Q((~Tm_CCOamq%vBX{hH02Hm
zC;(HzHQ<OA_9Q0=?KwG-41qD&fX#t~?n|qkozZ_gvkU*Npb6Xz{g|ARn@j$YM(xA*
zZ@pV<^=ZKVP_OAvg7^N<kWQ;2q5xqS0uaYBS(Xisb5m>}QF0XFoWmGHp69)gyM;7O
zwJghXCqs~4^7S~z7}lEK{Ltu*7l5KD0)VQjSdG8%-t!q)bWZ1SdjV~T-AM=HW*5jH
z0ALvwTtgOz<dLnbZGwu3iioyve+lxE`K>wv)0|TEGazj000000NkvXXu0mjfPw#U#

diff --git a/assets/hbm/textures/items/ammo_rocket_nuclear.png b/assets/hbm/textures/items/ammo_rocket_nuclear.png
index e6c2e328462e291679257e763b26446ea0279ca1..7a8112095503caa68fadcdb7123a790f3b5d3147 100644
GIT binary patch
delta 304
zcmV-00nh%#0@?zQGk*aQNkl<ZIE`aq7-+x<V^kku{Vyyc#K6G7z)+;|k`bp4G{A(+
zF;VelP?6DR=({2QpDY7D{CLFh`R8i}UI9*qj%h_i8v+N_M_B*QexdMx*RkdQuiZWQ
zpBO_h{F<2S``_Buf<aD3i9tqOiDAcYKfGbWgf1|D@@B@Phks8nJbH4EVaIPj1`pOv
zc)f$u<mw}={}rD#z+JLw=Sqf(tUe6&EVvA4wfW7Mn0w+sgDr&b=N`_$Fpc3qo6}Mh
zFJX8ApLhJ+!x?_<i$;lNq7n=&U_a?iV(?(y#IR}SN(Puq@VWp7q{4SF96fx3f$vft
zic5%g0RsahP${3S^k9Iwgp}ltVn|}HFX<^19{>PR%yDzgr~o(s0000<MNUMnLSTaT
CL63m|

delta 282
zcmcb`bcAVwaXrItPZ!4!i{9h}36lrs^xFRa&v!7;{54~OWx2fL3(48u9cC?p$1Ju=
zC4JuKf0G9Un3Cr3Nba-kvG|g>>wwOb#=^&oQ`*kU*BO97O~u!_5C5O8YSMH3=#>32
z#*K}Q4J<k3cZWeqUZwK|>xj8O{-^%^KTFkLqN1MFf}^UPbGE|b3gtVhJUjyL&)kS<
zGHu%+)$nevz|ECB@^Q84Gb(qtFy0ktS{QS8_MiEUjg5+d<$8x_9lr^7iryPr9<4lq
zy%w<y%>RmtB_)91S-fA{?v%5Sa~{PWIKbekEG@5Ud?1Et^IQ#a0|SRk9A{Kd%wlI}
aU`Q6;o}j87ddZ3b2s~Z=T-G@yGywpRsC4fD

diff --git a/assets/hbm/textures/items/ammo_rocket_shrapnel.png b/assets/hbm/textures/items/ammo_rocket_shrapnel.png
index 6909b1b752109cc721f434d131f9c46f608a9cd7..7f9cd9a1514fdf3a1f0bb04297c9a39227cb734b 100644
GIT binary patch
delta 284
zcmV+%0ptFg0>=W7G=Kg{L_t(Ijm46^N&`U@M$d%BLP#2sFr}~%WGaj8r<lq&5W$BK
zB+n3pyoPU(D#ez<7FJVaJDXiruy89O!nFv-Og0-gY5b~thq;IE{=k1rt)tOcI32Fy
zmwVOnzoFh{633Se&M)9<Dn|j{K0c}IC7cXNlB5&l7qFP9`hWEqWXWwj!&=)35(U{}
zqO{gh^$h^lS^&witaT>Q_Cr~g3J`!i&;Nup0GkkF3`J4wh3o`uI|<tPx(U|YYnFx(
z?>$vj@i^D3!A4KPnmZkg)>@1)%-^qha3yJ)^5bN$gSC^v9o~D~*(`K&kVa$CT8nc|
i4!P8wkmHJ5^c4;NHD#W$Dlydn0000<MNUMnLSTY>gNFeC

delta 239
zcmV<L01*Gj0-FMmG=I`bL_t(Ijm^<54#F@P#_|8=mkJ!1DUzv)_X40NhUNlXgbPe^
z3#PDKV45(oASP;;IS@sVz}9qpB_upaMbkXLe!>4FJQ}9vHa>{oo1IGl(lmV=c>tFR
zE)}!!oTh2sM!fDsL<~R>1OUWwOqOMyqvr;?NEAiXb&XPrJZR4c5$8gZBt~m}Kgly>
zP`0n5lp;TDq4atk-_Zr2C<+gtZCm!I&Fx{M1@<=&0$oH#%RUkw@5oaCpwMe<WEQSo
p)vQc*MnsH=nC|XhA>WmMnJdkXRW`VNh%f*E002ovPDHLkV1nS`XSe_W

diff --git a/assets/hbm/textures/items/ammo_rocket_sleek.png b/assets/hbm/textures/items/ammo_rocket_sleek.png
index 748fb0a4fb32018df87414c4a906e5c0700e01cb..8eff0d768e190bb55558c0b8343fca2101a70d1a 100644
GIT binary patch
delta 242
zcmV<O01f~20iFVoG=J4eL_t(Ijm43z4#GeXgy+a1KyaxlKNU3>a)!g=&Y%#0<f%|R
zM==Nt27#@s=o3`oAVA3?2!x+PdPOj5ca!<Dy94}N>{cuSNv-;|?)GB#$?&SuW7E+U
zv?UO3BozW2c6%JoK(hh3uA2*T2MoqBTdjfP9_SCNP)g;7JZp(_PQLGx)|!klWOL3N
zB-}_c#?ZG-c-AmYQ#PBHX*4-Oh%J;-06<BSyruIsF3vf5o(CZW9LGTvMOe;jRxxLu
sWBr$(A&Wqg&0}*xtjw>FLgr7p0HH@@W?@K@RR91007*qoM6N<$f{Z0<WB>pF

delta 200
zcmV;(05|`h0`vipG=Hl}L_t(Ijm?oU4#F@DMSnVG<_@0Cgk&zl#K6J043V<YvAILm
zdNor}XoDb?knrLp(trB@2l$)O5oQxiM65?Q)R+B<p{nSCxN;yO0|4(m$_^p8H@dZh
zl#&AgRYlo0p)1bQ2@#o&FlPSPNz-DEFgep#afa68?toPs5kaw5q$U7(?c{d7LsfCS
zNPjP-ley|-9y=g8!j=$b?sHK?a@_E>HDr_cr}F?+-DfQ640r<o0000<MNUMnLSTYA
C!d%P%

diff --git a/assets/hbm/textures/items/ammo_rocket_toxic.png b/assets/hbm/textures/items/ammo_rocket_toxic.png
index 2e1ea5f1adda27ec7eafcc0c8ad4d158dc5910d3..1cad57c5be21ccd41216bd49e27bba17831655e8 100644
GIT binary patch
delta 298
zcmV+_0oDGr0@MPKGk*aKNkl<ZIE}@Utxm*16h_Z%_zR{8n5H#608J|DFq1Ta1i>Sq
zRwHpp99e}%?L&}&8iT8V45kmTO)GG0LYm#d&<*Xjo9-GuHFJ}Da%S#@|Bk2*!*OW$
z4`%>8To}>W(a7NM#Xt5r@b|cW3hYLJY5B=?_QlT8oG6NVL4Ov2$E!Cnc`soun2bV{
zQoSHcZ<SKoAP8_>7tiz1T9YJ6=bvmf3q?@~V~hnz(-fr?fbD_|+KRsr9LFKcvX#$S
zGH5da7AB{6-?cHf8Z=GvJf}Q+Mk&SX?QU(%y%whW*pr)r?U!@3)>I}d4XRv@Jd81X
w+{>EDS{aT*D<h?}aU9!qHnkP9QFB**03OqCy?sX&SO5S307*qoM6N<$f&%V_kpKVy

delta 266
zcmV+l0rmdW0<;2<Gk*Z<Nkl<ZIE~GbD{jL;5Qaa8TSMA2L`Ei6E>PARlo>1wa#$)$
zosg8ZG+=pdP*UXrQE*ORU@0LhA7Bft&D(jP<d;@EyQBH{n;p2fq7Y11czJ5#w`hBR
zNuAw;TQ|F^`kM{hs#$-79OvBCCVQyH7!MG~F#u_rl4aT1c7KkN!6Zo%%Cba6P}NqG
zlZm1zd{tE&l5-}l&WG)Y2)$1|no#FNEdbWq2%xTOdLKVH=a`R_U(ep>UYvIzdHu4?
z$2lTGx39cEH?^$<K`#Rfz-(x?B;)*g0)WX9zxXx;lJNRXnk@05oyXEYJ#J5$eDxV@
Q00000NkvXXt^-0~g5qR&-~a#s

diff --git a/assets/hbm/textures/items/plate_aluminum.png b/assets/hbm/textures/items/plate_aluminium.png
similarity index 100%
rename from assets/hbm/textures/items/plate_aluminum.png
rename to assets/hbm/textures/items/plate_aluminium.png
diff --git a/assets/hbm/textures/models/misc/danger_diamond.png b/assets/hbm/textures/models/misc/danger_diamond.png
new file mode 100644
index 0000000000000000000000000000000000000000..829f24a8d2822c2cddb94c722d6305fca2c4ff26
GIT binary patch
literal 7168
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
MyV`e3Z(D@^AO3vfSpWb4

literal 0
HcmV?d00001

diff --git a/com/hbm/blocks/ModBlocks.java b/com/hbm/blocks/ModBlocks.java
index 606259b15..568e3da89 100644
--- a/com/hbm/blocks/ModBlocks.java
+++ b/com/hbm/blocks/ModBlocks.java
@@ -401,7 +401,7 @@ public class ModBlocks {
 	public static Block barrel_iron;
 	public static Block barrel_steel;
 	public static Block barrel_antimatter;
-	public static final int guiID_barrel = 18;
+	public static final int guiID_barrel = 92;
 
 	public static Block machine_transformer;
 	public static Block machine_transformer_20;
diff --git a/com/hbm/blocks/generic/DecoPoleTop.java b/com/hbm/blocks/generic/DecoPoleTop.java
index 7a25a06e3..f189620c6 100644
--- a/com/hbm/blocks/generic/DecoPoleTop.java
+++ b/com/hbm/blocks/generic/DecoPoleTop.java
@@ -1,29 +1,17 @@
 package com.hbm.blocks.generic;
 
-import com.hbm.tileentity.deco.TileEntityDecoPoleTop;
-
-import net.minecraft.block.BlockContainer;
+import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
-import net.minecraft.entity.EntityLivingBase;
-import net.minecraft.item.ItemStack;
-import net.minecraft.tileentity.TileEntity;
-import net.minecraft.util.MathHelper;
-import net.minecraft.world.World;
 
-public class DecoPoleTop extends BlockContainer {
+public class DecoPoleTop extends Block {
 
 	public DecoPoleTop(Material p_i45386_1_) {
 		super(p_i45386_1_);
 	}
-
-	@Override
-	public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) {
-		return new TileEntityDecoPoleTop();
-	}
 	
 	@Override
 	public int getRenderType(){
-		return -1;
+		return 334084;
 	}
 	
 	@Override
@@ -35,27 +23,5 @@ public class DecoPoleTop extends BlockContainer {
 	public boolean renderAsNormalBlock() {
 		return false;
 	}
-	
-	@Override
-	public void onBlockPlacedBy(World world, int x, int y, int z, EntityLivingBase player, ItemStack itemStack) {
-		int i = MathHelper.floor_double(player.rotationYaw * 4.0F / 360.0F + 0.5D) & 3;
-		
-		if(i == 0)
-		{
-			world.setBlockMetadataWithNotify(x, y, z, 2, 2);
-		}
-		if(i == 1)
-		{
-			world.setBlockMetadataWithNotify(x, y, z, 5, 2);
-		}
-		if(i == 2)
-		{
-			world.setBlockMetadataWithNotify(x, y, z, 3, 2);
-		}
-		if(i == 3)
-		{
-			world.setBlockMetadataWithNotify(x, y, z, 4, 2);
-		}
-	}
 
 }
diff --git a/com/hbm/blocks/machine/BlockFluidBarrel.java b/com/hbm/blocks/machine/BlockFluidBarrel.java
index fa086431e..3e88d7997 100644
--- a/com/hbm/blocks/machine/BlockFluidBarrel.java
+++ b/com/hbm/blocks/machine/BlockFluidBarrel.java
@@ -17,6 +17,8 @@ import net.minecraft.inventory.ISidedInventory;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.AxisAlignedBB;
+import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
 
 public class BlockFluidBarrel extends BlockContainer {
@@ -61,6 +63,20 @@ public class BlockFluidBarrel extends BlockContainer {
 			return false;
 		}
 	}
+	
+	@Override
+	public void setBlockBoundsBasedOnState(IBlockAccess p_149719_1_, int p_149719_2_, int p_149719_3_, int p_149719_4_)
+    {
+        float f = 0.0625F;
+        this.setBlockBounds(2*f, 0.0F, 2*f, 14*f, 1.0F, 14*f);
+    }
+	
+	@Override
+	public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
+        float f = 0.0625F;
+        this.setBlockBounds(2*f, 0.0F, 2*f, 14*f, 1.0F, 14*f);
+		return AxisAlignedBB.getBoundingBox(x + this.minX, y + this.minY, z + this.minZ, x + this.maxX, y + this.maxY, z + this.maxZ);
+	}
 
     private final Random field_149933_a = new Random();
 	private Random rand;
diff --git a/com/hbm/entity/grenade/EntityGrenadePulse.java b/com/hbm/entity/grenade/EntityGrenadePulse.java
index 24819a718..476d1135f 100644
--- a/com/hbm/entity/grenade/EntityGrenadePulse.java
+++ b/com/hbm/entity/grenade/EntityGrenadePulse.java
@@ -9,8 +9,6 @@ import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.world.World;
 
 public class EntityGrenadePulse extends EntityGrenadeBouncyBase {
-	
-	private static final String __OBFID = "CL_00001722";
 
 	public EntityGrenadePulse(World p_i1773_1_) {
 		super(p_i1773_1_);
diff --git a/com/hbm/explosion/ExplosionChaos.java b/com/hbm/explosion/ExplosionChaos.java
index fa3eceadc..f9ebe822e 100644
--- a/com/hbm/explosion/ExplosionChaos.java
+++ b/com/hbm/explosion/ExplosionChaos.java
@@ -152,7 +152,9 @@ public class ExplosionChaos {
 					int Z = zz + z;
 					int ZZ = YY + zz * zz;
 					if (ZZ < r22) {
-						pDestruction(world, X, Y, Z);
+						
+						if(world.getBlock(X, Y, Z).getExplosionResistance(null) <= 70)
+							pDestruction(world, X, Y, Z);
 					}
 				}
 			}
diff --git a/com/hbm/handler/FluidTypeHandler.java b/com/hbm/handler/FluidTypeHandler.java
index a0e70b732..5d6ad3017 100644
--- a/com/hbm/handler/FluidTypeHandler.java
+++ b/com/hbm/handler/FluidTypeHandler.java
@@ -2,64 +2,66 @@ package com.hbm.handler;
 
 import java.util.Arrays;
 
+import com.hbm.render.util.EnumSymbol;
+
 public class FluidTypeHandler {
 	
 	public enum FluidType {
-		NONE			(0x888888,	0,	1,	1, "hbmfluid.none"),
+		NONE			(0x888888,	0,	1,	1,	0,	0,	0,	EnumSymbol.NONE,		"hbmfluid.none"),
 
-		WATER			(0x3333FF,	1,	1,	1,  "hbmfluid.water"),
-		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"),
+		WATER			(0x3333FF,	1,	1,	1,	0,	0,	0,	EnumSymbol.NONE,		"hbmfluid.water"),
+		STEAM			(0xe5e5e5,	9,	2,	1,	3,	0,	0,	EnumSymbol.NONE,		"hbmfluid.steam", true, false, false),
+		HOTSTEAM		(0xE7D6D6,	1,	1,	2,	4,	0,	0,	EnumSymbol.NONE,		"hbmfluid.hotsteam", true, false, false),
+		SUPERHOTSTEAM	(0xE7B7B7,	2,	1,	2,	4,	0,	0,	EnumSymbol.NONE,		"hbmfluid.superhotsteam", true, false, false),
+		COOLANT			(0xd8fcff,	2,	1,	1,	1,	0,	0,	EnumSymbol.NONE,		"hbmfluid.coolant"),
 		
-		LAVA			(0xFF3300,	3,	1,	1,  "hbmfluid.lava", true, false, false),
+		LAVA			(0xFF3300,	3,	1,	1,	4,	0,	0,	EnumSymbol.NOWATER,		"hbmfluid.lava", true, false, false),
 		
-		DEUTERIUM		(0x0000FF,	4,	1,	1,  "hbmfluid.deuterium"),
-		TRITIUM			(0x000099,	5,	1,	1,  "hbmfluid.tritium"),
+		DEUTERIUM		(0x0000FF,	4,	1,	1,	3,	4,	0,	EnumSymbol.NONE,		"hbmfluid.deuterium"),
+		TRITIUM			(0x000099,	5,	1,	1,	3,	4,	0,	EnumSymbol.RADIATION,	"hbmfluid.tritium"),
 
-		OIL				(0x020202,	6,	1,	1,  "hbmfluid.oil"),
-		HOTOIL			(0x300900,	8,	2,	1,  "hbmfluid.hotoil", true, false, false),
+		OIL				(0x020202,	6,	1,	1,	2,	1,	0,	EnumSymbol.NONE,		"hbmfluid.oil"),
+		HOTOIL			(0x300900,	8,	2,	1,	2,	3,	0,	EnumSymbol.NONE,		"hbmfluid.hotoil", true, false, false),
 		
-		HEAVYOIL		(0x141312,	2,	2,	1,  "hbmfluid.heavyoil"),
-		BITUMEN			(0x1f2426,	3,	2,	1,  "hbmfluid.bitumen"),
-		SMEAR			(0x190f01,	7,	1,	1,  "hbmfluid.smear"),
-		HEATINGOIL		(0x211806,	4,	2,	1,  "hbmfluid.heatingoil"),
+		HEAVYOIL		(0x141312,	2,	2,	1,	2,	1,	0,	EnumSymbol.NONE,		"hbmfluid.heavyoil"),
+		BITUMEN			(0x1f2426,	3,	2,	1,	2,	0,	0,	EnumSymbol.NONE,		"hbmfluid.bitumen"),
+		SMEAR			(0x190f01,	7,	1,	1,	2,	1,	0,	EnumSymbol.NONE,		"hbmfluid.smear"),
+		HEATINGOIL		(0x211806,	4,	2,	1,	2,	2,	0,	EnumSymbol.NONE,		"hbmfluid.heatingoil"),
 		
-		RECLAIMED		(0x332b22,	8,	1,	1,  "hbmfluid.reclaimed"),
-		PETROIL			(0x44413d,	9,	1,	1,  "hbmfluid.petroil"),
+		RECLAIMED		(0x332b22,	8,	1,	1,	2,	2,	0,	EnumSymbol.NONE,		"hbmfluid.reclaimed"),
+		PETROIL			(0x44413d,	9,	1,	1,	1,	3,	0,	EnumSymbol.NONE,		"hbmfluid.petroil"),
 		
-		LUBRICANT		(0x606060,	10,	1,	1,  "hbmfluid.lubricant"),
+		LUBRICANT		(0x606060,	10,	1,	1,	2,	1,	0,	EnumSymbol.NONE,		"hbmfluid.lubricant"),
 		
-		NAPHTHA			(0x595744,	5,	2,	1,  "hbmfluid.naphtha"),
-		DIESEL			(0xf2eed5,	11,	1,	1,  "hbmfluid.diesel"),
+		NAPHTHA			(0x595744,	5,	2,	1,	2,	1,	0,	EnumSymbol.NONE,		"hbmfluid.naphtha"),
+		DIESEL			(0xf2eed5,	11,	1,	1,	1,	2,	0,	EnumSymbol.NONE,		"hbmfluid.diesel"),
 		
-		LIGHTOIL		(0x8c7451,	6,	2,	1,  "hbmfluid.lightoil"),
-		KEROSENE		(0xffa5d2,	12,	1,	1,  "hbmfluid.kerosene"),
+		LIGHTOIL		(0x8c7451,	6,	2,	1,	1,	2,	0,	EnumSymbol.NONE,		"hbmfluid.lightoil"),
+		KEROSENE		(0xffa5d2,	12,	1,	1,	1,	2,	0,	EnumSymbol.NONE,		"hbmfluid.kerosene"),
 		
-		GAS				(0xfffeed,	13,	1,	1,  "hbmfluid.gas"),
-		PETROLEUM		(0x7cb7c9,	7,	2,	1,  "hbmfluid.petroleum"),
+		GAS				(0xfffeed,	13,	1,	1,	1,	4,	1,	EnumSymbol.NONE,		"hbmfluid.gas"),
+		PETROLEUM		(0x7cb7c9,	7,	2,	1,	1,	4,	1,	EnumSymbol.NONE,		"hbmfluid.petroleum"),
 		
-		BIOGAS			(0xbfd37c,	12,	2,	1,  "hbmfluid.biogas"),
-		BIOFUEL			(0xeef274,	13,	2,	1,  "hbmfluid.biofuel"),
+		BIOGAS			(0xbfd37c,	12,	2,	1,	1,	4,	1,	EnumSymbol.NONE,		"hbmfluid.biogas"),
+		BIOFUEL			(0xeef274,	13,	2,	1,	1,	2,	0,	EnumSymbol.NONE,		"hbmfluid.biofuel"),
 
-		NITAN			(0x8018ad,	15,	2,	1,  "hbmfluid.nitan"),
+		NITAN			(0x8018ad,	15,	2,	1,	2,	4,	1,	EnumSymbol.NONE,		"hbmfluid.nitan"),
 		
-		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),
+		UF6				(0xD1CEBE,	14,	1,	1,	4,	0,	2,	EnumSymbol.RADIATION,	"hbmfluid.uf6", false, true, false),
+		PUF6			(0x4C4C4C,	15,	1,	1,	4,	0,	4,	EnumSymbol.RADIATION,	"hbmfluid.puf6", false, true, false),
+		SAS3			(0x4ffffc,	14,	2,	1,	5,	0,	4,	EnumSymbol.RADIATION,	"hbmfluid.sas3", false, true, false),
 		
-		AMAT			(0x010101,	0,	2,	1,  "hbmfluid.amat", false, false, true),
-		ASCHRAB			(0xb50000,	1,	2,	1,  "hbmfluid.aschrab", false, false, true),
+		AMAT			(0x010101,	0,	2,	1,	5,	0,	5,	EnumSymbol.ANTIMATTER,	"hbmfluid.amat", false, false, true),
+		ASCHRAB			(0xb50000,	1,	2,	1,	5,	0,	5,	EnumSymbol.ANTIMATTER,	"hbmfluid.aschrab", false, false, true),
 
-		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"),
+		ACID			(0xfff7aa,	10,	2,	1,	3,	0,	3,	EnumSymbol.OXIDIZER,	"hbmfluid.acid", false, true, false),
+		WATZ			(0x86653E,	11,	2,	1,	4,	0,	3,	EnumSymbol.ACID,		"hbmfluid.watz", false, true, false),
+		CRYOGEL			(0x32ffff,	0,	1,	2,	2,	0,	0,	EnumSymbol.CROYGENIC,	"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", true, true, false);
+		HYDROGEN		(0x4286f4,	3,	1,	2,	3,	4,	0,	EnumSymbol.CROYGENIC,	"hbmfluid.hydrogen"),
+		OXYGEN			(0x98bdf9,	4,	1,	2,	3,	0,	0,	EnumSymbol.CROYGENIC,	"hbmfluid.oxygen"),
+		XENON			(0xba45e8,	5,	1,	2,	0,	0,	0,	EnumSymbol.ASPHYXIANT,	"hbmfluid.xenon"),
+		BALEFIRE		(0x28e02e,	6,	1,	2,	4,	4,	3,	EnumSymbol.RADIATION,	"hbmfluid.balefire", true, true, false);
 		
 
 		//Approximate HEX Color of the fluid, used for pipe rendering
@@ -79,20 +81,33 @@ public class FluidTypeHandler {
 		//Whether the fluid is antimatter and requires magnetic storage
 		private boolean antimatter;
 		
-		private FluidType(int color, int x, int y, int sheet, String name) {
+		public int poison;
+		public int flammability;
+		public int reactivity;
+		public EnumSymbol symbol;
+		
+		private FluidType(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name) {
 			this.color = color;
 			this.textureX = x;
 			this.textureY = y;
 			this.name = name;
 			this.sheetID = sheet;
+			this.poison = p;
+			this.flammability = f;
+			this.reactivity = r;
+			this.symbol = symbol;
 		}
 		
-		private FluidType(int color, int x, int y, int sheet, String name, boolean hot, boolean corrosive, boolean antimatter) {
+		private FluidType(int color, int x, int y, int sheet, int p, int f, int r, EnumSymbol symbol, String name, boolean hot, boolean corrosive, boolean antimatter) {
 			this.color = color;
 			this.textureX = x;
 			this.textureY = y;
 			this.name = name;
 			this.sheetID = sheet;
+			this.poison = p;
+			this.flammability = f;
+			this.reactivity = r;
+			this.symbol = symbol;
 			this.hot = hot;
 			this.corrosive = corrosive;
 			this.antimatter = antimatter;
diff --git a/com/hbm/handler/GUIHandler.java b/com/hbm/handler/GUIHandler.java
index 2a96a6682..71e2c8b92 100644
--- a/com/hbm/handler/GUIHandler.java
+++ b/com/hbm/handler/GUIHandler.java
@@ -822,6 +822,15 @@ public class GUIHandler implements IGuiHandler {
 					}
 					return null;
 				}
+	
+				case ModBlocks.guiID_barrel:
+				{
+					if(entity instanceof TileEntityBarrel)
+					{
+						return new ContainerBarrel(player.inventory, (TileEntityBarrel) entity);
+					}
+					return null;
+				}
 			}
 		} else {
 			//NON-TE CONTAINERS
@@ -1643,6 +1652,15 @@ public class GUIHandler implements IGuiHandler {
 					}
 					return null;
 				}
+				
+				case ModBlocks.guiID_barrel:
+				{
+					if(entity instanceof TileEntityBarrel)
+					{
+						return new GUIBarrel(player.inventory, (TileEntityBarrel) entity);
+					}
+					return null;
+				}
 			}
 		} else {
 			//CLIENTONLY GUIS
diff --git a/com/hbm/inventory/container/ContainerBarrel.java b/com/hbm/inventory/container/ContainerBarrel.java
new file mode 100644
index 000000000..bb49b6000
--- /dev/null
+++ b/com/hbm/inventory/container/ContainerBarrel.java
@@ -0,0 +1,87 @@
+package com.hbm.inventory.container;
+
+import com.hbm.tileentity.machine.TileEntityBarrel;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.ICrafting;
+import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
+
+public class ContainerBarrel extends Container {
+	
+	private TileEntityBarrel diFurnace;
+	private int power;
+	
+	public ContainerBarrel(InventoryPlayer invPlayer, TileEntityBarrel tedf) {
+		power = 0;
+		
+		diFurnace = tedf;
+		
+		this.addSlotToContainer(new Slot(tedf, 0, 8, 17));
+		this.addSlotToContainer(new Slot(tedf, 1, 8, 53));
+		this.addSlotToContainer(new Slot(tedf, 2, 53 - 18, 17));
+		this.addSlotToContainer(new Slot(tedf, 3, 53 - 18, 53));
+		this.addSlotToContainer(new Slot(tedf, 4, 125, 17));
+		this.addSlotToContainer(new Slot(tedf, 5, 125, 53));
+		
+		for(int i = 0; i < 3; i++)
+		{
+			for(int j = 0; j < 9; j++)
+			{
+				this.addSlotToContainer(new Slot(invPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
+			}
+		}
+		
+		for(int i = 0; i < 9; i++)
+		{
+			this.addSlotToContainer(new Slot(invPlayer, i, 8 + i * 18, 142));
+		}
+	}
+	
+	@Override
+	public void addCraftingToCrafters(ICrafting crafting) {
+		super.addCraftingToCrafters(crafting);
+	}
+	
+	@Override
+    public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2)
+    {
+		ItemStack var3 = null;
+		Slot var4 = (Slot) this.inventorySlots.get(par2);
+		
+		if (var4 != null && var4.getHasStack())
+		{
+			ItemStack var5 = var4.getStack();
+			var3 = var5.copy();
+			
+            if (par2 <= 5) {
+				if (!this.mergeItemStack(var5, 7, this.inventorySlots.size(), true))
+				{
+					return null;
+				}
+			}
+			else if (!this.mergeItemStack(var5, 0, 6, false))
+			{
+				return null;
+			}
+			
+			if (var5.stackSize == 0)
+			{
+				var4.putStack((ItemStack) null);
+			}
+			else
+			{
+				var4.onSlotChanged();
+			}
+		}
+		
+		return var3;
+    }
+
+	@Override
+	public boolean canInteractWith(EntityPlayer player) {
+		return diFurnace.isUseableByPlayer(player);
+	}
+}
diff --git a/com/hbm/inventory/container/ContainerCoreEmitter.java b/com/hbm/inventory/container/ContainerCoreEmitter.java
index bdfdde1d5..79e8dd3ca 100644
--- a/com/hbm/inventory/container/ContainerCoreEmitter.java
+++ b/com/hbm/inventory/container/ContainerCoreEmitter.java
@@ -6,6 +6,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
 
 public class ContainerCoreEmitter extends Container {
 
@@ -33,4 +34,18 @@ public class ContainerCoreEmitter extends Container {
 	public boolean canInteractWith(EntityPlayer player) {
 		return nukeBoy.isUseableByPlayer(player);
 	}
+	
+	@Override
+    public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2)
+    {
+		ItemStack var3 = null;
+		Slot var4 = (Slot) this.inventorySlots.get(par2);
+		
+		if (var4 != null && var4.getHasStack())
+		{
+			return null;
+		}
+		
+		return var3;
+    }
 }
diff --git a/com/hbm/inventory/container/ContainerCoreReceiver.java b/com/hbm/inventory/container/ContainerCoreReceiver.java
index 16953d61e..e5e104100 100644
--- a/com/hbm/inventory/container/ContainerCoreReceiver.java
+++ b/com/hbm/inventory/container/ContainerCoreReceiver.java
@@ -6,6 +6,7 @@ import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.inventory.Container;
 import net.minecraft.inventory.Slot;
+import net.minecraft.item.ItemStack;
 
 public class ContainerCoreReceiver extends Container {
 
@@ -33,4 +34,18 @@ public class ContainerCoreReceiver extends Container {
 	public boolean canInteractWith(EntityPlayer player) {
 		return te.isUseableByPlayer(player);
 	}
+	
+	@Override
+    public ItemStack transferStackInSlot(EntityPlayer p_82846_1_, int par2)
+    {
+		ItemStack var3 = null;
+		Slot var4 = (Slot) this.inventorySlots.get(par2);
+		
+		if (var4 != null && var4.getHasStack())
+		{
+			return null;
+		}
+		
+		return var3;
+    }
 }
diff --git a/com/hbm/inventory/gui/GUIBarrel.java b/com/hbm/inventory/gui/GUIBarrel.java
new file mode 100644
index 000000000..f7a9166ea
--- /dev/null
+++ b/com/hbm/inventory/gui/GUIBarrel.java
@@ -0,0 +1,70 @@
+package com.hbm.inventory.gui;
+
+import org.lwjgl.opengl.GL11;
+
+import com.hbm.inventory.FluidTank;
+import com.hbm.inventory.container.ContainerBarrel;
+import com.hbm.lib.RefStrings;
+import com.hbm.packet.AuxButtonPacket;
+import com.hbm.packet.PacketDispatcher;
+import com.hbm.tileentity.machine.TileEntityBarrel;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.audio.PositionedSoundRecord;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+
+public class GUIBarrel extends GuiInfoContainer {
+	
+	private static ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/gui/storage/gui_barrel.png");
+	private TileEntityBarrel tank;
+
+	public GUIBarrel(InventoryPlayer invPlayer, TileEntityBarrel tedf) {
+		super(new ContainerBarrel(invPlayer, tedf));
+		tank = tedf;
+		
+		this.xSize = 176;
+		this.ySize = 166;
+	}
+	
+	@Override
+	public void drawScreen(int mouseX, int mouseY, float f) {
+		super.drawScreen(mouseX, mouseY, f);
+
+		tank.tank.renderTankInfo(this, mouseX, mouseY, guiLeft + 71, guiTop + 69 - 52, 34, 52);
+	}
+	
+	@Override
+	protected void drawGuiContainerForegroundLayer(int i, int j) {
+		String name = this.tank.hasCustomInventoryName() ? this.tank.getInventoryName() : I18n.format(this.tank.getInventoryName());
+		
+		this.fontRendererObj.drawString(name, this.xSize / 2 - this.fontRendererObj.getStringWidth(name) / 2, 6, 4210752);
+		this.fontRendererObj.drawString(I18n.format("container.inventory"), 8, this.ySize - 96 + 2, 4210752);
+	}
+
+	protected void mouseClicked(int x, int y, int i) {
+    	super.mouseClicked(x, y, i);
+		
+    	if(guiLeft + 151 <= x && guiLeft + 151 + 18 > x && guiTop + 35 < y && guiTop + 35 + 18 >= y) {
+    		
+			mc.getSoundHandler().playSound(PositionedSoundRecord.func_147674_a(new ResourceLocation("gui.button.press"), 1.0F));
+    		PacketDispatcher.wrapper.sendToServer(new AuxButtonPacket(tank.xCoord, tank.yCoord, tank.zCoord, 0, 0));
+    	}
+	}
+
+	@Override
+	protected void drawGuiContainerBackgroundLayer(float p_146976_1_, int p_146976_2_, int p_146976_3_) {
+		GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F);
+		Minecraft.getMinecraft().getTextureManager().bindTexture(texture);
+		drawTexturedModalRect(guiLeft, guiTop, 0, 0, xSize, ySize);
+		
+		int i = tank.mode;
+		drawTexturedModalRect(guiLeft + 151, guiTop + 34, 176, i * 18, 18, 18);
+		
+		Minecraft.getMinecraft().getTextureManager().bindTexture(tank.tank.getSheet());
+		tank.tank.renderTank(this, guiLeft + 71, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 16, 52);
+		tank.tank.renderTank(this, guiLeft + 71 + 16, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 16, 52);
+		tank.tank.renderTank(this, guiLeft + 71 + 32, guiTop + 69, tank.tank.getTankType().textureX() * FluidTank.x, tank.tank.getTankType().textureY() * FluidTank.y, 2, 52);
+	}
+}
diff --git a/com/hbm/items/special/ItemBlockLore.java b/com/hbm/items/special/ItemBlockLore.java
index 2c00fa200..0af718785 100644
--- a/com/hbm/items/special/ItemBlockLore.java
+++ b/com/hbm/items/special/ItemBlockLore.java
@@ -19,20 +19,33 @@ public class ItemBlockLore extends ItemBlock {
 	@Override
 	public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) {
 		
-		if(this.field_150939_a instanceof RedBarrel)
+		if(this.field_150939_a instanceof RedBarrel) {
 			list.add("Static fluid barrel");
+		}
 		
-		if(this.field_150939_a == ModBlocks.barrel_plastic)
+		if(this.field_150939_a == ModBlocks.barrel_plastic) {
 			list.add("Cannot store hot fluids");
+			list.add("Cannot store corrosive fluids");
+			list.add("Cannot store antimatter");
+		}
 		
-		if(this.field_150939_a == ModBlocks.barrel_iron)
-			list.add("Will leak when corrosive fluids are stored");
+		if(this.field_150939_a == ModBlocks.barrel_iron) {
+			list.add("Can store hot fluids");
+			list.add("Cannot store corrosive fluids properly");
+			list.add("Cannot store antimatter");
+		}
 		
-		if(this.field_150939_a == ModBlocks.barrel_steel)
-			list.add("Can hold corrosive fluids");
+		if(this.field_150939_a == ModBlocks.barrel_steel) {
+			list.add("Can store hot fluids");
+			list.add("Can store corrosive fluids");
+			list.add("Cannot store antimatter");
+		}
 		
-		if(this.field_150939_a == ModBlocks.barrel_antimatter)
+		if(this.field_150939_a == ModBlocks.barrel_antimatter) {
+			list.add("Can store hot fluids");
+			list.add("Can store corrosive fluids");
 			list.add("Can store antimatter");
+		}
 	}
 
 }
diff --git a/com/hbm/main/ClientProxy.java b/com/hbm/main/ClientProxy.java
index c00d9b61b..63044a586 100644
--- a/com/hbm/main/ClientProxy.java
+++ b/com/hbm/main/ClientProxy.java
@@ -60,6 +60,7 @@ public class ClientProxy extends ServerProxy
 		RenderingRegistry.registerBlockHandler(new RenderBarrel());
 		RenderingRegistry.registerBlockHandler(new RenderFence());
 		RenderingRegistry.registerBlockHandler(new RenderBarbedWire());
+		RenderingRegistry.registerBlockHandler(new RenderAntennaTop());
 
 		MinecraftForgeClient.registerItemRenderer(ModItems.assembly_template, new ItemRenderTemplate());
 		MinecraftForgeClient.registerItemRenderer(ModItems.chemistry_template, new ItemRenderTemplate());
@@ -79,7 +80,6 @@ public class ClientProxy extends ServerProxy
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityObjTester.class, new RendererObjTester());
 
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukeGadget.class, new RenderNukeGadget());
-		//MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.nuke_gadget), new ItemRenderNukeGadget());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukeBoy.class, new RenderNukeBoy());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukeCustom.class, new RenderNukeCustom());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityNukeSolinium.class, new RenderNukeSolinium());
@@ -131,6 +131,7 @@ public class ClientProxy extends ServerProxy
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineReactorSmall.class, new RenderSmallReactor());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityMachineShredderLarge.class, new RenderMachineShredder());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityTesla.class, new RenderTesla());
+		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBarrel.class, new RenderFluidBarrel());
 
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityVaultDoor.class, new RenderVaultDoor());
 		ClientRegistry.bindTileEntitySpecialRenderer(TileEntityBlastDoor.class, new RenderBlastDoor());
diff --git a/com/hbm/main/ResourceManager.java b/com/hbm/main/ResourceManager.java
index 77a84a278..d0cd6b28b 100644
--- a/com/hbm/main/ResourceManager.java
+++ b/com/hbm/main/ResourceManager.java
@@ -612,11 +612,12 @@ public class ResourceManager {
 	public static final ResourceLocation mp_w_15_balefire_tex = new ResourceLocation(RefStrings.MODID, "textures/models/missile_parts/warheads/mp_w_15_balefire.png");
 	
 	//ISBRHs
-	public static final IModelCustom scaffold = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/scaffold.obj"));
-	public static final IModelCustom taperecorder = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/taperecorder.obj"));
-	public static final IModelCustom beam = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/beam.obj"));
-	public static final IModelCustom barrel = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/barrel.obj"));
-	public static final IModelCustom pole = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/pole.obj"));
+	public static final IModelCustom scaffold = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/scaffold.obj"));
+	public static final IModelCustom taperecorder = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/taperecorder.obj"));
+	public static final IModelCustom beam = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/beam.obj"));
+	public static final IModelCustom barrel = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/barrel.obj"));
+	public static final IModelCustom pole = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/pole.obj"));
 	public static final IModelCustom barbed_wire = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/barbed_wire.obj"));
+	public static final IModelCustom antenna_top = AdvancedModelLoader.loadModel(new ResourceLocation(RefStrings.MODID, "models/blocks/antenna_top.obj"));
 	
 }
diff --git a/com/hbm/packet/AuxButtonPacket.java b/com/hbm/packet/AuxButtonPacket.java
index a74183925..0bda5426c 100644
--- a/com/hbm/packet/AuxButtonPacket.java
+++ b/com/hbm/packet/AuxButtonPacket.java
@@ -3,6 +3,7 @@ package com.hbm.packet;
 import com.hbm.handler.FluidTypeHandler.FluidType;
 import com.hbm.items.weapon.ItemMissile.PartSize;
 import com.hbm.tileentity.bomb.TileEntityLaunchTable;
+import com.hbm.tileentity.machine.TileEntityBarrel;
 import com.hbm.tileentity.machine.TileEntityCoreEmitter;
 import com.hbm.tileentity.machine.TileEntityCoreStabilizer;
 import com.hbm.tileentity.machine.TileEntityForceField;
@@ -226,6 +227,13 @@ public class AuxButtonPacket implements IMessage {
 					}
 				}
 				
+				if (te instanceof TileEntityBarrel) {
+					TileEntityBarrel barrel = (TileEntityBarrel)te;
+
+					barrel.mode = (short) ((barrel.mode + 1) % barrel.modes);
+					barrel.markDirty();
+				}
+				
 			//} catch (Exception x) { }
 			
 			return null;
diff --git a/com/hbm/render/block/RenderAntennaTop.java b/com/hbm/render/block/RenderAntennaTop.java
new file mode 100644
index 000000000..2f7322e8e
--- /dev/null
+++ b/com/hbm/render/block/RenderAntennaTop.java
@@ -0,0 +1,70 @@
+package com.hbm.render.block;
+
+import org.lwjgl.opengl.GL11;
+
+import com.hbm.main.ResourceManager;
+
+import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler;
+import net.minecraft.block.Block;
+import net.minecraft.client.renderer.RenderBlocks;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import net.minecraftforge.client.model.obj.WavefrontObject;
+
+public class RenderAntennaTop implements ISimpleBlockRenderingHandler {
+
+	@Override
+	public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) {
+
+		GL11.glPushMatrix();
+        Tessellator tessellator = Tessellator.instance;
+        IIcon iicon = block.getIcon(0, 0);
+		tessellator.setColorOpaque_F(1, 1, 1);
+
+        if (renderer.hasOverrideBlockTexture())
+        {
+            iicon = renderer.overrideBlockTexture;
+        }
+
+        GL11.glTranslated(0, -0.5, 0);
+        GL11.glScalef(0.75F, 0.75F, 0.75F);
+        tessellator.startDrawingQuads();
+		ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.antenna_top, iicon, tessellator, 0, false);
+		tessellator.draw();
+		
+        GL11.glPopMatrix();
+	}
+
+	@Override
+	public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) {
+        
+        Tessellator tessellator = Tessellator.instance;
+        IIcon iicon = block.getIcon(0, world.getBlockMetadata(x, y, z));
+		
+        tessellator.setBrightness(block.getMixedBrightnessForBlock(world, x, y, z));
+		tessellator.setColorOpaque_F(1, 1, 1);
+
+        if (renderer.hasOverrideBlockTexture())
+        {
+            iicon = renderer.overrideBlockTexture;
+        }
+        
+        tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
+		ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.antenna_top, iicon, tessellator, 0, true);
+        tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
+        
+		return true;
+	}
+
+	@Override
+	public boolean shouldRender3DInInventory(int modelId) {
+		return true;
+	}
+
+	@Override
+	public int getRenderId() {
+		return 334084;
+	}
+
+}
diff --git a/com/hbm/render/block/RenderFence.java b/com/hbm/render/block/RenderFence.java
index c3dfa1384..cb42f1d72 100644
--- a/com/hbm/render/block/RenderFence.java
+++ b/com/hbm/render/block/RenderFence.java
@@ -20,12 +20,10 @@ public class RenderFence implements ISimpleBlockRenderingHandler {
 		
 		BlockFence fence = (BlockFence) ModBlocks.fence_metal;
 		
-        boolean flag = false;
         float f = 0.375F;
         float f1 = 0.625F;
         renderer.setRenderBounds((double)f, 0.0D, (double)f, (double)f1, 1.0D, (double)f1);
         renderer.renderStandardBlock(fence, x, y, z);
-        flag = true;
         boolean flag1 = false;
         boolean flag2 = false;
 
@@ -61,24 +59,22 @@ public class RenderFence implements ISimpleBlockRenderingHandler {
         {
         	renderer.setRenderBounds((double)f4, (double)0, (double)0.5, (double)f5, (double)1, (double)0.5);
         	renderer.renderStandardBlock(fence, x, y, z);
-            flag = true;
         }
 
         if (flag2)
         {
         	renderer.setRenderBounds((double)0.5, (double)0, (double)f6, (double)0.5, (double)1, (double)f7);
         	renderer.renderStandardBlock(fence, x, y, z);
-            flag = true;
         }
 
         renderer.field_152631_f = false;
         fence.setBlockBoundsBasedOnState(world, x, y, z);
-        return flag;
+        return true;
 	}
 
 	@Override
 	public boolean shouldRender3DInInventory(int modelId) {
-		return false;
+		return true;
 	}
 
 	@Override
diff --git a/com/hbm/render/tileentity/RenderFluidBarrel.java b/com/hbm/render/tileentity/RenderFluidBarrel.java
new file mode 100644
index 000000000..9ae93cf83
--- /dev/null
+++ b/com/hbm/render/tileentity/RenderFluidBarrel.java
@@ -0,0 +1,46 @@
+package com.hbm.render.tileentity;
+
+import org.lwjgl.opengl.GL11;
+
+import com.hbm.handler.FluidTypeHandler.FluidType;
+import com.hbm.render.util.DiamondPronter;
+import com.hbm.render.util.EnumSymbol;
+import com.hbm.tileentity.machine.TileEntityBarrel;
+
+import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
+import net.minecraft.tileentity.TileEntity;
+
+public class RenderFluidBarrel extends TileEntitySpecialRenderer {
+
+	@Override
+	public void renderTileEntityAt(TileEntity te, double x, double y, double z, float i) {
+
+		GL11.glPushMatrix();
+		GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5);
+		GL11.glEnable(GL11.GL_LIGHTING);
+		
+		if(te instanceof TileEntityBarrel) {
+			
+			TileEntityBarrel barrel = (TileEntityBarrel)te;
+			FluidType type = barrel.tank.getTankType();
+			int poison = type.poison;
+			int flammability = type.flammability;
+			int reactivity = type.reactivity;
+			EnumSymbol symbol = type.symbol;
+			
+			for(int j = 0; j < 4; j++) {
+				
+				GL11.glPushMatrix();
+				GL11.glTranslated(0.4, 0.25, -0.15);
+				GL11.glScalef(1.0F, 0.35F, 0.35F);
+				DiamondPronter.pront(poison, flammability, reactivity, symbol);
+				GL11.glPopMatrix();
+				GL11.glRotatef(90, 0, 1, 0);
+			}
+			
+		}
+		
+		GL11.glPopMatrix();
+	}
+
+}
diff --git a/com/hbm/render/tileentity/RendererObjTester.java b/com/hbm/render/tileentity/RendererObjTester.java
index a063d6926..05f6d6356 100644
--- a/com/hbm/render/tileentity/RendererObjTester.java
+++ b/com/hbm/render/tileentity/RendererObjTester.java
@@ -3,14 +3,12 @@ package com.hbm.render.tileentity;
 import org.lwjgl.opengl.GL11;
 
 import com.hbm.lib.RefStrings;
-import com.hbm.render.util.BeamPronter;
-import com.hbm.render.util.BeamPronter.EnumBeamType;
-import com.hbm.render.util.BeamPronter.EnumWaveType;
+import com.hbm.render.util.DiamondPronter;
+import com.hbm.render.util.EnumSymbol;
 
 import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer;
 import net.minecraft.tileentity.TileEntity;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.Vec3;
 import net.minecraftforge.client.model.AdvancedModelLoader;
 import net.minecraftforge.client.model.IModelCustom;
 
@@ -32,7 +30,8 @@ public class RendererObjTester extends TileEntitySpecialRenderer {
 	public void renderTileEntityAt(TileEntity tileEntity, double x, double y, double z, float f)
     {
         GL11.glPushMatrix();
-        GL11.glTranslated(x + 0.5, y, z + 0.5);
+        GL11.glTranslated(x + 0.5, y + 0.5, z + 0.5);
+        GL11.glEnable(GL11.GL_LIGHTING);
 		/*switch(tileEntity.getBlockMetadata())
 		{
 		case 5:
@@ -108,10 +107,12 @@ public class RendererObjTester extends TileEntitySpecialRenderer {
         
         //SoyuzPronter.prontSoyuz();
         //TomPronter.prontTom();
-        BeamPronter.prontBeam(Vec3.createVectorHelper(5, 5, 5), EnumWaveType.SPIRAL, EnumBeamType.SOLID, 0xff8000, 0xff8000, (int)tileEntity.getWorldObj().getTotalWorldTime() % 360 * 25, 25, 0.1F, 4, 0.05F);
-        BeamPronter.prontBeam(Vec3.createVectorHelper(5, 5, 5), EnumWaveType.SPIRAL, EnumBeamType.SOLID, 0xffff00, 0xffff00, (int)tileEntity.getWorldObj().getTotalWorldTime() % 360 * 25, 1, 0F, 4, 0.05F);
+        //BeamPronter.prontBeam(Vec3.createVectorHelper(5, 5, 5), EnumWaveType.SPIRAL, EnumBeamType.SOLID, 0xff8000, 0xff8000, (int)tileEntity.getWorldObj().getTotalWorldTime() % 360 * 25, 25, 0.1F, 4, 0.05F);
+        //BeamPronter.prontBeam(Vec3.createVectorHelper(5, 5, 5), EnumWaveType.SPIRAL, EnumBeamType.SOLID, 0xffff00, 0xffff00, (int)tileEntity.getWorldObj().getTotalWorldTime() % 360 * 25, 1, 0F, 4, 0.05F);
         //BeamPronter.prontHelix(Vec3.createVectorHelper(0, 5, 0), 0.5, 0.5, 0.5, EnumWaveType.SPIRAL, EnumBeamType.LINE, 0x0000ff, 0xffff00, (int)tileEntity.getWorldObj().getTotalWorldTime() % 360 * 25 + 180, 25, 0.25F);
 
+        DiamondPronter.pront(1, 2, 3, EnumSymbol.OXIDIZER);
+        
         GL11.glPopMatrix();
     }
 
diff --git a/com/hbm/render/util/DiamondPronter.java b/com/hbm/render/util/DiamondPronter.java
new file mode 100644
index 000000000..bd4c3950b
--- /dev/null
+++ b/com/hbm/render/util/DiamondPronter.java
@@ -0,0 +1,115 @@
+package com.hbm.render.util;
+
+import org.lwjgl.opengl.GL11;
+
+import com.hbm.lib.RefStrings;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.OpenGlHelper;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.util.ResourceLocation;
+
+public class DiamondPronter {
+	
+	private static final ResourceLocation texture = new ResourceLocation(RefStrings.MODID + ":textures/models/misc/danger_diamond.png");
+	
+	public static void pront(int poison, int flammability, int reactivity, EnumSymbol symbol) {
+		
+		GL11.glPushMatrix();
+		
+		Minecraft.getMinecraft().renderEngine.bindTexture(texture);
+		
+		float p = 1F/256F;
+		float s = 1F/139F;
+		Tessellator tess = Tessellator.instance;
+		GL11.glEnable(GL11.GL_BLEND);
+        OpenGlHelper.glBlendFunc(770, 771, 1, 0);
+
+		tess.startDrawingQuads();
+		tess.addVertexWithUV(0.0, 0.5, -0.5, p * 144, p * 45);
+		tess.addVertexWithUV(0.0, 0.5, 0.5, p * 5, p * 45);
+		tess.addVertexWithUV(0.0, -0.5, 0.5, p * 5, p * 184);
+		tess.addVertexWithUV(0.0, -0.5, -0.5, p * 144, p * 184);
+		tess.draw();
+		
+		float width = 10F * s;
+		float height = 14F * s;
+		
+		if(poison >= 0 && poison < 6) {
+			
+			float oY = 0;
+			float oZ = 33 * s;
+			
+			int x = 5 + (poison - 1) * 24;
+			int y = 5;
+			
+			if(poison == 0) x = 125;
+
+			tess.startDrawingQuads();
+			tess.addVertexWithUV(0.01, height + oY, -width + oZ, (x + 20) * p, y * p);
+			tess.addVertexWithUV(0.01, height + oY, width + oZ, x * p, y * p);
+			tess.addVertexWithUV(0.01, -height + oY, width + oZ, x * p, (y + 28) * p);
+			tess.addVertexWithUV(0.01, -height + oY, -width + oZ, (x + 20) * p, (y + 28) * p);
+			tess.draw();
+		}
+		
+		if(flammability >= 0 && flammability < 6) {
+			
+			float oY = 33 * s;
+			float oZ = 0;
+			
+			int x = 5 + (flammability - 1) * 24;
+			int y = 5;
+			
+			if(flammability == 0) x = 125;
+
+			tess.startDrawingQuads();
+			tess.addVertexWithUV(0.01, height + oY, -width + oZ, (x + 20) * p, y * p);
+			tess.addVertexWithUV(0.01, height + oY, width + oZ, x * p, y * p);
+			tess.addVertexWithUV(0.01, -height + oY, width + oZ, x * p, (y + 28) * p);
+			tess.addVertexWithUV(0.01, -height + oY, -width + oZ, (x + 20) * p, (y + 28) * p);
+			tess.draw();
+		}
+		
+		if(reactivity >= 0 && reactivity < 6) {
+			
+			float oY = 0;
+			float oZ = -33 * s;
+			
+			int x = 5 + (reactivity - 1) * 24;
+			int y = 5;
+			
+			if(reactivity == 0) x = 125;
+
+			tess.startDrawingQuads();
+			tess.addVertexWithUV(0.01, height + oY, -width + oZ, (x + 20) * p, y * p);
+			tess.addVertexWithUV(0.01, height + oY, width + oZ, x * p, y * p);
+			tess.addVertexWithUV(0.01, -height + oY, width + oZ, x * p, (y + 28) * p);
+			tess.addVertexWithUV(0.01, -height + oY, -width + oZ, (x + 20) * p, (y + 28) * p);
+			tess.draw();
+		}
+		
+
+		float symSize = 59F/2F * s;
+		
+		if(symbol != EnumSymbol.NONE) {
+			
+			float oY = -33 * s;
+			float oZ = 0;
+			
+			int x = symbol.x;
+			int y = symbol.y;
+
+			tess.startDrawingQuads();
+			tess.addVertexWithUV(0.01, symSize + oY, -symSize + oZ, (x + 59) * p, y * p);
+			tess.addVertexWithUV(0.01, symSize + oY, symSize + oZ, x * p, y * p);
+			tess.addVertexWithUV(0.01, -symSize + oY, symSize + oZ, x * p, (y + 59) * p);
+			tess.addVertexWithUV(0.01, -symSize + oY, -symSize + oZ, (x + 59) * p, (y + 59) * p);
+			tess.draw();
+		}
+
+		GL11.glDisable(GL11.GL_BLEND);
+		GL11.glPopMatrix();
+	}
+
+}
diff --git a/com/hbm/render/util/EnumSymbol.java b/com/hbm/render/util/EnumSymbol.java
new file mode 100644
index 000000000..7b73294ef
--- /dev/null
+++ b/com/hbm/render/util/EnumSymbol.java
@@ -0,0 +1,20 @@
+package com.hbm.render.util;
+
+public enum EnumSymbol {
+	NONE(0, 0),
+	RADIATION(195, 2),
+	NOWATER(195, 63),
+	ACID(195, 124),
+	ASPHYXIANT(195, 185),
+	CROYGENIC(134, 185),
+	ANTIMATTER(73, 185),
+	OXIDIZER(12, 185);
+	
+	public int x;
+	public int y;
+	
+	private EnumSymbol(int x, int y) {
+		this.x = x;
+		this.y = y;
+	}
+}
diff --git a/com/hbm/tileentity/machine/TileEntityBarrel.java b/com/hbm/tileentity/machine/TileEntityBarrel.java
index ed1046218..e00c473f9 100644
--- a/com/hbm/tileentity/machine/TileEntityBarrel.java
+++ b/com/hbm/tileentity/machine/TileEntityBarrel.java
@@ -3,6 +3,7 @@ package com.hbm.tileentity.machine;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.hbm.blocks.ModBlocks;
 import com.hbm.handler.FluidTypeHandler.FluidType;
 import com.hbm.interfaces.IFluidAcceptor;
 import com.hbm.interfaces.IFluidSource;
@@ -10,13 +11,23 @@ import com.hbm.inventory.FluidTank;
 import com.hbm.lib.Library;
 import com.hbm.tileentity.TileEntityMachineBase;
 
+import net.minecraft.block.Block;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+
 public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcceptor, IFluidSource {
 	
 	public FluidTank tank;
-	public int mode = 0;
+	public short mode = 0;
+	public static final short modes = 4;
 	public int age = 0;
 	public List<IFluidAcceptor> list = new ArrayList();
 
+	public TileEntityBarrel() {
+		super(6);
+		tank = new FluidTank(FluidType.NONE, 0, 0);
+	}
+
 	public TileEntityBarrel(int capacity) {
 		super(6);
 		tank = new FluidTank(FluidType.NONE, capacity, 0);
@@ -33,9 +44,62 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc
 		if(!worldObj.isRemote) {
 			
 			tank.setType(0, 1, slots);
+			tank.loadTank(2, 3, slots);
+			tank.unloadTank(4, 5, slots);
 			tank.updateTank(xCoord, yCoord, zCoord, worldObj.provider.dimensionId);
+
+			age++;
+			if(age >= 20)
+				age = 0;
+			
+			if((mode == 1 || mode == 2) && (age == 9 || age == 19))
+				fillFluidInit(tank.getTankType());
+			
+			if(tank.getFill() > 0) {
+				
+				Block b = this.getBlockType();
+				
+				if(b != ModBlocks.barrel_antimatter && tank.getTankType().isAntimatter()) {
+					worldObj.func_147480_a(xCoord, yCoord, zCoord, false);
+					worldObj.newExplosion(null, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 5, true, true);
+				}
+				
+				if(b == ModBlocks.barrel_plastic && (tank.getTankType().isCorrosive() || tank.getTankType().isHot())) {
+					worldObj.func_147480_a(xCoord, yCoord, zCoord, false);
+					worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "random.fizz", 1.0F, 1.0F);
+				}
+				
+				//TODO: rip off furnace code and make transition more seamless
+				if(b == ModBlocks.barrel_iron && tank.getTankType().isCorrosive()) {
+					ItemStack[] copy = this.slots.clone();
+					this.slots = new ItemStack[6];
+					worldObj.setBlock(xCoord, yCoord, zCoord, ModBlocks.barrel_corroded);
+					TileEntityBarrel barrel = (TileEntityBarrel)worldObj.getTileEntity(xCoord, yCoord, zCoord);
+					
+					if(barrel != null) {
+						barrel.tank.setTankType(tank.getTankType());
+						barrel.tank.setFill(Math.min(barrel.tank.getMaxFill(), tank.getFill()));
+						barrel.slots = copy;
+					}
+					
+					worldObj.playSoundEffect(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, "random.fizz", 1.0F, 1.0F);
+				}
+				
+				if(b == ModBlocks.barrel_corroded && worldObj.rand.nextInt(3) == 0) {
+					tank.setFill(tank.getFill() - 1);
+				}
+			}
+			
+			NBTTagCompound data = new NBTTagCompound();
+			data.setShort("mode", mode);
+			this.networkPack(data, 50);
 		}
 	}
+	
+	public void networkUnpack(NBTTagCompound data) {
+		
+		mode = data.getShort("mode");
+	}
 
 	@Override
 	public void setFillstate(int fill, int index) {
@@ -49,6 +113,10 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc
 
 	@Override
 	public int getMaxFluidFill(FluidType type) {
+		
+		if(mode == 2 || mode == 3)
+			return 0;
+		
 		return type.name().equals(this.tank.getTankType().name()) ? tank.getMaxFill() : 0;
 	}
 
@@ -74,6 +142,7 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc
 
 	@Override
 	public int getFluidFill(FluidType type) {
+		
 		return type.name().equals(this.tank.getTankType().name()) ? tank.getFill() : 0;
 	}
 
@@ -100,4 +169,20 @@ public class TileEntityBarrel extends TileEntityMachineBase implements IFluidAcc
 		
 		return list;
 	}
+	
+	@Override
+	public void readFromNBT(NBTTagCompound nbt) {
+		super.readFromNBT(nbt);
+		
+		mode = nbt.getShort("mode");
+		tank.readFromNBT(nbt, "tank");
+	}
+	
+	@Override
+	public void writeToNBT(NBTTagCompound nbt) {
+		super.writeToNBT(nbt);
+		
+		nbt.setShort("mode", mode);
+		tank.writeToNBT(nbt, "tank");
+	}
 }
diff --git a/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java b/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java
index 1e834620d..3682fc7f5 100644
--- a/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java
+++ b/com/hbm/tileentity/machine/TileEntityMachineReactorSmall.java
@@ -48,8 +48,8 @@ public class TileEntityMachineReactorSmall extends TileEntity
 	public FluidTank[] tanks;
 
 	private static final int[] slots_top = new int[] { 0 };
-	private static final int[] slots_bottom = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 16 };
-	private static final int[] slots_side = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14, 16 };
+	private static final int[] slots_bottom = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15 };
+	private static final int[] slots_side = new int[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 14 };
 
 	private String customName;