From a6e047467cf6d2639c6911df9e0f16e1af42471e Mon Sep 17 00:00:00 2001 From: Bob Date: Mon, 7 Sep 2020 22:52:02 +0200 Subject: [PATCH] cyclotron texture, more ammo type textures --- .../textures/items/ammo_4gauge_canister.png | Bin 0 -> 393 bytes .../textures/items/ammo_rocket_balefire.png | Bin 0 -> 299 bytes .../textures/items/ammo_rocket_canister.png | Bin 0 -> 277 bytes .../textures/models/machines/cyclotron.png | Bin 1175 -> 3933 bytes .../hbm/handler/guncfg/Gun4GaugeFactory.java | 8 +++++++- 5 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 src/main/java/assets/hbm/textures/items/ammo_4gauge_canister.png create mode 100644 src/main/java/assets/hbm/textures/items/ammo_rocket_balefire.png create mode 100644 src/main/java/assets/hbm/textures/items/ammo_rocket_canister.png diff --git a/src/main/java/assets/hbm/textures/items/ammo_4gauge_canister.png b/src/main/java/assets/hbm/textures/items/ammo_4gauge_canister.png new file mode 100644 index 0000000000000000000000000000000000000000..58b184c3efc5bec3b5b0a395beb649d62391cc91 GIT binary patch literal 393 zcmV;40e1e0P)Ns+9sy8Z-mVVb$~eViHKKb|p$McpzR0lQf#nn4f%0Maxq z2IZV20{HsN){5qKy9EFQL4Z!DgL7#jfMN_H;PBrV!|`~`>2ylx9J4H==XsS9KJVdL z)xc)6K^TT;G#U_*6N$W|dc7irh_Kh|QAD_!v^g63SC6~5i?G>j?qDuoE=nq+hzLL5 z?(yK?0RX&~kM(?puh|lddLM(qV8>P7fTVn+KL7x%=QDUMAB%b)-EJ3g9N)Im(<3+< z`dm%gR8^8>p67JV@mRuAok&!b)>>L?Ns@6K(>X^~IGD#99NkVHaRh4<3AHWv{ nWl53b7{2M1C4Yv?lH=YtW`Nd6Jv^1q00000NkvXXu0mjfFGHxF literal 0 HcmV?d00001 diff --git a/src/main/java/assets/hbm/textures/items/ammo_rocket_balefire.png b/src/main/java/assets/hbm/textures/items/ammo_rocket_balefire.png new file mode 100644 index 0000000000000000000000000000000000000000..a5a42216a73da801117a773a5487b88f3e4b0174 GIT binary patch literal 299 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 S>qTHm!{F)a=d#Wzp$PyN75I_> diff --git a/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java b/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java index 75b03ab5d..d669ad7ef 100644 --- a/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java +++ b/src/main/java/com/hbm/handler/guncfg/Gun4GaugeFactory.java @@ -242,13 +242,16 @@ public class Gun4GaugeFactory { @Override public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { + if(bullet.worldObj.isRemote) + return; + ExplosionNT explosion = new ExplosionNT(bullet.worldObj, null, bullet.posX, bullet.posY, bullet.posZ, 4); explosion.atttributes.add(ExAttrib.ALLDROP); explosion.atttributes.add(ExAttrib.NOHURT); explosion.doExplosionA(); explosion.doExplosionB(false); - ExplosionLarge.spawnParticles(bullet.worldObj, bullet.posX, bullet.posY, bullet.posZ, 5); + ExplosionLarge.spawnParticles(bullet.worldObj, bullet.posX, bullet.posY, bullet.posZ, 15); } }; @@ -273,6 +276,9 @@ public class Gun4GaugeFactory { @Override public void behaveBlockHit(EntityBulletBase bullet, int x, int y, int z) { + if(bullet.worldObj.isRemote) + return; + ExplosionNT explosion = new ExplosionNT(bullet.worldObj, null, bullet.posX, bullet.posY, bullet.posZ, 6); explosion.atttributes.add(ExAttrib.BALEFIRE); explosion.doExplosionA();