From 3520ba51878ea1af7e22916e3c4dab553fbcf019 Mon Sep 17 00:00:00 2001 From: Bob Date: Sat, 11 Apr 2026 20:15:41 +0200 Subject: [PATCH] total grenade death --- .../com/hbm/blocks/generic/BlockCrate.java | 12 +- .../com/hbm/crafting/ConsumableRecipes.java | 4 +- .../java/com/hbm/crafting/WeaponRecipes.java | 70 ++--- .../java/com/hbm/entity/EntityMappings.java | 44 +-- .../entity/grenade/EntityGrenadeASchrab.java | 43 --- .../grenade/EntityGrenadeBlackHole.java | 52 ---- .../grenade/EntityGrenadeBouncyGeneric.java | 2 +- .../entity/grenade/EntityGrenadeBreach.java | 35 --- .../entity/grenade/EntityGrenadeBurst.java | 57 ---- .../entity/grenade/EntityGrenadeCloud.java | 32 --- .../entity/grenade/EntityGrenadeCluster.java | 47 ---- .../entity/grenade/EntityGrenadeDynamite.java | 35 --- .../entity/grenade/EntityGrenadeElectric.java | 48 ---- .../hbm/entity/grenade/EntityGrenadeFire.java | 52 ---- .../entity/grenade/EntityGrenadeFlare.java | 44 --- .../hbm/entity/grenade/EntityGrenadeFrag.java | 59 ---- .../hbm/entity/grenade/EntityGrenadeGas.java | 53 ---- .../entity/grenade/EntityGrenadeGascan.java | 29 -- .../entity/grenade/EntityGrenadeGeneric.java | 43 --- .../entity/grenade/EntityGrenadeIFBouncy.java | 48 ---- .../grenade/EntityGrenadeIFBrimstone.java | 96 ------- .../grenade/EntityGrenadeIFConcussion.java | 46 ---- .../grenade/EntityGrenadeIFGeneric.java | 48 ---- .../hbm/entity/grenade/EntityGrenadeIFHE.java | 48 ---- .../grenade/EntityGrenadeIFHopwire.java | 51 ---- .../entity/grenade/EntityGrenadeIFImpact.java | 35 --- .../grenade/EntityGrenadeIFIncendiary.java | 53 ---- .../grenade/EntityGrenadeIFMystery.java | 49 ---- .../entity/grenade/EntityGrenadeIFNull.java | 66 ----- .../entity/grenade/EntityGrenadeIFSpark.java | 51 ---- .../entity/grenade/EntityGrenadeIFSticky.java | 48 ---- .../entity/grenade/EntityGrenadeIFToxic.java | 52 ---- .../grenade/EntityGrenadeImpactGeneric.java | 2 +- .../entity/grenade/EntityGrenadeLemon.java | 46 ---- .../hbm/entity/grenade/EntityGrenadeMIRV.java | 58 ---- .../hbm/entity/grenade/EntityGrenadeMk2.java | 43 --- .../entity/grenade/EntityGrenadeNuclear.java | 43 --- .../hbm/entity/grenade/EntityGrenadeNuke.java | 30 -- .../hbm/entity/grenade/EntityGrenadePC.java | 32 --- .../entity/grenade/EntityGrenadePlasma.java | 43 --- .../entity/grenade/EntityGrenadePoison.java | 44 --- .../entity/grenade/EntityGrenadePulse.java | 48 ---- .../grenade/EntityGrenadeSchrabidium.java | 44 --- .../entity/grenade/EntityGrenadeShrapnel.java | 47 ---- .../entity/grenade/EntityGrenadeSmart.java | 41 --- .../entity/grenade/EntityGrenadeStrong.java | 42 --- .../hbm/entity/grenade/EntityGrenadeTau.java | 43 --- .../hbm/entity/grenade/EntityGrenadeZOMG.java | 62 ----- .../entity/missile/EntityMissileTier0.java | 2 +- .../com/hbm/entity/mob/EntityFBIDrone.java | 9 +- ...yExplosiveBeam.java => EntityB92Beam.java} | 34 +-- .../hbm/entity/projectile/EntityBullet.java | 27 +- .../com/hbm/explosion/ExplosionChaos.java | 48 ---- .../hbm/explosion/ExplosionNukeGeneric.java | 8 +- .../com/hbm/handler/BobmazonOfferFactory.java | 1 - .../hbm/handler/DispenserBehaviorHandler.java | 7 +- .../recipes/AssemblyMachineRecipes.java | 28 +- .../com/hbm/itempool/ItemPoolsLegacy.java | 13 +- .../java/com/hbm/itempool/ItemPoolsPile.java | 8 +- .../com/hbm/itempool/ItemPoolsSingle.java | 17 +- src/main/java/com/hbm/items/ModItems.java | 142 +--------- .../com/hbm/items/special/ItemStarterKit.java | 33 --- .../java/com/hbm/items/weapon/GunB92.java | 6 +- .../com/hbm/items/weapon/ItemGrenade.java | 260 ------------------ .../hbm/items/weapon/ItemGrenadeDynamite.java | 25 ++ .../weapon/grenade/ItemGrenadeFilling.java | 37 ++- src/main/java/com/hbm/main/ClientProxy.java | 45 +-- .../java/com/hbm/main/CraftingManager.java | 2 - src/main/java/com/hbm/main/MainRegistry.java | 44 +++ .../java/com/hbm/main/ResourceManager.java | 4 - .../entity/projectile/RenderGrenade.java | 57 ---- src/main/resources/assets/hbm/lang/de_DE.lang | 69 ++--- src/main/resources/assets/hbm/lang/en_US.lang | 70 ++--- .../hbm/textures/items/grenade_aschrab.png | Bin 376 -> 0 bytes .../hbm/textures/items/grenade_black_hole.png | Bin 269 -> 0 bytes .../hbm/textures/items/grenade_breach.png | Bin 322 -> 0 bytes .../hbm/textures/items/grenade_burst.png | Bin 387 -> 0 bytes .../hbm/textures/items/grenade_cloud.png | Bin 344 -> 0 bytes .../textures/items/grenade_cluster_alt.png | Bin 293 -> 0 bytes .../textures/items/grenade_electric_alt.png | Bin 285 -> 0 bytes .../items/grenade_extra.frag_sleeve.png | Bin 0 -> 228 bytes .../hbm/textures/items/grenade_extra.glue.png | Bin 0 -> 312 bytes .../items/grenade_extra.proxy_fuze.png | Bin 0 -> 356 bytes .../textures/items/grenade_extra.triplex.png | Bin 0 -> 215 bytes .../items/grenade_filling.cluster_heavy.png | Bin 0 -> 308 bytes .../textures/items/grenade_filling.emp.png | Bin 0 -> 196 bytes .../textures/items/grenade_filling.inc.png | Bin 375 -> 378 bytes .../textures/items/grenade_filling.laser.png | Bin 0 -> 197 bytes .../textures/items/grenade_filling.plasma.png | Bin 0 -> 195 bytes .../hbm/textures/items/grenade_filling.wp.png | Bin 0 -> 375 bytes .../hbm/textures/items/grenade_fire_alt.png | Bin 261 -> 0 bytes .../hbm/textures/items/grenade_flare_alt.png | Bin 284 -> 0 bytes .../hbm/textures/items/grenade_frag_alt.png | Bin 313 -> 0 bytes .../hbm/textures/items/grenade_gas_alt.png | Bin 276 -> 0 bytes .../hbm/textures/items/grenade_gascan.png | Bin 278 -> 0 bytes .../hbm/textures/items/grenade_generic.png | Bin 319 -> 0 bytes .../hbm/textures/items/grenade_if_antioch.png | Bin 326 -> 0 bytes .../textures/items/grenade_if_antioch_alt.png | Bin 341 -> 0 bytes .../hbm/textures/items/grenade_if_bouncy.png | Bin 315 -> 0 bytes .../textures/items/grenade_if_brimstone.png | Bin 299 -> 0 bytes .../textures/items/grenade_if_concussion.png | Bin 321 -> 0 bytes .../hbm/textures/items/grenade_if_generic.png | Bin 308 -> 0 bytes .../hbm/textures/items/grenade_if_he.png | Bin 313 -> 0 bytes .../hbm/textures/items/grenade_if_hopwire.png | Bin 314 -> 0 bytes .../hbm/textures/items/grenade_if_impact.png | Bin 297 -> 0 bytes .../textures/items/grenade_if_incendiary.png | Bin 317 -> 0 bytes .../hbm/textures/items/grenade_if_mystery.png | Bin 322 -> 0 bytes .../hbm/textures/items/grenade_if_null.png | Bin 326 -> 0 bytes .../hbm/textures/items/grenade_if_spark.png | Bin 320 -> 0 bytes .../hbm/textures/items/grenade_if_sticky.png | Bin 324 -> 0 bytes .../hbm/textures/items/grenade_if_toxic.png | Bin 322 -> 0 bytes .../hbm/textures/items/grenade_ironshod.png | Bin 320 -> 0 bytes .../textures/items/grenade_ironshod_base.png | Bin 228 -> 0 bytes .../items/grenade_ironshod_overlay.png | Bin 195 -> 0 bytes .../assets/hbm/textures/items/grenade_kit.png | Bin 284 -> 0 bytes .../hbm/textures/items/grenade_kyiv.png | Bin 516 -> 0 bytes .../textures/items/grenade_kyiv.png.mcmeta | 3 - .../hbm/textures/items/grenade_lemon.png | Bin 336 -> 0 bytes .../hbm/textures/items/grenade_mirv.png | Bin 371 -> 0 bytes .../assets/hbm/textures/items/grenade_mk2.png | Bin 304 -> 0 bytes .../hbm/textures/items/grenade_mk2_alt.png | Bin 295 -> 0 bytes .../hbm/textures/items/grenade_nuclear.png | Bin 356 -> 0 bytes .../hbm/textures/items/grenade_nuke_alt.png | Bin 289 -> 0 bytes .../hbm/textures/items/grenade_pink_cloud.png | Bin 370 -> 0 bytes .../hbm/textures/items/grenade_plasma_alt.png | Bin 287 -> 0 bytes .../hbm/textures/items/grenade_poison_alt.png | Bin 274 -> 0 bytes .../hbm/textures/items/grenade_pulse.png | Bin 255 -> 0 bytes .../items/grenade_schrabidium_alt.png | Bin 282 -> 0 bytes .../hbm/textures/items/grenade_shrapnel.png | Bin 302 -> 0 bytes .../hbm/textures/items/grenade_smart.png | Bin 312 -> 0 bytes .../hbm/textures/items/grenade_strong.png | Bin 317 -> 0 bytes .../hbm/textures/items/grenade_tau_alt.png | Bin 290 -> 0 bytes .../hbm/textures/items/grenade_zomg.png | Bin 344 -> 0 bytes .../hbm/textures/items/pellet_cluster.png | Bin 283 -> 178 bytes 134 files changed, 242 insertions(+), 2877 deletions(-) delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeASchrab.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeBlackHole.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeBreach.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeBurst.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeCloud.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeCluster.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeDynamite.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeElectric.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeFire.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeFlare.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeFrag.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeGas.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeGascan.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeGeneric.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeIFBouncy.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeIFBrimstone.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeIFConcussion.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeIFGeneric.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeIFHE.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeIFHopwire.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeIFImpact.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeIFIncendiary.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeIFMystery.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeIFNull.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeIFSpark.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeIFSticky.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeIFToxic.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeLemon.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeMIRV.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeMk2.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeNuclear.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeNuke.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadePC.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadePlasma.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadePoison.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadePulse.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeSchrabidium.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeShrapnel.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeSmart.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeStrong.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeTau.java delete mode 100644 src/main/java/com/hbm/entity/grenade/EntityGrenadeZOMG.java rename src/main/java/com/hbm/entity/projectile/{EntityExplosiveBeam.java => EntityB92Beam.java} (90%) create mode 100644 src/main/java/com/hbm/items/weapon/ItemGrenadeDynamite.java delete mode 100644 src/main/java/com/hbm/render/entity/projectile/RenderGrenade.java delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_aschrab.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_black_hole.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_breach.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_burst.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_cloud.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_cluster_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_electric_alt.png create mode 100644 src/main/resources/assets/hbm/textures/items/grenade_extra.frag_sleeve.png create mode 100644 src/main/resources/assets/hbm/textures/items/grenade_extra.glue.png create mode 100644 src/main/resources/assets/hbm/textures/items/grenade_extra.proxy_fuze.png create mode 100644 src/main/resources/assets/hbm/textures/items/grenade_extra.triplex.png create mode 100644 src/main/resources/assets/hbm/textures/items/grenade_filling.cluster_heavy.png create mode 100644 src/main/resources/assets/hbm/textures/items/grenade_filling.emp.png create mode 100644 src/main/resources/assets/hbm/textures/items/grenade_filling.laser.png create mode 100644 src/main/resources/assets/hbm/textures/items/grenade_filling.plasma.png create mode 100644 src/main/resources/assets/hbm/textures/items/grenade_filling.wp.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_fire_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_flare_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_frag_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_gas_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_gascan.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_generic.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_if_antioch.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_if_antioch_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_if_bouncy.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_if_brimstone.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_if_concussion.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_if_generic.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_if_he.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_if_hopwire.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_if_impact.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_if_incendiary.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_if_mystery.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_if_null.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_if_spark.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_if_sticky.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_if_toxic.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_ironshod.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_ironshod_base.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_ironshod_overlay.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_kit.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_kyiv.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_kyiv.png.mcmeta delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_lemon.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_mirv.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_mk2.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_mk2_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_nuclear.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_nuke_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_pink_cloud.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_plasma_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_poison_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_pulse.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_schrabidium_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_shrapnel.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_smart.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_strong.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_tau_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/grenade_zomg.png diff --git a/src/main/java/com/hbm/blocks/generic/BlockCrate.java b/src/main/java/com/hbm/blocks/generic/BlockCrate.java index 6e948d05f..74aaff451 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockCrate.java +++ b/src/main/java/com/hbm/blocks/generic/BlockCrate.java @@ -6,6 +6,11 @@ import java.util.Random; import com.hbm.blocks.ModBlocks; import com.hbm.interfaces.Spaghetti; +import com.hbm.items.weapon.grenade.ItemGrenadeUniversal; +import com.hbm.items.weapon.grenade.ItemGrenadeExtra.EnumGrenadeExtra; +import com.hbm.items.weapon.grenade.ItemGrenadeFilling.EnumGrenadeFilling; +import com.hbm.items.weapon.grenade.ItemGrenadeFuze.EnumGrenadeFuze; +import com.hbm.items.weapon.grenade.ItemGrenadeShell.EnumGrenadeShell; import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmoSecret; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemBatteryPack.EnumBatteryPack; @@ -55,10 +60,9 @@ public class BlockCrate extends BlockFalling { // Supply Crate BlockCrate.addToListWithWeight(crateList, ModItems.syringe_metal_stimpak, 10); BlockCrate.addToListWithWeight(crateList, ModItems.syringe_antidote, 5); - BlockCrate.addToListWithWeight(crateList, ModItems.grenade_generic, 8); - BlockCrate.addToListWithWeight(crateList, ModItems.grenade_strong, 6); - BlockCrate.addToListWithWeight(crateList, ModItems.grenade_mk2, 4); - BlockCrate.addToListWithWeight(crateList, ModItems.grenade_flare, 4); + BlockCrate.addToListWithWeight(crateList, ItemGrenadeUniversal.make(EnumGrenadeShell.FRAG, EnumGrenadeFilling.HE, EnumGrenadeFuze.S3, EnumGrenadeExtra.FRAG_SLEEVE), 8); + BlockCrate.addToListWithWeight(crateList, ItemGrenadeUniversal.make(EnumGrenadeShell.STICK, EnumGrenadeFilling.HE, EnumGrenadeFuze.IMPACT), 6); + BlockCrate.addToListWithWeight(crateList, ItemGrenadeUniversal.make(EnumGrenadeShell.FRAG, EnumGrenadeFilling.INC, EnumGrenadeFuze.S7), 4); BlockCrate.addToListWithWeight(crateList, ModItems.ammo_container, 2); // Weapon Crate diff --git a/src/main/java/com/hbm/crafting/ConsumableRecipes.java b/src/main/java/com/hbm/crafting/ConsumableRecipes.java index d8fc7090b..3b48a9be2 100644 --- a/src/main/java/com/hbm/crafting/ConsumableRecipes.java +++ b/src/main/java/com/hbm/crafting/ConsumableRecipes.java @@ -6,6 +6,7 @@ import com.hbm.inventory.OreDictManager.DictFrame; import com.hbm.inventory.fluid.Fluids; import com.hbm.items.machine.ItemBatteryPack.EnumBatteryPack; import com.hbm.items.machine.ItemCircuit.EnumCircuitType; +import com.hbm.items.weapon.grenade.ItemGrenadeFilling.EnumGrenadeFilling; import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo; import com.hbm.items.ItemEnums; import com.hbm.items.ModItems; @@ -29,9 +30,8 @@ public class ConsumableRecipes { //Airstikes CraftingManager.addRecipeAuto(new ItemStack(ModItems.bomb_caller, 1, 0), new Object[] { "TTT", "TRT", "TTT", 'T', Blocks.tnt, 'R', ModItems.rangefinder }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.bomb_caller, 1, 1), new Object[] { "TTT", "TRT", "TTT", 'T', ModItems.grenade_gascan, 'R', ModItems.rangefinder }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.bomb_caller, 1, 1), new Object[] { "TTT", "TRT", "TTT", 'T', DictFrame.fromOne(ModItems.grenade_filling, EnumGrenadeFilling.INC), 'R', ModItems.rangefinder }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.bomb_caller, 1, 2), new Object[] { "TTT", "TRT", "TTT", 'T', ModItems.pellet_gas, 'R', ModItems.rangefinder }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.bomb_caller, 1, 3), new Object[] { "TRT", 'T', ModItems.grenade_cloud, 'R', ModItems.rangefinder }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.bomb_caller, 1, 4), new Object[] { "TRC", 'T', DictFrame.fromOne(ModItems.ammo_standard, EnumAmmo.NUKE_HIGH), 'R', ModItems.rangefinder, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CONTROLLER) }); //Food diff --git a/src/main/java/com/hbm/crafting/WeaponRecipes.java b/src/main/java/com/hbm/crafting/WeaponRecipes.java index 80f90ba8d..f0bbef47e 100644 --- a/src/main/java/com/hbm/crafting/WeaponRecipes.java +++ b/src/main/java/com/hbm/crafting/WeaponRecipes.java @@ -16,6 +16,10 @@ import com.hbm.items.machine.ItemBatteryPack.EnumBatteryPack; import com.hbm.items.machine.ItemCircuit.EnumCircuitType; import com.hbm.items.ModItems; import com.hbm.items.weapon.GunB92Cell; +import com.hbm.items.weapon.grenade.ItemGrenadeExtra.EnumGrenadeExtra; +import com.hbm.items.weapon.grenade.ItemGrenadeFilling.EnumGrenadeFilling; +import com.hbm.items.weapon.grenade.ItemGrenadeFuze.EnumGrenadeFuze; +import com.hbm.items.weapon.grenade.ItemGrenadeShell.EnumGrenadeShell; import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo; import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmoSecret; import com.hbm.items.weapon.sedna.factory.GunFactory.EnumModGeneric; @@ -24,7 +28,6 @@ import com.hbm.main.CraftingManager; import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; /** @@ -168,7 +171,7 @@ public class WeaponRecipes { //Missiles CraftingManager.addShapelessAuto(new ItemStack(ModItems.missile_taint, 1), new Object[] { ModItems.missile_assembly, ModItems.bucket_mud, ModItems.powder_spark_mix, ModItems.powder_magic }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.missile_micro, 1), new Object[] { ModItems.missile_assembly, ModItems.ducttape, DictFrame.fromOne(ModItems.ammo_standard, EnumAmmo.NUKE_HIGH) }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.missile_bhole, 1), new Object[] { ModItems.missile_assembly, ModItems.ducttape, ModItems.grenade_black_hole }); + CraftingManager.addShapelessAuto(new ItemStack(ModItems.missile_bhole, 1), new Object[] { ModItems.missile_assembly, ModItems.ducttape, ModItems.black_hole }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.missile_schrabidium, 1), new Object[] { ModItems.missile_assembly, ModItems.ducttape, ModItems.cell_anti_schrabidium, ANY_HARDPLASTIC.ingot() }); CraftingManager.addShapelessAuto(new ItemStack(ModItems.missile_emp, 1), new Object[] { ModItems.missile_assembly, ModItems.ducttape, ModBlocks.emp_bomb }); @@ -253,30 +256,31 @@ public class WeaponRecipes { CraftingManager.addRecipeAuto(ModItems.ammo_fireext.stackFromEnum(AmmoFireExt.SAND), new Object[] { "NNN", "NFN", "NNN", 'N', new ItemStack(ModBlocks.sand_mix, 1, EnumSandType.BORON.ordinal()), 'F', ModItems.ammo_fireext }); //Grenades - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_generic, 4), new Object[] { "RS ", "ITI", " I ", 'I', IRON.plate(), 'R', MINGRADE.wireFine(), 'S', STEEL.plate(), 'T', Item.getItemFromBlock(Blocks.tnt) }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_strong, 2), new Object[] { " G ", "SGS", " S ", 'G', ModItems.grenade_generic, 'S', Items.gunpowder }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_frag, 2), new Object[] { " G ", "WGW", " K ", 'G', ModItems.grenade_generic, 'W', KEY_PLANKS, 'K', Item.getItemFromBlock(Blocks.gravel) }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_poison, 2), new Object[] { " G ", "PGP", " P ", 'G', ModItems.grenade_generic, 'P', ModItems.powder_poison }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_gas, 2), new Object[] { " G ", "CGC", " C ", 'G', ModItems.grenade_generic, 'C', ModItems.pellet_gas }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_aschrab, 1), new Object[] {"RS ", "ITI", " S ", 'I', KEY_CLEARGLASS, 'R', MINGRADE.wireFine(), 'S', STEEL.plate(), 'T', ModItems.cell_anti_schrabidium }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_mk2, 2), new Object[] { " G ", "SGS", " S ", 'G', ModItems.grenade_strong, 'S', Items.gunpowder }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.grenade_gascan, 1), new Object[] { Fluids.DIESEL.getDict(1000), Items.flint }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.grenade_gascan, 1), new Object[] { Fluids.DIESEL_CRACK.getDict(1000), Items.flint }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.grenade_gascan, 1), new Object[] { Fluids.PETROIL.getDict(1000), Items.flint }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.grenade_gascan, 1), new Object[] { Fluids.PETROIL_LEADED.getDict(1000), Items.flint }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.grenade_gascan, 1), new Object[] { Fluids.GASOLINE.getDict(1000), Items.flint }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.grenade_gascan, 1), new Object[] { Fluids.GASOLINE_LEADED.getDict(1000), Items.flint }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.grenade_gascan, 1), new Object[] { Fluids.BIOFUEL.getDict(1000), Items.flint }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.grenade_lemon, 1), new Object[] { ModItems.lemon, ModItems.grenade_strong }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_smart, 4), new Object[] { " A ", "ACA", " A ", 'A', ModItems.grenade_strong, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP) }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_mirv, 1), new Object[] { "GGG", "GCG", "GGG", 'G', ModItems.grenade_smart, 'C', ModItems.grenade_generic }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_breach, 1), new Object[] { "G", "G", "P", 'G', ModItems.grenade_smart, 'P', BIGMT.plate() }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_burst, 1), new Object[] { "GGG", "GCG", "GGG", 'G', ModItems.grenade_breach, 'C', ModItems.grenade_generic }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_cloud), new Object[] { "SPS", "CAC", "SPS", 'S', S.dust(), 'P', ModItems.powder_poison, 'C', CU.dust(), 'A', new ItemStack(ModItems.fluid_tank_full, 1, Fluids.PEROXIDE.getID()) }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_pink_cloud), new Object[] { " S ", "ECE", " E ", 'S', ModItems.powder_spark_mix, 'E', ModItems.powder_magic, 'C', ModItems.grenade_cloud }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.nuclear_waste_pearl), new Object[] { "WWW", "WFW", "WWW", 'W', ModItems.nuclear_waste_tiny, 'F', ModBlocks.block_fallout }); - CraftingManager.addShapelessAuto(new ItemStack(ModItems.grenade_kyiv), new Object[] { ModItems.canister_napalm, ModItems.bottle2_empty, ModItems.rag }); CraftingManager.addRecipeAuto(new ItemStack(ModItems.disperser_canister_empty, 4), new Object[] { " P ", "PGP", " P ", 'P', ANY_HARDPLASTIC.ingot(), 'G', ModBlocks.glass_boron }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_shell, 4, EnumGrenadeShell.FRAG.ordinal()), new Object[] { "B", "P", "S", 'B', STEEL.bolt(), 'P', AL.plate(), 'S', STEEL.shell() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_shell, 4, EnumGrenadeShell.STICK.ordinal()), new Object[] { "S", "B", "W", 'B', STEEL.bolt(), 'S', STEEL.shell(), 'W', KEY_PLANKS }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_shell, 4, EnumGrenadeShell.TECH.ordinal()), new Object[] { "C", "M", "S", 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC), 'M', WEAPONSTEEL.mechanism(), 'S', WEAPONSTEEL.shell() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_shell, 2, EnumGrenadeShell.NUKE.ordinal()), new Object[] { " S ", "CMC", " S ", 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED), 'M', WEAPONSTEEL.mechanism(), 'S', WEAPONSTEEL.shell() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_fuze, 4, EnumGrenadeFuze.S3.ordinal()), new Object[] { "S", "F", 'S', STEEL.bolt(), 'F', ModItems.safety_fuse }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_fuze, 4, EnumGrenadeFuze.S7.ordinal()), new Object[] { "S", "F", "F", 'S', STEEL.bolt(), 'F', ModItems.safety_fuse }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_fuze, 4, EnumGrenadeFuze.S15.ordinal()), new Object[] { " S ", " F ", "FFF", 'S', STEEL.bolt(), 'F', ModItems.safety_fuse }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_fuze, 4, EnumGrenadeFuze.IMPACT.ordinal()), new Object[] { "C", "S", "F", 'C', ANY_SMOKELESS.dust(), 'S', STEEL.bolt(), 'F', ModItems.safety_fuse }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_fuze, 4, EnumGrenadeFuze.AIRBURST.ordinal()), new Object[] { "C", "S", "F", 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.VACUUM_TUBE), 'S', STEEL.bolt(), 'F', ModItems.safety_fuse }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_filling, 4, EnumGrenadeFilling.POWDER.ordinal()), new Object[] { "F", "I", "F", 'F', Items.gunpowder, 'I', ModItems.plate_polymer }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_filling, 4, EnumGrenadeFilling.HE.ordinal()), new Object[] { "F", "I", "F", 'F', ModItems.ball_dynamite, 'I', ModItems.plate_polymer }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_filling, 4, EnumGrenadeFilling.DEMO.ordinal()), new Object[] { "F", "I", "F", 'F', ANY_HIGHEXPLOSIVE.ingot(), 'I', ModItems.plate_polymer }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_filling, 4, EnumGrenadeFilling.INC.ordinal()), new Object[] { "F", "I", "F", 'F', P_RED.dust(), 'I', ModItems.plate_polymer }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_filling, 4, EnumGrenadeFilling.WP.ordinal()), new Object[] { "F", "I", "F", 'F', P_WHITE.ingot(), 'I', ModItems.plate_polymer }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_filling, 4, EnumGrenadeFilling.CLUSTER.ordinal()), new Object[] { "F", "I", "F", 'F', ModItems.pellet_cluster, 'I', ModItems.plate_polymer }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_filling, 1, EnumGrenadeFilling.CLUSTER_HEAVY.ordinal()), new Object[] { "F", "I", "F", 'F', ModItems.pellet_cluster, 'I', WEAPONSTEEL.plate() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_filling, 4, EnumGrenadeFilling.EMP.ordinal()), new Object[] { " C ", "KWK", 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.BASIC), 'K', ModItems.coil_gold, 'W', WEAPONSTEEL.plate() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_filling, 4, EnumGrenadeFilling.PLASMA.ordinal()), new Object[] { " C ", "KWK", 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CAPACITOR_BOARD), 'K', ModItems.cell_tritium, 'W', WEAPONSTEEL.plate() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_filling, 4, EnumGrenadeFilling.LASER.ordinal()), new Object[] { " C ", "KWK", 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ATOMIC_CLOCK), 'K', ModItems.crystal_redstone, 'W', WEAPONSTEEL.plate() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_filling, 1, EnumGrenadeFilling.NUCLEAR.ordinal()), new Object[] { " T ", "CPC", " T ", 'T', ModItems.ball_tatb, 'C', WEAPONSTEEL.plate(), 'P', PU239.nugget() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_filling, 1, EnumGrenadeFilling.NUCLEAR_DEMO.ordinal()), new Object[] { "TPT", "CPC", "TPT", 'T', ModItems.ball_tatb, 'C', WEAPONSTEEL.plate(), 'P', PU239.nugget() }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_extra, 1, EnumGrenadeExtra.GLUE.ordinal()), new Object[] { " P ", "PSP", " P ", 'P', Items.paper, 'S', Items.slime_ball }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_extra, 1, EnumGrenadeExtra.PROXY_FUZE.ordinal()), new Object[] { "C", "F", 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.CHIP), 'F', ModItems.safety_fuse }); + CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_extra, 1, EnumGrenadeExtra.FRAG_SLEEVE.ordinal()), new Object[] { "BBB", " T ", "BBB", 'B', STEEL.bolt(), 'T', ModItems.ducttape }); //Sticks of explosives CraftingManager.addRecipeAuto(new ItemStack(ModItems.stick_dynamite, 4), new Object[] { " S ", "PDP", "PDP", 'S', ModItems.safety_fuse, 'P', Items.paper, 'D', ModItems.ball_dynamite }); @@ -292,22 +296,6 @@ public class WeaponRecipes { CraftingManager.addRecipeAuto(new ItemStack(ModBlocks.c4, 1), new Object[] { "DDD", "DSD", "DDD", 'D', ModItems.stick_c4, 'S', ModItems.safety_fuse }); CraftingManager.addRecipeAuto(new ItemStack(ModBlocks.fissure_bomb, 1), new Object[] { "SUS", "RPR", "SUS", 'S', ModBlocks.semtex, 'U', U238.block(), 'R', TA.ingot(), 'P', PU239.billet() }); - - //IF Grenades - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_if_generic, 1), new Object[] { " C ", "PTP", " P ", 'C', ModItems.coil_tungsten, 'P', STEEL.plate(), 'T', Blocks.tnt }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_if_he, 1), new Object[] { "A", "G", "A", 'G', ModItems.grenade_if_generic, 'A', Items.gunpowder }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_if_bouncy, 1), new Object[] { "G", "A", 'G', ModItems.grenade_if_generic, 'A', ANY_RUBBER.ingot() }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_if_sticky, 1), new Object[] { "G", "A", 'G', ModItems.grenade_if_generic, 'A', KEY_SLIME }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_if_impact, 1), new Object[] { "G", "A", 'G', ModItems.grenade_if_generic, 'A', REDSTONE.dust() }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_if_concussion, 1), new Object[] { "G", "A", 'G', ModItems.grenade_if_generic, 'A', Items.glowstone_dust }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_if_toxic, 1), new Object[] { "G", "A", 'G', ModItems.grenade_if_generic, 'A', ModItems.powder_poison }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_if_incendiary, 1), new Object[] { "G", "A", 'G', ModItems.grenade_if_generic, 'A', P_RED.dust() }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_if_brimstone, 1), new Object[] { "R", "G", "A", 'G', ModItems.grenade_if_generic, 'R', REDSTONE.dust(), 'A', S.dust() }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_if_mystery, 1), new Object[] { "A", "G", "A", 'G', ModItems.grenade_if_generic, 'A', ModItems.powder_magic }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_if_spark, 1), new Object[] { " A ", "AGA", " A ", 'G', ModItems.grenade_if_generic, 'A', ModItems.powder_spark_mix }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_if_hopwire, 1), new Object[] { " A ", "AGA", " A ", 'G', ModItems.grenade_if_generic, 'A', ModItems.powder_power }); - CraftingManager.addRecipeAuto(new ItemStack(ModItems.grenade_if_null, 1), new Object[] { "BAB", "AGA", "BAB", 'G', ModItems.grenade_if_generic, 'A', ModItems.undefined, 'B', BIGMT.ingot() }); - //Mines CraftingManager.addRecipeAuto(new ItemStack(ModBlocks.mine_ap, 4), new Object[] { "I", "C", "S", 'I', ModItems.plate_polymer, 'C', ANY_SMOKELESS.dust(), 'S', STEEL.ingot() }); CraftingManager.addRecipeAuto(new ItemStack(ModBlocks.mine_shrap, 1), new Object[] { "L", "M", 'M', ModBlocks.mine_ap, 'L', ModItems.pellet_buckshot }); diff --git a/src/main/java/com/hbm/entity/EntityMappings.java b/src/main/java/com/hbm/entity/EntityMappings.java index e28b6928b..74d74a829 100644 --- a/src/main/java/com/hbm/entity/EntityMappings.java +++ b/src/main/java/com/hbm/entity/EntityMappings.java @@ -42,18 +42,7 @@ public class EntityMappings { public static void writeMappings() { addEntity(EntityRocket.class, "entity_rocket", 250); - addEntity(EntityGrenadeGeneric.class, "entity_grenade_generic", 250); - addEntity(EntityGrenadeStrong.class, "entity_grenade_strong", 250); - addEntity(EntityGrenadeFrag.class, "entity_grenade_frag", 250); - addEntity(EntityGrenadeFire.class, "entity_grenade_fire", 250); - addEntity(EntityGrenadeCluster.class, "entity_grenade_cluster", 250); addEntity(EntityBullet.class, "entity_bullet", 250); - addEntity(EntityGrenadeFlare.class, "entity_grenade_flare", 500); - addEntity(EntityGrenadeElectric.class, "entity_grenade_electric", 500); - addEntity(EntityGrenadePoison.class, "entity_grenade_poison", 500); - addEntity(EntityGrenadeGas.class, "entity_grenade_gas", 500); - addEntity(EntityGrenadeSchrabidium.class, "entity_grenade_schrab", 500); - addEntity(EntityGrenadeNuke.class, "entity_grenade_nuke", 500); addEntity(EntitySchrab.class, "entity_schrabnel", 500); addEntity(EntityMissileGeneric.class, "entity_missile_generic", 1000); addEntity(EntityMissileDecoy.class, "entity_missile_decoy", 1000); @@ -71,23 +60,13 @@ public class EntityMappings { addEntity(EntityMissileRain.class, "entity_missile_rain", 1000); addEntity(EntityMissileDrill.class, "entity_missile_drill", 1000); addEntity(EntityMissileMirv.class, "entity_missile_mirv", 1000); - addEntity(EntityGrenadeNuclear.class, "entity_grenade_nuclear", 1000); - addEntity(EntityGrenadePlasma.class, "entity_grenade_plasma", 500); - addEntity(EntityGrenadeTau.class, "entity_grenade_tau", 500); addEntity(EntityChopperMine.class, "entity_chopper_mine", 1000); - addEntity(EntityGrenadeLemon.class, "entity_grenade_lemon", 500); addEntity(EntityCloudFleija.class, "entity_cloud_fleija", 500); - addEntity(EntityGrenadeMk2.class, "entity_grenade_mk2", 500); - addEntity(EntityGrenadeZOMG.class, "entity_grenade_zomg", 500); - addEntity(EntityGrenadeASchrab.class, "entity_grenade_aschrab", 500); addEntity(EntityFalloutRain.class, "entity_fallout", 1000); addEntity(EntityEMPBlast.class, "entity_emp_blast", 1000); - addEntity(EntityGrenadePulse.class, "entity_grenade_pulse", 1000); addEntity(EntityRubble.class, "entity_rubble", 1000); addEntity(EntityShrapnel.class, "entity_shrapnel", 1000); - addEntity(EntityGrenadeShrapnel.class, "entity_grenade_shrapnel", 250); addEntity(EntityBlackHole.class, "entity_black_hole", 250); - addEntity(EntityGrenadeBlackHole.class, "entity_grenade_black_hole", 250); addEntity(EntityMinecartTest.class, "entity_minecart_test", 1000); addEntity(EntityMissileDoomsday.class, "entity_missile_doomsday", 1000); addEntity(EntityMissileDoomsdayRusted.class, "entity_missile_doomsday_rusted", 1000); @@ -97,10 +76,9 @@ public class EntityMappings { addEntity(EntityBoxcar.class, "entity_boxcar", 1000); addEntity(EntityTorpedo.class, "entity_torpedo", 1000); addEntity(EntityMissileTaint.class, "entity_missile_taint", 1000); - addEntity(EntityGrenadeGascan.class, "entity_grenade_gascan", 1000); addEntity(EntityNukeExplosionMK5.class, "entity_nuke_mk5", 1000); addEntity(EntityCloudFleijaRainbow.class, "entity_cloud_rainbow", 1000); - addEntity(EntityExplosiveBeam.class, "entity_beam_bomb", 1000); + addEntity(EntityB92Beam.class, "entity_beam_bomb", 1000); addEntity(EntityMissileTest.class, "entity_missile_test_mk2", 1000); addEntity(EntityMissileMicro.class, "entity_missile_micronuclear", 1000); addEntity(EntityCloudSolinium.class, "entity_cloud_rainbow", 1000); @@ -111,31 +89,12 @@ public class EntityMappings { addEntity(EntityChlorineFX.class, "entity_chlorine_fx", 1000); addEntity(EntityPinkCloudFX.class, "entity_pink_cloud_fx", 1000); addEntity(EntityCloudFX.class, "entity_cloud_fx", 1000); - addEntity(EntityGrenadePC.class, "entity_grenade_pink_cloud", 250); - addEntity(EntityGrenadeCloud.class, "entity_grenade_cloud", 250); addEntity(EntityBomber.class, "entity_bomber", 1000); addEntity(EntityC130.class, "entity_c130", 1000); addEntity(EntityBombletZeta.class, "entity_zeta", 1000); addEntity(EntityOrangeFX.class, "entity_agent_orange", 1000); addEntity(EntityDeathBlast.class, "entity_laser_blast", 1000); - addEntity(EntityGrenadeSmart.class, "entity_grenade_smart", 250); - addEntity(EntityGrenadeMIRV.class, "entity_grenade_mirv", 250); - addEntity(EntityGrenadeBreach.class, "entity_grenade_breach", 250); - addEntity(EntityGrenadeBurst.class, "entity_grenade_burst", 250); addEntity(EntityBurningFOEQ.class, "entity_burning_foeq", 1000); - addEntity(EntityGrenadeIFGeneric.class, "entity_grenade_ironshod", 250); - addEntity(EntityGrenadeIFHE.class, "entity_grenade_ironshod_he", 250); - addEntity(EntityGrenadeIFBouncy.class, "entity_grenade_ironshod_bouncy", 250); - addEntity(EntityGrenadeIFSticky.class, "entity_grenade_ironshod_sticky", 250); - addEntity(EntityGrenadeIFImpact.class, "entity_grenade_ironshod_impact", 250); - addEntity(EntityGrenadeIFIncendiary.class, "entity_grenade_ironshod_fire", 250); - addEntity(EntityGrenadeIFToxic.class, "entity_grenade_ironshod_toxic", 250); - addEntity(EntityGrenadeIFConcussion.class, "entity_grenade_ironshod_con", 250); - addEntity(EntityGrenadeIFBrimstone.class, "entity_grenade_ironshod_brim", 250); - addEntity(EntityGrenadeIFMystery.class, "entity_grenade_ironshod_m", 250); - addEntity(EntityGrenadeIFSpark.class, "entity_grenade_ironshod_s", 250); - addEntity(EntityGrenadeIFHopwire.class, "entity_grenade_ironshod_hopwire", 250); - addEntity(EntityGrenadeIFNull.class, "entity_grenade_ironshod_null", 250); addEntity(EntityFallingNuke.class, "entity_falling_bomb", 1000); addEntity(EntityBulletBaseNT.class, "entity_bullet_mk3", 250, false); addEntity(EntityBulletBaseMK4.class, "entity_bullet_mk4", 250, false); @@ -176,7 +135,6 @@ public class EntityMappings { addEntity(EntityMissileShuttle.class, "entity_missile_shuttle", 1000); addEntity(EntityZirnoxDebris.class, "entity_zirnox_debris", 1000); addEntity(EntityGhost.class, "entity_ntm_ghost", 1000); - addEntity(EntityGrenadeDynamite.class, "entity_grenade_dynamite", 250); addEntity(EntitySiegeLaser.class, "entity_ntm_siege_laser", 1000); addEntity(EntityTNTPrimedBase.class, "entity_ntm_tnt_primed", 1000); addEntity(EntityGrenadeBouncyGeneric.class, "entity_grenade_bouncy_generic", 250); diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeASchrab.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeASchrab.java deleted file mode 100644 index e878c8b64..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeASchrab.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.config.BombConfig; -import com.hbm.entity.effect.EntityCloudFleija; -import com.hbm.entity.logic.EntityNukeExplosionMK3; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeASchrab extends EntityGrenadeBase { - - public EntityGrenadeASchrab(World p_i1773_1_) { - super(p_i1773_1_); - } - - public EntityGrenadeASchrab(World p_i1774_1_, EntityLivingBase p_i1774_2_) { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeASchrab(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) { - EntityNukeExplosionMK3 ex = EntityNukeExplosionMK3.statFacFleija(worldObj, posX, posY, posZ, BombConfig.aSchrabRadius); - if(!ex.isDead) { - this.worldObj.playSoundEffect(this.posX, this.posY, this.posZ, "random.explode", 100.0F, this.worldObj.rand.nextFloat() * 0.1F + 0.9F); - worldObj.spawnEntityInWorld(ex); - - EntityCloudFleija cloud = new EntityCloudFleija(this.worldObj, BombConfig.aSchrabRadius); - cloud.posX = this.posX; - cloud.posY = this.posY; - cloud.posZ = this.posZ; - this.worldObj.spawnEntityInWorld(cloud); - } - - this.setDead(); - } - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeBlackHole.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeBlackHole.java deleted file mode 100644 index 4a5229ca4..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeBlackHole.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.hbm.entity.grenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -import com.hbm.entity.effect.EntityBlackHole; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -public class EntityGrenadeBlackHole extends EntityGrenadeBouncyBase -{ - public EntityGrenadeBlackHole(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeBlackHole(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeBlackHole(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 1.5F, true); - - EntityBlackHole bl = new EntityBlackHole(this.worldObj, 1.5F); - bl.posX = this.posX; - bl.posY = this.posY; - bl.posZ = this.posZ; - this.worldObj.spawnEntityInWorld(bl); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_black_hole); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeBouncyGeneric.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeBouncyGeneric.java index 05f5326dd..1a08aab71 100644 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeBouncyGeneric.java +++ b/src/main/java/com/hbm/entity/grenade/EntityGrenadeBouncyGeneric.java @@ -30,7 +30,7 @@ public class EntityGrenadeBouncyGeneric extends EntityGrenadeBouncyBase implemen @Override public ItemGenericGrenade getGrenade() { ItemGenericGrenade gren = (ItemGenericGrenade) Item.getItemById(this.dataWatcher.getWatchableObjectInt(12)); - return gren != null ? gren : (ItemGenericGrenade) ModItems.grenade_kyiv; + return gren != null ? gren : (ItemGenericGrenade) ModItems.stick_dynamite; } @Override diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeBreach.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeBreach.java deleted file mode 100644 index 8c1ca9b4f..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeBreach.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionLarge; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeBreach extends EntityGrenadeBase { - - public EntityGrenadeBreach(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeBreach(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeBreach(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - if(rand.nextInt(10) == 0) - this.setDead(); - ExplosionLarge.explode(worldObj, posX, posY, posZ, 2.5F, false, false, false); - } - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeBurst.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeBurst.java deleted file mode 100644 index 624f4d0a2..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeBurst.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeBurst extends EntityGrenadeBouncyBase { - - public EntityGrenadeBurst(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeBurst(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeBurst(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - - for(int i = 0; i < 8; i++) { - - EntityGrenadeBreach grenade = new EntityGrenadeBreach(worldObj); - grenade.posX = posX; - grenade.posY = posY; - grenade.posZ = posZ; - grenade.motionX = rand.nextGaussian() * 0.1D; - grenade.motionY = -0.25D; - grenade.motionZ = rand.nextGaussian() * 0.1D; - - worldObj.spawnEntityInWorld(grenade); - } - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_burst); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeCloud.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeCloud.java deleted file mode 100644 index 084f50b36..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeCloud.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionChaos; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeCloud extends EntityGrenadeBase { - - public EntityGrenadeCloud(World p_i1773_1_) { - super(p_i1773_1_); - } - - public EntityGrenadeCloud(World p_i1774_1_, EntityLivingBase p_i1774_2_) { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeCloud(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) { - this.setDead(); - - this.worldObj.playAuxSFX(2002, (int)Math.round(this.posX), (int)Math.round(this.posY), (int)Math.round(this.posZ), 0); - ExplosionChaos.spawnPoisonCloud(worldObj, posX, posY, posZ, 250, 1.5, 1); - } - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeCluster.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeCluster.java deleted file mode 100644 index bfe9085f6..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeCluster.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.hbm.entity.grenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -import com.hbm.explosion.ExplosionChaos; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -public class EntityGrenadeCluster extends EntityGrenadeBouncyBase -{ - public EntityGrenadeCluster(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeCluster(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeCluster(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - ExplosionChaos.cluster(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 10, 50); - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 1.5F, true); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_cluster); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeDynamite.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeDynamite.java deleted file mode 100644 index 981a5479b..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeDynamite.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hbm.entity.grenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeDynamite extends EntityGrenadeBouncyBase { - - public EntityGrenadeDynamite(World world) { - super(world); - } - - public EntityGrenadeDynamite(World world, EntityLivingBase living) { - super(world, living); - } - - public EntityGrenadeDynamite(World world, double x, double y, double z) { - super(world, x, y, z); - } - - @Override - public void explode() { - worldObj.newExplosion(this, posX, posY + 0.25D, posZ, 3F, false, false); - this.setDead(); - } - - @Override - protected int getMaxTimer() { - return 60; - } - - @Override - protected double getBounceMod() { - return 0.5D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeElectric.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeElectric.java deleted file mode 100644 index b2a8e44d1..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeElectric.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.effect.EntityLightningBolt; -import net.minecraft.world.World; - -public class EntityGrenadeElectric extends EntityGrenadeBouncyBase -{ - public EntityGrenadeElectric(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeElectric(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeElectric(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.0F, true); - } - this.worldObj.spawnEntityInWorld(new EntityLightningBolt(this.worldObj, this.posX, this.posY, this.posZ)); - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_electric); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } - -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeFire.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeFire.java deleted file mode 100644 index 5d3cd267c..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeFire.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.hbm.entity.grenade; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -import com.hbm.explosion.ExplosionChaos; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -public class EntityGrenadeFire extends EntityGrenadeBouncyBase -{ - public Entity shooter; - - public EntityGrenadeFire(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeFire(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeFire(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - ExplosionChaos.frag(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 100, true, this.shooter); - ExplosionChaos.burn(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 5); - ExplosionChaos.flameDeath(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 15); - this.worldObj.playSoundEffect((int)this.posX, (int)this.posY, (int)this.posZ, "random.explode", 4.0F, (1.0F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.2F) * 0.7F); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_fire); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeFlare.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeFlare.java deleted file mode 100644 index 8acc150d5..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeFlare.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hbm.entity.grenade; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; - -public class EntityGrenadeFlare extends EntityThrowable -{ - public Entity shooter; - - public EntityGrenadeFlare(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeFlare(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeFlare(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void onUpdate() { - super.onUpdate(); - if(this.ticksExisted > 250) - { - this.setDead(); - } - } - - @Override - protected void onImpact(MovingObjectPosition p_70184_1_) - { - this.motionX = 0; - this.motionY = 0; - this.motionZ = 0; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeFrag.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeFrag.java deleted file mode 100644 index 9dc1248a1..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeFrag.java +++ /dev/null @@ -1,59 +0,0 @@ -package com.hbm.entity.grenade; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -import com.hbm.explosion.ExplosionChaos; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -public class EntityGrenadeFrag extends EntityGrenadeBouncyBase -{ - public Entity shooter; - - public EntityGrenadeFrag(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeFrag(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeFrag(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - if(this.isBurning()) - { - this.setDead(); - ExplosionChaos.frag(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 100, true, this.shooter); - ExplosionChaos.burn(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 5); - ExplosionChaos.flameDeath(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 15); - this.worldObj.playSoundEffect((int)this.posX, (int)this.posY, (int)this.posZ, "random.explode", 4.0F, (1.0F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.2F) * 0.7F); - } else { - this.setDead(); - ExplosionChaos.frag(this.worldObj, (int)this.posX, (int)this.posY, (int)this.posZ, 100, false, this.shooter); - this.worldObj.playSoundEffect((int)this.posX, (int)this.posY, (int)this.posZ, "random.explode", 4.0F, (1.0F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.2F) * 0.7F); - } - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_frag); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeGas.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeGas.java deleted file mode 100644 index 20be9af9c..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeGas.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.hbm.entity.grenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -import java.util.Random; - -import com.hbm.entity.effect.EntityMist; -import com.hbm.inventory.fluid.Fluids; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -public class EntityGrenadeGas extends EntityGrenadeBouncyBase { - Random rand = new Random(); - - public EntityGrenadeGas(World p_i1773_1_) { - super(p_i1773_1_); - } - - public EntityGrenadeGas(World p_i1774_1_, EntityLivingBase p_i1774_2_) { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeGas(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) { - this.setDead(); - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 0.0F, true); - - EntityMist mist = new EntityMist(worldObj); - mist.setType(Fluids.CHLORINE); - mist.setPosition(posX, posY - 5, posZ); - mist.setArea(15, 10); - worldObj.spawnEntityInWorld(mist); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_gas); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } - -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeGascan.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeGascan.java deleted file mode 100644 index 45ebfb340..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeGascan.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.hbm.entity.grenade; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeGascan extends EntityGrenadeBase { - - public EntityGrenadeGascan(World p_i1773_1_) { - super(p_i1773_1_); - } - - public EntityGrenadeGascan(World p_i1774_1_, EntityLivingBase p_i1774_2_) { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeGascan(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if(!this.worldObj.isRemote) { - this.setDead(); - this.worldObj.newExplosion((Entity) null, (float) this.posX, (float) this.posY, (float) this.posZ, 5.0F, true, false); - } - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeGeneric.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeGeneric.java deleted file mode 100644 index 6afb56a1f..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeGeneric.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.hbm.entity.grenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeGeneric extends EntityGrenadeBouncyBase -{ - public EntityGrenadeGeneric(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeGeneric(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeGeneric(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.0F, true); - } - } - - @Override - protected int getMaxTimer() { - return 100; - } - - @Override - protected double getBounceMod() { - return 0.25D; - } - -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFBouncy.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFBouncy.java deleted file mode 100644 index 94a5f74a9..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFBouncy.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionLarge; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeIFBouncy extends EntityGrenadeBouncyBase { - - public EntityGrenadeIFBouncy(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeIFBouncy(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeIFBouncy(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - - ExplosionLarge.jolt(worldObj, posX, posY, posZ, 5, 200, 0.25); - ExplosionLarge.explode(worldObj, posX, posY, posZ, 5, true, true, true); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_if_bouncy); - } - - @Override - protected double getBounceMod() { - return 0.75D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFBrimstone.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFBrimstone.java deleted file mode 100644 index 370ef98e3..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFBrimstone.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.entity.projectile.EntityBullet; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.world.World; - -public class EntityGrenadeIFBrimstone extends EntityGrenadeBouncyBase { - - public EntityGrenadeIFBrimstone(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeIFBrimstone(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeIFBrimstone(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void onUpdate() { - super.onUpdate(); - - if(this.timer > (this.getMaxTimer() * 0.65)) { - - if(!worldObj.isRemote) { - EntityBullet fragment; - - fragment = new EntityBullet(worldObj, (EntityPlayer) this.thrower, 3.0F, 35, 45, false, "tauDay"); - fragment.setDamage(rand.nextInt(301) + 100); - - fragment.motionX = rand.nextGaussian(); - fragment.motionY = rand.nextGaussian(); - fragment.motionZ = rand.nextGaussian(); - fragment.shootingEntity = this.thrower; - - fragment.posX = posX; - fragment.posY = posY; - fragment.posZ = posZ; - - fragment.setIsCritical(true); - - worldObj.spawnEntityInWorld(fragment); - } - } - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - - worldObj.newExplosion(this, posX, posY, posZ, 5, false, false); - - for(int i = 0; i < 100; i++) { - EntityBullet fragment; - - fragment = new EntityBullet(worldObj, (EntityPlayer) this.thrower, 3.0F, 35, 45, false, "tauDay"); - fragment.setDamage(rand.nextInt(301) + 100); - - fragment.motionX = rand.nextGaussian() * 0.25; - fragment.motionY = rand.nextGaussian() * 0.25; - fragment.motionZ = rand.nextGaussian() * 0.25; - fragment.shootingEntity = this.thrower; - - fragment.posX = posX; - fragment.posY = posY; - fragment.posZ = posZ; - - fragment.setIsCritical(true); - - worldObj.spawnEntityInWorld(fragment); - } - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_if_brimstone); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFConcussion.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFConcussion.java deleted file mode 100644 index d632d7650..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFConcussion.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeIFConcussion extends EntityGrenadeBouncyBase { - - public EntityGrenadeIFConcussion(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeIFConcussion(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeIFConcussion(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - - worldObj.newExplosion(this, posX, posY, posZ, 15, false, false); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_if_concussion); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFGeneric.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFGeneric.java deleted file mode 100644 index 393abd81c..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFGeneric.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionLarge; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeIFGeneric extends EntityGrenadeBouncyBase { - - public EntityGrenadeIFGeneric(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeIFGeneric(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeIFGeneric(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - - ExplosionLarge.jolt(worldObj, posX, posY, posZ, 5, 200, 0.25); - ExplosionLarge.explode(worldObj, posX, posY, posZ, 5, true, true, true); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_if_generic); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFHE.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFHE.java deleted file mode 100644 index 7565a93ad..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFHE.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionLarge; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeIFHE extends EntityGrenadeBouncyBase { - - public EntityGrenadeIFHE(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeIFHE(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeIFHE(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - - ExplosionLarge.jolt(worldObj, posX, posY, posZ, 7.5, 300, 0.25); - ExplosionLarge.explode(worldObj, posX, posY, posZ, 7, true, true, true); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_if_he); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFHopwire.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFHopwire.java deleted file mode 100644 index 23aabee92..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFHopwire.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.entity.effect.EntityVortex; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeIFHopwire extends EntityGrenadeBouncyBase { - - public EntityGrenadeIFHopwire(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeIFHopwire(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeIFHopwire(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - - EntityVortex vortex = new EntityVortex(worldObj, 0.75F); - vortex.posX = posX; - vortex.posY = posY; - vortex.posZ = posZ; - worldObj.spawnEntityInWorld(vortex); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_if_hopwire); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFImpact.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFImpact.java deleted file mode 100644 index e13b524c2..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFImpact.java +++ /dev/null @@ -1,35 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionLarge; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeIFImpact extends EntityGrenadeBase { - - public EntityGrenadeIFImpact(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeIFImpact(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeIFImpact(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - - ExplosionLarge.jolt(worldObj, posX, posY, posZ, 5, 200, 0.25); - ExplosionLarge.explode(worldObj, posX, posY, posZ, 5, true, true, true); - } - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFIncendiary.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFIncendiary.java deleted file mode 100644 index 1d94c4a7b..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFIncendiary.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionChaos; -import com.hbm.explosion.ExplosionLarge; -import com.hbm.explosion.ExplosionThermo; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeIFIncendiary extends EntityGrenadeBouncyBase { - - public EntityGrenadeIFIncendiary(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeIFIncendiary(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeIFIncendiary(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - - ExplosionLarge.jolt(worldObj, posX, posY, posZ, 5, 200, 0.25); - ExplosionLarge.explode(worldObj, posX, posY, posZ, 5, true, true, true); - ExplosionThermo.setEntitiesOnFire(worldObj, (int)posX, (int)posY, (int)posZ, 8); - ExplosionChaos.flameDeath(worldObj, (int)posX, (int)posY, (int)posZ, 15); - ExplosionChaos.burn(worldObj, (int)posX, (int)posY, (int)posZ, 10); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_if_incendiary); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFMystery.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFMystery.java deleted file mode 100644 index a672752a2..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFMystery.java +++ /dev/null @@ -1,49 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionChaos; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeIFMystery extends EntityGrenadeBouncyBase { - - public EntityGrenadeIFMystery(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeIFMystery(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeIFMystery(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - - worldObj.newExplosion(this, posX, posY, posZ, 10, false, false); - - ExplosionChaos.spawnVolley(worldObj, posX, posY, posZ, 100, 1.0D); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_if_mystery); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFNull.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFNull.java deleted file mode 100644 index 98da6e84c..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFNull.java +++ /dev/null @@ -1,66 +0,0 @@ -package com.hbm.entity.grenade; - -import java.util.List; - -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.DamageSource; -import net.minecraft.world.World; - -public class EntityGrenadeIFNull extends EntityGrenadeBouncyBase { - - public EntityGrenadeIFNull(World world) { - super(world); - } - - public EntityGrenadeIFNull(World world, EntityLivingBase thrower) { - super(world, thrower); - } - - public EntityGrenadeIFNull(World world, double x, double y, double z) { - super(world, x, y, z); - } - - @Override - public void explode() { - - if(!this.worldObj.isRemote) { - this.setDead(); - - int range = 5; - - for(int a = -range; a <= range; a++) - for(int b = -range; b <= range; b++) - for(int c = -range; c <= range; c++) - worldObj.setBlockToAir((int) Math.floor(posX + a), (int) Math.floor(posY + b), (int) Math.floor(posZ + c)); - - List list = worldObj.getEntitiesWithinAABBExcludingEntity(this, - AxisAlignedBB.getBoundingBox((int) posX + 0.5 - 3, (int) posY + 0.5 - 3, (int) posZ + 0.5 - 3, (int) posX + 0.5 + 3, (int) posY + 0.5 + 3, (int) posZ + 0.5 + 3)); - - for(Object o : list) { - if(o instanceof EntityLivingBase) { - EntityLivingBase e = (EntityLivingBase) o; - e.setHealth(0); - e.onDeath(DamageSource.outOfWorld); - } else if(o instanceof Entity) { - Entity e = (Entity) o; - e.setDead(); - } - } - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_if_null); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFSpark.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFSpark.java deleted file mode 100644 index db249cf88..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFSpark.java +++ /dev/null @@ -1,51 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.entity.effect.EntityRagingVortex; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeIFSpark extends EntityGrenadeBouncyBase { - - public EntityGrenadeIFSpark(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeIFSpark(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeIFSpark(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - - EntityRagingVortex vortex = new EntityRagingVortex(worldObj, 1.5F); - vortex.posX = posX; - vortex.posY = posY; - vortex.posZ = posZ; - worldObj.spawnEntityInWorld(vortex); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_if_spark); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFSticky.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFSticky.java deleted file mode 100644 index c08658505..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFSticky.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionLarge; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeIFSticky extends EntityGrenadeBouncyBase { - - public EntityGrenadeIFSticky(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeIFSticky(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeIFSticky(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - - ExplosionLarge.jolt(worldObj, posX, posY, posZ, 5, 200, 0.25); - ExplosionLarge.explode(worldObj, posX, posY, posZ, 5, true, true, true); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_if_sticky); - } - - @Override - protected double getBounceMod() { - return 0.05D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFToxic.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFToxic.java deleted file mode 100644 index 83d04ad89..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeIFToxic.java +++ /dev/null @@ -1,52 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionChaos; -import com.hbm.explosion.ExplosionLarge; -import com.hbm.explosion.ExplosionNukeGeneric; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeIFToxic extends EntityGrenadeBouncyBase { - - public EntityGrenadeIFToxic(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeIFToxic(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeIFToxic(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - - ExplosionLarge.jolt(worldObj, posX, posY, posZ, 3, 200, 0.25); - ExplosionLarge.explode(worldObj, posX, posY, posZ, 2, true, true, true); - ExplosionChaos.poison(worldObj, (int)posX, (int)posY, (int)posZ, 12); - ExplosionNukeGeneric.waste(worldObj, (int)posX, (int)posY, (int)posZ, 12); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_if_toxic); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeImpactGeneric.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeImpactGeneric.java index 82d4e89ca..6201c6051 100644 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeImpactGeneric.java +++ b/src/main/java/com/hbm/entity/grenade/EntityGrenadeImpactGeneric.java @@ -30,7 +30,7 @@ public class EntityGrenadeImpactGeneric extends EntityGrenadeBase implements IGe @Override public ItemGenericGrenade getGrenade() { ItemGenericGrenade gren = (ItemGenericGrenade) Item.getItemById(this.dataWatcher.getWatchableObjectInt(12)); - return gren != null ? gren : (ItemGenericGrenade) ModItems.grenade_kyiv; + return gren != null ? gren : (ItemGenericGrenade) ModItems.stick_dynamite; } @Override diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeLemon.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeLemon.java deleted file mode 100644 index ef8ec0f99..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeLemon.java +++ /dev/null @@ -1,46 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeLemon extends EntityGrenadeBouncyBase -{ - public EntityGrenadeLemon(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeLemon(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeLemon(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - this.worldObj.newExplosion((Entity)null, (float)this.posX, (float)this.posY, (float)this.posZ, 5.0F, true, true); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_lemon); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeMIRV.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeMIRV.java deleted file mode 100644 index c0c3479b3..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeMIRV.java +++ /dev/null @@ -1,58 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeMIRV extends EntityGrenadeBouncyBase { - - public EntityGrenadeMIRV(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeMIRV(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeMIRV(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - - for(int i = 0; i < 8; i++) { - - EntityGrenadeSmart grenade = new EntityGrenadeSmart(worldObj); - grenade.posX = posX; - grenade.posY = posY; - grenade.posZ = posZ; - grenade.motionX = motionX + rand.nextGaussian() * 0.25D; - grenade.motionY = motionY + rand.nextGaussian() * 0.25D; - grenade.motionZ = motionZ + rand.nextGaussian() * 0.25D; - grenade.ticksExisted = 10; - - worldObj.spawnEntityInWorld(grenade); - } - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_mirv); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeMk2.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeMk2.java deleted file mode 100644 index 11b43d077..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeMk2.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionLarge; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeMk2 extends EntityGrenadeBouncyBase { - - - public EntityGrenadeMk2(World p_i1773_1_) { - super(p_i1773_1_); - } - - public EntityGrenadeMk2(World p_i1774_1_, EntityLivingBase p_i1774_2_) { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeMk2(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if(!this.worldObj.isRemote) { - this.setDead(); - ExplosionLarge.explode(worldObj, posX, posY, posZ, 7.5F, true, false, false); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_mk2); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeNuclear.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeNuclear.java deleted file mode 100644 index 0f8cca46a..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeNuclear.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionNukeSmall; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeNuclear extends EntityGrenadeBouncyBase { - - public EntityGrenadeNuclear(World p_i1773_1_) { - super(p_i1773_1_); - } - - public EntityGrenadeNuclear(World p_i1774_1_, EntityLivingBase p_i1774_2_) { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeNuclear(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if(!this.worldObj.isRemote) { - this.setDead(); - - ExplosionNukeSmall.explode(worldObj, posX, posY + 0.5, posZ, ExplosionNukeSmall.PARAMS_TOTS); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_nuclear); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeNuke.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeNuke.java deleted file mode 100644 index cb727736e..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeNuke.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.hbm.entity.grenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeNuke extends EntityGrenadeBase { - public int count = 2; - - public EntityGrenadeNuke(World p_i1773_1_) { - super(p_i1773_1_); - } - - public EntityGrenadeNuke(World p_i1774_1_, EntityLivingBase p_i1774_2_) { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeNuke(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if(!this.worldObj.isRemote) { - // this.setDead(); - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 30F, true); - } - } - -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadePC.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadePC.java deleted file mode 100644 index 9136b287a..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadePC.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionChaos; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadePC extends EntityGrenadeBase { - - public EntityGrenadePC(World p_i1773_1_) { - super(p_i1773_1_); - } - - public EntityGrenadePC(World p_i1774_1_, EntityLivingBase p_i1774_2_) { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadePC(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) { - this.setDead(); - - this.worldObj.playAuxSFX(2002, (int)Math.round(this.posX), (int)Math.round(this.posY), (int)Math.round(this.posZ), 0); - ExplosionChaos.spawnPoisonCloud(worldObj, posX, posY, posZ, 500, 2, 2); - } - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadePlasma.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadePlasma.java deleted file mode 100644 index 80e1f99df..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadePlasma.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionChaos; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadePlasma extends EntityGrenadeBouncyBase { - - public EntityGrenadePlasma(World p_i1773_1_) { - super(p_i1773_1_); - } - - public EntityGrenadePlasma(World p_i1774_1_, EntityLivingBase p_i1774_2_) { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadePlasma(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if(!this.worldObj.isRemote) { - this.setDead(); - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.0F, true); - ExplosionChaos.plasma(this.worldObj, (int) this.posX, (int) this.posY, (int) this.posZ, 7); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_plasma); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadePoison.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadePoison.java deleted file mode 100644 index 868ff4205..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadePoison.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionNukeGeneric; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadePoison extends EntityGrenadeBouncyBase { - - public EntityGrenadePoison(World p_i1773_1_) { - super(p_i1773_1_); - } - - public EntityGrenadePoison(World p_i1774_1_, EntityLivingBase p_i1774_2_) { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadePoison(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if(!this.worldObj.isRemote) { - this.setDead(); - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.0F, true); - ExplosionNukeGeneric.wasteNoSchrab(this.worldObj, (int) this.posX, (int) this.posY, (int) this.posZ, 10); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_poison); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } - -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadePulse.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadePulse.java deleted file mode 100644 index 476d1135f..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadePulse.java +++ /dev/null @@ -1,48 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionChaos; -import com.hbm.explosion.ExplosionLarge; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadePulse extends EntityGrenadeBouncyBase { - - public EntityGrenadePulse(World p_i1773_1_) { - super(p_i1773_1_); - } - - public EntityGrenadePulse(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadePulse(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - - if (!this.worldObj.isRemote) { - this.setDead(); - ExplosionChaos.pulse(this.worldObj, (int) this.posX, (int) this.posY, (int) this.posZ, 7); - this.worldObj.playSoundEffect((int)this.posX, (int)this.posY, (int)this.posZ, "random.explode", 4.0F, (1.0F + (this.worldObj.rand.nextFloat() - this.worldObj.rand.nextFloat()) * 0.2F) * 0.7F); - ExplosionLarge.spawnShock(worldObj, posX, posY, posZ, 24, 2); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_pulse); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeSchrabidium.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeSchrabidium.java deleted file mode 100644 index 4796fc4c0..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeSchrabidium.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionChaos; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeSchrabidium extends EntityGrenadeBouncyBase { - - public EntityGrenadeSchrabidium(World p_i1773_1_) { - super(p_i1773_1_); - } - - public EntityGrenadeSchrabidium(World p_i1774_1_, EntityLivingBase p_i1774_2_) { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeSchrabidium(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if(!this.worldObj.isRemote) { - this.setDead(); - ExplosionChaos.schrab(this.worldObj, (int) this.posX, (int) this.posY, (int) this.posZ, 50, 50); - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 1.5F, true); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_schrabidium); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } - -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeShrapnel.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeShrapnel.java deleted file mode 100644 index 4252daaab..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeShrapnel.java +++ /dev/null @@ -1,47 +0,0 @@ -package com.hbm.entity.grenade; - -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -import com.hbm.explosion.ExplosionLarge; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -public class EntityGrenadeShrapnel extends EntityGrenadeBouncyBase { - public Entity shooter; - - public EntityGrenadeShrapnel(World p_i1773_1_) { - super(p_i1773_1_); - } - - public EntityGrenadeShrapnel(World p_i1774_1_, EntityLivingBase p_i1774_2_) { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeShrapnel(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if(!this.worldObj.isRemote) { - this.setDead(); - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.0F, true); - for(int i = 0; i < 5; i++) { - ExplosionLarge.spawnShrapnels(worldObj, this.posX, this.posY, this.posZ, 5); - } - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_shrapnel); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeSmart.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeSmart.java deleted file mode 100644 index 4f967993c..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeSmart.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionLarge; -import com.hbm.items.ModItems; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.item.EntityItem; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public class EntityGrenadeSmart extends EntityGrenadeBase { - - public EntityGrenadeSmart(World p_i1773_1_) - { - super(p_i1773_1_); - } - - public EntityGrenadeSmart(World p_i1774_1_, EntityLivingBase p_i1774_2_) - { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeSmart(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) - { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if (!this.worldObj.isRemote) - { - this.setDead(); - - if(this.ticksExisted > 10) - ExplosionLarge.explode(worldObj, posX, posY, posZ, 5.0F, true, false, false); - else - worldObj.spawnEntityInWorld(new EntityItem(worldObj, posX, posY, posZ, new ItemStack(ModItems.grenade_smart))); - } - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeStrong.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeStrong.java deleted file mode 100644 index f0d8c2a28..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeStrong.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionLarge; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeStrong extends EntityGrenadeBouncyBase { - - public EntityGrenadeStrong(World p_i1773_1_) { - super(p_i1773_1_); - } - - public EntityGrenadeStrong(World p_i1774_1_, EntityLivingBase p_i1774_2_) { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeStrong(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if(!this.worldObj.isRemote) { - this.setDead(); - ExplosionLarge.explode(worldObj, posX, posY, posZ, 5.0F, true, false, false); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_strong); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeTau.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeTau.java deleted file mode 100644 index a77fa4bbf..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeTau.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.explosion.ExplosionChaos; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeTau extends EntityGrenadeBouncyBase { - - public EntityGrenadeTau(World p_i1773_1_) { - super(p_i1773_1_); - } - - public EntityGrenadeTau(World p_i1774_1_, EntityLivingBase p_i1774_2_) { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeTau(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if(!this.worldObj.isRemote) { - this.setDead(); - this.worldObj.createExplosion(this, this.posX, this.posY, this.posZ, 2.0F, true); - ExplosionChaos.tauMeSinPi(this.worldObj, this.posX, this.posY, this.posZ, 100, this.getThrower(), this); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_tau); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } -} diff --git a/src/main/java/com/hbm/entity/grenade/EntityGrenadeZOMG.java b/src/main/java/com/hbm/entity/grenade/EntityGrenadeZOMG.java deleted file mode 100644 index 8095ea552..000000000 --- a/src/main/java/com/hbm/entity/grenade/EntityGrenadeZOMG.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.hbm.entity.grenade; - -import com.hbm.config.BombConfig; -import com.hbm.entity.effect.EntityCloudFleijaRainbow; -import com.hbm.entity.logic.EntityNukeExplosionMK3; -import com.hbm.items.ModItems; -import com.hbm.items.weapon.ItemGrenade; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -public class EntityGrenadeZOMG extends EntityGrenadeBouncyBase { - - public EntityGrenadeZOMG(World p_i1773_1_) { - super(p_i1773_1_); - } - - public EntityGrenadeZOMG(World p_i1774_1_, EntityLivingBase p_i1774_2_) { - super(p_i1774_1_, p_i1774_2_); - } - - public EntityGrenadeZOMG(World p_i1775_1_, double p_i1775_2_, double p_i1775_4_, double p_i1775_6_) { - super(p_i1775_1_, p_i1775_2_, p_i1775_4_, p_i1775_6_); - } - - @Override - public void explode() { - - if(!this.worldObj.isRemote) { - this.setDead(); - - EntityNukeExplosionMK3 ex = new EntityNukeExplosionMK3(worldObj); - ex.posX = posX; - ex.posY = posY; - ex.posZ = posZ; - ex.destructionRange = 50; - ex.speed = BombConfig.blastSpeed; - ex.coefficient = 1.0F; - ex.waste = false; - worldObj.spawnEntityInWorld(ex); - - worldObj.playSoundEffect(this.posX, this.posY, this.posZ, "random.explode", 100000.0F, 1.0F); - - EntityCloudFleijaRainbow cloud = new EntityCloudFleijaRainbow(worldObj, 50); - cloud.posX = posX; - cloud.posY = posY; - cloud.posZ = posZ; - worldObj.spawnEntityInWorld(cloud); - } - } - - @Override - protected int getMaxTimer() { - return ItemGrenade.getFuseTicks(ModItems.grenade_tau); - } - - @Override - protected double getBounceMod() { - return 0.25D; - } - -} diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileTier0.java b/src/main/java/com/hbm/entity/missile/EntityMissileTier0.java index f1ce3a4bb..a837c0998 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileTier0.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileTier0.java @@ -116,7 +116,7 @@ public abstract class EntityMissileTier0 extends EntityMissileBaseNT { bl.posZ = this.posZ; this.worldObj.spawnEntityInWorld(bl); } - @Override public ItemStack getDebrisRareDrop() { return new ItemStack(ModItems.grenade_black_hole, 1); } + @Override public ItemStack getDebrisRareDrop() { return new ItemStack(ModItems.black_hole, 1); } @Override public ItemStack getMissileItemForInfo() { return new ItemStack(ModItems.missile_bhole); } } diff --git a/src/main/java/com/hbm/entity/mob/EntityFBIDrone.java b/src/main/java/com/hbm/entity/mob/EntityFBIDrone.java index 97110b54f..c35604aa4 100644 --- a/src/main/java/com/hbm/entity/mob/EntityFBIDrone.java +++ b/src/main/java/com/hbm/entity/mob/EntityFBIDrone.java @@ -1,6 +1,10 @@ package com.hbm.entity.mob; -import com.hbm.entity.grenade.EntityGrenadeStrong; +import com.hbm.entity.grenade.EntityGrenadeUniversal; +import com.hbm.items.weapon.grenade.ItemGrenadeUniversal; +import com.hbm.items.weapon.grenade.ItemGrenadeFilling.EnumGrenadeFilling; +import com.hbm.items.weapon.grenade.ItemGrenadeFuze.EnumGrenadeFuze; +import com.hbm.items.weapon.grenade.ItemGrenadeShell.EnumGrenadeShell; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.util.Vec3; @@ -29,7 +33,8 @@ public class EntityFBIDrone extends EntityUFOBase { Vec3 vec = Vec3.createVectorHelper(posX - target.posX, posY - target.posY, posZ - target.posZ); if(Math.abs(vec.xCoord) < 5 && Math.abs(vec.zCoord) < 5 && vec.yCoord > 3) { attackCooldown = 60; - EntityGrenadeStrong grenade = new EntityGrenadeStrong(worldObj); + EntityGrenadeUniversal grenade = new EntityGrenadeUniversal(worldObj, ItemGrenadeUniversal.make(EnumGrenadeShell.FRAG, EnumGrenadeFilling.HE, EnumGrenadeFuze.S7)); + grenade.setThrower(this); grenade.setPosition(posX, posY, posZ); worldObj.spawnEntityInWorld(grenade); } diff --git a/src/main/java/com/hbm/entity/projectile/EntityExplosiveBeam.java b/src/main/java/com/hbm/entity/projectile/EntityB92Beam.java similarity index 90% rename from src/main/java/com/hbm/entity/projectile/EntityExplosiveBeam.java rename to src/main/java/com/hbm/entity/projectile/EntityB92Beam.java index 67c0f73a4..12b4398cd 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityExplosiveBeam.java +++ b/src/main/java/com/hbm/entity/projectile/EntityB92Beam.java @@ -3,7 +3,6 @@ package com.hbm.entity.projectile; import java.util.List; import com.hbm.entity.effect.EntityCloudFleijaRainbow; -import com.hbm.entity.grenade.EntityGrenadeZOMG; import com.hbm.entity.logic.EntityNukeExplosionMK3; import cpw.mods.fml.relauncher.Side; @@ -21,7 +20,7 @@ import net.minecraft.util.MovingObjectPosition; import net.minecraft.util.Vec3; import net.minecraft.world.World; -public class EntityExplosiveBeam extends Entity implements IProjectile +public class EntityB92Beam extends Entity implements IProjectile { private int field_145791_d = -1; private int field_145792_e = -1; @@ -39,14 +38,14 @@ public class EntityExplosiveBeam extends Entity implements IProjectile private int ticksInGround; private int ticksInAir; private double damage = 2.0D; - public EntityExplosiveBeam(World p_i1753_1_) + public EntityB92Beam(World p_i1753_1_) { super(p_i1753_1_); this.renderDistanceWeight = 10.0D; this.setSize(0.5F, 0.5F); } - public EntityExplosiveBeam(World p_i1754_1_, double p_i1754_2_, double p_i1754_4_, double p_i1754_6_) + public EntityB92Beam(World p_i1754_1_, double p_i1754_2_, double p_i1754_4_, double p_i1754_6_) { super(p_i1754_1_); this.renderDistanceWeight = 10.0D; @@ -55,7 +54,7 @@ public class EntityExplosiveBeam extends Entity implements IProjectile this.yOffset = 0.0F; } - public EntityExplosiveBeam(World p_i1755_1_, EntityLivingBase p_i1755_2_, EntityLivingBase p_i1755_3_, float p_i1755_4_, float p_i1755_5_) + public EntityB92Beam(World p_i1755_1_, EntityLivingBase p_i1755_2_, EntityLivingBase p_i1755_3_, float p_i1755_4_, float p_i1755_5_) { super(p_i1755_1_); this.renderDistanceWeight = 10.0D; @@ -84,29 +83,8 @@ public class EntityExplosiveBeam extends Entity implements IProjectile this.setThrowableHeading(d0, d1 + f4, d2, p_i1755_4_, p_i1755_5_); } } - - public EntityExplosiveBeam(World p_i1756_1_, EntityLivingBase p_i1756_2_, float p_i1756_3_, int dmgMin, int dmgMax, EntityGrenadeZOMG grenade) { - super(p_i1756_1_); - this.renderDistanceWeight = 10.0D; - this.shootingEntity = p_i1756_2_; - this.setSize(0.5F, 0.5F); - this.setLocationAndAngles(grenade.posX, grenade.posY + grenade.getEyeHeight(), grenade.posZ, - grenade.rotationYaw, grenade.rotationPitch); - this.posX -= MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F; - this.posY -= 0.10000000149011612D; - this.posZ -= MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F; - this.setPosition(this.posX, this.posY, this.posZ); - this.yOffset = 0.0F; - this.motionX = -MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) - * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI); - this.motionZ = MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) - * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI); - this.motionY = (-MathHelper.sin(this.rotationPitch / 180.0F * (float) Math.PI)); - this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, p_i1756_3_ * 1.5F, 1.0F); - } - - public EntityExplosiveBeam(World p_i1756_1_, EntityLivingBase p_i1756_2_, float p_i1756_3_) + public EntityB92Beam(World p_i1756_1_, EntityLivingBase p_i1756_2_, float p_i1756_3_) { super(p_i1756_1_); this.renderDistanceWeight = 10.0D; @@ -125,7 +103,7 @@ public class EntityExplosiveBeam extends Entity implements IProjectile this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, p_i1756_3_ * 1.5F, 1.0F); } - public EntityExplosiveBeam(World world, int x, int y, int z, double mx, double my, double mz, double grav) { + public EntityB92Beam(World world, int x, int y, int z, double mx, double my, double mz, double grav) { super(world); this.posX = x + 0.5F; this.posY = y + 0.5F; diff --git a/src/main/java/com/hbm/entity/projectile/EntityBullet.java b/src/main/java/com/hbm/entity/projectile/EntityBullet.java index b26a94e60..8ef823037 100644 --- a/src/main/java/com/hbm/entity/projectile/EntityBullet.java +++ b/src/main/java/com/hbm/entity/projectile/EntityBullet.java @@ -30,7 +30,6 @@ import net.minecraft.util.Vec3; import net.minecraft.world.World; import com.hbm.blocks.bomb.BlockDetonatable; -import com.hbm.entity.grenade.EntityGrenadeTau; import com.hbm.entity.mob.EntityCreeperNuclear; import com.hbm.items.ModItems; import com.hbm.lib.ModDamageSource; @@ -40,6 +39,7 @@ import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +@Deprecated // ancient ass fucking bullet entity from pre ItemGunBase days public class EntityBullet extends Entity implements IProjectile { private int tileX = -1; private int tileY = -1; @@ -190,31 +190,6 @@ public class EntityBullet extends Entity implements IProjectile { this.setChopper(isTau == "chopper"); this.setIsCritical(isTau != "chopper"); } - - //why the living shit did i make isTau a string? who knows, who cares. - public EntityBullet(World p_i1756_1_, EntityLivingBase p_i1756_2_, float p_i1756_3_, int dmgMin, int dmgMax, - boolean instakill, String isTau, EntityGrenadeTau grenade) { - super(p_i1756_1_); - this.renderDistanceWeight = 10.0D; - this.shootingEntity = p_i1756_2_; - - this.setSize(0.5F, 0.5F); - this.setLocationAndAngles(grenade.posX, grenade.posY + grenade.getEyeHeight(), grenade.posZ, - grenade.rotationYaw, grenade.rotationPitch); - this.posX -= MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F; - this.posY -= 0.10000000149011612D; - this.posZ -= MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) * 0.16F; - this.setPosition(this.posX, this.posY, this.posZ); - this.yOffset = 0.0F; - this.motionX = -MathHelper.sin(this.rotationYaw / 180.0F * (float) Math.PI) - * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI); - this.motionZ = MathHelper.cos(this.rotationYaw / 180.0F * (float) Math.PI) - * MathHelper.cos(this.rotationPitch / 180.0F * (float) Math.PI); - this.motionY = (-MathHelper.sin(this.rotationPitch / 180.0F * (float) Math.PI)); - this.setThrowableHeading(this.motionX, this.motionY, this.motionZ, p_i1756_3_ * 1.5F, 1.0F); - this.setTau(isTau == "tauDay"); - this.setIsCritical(true); - } public EntityBullet(World world, int x, int y, int z, double mx, double my, double mz, double grav) { super(world); diff --git a/src/main/java/com/hbm/explosion/ExplosionChaos.java b/src/main/java/com/hbm/explosion/ExplosionChaos.java index 5739cabb6..95c1e9f7f 100644 --- a/src/main/java/com/hbm/explosion/ExplosionChaos.java +++ b/src/main/java/com/hbm/explosion/ExplosionChaos.java @@ -4,13 +4,11 @@ import java.util.List; import java.util.Random; import com.hbm.blocks.ModBlocks; -import com.hbm.entity.grenade.EntityGrenadeTau; import com.hbm.entity.item.EntityFallingBlockNT; import com.hbm.entity.particle.EntityCloudFX; import com.hbm.entity.particle.EntityModFX; import com.hbm.entity.particle.EntityOrangeFX; import com.hbm.entity.particle.EntityPinkCloudFX; -import com.hbm.entity.projectile.EntityBullet; import com.hbm.entity.projectile.EntityRocket; import com.hbm.entity.projectile.EntityRubble; import com.hbm.entity.projectile.EntitySchrab; @@ -26,7 +24,6 @@ import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntitySheep; -import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.projectile.EntityArrow; import net.minecraft.init.Blocks; import net.minecraft.potion.Potion; @@ -526,51 +523,6 @@ public class ExplosionChaos { //TODO: destroy this entire class } } - public static void tauMeSinPi(World world, double x, double y, double z, int count, Entity shooter, - EntityGrenadeTau tau) { - - double d1 = 0; - double d2 = 0; - double d3 = 0; - EntityBullet fragment; - - if (shooter != null && shooter instanceof EntityPlayer) - for (int i = 0; i < count; i++) { - d1 = rand.nextDouble(); - d2 = rand.nextDouble(); - d3 = rand.nextDouble(); - - if (rand.nextInt(2) == 0) { - d1 *= -1; - } - - if (rand.nextInt(2) == 0) { - d2 *= -1; - } - - if (rand.nextInt(2) == 0) { - d3 *= -1; - } - - if (rand.nextInt(5) == 0) { - fragment = new EntityBullet(world, (EntityPlayer) shooter, 3.0F, 35, 45, false, "tauDay", tau); - fragment.setDamage(rand.nextInt(301) + 100); - } else { - fragment = new EntityBullet(world, (EntityPlayer) shooter, 3.0F, 35, 45, false, "eyyOk", tau); - fragment.setDamage(rand.nextInt(11) + 35); - } - - fragment.motionX = d1 * 5; - fragment.motionY = d2 * 5; - fragment.motionZ = d3 * 5; - fragment.shootingEntity = shooter; - - fragment.setIsCritical(true); - - world.spawnEntityInWorld(fragment); - } - } - public static void levelDown(World world, int x, int y, int z, int radius) { if(!world.isRemote) diff --git a/src/main/java/com/hbm/explosion/ExplosionNukeGeneric.java b/src/main/java/com/hbm/explosion/ExplosionNukeGeneric.java index 7301e3721..be1280121 100644 --- a/src/main/java/com/hbm/explosion/ExplosionNukeGeneric.java +++ b/src/main/java/com/hbm/explosion/ExplosionNukeGeneric.java @@ -20,10 +20,8 @@ import net.minecraftforge.common.util.ForgeDirection; import com.hbm.blocks.ModBlocks; import com.hbm.config.VersatileConfig; -import com.hbm.entity.grenade.EntityGrenadeASchrab; -import com.hbm.entity.grenade.EntityGrenadeNuclear; import com.hbm.entity.projectile.EntityBulletBaseNT; -import com.hbm.entity.projectile.EntityExplosiveBeam; +import com.hbm.entity.projectile.EntityB92Beam; import com.hbm.interfaces.Spaghetti; import com.hbm.items.ModItems; import com.hbm.lib.Library; @@ -102,9 +100,7 @@ public class ExplosionNukeGeneric { private static boolean isExplosionExempt(Entity e) { if (e instanceof EntityOcelot || - e instanceof EntityGrenadeASchrab || - e instanceof EntityGrenadeNuclear || - e instanceof EntityExplosiveBeam || + e instanceof EntityB92Beam || e instanceof EntityBulletBaseNT || e instanceof EntityPlayer && ArmorUtil.checkArmor((EntityPlayer) e, ModItems.euphemium_helmet, ModItems.euphemium_plate, ModItems.euphemium_legs, ModItems.euphemium_boots)) { diff --git a/src/main/java/com/hbm/handler/BobmazonOfferFactory.java b/src/main/java/com/hbm/handler/BobmazonOfferFactory.java index f04c5d0a8..c8c1228b9 100644 --- a/src/main/java/com/hbm/handler/BobmazonOfferFactory.java +++ b/src/main/java/com/hbm/handler/BobmazonOfferFactory.java @@ -78,7 +78,6 @@ public class BobmazonOfferFactory { special.add(new Offer(new ItemStack(ModItems.boy_kit), Requirement.STEEL, 5)); special.add(new Offer(new ItemStack(ModItems.prototype_kit), Requirement.STEEL, 10)); special.add(new Offer(new ItemStack(ModItems.missile_kit), Requirement.STEEL, 5)); - special.add(new Offer(new ItemStack(ModItems.grenade_kit), Requirement.STEEL, 5)); special.add(new Offer(new ItemStack(ModItems.jetpack_vector), Requirement.STEEL, 2)); special.add(new Offer(new ItemStack(ModItems.jetpack_tank), Requirement.STEEL, 2)); special.add(new Offer(new ItemStack(ModItems.gun_kit_1, 1), Requirement.STEEL, 1)); diff --git a/src/main/java/com/hbm/handler/DispenserBehaviorHandler.java b/src/main/java/com/hbm/handler/DispenserBehaviorHandler.java index 81f17089d..d06765c23 100644 --- a/src/main/java/com/hbm/handler/DispenserBehaviorHandler.java +++ b/src/main/java/com/hbm/handler/DispenserBehaviorHandler.java @@ -40,14 +40,9 @@ public class DispenserBehaviorHandler { } }); - BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.nuclear_waste_pearl, new BehaviorProjectileDispense() { - protected IProjectile getProjectileEntity(World world, IPosition position) { - return new EntityWastePearl(world, position.getX(), position.getY(), position.getZ()); - } - }); BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.stick_dynamite, new BehaviorProjectileDispense() { protected IProjectile getProjectileEntity(World world, IPosition position) { - return new EntityGrenadeDynamite(world, position.getX(), position.getY(), position.getZ()); + return new EntityGrenadeImpactGeneric(world, position.getX(), position.getY(), position.getZ()).setType((ItemGenericGrenade) ModItems.stick_dynamite); } }); BlockDispenser.dispenseBehaviorRegistry.putObject(ModItems.stick_dynamite_fishing, new BehaviorProjectileDispense() { diff --git a/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java b/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java index 23e5bf7b1..85fc44cea 100644 --- a/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java +++ b/src/main/java/com/hbm/inventory/recipes/AssemblyMachineRecipes.java @@ -684,32 +684,6 @@ public class AssemblyMachineRecipes extends GenericRecipes { this.register(new GenericRecipe("ass.soliniumcharge").setup(300, 100).outputItems(new ItemStack(ModItems.solinium_propellant, 1)) .inputItems(new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 3), new OreDictStack(OreDictManager.getReflector(), 2), new ComparableStack(ModItems.plate_polymer, 6), new OreDictStack(W.wireFine(), 6), new ComparableStack(ModItems.biomass_compressed, 4))); - // grenades - this.register(new GenericRecipe("ass.incgrenade").setup(100, 100).outputItems(new ItemStack(ModItems.grenade_fire, 1)) - .inputItems(new ComparableStack(ModItems.grenade_frag, 1), new OreDictStack(P_RED.dust(), 1), new OreDictStack(CU.plate(), 2))); - this.register(new GenericRecipe("ass.shrapgrenade").setup(100, 100).outputItems(new ItemStack(ModItems.grenade_shrapnel, 1)) - .inputItems(new ComparableStack(ModItems.grenade_frag, 1), new ComparableStack(ModItems.pellet_buckshot, 1), new OreDictStack(STEEL.plate(), 2))); - this.register(new GenericRecipe("ass.clustergrenade").setup(100, 100).outputItems(new ItemStack(ModItems.grenade_cluster, 1)) - .inputItems(new ComparableStack(ModItems.grenade_frag, 1), new ComparableStack(ModItems.pellet_cluster, 1), new OreDictStack(STEEL.plate(), 2))); - this.register(new GenericRecipe("ass.signalflare").setup(100, 100).outputItems(new ItemStack(ModItems.grenade_flare, 1)) - .inputItems(new ComparableStack(ModItems.grenade_generic, 1), new ComparableStack(Items.glowstone_dust, 1), new OreDictStack(AL.plate(), 2))); - this.register(new GenericRecipe("ass.electricgrenade").setup(100, 100).outputItems(new ItemStack(ModItems.grenade_electric, 1)) - .inputItems(new ComparableStack(ModItems.grenade_generic, 1), new ComparableStack(ModItems.circuit, 3, EnumCircuitType.CAPACITOR.ordinal()), new OreDictStack(GOLD.plate(), 2))); - this.register(new GenericRecipe("ass.pulsegrenade").setup(100, 100).outputItems(new ItemStack(ModItems.grenade_pulse, 4)) - .inputItems(new OreDictStack(STEEL.plate(), 1), new OreDictStack(IRON.plate(), 3), new OreDictStack(MINGRADE.wireFine(), 6), new ComparableStack(Items.diamond, 1))); - this.register(new GenericRecipe("ass.plasmagrenade").setup(200, 100).outputItems(new ItemStack(ModItems.grenade_plasma, 2)) - .inputItems(new OreDictStack(STEEL.plate(), 3), new OreDictStack(ALLOY.plate(), 1), new ComparableStack(ModItems.coil_advanced_torus, 1), new ComparableStack(ModItems.cell_deuterium, 1), new ComparableStack(ModItems.cell_tritium, 1))); - this.register(new GenericRecipe("ass.taugrenade").setup(200, 100).outputItems(new ItemStack(ModItems.grenade_tau, 2)) - .inputItems(new OreDictStack(PB.plate(), 3), new OreDictStack(ALLOY.plate(), 1), new ComparableStack(ModItems.coil_advanced_torus, 1), new ComparableStack(ModItems.ammo_standard, 1, EnumAmmo.TAU_URANIUM))); - this.register(new GenericRecipe("ass.schrabgrenade").setup(200, 100).outputItems(new ItemStack(ModItems.grenade_schrabidium, 1)) - .inputItems(new ComparableStack(ModItems.grenade_flare, 1), new OreDictStack(SA326.dust(), 1), new OreDictStack(OreDictManager.getReflector(), 2))); - this.register(new GenericRecipe("ass.nukagrenade").setup(600, 100).outputItems(new ItemStack(ModItems.grenade_nuclear, 1)) - .inputItems(new OreDictStack(IRON.plate(), 1), new OreDictStack(STEEL.plate(), 1), new OreDictStack(PU239.nugget(), 2), new OreDictStack(MINGRADE.wireFine(), 2))); - this.register(new GenericRecipe("ass.zomggrenade").setup(600, 100).outputItems(new ItemStack(ModItems.grenade_zomg, 1)) - .inputItems(new ComparableStack(ModItems.plate_paa, 3), new OreDictStack(OreDictManager.getReflector(), 1), new ComparableStack(ModItems.coil_magnetized_tungsten, 3), new ComparableStack(ModItems.powder_power, 3))); - this.register(new GenericRecipe("ass.bholegrenade").setup(1_200, 100).outputItems(new ItemStack(ModItems.grenade_black_hole, 1)) - .inputItems(new OreDictStack(ANY_PLASTIC.ingot(), 6), new OreDictStack(OreDictManager.getReflector(), 3), new ComparableStack(ModItems.coil_magnetized_tungsten, 2), new ComparableStack(ModItems.black_hole, 1))); - // turrets this.register(new GenericRecipe("ass.turretchekhov").setup(200, 100).outputItems(new ItemStack(ModBlocks.turret_chekhov, 1)) .inputItems(new ComparableStack(ModItems.battery_pack, 1, EnumBatteryPack.BATTERY_LEAD), new OreDictStack(STEEL.ingot(), 16), new ComparableStack(ModItems.motor, 3), new ComparableStack(ModItems.circuit, 1, EnumCircuitType.ADVANCED), new OreDictStack(STEEL.pipe(), 3), new OreDictStack(GUNMETAL.mechanism(), 3), new ComparableStack(ModBlocks.crate_iron, 1), new ComparableStack(ModItems.crt_display, 1)) @@ -891,7 +865,7 @@ public class AssemblyMachineRecipes extends GenericRecipes { this.register(new GenericRecipe("ass.mpw10taint").setup(100, 100).outputItems(new ItemStack(ModItems.mp_warhead_10_taint, 1)) .inputItems(new ComparableStack(ModItems.seg_10, 1), new OreDictStack(STEEL.plate(), 12), new ComparableStack(ModBlocks.det_cord, 2), new ComparableStack(ModItems.powder_magic, 12), new OreDictStack(Fluids.WATZ.getDict(1_000), 1))); this.register(new GenericRecipe("ass.mpw10cloud").setup(100, 100).outputItems(new ItemStack(ModItems.mp_warhead_10_cloud, 1)) - .inputItems(new ComparableStack(ModItems.seg_10, 1), new OreDictStack(STEEL.plate(), 12), new ComparableStack(ModBlocks.det_cord, 2), new ComparableStack(ModItems.grenade_pink_cloud, 2))); + .inputItems(new ComparableStack(ModItems.seg_10, 1), new OreDictStack(STEEL.plate(), 12), new ComparableStack(ModBlocks.det_cord, 2), new ComparableStack(ModItems.powder_magic, 16))); this.register(new GenericRecipe("ass.mpw15he").setup(200, 100).outputItems(new ItemStack(ModItems.mp_warhead_15_he, 1)) .inputItems(new ComparableStack(ModItems.seg_15, 1), new OreDictStack(STEEL.plate(), 12), new OreDictStack(ANY_HIGHEXPLOSIVE.ingot(), 12), new ComparableStack(ModItems.circuit, 3, EnumCircuitType.BASIC))); this.register(new GenericRecipe("ass.mpw15inc").setup(200, 100).outputItems(new ItemStack(ModItems.mp_warhead_15_incendiary, 1)) diff --git a/src/main/java/com/hbm/itempool/ItemPoolsLegacy.java b/src/main/java/com/hbm/itempool/ItemPoolsLegacy.java index 76cad0680..4b17cb1f9 100644 --- a/src/main/java/com/hbm/itempool/ItemPoolsLegacy.java +++ b/src/main/java/com/hbm/itempool/ItemPoolsLegacy.java @@ -8,6 +8,11 @@ import com.hbm.items.machine.ItemBatteryPack.EnumBatteryPack; import com.hbm.items.machine.ItemBreedingRod.BreedingRodType; import com.hbm.items.machine.ItemCircuit.EnumCircuitType; import com.hbm.items.machine.ItemZirnoxRod.EnumZirnoxType; +import com.hbm.items.weapon.grenade.ItemGrenadeUniversal; +import com.hbm.items.weapon.grenade.ItemGrenadeExtra.EnumGrenadeExtra; +import com.hbm.items.weapon.grenade.ItemGrenadeFilling.EnumGrenadeFilling; +import com.hbm.items.weapon.grenade.ItemGrenadeFuze.EnumGrenadeFuze; +import com.hbm.items.weapon.grenade.ItemGrenadeShell.EnumGrenadeShell; import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo; import static com.hbm.lib.HbmChestContents.*; @@ -111,9 +116,9 @@ public class ItemPoolsLegacy { weighted(ModItems.ammo_standard, EnumAmmo.ROCKET_HE.ordinal(), 1, 4, 5), weighted(ModItems.ammo_standard, EnumAmmo.G26_FLARE_SUPPLY.ordinal(), 1, 1, 5), weighted(ModItems.ammo_standard, EnumAmmo.G26_FLARE_WEAPON.ordinal(), 1, 1, 3), - weighted(ModItems.grenade_nuclear, 0, 1, 1, 2), - weighted(ModItems.grenade_smart, 0, 1, 3, 3), - weighted(ModItems.grenade_mirv, 0, 1, 1, 2), + weighted(ItemGrenadeUniversal.make(EnumGrenadeShell.NUKE, EnumGrenadeFilling.NUCLEAR, EnumGrenadeFuze.S7), 1, 1, 2), + weighted(ItemGrenadeUniversal.make(EnumGrenadeShell.FRAG, EnumGrenadeFilling.CLUSTER, EnumGrenadeFuze.S7), 1, 3, 3), + weighted(ModItems.grenade_extra, EnumGrenadeExtra.TRIPLEX.ordinal(), 1, 1, 1), weighted(ModItems.stealth_boy, 0, 1, 1, 2), weighted(ModItems.battery_pack, EnumBatteryPack.BATTERY_LITHIUM.ordinal(), 1, 1, 1), weighted(ModItems.syringe_awesome, 0, 1, 1, 1), @@ -202,7 +207,7 @@ public class ItemPoolsLegacy { weighted(ModItems.stealth_boy, 0, 1, 1, 7), weighted(ModItems.gas_mask_m65, 0, 1, 1, 5), weighted(ModItems.gas_mask_filter, 0, 1, 1, 5), - weighted(ModItems.grenade_nuclear, 0, 1, 2, 2), + weighted(ItemGrenadeUniversal.make(EnumGrenadeShell.NUKE, EnumGrenadeFilling.NUCLEAR, EnumGrenadeFuze.S7), 1, 2, 2), weighted(ModItems.bomb_caller, 0, 1, 1, 1), weighted(ModItems.bomb_caller, 1, 1, 1, 1), weighted(ModItems.bomb_caller, 2, 1, 1, 2) diff --git a/src/main/java/com/hbm/itempool/ItemPoolsPile.java b/src/main/java/com/hbm/itempool/ItemPoolsPile.java index 68e9d6d4a..c8e78b24f 100644 --- a/src/main/java/com/hbm/itempool/ItemPoolsPile.java +++ b/src/main/java/com/hbm/itempool/ItemPoolsPile.java @@ -4,6 +4,11 @@ import static com.hbm.lib.HbmChestContents.weighted; import com.hbm.inventory.material.Mats; import com.hbm.items.ModItems; +import com.hbm.items.weapon.grenade.ItemGrenadeExtra.EnumGrenadeExtra; +import com.hbm.items.weapon.grenade.ItemGrenadeFilling.EnumGrenadeFilling; +import com.hbm.items.weapon.grenade.ItemGrenadeFuze.EnumGrenadeFuze; +import com.hbm.items.weapon.grenade.ItemGrenadeShell.EnumGrenadeShell; +import com.hbm.items.weapon.grenade.ItemGrenadeUniversal; import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo; import net.minecraft.init.Items; @@ -43,7 +48,8 @@ public class ItemPoolsPile { //Weapons weighted(ModItems.gun_maresleg, 0, 1, 1, 5), weighted(ModItems.gun_light_revolver, 0, 1, 1, 1), - weighted(ModItems.grenade_if_generic, 0, 1, 2, 5), + weighted(ItemGrenadeUniversal.make(EnumGrenadeShell.FRAG, EnumGrenadeFilling.HE, EnumGrenadeFuze.S3, EnumGrenadeExtra.FRAG_SLEEVE), 1, 2, 5), + weighted(ItemGrenadeUniversal.make(EnumGrenadeShell.STICK, EnumGrenadeFilling.DEMO, EnumGrenadeFuze.IMPACT), 1, 2, 3), weighted(ModItems.ammo_standard, EnumAmmo.G12.ordinal(), 4, 4, 10), weighted(ModItems.ammo_standard, EnumAmmo.M357_SP.ordinal(), 6, 12, 10), weighted(ModItems.ammo_standard, EnumAmmo.G40_HE.ordinal(), 1, 1, 2), diff --git a/src/main/java/com/hbm/itempool/ItemPoolsSingle.java b/src/main/java/com/hbm/itempool/ItemPoolsSingle.java index 8950a9e06..73623ef83 100644 --- a/src/main/java/com/hbm/itempool/ItemPoolsSingle.java +++ b/src/main/java/com/hbm/itempool/ItemPoolsSingle.java @@ -5,6 +5,11 @@ import static com.hbm.lib.HbmChestContents.weighted; import com.hbm.blocks.ModBlocks; import com.hbm.items.ModItems; import com.hbm.items.machine.ItemCircuit.EnumCircuitType; +import com.hbm.items.weapon.grenade.ItemGrenadeExtra.EnumGrenadeExtra; +import com.hbm.items.weapon.grenade.ItemGrenadeFilling.EnumGrenadeFilling; +import com.hbm.items.weapon.grenade.ItemGrenadeFuze.EnumGrenadeFuze; +import com.hbm.items.weapon.grenade.ItemGrenadeShell.EnumGrenadeShell; +import com.hbm.items.weapon.grenade.ItemGrenadeUniversal; import com.hbm.items.weapon.sedna.factory.GunFactory.EnumAmmo; import net.minecraft.init.Items; @@ -33,8 +38,8 @@ public class ItemPoolsSingle { weighted(ModItems.ammo_standard, EnumAmmo.P9_JHP.ordinal(), 48, 64, 2), weighted(ModItems.circuit, EnumCircuitType.CHIP.ordinal(), 3, 6, 1), weighted(ModItems.gas_mask_m65, 0, 1, 1, 1), - weighted(ModItems.grenade_if_he, 0, 1, 1, 1), - weighted(ModItems.grenade_if_incendiary, 0, 1, 1, 1), + weighted(ItemGrenadeUniversal.make(EnumGrenadeShell.FRAG, EnumGrenadeFilling.HE, EnumGrenadeFuze.S3), 1, 1, 1), + weighted(ItemGrenadeUniversal.make(EnumGrenadeShell.FRAG, EnumGrenadeFilling.INC, EnumGrenadeFuze.S3), 1, 1, 1), weighted(Items.diamond, 0, 1, 2, 1) }; }}; @@ -46,8 +51,8 @@ public class ItemPoolsSingle { weighted(Items.diamond, 0, 3, 6, 1), weighted(ModItems.ammo_standard, EnumAmmo.NUKE_STANDARD.ordinal(), 1, 1, 1), weighted(ModItems.ammo_container, 0, 1, 1, 1), - weighted(ModItems.grenade_nuclear, 0, 1, 1, 1), - weighted(ModItems.grenade_smart, 0, 1, 6, 1), + weighted(ItemGrenadeUniversal.make(EnumGrenadeShell.NUKE, EnumGrenadeFilling.NUCLEAR, EnumGrenadeFuze.S7), 1, 1, 1), + weighted(ItemGrenadeUniversal.make(EnumGrenadeShell.TECH, EnumGrenadeFilling.EMP, EnumGrenadeFuze.S3), 1, 6, 1), weighted(ModItems.powder_yellowcake, 0, 16, 24, 1), weighted(ModItems.gun_uzi, 0, 1, 1, 1), weighted(ModItems.circuit, EnumCircuitType.VACUUM_TUBE.ordinal(), 12, 16, 1), @@ -63,8 +68,8 @@ public class ItemPoolsSingle { weighted(Items.diamond, 0, 5, 9, 1), weighted(ModItems.ammo_standard, EnumAmmo.NUKE_STANDARD.ordinal(), 1, 3, 1), weighted(ModItems.ammo_container, 0, 1, 4, 1), - weighted(ModItems.grenade_nuclear, 0, 1, 2, 1), - weighted(ModItems.grenade_mirv, 0, 1, 1, 1), + weighted(ItemGrenadeUniversal.make(EnumGrenadeShell.NUKE, EnumGrenadeFilling.NUCLEAR, EnumGrenadeFuze.S7), 1, 2, 1), + weighted(ItemGrenadeUniversal.make(EnumGrenadeShell.STICK, EnumGrenadeFilling.HE, EnumGrenadeFuze.IMPACT, EnumGrenadeExtra.TRIPLEX), 1, 1, 1), weighted(ModItems.powder_yellowcake, 0, 26, 42, 1), weighted(ModItems.gun_heavy_revolver, 0, 1, 1, 1), weighted(ModItems.circuit, EnumCircuitType.CHIP.ordinal(), 18, 32, 1), diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 2ab2372c4..2f1e2cf9e 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -1454,55 +1454,8 @@ public class ModItems { public static Item grenade_extra; public static Item grenade_universal; - @Deprecated public static Item grenade_generic; - @Deprecated public static Item grenade_strong; - @Deprecated public static Item grenade_frag; - @Deprecated public static Item grenade_fire; - @Deprecated public static Item grenade_shrapnel; - @Deprecated public static Item grenade_cluster; - @Deprecated public static Item grenade_flare; - @Deprecated public static Item grenade_electric; - @Deprecated public static Item grenade_poison; - @Deprecated public static Item grenade_gas; - @Deprecated public static Item grenade_pulse; - @Deprecated public static Item grenade_plasma; - @Deprecated public static Item grenade_tau; - @Deprecated public static Item grenade_schrabidium; - @Deprecated public static Item grenade_lemon; - @Deprecated public static Item grenade_gascan; - @Deprecated public static Item grenade_kyiv; - @Deprecated public static Item grenade_mk2; - @Deprecated public static Item grenade_aschrab; - @Deprecated public static Item grenade_nuke; - @Deprecated public static Item grenade_nuclear; - @Deprecated public static Item grenade_zomg; - @Deprecated public static Item grenade_black_hole; - @Deprecated public static Item grenade_cloud; - @Deprecated public static Item grenade_pink_cloud; - public static Item ullapool_caber; - @Deprecated public static Item grenade_if_generic; - @Deprecated public static Item grenade_if_he; - @Deprecated public static Item grenade_if_bouncy; - @Deprecated public static Item grenade_if_sticky; - @Deprecated public static Item grenade_if_impact; - @Deprecated public static Item grenade_if_incendiary; - @Deprecated public static Item grenade_if_toxic; - @Deprecated public static Item grenade_if_concussion; - @Deprecated public static Item grenade_if_brimstone; - @Deprecated public static Item grenade_if_mystery; - @Deprecated public static Item grenade_if_spark; - @Deprecated public static Item grenade_if_hopwire; - @Deprecated public static Item grenade_if_null; - - @Deprecated public static Item grenade_smart; - @Deprecated public static Item grenade_mirv; - @Deprecated public static Item grenade_breach; - @Deprecated public static Item grenade_burst; - - public static Item nuclear_waste_pearl; - public static Item weaponized_starblaster_cell; public static Item bomb_waffle; @@ -2054,7 +2007,6 @@ public class ModItems { public static Item tsar_kit; public static Item multi_kit; public static Item custom_kit; - public static Item grenade_kit; public static Item fleija_kit; public static Item prototype_kit; public static Item missile_kit; @@ -3683,7 +3635,7 @@ public class ModItems { ToolMaterial matCrucible = EnumHelper.addToolMaterial("CRUCIBLE", 10, 3, 50.0F, 100.0F, 0); crucible = new ItemCrucible(5000, 1F, matCrucible).setUnlocalizedName("crucible").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":crucible"); - stick_dynamite = new ItemGrenade(3).setUnlocalizedName("stick_dynamite").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":stick_dynamite"); + stick_dynamite = new ItemGrenadeDynamite(3).setUnlocalizedName("stick_dynamite").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":stick_dynamite"); stick_dynamite_fishing = new ItemGrenadeFishing(3).setUnlocalizedName("stick_dynamite_fishing").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":stick_dynamite_fishing"); stick_tnt = new Item().setUnlocalizedName("stick_tnt").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":stick_tnt"); stick_semtex = new Item().setUnlocalizedName("stick_semtex").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":stick_semtex"); @@ -3695,53 +3647,8 @@ public class ModItems { grenade_extra = new ItemGrenadeExtra().setUnlocalizedName("grenade_extra").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_extra"); grenade_universal = new ItemGrenadeUniversal().setUnlocalizedName("grenade_universal").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_universal"); - grenade_generic = new ItemGrenade(4).setUnlocalizedName("grenade_generic").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_generic"); - grenade_strong = new ItemGrenade(5).setUnlocalizedName("grenade_strong").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_strong"); - grenade_frag = new ItemGrenade(4).setUnlocalizedName("grenade_frag").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_frag_alt"); - grenade_fire = new ItemGrenade(4).setUnlocalizedName("grenade_fire").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_fire_alt"); - grenade_shrapnel = new ItemGrenade(4).setUnlocalizedName("grenade_shrapnel").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_shrapnel"); - grenade_cluster = new ItemGrenade(5).setUnlocalizedName("grenade_cluster").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_cluster_alt"); - grenade_flare = new ItemGrenade(0).setUnlocalizedName("grenade_flare").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_flare_alt"); - grenade_electric = new ItemGrenade(5).setUnlocalizedName("grenade_electric").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_electric_alt"); - grenade_poison = new ItemGrenade(4).setUnlocalizedName("grenade_poison").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_poison_alt"); - grenade_gas = new ItemGrenade(4).setUnlocalizedName("grenade_gas").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_gas_alt"); - grenade_pulse = new ItemGrenade(4).setUnlocalizedName("grenade_pulse").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_pulse"); - grenade_plasma = new ItemGrenade(5).setUnlocalizedName("grenade_plasma").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_plasma_alt"); - grenade_tau = new ItemGrenade(5).setUnlocalizedName("grenade_tau").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_tau_alt"); - grenade_schrabidium = new ItemGrenade(7).setUnlocalizedName("grenade_schrabidium").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_schrabidium_alt"); - grenade_lemon = new ItemGrenade(4).setUnlocalizedName("grenade_lemon").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_lemon"); - grenade_gascan = new ItemGrenade(-1).setUnlocalizedName("grenade_gascan").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_gascan"); - grenade_kyiv = new ItemGrenadeKyiv(-1).setUnlocalizedName("grenade_kyiv").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_kyiv"); - grenade_mk2 = new ItemGrenade(5).setUnlocalizedName("grenade_mk2").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_mk2_alt"); - grenade_aschrab = new ItemGrenade(-1).setUnlocalizedName("grenade_aschrab").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_aschrab"); - grenade_nuke = new ItemGrenade(-1).setUnlocalizedName("grenade_nuke").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_nuke_alt"); - grenade_nuclear = new ItemGrenade(7).setUnlocalizedName("grenade_nuclear").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_nuclear"); - grenade_zomg = new ItemGrenade(7).setUnlocalizedName("grenade_zomg").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_zomg"); - grenade_black_hole = new ItemGrenade(7).setUnlocalizedName("grenade_black_hole").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_black_hole"); - grenade_cloud = new ItemGrenade(-1).setUnlocalizedName("grenade_cloud").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_cloud"); - grenade_pink_cloud = new ItemGrenade(-1).setUnlocalizedName("grenade_pink_cloud").setCreativeTab(null).setTextureName(RefStrings.MODID + ":grenade_pink_cloud"); ullapool_caber = new WeaponSpecial(MainRegistry.tMatSteel).setUnlocalizedName("ullapool_caber").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":ullapool_caber"); - grenade_if_generic = new ItemGrenade(4).setUnlocalizedName("grenade_if_generic").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_if_generic"); - grenade_if_he = new ItemGrenade(5).setUnlocalizedName("grenade_if_he").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_if_he"); - grenade_if_bouncy = new ItemGrenade(4).setUnlocalizedName("grenade_if_bouncy").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_if_bouncy"); - grenade_if_sticky = new ItemGrenade(4).setUnlocalizedName("grenade_if_sticky").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_if_sticky"); - grenade_if_impact = new ItemGrenade(-1).setUnlocalizedName("grenade_if_impact").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_if_impact"); - grenade_if_incendiary = new ItemGrenade(4).setUnlocalizedName("grenade_if_incendiary").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_if_incendiary"); - grenade_if_toxic = new ItemGrenade(4).setUnlocalizedName("grenade_if_toxic").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_if_toxic"); - grenade_if_concussion = new ItemGrenade(4).setUnlocalizedName("grenade_if_concussion").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_if_concussion"); - grenade_if_brimstone = new ItemGrenade(5).setUnlocalizedName("grenade_if_brimstone").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_if_brimstone"); - grenade_if_mystery = new ItemGrenade(5).setUnlocalizedName("grenade_if_mystery").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_if_mystery"); - grenade_if_spark = new ItemGrenade(7).setUnlocalizedName("grenade_if_spark").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_if_spark"); - grenade_if_hopwire = new ItemGrenade(7).setUnlocalizedName("grenade_if_hopwire").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_if_hopwire"); - grenade_if_null = new ItemGrenade(7).setUnlocalizedName("grenade_if_null").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_if_null"); - - grenade_smart = new ItemGrenade(-1).setUnlocalizedName("grenade_smart").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_smart"); - grenade_mirv = new ItemGrenade(1).setUnlocalizedName("grenade_mirv").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_mirv"); - grenade_breach = new ItemGrenade(-1).setUnlocalizedName("grenade_breach").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_breach"); - grenade_burst = new ItemGrenade(1).setUnlocalizedName("grenade_burst").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_burst"); - nuclear_waste_pearl = new ItemGrenade(-1).setUnlocalizedName("nuclear_waste_pearl").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":nuclear_waste_pearl"); - weaponized_starblaster_cell = new WeaponizedCell().setUnlocalizedName("weaponized_starblaster_cell").setMaxStackSize(1).setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_b92_ammo_weaponized"); bomb_waffle = new ItemWaffle(20, false).setUnlocalizedName("bomb_waffle").setCreativeTab(MainRegistry.consumableTab).setTextureName(RefStrings.MODID + ":bomb_waffle"); @@ -3957,7 +3864,6 @@ public class ModItems { tsar_kit = new ItemStarterKit().setUnlocalizedName("tsar_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":tsar_kit"); multi_kit = new ItemStarterKit().setUnlocalizedName("multi_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":multi_kit"); custom_kit = new ItemStarterKit().setUnlocalizedName("custom_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":custom_kit"); - grenade_kit = new ItemStarterKit().setUnlocalizedName("grenade_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":grenade_kit"); fleija_kit = new ItemStarterKit().setUnlocalizedName("fleija_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":fleija_kit"); prototype_kit = new ItemStarterKit().setUnlocalizedName("prototype_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.nukeTab).setTextureName(RefStrings.MODID + ":prototype_kit"); missile_kit = new ItemStarterKit().setUnlocalizedName("missile_kit").setMaxStackSize(1).setCreativeTab(MainRegistry.missileTab).setTextureName(RefStrings.MODID + ":missile_kit"); @@ -6044,51 +5950,6 @@ public class ModItems { GameRegistry.registerItem(grenade_fuze, grenade_fuze.getUnlocalizedName()); GameRegistry.registerItem(grenade_extra, grenade_extra.getUnlocalizedName()); GameRegistry.registerItem(grenade_universal, grenade_universal.getUnlocalizedName()); - - GameRegistry.registerItem(grenade_generic, grenade_generic.getUnlocalizedName()); - GameRegistry.registerItem(grenade_strong, grenade_strong.getUnlocalizedName()); - GameRegistry.registerItem(grenade_frag, grenade_frag.getUnlocalizedName()); - GameRegistry.registerItem(grenade_fire, grenade_fire.getUnlocalizedName()); - GameRegistry.registerItem(grenade_shrapnel, grenade_shrapnel.getUnlocalizedName()); - GameRegistry.registerItem(grenade_cluster, grenade_cluster.getUnlocalizedName()); - GameRegistry.registerItem(grenade_flare, grenade_flare.getUnlocalizedName()); - GameRegistry.registerItem(grenade_electric, grenade_electric.getUnlocalizedName()); - GameRegistry.registerItem(grenade_poison, grenade_poison.getUnlocalizedName()); - GameRegistry.registerItem(grenade_gas, grenade_gas.getUnlocalizedName()); - GameRegistry.registerItem(grenade_cloud, grenade_cloud.getUnlocalizedName()); - GameRegistry.registerItem(grenade_pink_cloud, grenade_pink_cloud.getUnlocalizedName()); - GameRegistry.registerItem(grenade_smart, grenade_smart.getUnlocalizedName()); - GameRegistry.registerItem(grenade_mirv, grenade_mirv.getUnlocalizedName()); - GameRegistry.registerItem(grenade_breach, grenade_breach.getUnlocalizedName()); - GameRegistry.registerItem(grenade_burst, grenade_burst.getUnlocalizedName()); - GameRegistry.registerItem(grenade_pulse, grenade_pulse.getUnlocalizedName()); - GameRegistry.registerItem(grenade_plasma, grenade_plasma.getUnlocalizedName()); - GameRegistry.registerItem(grenade_tau, grenade_tau.getUnlocalizedName()); - GameRegistry.registerItem(grenade_schrabidium, grenade_schrabidium.getUnlocalizedName()); - GameRegistry.registerItem(grenade_nuke, grenade_nuke.getUnlocalizedName()); - GameRegistry.registerItem(grenade_lemon, grenade_lemon.getUnlocalizedName()); - GameRegistry.registerItem(grenade_gascan, grenade_gascan.getUnlocalizedName()); - GameRegistry.registerItem(grenade_kyiv, grenade_kyiv.getUnlocalizedName()); - GameRegistry.registerItem(grenade_mk2, grenade_mk2.getUnlocalizedName()); - GameRegistry.registerItem(grenade_aschrab, grenade_aschrab.getUnlocalizedName()); - GameRegistry.registerItem(grenade_nuclear, grenade_nuclear.getUnlocalizedName()); - GameRegistry.registerItem(grenade_zomg, grenade_zomg.getUnlocalizedName()); - GameRegistry.registerItem(grenade_black_hole, grenade_black_hole.getUnlocalizedName()); - - GameRegistry.registerItem(grenade_if_generic, grenade_if_generic.getUnlocalizedName()); - GameRegistry.registerItem(grenade_if_he, grenade_if_he.getUnlocalizedName()); - GameRegistry.registerItem(grenade_if_bouncy, grenade_if_bouncy.getUnlocalizedName()); - GameRegistry.registerItem(grenade_if_sticky, grenade_if_sticky.getUnlocalizedName()); - GameRegistry.registerItem(grenade_if_impact, grenade_if_impact.getUnlocalizedName()); - GameRegistry.registerItem(grenade_if_incendiary, grenade_if_incendiary.getUnlocalizedName()); - GameRegistry.registerItem(grenade_if_toxic, grenade_if_toxic.getUnlocalizedName()); - GameRegistry.registerItem(grenade_if_concussion, grenade_if_concussion.getUnlocalizedName()); - GameRegistry.registerItem(grenade_if_brimstone, grenade_if_brimstone.getUnlocalizedName()); - GameRegistry.registerItem(grenade_if_mystery, grenade_if_mystery.getUnlocalizedName()); - GameRegistry.registerItem(grenade_if_spark, grenade_if_spark.getUnlocalizedName()); - GameRegistry.registerItem(grenade_if_hopwire, grenade_if_hopwire.getUnlocalizedName()); - GameRegistry.registerItem(grenade_if_null, grenade_if_null.getUnlocalizedName()); - GameRegistry.registerItem(nuclear_waste_pearl, nuclear_waste_pearl.getUnlocalizedName()); //Disperser Canister GameRegistry.registerItem(disperser_canister_empty, disperser_canister_empty.getUnlocalizedName()); @@ -6678,7 +6539,6 @@ public class ModItems { GameRegistry.registerItem(multi_kit, multi_kit.getUnlocalizedName()); GameRegistry.registerItem(custom_kit, custom_kit.getUnlocalizedName()); GameRegistry.registerItem(missile_kit, missile_kit.getUnlocalizedName()); - GameRegistry.registerItem(grenade_kit, grenade_kit.getUnlocalizedName()); GameRegistry.registerItem(hazmat_kit, hazmat_kit.getUnlocalizedName()); GameRegistry.registerItem(hazmat_red_kit, hazmat_red_kit.getUnlocalizedName()); GameRegistry.registerItem(hazmat_grey_kit, hazmat_grey_kit.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/items/special/ItemStarterKit.java b/src/main/java/com/hbm/items/special/ItemStarterKit.java index 38eb5b124..5c4333b1f 100644 --- a/src/main/java/com/hbm/items/special/ItemStarterKit.java +++ b/src/main/java/com/hbm/items/special/ItemStarterKit.java @@ -293,38 +293,6 @@ public class ItemStarterKit extends Item { player.inventory.addItemStackToInventory(new ItemStack(ModItems.custom_fall, 1)); } - if(this == ModItems.grenade_kit) - { - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_generic, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_strong, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_frag, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_fire, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_shrapnel, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_cluster, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_flare, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_electric, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_poison, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_gas, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_cloud, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_pink_cloud, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_smart, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_mirv, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_breach, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_burst, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_pulse, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_plasma, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_tau, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_schrabidium, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_lemon, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_gascan, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_mk2, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_aschrab, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_nuke, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_nuclear, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_zomg, 16)); - player.inventory.addItemStackToInventory(new ItemStack(ModItems.grenade_black_hole, 16)); - } - if(this == ModItems.fleija_kit) { player.inventory.addItemStackToInventory(new ItemStack(Item.getItemFromBlock(ModBlocks.nuke_fleija), 1)); @@ -448,7 +416,6 @@ public class ItemStarterKit extends Item { this == ModItems.prototype_kit || this == ModItems.fleija_kit || this == ModItems.solinium_kit || - this == ModItems.grenade_kit || this == ModItems.missile_kit || this == ModItems.multi_kit) { list.add("Please empty inventory before opening!"); diff --git a/src/main/java/com/hbm/items/weapon/GunB92.java b/src/main/java/com/hbm/items/weapon/GunB92.java index 32dea25a6..fc65e053f 100644 --- a/src/main/java/com/hbm/items/weapon/GunB92.java +++ b/src/main/java/com/hbm/items/weapon/GunB92.java @@ -6,7 +6,7 @@ import java.util.Random; import com.google.common.collect.Multimap; import com.hbm.entity.effect.EntityCloudFleijaRainbow; import com.hbm.entity.logic.EntityNukeExplosionMK3; -import com.hbm.entity.projectile.EntityExplosiveBeam; +import com.hbm.entity.projectile.EntityB92Beam; import com.hbm.interfaces.Spaghetti; import com.hbm.main.MainRegistry; @@ -62,8 +62,8 @@ public class GunB92 extends Item { if (!p_77615_2_.isRemote) for(int i = 0; i < getPower(p_77615_1_); i++) { - EntityExplosiveBeam entityarrow1; - entityarrow1 = new EntityExplosiveBeam(p_77615_2_, p_77615_3_, 3.0F); + EntityB92Beam entityarrow1; + entityarrow1 = new EntityB92Beam(p_77615_2_, p_77615_3_, 3.0F); float divergence = i * 0.2F; diff --git a/src/main/java/com/hbm/items/weapon/ItemGrenade.java b/src/main/java/com/hbm/items/weapon/ItemGrenade.java index 4bca576fe..b7e893638 100644 --- a/src/main/java/com/hbm/items/weapon/ItemGrenade.java +++ b/src/main/java/com/hbm/items/weapon/ItemGrenade.java @@ -1,16 +1,6 @@ package com.hbm.items.weapon; -import java.util.List; - -import com.hbm.entity.grenade.*; -import com.hbm.items.ModItems; - -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.EnumRarity; import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.EnumChatFormatting; -import net.minecraft.world.World; public class ItemGrenade extends Item { @@ -20,256 +10,6 @@ public class ItemGrenade extends Item { this.maxStackSize = 16; this.fuse = fuse; } - - @Override - public ItemStack onItemRightClick(ItemStack p_77659_1_, World p_77659_2_, EntityPlayer p_77659_3_) { - if (!p_77659_3_.capabilities.isCreativeMode) { - --p_77659_1_.stackSize; - } - - p_77659_2_.playSoundAtEntity(p_77659_3_, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); - - //TODO: - /* - * kill all this stupid bullshit - * make a PROPER grenade entity base class - * have all the grenade items be an NBT stat in the entity instead of having new entities for every fucking grenade type - * register explosion effects with some lambdas to save on LOC - * jesus christ why do i keep doing this - */ - if (!p_77659_2_.isRemote) { - if (this == ModItems.grenade_generic) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeGeneric(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_strong) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeStrong(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_frag) { - EntityGrenadeFrag frag = new EntityGrenadeFrag(p_77659_2_, p_77659_3_); - frag.shooter = p_77659_3_; - p_77659_2_.spawnEntityInWorld(frag); - } - if (this == ModItems.grenade_fire) { - EntityGrenadeFire fire = new EntityGrenadeFire(p_77659_2_, p_77659_3_); - fire.shooter = p_77659_3_; - p_77659_2_.spawnEntityInWorld(fire); - } - if (this == ModItems.grenade_cluster) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeCluster(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_flare) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeFlare(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_electric) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeElectric(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_poison) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadePoison(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_gas) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeGas(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_schrabidium) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeSchrabidium(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_nuke) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeNuke(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_nuclear) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeNuclear(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_pulse) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadePulse(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_plasma) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadePlasma(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_tau) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeTau(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_lemon) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeLemon(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_mk2) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeMk2(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_aschrab) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeASchrab(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_zomg) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeZOMG(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_shrapnel) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeShrapnel(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_black_hole) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeBlackHole(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_gascan) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeGascan(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_cloud) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeCloud(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_pink_cloud) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadePC(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_smart) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeSmart(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_mirv) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeMIRV(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_breach) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeBreach(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_burst) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeBurst(p_77659_2_, p_77659_3_)); - } - - if (this == ModItems.grenade_if_generic) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeIFGeneric(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_if_he) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeIFHE(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_if_bouncy) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeIFBouncy(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_if_sticky) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeIFSticky(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_if_impact) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeIFImpact(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_if_incendiary) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeIFIncendiary(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_if_toxic) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeIFToxic(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_if_concussion) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeIFConcussion(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_if_brimstone) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeIFBrimstone(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_if_mystery) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeIFMystery(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_if_spark) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeIFSpark(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_if_hopwire) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeIFHopwire(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.grenade_if_null) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeIFNull(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.nuclear_waste_pearl) { - p_77659_2_.spawnEntityInWorld(new EntityWastePearl(p_77659_2_, p_77659_3_)); - } - if (this == ModItems.stick_dynamite) { - p_77659_2_.spawnEntityInWorld(new EntityGrenadeDynamite(p_77659_2_, p_77659_3_)); - } - } - - return p_77659_1_; - } - - @Override - public EnumRarity getRarity(ItemStack p_77613_1_) { - - if (this == ModItems.grenade_schrabidium || this == ModItems.grenade_aschrab || this == ModItems.grenade_cloud) { - return EnumRarity.rare; - } - - if (this == ModItems.grenade_plasma || this == ModItems.grenade_zomg || this == ModItems.grenade_black_hole || this == ModItems.grenade_pink_cloud) { - return EnumRarity.epic; - } - - if (this == ModItems.grenade_nuke || this == ModItems.grenade_nuclear || this == ModItems.grenade_tau || this == ModItems.grenade_lemon || this == ModItems.grenade_mk2 || this == ModItems.grenade_pulse || this == ModItems.grenade_gascan) { - return EnumRarity.uncommon; - } - - return EnumRarity.common; - } - - private String translateFuse() { - if(fuse == -1) - return "Impact"; - - if(fuse == 0) - return "Instant"; - - return fuse + "s"; - } - - @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) { - - list.add("Fuse: " + translateFuse()); - - if (this == ModItems.grenade_smart) { - list.add(""); - list.add("\"Why did it not blow up????\""); - list.add(EnumChatFormatting.ITALIC + "If it didn't blow up it means it worked."); - } - - if (this == ModItems.grenade_if_generic) { - list.add(""); - list.add(EnumChatFormatting.ITALIC + "\"How do you like " + EnumChatFormatting.RESET + EnumChatFormatting.GRAY + "them" + EnumChatFormatting.ITALIC + " apples?\""); - } - if (this == ModItems.grenade_if_he) { - list.add(""); - list.add(EnumChatFormatting.ITALIC + "\"You better run, you better take cover!\""); - } - if (this == ModItems.grenade_if_bouncy) { - list.add(""); - list.add(EnumChatFormatting.ITALIC + "\"Boing!\""); - } - if (this == ModItems.grenade_if_sticky) { - list.add(""); - list.add(EnumChatFormatting.ITALIC + "\"This one is the booger grenade.\""); - } - if (this == ModItems.grenade_if_impact) { - list.add(""); - list.add(EnumChatFormatting.ITALIC + "\"Tossable boom.\""); - } - if (this == ModItems.grenade_if_incendiary) { - list.add(""); - list.add(EnumChatFormatting.ITALIC + "\"Flaming wheel of destruction!\""); - } - if (this == ModItems.grenade_if_toxic) { - list.add(""); - list.add(EnumChatFormatting.ITALIC + "\"TOXIC SHOCK\""); - } - if (this == ModItems.grenade_if_concussion) { - list.add(""); - list.add(EnumChatFormatting.ITALIC + "\"Oof ouch owie, my bones!\""); - } - if (this == ModItems.grenade_if_brimstone) { - list.add(""); - list.add(EnumChatFormatting.ITALIC + "\"Zoop!\""); - } - if (this == ModItems.grenade_if_mystery) { - list.add(""); - list.add(EnumChatFormatting.ITALIC + "\"It's a mystery!\""); - } - if (this == ModItems.grenade_if_spark) { - list.add(""); - //list.add(EnumChatFormatting.ITALIC + "\"31-31-31-31-31-31-31-31-31-31-31-31-31\""); - list.add(EnumChatFormatting.ITALIC + "\"We can't rewind, we've gone too far.\""); - } - if (this == ModItems.grenade_if_hopwire) { - list.add(""); - list.add(EnumChatFormatting.ITALIC + "\"All I ever wished for was a bike that didn't fall over.\""); - } - if (this == ModItems.grenade_if_null) { - list.add(""); - list.add(EnumChatFormatting.ITALIC + "java.lang.NullPointerException"); - } - } public static int getFuseTicks(Item grenade) { return ((ItemGrenade)grenade).fuse * 20; diff --git a/src/main/java/com/hbm/items/weapon/ItemGrenadeDynamite.java b/src/main/java/com/hbm/items/weapon/ItemGrenadeDynamite.java new file mode 100644 index 000000000..98f903748 --- /dev/null +++ b/src/main/java/com/hbm/items/weapon/ItemGrenadeDynamite.java @@ -0,0 +1,25 @@ +package com.hbm.items.weapon; + +import com.hbm.explosion.vanillant.ExplosionVNT; +import com.hbm.explosion.vanillant.standard.EntityProcessorCrossSmooth; +import com.hbm.explosion.vanillant.standard.ExplosionEffectWeapon; +import com.hbm.explosion.vanillant.standard.PlayerProcessorStandard; + +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.world.World; + +public class ItemGrenadeDynamite extends ItemGenericGrenade { + + public ItemGrenadeDynamite(int fuse) { + super(fuse); + } + + public void explode(Entity grenade, EntityLivingBase thrower, World world, double x, double y, double z) { + ExplosionVNT vnt = new ExplosionVNT(grenade.worldObj, grenade.posX, grenade.posY, grenade.posZ, 5, thrower); + vnt.setEntityProcessor(new EntityProcessorCrossSmooth(1, 15)); + vnt.setPlayerProcessor(new PlayerProcessorStandard()); + vnt.setSFX(new ExplosionEffectWeapon(10, 2.5F, 1F)); + vnt.explode(); + } +} diff --git a/src/main/java/com/hbm/items/weapon/grenade/ItemGrenadeFilling.java b/src/main/java/com/hbm/items/weapon/grenade/ItemGrenadeFilling.java index bdfdfa8fc..dc28082ac 100644 --- a/src/main/java/com/hbm/items/weapon/grenade/ItemGrenadeFilling.java +++ b/src/main/java/com/hbm/items/weapon/grenade/ItemGrenadeFilling.java @@ -62,6 +62,7 @@ public class ItemGrenadeFilling extends ItemEnumMulti { HE(EXPLODE_HE, 0x595533, 0xA49D62, FRAG, STICK), // high explosive DEMO(EXPLODE_DEMO, 0x595533, 0xDD4029, FRAG, STICK), // demolition INC(EXPLODE_INC, 0x5A5A5A, 0xFF5F21, FRAG, STICK), // incendiary + WP(EXPLODE_WP, 0xDCDCDC, 0xFF5F21, FRAG, STICK), // white phosphorus CLUSTER(EXPLODE_CLUSTER, 0x5A5A5A, 0xFFC711, FRAG, STICK), // explosive pellets EMP(EXPLODE_EMP, 0x93A1AC, 0x00FFFF, TECH), // tesla PLASMA(EXPLODE_PLASMA, 0x655B2C, 0x4CFF00, TECH), // EMP but more oomph @@ -131,20 +132,38 @@ public class ItemGrenadeFilling extends ItemEnumMulti { fire.setPosition(grenade.posX, grenade.posY, grenade.posZ); world.spawnEntityInWorld(fire); for(int dx = -2; dx <= 2; dx++) for(int dy = -2; dy <= 2; dy++) for(int dz = -2; dz <= 2; dz++) { - int x = (int) Math.floor(grenade.posX) + dx; - int y = (int) Math.floor(grenade.posY) + dy; - int z = (int) Math.floor(grenade.posZ) + dz; - if(world.getBlock(x, y, z).isAir(grenade.worldObj, x, y, z)) { - for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { - if(world.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ).isFlammable(world, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite())) { - world.setBlock(x, y, z, Blocks.fire); - break; - } + int x = (int) Math.floor(grenade.posX) + dx; int y = (int) Math.floor(grenade.posY) + dy; int z = (int) Math.floor(grenade.posZ) + dz; + if(world.getBlock(x, y, z).isAir(grenade.worldObj, x, y, z)) for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if(world.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ).isFlammable(world, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite())) { + world.setBlock(x, y, z, Blocks.fire); + break; } } } }; + public static Consumer EXPLODE_WP = (grenade) -> { + World world = grenade.worldObj; + standardExplode(grenade, 3F, 10F); + EntityFireLingering fire = new EntityFireLingering(world).setArea(6, 2).setDuration(600).setType(EntityFireLingering.TYPE_PHOSPHORUS); + fire.setPosition(grenade.posX, grenade.posY, grenade.posZ); + world.spawnEntityInWorld(fire); + for(int dx = -3; dx <= 3; dx++) for(int dy = -3; dy <= 3; dy++) for(int dz = -3; dz <= 3; dz++) { + int x = (int) Math.floor(grenade.posX) + dx; int y = (int) Math.floor(grenade.posY) + dy; int z = (int) Math.floor(grenade.posZ) + dz; + if(world.getBlock(x, y, z).isAir(grenade.worldObj, x, y, z)) for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if(world.getBlock(x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ).isFlammable(world, x + dir.offsetX, y + dir.offsetY, z + dir.offsetZ, dir.getOpposite())) { + world.setBlock(x, y, z, Blocks.fire); + break; + } + } + } + for(int i = 0; i < 3; i++) { + NBTTagCompound haze = new NBTTagCompound(); + haze.setString("type", "haze"); + PacketThreading.createAllAroundThreadedPacket(new AuxParticlePacketNT(haze, grenade.posX + grenade.worldObj.rand.nextGaussian() * 4, grenade.posY, grenade.posZ + grenade.worldObj.rand.nextGaussian() * 4), new TargetPoint(grenade.dimension, grenade.posX, grenade.posY, grenade.posZ, 150)); + } + }; + public static Consumer EXPLODE_EMP = (grenade) -> { explodeStandardEnergy(grenade, 30F, 3F, DamageClass.ELECTRIC, 0.5F, 0.5F, 1F, 3F); }; diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 553fac826..9b25470df 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -598,7 +598,7 @@ public class ClientProxy extends ServerProxy { RenderingRegistry.registerEntityRenderingHandler(EntityBulletBaseMK4.class, new RenderBulletMK4()); RenderingRegistry.registerEntityRenderingHandler(EntityBulletBaseMK4CL.class, new RenderBulletMK4()); RenderingRegistry.registerEntityRenderingHandler(EntityBulletBeamBase.class, new RenderBeam()); - RenderingRegistry.registerEntityRenderingHandler(EntityExplosiveBeam.class, new RenderBeam5()); + RenderingRegistry.registerEntityRenderingHandler(EntityB92Beam.class, new RenderBeam5()); RenderingRegistry.registerEntityRenderingHandler(EntitySiegeLaser.class, new RenderSiegeLaser()); RenderingRegistry.registerEntityRenderingHandler(EntityBombletZeta.class, new RenderBombletTheta()); RenderingRegistry.registerEntityRenderingHandler(EntityMeteor.class, new RenderMeteor()); @@ -633,49 +633,6 @@ public class ClientProxy extends ServerProxy { RenderingRegistry.registerEntityRenderingHandler(EntityWaypoint.class, new RenderMist()); RenderingRegistry.registerEntityRenderingHandler(EntityAcidBomb.class, new RenderSnowball(Items.slime_ball)); //grenades - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeGeneric.class, new RenderSnowball(ModItems.grenade_generic)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeStrong.class, new RenderSnowball(ModItems.grenade_strong)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeFrag.class, new RenderSnowball(ModItems.grenade_frag)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeFire.class, new RenderSnowball(ModItems.grenade_fire)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeCluster.class, new RenderSnowball(ModItems.grenade_cluster)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeFlare.class, new RenderFlare()); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeElectric.class, new RenderSnowball(ModItems.grenade_electric)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadePoison.class, new RenderSnowball(ModItems.grenade_poison)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeGas.class, new RenderSnowball(ModItems.grenade_gas)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeSchrabidium.class, new RenderSnowball(ModItems.grenade_schrabidium)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeNuke.class, new RenderSnowball(ModItems.grenade_nuke)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeNuclear.class, new RenderSnowball(ModItems.grenade_nuclear)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadePlasma.class, new RenderSnowball(ModItems.grenade_plasma)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeTau.class, new RenderSnowball(ModItems.grenade_tau)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeLemon.class, new RenderSnowball(ModItems.grenade_lemon)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeMk2.class, new RenderGrenade()); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeZOMG.class, new RenderSnowball(ModItems.grenade_zomg)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeASchrab.class, new RenderGrenade()); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadePulse.class, new RenderSnowball(ModItems.grenade_pulse)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeShrapnel.class, new RenderSnowball(ModItems.grenade_shrapnel)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeBlackHole.class, new RenderSnowball(ModItems.grenade_black_hole)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeGascan.class, new RenderSnowball(ModItems.grenade_gascan)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeCloud.class, new RenderSnowball(ModItems.grenade_cloud)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadePC.class, new RenderSnowball(ModItems.grenade_pink_cloud)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeSmart.class, new RenderSnowball(ModItems.grenade_smart)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeMIRV.class, new RenderSnowball(ModItems.grenade_mirv)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeBreach.class, new RenderSnowball(ModItems.grenade_breach)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeBurst.class, new RenderSnowball(ModItems.grenade_burst)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFGeneric.class, new RenderSnowball(ModItems.grenade_if_generic)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFHE.class, new RenderSnowball(ModItems.grenade_if_he)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFBouncy.class, new RenderSnowball(ModItems.grenade_if_bouncy)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFSticky.class, new RenderSnowball(ModItems.grenade_if_sticky)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFImpact.class, new RenderSnowball(ModItems.grenade_if_impact)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFIncendiary.class, new RenderSnowball(ModItems.grenade_if_incendiary)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFToxic.class, new RenderSnowball(ModItems.grenade_if_toxic)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFConcussion.class, new RenderSnowball(ModItems.grenade_if_concussion)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFBrimstone.class, new RenderSnowball(ModItems.grenade_if_brimstone)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFMystery.class, new RenderSnowball(ModItems.grenade_if_mystery)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFSpark.class, new RenderSnowball(ModItems.grenade_if_spark)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFHopwire.class, new RenderSnowball(ModItems.grenade_if_hopwire)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeIFNull.class, new RenderSnowball(ModItems.grenade_if_null)); - RenderingRegistry.registerEntityRenderingHandler(EntityWastePearl.class, new RenderSnowball(ModItems.nuclear_waste_pearl)); - RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeDynamite.class, new RenderSnowball(ModItems.stick_dynamite)); RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeBouncyGeneric.class, new RenderGenericGrenade()); RenderingRegistry.registerEntityRenderingHandler(EntityGrenadeImpactGeneric.class, new RenderGenericGrenade()); RenderingRegistry.registerEntityRenderingHandler(EntityDisperserCanister.class, new RenderGenericGrenade()); diff --git a/src/main/java/com/hbm/main/CraftingManager.java b/src/main/java/com/hbm/main/CraftingManager.java index 16aca9795..e8898bf89 100644 --- a/src/main/java/com/hbm/main/CraftingManager.java +++ b/src/main/java/com/hbm/main/CraftingManager.java @@ -629,8 +629,6 @@ public class CraftingManager { addRecipeAuto(new ItemStack(ModItems.jackt2), new Object[] { "S S", "LIL", "III", 'S', STEEL.plate(), 'L', Items.leather, 'I', ANY_RUBBER.ingot() }); addRecipeAuto(new ItemStack(ModBlocks.vent_chlorine), new Object[] { "IGI", "ICI", "IDI", 'I', IRON.plate(), 'G', Blocks.iron_bars, 'C', ModItems.pellet_gas, 'D', Blocks.dispenser }); addRecipeAuto(new ItemStack(ModBlocks.vent_chlorine_seal), new Object[] { "ISI", "SCS", "ISI", 'I', BIGMT.ingot(), 'S', STAR.ingot(), 'C', ModItems.chlorine_pinwheel }); - addRecipeAuto(new ItemStack(ModBlocks.vent_cloud), new Object[] { "IGI", "ICI", "IDI", 'I', IRON.plate(), 'G', Blocks.iron_bars, 'C', ModItems.grenade_cloud, 'D', Blocks.dispenser }); - addRecipeAuto(new ItemStack(ModBlocks.vent_pink_cloud), new Object[] { "IGI", "ICI", "IDI", 'I', IRON.plate(), 'G', Blocks.iron_bars, 'C', ModItems.grenade_pink_cloud, 'D', Blocks.dispenser }); addRecipeAuto(new ItemStack(ModBlocks.spikes, 4), new Object[] { "BBB", "BBB", "TTT", 'B', STEEL.bolt(), 'T', STEEL.ingot() }); addRecipeAuto(new ItemStack(ModItems.custom_fall, 1), new Object[] { "IIP", "CHW", "IIP", 'I', ANY_RUBBER.ingot(), 'P', BIGMT.plate(), 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED), 'H', STEEL.shell(), 'W', ModItems.coil_copper }); addRecipeAuto(new ItemStack(ModBlocks.machine_controller, 1), new Object[] { "TDT", "DCD", "TDT", 'T', ANY_RESISTANTALLOY.ingot(), 'D', ModItems.crt_display, 'C', DictFrame.fromOne(ModItems.circuit, EnumCircuitType.ADVANCED) }); diff --git a/src/main/java/com/hbm/main/MainRegistry.java b/src/main/java/com/hbm/main/MainRegistry.java index b0415b0f5..8b6c3ccb8 100644 --- a/src/main/java/com/hbm/main/MainRegistry.java +++ b/src/main/java/com/hbm/main/MainRegistry.java @@ -1525,6 +1525,50 @@ public class MainRegistry { ignoreMappings.add("hbm:tile.absorber_red"); ignoreMappings.add("hbm:tile.absorber_green"); ignoreMappings.add("hbm:tile.absorber_pink"); + ignoreMappings.add("hbm:item.grenade_generic"); + ignoreMappings.add("hbm:item.grenade_strong"); + ignoreMappings.add("hbm:item.grenade_frag"); + ignoreMappings.add("hbm:item.grenade_fire"); + ignoreMappings.add("hbm:item.grenade_shrapnel"); + ignoreMappings.add("hbm:item.grenade_cluster"); + ignoreMappings.add("hbm:item.grenade_flare"); + ignoreMappings.add("hbm:item.grenade_electric"); + ignoreMappings.add("hbm:item.grenade_poison"); + ignoreMappings.add("hbm:item.grenade_gas"); + ignoreMappings.add("hbm:item.grenade_cloud"); + ignoreMappings.add("hbm:item.grenade_pink_cloud"); + ignoreMappings.add("hbm:item.grenade_smart"); + ignoreMappings.add("hbm:item.grenade_mirv"); + ignoreMappings.add("hbm:item.grenade_breach"); + ignoreMappings.add("hbm:item.grenade_burst"); + ignoreMappings.add("hbm:item.grenade_pulse"); + ignoreMappings.add("hbm:item.grenade_plasma"); + ignoreMappings.add("hbm:item.grenade_tau"); + ignoreMappings.add("hbm:item.grenade_schrabidium"); + ignoreMappings.add("hbm:item.grenade_nuke"); + ignoreMappings.add("hbm:item.grenade_lemon"); + ignoreMappings.add("hbm:item.grenade_gascan"); + ignoreMappings.add("hbm:item.grenade_kyiv"); + ignoreMappings.add("hbm:item.grenade_mk2"); + ignoreMappings.add("hbm:item.grenade_aschrab"); + ignoreMappings.add("hbm:item.grenade_nuclear"); + ignoreMappings.add("hbm:item.grenade_zomg"); + ignoreMappings.add("hbm:item.grenade_black_hole"); + ignoreMappings.add("hbm:item.grenade_if_generic"); + ignoreMappings.add("hbm:item.grenade_if_he"); + ignoreMappings.add("hbm:item.grenade_if_bouncy"); + ignoreMappings.add("hbm:item.grenade_if_sticky"); + ignoreMappings.add("hbm:item.grenade_if_impact"); + ignoreMappings.add("hbm:item.grenade_if_incendiary"); + ignoreMappings.add("hbm:item.grenade_if_toxic"); + ignoreMappings.add("hbm:item.grenade_if_concussion"); + ignoreMappings.add("hbm:item.grenade_if_brimstone"); + ignoreMappings.add("hbm:item.grenade_if_mystery"); + ignoreMappings.add("hbm:item.grenade_if_spark"); + ignoreMappings.add("hbm:item.grenade_if_hopwire"); + ignoreMappings.add("hbm:item.grenade_if_null"); + ignoreMappings.add("hbm:item.grenade_kit"); + ignoreMappings.add("hbm:item.nuclear_waste_pearl"); /// REMAP /// remapItems.put("hbm:item.gadget_explosive8", ModItems.early_explosive_lenses); diff --git a/src/main/java/com/hbm/main/ResourceManager.java b/src/main/java/com/hbm/main/ResourceManager.java index 374087e3d..2416ecced 100644 --- a/src/main/java/com/hbm/main/ResourceManager.java +++ b/src/main/java/com/hbm/main/ResourceManager.java @@ -960,8 +960,6 @@ public class ResourceManager { public static final IModelCustom lance = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/lance.obj")); - public static final IModelCustom grenade_frag = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/grenade_frag.obj")); - public static final IModelCustom grenade_aschrab = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/grenade_aschrab.obj")); public static final IModelCustom grenades = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/weapons/grenades.obj")); public static final IModelCustom armor_bj = new HFRWavefrontObject(new ResourceLocation(RefStrings.MODID, "models/armor/BJ.obj")).asVBO(); @@ -1102,8 +1100,6 @@ public class ResourceManager { public static final ResourceLocation ff_gun_dark = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/gun_dark.png"); public static final ResourceLocation ff_gun_normal = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/ff/gun_normal.png"); - public static final ResourceLocation grenade_mk2 = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/grenade_mk2.png"); - public static final ResourceLocation grenade_aschrab_tex = new ResourceLocation(RefStrings.MODID, "textures/models/weapons/grenade_aschrab.png"); public static final ResourceLocation grenade_frag_tex = new ResourceLocation(RefStrings.MODID, "textures/models/grenades/frag.png"); public static final ResourceLocation grenade_frag_body_tex = new ResourceLocation(RefStrings.MODID, "textures/models/grenades/frag_body.png"); public static final ResourceLocation grenade_frag_label_tex = new ResourceLocation(RefStrings.MODID, "textures/models/grenades/frag_label.png"); diff --git a/src/main/java/com/hbm/render/entity/projectile/RenderGrenade.java b/src/main/java/com/hbm/render/entity/projectile/RenderGrenade.java deleted file mode 100644 index a347849be..000000000 --- a/src/main/java/com/hbm/render/entity/projectile/RenderGrenade.java +++ /dev/null @@ -1,57 +0,0 @@ -package com.hbm.render.entity.projectile; - -import org.lwjgl.opengl.GL11; - -import com.hbm.entity.grenade.EntityGrenadeASchrab; -import com.hbm.entity.grenade.EntityGrenadeMk2; -import com.hbm.main.ResourceManager; - -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.entity.Entity; -import net.minecraft.util.ResourceLocation; - -public class RenderGrenade extends Render { - - @Override - public void doRender(Entity grenade, double x, double y, double z, float f0, float interp) { - - GL11.glPushMatrix(); - GL11.glTranslatef((float)x, (float)y + 0.125F, (float)z); - GL11.glRotatef(grenade.prevRotationYaw + (grenade.rotationYaw - grenade.prevRotationYaw) * interp - 90.0F, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(grenade.prevRotationPitch + (grenade.rotationPitch - grenade.prevRotationPitch) * interp, 0.0F, 0.0F, 1.0F); - - GL11.glEnable(GL11.GL_LIGHTING); - GL11.glEnable(GL11.GL_CULL_FACE); - GL11.glShadeModel(GL11.GL_SMOOTH); - - bindTexture(getEntityTexture(grenade)); - - if(grenade instanceof EntityGrenadeMk2) { - GL11.glRotatef(90, 0F, 1F, 0F); - GL11.glScaled(0.125, 0.125, 0.125); - ResourceManager.grenade_frag.renderAll(); - } - if(grenade instanceof EntityGrenadeASchrab) { - GL11.glRotatef(90, 0F, 1F, 0F); - GL11.glScaled(0.125, 0.125, 0.125); - ResourceManager.grenade_aschrab.renderAll(); - } - - GL11.glShadeModel(GL11.GL_FLAT); - - GL11.glPopMatrix(); - } - - @Override - protected ResourceLocation getEntityTexture(Entity grenade) { - - if(grenade instanceof EntityGrenadeMk2) { - return ResourceManager.grenade_mk2; - } - if(grenade instanceof EntityGrenadeASchrab) { - return ResourceManager.grenade_aschrab_tex; - } - - return null; - } -} diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index 1c699eb13..76e95530f 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -2130,49 +2130,32 @@ item.glowing_stew.name=Leuchtende Pilzsuppe item.glyphid_meat.name=Glyphidfleisch item.glyphid_meat_grilled.name=Gegrilltes Glyphidfleisch item.goggles.name=Schutzbrille -item.grenade_aschrab.name=Werfbare Antischrabidiumzelle -item.grenade_black_hole.name=Schwarzes-Loch-Granate -item.grenade_breach.name=Durchbruchgranate -item.grenade_burst.name=Gräbergranate -item.grenade_cloud.name=Gefäß voll ätzenden Dämpfen -item.grenade_cluster.name=Cluster-Bombe -item.grenade_electric.name=Blitzbombe -item.grenade_fire.name=Brandsplittergranate -item.grenade_flare.name=Signalfeuer -item.grenade_frag.name=Splittergranate -item.grenade_gas.name=Gasgranate -item.grenade_gascan.name=Werfbarer Spritkanister -item.grenade_generic.name=Handgranate -item.grenade_if_bouncy.name=IF - Elastissche Granate -item.grenade_if_brimstone.name=IF - Werfbare Brimstone-Mine -item.grenade_if_concussion.name=IF - Erschütterungsgranate -item.grenade_if_generic.name=IF - Nullgranate -item.grenade_if_he.name=IF - HE-Granate -item.grenade_if_hopwire.name=IF - Vortex Hopwire -item.grenade_if_impact.name=IF - Aufschlaggranate -item.grenade_if_incendiary.name=IF - Brandgranate -item.grenade_if_mystery.name=IF - M.-Granate -item.grenade_if_null.name=IF - Null-Granate -item.grenade_if_spark.name=IF - S.-Granate -item.grenade_if_sticky.name=IF - Klebrige Granate -item.grenade_if_toxic.name=IF - Toxische Granate -item.grenade_kit.name=Granaten Kit -item.grenade_kyiv.name=Das Kiew Spezial -item.grenade_lemon.name=Zitronengranate -item.grenade_mirv.name=MIRV-Granate -item.grenade_mk2.name=Mk 2 Granate "Botschafter Ananas" -item.grenade_nuclear.name=Nuka-Granate -item.grenade_nuke.name=Mark VI Bohrgranate -item.grenade_pink_cloud.name=Gefäß voll pinker Wolke -item.grenade_plasma.name=Plasmagranate -item.grenade_poison.name=Giftgranate -item.grenade_pulse.name=Impulsgranate -item.grenade_schrabidium.name=Schrabidiumgranate -item.grenade_shrapnel.name=Schrapnellgranate -item.grenade_smart.name=Smart-Granate -item.grenade_strong.name=Verbesserte Handgranate -item.grenade_tau.name=Taugranate -item.grenade_zomg.name=Negativenergie-Paarvernichtungsgranate +item.grenade_extra.frag_sleeve.name=Granatenextra - Splitterring +item.grenade_extra.glue.name=Granatenextra - Klebstoff +item.grenade_extra.proxy_fuze.name=Granatenextra - Annäherungszünder +item.grenade_extra.triplex.name=Granatenextra - Triplex +item.grenade_filling.cluster.name=Clustergranatenladung +item.grenade_filling.cluster_heavy.name=Schwere Clustergranatenladung +item.grenade_filling.demo.name=Abrissgranatenladung +item.grenade_filling.emp.name=EMP-Granatenladung +item.grenade_filling.he.name=Sprenggranatenladung +item.grenade_filling.inc.name=Brandgrantatenladung +item.grenade_filling.laser.name=Lasergrantatenladung +item.grenade_filling.nuclear.name=Atomare Granatenladung +item.grenade_filling.nuclear_demo.name=Atomare Abrissgranatenladung +item.grenade_filling.plasma.name=Plasmagranatenladung +item.grenade_filling.powder.name=Pulverladung +item.grenade_filling.wp.name=Weiße Phosphorgranatenladung +item.grenade_fuze.airburst.name=Luftdetonationszünder +item.grenade_fuze.impact.name=Aufschlagzünder +item.grenade_fuze.s3.name=Zeitzünder, 3s +item.grenade_fuze.s7.name=Zeitzünder, 7s +item.grenade_fuze.s15.name=Zeitzünder, 15s +item.grenade_shell.frag.name=Kompaktes Granatengehäuse +item.grenade_shell.nuke.name=Atomgranatengehäuse +item.grenade_shell.stick.name=Stielgranatengehäuse +item.grenade_shell.tech.name=High-Tech Granatengehäuse +item.grenade_universal.name=Granate item.gun_aberrator.name=Aberrator item.gun_aberrator_eott.name=Eyes Of The Tempest item.gun_am180.name=.22er Maschinenpistole diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 282514c78..d31f95746 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -2958,50 +2958,32 @@ item.glowing_stew.name=Glowing Mushroom Stew item.glyphid_meat.name=Glyphid Meat item.glyphid_meat_grilled.name=Grilled Glyphid Meat item.goggles.name=Protection Goggles -item.grenade_aschrab.name=Tossable Antischrabidium Cell -item.grenade_black_hole.name=Black Hole Grenade -item.grenade_breach.name=Breaching Grenade -item.grenade_burst.name=Digger Grenade -item.grenate_cats.name=Grenade of Cats -item.grenade_cloud.name=Jar of Corrosive Fumes -item.grenade_cluster.name=Cluster Bomb -item.grenade_electric.name=Lightning Bomb -item.grenade_fire.name=Flame Frag Grenade -item.grenade_flare.name=Signal Flare -item.grenade_frag.name=Frag Grenade -item.grenade_gas.name=Gas Grenade -item.grenade_gascan.name=Tossable Gas Can -item.grenade_generic.name=Grenade -item.grenade_if_bouncy.name=IF - Bouncy Grenade -item.grenade_if_brimstone.name=IF - Tossable Brimstone Mine -item.grenade_if_concussion.name=IF - Concussion Grenade -item.grenade_if_generic.name=IF - Grenade -item.grenade_if_he.name=IF - HE Grenade -item.grenade_if_hopwire.name=IF - Vortex Hopwire -item.grenade_if_impact.name=IF - Impact Grenade -item.grenade_if_incendiary.name=IF - Incendiary Grenade -item.grenade_if_mystery.name=IF - M.-Grenade -item.grenade_if_null.name=IF - Null Grenade -item.grenade_if_spark.name=IF - S.-Grenade -item.grenade_if_sticky.name=IF - Sticky Grenade -item.grenade_if_toxic.name=IF - Toxic Grenade -item.grenade_kit.name=Grenade Kit -item.grenade_kyiv.name=The Kyiv Special -item.grenade_lemon.name=Combustible Lemon -item.grenade_mirv.name=MIRV Grenade -item.grenade_mk2.name=Mk 2 Grenade "Ambassador Pineapple" -item.grenade_nuclear.name=Nuka Grenade -item.grenade_nuke.name=Mark VI Drill Grenade -item.grenade_pink_cloud.name=Jar of Pink Cloud -item.grenade_plasma.name=Plasma Grenade -item.grenade_poison.name=Poison Grenade -item.grenade_pulse.name=Impulse Grenade -item.grenade_schrabidium.name=Schrabidium Grenade -item.grenade_shrapnel.name=Shrapnel Grenade -item.grenade_smart.name=Smart Grenade -item.grenade_strong.name=Enhanced Grenade -item.grenade_tau.name=Tau Grenade -item.grenade_zomg.name=Negative Energy Pair Annihilation Grenade +item.grenade_extra.frag_sleeve.name=Grenade Extra - Fragmentation Sleeve +item.grenade_extra.glue.name=Grenade Extra - Glue +item.grenade_extra.proxy_fuze.name=Grenade Extra - Proximity Fuze +item.grenade_extra.triplex.name=Grenade Extra - Triplex +item.grenade_filling.cluster.name=Cluster Grenade Charge +item.grenade_filling.cluster_heavy.name=Heavy Cluster Grenade Charge +item.grenade_filling.demo.name=Demolition Grenade Charge +item.grenade_filling.emp.name=EMP Grenade Charge +item.grenade_filling.he.name=High-Explosive Grenade Charge +item.grenade_filling.inc.name=Incendiary Grenade Charge +item.grenade_filling.laser.name=Laser Grenade Charge +item.grenade_filling.nuclear.name=Nuclear Grenade Charge +item.grenade_filling.nuclear_demo.name=Nuclear Demolition Grenade Charge +item.grenade_filling.plasma.name=Plasma Grenade Charge +item.grenade_filling.powder.name=Gunpowder Grenade Charge +item.grenade_filling.wp.name=White Phosphorus Grenade Charge +item.grenade_fuze.airburst.name=Airburst Grenade Fuze +item.grenade_fuze.impact.name=Impact Grenade Fuze +item.grenade_fuze.s3.name=Timed Grenade Fuze, 3s +item.grenade_fuze.s7.name=Timed Grenade Fuze, 7s +item.grenade_fuze.s15.name=Timed Grenade Fuze, 15s +item.grenade_shell.frag.name=Compact Grenade Shell +item.grenade_shell.nuke.name=Nuclear Grenade Shell +item.grenade_shell.stick.name=Stick Grenade Shell +item.grenade_shell.tech.name=High-Tech Grenade Shell +item.grenade_universal.name=Grenade item.glyphid_gland.name= Gland item.glyphid_gland_empty.name= Glyphid's Fluid Gland item.gun_aberrator.name=Aberrator diff --git a/src/main/resources/assets/hbm/textures/items/grenade_aschrab.png b/src/main/resources/assets/hbm/textures/items/grenade_aschrab.png deleted file mode 100644 index 99a55435c353eeb57d05d5b8985cc8607a75d3e9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 376 zcmV-;0f+vHP)J#NB45QV=@km!8^7m-}J*(19nEHw?RLv-HlyF~R{~5~yx;E`kH>hPhjWgXPKVGKQ|TZV_j*0DEWQN+W-?S}n3H1K@qJ;COPz_ZedTa8m4GKA+>9<8?4NHP-8VHwEPGGQu!a z5Cj59B`J=TN;+7pgSA?L9)josB1tPy`X7kmSO;sBmLU0^+>I!QkR$*cmrDS?Mx!FF zO28%Lv)wN4B#I)_sL%pnj4_flolf!2QAbf^0G{gr05+S=#~DVq+pXpNs*)tRO5hhA W2*SGmDmI@00000#%`<%Y4_ah7X=G()Sggd*&}cUs=R1f5804Jq|^W=OP;qY_cn4ni-VQw%wZh z|CDQ07o+r-+J~OJW5Rn(!i8n22*b5o2Nrw1JSOq1lCP&Umfgj(NoHH|x=)ODAEr3p zpUlv4B5Cc~Z6bjT2TXitE=*EozVnkywm|Y8e?Oz!h4a;4%=aF-dT0BE?b!j}Ss9fN z9O#{(uyjSMfBWOvC$=$c$USJzprGVX;qy|k?AWA9-Zoin@_HW&J_YV&=-&`>-OSU9h_g>a^l?}xFrD&w?@Zx&aitNS(JU{B$HZg3+1x(u}mWhlDn6^!P zHtY8fmiYPh=*;F<9G}kd{D`0U>*Hy#MC&X376Bm7bLUTi_szp#((B9G`ezPbdlgx$ UDTG|&DF6Tf07*qoM6N<$g1lpjj{pDw diff --git a/src/main/resources/assets/hbm/textures/items/grenade_burst.png b/src/main/resources/assets/hbm/textures/items/grenade_burst.png deleted file mode 100644 index 82f4261f3dfb289ea15fc63390075663098133f7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 387 zcmV-}0et?6P)$S31R~=5% zR9h?-h~pSU1OSMlNd8Em4DVVCZKJ}N9DBmq$+HS{ozXl#U{hbIw5XhIO zo7VR0^DW-8yEa0Tui95pI$&lnGn&r`tZ(<=)JiE|5^`sOS!+DNt4IgcOfEjKD*{(euIcKLiS2T zB>1Jc(^UL4o-+AfE2WglXFLo{{o~Jikow{O8O<=LK%PWl6{A^b1+;m o=`Gj1@cnOQ(CuyK?2GN=4BpPPc>K-rFVLS1p00i_>zopr0P+HINdN!< diff --git a/src/main/resources/assets/hbm/textures/items/grenade_electric_alt.png b/src/main/resources/assets/hbm/textures/items/grenade_electric_alt.png deleted file mode 100644 index 4bbd9a39b645e3525ca39b66549de8c0c9587672..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfwmUz34It9@@TGxtmG31unojxhf?V#h3Otesd`prG>OHeacNl(V+f&eOT?Z2uO` zl8cB~eZ%0i5&wcIhoZbArv=I$sIs~c^?O@xxR>UvWsD0nxc+ZuUb}UA(4#qv-&apk zseJot7vGmgW=+-D>xMkcnX{By95@&q<~?tm{Ni@fw6$A9LPcMg8y?tvs)W74@|}HF z8si=R&9C1xRL61c&|%r}`bP8qUy=pVzrXo6+>}fEDR8pU@Yz(x=Q5W+oAh2(kWBvb h`H;1W*wdq589ugqc?L_qV*>h*!PC{xWt~$(696iday!V%ey zE&>zN)_+zE2wgH|*Iw-oLnek9J8$l0dT-moq1ck9KWUD5@oz3xwpH;K)l010fB0`= Y>^)ZrjA*tG}18qR2#xsgKy2ggq6iPn=*)QOsL7`vub`UiL|z1wjQtCM+T%f}AQ` z`xomk`~N)sQe*k22Zir;@bj&{90D%$ayownO;nrtb^2-(poHTS zLm6HMizn&~+g{t+zjTxQw8+~)hIa=0e1#=DMqm8;|9@Bf?1e=yl$0(q0=>@Q>FVdQ I&MBb@0FJ?a$^ZZW literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/grenade_extra.proxy_fuze.png b/src/main/resources/assets/hbm/textures/items/grenade_extra.proxy_fuze.png new file mode 100644 index 0000000000000000000000000000000000000000..3cb15041d15288d08edb184be11b0c6893ed75a4 GIT binary patch literal 356 zcmV-q0h|7bP)5)y^SfK* zc!ars?Bayy!1fk`tBc+a99S^$3*Lq89*qP4o&5rm?Q7}cUpXHD0000(^b literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/grenade_filling.cluster_heavy.png b/src/main/resources/assets/hbm/textures/items/grenade_filling.cluster_heavy.png new file mode 100644 index 0000000000000000000000000000000000000000..a5b91535a7837dfef8ecbfb4b0c8e92f8dd6ce08 GIT binary patch literal 308 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfyn^t4@^#A^6XC4D7|M2K2w}|+GA1gc8X{<|d zG#5-$-sF~IXLaBM)2_=Gf4*Qi%Gy7_R`DjQ#KsMErT_nThubIdGMA^9K1y<{9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/grenade_filling.inc.png b/src/main/resources/assets/hbm/textures/items/grenade_filling.inc.png index 66e1e8d7aaed8ccbfb82d6ca301789cd48ef741a..44033f00fdc5a732a72a42ed836af7e5e02ae746 100644 GIT binary patch delta 335 zcmV-V0kHn}0{Q}wG=DKkL_t(Ijir+@O9Md=g+IduV%9<;;)Oe~P(-*=RJbDlLQt%1 z>@58s0c|bqtu2Cxih2kZNeGtFLnY)$VMs86waD!$*$p0Ks@=D5-n^Zig(+iZ(!ts3 zp;T)j^6Vazja(zBlHWgC3AVbjY!u0i10~;;LgcB|o3x`I?SH68(O$&1i+j|pL7jT>ujtesSfr2*XbRqK@R~ zrOU~hNGDJmb~(Oy1t5^$2?n}=)BcZxYI-$^!rZ002ovPDHLkV1jsAp&I}I delta 332 zcmV-S0ki)40`~%tG=DBhL_t(Ijir+@OT$nUg+Ik1%^OlGVnPcJI=G7n8S*a#9bNoA z4vq@8lTh#nbm*j14TTP&6e$#h&}vACLyX&VF#(eot$3#U&b#;Ab07D?Ke1AEae00! zvseh7qmwgbu9D1(=ZhfccDA>aBCAEhv0G9I9dGx~)!y}nBnmkg9g0BCo*EP{aH$fMVHxxRU% z-RUmp0N~^Ojf<-u0I&0>oKr#RK+_EX(j?9cGj3@I05wrZ(~ZjRl>(Y>kS1}-kqXKY zvhFoeFS+_vz(x08^0@d0je6zge}`kYWRiq3NkTcB4&-b)kg6?&A3oFZ;hxOgM6tvh e`%AX}BR&CVbaXwZTqOkn0000ho7&n=UIQhK5<9Q oPouD{K0A06#CVvQ+2j})-X8H-Qo`ZA8R!lMPgg&ebxsLQ00#I(g8%>k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/items/grenade_filling.plasma.png b/src/main/resources/assets/hbm/textures/items/grenade_filling.plasma.png new file mode 100644 index 0000000000000000000000000000000000000000..17a04642770d9d9d4e5d4e62f9912d08a320375d GIT binary patch literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfx~)!y}nBnmkg9g0BCo*EP{aH$fMVHxxRU%-RUmp0N~^O zjf<-u0I&0>oKr#RK+_EX(j?9cGj3@I05wrZ(~ZjRl>(Y>kS1}-kqXKYvhFoeFS+_v z!1rJBxcCN*dgbPShhw*7l7uozLOGibSsx5>cKGX5xp3K}tvBVquOSbe8758k^I6bLQMo^Gp*0PJvOqwn!b(Vt0O~rnqUzl$- zYOVMl$KScf;r7bPlWR4uZ`sMrdq8>z<9^nB$N882HhJVOzf--xXhUQY%f8Dg-QJH9 zgcCh-mj4kb5@dL_>t6o>Kb8i8L$8#48`}#XeLr(^e!u<7+M*AOXQnL%`h&sK)z4*} HQ$iB}UA<A&=#YVkOT1*vvJR_|cHt`_N0TiWR;eE-5aV$__#n`9#;J2pm<&tp7jdWsEZ}60 zotjei{k@v-jEb zRf;8G7c7K`ov$>q3$tRjh>Cf6n(Z8T@H5Q(|35Pi9vzk`>AG$K;QRh17e$e=wqk=z~OW2DFhvK<6H_&mPgI8J38ql34;V%#a4_rLIS zfLtJstYC*GeaHaTp+p>3DVXZ$*(Sf6%slOX7oYHiz$*G&#|+d7tGgM(~WwXI{i z)%w~JXG<*q2?m|g_BEcb>Q^&f;noNMNs?HN1k*)bY4TwmSF?dgtG&1JPLDW;Nf#|A^IuSZXKZ1)yF_4mpVE!{EtC9ok1p9Z!ML^B-_Gwu zqf6?>#K>uK4w|i7r!C7|WY=)EXu;NRhYeD^G=J@5U$8Fwe>v0It)MWImwlA+YF;rl6&f7f3zG~HD`_b Y!OPx;ak42#f!<>9boFyt=akR{0DkXp2><{9 diff --git a/src/main/resources/assets/hbm/textures/items/grenade_gascan.png b/src/main/resources/assets/hbm/textures/items/grenade_gascan.png deleted file mode 100644 index ca491e01a154a32957917c90c72e2c14d5ac1292..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfyU$h>-^c-XG8TCz=&CfH z*fnd$%Cwn(`?sHVxVv@JucFkiPva*XT@uc(^4eGNNr{CH`x%C10<0H)?`_lCvn`ji zfY+HJFL26vv)!?ZmxCC0t?QOQ&cNc?#5m`2Nan38dmb(S#Wh3My0ShnLW6PUzlyvE z@sI!WFt~;7mO5}#Zlch)b1Qc>>aAgA@eHz9Z6{#&=3t`1iRtQl?lX4C^M{Z7F$PapKbLh*2~7at8gCT< diff --git a/src/main/resources/assets/hbm/textures/items/grenade_generic.png b/src/main/resources/assets/hbm/textures/items/grenade_generic.png deleted file mode 100644 index e5147fa3018dbfafd607bf07a032d8fc891289b1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 319 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$@hV3Hh8)?hFJJ7?b|4LSV4d#l%JDRaH3X_AEU_vt`}e4UOiL!;NUhJzOpm( z--qv?c{5(;aC}6Y((|0(`|Rhx{-4Md{{7FOfn~4D>Fq2RyjfcI4IRB*}Znx3QPy97yf+udV~Sox#)9 K&t;ucLK6Uv#&{I~ diff --git a/src/main/resources/assets/hbm/textures/items/grenade_if_antioch.png b/src/main/resources/assets/hbm/textures/items/grenade_if_antioch.png deleted file mode 100644 index f615dd11bde196d7bbf80d6ab9dbc45fde9df763..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJtM=93Yk-Zine*WIEGmGCnrdlEU=mL(Efzs&wm0^;y?cXw`b-^W_|zp(}yg!%qGc( zM1eD`22x8Zg82{E3&aJnA2f)b$b0aW&;&(=^>5~L9yD-vcoh8kW3^z8f`=l9vNVGc zONz!O?+v&3E|t_RWsrD&ZBMH-laatPp*`ywZgLqh9BHd$bxG#t=LtW+0#LT=By}Z;C1rt33 zJtM=93Yk-ZijI1^IEGmGFP&`2#bhYpTD*Q|r})h<#}saV#WJ(F162p3Hf;IMG)=kx z!}Jt$&ZMryX*vI9&!4F>Bl1P3o?&bHfu|Yg4pqt*>)x>y_%%QGOJPQrAm@TTMGERU zb$8En9ye`UwQRzoPz9N%wf%}5uPLYr<~=mdI*!PC{xWt~$(697GnfoA{! diff --git a/src/main/resources/assets/hbm/textures/items/grenade_if_bouncy.png b/src/main/resources/assets/hbm/textures/items/grenade_if_bouncy.png deleted file mode 100644 index 29a4052f434b0fe954bf74e638040beb52ac6dda..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJtM=93Yk-ZidK8NIEGmGpPjUk_ppM1>&%1FDNO-EOBO8pbnBjia0+9;!xx#_p9j=u zduS%TOi{UC{rzCehwc778*fSRX{}&yOEGymCtEXh^>6K*(&{>|pkH@f#Ol^8T&42x z_m(${nq3STpWot|uw=?Cm0pL94Ux(lgqCS{&ORi3BiG=rb-y#0i&)Ct!^@u^5aI05 zz2RpsD!|Dh5%^zQKar)$rov-E^F`K2e?={7-q&CJ!RB=P!1sHNg+PxoFnGH9xvX2@Rl diff --git a/src/main/resources/assets/hbm/textures/items/grenade_if_brimstone.png b/src/main/resources/assets/hbm/textures/items/grenade_if_brimstone.png deleted file mode 100644 index a6b46f95e64c4d63e4d30204fd1fa02323c5b08d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 299 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJtM=93Yk-Zie`JdIEGmG-<@R0)nXvvTHHLxfnPx^bE}u=2bXEpUuKB^5O6ixm9zCw zg24UR^L^(0-ml&=A-U)0>bZ>db53h6jrweGMQZQ*RIish6*HHunZ&YF|Ej1W!<}ni zRU9^n-|$hAaMWJ7ds0cTMj7|#-go`y7T?`{Equr920f-u-5qc90#LT=By}Z;C1rt33 zJtM=93Yk-ZiZ*(>IEGmGpPgjL#bhYp8XR#$|3>#-mYg8ZRd)_ZS1{>65d3yxqWBL3 z!^2Vs54AQPI9L6-+)VM$TjAt2+mBSe zF`<(_*xf0!>j^Yu)PKEISiw`X)N_|e7wZ|x#;FFeo_9p%9jIfwytkG|Qy_A}XNLT@ zjhaFN(FNwU-VQ1X2`-1%|6x%Ucyh>?N!Lw$MeL&d123!pcOMh?;a=LES6+Pw=y(QC LS3j3^P60#LT=By}Z;C1rt33 zJtM=93Yk-Zik5h~IEGmGpPh7&^N50gYw#rZ{&`!NwKp(&dpy;$bDBsO>lvxWsRps0cSPnL$ZLLiuX4{)hZM(a)_*Gad?q&BXnOm_opEAA xgW%i!pOkwXCa}wMmKf}E*t4Ih|NUQmsrXZA$LA0#LT=By}Z;C1rt33 zJtM=93Yk-ZidK5MIEGmGpPh7&v&BHbRaf))1I^_PtU6*F#5S;VZ}_aE{~>Xb>>Um{ z5jN&?)t`lpefw*jIF4Q`2ynDDP+6?GG^FU<)_bp`UT@Xes(OhHBL2%^}Hi8??7Jj%X^i7mN=w1UbC&K;`5o0#LT=By}Z;C1rt33 zJtM=93Yk-ZidK2LIEGmGpPl5$bwq*3)&2_uv#q1P!j2N-2d94DKau%|H*EICGD8EW z7i#~X{x>;r-|l^_-SsVjqFY=K+B@e4;hJ z_xfZG2A3men5s0=)I=j6&3^f|@dab;%|Bmi|8M%pTo%#Pb9-)_8PL@Xp00i_>zopr E00OyoW&i*H diff --git a/src/main/resources/assets/hbm/textures/items/grenade_if_impact.png b/src/main/resources/assets/hbm/textures/items/grenade_if_impact.png deleted file mode 100644 index 3bd6cef7763e5cc0ca33f5562012b083165c6011..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJtM=93Yk-Zie`GcIEGmG-<@=jw?To&Rq|kyj}+4(>AUbU!T?N*~hhHkEJCwp)0O`jQ5qPAvpu$bzPeO-!83XP`=1RaE& zHcU>DXmV0#LT=By}Z;C1rt33 zJtM=93Yk-Ziq?9%IEGmGpPh7&^N50g>stlUC5>}zy!__nWLtZ%W+r&wc*W!Y!(f;5 zwN~4lgpLW7`TLFu{QK5v7#4lmk+t{0l%8dCiglN6vAVwX>PDTlDofA%raXMUEp)0% zO?}IQ!xEyxAGW@q%i!s?()-fV0G)(u9BW!$dOce9fu&5^=li+Gx~xjvo8%teE>7rT zIU<&`{61F)3rkPNpQ-YREKN2QUJIHpvOfANYEk>X{$d5=noAp{g8Sv(0UgfZ>FVdQ I&MBb@01a<0#LT=By}Z;C1rt33 zJtM=93Yk-ZiZ*$=IEGmGpPh7&lgUuPHMo)YM#BSD^Wrn9!40Yrjj|C3%@R1xW?pmOBBENYWE#mCQY$3pV&J8 zcy_4gq3_ieKMmZDveeAYpUdFswbJ|2(g2-=YaDA@UV1%R_JO5L+UNVZ$GWUa+?(Vc z-Yrh(VmTs~v-~|*2MbG2#-FM3i7ZVv60#LT=By}Z;C1rt33 zJtM=93Yk-Zine*WIEGmGFP(gn_kaQqOR$jtyge_vjWn9nRy5_w=w5O&a~ElC7hPiT z_~|Z}Csr$!C3?3rJ)iU9*3vmFEp7?w#!Nn3iXJ^1!!?(NuiYxXbjI>&Y)f&I^Sx?d2(ne|vmOr$DB_W5GDJ z2kRDbvv&AKl-G+ouy7c-JPzD9ugTA`;LRUT2SI&-eabubc+|%|{g}OnF{I+MNg3~( R<3JxUc)I$ztaD0e0stNxba(&& diff --git a/src/main/resources/assets/hbm/textures/items/grenade_if_spark.png b/src/main/resources/assets/hbm/textures/items/grenade_if_spark.png deleted file mode 100644 index 07c89be6bf741b1bd18fbadadd5dca755bb8bc2e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 320 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucLCF%=h?3y^w370~qEv>0#LT=By}Z;C1rt33 zJtM=93Yk-ZiZ*zZ0zA>BeZtn4DE*G(syNBDK z9}wZ}(7oYjFCxInArbgr+x`#-OXY_N4(yA$kNnmy_;K(5qK~Xct{x28o7?&y=ynEA LS3j3^P60#LT=By}Z;C1rt33 zJtM=93Yk-Zine&VIEGmGCnrd3IdI^>1A8O2TMG?*Ur2Qr@hmxU@ZiJ!vu8_77;mX> zdT>fzfQMC~G$OWTQRS)s|9K2}Oj%UUPbd}Loi?Gf;5oA?myV+`LqmP;((j870#LT=By}Z;C1rt33 zJtM=93Yk-ZiZ*$=IEGmGpPjUk_mF{rt1Tn90aLH{^mQ>C8HFzdUc7WMmC-H1b8-61 z?#;zqZi^HyX-+G8e|P(1fq&mR4a1@@JF@m3n9{RsPO4~W(wfji2iC+RdxAyrBsmnC_3T0z&G@J4-#VxaU25x%CZCi7-Ikc z<2Xi+=S+Tm17FNJza=xqpl#bLNfJ!cM1y~PlGYmgzJqfP#@Nju&vRI7Q540kP6jTP zloIniQz8J!vJBg{K?nf==(_HD7=)m;rn9w{&VGvErlpiOqh(njgrH>}$3c6zEm0{I z4Z}e3)^&xomZFCc{2WcwTxpu3u4|m<2>`+Aj|2{GVo3Z^0*Aiu={fI{{|{d9MQ+o| S2}$Sx0000i-sVw|)<@3+&iP_$o4437$v8??OuCxBZoYlGSrv9pEJ>OSZvT0M@>jej+Zf~y*`zK$+ Z$Zh8NT4lECO`tOwJYD@<);T3K0RVKCRMG$d diff --git a/src/main/resources/assets/hbm/textures/items/grenade_ironshod_overlay.png b/src/main/resources/assets/hbm/textures/items/grenade_ironshod_overlay.png deleted file mode 100644 index 97a99b67504258f0f081520336329be4330c9b26..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfOH-R$+}PWLAH!`W5=$4(}V6rI`ciw zxxl?Otu4r_!;p!g=v&h$W;(V>w?U3$@O1TaS?83{1OUC)MbH2M diff --git a/src/main/resources/assets/hbm/textures/items/grenade_kit.png b/src/main/resources/assets/hbm/textures/items/grenade_kit.png deleted file mode 100644 index 49a8023159a34a2d948379f931ec8db17a2d8865..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 284 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=Dh+L6~vJ#O${~L5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33J+nVO$@hV3W_h|e zhFJJ7J#Wazq$t1|z?Yz7$-v5*{?OuEQ1IoTONBCe2Q`nS3YqNw6YB06$6(dHvG@MA+On`sEQ%~u&n@;__cTrsI&En`H7H_jspiet zKEqE>?^#PG&)7Pxx7BM})55K8ugWTS#_ufI_bmCK$^PO$*D@QA1bxt!@H!B{)OKI_ aD?`Q9>y2lpFntBOlEKr}&t;ucLK6VIQf7+) diff --git a/src/main/resources/assets/hbm/textures/items/grenade_kyiv.png b/src/main/resources/assets/hbm/textures/items/grenade_kyiv.png deleted file mode 100644 index c48225d2772aa2e0dbfc318777d3a4e7acfc5a4a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 516 zcmV+f0{i`mP)l)w)-|H>2z0HDuXz!u zncfv76RI`iZfqJS)fW_wR#92o!&FQ}Ja2keZ-?zmP-KAuKl@>nCHKwbVfrfu^BUvf zmGw?8;eGrc}F007$uc>(~6EYQZ=N0%At1v3>+FX09Q02u_fDo|vB zX7gu(VatG-Z0&3Wg1e;10zJ>BJdez`N#F3$WzU1axxk)(EhP?~2YNA$X4MRy2eWgx z(6u(A@d%zj0n|+A%fv%$usp!bKAKe%0I;+W={=*{5_}!;$nwCt&%;b%9)x+|rGfL{ zfBqlzgxI*xEYoB{rA9qRODd?N8ZX#w31J?Dc@W5?Z+Pe$O1}^cuIIW;JU{PtRU{RY z(jxR?+L;FcJOjnOUpTb-h4H&T!i2xZ_Y1z^Fb~2!@S|@4w))^spEf`M00000#LT=By}Z;C1rt33 zJwt=FTwDi$iVk?XIEGmGFP)$$bjU!!wRrxF87txztTWnH?yzu&gjl!R!^a;_|64Nq zX6md9jA?OYH-EnGwo>}V{W(20T+Zx6@2?O1pG`HzhExCm diff --git a/src/main/resources/assets/hbm/textures/items/grenade_mirv.png b/src/main/resources/assets/hbm/textures/items/grenade_mirv.png deleted file mode 100644 index 1d3f76707c06b43019aaef3b827e1ad3d8896552..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 371 zcmV-(0gV2MP)`L zKhf;I?DkL%#B9Ywp#uwVhqtpcZx{X>o{Jm|1{PpE9+%v7I(7CoT!)v-r5A=F^Z6X5 z6abUS#2zKE52aMOTp|Y}4DUYBxnc8V2>L#q_gmWSb|sF}!TI$Y-Qg=bH;95lgU$`J z*{pV0A} z5lNC*5upe&y1fRXAYU0y)-fVd6RADpE(U-sM#xK80#LT=By}Z;C1rt33 zJwt=FTwDi$iWYdfIEGmGAMN+%I&8q>!mO!U{^D4y<%8bM?^&z6CiyY+dY_5|b0 zs&gg#zNa;8JXiZp+%cJ@<@f72iKiKMdKWgEx*P9(@QPJw*8lwhmqi*fzB%~@TZHSc u;M>Kfz*g&6dcjnt*75nd4L@zS%?UUew)|0?-(8?v89ZJ6T-G@yGywoSoNUqn diff --git a/src/main/resources/assets/hbm/textures/items/grenade_mk2_alt.png b/src/main/resources/assets/hbm/textures/items/grenade_mk2_alt.png deleted file mode 100644 index 452522c766a704d3b6b180b8b8ce799e7d10f221..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 295 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C|TkfQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXK1jNi|YVT(GpJ= z#}Etuqy5%g%!WKJ;$|&(6nld!5B6?9&sy}KS<|NRfLyhCqll*5ud^JPhMVWlFbno# z+j@=hY8h*S%Cw*w&OlDxlC%q~mg((sA0IOv;OPJR=+5@5%EqxqGZO3X-f_tJJma|Q z10#LT=By}Z;C1rt33 zJknfFCH`dtld50}K=W}=G%-Q~5 zmnL}3=7~RY|5>5}kJ6^qnX`^W?XLUwIpBKBvBH@4_uutBt{+KB?n!VFpRjJ>E;Y3y z5~@p8ET1dII+yxx@i}1ck$mQ}j$#Yb1%W3ewW1F9esei+Fr0Y#ORHf{F{=Ydm@0#1 zY&@$#xFU<8!|gj^p$vudPyba~e|+njUv>Ao%2zSJlQqnL5WsH3%(UbG<#vvSwmG}p wcrEWRw!}v=f4k?L{6TaRchiHd>x0_(=ZT*&S9~5;2J|3mdKI;Vst0PHx0+yDRo diff --git a/src/main/resources/assets/hbm/textures/items/grenade_nuke_alt.png b/src/main/resources/assets/hbm/textures/items/grenade_nuke_alt.png deleted file mode 100644 index 3419864d6ea137732b35ef22b2ee735d979dc87e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf#%`H+kO#~O2b_Z6Wz|ws+knG;`k|%4^M7RIQfHV-O5XBOB`jp<|gb9Xx;PD zx$4&!Zrh5De3z0!LpcvfICC^^%ROq>u>Eb*RoM@@GXEKkM%L(sOH#1(H)v-_8_a lKWRCA8uNFd%qj8f;@5Y^*m%uJ^aA>k!PC{xWt~$(698=JdgcHC diff --git a/src/main/resources/assets/hbm/textures/items/grenade_pink_cloud.png b/src/main/resources/assets/hbm/textures/items/grenade_pink_cloud.png deleted file mode 100644 index b06b5f55c6929e0b62e622e137021a58367f7863..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 370 zcmV-&0ge8NP)(EM4AW@7T-uL zB*JLYegZZOBqEY74N+n!tv2b?V=y)E(^gE*_T1;5bI-ZC@UL;Ox2pY2O6_{QRv(fy zky>JMVHrtnMOs3VvK`2#9hvCU&!dvS7~|}9M#xHHs|dS8e15%hYtHH9q={V56l8f& zkxOawMe_5y;M5r>sjR1SY`8hahk|2vu{ynC_|8 zt0X_>NJeHsqEadmCDvI0AlW^Gt(Ni6d>U&YLFCwyb9!(ft7c?>agl$zq>>O@Y%i_E$;u@856A zEdNSHboDAPhGP;=99wd=zcJS2a$mb;()akJ#9;#-1{2@OeCivnsjW3NbldY?#C7Am zueJMM-&eg5W$Y{b*(P|Js+Z=JAciZYd%czZ`F6=TEqJ}_zi>+J|2eL9IUjb%T$^sZ zKeZrooszuS4!y}I+Ij!In*AbK jtQlWnHZkmHvMs}5<*Zio>nhGbA2N8l`njxgN@xNAbiHzI diff --git a/src/main/resources/assets/hbm/textures/items/grenade_poison_alt.png b/src/main/resources/assets/hbm/textures/items/grenade_poison_alt.png deleted file mode 100644 index db89531555996cdeffa70498d369f73d4483a4d0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfwm*C7LuR{Ntqv0i1GCzVRhT}c<7e|BZ?^Sq#6OiQC;g$(?3FCCFTG4s$~b$RtC z4vWk-CI*VgIcTKctGa6ylp&V z&-wMQ?>A&?J($L|V>y#tCquE_9~PGXSv`?f59TD-#%(u@Qc3QaufNARDb(*8_nQ(g V>o~uvUqDYWc)I$ztaD0e0ssx=YSI7z diff --git a/src/main/resources/assets/hbm/textures/items/grenade_pulse.png b/src/main/resources/assets/hbm/textures/items/grenade_pulse.png deleted file mode 100644 index 1b3a050844ffa2d74bc87f308885623eeeed45d3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfkdrhLqQC4A@${z{Hn<=P<*8 zUF+1g?`#%udc9Nc!Cv#2vy*NzK2hy^>~X!+VcVu$X-(D1^}3u(rZC+2ez!oLv*Uy! zpQ6OO&PA-B_D^57>S=Ui&8nhs+k$wG4CQ~aa?L?@cFB3WUjco<;OXk;vd$@?2>>LQ BU-bY0 diff --git a/src/main/resources/assets/hbm/textures/items/grenade_schrabidium_alt.png b/src/main/resources/assets/hbm/textures/items/grenade_schrabidium_alt.png deleted file mode 100644 index 290ae3b72f02d1996620b3f9ea404cc5c7d9918e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf=sP>wXcFO2c2wZc?_{pZ@o&pO5Rk-eSR||MbctKck~|QSEzPJ}#-Mdc=3{ zimSGn?_|a~#T^{A_gB|4$p3EoZg>83P2o91UtxyW>rXFp?)iQ*%G;|`LOC=vH~q1N z+%JC4HCuH~AKJCvIY3CZ*h-b|;R++l^C%s_*45o~6(-;dJYL ewOd;I*UFohWv%V;C=CR9j=|H_&t;ucLK6VFPI%q` diff --git a/src/main/resources/assets/hbm/textures/items/grenade_shrapnel.png b/src/main/resources/assets/hbm/textures/items/grenade_shrapnel.png deleted file mode 100644 index 5c00676a1a2170832e78f34ad65d4a0a50de44a3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 302 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfD!kRcM^uxf=utdyT@<(9qQ=k4~Kfk zb<-J=QP~25*GgSwj&HYcWKWG;q`_ri-1oR)tJs;I%vpOH;}&Mlx*XMAdtY&B%ju~> z<_ni=JGdmIaVR#$XqLYIuC!xY?7w@b+}WdEpWY^L=&_y+d+mL9&q)qmoJxoM?Rc8M xrybO->0)5`Y~x0;{7d)O8;Gb_7Uh|22WQ%mvv4FO#m@ac31!a diff --git a/src/main/resources/assets/hbm/textures/items/grenade_smart.png b/src/main/resources/assets/hbm/textures/items/grenade_smart.png deleted file mode 100644 index d779dbee296d1768868246b9575fe064aceaa4f5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 312 zcmV-80muG{P)7_5#NlK?7+H0)kkiQ^7jFTvA913D`)m5bRTk z%8AKtZr93ScK3{(4h%dVvv1y;g}<)AN2Y0N0P;K^xw0(1vkTwjwrztf%V?SgDJ1|! zQJ7x|*d?VL+b8m4gw5p}s@HT|O`Hf;uNOp7G>PMNaD4W{dh?9xHG_nm0@Z7(s&Wf7^rhnJS4@0=r>=YwDITz;ZCVK_qM4)<2xYS-uH=TDP*tTsv>!90CZQJ-DoN@4Y zI|S>a1*^k=I1zluPj`cJMDH)`ivUp9bucUNa3h^f_t!4>Kk5^`1C;c@N0_Am0000< KMNUMnLSTZu|ACbN diff --git a/src/main/resources/assets/hbm/textures/items/grenade_strong.png b/src/main/resources/assets/hbm/textures/items/grenade_strong.png deleted file mode 100644 index dc7928bf5cdbd5416f191c46579d8979bea54d63..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 317 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$@hV3)_J-(hFJJ7?K9+KR^(yvoagN9EIjM+|M^9GUWiG~)^O2uJ2?C6oXH)3 zj+*^x&Gm@NzEpkv`M-LBrl{3Zf>fUCR5&x$^y@HpM;y_2nPTv{rD4*Ssvd0x&+Ek; zWs_28B>FNjis?>hT$o_(E zMsVJn)n3P;v0+m6PY(kpZN*tX(y4m*Jql&rWc*?}e(%mjVmos>}`njxg HN@xNA1+#GP diff --git a/src/main/resources/assets/hbm/textures/items/grenade_tau_alt.png b/src/main/resources/assets/hbm/textures/items/grenade_tau_alt.png deleted file mode 100644 index e42ec824933d5b6cd5ac8fbe6d64c799b79d6fe1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmV+-0p0$IP)U0;ZJeB$m{|#508#vdSCTqW z4Vwr$b(J(47W5CTF706>;y3n%PuoMj?HS(d*YOts(f zIvCL2$-g}5Re{0dn7t1-rBz}olj olb)xM4U#d&O&2~PT$KN=7pL!JJac0NyZ`_I07*qoM6N<$f~rt+e*gdg diff --git a/src/main/resources/assets/hbm/textures/items/grenade_zomg.png b/src/main/resources/assets/hbm/textures/items/grenade_zomg.png deleted file mode 100644 index 094e7f3da0db73e87a117be342c0b9ba285220fe..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 344 zcmV-e0jK_nP)1sx5JkU?34XrNpu< zyB8$^Qc4WN03w1?DqCrh+APa*n@`gO05HZRpAiAn*>cx)008IQ9YmdN1c?B*i@#e3 zNGg{E@VJWRd0yAw&rvQ55C;k8oCuKH#lty=zVC%N#66Dy#nUSKcoq11FTkV6=bPWH zAd2d=c3W%BbzO6HG8`NTxoibIdJxejtX>|p@o)UMF+48|2#pFZJZ$6j*b8G!BqSnS qkG;rM4B+<{5)p@?wPqmwD}MlK`Fc3wSmDwD0000#fGZx^prw85kH?(j9#r85lP9bN@+X1@buyJR*x382Ao@Fyrz3 z6)8YLi4xa{lHmNblJdl&REC1Y%)Ao4ywnl}6Fmbxvp+q__kn79JY5_^Ed1wAxX61z zfrEAKq5Sqjv+K+Ds)agU*rGE1z+=TDPg*-P>{=^i>*P;Za_iWJvbepvHtR~1;mSCF z1*1jNgXXpO^S2z^z3tXweW!$;f}@g6-3PuU2?b3*BhlOL~G z?_srFxY61)YJrc*p2Q9@jmw<*j{g51wWZIIoOp>fox@p-<+?&8&|wUou6{1-oD!M< Dv6W$&