From 3fc90bca4446a86d4eaae770f9cb5e25802ae416 Mon Sep 17 00:00:00 2001
From: Bob <hbmmods@gmail.com>
Date: Sun, 17 Jan 2021 22:09:22 +0100
Subject: [PATCH] some conveyor belt improvements, reworked orbital death ray

---
 .../java/assets/hbm/models/blocks/arrow.obj   | 159 ++++++++++--------
 .../hbm/textures/armor/fau_cassette.png       | Bin 2862 -> 3607 bytes
 .../assets/hbm/textures/blocks/conveyor.png   | Bin 0 -> 237 bytes
 .../hbm/textures/blocks/conveyor.png.mcmeta   |   3 +
 .../assets/hbm/textures/blocks/crane_in.png   | Bin 0 -> 246 bytes
 .../assets/hbm/textures/blocks/crane_out.png  | Bin 0 -> 256 bytes
 .../assets/hbm/textures/blocks/crane_side.png | Bin 0 -> 177 bytes
 .../assets/hbm/textures/blocks/crane_top.png  | Bin 0 -> 134 bytes
 .../textures/blocks/crate_entangled_side.png  | Bin 0 -> 230 bytes
 .../textures/blocks/crate_entangled_top.png   | Bin 0 -> 302 bytes
 src/main/java/com/hbm/blocks/ModBlocks.java   |   2 +-
 .../com/hbm/blocks/network/BlockConveyor.java |   2 +-
 .../com/hbm/entity/item/EntityMovingItem.java |  17 +-
 .../hbm/entity/logic/EntityDeathBlast.java    |  40 ++++-
 .../com/hbm/handler/EntityEffectHandler.java  |  90 ++++++++++
 src/main/java/com/hbm/main/ClientProxy.java   |  38 ++---
 .../java/com/hbm/main/ModEventHandler.java    |  44 ++---
 .../java/com/hbm/packet/ExtPropPacket.java    |  76 +++++++++
 .../java/com/hbm/packet/PacketDispatcher.java |   2 +-
 .../java/com/hbm/packet/RadSurveyPacket.java  |  54 ------
 .../com/hbm/render/block/RenderConveyor.java  |  33 ++--
 .../hbm/render/model/ModelArmorDigamma.java   |   3 +
 22 files changed, 357 insertions(+), 206 deletions(-)
 create mode 100644 src/main/java/assets/hbm/textures/blocks/conveyor.png
 create mode 100644 src/main/java/assets/hbm/textures/blocks/conveyor.png.mcmeta
 create mode 100644 src/main/java/assets/hbm/textures/blocks/crane_in.png
 create mode 100644 src/main/java/assets/hbm/textures/blocks/crane_out.png
 create mode 100644 src/main/java/assets/hbm/textures/blocks/crane_side.png
 create mode 100644 src/main/java/assets/hbm/textures/blocks/crane_top.png
 create mode 100644 src/main/java/assets/hbm/textures/blocks/crate_entangled_side.png
 create mode 100644 src/main/java/assets/hbm/textures/blocks/crate_entangled_top.png
 create mode 100644 src/main/java/com/hbm/handler/EntityEffectHandler.java
 create mode 100644 src/main/java/com/hbm/packet/ExtPropPacket.java
 delete mode 100644 src/main/java/com/hbm/packet/RadSurveyPacket.java

diff --git a/src/main/java/assets/hbm/models/blocks/arrow.obj b/src/main/java/assets/hbm/models/blocks/arrow.obj
index 52e9add4a..1652de2aa 100644
--- a/src/main/java/assets/hbm/models/blocks/arrow.obj
+++ b/src/main/java/assets/hbm/models/blocks/arrow.obj
@@ -1,80 +1,91 @@
-# Blender v2.76 (sub 0) OBJ File: ''
+# Blender v2.79 (sub 0) OBJ File: ''
 # www.blender.org
 o Plane
-v -0.250000 0.125000 -0.500000
-v 0.250000 0.125000 -0.500000
-v 0.500000 0.125000 0.000000
-v 0.000000 0.125000 0.500000
-v 0.000000 0.000000 0.500000
 v -0.500000 0.000000 0.000000
-v 0.500000 0.000000 0.000000
-v 0.250000 0.000000 -0.500000
 v -0.500000 0.125000 0.000000
-v -0.250000 0.000000 -0.500000
-v 0.250000 0.000000 0.000000
 v -0.250000 0.125000 0.000000
-v -0.250000 0.000000 0.000000
+v 0.250000 0.000000 -0.500000
+v 0.250000 0.125000 -0.500000
 v 0.250000 0.125000 0.000000
-vt 0.494975 0.819349
-vt 0.424264 0.819349
-vt 0.424264 0.638698
-vt 0.141422 1.000000
-vt 0.070711 1.000000
-vt 0.070711 0.638698
-vt 0.700000 0.510958
-vt 0.900000 0.255479
-vt 1.000000 0.638698
-vt 0.353554 1.000000
-vt 0.282843 1.000000
-vt 0.282843 0.638698
-vt 0.000000 1.000000
-vt 0.000000 0.638698
-vt 0.353554 0.819349
-vt 0.353554 0.638698
-vt 0.400000 0.255479
-vt 0.500000 0.638698
-vt 0.200000 0.510958
-vt 0.212132 1.000000
-vt 0.141422 0.638698
-vt 0.212132 0.638698
-vt 0.494975 0.638698
-vt 0.500000 0.255479
-vt 0.700000 0.000000
-vt 0.600000 0.638698
-vt 1.000000 0.127740
-vt 0.500000 0.127740
-vt 0.000000 0.255479
-vt 0.200000 0.000000
-vt 0.100000 0.638698
-vn 0.000000 0.000000 -1.000000
-vn 1.000000 0.000000 0.000000
-vn 0.000000 1.000000 0.000000
-vn -0.707100 0.000000 0.707100
-vn 0.707100 0.000000 0.707100
-vn 0.000000 -1.000000 0.000000
-vn -1.000000 0.000000 0.000000
-s off
-f 6/1/1 9/2/1 12/3/1
-f 8/4/2 2/5/2 14/6/2
-f 14/7/3 12/8/3 4/9/3
-f 5/10/4 4/11/4 9/12/4
-f 7/5/5 3/13/5 4/14/5
-f 11/2/1 14/15/1 3/16/1
-f 11/17/6 5/18/6 13/19/6
-f 13/20/7 12/4/7 1/21/7
-f 10/22/1 1/12/1 2/11/1
-f 13/23/1 6/1/1 12/3/1
-f 11/21/2 8/4/2 14/6/2
-f 14/7/3 2/24/3 1/25/3
-f 4/9/3 3/26/3 14/7/3
-f 12/8/3 9/27/3 4/9/3
-f 14/7/3 1/25/3 12/8/3
-f 6/16/4 5/10/4 9/12/4
-f 5/6/5 7/5/5 4/14/5
-f 7/3/1 11/2/1 3/16/1
-f 11/17/6 7/28/6 5/18/6
-f 10/29/6 8/30/6 11/17/6
-f 5/18/6 6/31/6 13/19/6
-f 13/19/6 10/29/6 11/17/6
-f 10/22/7 13/20/7 1/21/7
-f 8/20/1 10/22/1 2/11/1
+v 0.000000 0.125000 0.500000
+v 0.000000 -0.000000 0.500000
+v 0.500000 0.000000 0.000000
+v 0.500000 0.125000 0.000000
+v 0.250000 0.000000 0.000000
+v -0.250000 0.000000 0.000000
+v -0.250000 0.125000 -0.500000
+v -0.250000 0.000000 -0.500000
+vt 0.333302 0.666510
+vt 0.000094 0.666510
+vt 0.000094 0.000094
+vt 0.176982 0.000077
+vt 0.353731 0.000077
+vt 0.353731 0.707075
+vt 0.250050 0.500000
+vt 0.749950 0.500000
+vt 0.500000 0.999900
+vt 0.999923 0.000077
+vt 0.999923 0.176827
+vt 0.000077 0.176827
+vt 0.000077 0.000077
+vt 0.176827 0.000077
+vt 0.176827 0.999923
+vt 0.000094 0.999906
+vt 0.000094 0.666698
+vt 0.666510 0.666698
+vt 0.749950 0.500000
+vt 0.500000 0.999900
+vt 0.250050 0.500000
+vt 0.176827 0.883979
+vt 0.000077 0.883979
+vt 0.000077 0.176982
+vt 0.000050 0.250025
+vt 0.000050 0.000050
+vt 0.999950 0.000050
+vt 0.333302 0.000094
+vt 0.176982 0.707075
+vt 0.250050 0.000100
+vt 0.749950 0.000100
+vt 0.000100 0.500000
+vt 0.999900 0.500000
+vt 0.000077 0.000077
+vt 0.000077 0.999923
+vt 0.666510 0.999906
+vt 0.999900 0.500000
+vt 0.250050 0.000100
+vt 0.749950 0.000100
+vt 0.000100 0.500000
+vt 0.176827 0.176982
+vt 0.999950 0.250025
+vn 0.0000 0.0000 -1.0000
+vn 1.0000 0.0000 0.0000
+vn 0.0000 1.0000 0.0000
+vn -0.7071 0.0000 0.7071
+vn 0.7071 0.0000 0.7071
+vn 0.0000 -1.0000 -0.0000
+vn -1.0000 0.0000 0.0000
+s 1
+f 1/1/1 2/2/1 3/3/1
+f 4/4/2 5/5/2 6/6/2
+f 6/7/3 3/8/3 7/9/3
+f 8/10/4 7/11/4 2/12/4
+f 9/13/5 10/14/5 7/15/5
+f 11/16/1 6/17/1 10/18/1
+f 11/19/6 8/20/6 12/21/6
+f 12/22/7 3/23/7 13/24/7
+f 14/25/1 13/26/1 5/27/1
+f 12/28/1 1/1/1 3/3/1
+f 11/29/2 4/4/2 6/6/2
+f 6/7/3 5/30/3 13/31/3
+f 7/9/3 10/32/3 6/7/3
+f 3/8/3 2/33/3 7/9/3
+f 6/7/3 13/31/3 3/8/3
+f 1/34/4 8/10/4 2/12/4
+f 8/35/5 9/13/5 7/15/5
+f 9/36/1 11/16/1 10/18/1
+f 11/19/6 9/37/6 8/20/6
+f 14/38/6 4/39/6 11/19/6
+f 8/20/6 1/40/6 12/21/6
+f 12/21/6 14/38/6 11/19/6
+f 14/41/7 12/22/7 13/24/7
+f 4/42/1 14/25/1 5/27/1
diff --git a/src/main/java/assets/hbm/textures/armor/fau_cassette.png b/src/main/java/assets/hbm/textures/armor/fau_cassette.png
index 7cda0822cbb31c8aa6917d14ecaae6f6c9c93114..37df35c1e1069596c27b072f103062da7e78d546 100644
GIT binary patch
delta 3606
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

delta 2855
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
FV1grXf_VS{

diff --git a/src/main/java/assets/hbm/textures/blocks/conveyor.png b/src/main/java/assets/hbm/textures/blocks/conveyor.png
new file mode 100644
index 0000000000000000000000000000000000000000..3a84ab6209e893a668ffcee7abf01c6a7632a86c
GIT binary patch
literal 237
zcmeAS@N?(olHy`uVBq!ia0vp^0zmA*!3HFSYrjteQY^(zo*^7SP{WbZ0pu_7ba4!c
zXnlLhmg|s%z|oKOi(F619K7_YQo4V#aRt{}+m7HU&o^Q@+k8^j{Nd_iVR5{-?eOfm
zf6t0J+<%|AQ6%|Xo~%gm3@@gpUF+OU873T2S$d_Q?Qy2txtZ%;uUPde^})t_a#3ct
zOXf5DusFIwuaimo#sN074F^ks3<sf97n{2iitBDCMD%myAGE*7_CGm*$z=7#o6*m{
i`+tziO=#AajA3|E&mGep9xeuSFN3G6pUXO@geCy|+g$ws

literal 0
HcmV?d00001

diff --git a/src/main/java/assets/hbm/textures/blocks/conveyor.png.mcmeta b/src/main/java/assets/hbm/textures/blocks/conveyor.png.mcmeta
new file mode 100644
index 000000000..df9cfce6e
--- /dev/null
+++ b/src/main/java/assets/hbm/textures/blocks/conveyor.png.mcmeta
@@ -0,0 +1,3 @@
+{
+  "animation": { }
+}
diff --git a/src/main/java/assets/hbm/textures/blocks/crane_in.png b/src/main/java/assets/hbm/textures/blocks/crane_in.png
new file mode 100644
index 0000000000000000000000000000000000000000..af0ea0d69bbab000023c4827db64f4aab63e9431
GIT binary patch
literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<gfK~aSXBO
zT{_uTsL4Q}b-%&OLyj*ZqF3*2bYALyrAxbj`J<j^FY6<QNjyiw_x`ET-#q)sidP5Z
zH%$(_>YQ-BltIMu!<>zuPj1UCKj?e8W^b&1)%(c>k<+?A`a5W)@VYZ^bJ~{h!^Ciz
z0Fz?Nm1!jh<XpWO3eG)cKav%9y5q!$J>MBlY`s_7`}Z;HftPAGPFJ@0vX<69c*5m!
tV8yEmpQj}L;Xj&ElrY28P@UxgZ)m0=@1B(Vvw#j~@O1TaS?83{1OWJJWb*(3

literal 0
HcmV?d00001

diff --git a/src/main/java/assets/hbm/textures/blocks/crane_out.png b/src/main/java/assets/hbm/textures/blocks/crane_out.png
new file mode 100644
index 0000000000000000000000000000000000000000..157c24e4a77a597e37bc63ff76b26ae855a9eb91
GIT binary patch
literal 256
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Zt(MaSXBO
z-8#vT?~nnHYy4`twvU^QezKK3k+2m@?z<p8VPkTBQroG}g`F&}HJU+Fe%M==Nf{T{
z1&B)<|2}2Wr_AtH@bk6HQ}u$qT!Zg_-@RE@VX4cxowI(*eq!R-ykwE(foPA9oD7Ez
z7!1yT=F(re_S&z7t3+L%Nre0UU%lYlv$-le{df3VJeVY-v2I6qh3CCk{nHt<E;H5K
zF@7Fh+he!!nD>PlGv$At+F-Jy_pG3C&a4U+rVlLQ$w9MIO(b^!y};n<>gTe~DWM4f
Diiu>V

literal 0
HcmV?d00001

diff --git a/src/main/java/assets/hbm/textures/blocks/crane_side.png b/src/main/java/assets/hbm/textures/blocks/crane_side.png
new file mode 100644
index 0000000000000000000000000000000000000000..7114de091b37adc35756e6e9762e5363a2ba0773
GIT binary patch
literal 177
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<Y#!gIEGmC
zzMZ_0x4}SwSzqvQK%MVX-Uv(OfHdh~mx%(RoU(^5d6yNgyXQHna^X^GPv-<p)&?8q
z_?b37_r8eNENbZ3pj~$K!n@2qj_0-33?A9qC8-+fp7SbGGpbMAJ#(NS^05!+0nXh^
WEj5o^;PwaF$>8bg=d#Wzp$P!wWI5;n

literal 0
HcmV?d00001

diff --git a/src/main/java/assets/hbm/textures/blocks/crane_top.png b/src/main/java/assets/hbm/textures/blocks/crane_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..de1c3261a7194b562bec9b5f6f38248c0200159d
GIT binary patch
literal 134
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<lB0>IEGmC
zCYKZx{5bExn9yh_BO~K+sp7!_Mm7*oD>6}jov0M4E+t`_aHYX9g+V8I0#ia&#06Fl
aR))E^d6jnw`ltg9V(@hJb6Mw<&;$VAq#@`4

literal 0
HcmV?d00001

diff --git a/src/main/java/assets/hbm/textures/blocks/crate_entangled_side.png b/src/main/java/assets/hbm/textures/blocks/crate_entangled_side.png
new file mode 100644
index 0000000000000000000000000000000000000000..bd9e5fc2ed9fb65b37c6a951c3f32d0bbf944eaf
GIT binary patch
literal 230
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf<j?hVaSXBO
zT{`(RFS8;KE4z!K<*zxDtv#4;dz<ZDBH(pmV%{9)Bv%d>ok}4gvHYI1$5*cU*zPoQ
z#VbvNV;l|fjoE5FJl|`7cgX+V{Q9%;2Yp#lkrj7W_D08VZ<SiL`sG$Zx9-JeQSsk-
z(hjWWN^1<eEXt#*l*YNa#Zhka#*P{LW8)cic>85^25$@wjjlX3;eWIKWKoG#(Gi|Z
aAJ~pg3_Q*~Ay)+GPzFy|KbLh*2~7aq)>6m-

literal 0
HcmV?d00001

diff --git a/src/main/java/assets/hbm/textures/blocks/crate_entangled_top.png b/src/main/java/assets/hbm/textures/blocks/crate_entangled_top.png
new file mode 100644
index 0000000000000000000000000000000000000000..dc1866989d671954007b1d182626b6f1587663f9
GIT binary patch
literal 302
zcmV+}0nz@6P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00004b3#c}2nYxW
zd<bNS0002xNkl<ZIE|%~%?*Pv427R77Jyr~$pYz-Em}rMJOX74j%5M1>8*^A9!h?k
zfK=KiA%VkZKidi^r5yfH<zJLihroHB0RX3O;MSQU=9yD|;Or|rUgyhxvMT-Xki~5c
z)L<IWPaNQpSR^PM1UOTtOL#Lukf{aiU3A)rHbe_#8^A>nwt;~GbFAD?3{d<<Bme-W
zA)3Ial5y9~bJ0TU3_2aHb$YGrx4{d*i`b5EFcJe(*>iw*R1C3o8Jx)CUc|%<(mi_@
zOamOEZL-aNf^^T%2g0;-C>8nJ`0Hh=^1xBO0ff$6`{arMw*UYD07*qoM6N<$f;~2R
A;{X5v

literal 0
HcmV?d00001

diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java
index b18ce42ba..7dd39cc37 100644
--- a/src/main/java/com/hbm/blocks/ModBlocks.java
+++ b/src/main/java/com/hbm/blocks/ModBlocks.java
@@ -1286,7 +1286,7 @@ public class ModBlocks {
 		gas_duct_solid = new GasDuctSolid(Material.iron).setBlockName("gas_duct_solid").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":gas_duct_solid");
 		gas_duct = new BlockGasDuct(Material.iron).setBlockName("gas_duct").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":gas_duct_icon");
 		fluid_duct = new BlockFluidDuct(Material.iron).setBlockName("fluid_duct").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":fluid_duct_icon");
-		conveyor = new BlockConveyor(Material.iron).setBlockName("conveyor").setHardness(0.0F).setResistance(2.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":block_reiium");
+		conveyor = new BlockConveyor(Material.iron).setBlockName("conveyor").setHardness(0.0F).setResistance(2.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":conveyor");
 		
 		chain = new BlockChain(Material.iron).setBlockName("dungeon_chain").setHardness(0.25F).setResistance(2.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":chain");
 
diff --git a/src/main/java/com/hbm/blocks/network/BlockConveyor.java b/src/main/java/com/hbm/blocks/network/BlockConveyor.java
index 5a4ee956b..a1dbd97b8 100644
--- a/src/main/java/com/hbm/blocks/network/BlockConveyor.java
+++ b/src/main/java/com/hbm/blocks/network/BlockConveyor.java
@@ -61,7 +61,7 @@ public class BlockConveyor extends Block {
 	
 	@Override
     public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) {
-        return null;
+        return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y, z + 1);
     }
 	
 	@Override
diff --git a/src/main/java/com/hbm/entity/item/EntityMovingItem.java b/src/main/java/com/hbm/entity/item/EntityMovingItem.java
index b2d318bd4..ebe787a53 100644
--- a/src/main/java/com/hbm/entity/item/EntityMovingItem.java
+++ b/src/main/java/com/hbm/entity/item/EntityMovingItem.java
@@ -48,8 +48,8 @@ public class EntityMovingItem extends Entity {
     public boolean attackEntityFrom(DamageSource source, float amount) {
     	
     	if(!worldObj.isRemote) {
-			worldObj.spawnEntityInWorld(new EntityItem(worldObj, posX, posY, posZ, this.getItemStack()));
 	    	this.setDead();
+			worldObj.spawnEntityInWorld(new EntityItem(worldObj, posX, posY, posZ, this.getItemStack()));
     	}
     	return true;
     }
@@ -80,7 +80,12 @@ public class EntityMovingItem extends Entity {
     		
     		if(worldObj.getBlock((int)Math.floor(posX), (int)Math.floor(posY), (int)Math.floor(posZ)) != ModBlocks.conveyor) {
     			this.setDead();
-    			worldObj.spawnEntityInWorld(new EntityItem(worldObj, posX, posY, posZ, this.getItemStack()));
+    			EntityItem item = new EntityItem(worldObj, posX, posY, posZ, this.getItemStack());
+    			item.motionX = this.motionX * 3;
+    			item.motionY = 0.1;
+    			item.motionZ = this.motionZ * 3;
+    			item.velocityChanged = true;
+    			worldObj.spawnEntityInWorld(item);
     			return;
     		}
     	}
@@ -104,9 +109,15 @@ public class EntityMovingItem extends Entity {
         		motionX = -speed * dir.offsetX;
         		motionY = -speed * dir.offsetY;
         		motionZ = -speed * dir.offsetZ;
+        		
+        		this.velocityChanged = true;
     		}
+
+    		this.lastTickPosX = this.prevPosX = this.posX;
+    		this.lastTickPosY = this.prevPosY = this.posY;
+    		this.lastTickPosZ = this.prevPosZ = this.posZ;
     		
-    		this.moveEntity(motionX, motionY, motionZ);
+    		this.setPosition(posX + motionX, posY + motionY, posZ + motionZ);
     		schedule--;
     	}
     }
diff --git a/src/main/java/com/hbm/entity/logic/EntityDeathBlast.java b/src/main/java/com/hbm/entity/logic/EntityDeathBlast.java
index e9db9a631..e51134cb3 100644
--- a/src/main/java/com/hbm/entity/logic/EntityDeathBlast.java
+++ b/src/main/java/com/hbm/entity/logic/EntityDeathBlast.java
@@ -1,11 +1,17 @@
 package com.hbm.entity.logic;
 
-import com.hbm.explosion.ExplosionLarge;
+import com.hbm.entity.projectile.EntityBulletBase;
+import com.hbm.explosion.ExplosionNT;
+import com.hbm.handler.BulletConfigSyncingUtil;
+import com.hbm.packet.AuxParticlePacketNT;
+import com.hbm.packet.PacketDispatcher;
 
+import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
 import net.minecraft.entity.Entity;
 import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.Vec3;
 import net.minecraft.world.World;
 
 public class EntityDeathBlast extends Entity {
@@ -31,8 +37,36 @@ public class EntityDeathBlast extends Entity {
 		
 		if(this.ticksExisted >= maxAge && !worldObj.isRemote) {
 			this.setDead();
-    		
-    		ExplosionLarge.explodeFire(worldObj, posX, posY, posZ, 25, true, true, true);
+
+			/*new ExplosionNT(worldObj, null, posX, posY, posZ, 35).addAllAttrib(ExplosionNT.nukeAttribs).explode();
+			new ExplosionNT(worldObj, null, posX + 10, posY, posZ, 20).addAllAttrib(ExplosionNT.nukeAttribs).explode();
+			new ExplosionNT(worldObj, null, posX - 10, posY, posZ, 20).addAllAttrib(ExplosionNT.nukeAttribs).explode();
+			new ExplosionNT(worldObj, null, posX, posY, posZ + 10, 20).addAllAttrib(ExplosionNT.nukeAttribs).explode();
+			new ExplosionNT(worldObj, null, posX, posY, posZ - 10, 20).addAllAttrib(ExplosionNT.nukeAttribs).explode();
+			
+			for(int k = 1; k < 6; k++)
+				new ExplosionNT(worldObj, null, posX, posY - k * 7, posZ, 20).addAllAttrib(ExplosionNT.nukeAttribs).explode();*/
+			
+			worldObj.spawnEntityInWorld(EntityNukeExplosionMK4.statFacNoRad(worldObj, 40, posX, posY, posZ).mute());
+			
+			int count = 100;
+			for(int i = 0; i < count; i++) {
+				
+				Vec3 vec = Vec3.createVectorHelper(0.2, 0, 0);
+				vec.rotateAroundY((float)(2 * Math.PI * i / (float)count));
+				
+				EntityBulletBase laser = new EntityBulletBase(worldObj, BulletConfigSyncingUtil.MASKMAN_BOLT);
+				laser.setPosition(posX, posY + 2, posZ);
+				laser.motionX = vec.xCoord;
+				laser.motionZ = vec.zCoord;
+				laser.motionY = -0.01;
+				worldObj.spawnEntityInWorld(laser);
+			}
+			
+			NBTTagCompound data = new NBTTagCompound();
+			data.setString("type", "muke");
+			PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, posX, posY + 0.5, posZ), new TargetPoint(worldObj.provider.dimensionId, posX, posY, posZ, 250));
+			worldObj.playSoundEffect(posX, posY, posZ, "hbm:weapon.mukeExplosion", 25.0F, 0.9F);
 		}
 	}
 
diff --git a/src/main/java/com/hbm/handler/EntityEffectHandler.java b/src/main/java/com/hbm/handler/EntityEffectHandler.java
new file mode 100644
index 000000000..bc93d2745
--- /dev/null
+++ b/src/main/java/com/hbm/handler/EntityEffectHandler.java
@@ -0,0 +1,90 @@
+package com.hbm.handler;
+
+import com.hbm.config.RadiationConfig;
+import com.hbm.extprop.HbmLivingProps;
+import com.hbm.packet.AuxParticlePacketNT;
+import com.hbm.packet.PacketDispatcher;
+import com.hbm.packet.ExtPropPacket;
+import com.hbm.saveddata.AuxSavedData;
+import com.hbm.saveddata.RadiationSavedData;
+import com.hbm.util.ContaminationUtil;
+
+import cpw.mods.fml.common.network.NetworkRegistry.TargetPoint;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.MathHelper;
+import net.minecraft.world.World;
+import net.minecraft.world.chunk.Chunk;
+
+public class EntityEffectHandler {
+
+	public static void onUpdate(EntityLivingBase entity) {
+		
+		if(!entity.worldObj.isRemote && entity instanceof EntityPlayerMP) {
+			NBTTagCompound data = new NBTTagCompound();
+			HbmLivingProps props = HbmLivingProps.getData(entity);
+			props.saveNBTData(data);
+			PacketDispatcher.wrapper.sendTo(new ExtPropPacket(data), (EntityPlayerMP) entity);
+		}
+		
+		if(HbmLivingProps.getRadiation(entity) > 0)
+			handleRadiation(entity);
+		
+		if(HbmLivingProps.getDigamma(entity) > 0)
+			handleDigamma(entity);
+	}
+	
+	private static void handleRadiation(EntityLivingBase entity) {
+		
+		World world = entity.worldObj;
+		
+		if(world.isRemote)
+			return;
+		
+		if(entity instanceof EntityPlayer && ((EntityPlayer)entity).capabilities.isCreativeMode)
+			return;
+
+		RadiationSavedData data = RadiationSavedData.getData(world);
+		int ix = (int)MathHelper.floor_double(entity.posX);
+		int iy = (int)MathHelper.floor_double(entity.posY);
+		int iz = (int)MathHelper.floor_double(entity.posZ);
+
+		if(world.getTotalWorldTime() % 20 == 0) {
+
+			Chunk chunk = world.getChunkFromBlockCoords(ix, iz);
+			float rad = data.getRadNumFromCoord(chunk.xPosition, chunk.zPosition);
+			
+			if(world.provider.isHellWorld && RadiationConfig.hellRad > 0 && rad < RadiationConfig.hellRad)
+				rad = RadiationConfig.hellRad;
+			
+			if(rad > 0) {
+				ContaminationUtil.applyRadData(entity, rad);
+			}
+			
+			if(entity.worldObj.isRaining() && RadiationConfig.cont > 0 && AuxSavedData.getThunder(entity.worldObj) > 0 && entity.worldObj.canBlockSeeTheSky(ix, iy, iz)) {
+
+				ContaminationUtil.applyRadData(entity, RadiationConfig.cont * 0.01F);
+			}
+		}
+	}
+	
+	private static void handleDigamma(EntityLivingBase entity) {
+		
+		if(!entity.worldObj.isRemote) {
+			
+			float digamma = HbmLivingProps.getDigamma(entity);
+			
+			int chance = Math.max(10 - (int)(digamma), 1);
+			
+			if(chance == 1 || entity.getRNG().nextInt(chance) == 0) {
+				
+				NBTTagCompound data = new NBTTagCompound();
+				data.setString("type", "digammaDecay");
+				data.setInteger("entity", entity.getEntityId());
+				PacketDispatcher.wrapper.sendToAllAround(new AuxParticlePacketNT(data, 0, 0, 0),  new TargetPoint(entity.dimension, entity.posX, entity.posY, entity.posZ, 25));
+			}
+		}
+	}
+}
diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java
index b91acc327..d3cb36366 100644
--- a/src/main/java/com/hbm/main/ClientProxy.java
+++ b/src/main/java/com/hbm/main/ClientProxy.java
@@ -12,7 +12,9 @@ import net.minecraft.client.particle.EntityReddustFX;
 import net.minecraft.client.renderer.entity.RenderSnowball;
 import net.minecraft.client.renderer.texture.TextureManager;
 import net.minecraft.entity.Entity;
+import net.minecraft.entity.EntityLivingBase;
 import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
 import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.MovingObjectPosition;
@@ -1051,29 +1053,25 @@ public class ClientProxy extends ServerProxy {
 			player.attackedAtYaw = 0F;
 		}
 		
-		if("hadron".equals(type)) {
+		if("digammaDecay".equals(type)) {
 			
-			/*for(int i = 0; i < 30; i++) {
-				
-				EntityFX fx = null;
+			Entity e = world.getEntityByID(data.getInteger("entity"));
+			
+			if(e instanceof EntityLivingBase) {
 
-				if(i % 3 == 0) {
-					fx = new net.minecraft.client.particle.EntityReddustFX(world, x, y, z, 0.0F, 0.0F, 0.0F);
-				}
-				if(i % 3 == 1) {
-					fx = new net.minecraft.client.particle.EntityReddustFX(world, x, y, z, 0.01F, 0.01F, 1F);
-				}
-				if(i % 3 == 2) {
-					fx = new net.minecraft.client.particle.EntityReddustFX(world, x, y, z, 1F, 1F, 0.1F);
-				}
+				double ix = e.boundingBox.minX - 0.2 + (e.boundingBox.maxX - e.boundingBox.minX + 0.4) * rand.nextDouble();
+				double iy = e.boundingBox.minY + (e.boundingBox.maxY - e.boundingBox.minY + 0.2) * rand.nextDouble();
+				double iz = e.boundingBox.minZ - 0.2 + (e.boundingBox.maxZ - e.boundingBox.minZ + 0.4) * rand.nextDouble();
 				
-				if(fx != null) {
-					fx.motionX = rand.nextGaussian() * 0.1;
-					fx.motionY = rand.nextGaussian() * 0.1;
-					fx.motionZ = rand.nextGaussian() * 0.1;
-					Minecraft.getMinecraft().effectRenderer.addEffect(fx);
-				}
-			}*/
+				
+				EntityFX fx = new net.minecraft.client.particle.EntityBlockDustFX(world, ix, iy, iz, 0, 0, 0, Blocks.soul_sand, 0);
+				ReflectionHelper.setPrivateValue(EntityFX.class, fx, 150 + rand.nextInt(50), "particleMaxAge", "field_70547_e");
+				
+				Minecraft.getMinecraft().effectRenderer.addEffect(fx);
+			}
+		}
+		
+		if("hadron".equals(type)) {
 			
 			Minecraft.getMinecraft().effectRenderer.addEffect(new ParticleHadron(man, world, x, y, z));
 		}
diff --git a/src/main/java/com/hbm/main/ModEventHandler.java b/src/main/java/com/hbm/main/ModEventHandler.java
index 2e55db96b..fca62bd13 100644
--- a/src/main/java/com/hbm/main/ModEventHandler.java
+++ b/src/main/java/com/hbm/main/ModEventHandler.java
@@ -28,6 +28,7 @@ import com.hbm.entity.projectile.EntityMeteor;
 import com.hbm.extprop.HbmLivingProps;
 import com.hbm.extprop.HbmPlayerProps;
 import com.hbm.handler.BossSpawnHandler;
+import com.hbm.handler.EntityEffectHandler;
 import com.hbm.handler.RadiationWorldHandler;
 import com.hbm.handler.HTTPHandler;
 import com.hbm.items.ModItems;
@@ -39,7 +40,7 @@ import com.hbm.lib.ModDamageSource;
 import com.hbm.lib.RefStrings;
 import com.hbm.packet.PacketDispatcher;
 import com.hbm.packet.PlayerInformPacket;
-import com.hbm.packet.RadSurveyPacket;
+import com.hbm.packet.ExtPropPacket;
 import com.hbm.saveddata.AuxSavedData;
 import com.hbm.saveddata.RadiationSavedData;
 import com.hbm.util.ArmorUtil;
@@ -91,6 +92,7 @@ import net.minecraftforge.event.entity.EntityJoinWorldEvent;
 import net.minecraftforge.event.entity.living.LivingAttackEvent;
 import net.minecraftforge.event.entity.living.LivingDeathEvent;
 import net.minecraftforge.event.entity.living.LivingEvent.LivingJumpEvent;
+import net.minecraftforge.event.entity.living.LivingEvent.LivingUpdateEvent;
 import net.minecraftforge.event.entity.living.LivingFallEvent;
 import net.minecraftforge.event.entity.living.LivingHurtEvent;
 import net.minecraftforge.event.entity.living.LivingSpawnEvent;
@@ -222,6 +224,11 @@ public class ModEventHandler
 		}
 	}
 	
+	@SubscribeEvent
+	public void onLivingUpdate(LivingUpdateEvent event) {
+		EntityEffectHandler.onUpdate(event.entityLiving);
+	}
+	
 	@SubscribeEvent
 	public void worldTick(WorldTickEvent event) {
 		
@@ -281,15 +288,6 @@ public class ModEventHandler
 					data.worldObj = event.world;
 				}
 				
-				for(Object o : event.world.playerEntities) {
-					
-					if(o instanceof EntityPlayerMP) {
-						EntityPlayerMP player = (EntityPlayerMP)o;
-						//TODO: replace with packet that sends all to-sync data
-						PacketDispatcher.wrapper.sendTo(new RadSurveyPacket(HbmLivingProps.getRadiation(player)), player);
-					}
-				}
-				
 				if(event.world.getTotalWorldTime() % 20 == 0 && event.phase == Phase.START) {
 					data.updateSystem();
 				}
@@ -297,6 +295,10 @@ public class ModEventHandler
 				List<Object> oList = new ArrayList<Object>();
 				oList.addAll(event.world.loadedEntityList);
 				
+				
+				/**
+				 *  REMOVE THIS V V V
+				 */
 				for(Object e : oList) {
 					if(e instanceof EntityLivingBase) {
 						
@@ -305,25 +307,6 @@ public class ModEventHandler
 						
 						if(entity instanceof EntityPlayer && ((EntityPlayer)entity).capabilities.isCreativeMode)
 							continue;
-
-						if(event.world.getTotalWorldTime() % 20 == 0) {
-
-							Chunk chunk = entity.worldObj.getChunkFromBlockCoords((int)entity.posX, (int)entity.posZ);
-							float rad = data.getRadNumFromCoord(chunk.xPosition, chunk.zPosition);
-							
-							if(event.world.provider.isHellWorld && RadiationConfig.hellRad > 0 && rad < RadiationConfig.hellRad)
-								rad = RadiationConfig.hellRad;
-							
-							if(rad > 0) {
-								ContaminationUtil.applyRadData(entity, rad / 2);
-							}
-							
-							if(entity.worldObj.isRaining() && RadiationConfig.cont > 0 && AuxSavedData.getThunder(entity.worldObj) > 0 &&
-									entity.worldObj.canBlockSeeTheSky(MathHelper.floor_double(entity.posX), MathHelper.floor_double(entity.posY), MathHelper.floor_double(entity.posZ))) {
-
-								ContaminationUtil.applyRadData(entity, RadiationConfig.cont * 0.005F);
-							}
-						}
 						
 						float eRad = HbmLivingProps.getRadiation(entity);
 						
@@ -445,6 +428,9 @@ public class ModEventHandler
 						}
 					}
 				}
+				/**
+				 * REMOVE THIS ^ ^ ^
+				 */
 			}
 		}
 		/// RADIATION STUFF END ///
diff --git a/src/main/java/com/hbm/packet/ExtPropPacket.java b/src/main/java/com/hbm/packet/ExtPropPacket.java
new file mode 100644
index 000000000..aaf18e370
--- /dev/null
+++ b/src/main/java/com/hbm/packet/ExtPropPacket.java
@@ -0,0 +1,76 @@
+package com.hbm.packet;
+
+import java.io.IOException;
+
+import com.hbm.extprop.HbmLivingProps;
+
+import cpw.mods.fml.common.network.simpleimpl.IMessage;
+import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
+import cpw.mods.fml.common.network.simpleimpl.MessageContext;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import net.minecraft.client.Minecraft;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.network.PacketBuffer;
+
+public class ExtPropPacket implements IMessage {
+	
+	PacketBuffer buffer;
+
+	public ExtPropPacket() { }
+
+	public ExtPropPacket(NBTTagCompound nbt) {
+		
+		this.buffer = new PacketBuffer(Unpooled.buffer());
+		
+		try {
+			buffer.writeNBTTagCompoundToBuffer(nbt);
+			
+		} catch (IOException e) {
+			e.printStackTrace();
+		}
+	}
+
+	@Override
+	public void fromBytes(ByteBuf buf) {
+		
+		if (buffer == null) {
+			buffer = new PacketBuffer(Unpooled.buffer());
+		}
+		buffer.writeBytes(buf);
+	}
+
+	@Override
+	public void toBytes(ByteBuf buf) {
+		
+		if (buffer == null) {
+			buffer = new PacketBuffer(Unpooled.buffer());
+		}
+		buf.writeBytes(buffer);
+	}
+
+	public static class Handler implements IMessageHandler<ExtPropPacket, IMessage> {
+		
+		@Override
+		@SideOnly(Side.CLIENT)
+		public IMessage onMessage(ExtPropPacket m, MessageContext ctx) {
+			
+			if(Minecraft.getMinecraft().theWorld == null)
+				return null;
+			
+			try {
+				
+				NBTTagCompound nbt = m.buffer.readNBTTagCompoundFromBuffer();
+				HbmLivingProps props = HbmLivingProps.getData(Minecraft.getMinecraft().thePlayer);
+				props.loadNBTData(nbt);
+				
+			} catch (IOException e) {
+				e.printStackTrace();
+			}
+			
+			return null;
+		}
+	}
+}
diff --git a/src/main/java/com/hbm/packet/PacketDispatcher.java b/src/main/java/com/hbm/packet/PacketDispatcher.java
index 24f4ef011..b60994331 100644
--- a/src/main/java/com/hbm/packet/PacketDispatcher.java
+++ b/src/main/java/com/hbm/packet/PacketDispatcher.java
@@ -70,7 +70,7 @@ public class PacketDispatcher {
 		//Packet to send block break particles
 		wrapper.registerMessage(ParticleBurstPacket.Handler.class, ParticleBurstPacket.class, i++, Side.CLIENT);
 		//Packet to send chunk radiation info to individual players
-		wrapper.registerMessage(RadSurveyPacket.Handler.class, RadSurveyPacket.class, i++, Side.CLIENT);
+		wrapper.registerMessage(ExtPropPacket.Handler.class, ExtPropPacket.class, i++, Side.CLIENT);
 		//Entity sound packet that keeps client and server separated
 		wrapper.registerMessage(LoopedEntitySoundPacket.Handler.class, LoopedEntitySoundPacket.class, i++, Side.CLIENT);
 		//Entity sound packet that keeps client and server separated
diff --git a/src/main/java/com/hbm/packet/RadSurveyPacket.java b/src/main/java/com/hbm/packet/RadSurveyPacket.java
deleted file mode 100644
index 932db6588..000000000
--- a/src/main/java/com/hbm/packet/RadSurveyPacket.java
+++ /dev/null
@@ -1,54 +0,0 @@
-package com.hbm.packet;
-
-import com.hbm.extprop.HbmLivingProps;
-
-import cpw.mods.fml.common.network.simpleimpl.IMessage;
-import cpw.mods.fml.common.network.simpleimpl.IMessageHandler;
-import cpw.mods.fml.common.network.simpleimpl.MessageContext;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
-import io.netty.buffer.ByteBuf;
-import net.minecraft.client.Minecraft;
-import net.minecraft.entity.player.EntityPlayer;
-
-public class RadSurveyPacket implements IMessage {
-
-	float rad;
-
-	public RadSurveyPacket()
-	{
-		
-	}
-
-	public RadSurveyPacket(float rad)
-	{
-		this.rad = rad;
-	}
-
-	@Override
-	public void fromBytes(ByteBuf buf) {
-		
-		rad = buf.readFloat();
-	}
-
-	@Override
-	public void toBytes(ByteBuf buf) {
-		
-		buf.writeFloat(rad);
-	}
-
-	public static class Handler implements IMessageHandler<RadSurveyPacket, IMessage> {
-		
-		@Override
-		@SideOnly(Side.CLIENT)
-		public IMessage onMessage(RadSurveyPacket m, MessageContext ctx) {
-			try {
-				
-				EntityPlayer player = Minecraft.getMinecraft().thePlayer;
-				HbmLivingProps.setRadiation(player, m.rad);
-				
-			} catch (Exception x) { }
-			return null;
-		}
-	}
-}
diff --git a/src/main/java/com/hbm/render/block/RenderConveyor.java b/src/main/java/com/hbm/render/block/RenderConveyor.java
index 58dc66c81..bdb915666 100644
--- a/src/main/java/com/hbm/render/block/RenderConveyor.java
+++ b/src/main/java/com/hbm/render/block/RenderConveyor.java
@@ -41,30 +41,23 @@ public class RenderConveyor implements ISimpleBlockRenderingHandler {
 	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));
+        int meta = 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;
-        }
-        
-        float rotation = 0;
-        
-        if(world.getBlockMetadata(x, y, z) == 3)
-        	rotation = 180F / 180F * (float)Math.PI;
-        
-        if(world.getBlockMetadata(x, y, z) == 4)
-        	rotation = 90F / 180F * (float)Math.PI;
-        
-        if(world.getBlockMetadata(x, y, z) == 5)
-        	rotation = 270F / 180F * (float)Math.PI;
-        
-        tessellator.addTranslation(x + 0.5F, y, z + 0.5F);
-        ObjUtil.renderWithIcon((WavefrontObject) ResourceManager.arrow, iicon, tessellator, rotation, true);
-        tessellator.addTranslation(-x - 0.5F, -y, -z - 0.5F);
+		if(meta == 2)
+			renderer.uvRotateTop = 3;
+		if(meta == 3)
+			renderer.uvRotateTop = 0;
+		if(meta == 4)
+			renderer.uvRotateTop = 1;
+		if(meta == 5)
+			renderer.uvRotateTop = 2;
+		
+        renderer.setRenderBounds((double)0, 0.0D, (double)0, (double)1, 0.125D, (double)1);
+        renderer.renderStandardBlock(block, x, y, z);
+        renderer.uvRotateTop = 0;
         
 		return true;
 	}
diff --git a/src/main/java/com/hbm/render/model/ModelArmorDigamma.java b/src/main/java/com/hbm/render/model/ModelArmorDigamma.java
index d4e808b89..6410a0333 100644
--- a/src/main/java/com/hbm/render/model/ModelArmorDigamma.java
+++ b/src/main/java/com/hbm/render/model/ModelArmorDigamma.java
@@ -6,6 +6,7 @@ import com.hbm.main.ResourceManager;
 import com.hbm.render.loader.ModelRendererObj;
 
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.entity.Entity;
 
 public class ModelArmorDigamma extends ModelArmorBase {
@@ -43,6 +44,8 @@ public class ModelArmorDigamma extends ModelArmorBase {
 		if(type == 1) {
 			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.fau_chest);
 			body.render(par7);
+	        GL11.glEnable(GL11.GL_BLEND);
+	        OpenGlHelper.glBlendFunc(770, 771, 1, 0);
 			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.fau_cassette);
 			cassette.render(par7);
 			Minecraft.getMinecraft().renderEngine.bindTexture(ResourceManager.fau_arm);