From ed4421b2e224bad0c1cf445e0f95d33b0797c2ce Mon Sep 17 00:00:00 2001 From: Boblet Date: Tue, 4 Mar 2025 16:50:33 +0100 Subject: [PATCH] burned old textures, better sludge --- changelog | 12 +- src/main/java/com/hbm/blocks/ModBlocks.java | 6 +- .../java/com/hbm/blocks/bomb/BlockTaint.java | 247 ++++++------------ .../blocks/generic/BlockGenericStairs.java | 2 +- .../hbm/blocks/generic/BlockMultiSlab.java | 2 +- .../com/hbm/blocks/generic/RedBarrel.java | 5 +- .../blocks/network/BlockCablePaintable.java | 21 +- .../com/hbm/blocks/network/DroneDock.java | 54 ++++ .../blocks/network/FluidDuctPaintable.java | 21 +- .../entity/missile/EntityMissileCustom.java | 5 +- .../entity/missile/EntityMissileTier0.java | 6 +- .../hbm/entity/mob/EntityCreeperTainted.java | 8 +- .../com/hbm/handler/nei/SatelliteHandler.java | 11 - src/main/java/com/hbm/items/ModItems.java | 2 +- .../com/hbm/items/block/ItemTaintBlock.java | 40 --- .../com/hbm/items/weapon/ItemAmmoHIMARS.java | 2 +- src/main/java/com/hbm/main/ClientProxy.java | 1 - src/main/java/com/hbm/potion/HbmPotion.java | 16 +- .../hbm/render/block/RenderTaintBlock.java | 124 --------- .../assets/hbm/textures/blocks/ams_base.png | Bin 281 -> 0 bytes .../hbm/textures/blocks/ams_emitter.png | Bin 350 -> 0 bytes .../hbm/textures/blocks/ams_limiter.png | Bin 371 -> 0 bytes .../hbm/textures/blocks/block_daffergon.png | Bin 391 -> 0 bytes .../hbm/textures/blocks/block_reiium.png | Bin 370 -> 0 bytes .../hbm/textures/blocks/block_unobtainium.png | Bin 348 -> 0 bytes .../hbm/textures/blocks/block_verticium.png | Bin 339 -> 0 bytes .../hbm/textures/blocks/block_weidanium.png | Bin 348 -> 0 bytes .../assets/hbm/textures/blocks/taint.png | Bin 0 -> 731 bytes .../assets/hbm/textures/blocks/taint_0.png | Bin 476 -> 0 bytes .../assets/hbm/textures/blocks/taint_1.png | Bin 512 -> 0 bytes .../assets/hbm/textures/blocks/taint_10.png | Bin 487 -> 0 bytes .../assets/hbm/textures/blocks/taint_11.png | Bin 489 -> 0 bytes .../assets/hbm/textures/blocks/taint_12.png | Bin 477 -> 0 bytes .../assets/hbm/textures/blocks/taint_13.png | Bin 479 -> 0 bytes .../assets/hbm/textures/blocks/taint_14.png | Bin 463 -> 0 bytes .../assets/hbm/textures/blocks/taint_15.png | Bin 458 -> 0 bytes .../assets/hbm/textures/blocks/taint_2.png | Bin 482 -> 0 bytes .../assets/hbm/textures/blocks/taint_3.png | Bin 499 -> 0 bytes .../assets/hbm/textures/blocks/taint_4.png | Bin 499 -> 0 bytes .../assets/hbm/textures/blocks/taint_5.png | Bin 502 -> 0 bytes .../assets/hbm/textures/blocks/taint_6.png | Bin 497 -> 0 bytes .../assets/hbm/textures/blocks/taint_7.png | Bin 499 -> 0 bytes .../assets/hbm/textures/blocks/taint_8.png | Bin 486 -> 0 bytes .../assets/hbm/textures/blocks/taint_9.png | Bin 483 -> 0 bytes .../assets/hbm/textures/blocks/taint_full.png | Bin 509 -> 0 bytes .../assets/hbm/textures/blocks/taint_low.png | Bin 431 -> 0 bytes .../hbm/textures/blocks/test_bb_bork.png | Bin 427 -> 0 bytes .../hbm/textures/blocks/test_bb_inf.png | Bin 197 -> 0 bytes .../assets/hbm/textures/blocks/test_bomb.png | Bin 254 -> 0 bytes .../hbm/textures/blocks/test_conductor.png | Bin 193 -> 0 bytes .../hbm/textures/blocks/test_container.png | Bin 255 -> 0 bytes .../assets/hbm/textures/blocks/test_nuke.png | Bin 229 -> 0 bytes .../hbm/textures/blocks/test_ticker.png | Bin 216 -> 0 bytes .../hbm/textures/blocks/waste_earth_side.png | Bin 454 -> 0 bytes .../hbm/textures/blocks/waste_earth_top.png | Bin 608 -> 0 bytes .../textures/entity/creeper_armor_taint.png | Bin 1647 -> 2238 bytes .../hbm/textures/entity/creeper_tainted.png | Bin 2274 -> 2922 bytes .../assets/hbm/textures/items/gun_ar15.png | Bin 208 -> 0 bytes .../assets/hbm/textures/items/gun_avenger.png | Bin 320 -> 0 bytes .../assets/hbm/textures/items/gun_b93.png | Bin 297 -> 0 bytes .../assets/hbm/textures/items/gun_bf.png | Bin 328 -> 0 bytes .../hbm/textures/items/gun_bio_revolver.png | Bin 309 -> 0 bytes .../hbm/textures/items/gun_bolt_action.png | Bin 210 -> 0 bytes .../textures/items/gun_bolt_action_green.png | Bin 210 -> 0 bytes .../items/gun_bolt_action_saturnite.png | Bin 210 -> 0 bytes .../hbm/textures/items/gun_calamity.png | Bin 281 -> 0 bytes .../hbm/textures/items/gun_calamity_dual.png | Bin 306 -> 0 bytes .../assets/hbm/textures/items/gun_coilgun.png | Bin 341 -> 0 bytes .../hbm/textures/items/gun_cryolator.png | Bin 405 -> 0 bytes .../assets/hbm/textures/items/gun_deagle.png | Bin 201 -> 0 bytes .../hbm/textures/items/gun_defabricator.png | Bin 194 -> 0 bytes .../textures/items/gun_defabricator_ammo.png | Bin 233 -> 0 bytes .../assets/hbm/textures/items/gun_emp.png | Bin 276 -> 0 bytes .../hbm/textures/items/gun_emp_ammo.png | Bin 360 -> 0 bytes .../hbm/textures/items/gun_euthanasia.png | Bin 318 -> 0 bytes .../textures/items/gun_euthanasia_ammo.png | Bin 156 -> 0 bytes .../assets/hbm/textures/items/gun_fatman.png | Bin 315 -> 0 bytes .../assets/hbm/textures/items/gun_flamer.png | Bin 304 -> 0 bytes .../assets/hbm/textures/items/gun_folly.png | Bin 244 -> 0 bytes .../assets/hbm/textures/items/gun_hk69.png | Bin 278 -> 0 bytes .../assets/hbm/textures/items/gun_hp.png | Bin 318 -> 0 bytes .../assets/hbm/textures/items/gun_hp_ammo.png | Bin 234 -> 0 bytes .../hbm/textures/items/gun_immolator.png | Bin 335 -> 0 bytes .../hbm/textures/items/gun_immolator_ammo.png | Bin 243 -> 0 bytes .../assets/hbm/textures/items/gun_jack.png | Bin 332 -> 0 bytes .../hbm/textures/items/gun_jack_ammo.png | Bin 392 -> 0 bytes .../assets/hbm/textures/items/gun_karl.png | Bin 353 -> 0 bytes .../assets/hbm/textures/items/gun_lacunae.png | Bin 321 -> 0 bytes .../hbm/textures/items/gun_lever_action.png | Bin 257 -> 0 bytes .../textures/items/gun_lever_action_dark.png | Bin 259 -> 0 bytes .../items/gun_lever_action_sonata.png | Bin 245 -> 0 bytes .../assets/hbm/textures/items/gun_minigun.png | Bin 309 -> 0 bytes .../assets/hbm/textures/items/gun_mirv.png | Bin 276 -> 0 bytes .../hbm/textures/items/gun_moist_nugget.png | Bin 479 -> 0 bytes .../assets/hbm/textures/items/gun_mp40.png | Bin 244 -> 0 bytes .../assets/hbm/textures/items/gun_mymy.png | Bin 280 -> 0 bytes .../assets/hbm/textures/items/gun_osipr.png | Bin 335 -> 0 bytes .../hbm/textures/items/gun_osipr_ammo.png | Bin 270 -> 0 bytes .../hbm/textures/items/gun_osipr_ammo2.png | Bin 299 -> 0 bytes .../hbm/textures/items/gun_panzerschreck.png | Bin 327 -> 0 bytes .../assets/hbm/textures/items/gun_pm.png | Bin 271 -> 0 bytes .../assets/hbm/textures/items/gun_pm_ammo.png | Bin 202 -> 0 bytes .../assets/hbm/textures/items/gun_quadro.png | Bin 294 -> 0 bytes .../hbm/textures/items/gun_revolver.png | Bin 291 -> 0 bytes .../hbm/textures/items/gun_revolver_ammo.png | Bin 378 -> 0 bytes .../textures/items/gun_revolver_blackjack.png | Bin 274 -> 0 bytes .../textures/items/gun_revolver_cursed.png | Bin 284 -> 0 bytes .../items/gun_revolver_cursed_ammo.png | Bin 326 -> 0 bytes .../hbm/textures/items/gun_revolver_gold.png | Bin 261 -> 0 bytes .../textures/items/gun_revolver_gold_ammo.png | Bin 316 -> 0 bytes .../textures/items/gun_revolver_inverted.png | Bin 205 -> 0 bytes .../hbm/textures/items/gun_revolver_iron.png | Bin 280 -> 0 bytes .../textures/items/gun_revolver_iron_ammo.png | Bin 364 -> 0 bytes .../hbm/textures/items/gun_revolver_lead.png | Bin 271 -> 0 bytes .../textures/items/gun_revolver_lead_ammo.png | Bin 278 -> 0 bytes .../textures/items/gun_revolver_nightmare.png | Bin 238 -> 0 bytes .../items/gun_revolver_nightmare2.png | Bin 244 -> 0 bytes .../items/gun_revolver_nightmare2_ammo.png | Bin 301 -> 0 bytes .../items/gun_revolver_nightmare_ammo.png | Bin 314 -> 0 bytes .../hbm/textures/items/gun_revolver_nopip.png | Bin 260 -> 0 bytes .../hbm/textures/items/gun_revolver_pip.png | Bin 323 -> 0 bytes .../textures/items/gun_revolver_pip_alt.png | Bin 290 -> 0 bytes .../hbm/textures/items/gun_revolver_red.png | Bin 283 -> 0 bytes .../textures/items/gun_revolver_saturnite.png | Bin 269 -> 0 bytes .../items/gun_revolver_schrabidium.png | Bin 265 -> 0 bytes .../items/gun_revolver_schrabidium_ammo.png | Bin 349 -> 0 bytes .../textures/items/gun_revolver_silver.png | Bin 292 -> 0 bytes .../assets/hbm/textures/items/gun_rpg.png | Bin 365 -> 0 bytes .../assets/hbm/textures/items/gun_rpg_alt.png | Bin 318 -> 0 bytes .../assets/hbm/textures/items/gun_rpg_new.png | Bin 300 -> 0 bytes .../hbm/textures/items/gun_skystinger.png | Bin 324 -> 0 bytes .../assets/hbm/textures/items/gun_spark.png | Bin 374 -> 0 bytes .../hbm/textures/items/gun_spark_ammo.png | Bin 234 -> 0 bytes .../assets/hbm/textures/items/gun_spas12.png | Bin 227 -> 0 bytes .../assets/hbm/textures/items/gun_stinger.png | Bin 315 -> 0 bytes .../hbm/textures/items/gun_super_shotgun.png | Bin 290 -> 0 bytes .../assets/hbm/textures/items/gun_uboinik.png | Bin 376 -> 0 bytes .../assets/hbm/textures/items/gun_uzi.png | Bin 288 -> 0 bytes .../hbm/textures/items/gun_uzi_saturnite.png | Bin 310 -> 0 bytes .../items/gun_uzi_saturnite_silencer.png | Bin 326 -> 0 bytes .../hbm/textures/items/gun_uzi_silencer.png | Bin 301 -> 0 bytes .../assets/hbm/textures/items/gun_xvl1456.png | Bin 336 -> 0 bytes .../hbm/textures/items/gun_xvl1456_ammo.png | Bin 335 -> 0 bytes .../assets/hbm/textures/items/gun_zomg.png | Bin 310 -> 0 bytes 144 files changed, 211 insertions(+), 374 deletions(-) delete mode 100644 src/main/java/com/hbm/items/block/ItemTaintBlock.java delete mode 100644 src/main/java/com/hbm/render/block/RenderTaintBlock.java delete mode 100644 src/main/resources/assets/hbm/textures/blocks/ams_base.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/ams_emitter.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/ams_limiter.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/block_daffergon.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/block_reiium.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/block_unobtainium.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/block_verticium.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/block_weidanium.png create mode 100644 src/main/resources/assets/hbm/textures/blocks/taint.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/taint_0.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/taint_1.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/taint_10.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/taint_11.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/taint_12.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/taint_13.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/taint_14.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/taint_15.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/taint_2.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/taint_3.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/taint_4.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/taint_5.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/taint_6.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/taint_7.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/taint_8.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/taint_9.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/taint_full.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/taint_low.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/test_bb_bork.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/test_bb_inf.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/test_bomb.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/test_conductor.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/test_container.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/test_nuke.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/test_ticker.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/waste_earth_side.png delete mode 100644 src/main/resources/assets/hbm/textures/blocks/waste_earth_top.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_ar15.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_avenger.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_b93.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_bf.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_bio_revolver.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_bolt_action.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_bolt_action_green.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_bolt_action_saturnite.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_calamity.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_calamity_dual.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_coilgun.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_cryolator.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_deagle.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_defabricator.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_defabricator_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_emp.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_emp_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_euthanasia.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_euthanasia_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_fatman.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_flamer.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_folly.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_hk69.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_hp.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_hp_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_immolator.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_immolator_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_jack.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_jack_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_karl.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_lacunae.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_lever_action.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_lever_action_dark.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_lever_action_sonata.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_minigun.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_mirv.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_moist_nugget.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_mp40.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_mymy.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_osipr.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_osipr_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_osipr_ammo2.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_panzerschreck.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_pm.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_pm_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_quadro.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_blackjack.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_cursed.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_cursed_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_gold.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_gold_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_inverted.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_iron.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_iron_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_lead.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_lead_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare2.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare2_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_nopip.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_pip.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_pip_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_red.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_saturnite.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_schrabidium.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_schrabidium_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_revolver_silver.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_rpg.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_rpg_alt.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_rpg_new.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_skystinger.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_spark.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_spark_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_spas12.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_stinger.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_super_shotgun.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_uboinik.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_uzi.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_uzi_saturnite.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_uzi_saturnite_silencer.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_uzi_silencer.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_xvl1456.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_xvl1456_ammo.png delete mode 100644 src/main/resources/assets/hbm/textures/items/gun_zomg.png diff --git a/changelog b/changelog index 96cce6458c..3122e1cbf9 100644 --- a/changelog +++ b/changelog @@ -9,6 +9,16 @@ * Fat mines now have a base damage of exactly 100, being identical to demolition mini nukes * Fat mines now gib affected entities * IV bags now use `setHealth` operations instead of dealing damage, preventing health duplication by just avoiding the damage +* The settings tool can now copy and paste the "paint" from paintable cables and fluid ducts +* Changed the way taint works + * Instead of neon purple vines, taint is bow a greyish sludge + * Taint now actively replaces blocks instead of growing along them + * Taint is still limited in spread, however taint spread is lower underground, taint decays three times faster in intensity if the block is not exposed to air, making taint spread more along the surface + * Taint has a 25% chance of splashing down when replacing a block with no supports, causing structures to collapse and taint to spread faster + * Similar to soil sand, entities will sink in taint and get slowed down + * The sludge consumeth ## Fixed -* Fixed animation error on the MAS-36 \ No newline at end of file +* Fixed animation error on the MAS-36 +* Fixed drone docks, requester and provider crates not dropping their contents when broken +* Fixed all missing texture errors that appear in the startup log \ No newline at end of file diff --git a/src/main/java/com/hbm/blocks/ModBlocks.java b/src/main/java/com/hbm/blocks/ModBlocks.java index 6cf108b50a..7dac239ef6 100644 --- a/src/main/java/com/hbm/blocks/ModBlocks.java +++ b/src/main/java/com/hbm/blocks/ModBlocks.java @@ -2177,7 +2177,7 @@ private static void initializeBlock() { mass_storage = new BlockMassStorage().setBlockName("mass_storage").setStepSound(Block.soundTypeMetal).setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab); boxcar = new DecoBlock(Material.iron).setBlockName("boxcar").setStepSound(Block.soundTypeMetal).setHardness(10.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":boxcar"); - boat = new DecoBlock(Material.iron).setBlockName("boat").setStepSound(Block.soundTypeMetal).setHardness(10.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":boat"); + boat = new DecoBlock(Material.iron).setBlockName("boat").setStepSound(Block.soundTypeMetal).setHardness(10.0F).setResistance(10.0F).setCreativeTab(MainRegistry.blockTab).setBlockTextureName(RefStrings.MODID + ":asphalt"); machine_well = new MachineOilWell().setBlockName("machine_well").setHardness(5.0F).setResistance(20.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_well"); machine_pumpjack = new MachinePumpjack().setBlockName("machine_pumpjack").setHardness(5.0F).setResistance(20.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":machine_pumpjack"); @@ -2279,7 +2279,7 @@ private static void initializeBlock() { crystal_virus = new CrystalVirus(Material.iron).setBlockName("crystal_virus").setHardness(15.0F).setResistance(Float.POSITIVE_INFINITY).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":crystal_virus"); crystal_hardened = new BlockGeneric(Material.iron).setBlockName("crystal_hardened").setHardness(15.0F).setResistance(Float.POSITIVE_INFINITY).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":crystal_hardened"); crystal_pulsar = new CrystalPulsar(Material.iron).setBlockName("crystal_pulsar").setHardness(15.0F).setResistance(Float.POSITIVE_INFINITY).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":crystal_pulsar"); - taint = new BlockTaint(Material.iron).setBlockName("taint").setHardness(15.0F).setResistance(10.0F).setCreativeTab(null); + taint = new BlockTaint(Material.iron).setBlockName("taint").setHardness(15.0F).setResistance(10.0F).setCreativeTab(null).setBlockTextureName(RefStrings.MODID + ":taint"); vent_chlorine = new BlockVent(Material.iron).setBlockName("vent_chlorine").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":vent_chlorine"); vent_cloud = new BlockVent(Material.iron).setBlockName("vent_cloud").setHardness(5.0F).setResistance(10.0F).setCreativeTab(MainRegistry.machineTab).setBlockTextureName(RefStrings.MODID + ":vent_cloud"); @@ -3476,7 +3476,7 @@ private static void registerBlock() { GameRegistry.registerBlock(crystal_virus, crystal_virus.getUnlocalizedName()); GameRegistry.registerBlock(crystal_hardened, crystal_hardened.getUnlocalizedName()); GameRegistry.registerBlock(crystal_pulsar, crystal_pulsar.getUnlocalizedName()); - GameRegistry.registerBlock(taint, ItemTaintBlock.class, taint.getUnlocalizedName()); + register(taint); GameRegistry.registerBlock(cheater_virus, cheater_virus.getUnlocalizedName()); GameRegistry.registerBlock(cheater_virus_seed, cheater_virus_seed.getUnlocalizedName()); GameRegistry.registerBlock(ntm_dirt, ntm_dirt.getUnlocalizedName()); diff --git a/src/main/java/com/hbm/blocks/bomb/BlockTaint.java b/src/main/java/com/hbm/blocks/bomb/BlockTaint.java index 3b92192de5..079058a64e 100644 --- a/src/main/java/com/hbm/blocks/bomb/BlockTaint.java +++ b/src/main/java/com/hbm/blocks/bomb/BlockTaint.java @@ -4,169 +4,71 @@ import java.util.List; import java.util.Random; -import com.hbm.blocks.ModBlocks; +import com.hbm.blocks.ITooltipProvider; import com.hbm.entity.mob.EntityTaintCrab; import com.hbm.entity.mob.EntityCreeperTainted; import com.hbm.entity.mob.EntityTeslaCrab; import com.hbm.potion.HbmPotion; -import cpw.mods.fml.client.registry.RenderingRegistry; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; +import net.minecraft.block.BlockFalling; import net.minecraft.block.material.MapColor; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityFallingBlock; import net.minecraft.entity.monster.EntityCreeper; +import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; import net.minecraft.util.AxisAlignedBB; -import net.minecraft.util.IIcon; import net.minecraft.world.World; +import net.minecraftforge.common.util.ForgeDirection; -public class BlockTaint extends Block/*Container*/ { - - @SideOnly(Side.CLIENT) - private IIcon[] icons; +public class BlockTaint extends Block implements ITooltipProvider { - public BlockTaint(Material p_i45386_1_) { - super(p_i45386_1_); - this.setTickRandomly(true); + public BlockTaint(Material mat) { + super(mat); + this.setTickRandomly(true); } - /*@Override - public TileEntity createNewTileEntity(World p_149915_1_, int p_149915_2_) { - return new TileEntityTaint(); - }*/ - - @SideOnly(Side.CLIENT) - public IIcon getIcon(int p_149691_1_, int meta) - { - return this.icons[meta % this.icons.length]; - } - - public int damageDropped(int meta) - { - return 0; - } - - public static int func_150032_b(int p_150032_0_) - { - return func_150031_c(p_150032_0_); - } - - public static int func_150031_c(int p_150031_0_) - { - return p_150031_0_ & 15; - } - - @SideOnly(Side.CLIENT) - public void getSubBlocks(Item p_149666_1_, CreativeTabs p_149666_2_, List p_149666_3_) - { - for (int i = 0; i < 16; ++i) - { - p_149666_3_.add(new ItemStack(p_149666_1_, 1, i)); - } - } - - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister p_149651_1_) - { - this.icons = new IIcon[16]; - - for (int i = 0; i < this.icons.length; ++i) - { - this.icons[i] = p_149651_1_.registerIcon("hbm:taint_" + i); - } - } - - public MapColor getMapColor(int p_149728_1_) - { - return MapColor.purpleColor; - } - - public static int renderID = RenderingRegistry.getNextAvailableRenderId(); - - @Override - public int getRenderType(){ - return renderID; - } + @Override public MapColor getMapColor(int meta) { return MapColor.grayColor; } + @Override public Item getItemDropped(int i, Random rand, int j) { return null; } - @Override - public Item getItemDropped(int p_149650_1_, Random p_149650_2_, int p_149650_3_) - { - return null; - } - - @Override - public boolean isOpaqueCube() { - return false; - } - @Override - public boolean renderAsNormalBlock() { - return false; - } - - public void onNeighborBlockChange(World world, int x, int y, int z, Block b) - { - if(!hasPosNeightbour(world, x, y, z) && !world.isRemote) - world.setBlockToAir(x, y, z); - } - - public void updateTick(World world, int x, int y, int z, Random rand) - { - int meta = world.getBlockMetadata(x, y, z); - if(!world.isRemote && meta < 15) { - - for(int i = 0; i < 15; i++) { - int a = rand.nextInt(11) + x - 5; - int b = rand.nextInt(11) + y - 5; - int c = rand.nextInt(11) + z - 5; - if(world.getBlock(a, b, c).isReplaceable(world, a, b, c) && hasPosNeightbour(world, a, b, c)) - world.setBlock(a, b, c, ModBlocks.taint, meta + 1, 2); - } - - for(int i = 0; i < 85; i++) { - int a = rand.nextInt(7) + x - 3; - int b = rand.nextInt(7) + y - 3; - int c = rand.nextInt(7) + z - 3; - if(world.getBlock(a, b, c).isReplaceable(world, a, b, c) && hasPosNeightbour(world, a, b, c)) - world.setBlock(a, b, c, ModBlocks.taint, meta + 1, 2); - } - } - } - - public static boolean hasPosNeightbour(World world, int x, int y, int z) { - Block b0 = world.getBlock(x + 1, y, z); - Block b1 = world.getBlock(x, y + 1, z); - Block b2 = world.getBlock(x, y, z + 1); - Block b3 = world.getBlock(x - 1, y, z); - Block b4 = world.getBlock(x, y - 1, z); - Block b5 = world.getBlock(x, y, z - 1); - boolean b = (b0.renderAsNormalBlock() && b0.getMaterial().isOpaque()) || - (b1.renderAsNormalBlock() && b1.getMaterial().isOpaque()) || - (b2.renderAsNormalBlock() && b2.getMaterial().isOpaque()) || - (b3.renderAsNormalBlock() && b3.getMaterial().isOpaque()) || - (b4.renderAsNormalBlock() && b4.getMaterial().isOpaque()) || - (b5.renderAsNormalBlock() && b5.getMaterial().isOpaque()); - return b; - } - - @Override - public AxisAlignedBB getCollisionBoundingBoxFromPool(World par1World, int par2, int par3, int par4) - { - return null; + public void updateTick(World world, int x, int y, int z, Random rand) { + + int meta = world.getBlockMetadata(x, y, z); + if(meta >= 15) return; + + for(int i = -3; i <= 3; i++) for(int j = -3; j <= 3; j++) for(int k = -3; k <= 3; k++) { + if(Math.abs(i) + Math.abs(j) + Math.abs(k) > 4) continue; + if(rand.nextFloat() > 0.25F) continue; + Block b = world.getBlock(x + i, y + j, z + k); + if(!b.isNormalCube() || b.isAir(world, x + i, y + j, z + k)) continue; + int targetMeta = meta + 1; + boolean hasAir = false; + for(ForgeDirection dir : ForgeDirection.VALID_DIRECTIONS) { + if(world.getBlock(x + i + dir.offsetX, y + j + dir.offsetY, z + k + dir.offsetZ).isAir(world, x + i + dir.offsetX, y + j + dir.offsetY, z + k + dir.offsetZ)) { + hasAir = true; + break; + } + } + if(!hasAir) targetMeta = meta + 3; + if(targetMeta > 15) continue; + if(b == this && world.getBlockMetadata(x + i, y + j, z + k) >= targetMeta) continue; + world.setBlock(x + i, y + j, z + k, this, targetMeta, 3); + if(rand.nextFloat() < 0.25F && BlockFalling.func_149831_e(world, x + i, y + j - 1, z + k)) { + EntityFallingBlock falling = new EntityFallingBlock(world, x + i + 0.5, y + j + 0.5, z + k + 0.5, this, targetMeta); + world.spawnEntityInWorld(falling); + } + } } - + @Override - public AxisAlignedBB getSelectedBoundingBoxFromPool(World par1World, int par2, int par3, int par4) - { - return AxisAlignedBB.getBoundingBox(par2, par3, par4, par2, par3, par4); + public AxisAlignedBB getCollisionBoundingBoxFromPool(World world, int x, int y, int z) { + return AxisAlignedBB.getBoundingBox(x, y, z, x + 1, y + 0.75, z + 1); } @Override @@ -174,36 +76,43 @@ public void onEntityCollidedWithBlock(World world, int x, int y, int z, Entity e int meta = world.getBlockMetadata(x, y, z); int level = 15 - meta; - - List list = new ArrayList(); - PotionEffect effect = new PotionEffect(HbmPotion.taint.id, 15 * 20, level); - effect.setCurativeItems(list); - - if(entity instanceof EntityLivingBase) { - if(world.rand.nextInt(50) == 0) { - ((EntityLivingBase)entity).addPotionEffect(effect); - } - } - - if(entity != null && entity.getClass().equals(EntityCreeper.class)) { - EntityCreeperTainted creep = new EntityCreeperTainted(world); - creep.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); - - if(!world.isRemote) { - entity.setDead(); - world.spawnEntityInWorld(creep); - } - } - - if(entity instanceof EntityTeslaCrab) { - EntityTaintCrab crab = new EntityTaintCrab(world); - crab.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); - - if(!world.isRemote) { - entity.setDead(); - world.spawnEntityInWorld(crab); - } - } + + entity.motionX *= 0.6; + entity.motionZ *= 0.6; + + List list = new ArrayList(); + PotionEffect effect = new PotionEffect(HbmPotion.taint.id, 15 * 20, level); + effect.setCurativeItems(list); + + if(entity instanceof EntityLivingBase) { + if(world.rand.nextInt(50) == 0) { + ((EntityLivingBase) entity).addPotionEffect(effect); + } + } + + if(entity != null && entity.getClass().equals(EntityCreeper.class)) { + EntityCreeperTainted creep = new EntityCreeperTainted(world); + creep.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); + + if(!world.isRemote) { + entity.setDead(); + world.spawnEntityInWorld(creep); + } + } + + if(entity instanceof EntityTeslaCrab) { + EntityTaintCrab crab = new EntityTaintCrab(world); + crab.setLocationAndAngles(entity.posX, entity.posY, entity.posZ, entity.rotationYaw, entity.rotationPitch); + + if(!world.isRemote) { + entity.setDead(); + world.spawnEntityInWorld(crab); + } + } } + @Override + public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { + list.add("DO NOT TOUCH, BREATHE OR STARE AT."); + } } diff --git a/src/main/java/com/hbm/blocks/generic/BlockGenericStairs.java b/src/main/java/com/hbm/blocks/generic/BlockGenericStairs.java index 7bd3ee8f69..61df2ed895 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockGenericStairs.java +++ b/src/main/java/com/hbm/blocks/generic/BlockGenericStairs.java @@ -18,6 +18,6 @@ public BlockGenericStairs(Block block, int meta) { recipeGen.add(new Object[] {block, meta, this}); - this.setBlockTextureName(RefStrings.MODID + ":concrete_smooth"); + this.setBlockTextureName(RefStrings.MODID + ":concrete"); } } diff --git a/src/main/java/com/hbm/blocks/generic/BlockMultiSlab.java b/src/main/java/com/hbm/blocks/generic/BlockMultiSlab.java index bcc38242d2..8374ba803c 100644 --- a/src/main/java/com/hbm/blocks/generic/BlockMultiSlab.java +++ b/src/main/java/com/hbm/blocks/generic/BlockMultiSlab.java @@ -39,7 +39,7 @@ public BlockMultiSlab(Block single, Material mat, Block... slabMaterials) { } } - this.setBlockTextureName(RefStrings.MODID + ":concrete_smooth"); + this.setBlockTextureName(RefStrings.MODID + ":concrete"); } @Override diff --git a/src/main/java/com/hbm/blocks/generic/RedBarrel.java b/src/main/java/com/hbm/blocks/generic/RedBarrel.java index 857cb7b553..753e47b091 100644 --- a/src/main/java/com/hbm/blocks/generic/RedBarrel.java +++ b/src/main/java/com/hbm/blocks/generic/RedBarrel.java @@ -4,11 +4,11 @@ import com.hbm.blocks.ModBlocks; import com.hbm.blocks.bomb.BlockDetonatable; -import com.hbm.blocks.bomb.BlockTaint; import com.hbm.blocks.machine.BlockFluidBarrel; import com.hbm.entity.item.EntityTNTPrimedBase; import com.hbm.explosion.ExplosionThermo; +import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.util.AxisAlignedBB; import net.minecraft.util.MathHelper; @@ -68,7 +68,8 @@ public void explodeEntity(World world, double x, double y, double z, EntityTNTPr int a = rand.nextInt(9) - 4 + ix; int b = rand.nextInt(9) - 4 + iy; int c = rand.nextInt(9) - 4 + iz; - if(world.getBlock(a, b, c).isReplaceable(world, a, b, c) && BlockTaint.hasPosNeightbour(world, a, b, c)) { + Block block = world.getBlock(a, b, c); + if(block.isNormalCube() && !block.isAir(world, a, b, c)) { world.setBlock(a, b, c, ModBlocks.taint, rand.nextInt(3) + 4, 2); } } diff --git a/src/main/java/com/hbm/blocks/network/BlockCablePaintable.java b/src/main/java/com/hbm/blocks/network/BlockCablePaintable.java index 68a0232ee6..3587df3c58 100644 --- a/src/main/java/com/hbm/blocks/network/BlockCablePaintable.java +++ b/src/main/java/com/hbm/blocks/network/BlockCablePaintable.java @@ -2,6 +2,7 @@ import api.hbm.block.IToolable; import com.hbm.blocks.IBlockMultiPass; +import com.hbm.interfaces.ICopiable; import com.hbm.lib.RefStrings; import com.hbm.render.block.RenderBlockMultipass; import com.hbm.tileentity.network.TileEntityCableBaseNT; @@ -124,7 +125,7 @@ public int getRenderType(){ return IBlockMultiPass.getRenderType(); } - public static class TileEntityCablePaintable extends TileEntityCableBaseNT { + public static class TileEntityCablePaintable extends TileEntityCableBaseNT implements ICopiable { private Block block; private int meta; @@ -168,5 +169,23 @@ public void writeToNBT(NBTTagCompound nbt) { if(block != null) nbt.setInteger("block", Block.getIdFromBlock(block)); nbt.setInteger("meta", meta); } + + @Override + public NBTTagCompound getSettings(World world, int x, int y, int z) { + NBTTagCompound nbt = new NBTTagCompound(); + if(block != null) { + nbt.setInteger("paintblock", Block.getIdFromBlock(block)); + nbt.setInteger("paintmeta", meta); + } + return nbt; + } + + @Override + public void pasteSettings(NBTTagCompound nbt, int index, World world, EntityPlayer player, int x, int y, int z) { + if(nbt.hasKey("paintblock")) { + this.block = Block.getBlockById(nbt.getInteger("paintblock")); + this.meta = nbt.getInteger("paintmeta"); + } + } } } diff --git a/src/main/java/com/hbm/blocks/network/DroneDock.java b/src/main/java/com/hbm/blocks/network/DroneDock.java index 226d3c3f00..83bb9d68f5 100644 --- a/src/main/java/com/hbm/blocks/network/DroneDock.java +++ b/src/main/java/com/hbm/blocks/network/DroneDock.java @@ -9,16 +9,21 @@ import cpw.mods.fml.common.network.internal.FMLNetworkHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.item.EntityItem; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.ISidedInventory; import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.IIcon; import net.minecraft.world.World; import java.util.List; +import java.util.Random; public class DroneDock extends BlockContainer implements ITooltipProvider { @@ -69,4 +74,53 @@ public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer p public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { this.addStandardInfo(stack, player, list, ext); } + + @Override + public void breakBlock(World world, int x, int y, int z, Block block, int meta) { + if(this == ModBlocks.drone_dock) this.dropContents(world, x, y, z, block, meta, 0, 9); + if(this == ModBlocks.drone_crate_provider) this.dropContents(world, x, y, z, block, meta, 0, 9); + if(this == ModBlocks.drone_crate_requester) this.dropContents(world, x, y, z, block, meta, 9, 18); + super.breakBlock(world, x, y, z, block, meta); + } + + private final Random rand = new Random(); + public void dropContents(World world, int x, int y, int z, Block block, int meta, int start, int end) { + ISidedInventory sidedInventory = (ISidedInventory) world.getTileEntity(x, y, z); + + if(sidedInventory != null) { + + for(int i1 = start; i1 < end; ++i1) { + ItemStack stack = sidedInventory.getStackInSlot(i1); + + if(stack != null) { + float f = this.rand.nextFloat() * 0.8F + 0.1F; + float f1 = this.rand.nextFloat() * 0.8F + 0.1F; + float f2 = this.rand.nextFloat() * 0.8F + 0.1F; + + while(stack.stackSize > 0) { + int j1 = this.rand.nextInt(21) + 10; + + if(j1 > stack.stackSize) { + j1 = stack.stackSize; + } + + stack.stackSize -= j1; + EntityItem entity = new EntityItem(world, x + f, y + f1, z + f2, new ItemStack(stack.getItem(), j1, stack.getItemDamage())); + + if(stack.hasTagCompound()) { + entity.getEntityItem().setTagCompound((NBTTagCompound) stack.getTagCompound().copy()); + } + + float f3 = 0.05F; + entity.motionX = (float) this.rand.nextGaussian() * f3; + entity.motionY = (float) this.rand.nextGaussian() * f3 + 0.2F; + entity.motionZ = (float) this.rand.nextGaussian() * f3; + world.spawnEntityInWorld(entity); + } + } + } + + world.func_147453_f(x, y, z, block); + } + } } diff --git a/src/main/java/com/hbm/blocks/network/FluidDuctPaintable.java b/src/main/java/com/hbm/blocks/network/FluidDuctPaintable.java index 37599923b7..0bca70d6b5 100644 --- a/src/main/java/com/hbm/blocks/network/FluidDuctPaintable.java +++ b/src/main/java/com/hbm/blocks/network/FluidDuctPaintable.java @@ -3,6 +3,7 @@ import api.hbm.block.IToolable; import com.hbm.blocks.IBlockMultiPass; import com.hbm.blocks.ILookOverlay; +import com.hbm.interfaces.ICopiable; import com.hbm.lib.RefStrings; import com.hbm.render.block.RenderBlockMultipass; import com.hbm.tileentity.network.TileEntityPipeBaseNT; @@ -163,7 +164,7 @@ public void printHook(Pre event, World world, int x, int y, int z) { ILookOverlay.printGeneric(event, I18nUtil.resolveKey(getUnlocalizedName() + ".name"), 0xffff00, 0x404000, text); } - public static class TileEntityPipePaintable extends TileEntityPipeBaseNT { + public static class TileEntityPipePaintable extends TileEntityPipeBaseNT implements ICopiable { private Block block; private int meta; @@ -195,5 +196,23 @@ public void writeToNBT(NBTTagCompound nbt) { if(block != null) nbt.setInteger("block", Block.getIdFromBlock(block)); nbt.setInteger("meta", meta); } + + @Override + public NBTTagCompound getSettings(World world, int x, int y, int z) { + NBTTagCompound nbt = new NBTTagCompound(); + if(block != null) { + nbt.setInteger("paintblock", Block.getIdFromBlock(block)); + nbt.setInteger("paintmeta", meta); + } + return nbt; + } + + @Override + public void pasteSettings(NBTTagCompound nbt, int index, World world, EntityPlayer player, int x, int y, int z) { + if(nbt.hasKey("paintblock")) { + this.block = Block.getBlockById(nbt.getInteger("paintblock")); + this.meta = nbt.getInteger("paintmeta"); + } + } } } diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileCustom.java b/src/main/java/com/hbm/entity/missile/EntityMissileCustom.java index 0b6a51cf83..e929e2fe2a 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileCustom.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileCustom.java @@ -4,7 +4,6 @@ import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.bomb.BlockTaint; import com.hbm.entity.effect.EntityNukeTorex; import com.hbm.entity.logic.EntityBalefire; import com.hbm.entity.logic.EntityNukeExplosionMK5; @@ -22,6 +21,7 @@ import com.hbm.main.MainRegistry; import api.hbm.entity.IRadarDetectableNT; +import net.minecraft.block.Block; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -211,7 +211,8 @@ public void onImpact() { //TODO: demolish this steaming pile of shit int a = rand.nextInt(r) + (int) posX - (r / 2 - 1); int b = rand.nextInt(r) + (int) posY - (r / 2 - 1); int c = rand.nextInt(r) + (int) posZ - (r / 2 - 1); - if(worldObj.getBlock(a, b, c).isReplaceable(worldObj, a, b, c) && BlockTaint.hasPosNeightbour(worldObj, a, b, c)) { + Block block = worldObj.getBlock(a, b, c); + if(block.isNormalCube() && !block.isAir(worldObj, a, b, c)) { worldObj.setBlock(a, b, c, ModBlocks.taint, rand.nextInt(3) + 4, 2); } } diff --git a/src/main/java/com/hbm/entity/missile/EntityMissileTier0.java b/src/main/java/com/hbm/entity/missile/EntityMissileTier0.java index ed2a473090..315f7c30b5 100644 --- a/src/main/java/com/hbm/entity/missile/EntityMissileTier0.java +++ b/src/main/java/com/hbm/entity/missile/EntityMissileTier0.java @@ -4,7 +4,6 @@ import java.util.List; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.bomb.BlockTaint; import com.hbm.config.BombConfig; import com.hbm.entity.effect.EntityBlackHole; import com.hbm.entity.effect.EntityCloudFleija; @@ -128,7 +127,10 @@ public static class EntityMissileTaint extends EntityMissileTier0 { int a = rand.nextInt(11) + (int) this.posX - 5; int b = rand.nextInt(11) + (int) this.posY - 5; int c = rand.nextInt(11) + (int) this.posZ - 5; - if(worldObj.getBlock(a, b, c).isReplaceable(worldObj, a, b, c) && BlockTaint.hasPosNeightbour(worldObj, a, b, c)) worldObj.setBlock(a, b, c, ModBlocks.taint); + Block block = worldObj.getBlock(a, b, c); + if(block.isNormalCube() && !block.isAir(worldObj, a, b, c)) { + worldObj.setBlock(a, b, c, ModBlocks.taint, rand.nextInt(3) + 4, 2); + } } } @Override public ItemStack getDebrisRareDrop() { return new ItemStack(ModItems.powder_spark_mix, 1); } diff --git a/src/main/java/com/hbm/entity/mob/EntityCreeperTainted.java b/src/main/java/com/hbm/entity/mob/EntityCreeperTainted.java index 807e6c5438..1997caa330 100644 --- a/src/main/java/com/hbm/entity/mob/EntityCreeperTainted.java +++ b/src/main/java/com/hbm/entity/mob/EntityCreeperTainted.java @@ -55,8 +55,8 @@ public void func_146077_cc() { int a = rand.nextInt(15) + (int) posX - 7; int b = rand.nextInt(15) + (int) posY - 7; int c = rand.nextInt(15) + (int) posZ - 7; - - if(worldObj.getBlock(a, b, c).isReplaceable(worldObj, a, b, c) && hasPosNeightbour(worldObj, a, b, c)) { + Block block = worldObj.getBlock(a, b, c); + if(block.isNormalCube() && !block.isAir(worldObj, a, b, c)) { if(!GeneralConfig.enableHardcoreTaint) { worldObj.setBlock(a, b, c, ModBlocks.taint, rand.nextInt(3) + 5, 2); } else { @@ -71,8 +71,8 @@ public void func_146077_cc() { int a = rand.nextInt(7) + (int) posX - 3; int b = rand.nextInt(7) + (int) posY - 3; int c = rand.nextInt(7) + (int) posZ - 3; - - if(worldObj.getBlock(a, b, c).isReplaceable(worldObj, a, b, c) && hasPosNeightbour(worldObj, a, b, c)) { + Block block = worldObj.getBlock(a, b, c); + if(block.isNormalCube() && !block.isAir(worldObj, a, b, c)) { if(!GeneralConfig.enableHardcoreTaint) { worldObj.setBlock(a, b, c, ModBlocks.taint, rand.nextInt(6) + 10, 2); } else { diff --git a/src/main/java/com/hbm/handler/nei/SatelliteHandler.java b/src/main/java/com/hbm/handler/nei/SatelliteHandler.java index 77e0c3cb47..7206b10b2f 100644 --- a/src/main/java/com/hbm/handler/nei/SatelliteHandler.java +++ b/src/main/java/com/hbm/handler/nei/SatelliteHandler.java @@ -14,12 +14,10 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.util.EnumChatFormatting; -import net.minecraft.util.MathHelper; import net.minecraft.util.WeightedRandomChestContent; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.List; import static codechicken.lib.gui.GuiDraw.drawTexturedModalRect; @@ -177,13 +175,4 @@ public List getOtherStacks() { return getCycledIngredients(cycleticks / 20, stacks); } } - - private static HashMap getRecipeMap() { - HashMap recipeMap = new HashMap<>(); - ItemStack minerStack = new ItemStack(ModItems.sat_miner); - ItemStack lunarMinerStack = new ItemStack(ModItems.sat_lunar_miner); - Arrays.stream(ItemPool.getPool(ItemPoolsSatellite.POOL_SAT_MINER)).forEach(poolEntry -> recipeMap.put(minerStack, poolEntry.theItemId)); - Arrays.stream(ItemPool.getPool(ItemPoolsSatellite.POOL_SAT_LUNAR)).forEach(poolEntry -> recipeMap.put(lunarMinerStack, poolEntry.theItemId)); - return recipeMap; - } } diff --git a/src/main/java/com/hbm/items/ModItems.java b/src/main/java/com/hbm/items/ModItems.java index 3b2feed151..724ddd4059 100644 --- a/src/main/java/com/hbm/items/ModItems.java +++ b/src/main/java/com/hbm/items/ModItems.java @@ -3830,7 +3830,7 @@ public static void initializeItem() gun_b92_ammo = new GunB92Cell().setUnlocalizedName("gun_b92_ammo").setMaxStackSize(1).setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_b92_ammo_alt"); gun_b92 = new GunB92().setUnlocalizedName("gun_b92").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_b92"); gun_cryolator_ammo = new Item().setUnlocalizedName("gun_cryolator_ammo").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_cryolator_ammo"); - gun_cryocannon = new ItemCryoCannon(GunEnergyFactory.getCryoCannonConfig()).setUnlocalizedName("gun_cryocannon").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_cryocannon"); + gun_cryocannon = new ItemCryoCannon(GunEnergyFactory.getCryoCannonConfig()).setUnlocalizedName("gun_cryocannon").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_darter"); gun_fireext = new ItemGunBase(GunEnergyFactory.getExtConfig()).setUnlocalizedName("gun_fireext").setCreativeTab(MainRegistry.weaponTab).setTextureName(RefStrings.MODID + ":gun_fireext"); ToolMaterial matCrucible = EnumHelper.addToolMaterial("CRUCIBLE", 10, 3, 50.0F, 100.0F, 0); diff --git a/src/main/java/com/hbm/items/block/ItemTaintBlock.java b/src/main/java/com/hbm/items/block/ItemTaintBlock.java deleted file mode 100644 index 2f048d02aa..0000000000 --- a/src/main/java/com/hbm/items/block/ItemTaintBlock.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.hbm.items.block; - -import java.util.List; - -import com.hbm.blocks.bomb.BlockTaint; - -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemBlock; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; - -public class ItemTaintBlock extends ItemBlock -{ - public ItemTaintBlock(Block p_i45358_1_) - { - super(p_i45358_1_); - this.setMaxDamage(0); - this.setHasSubtypes(true); - } - - @SideOnly(Side.CLIENT) - public IIcon getIconFromDamage(int p_77617_1_) - { - return this.field_150939_a.func_149735_b(2, BlockTaint.func_150032_b(p_77617_1_)); - } - - public int getMetadata(int p_77647_1_) - { - return p_77647_1_; - } - - @Override - public void addInformation(ItemStack itemstack, EntityPlayer player, List list, boolean bool) - { - list.add("DO NOT TOUCH, BREATHE OR STARE AT."); - } -} diff --git a/src/main/java/com/hbm/items/weapon/ItemAmmoHIMARS.java b/src/main/java/com/hbm/items/weapon/ItemAmmoHIMARS.java index f50d3ba0f1..c372487d21 100644 --- a/src/main/java/com/hbm/items/weapon/ItemAmmoHIMARS.java +++ b/src/main/java/com/hbm/items/weapon/ItemAmmoHIMARS.java @@ -54,7 +54,7 @@ public class ItemAmmoHIMARS extends Item { public ItemAmmoHIMARS() { this.setHasSubtypes(true); this.setCreativeTab(MainRegistry.weaponTab); - this.setTextureName(RefStrings.MODID + ":ammo_rocket"); + this.setTextureName(RefStrings.MODID + ":ammo_standard.rocket_he"); this.setMaxStackSize(1); init(); } diff --git a/src/main/java/com/hbm/main/ClientProxy.java b/src/main/java/com/hbm/main/ClientProxy.java index 1bc9c8d181..3a4db1cddb 100644 --- a/src/main/java/com/hbm/main/ClientProxy.java +++ b/src/main/java/com/hbm/main/ClientProxy.java @@ -771,7 +771,6 @@ public void registerEntityRenderer() { @Override public void registerBlockRenderer() { - RenderingRegistry.registerBlockHandler(new RenderTaintBlock()); RenderingRegistry.registerBlockHandler(new RenderScaffoldBlock()); RenderingRegistry.registerBlockHandler(new RenderTapeBlock()); RenderingRegistry.registerBlockHandler(new RenderSteelBeam()); diff --git a/src/main/java/com/hbm/potion/HbmPotion.java b/src/main/java/com/hbm/potion/HbmPotion.java index a7688f2da8..e27806e1a1 100644 --- a/src/main/java/com/hbm/potion/HbmPotion.java +++ b/src/main/java/com/hbm/potion/HbmPotion.java @@ -3,7 +3,6 @@ import java.lang.reflect.Field; import com.hbm.blocks.ModBlocks; -import com.hbm.blocks.bomb.BlockTaint; import com.hbm.config.GeneralConfig; import com.hbm.config.PotionConfig; import com.hbm.entity.mob.EntityTaintCrab; @@ -19,6 +18,7 @@ import cpw.mods.fml.relauncher.ReflectionHelper; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; import net.minecraft.client.Minecraft; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.passive.EntityCow; @@ -109,15 +109,13 @@ public void performEffect(EntityLivingBase entity, int level) { if(GeneralConfig.enableHardcoreTaint && !entity.worldObj.isRemote) { - int x = (int)(entity.posX - 1); - int y = (int)entity.posY; - int z = (int)(entity.posZ); + int x = (int) Math.floor(entity.posX); + int y = (int) Math.floor(entity.posY); + int z = (int) Math.floor(entity.posZ); - if(entity.worldObj.getBlock(x, y, z) - .isReplaceable(entity.worldObj, x, y, z) && - BlockTaint.hasPosNeightbour(entity.worldObj, x, y, z)) { - - entity.worldObj.setBlock(x, y, z, ModBlocks.taint, 14, 2); + Block b = entity.worldObj.getBlock(x, y - 1, z); + if(y > 1 && b.isNormalCube() && !b.isAir(entity.worldObj, x, y - 1, z)) { + entity.worldObj.setBlock(x, y - 1, z, ModBlocks.taint, 14, 2); } } } diff --git a/src/main/java/com/hbm/render/block/RenderTaintBlock.java b/src/main/java/com/hbm/render/block/RenderTaintBlock.java deleted file mode 100644 index b7f6bc240e..0000000000 --- a/src/main/java/com/hbm/render/block/RenderTaintBlock.java +++ /dev/null @@ -1,124 +0,0 @@ -package com.hbm.render.block; - -import com.hbm.blocks.bomb.BlockTaint; - -import cpw.mods.fml.client.registry.ISimpleBlockRenderingHandler; -import net.minecraft.block.Block; -import net.minecraft.client.renderer.RenderBlocks; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.util.IIcon; -import net.minecraft.world.IBlockAccess; - -public class RenderTaintBlock implements ISimpleBlockRenderingHandler { - - @Override - public void renderInventoryBlock(Block block, int metadata, int modelId, RenderBlocks renderer) { } - - @Override - public boolean renderWorldBlock(IBlockAccess world, int x, int y, int z, Block block, int modelId, RenderBlocks renderer) { - - Tessellator tessellator = Tessellator.instance; - IIcon iicon = block.getIcon(0, world.getBlockMetadata(x, y, z)); - - if (renderer.hasOverrideBlockTexture()) - { - iicon = renderer.overrideBlockTexture; - } - - boolean ceil = world.getBlock(x, y + 1, z).isNormalCube(); - boolean floor = world.getBlock(x, y - 1, z).isNormalCube(); - boolean side1 = world.getBlock(x, y, z + 1).isNormalCube(); - boolean side2 = world.getBlock(x - 1, y, z).isNormalCube(); - boolean side3 = world.getBlock(x, y, z - 1).isNormalCube(); - boolean side4 = world.getBlock(x + 1, y, z).isNormalCube(); - - tessellator.setBrightness(block.getMixedBrightnessForBlock(renderer.blockAccess, x, y, z)); - int l = block.colorMultiplier(renderer.blockAccess, x, y, z); - float f = (float)(l >> 16 & 255) / 255.0F; - float f1 = (float)(l >> 8 & 255) / 255.0F; - float f2 = (float)(l & 255) / 255.0F; - tessellator.setColorOpaque_F(f, f1, f2); - double d3 = (double)iicon.getMinU(); - double d4 = (double)iicon.getMinV(); - double d0 = (double)iicon.getMaxU(); - double d1 = (double)iicon.getMaxV(); - double d2 = 0.05D; - renderer.blockAccess.getBlockMetadata(x, y, z); - - if (side2) - { - tessellator.addVertexWithUV((double)x + d2, (double)(y + 1), (double)(z + 1), d3, d4); - tessellator.addVertexWithUV((double)x + d2, (double)(y + 0), (double)(z + 1), d3, d1); - tessellator.addVertexWithUV((double)x + d2, (double)(y + 0), (double)(z + 0), d0, d1); - tessellator.addVertexWithUV((double)x + d2, (double)(y + 1), (double)(z + 0), d0, d4); - tessellator.addVertexWithUV((double)x + d2, (double)(y + 1), (double)(z + 0), d0, d4); - tessellator.addVertexWithUV((double)x + d2, (double)(y + 0), (double)(z + 0), d0, d1); - tessellator.addVertexWithUV((double)x + d2, (double)(y + 0), (double)(z + 1), d3, d1); - tessellator.addVertexWithUV((double)x + d2, (double)(y + 1), (double)(z + 1), d3, d4); - } - - if (side4) - { - tessellator.addVertexWithUV((double)(x + 1) - d2, (double)(y + 0), (double)(z + 1), d0, d1); - tessellator.addVertexWithUV((double)(x + 1) - d2, (double)(y + 1), (double)(z + 1), d0, d4); - tessellator.addVertexWithUV((double)(x + 1) - d2, (double)(y + 1), (double)(z + 0), d3, d4); - tessellator.addVertexWithUV((double)(x + 1) - d2, (double)(y + 0), (double)(z + 0), d3, d1); - tessellator.addVertexWithUV((double)(x + 1) - d2, (double)(y + 0), (double)(z + 0), d3, d1); - tessellator.addVertexWithUV((double)(x + 1) - d2, (double)(y + 1), (double)(z + 0), d3, d4); - tessellator.addVertexWithUV((double)(x + 1) - d2, (double)(y + 1), (double)(z + 1), d0, d4); - tessellator.addVertexWithUV((double)(x + 1) - d2, (double)(y + 0), (double)(z + 1), d0, d1); - } - - if (side3) - { - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 0), (double)z + d2, d0, d1); - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 1), (double)z + d2, d0, d4); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 1), (double)z + d2, d3, d4); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 0), (double)z + d2, d3, d1); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 0), (double)z + d2, d3, d1); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 1), (double)z + d2, d3, d4); - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 1), (double)z + d2, d0, d4); - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 0), (double)z + d2, d0, d1); - } - - if (side1) - { - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 1), (double)(z + 1) - d2, d3, d4); - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 0), (double)(z + 1) - d2, d3, d1); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 0), (double)(z + 1) - d2, d0, d1); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 1), (double)(z + 1) - d2, d0, d4); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 1), (double)(z + 1) - d2, d0, d4); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 0), (double)(z + 1) - d2, d0, d1); - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 0), (double)(z + 1) - d2, d3, d1); - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 1), (double)(z + 1) - d2, d3, d4); - } - - if (ceil) - { - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 1) - d2, (double)(z + 0), d3, d4); - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 1) - d2, (double)(z + 1), d3, d1); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 1) - d2, (double)(z + 1), d0, d1); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 1) - d2, (double)(z + 0), d0, d4); - } - - if (floor) - { - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 0) + d2, (double)(z + 0), d0, d4); - tessellator.addVertexWithUV((double)(x + 0), (double)(y + 0) + d2, (double)(z + 1), d0, d1); - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 0) + d2, (double)(z + 1), d3, d1); - tessellator.addVertexWithUV((double)(x + 1), (double)(y + 0) + d2, (double)(z + 0), d3, d4); - } - return true; - } - - @Override - public boolean shouldRender3DInInventory(int modelId) { - return false; - } - - @Override - public int getRenderId() { - return BlockTaint.renderID; - } - -} diff --git a/src/main/resources/assets/hbm/textures/blocks/ams_base.png b/src/main/resources/assets/hbm/textures/blocks/ams_base.png deleted file mode 100644 index d0d65f51ff9d5c7b03ce8cb5be480db3edda213b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfKT{qZN%(@r_o-b~@|I?j^r!VP# zU@qr{pYi)2aw#)2M>*~KIFt9>zmJdE5BJO4Uy$u!G}yD@ub@ti#lxiE@r8@DrCk^p Y)H$4#*Ka$27w9(zPgg&ebxsLQ0D{VK7XSbN diff --git a/src/main/resources/assets/hbm/textures/blocks/ams_emitter.png b/src/main/resources/assets/hbm/textures/blocks/ams_emitter.png deleted file mode 100644 index 1e8db25665e052fdb82a3ad642375cdc413396ce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 350 zcmV-k0iphhP)ojw8CD+YP;MZ zIl>Yw#1sY=6xPB4i~S(TSj4Oend~BqUp2gW^WNiq0|(BL3ykB~0@QWg!_zb!@CU$R z7TR5ow-3*~H>WO=KRI(ge)*^e*zuTCQYex_ZOH<5rjU3=p%@m zIAtnby7>gYfk>=_)u9TZXvyFqsayw1G5*VTi;KmoM! zn`!htN2f|G-@c&u$Jg)4Z zRaQ*>MaIZf064w9FP%XF;P*N@21LdHOs2EKfGYuhucJfDM$cnJr15eF(Dxi2ll9$Q zk1M|TBf~r(h)j;!AIR*_dEfd1%Rod5*WbTa%N6e46fgr|GEF;Qt207*j-7MuM1Fn!)(`?Bf^!b%9M)Py1XX1=5y5+ph*W#F>pCu%3jj^iV2r7fr)lCl zyWMWsloF*B07@ymUaxNxKA9bcff(abqzYPF`O`F^s>@mLJ+|+A4u=D!lm)$Mno9rk z`2=9I*;EDlzQ+QD5dI0fq8!KZt$?cHoO{Dx$3=u;7_e>Iayp&JIisp?P0Tre#0TiQ z4l5#zHeV}*%F~*Nm*lxF2RsBB+DJ8Dg lYlSE+S)@C*P-dd zI)O2=Eb03#Y(79czyRg6Wb&1p8Nf|@ekK+0emVhA6b05=j4`NQ(}!W;k$p7{G6FG1 znD)!%@-Sh|!v12R#Lz36KdUaV84fP)Wq`=$8jD$Kv^Of15NV*h1)GvA>MqLp63&V7?HII>ox3l z(+!KaKMV=n#0Myf9}3p~55M;a*Xz8DL4|;*>!zG@N~>)VHXAq`H0Zr1q6v(n7SE}$ uS|NDo@EmSfZNUPvRqKu+q!6)zrmhUsDC$5g`!x2 z|9F6@aRp%q=QH%Z6)u<9_v`Qhd!0BWPz4Q3F{9d7c*cJ#X!D0T~8xP6N)t z!v12Qc}O~l`MQ~El5?tcB{dFo@J^2`(4-NGHqB@AOLOqH|&J6X4wFpKMW~u>;n|Vj|6M~hwnYe^*TSsFoi(WbyLncmDRQ&n++Te8uVTh@ebpt#dA|w utw6m0P{J_4`JCd0_i&-&zcZF%415E)zJ--_!5(k`0000GU`Ay`6R@?RwWX76_2Q>N(=; z>nnTj(ONSM165T~89^f_g7^G$O|+*^tXk>q&aqUyRKZrB7?VbZ5Ku}nJ||YcK~zXp z@?(hn8YAubNLX$-Idd)z`xKEeA>xPAXU{4ndR(F*sdVHR>HVo8ild~#D+3pbU|l3ZubGL zHKyoU?i*sU=tDk3mk4nrk+8i+m6CaR;@UIPWb!14&lg6NOq0iCfm|$~?oV`{Vay|2 zu~7FGD`xse(RU^P4o@Dp2{YH!;zZa-ga`-&bz5PgL2q(JYB+W+Rz%(^L9qw?yt4#Q zoSBD6-Zk06`yU_dIJU8BmDVY(8e zC+~n%=qh)-QlcmqX8+ByjLcaOM8$3NNMSf%DvC|AJR)n{2zo|o&85Ad*CA2#g1AQ1 z9x!p^UGCR5UPJwm~Mk8jjs$x(3n?H!>72iK!%HXi8#V!;T-v?RXoGrOudA3EIH zlE%auXS}~*g{2fdW$jqDfZW=EY%KWTA zCV4|jml=cS(DnFvBV|ohSF{eS2?T!fOgEN2U>bpI6Ng^n=R4)m@;^d9XtmcBt2zJx N002ovPDHLkV1o2JOws@V literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_0.png b/src/main/resources/assets/hbm/textures/blocks/taint_0.png deleted file mode 100644 index 0bbd1263467970ed2921f31bfe1376d793b71ac4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 476 zcmV<20VDp2P)Y4G@1amc}wLMBfq zHS>VyYqlBX;n?59A^gM?M0jh6!GpJk3kI5#$hi_(&J}m*?*YI8z>-B`1WwtbPiDry z=<}8=LUR&19)ag~qA7@sBXGL`uN%?ZlgQT>V94yw_OBa}TWiDfyTatH?OmoI^72V! z$nm9;E=xiU0sE7$`>I~_VdMUO`<3@F7IyxMrhU5uA0 zz1D}<%u3~UQ-Q5fjDVYh$OQu#tiLfQkshUWU-Hk8nOI8}nSzMz4VkUYsX2-C=fk-Y zU2&IEtb^aj`j9+O_0d|}E^c4cO+n<4JeVI=@z!w49`+CHk##=hM-$ic0)TPUWV6dC zS@ChyJ45JV@Gy8w7AZwlW>(*A(B`CKm!b~Epa_3`RRH@ZF^;zGU9oAsV4!b!%Qv>| Sw6|jb00007K4Hw}Y|syx{%Q zV={B7(&n3deEl(+Y^_D#|0Eh}5$jxvHs1sQoJ%o|0JA3mfM(4MQG&@Riz+G zf?Y%j0N`};7X!fMb}&TbZM+`uqPn!x^SlIX<{e!j()T-vl2C{!fo=0mnl&?u^*g#k zB&O8rL;ZSW+N_}#Y4c5Vtz`PGPIZMy{QvDd8FM|}#oNarnVI2S3QYdcJTIZS@ujxS zH*qcn^B!qtR8eQD20000r(IpuRR({mt4CpG5D}Oe^EMb9>goPXj_(!#mUa~) zLRD3};jSL#2$Ih&?JA~kCMnAjj~@@Ft4DFp!F!MM?S)cWjn+60 z3^OBy02^b()BRi0%FKxg0I0@RaNMl zNz^Xwmt~p2&XT67M~TC@tCnD6M1l%_KQX-M+M|ynjCb zz01AA7*nz^T4UDZ_v-__QGFf**RU}h}aWN@g*`)4`67XUDK zt5|E{z26PD^&m%(d~WVmF?};iRaJO;e=u!5h;t4h1e`A?^Yh1x+-^50Gkw$V^W|g; zBEr-Ag8=|$PFvb~kl&xbj1Ct?fe^xu&D^b0lx3M3%Ql%9BbXWI%gJcZT8r!T3TB3L z4$C$fW=4z=1rg!#{yAx7=EMX5RO0`RN<_F*E$TvEZ9NDPCBU*Q5o6rBQ7Bc_3IN`F z^vx)0m-efwN?_;9$yjT@Y*ekPF@yjjO0=07eKSf30oK~IXa}IQj@37##dNgI4{9)uPczt0g@R zE?jsT+&?Jx4+M@3CkO5vrQI`$WXFEb@0su~x_XQv0&6Wq1j{-T4$)S9Jk|{Wyq`a# zwHDs{-RG_z<8jFG9}UeE%d*7l<%PO>jLtc{US0?Qe*QSe=kp0==A6T}Z94|15CT5F z-Ut9hWQX?a_l1d@K#qEA2bs>+g9%Be04J?WR%)E2M-0s)3zqJ+s;JwGtOi{(s zd|8%h*zJBLYb|!P+NzJ<`)^8j^_UR#RbZ1hD^eaqGsT>xqH8@3(Boic-0oLe)|uL> zkGaLlC>Q;t31&_RDrl~})^ee{dW@v|DUvpO@6$!*4jnJjh)8M%0Owp+$@8lb}HVSTeBb49OpS!enKIBY3Z Tt(`Ss00000NkvXXu0mjfd6v|i diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_13.png b/src/main/resources/assets/hbm/textures/blocks/taint_13.png deleted file mode 100644 index 6e0ba09d3948f43c884433a730531316df35fd73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 479 zcmV<50U-W~P)E_b5Ph~58RrLrjjiD5V1liK*1@Q>_*7haT6hXP8E0X& zI9hBxKVY~T>VkHB&bC7=&Diff&wC1=<;PH%8O9heGqyb{Jk&h+@;KK3@bdIpj4^P| z9WMJZlt+-qd#5lh1pwB|S@|&(Yb}2Nc~$`M^T)5!DznxirG(q<_8%bUjP-I>0Km)# zwtsJbmB`jwBc)VlLZ-W}tIchXiiprk-}b1CF}UCFU}jirvF%YYGl&Q}=Ztyq^#L;< zl!R$1ecyk()SNR;#u&uws^qV2`7xB7a|P_W4n%ZtL&xh{|8I-|066Cmrlp8o((n7e zg2n5qj4?RKng?H;b4V#2y!K*cJZCx8_|D%K42J)UiVoik6d#Ke77YYUiWH4R8!PT3l=WrCHkC}3 zA`JvgWs$-T`vneGrXHEEcU=u_-|x@<&)_eHb`)lYwHC~bd7TXIqN{tkuUA?;UrwfJ znxc7VN4XcV)*|n#@?r=9-h0gJWaf1;RaGGuX_^MijAdDF0*C!EH868A?d#{$Ff)dB zl$WPh2_dA~(2jE0AEhFql$_Ve5K%F8UMFL%#r1jxGbci31`(l(F`}#cf+8n*d)~=* zyM1`n7$Y{;TAVK@qb}qzw4=lrli<8g#yKZl-OIdArmK5Ns%jAcc<(_(h%pwE5BsBp z5FXp8dwK5>LiqPsU9#2|`6Q4NJc_sH-MW~dH<9s=#N#1)b%K{=oSNGzagZ6ZFFY1sI z7FRy(k3vNF_2}002ovPDHLk FV1ma*$Grdm diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_15.png b/src/main/resources/assets/hbm/textures/blocks/taint_15.png deleted file mode 100644 index 9dd944165ae23603e8b4583e31450344e893c226..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 458 zcmV;*0X6=KP)b>!3`M_;Oqz9p%<^ixgNGUgi~?PHh3r{!vn&OQ07W`@ zsN>a|c>#?9S9U2CDGf)G`h4V( zaxY@7Mc!BC#Sj9#_n6no%-7p|PK3-1B0?2oL|69(MNabe{4U$=_Tf=u zjM!LfalV|4x{$}vjuK-`g7Z2V=bUtPFY`K?uI?qNszm_cy$2B?##l_=?+y||cxJvlgsS3l=KuiH-UcGVo=ghJ@Uyd0gH;o4GH)X%Q*1RTa5YTb3O}REWv})7}P`^}BMXR;zUOb+or3!#bMHNi272-n%xp z^6g3GPOa{r9O&^mSXIHyzz~abKvsU(QMnEDtNAR;(kDhB}l5*!iXe!oLR z5W)`q5}b%2#v6P}DKj6=8z&+ty_-e5w6ao4cr!1SLRmu{wIncwWg6b3npXg5+dal+ zRg25ktLi;BJ6MR%N7xg&8qW!1rcSU+@N2AGg&`tY*sB*8vE4g z%aCE}REIk1*sN-6r|q1-Evd0twOoHQpv7lk5dkv;%kxl538f0d`Js-=%rEmTB52z^ zOrjk!=C<8u5?}fPfDm>7kmE8-);xq=9yVrv&Vk9BI@K6&`9(5w-m{lE^3x6x;c(u# pm#1pcn3|!EIe{`2o7R2_?jK{`QL~hYFK_?=002ovPDHLkV1jii*k1qu diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_4.png b/src/main/resources/assets/hbm/textures/blocks/taint_4.png deleted file mode 100644 index dd66e62453ce37d36b8fc9898e2bd1ee8839123f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 499 zcmVW!Tbtg>Q9^xviwtXlHh36@H^BdnO_nV?abW4+n)+Ty{5JziR;K>WPgp@ZP_G zo3iJ1ktMFHCsu7Wa#0j`|I(@{dv?wtgn-jyuRh-bPtycZCU0^-J@!hcl<@wg6#x)X zW@*ZvKfaw3u+|zOgcmhkJ+ZddLZn)25n}`q;q=%m05}f^WsJe|`2-QcIfwIbP(*|n zBXmkBGas*8MMU`y0Mg=rLrp1RBfW?V%V^4;mjt44>4p}m(klRX@6lExi(Qg0iXs;~ zJ@(2NGuwFC-B|jPNvD*uY$8HijT}ONF(wn`0_WkNMAkamYUHI#VejgRkJs(rT)KMV zrtG<`#=Jb2-7TNRskRz=Q5%!CDIp^QV*&mMR3No3dwX?aO`>5xn;hiSkL9 zz4w_!FZ%)j=NtfJyQC#4?wrfZX04s~K;(7x#4*MhyprBlBOk9@)!I2{jKT4`RU2Wx p>~4I&-?4P!Wy-^!GqOYg@B>VKNPD!*GbR84002ovPDHLkV1k~O*ZBYd diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_5.png b/src/main/resources/assets/hbm/textures/blocks/taint_5.png deleted file mode 100644 index 90ba3f39cfbfaef30899fa27c4f30f33ceda5b3d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 502 zcmV}IM9imL$~g50)Y1(eKWDd zCHGZTsj7GE;ylv0*WMChA|LkKX&WTM<)f88jN^;&&1aj8<+hj!-e zY4tmop`E#_NA8;`FVA6l%-@n!-%MQIF9ay@37Cjrt<5S@N+?wbPIvXl*4n52CL(z6 zArj>$VfNl<5?%TN0OuS4Izs$UkQTS6sJuwl%7y}|gzqSewb=sf#@m&MJ+-+=( zf%pCnJk%3E4k>YSx3LWQ6m2qEBjIjCPhKKXXLL72&#d>=0drBh0H zd4Ey>Kty@VP*42!`==7H)*2y%J2rE-v9{LcM!&Wy#t0(9@p4eoGsfV0y@H6~oI}61 ziii+ngia~pv_EI9M3k8TfJpqGsVODwM2n6B8YO+*-*g+mB1#^gnLK)<$1Xg${0EL^gb?Q^&B z>&Nq7U*>M(p`LhbmTYKgt{m0aEL`??0+jd!Ohk}~$7bP_QckHHs)u@FYwg{A6A`@k z5Q_4XZ1&#gCA!oF0M0o8$Z?4z8Sb2euSMF;>&LSi?RQTw n*+rozhxJb!MJjTw{o1N8TKh&*cVurs00000NkvXXu0mjfS##lp diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_7.png b/src/main/resources/assets/hbm/textures/blocks/taint_7.png deleted file mode 100644 index 614bee225b0a303d15e35d84ffdbc41a70d99c77..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 499 zcmV zjWO`v-+_mE;>RH+Zs|5wV>5GARd{}XQbRqla}FT{94`m;>&FM*ZZ`-sd6Vzs<)Cy* z3D56O3IK>GZyD-|-+up80@hk1gmA}Z={DBZ+T7^ZR>c@WL^xg!N_xf^T(4IU5u9`A z*H#e`VvNu!C7kx>td)o|695p2|1&kEgq>)S6v`UviBn2>ptTk;#=A7MP!+8J;JwG# z%q($9zpAP{?07jSW6XDqr~R2lmpGkL%Cw0HV>5FI0mhiTC=ck@Rtc@g8k?C*ma={6 zHh%ql`RmKlZ9LQykIkG7EzOmq8k?ER{!V}rpMZ%767kr~oKngul|%JVPi(EdyKf?b z_Z~t~ev-}J`@BS#x&XjA2LL%PktD;Na}c)u+Nzx~210M?HjXi7a7le^W`6yAQKS9t p2`0NJ^yIMqiK9qGuC-rV^#v{OMVjWW!gv4x002ovPDHLkV1hUz-3@P)**YPy!&#aI-@BIs#eY&`6nkF~gIjRr>Qc9SQK}k<*4I%;&!59N~j*5s7LO>N`#Qb<> zttq9<1OP32E5#U5*EM2{Sgt|fR`&6v`+EfdyFE!t31iI5 z@Yt?&2Px-vdy<&Djhd#x$MP=5b|tMfoO76tUN8VN<2U}Ej$TwD1bi&-f(Loa*se4k zz2IR0aL&E3+3iV{QYtr=YY^Uhq?9lnz2Kgd5-~=^7@@Vsat$KJ2=6_r5CZJunYE^r zG7|t`iT^V-gn&2J!YPzBwkw4YkWvBwD5c=Ne@UZas-;$A4CZblj!Q}j0BD*fgH1;- z>bm}o(LSEUy4dLuLZ+Qk!rX1-oP(4yFOpLJ0xZ`cnAW}KZljVVZ{O`nU*Dg9ecA0v zW4qGaZQ0P$T)v69+ogpgAzLB-gvB&7t?;h&8$`M}DA?iX3b z7*T4`S_43iizTt4T5B-d7xaqRXa?|lX=sVk-M_5CTh$AB4tjp4)kCypW&zSiX$ Z#1BeII%rbHFKYk*002ovPDHLkV1jj?*m(c| diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_full.png b/src/main/resources/assets/hbm/textures/blocks/taint_full.png deleted file mode 100644 index fce2c72d0755e6e8367232306d9982e26a7c6828..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 509 zcmVg_$)LPB+`IOJ+10~ZleXq5eV~l~6k^ul_-cyK3UayzY z=EviK>$?8XwASSC-h+q)0KE5@b7HN9TB`wo-n((m;r)JtnGr%j@7*vn=A1aj7<+Qg z*{rp|%qXP@0H{P=+P%gY_);zEg4S9KL?mMj=rWb??#7|0suciIN^s6?yPR_Xfb%@} zWwlmgt^Khv#we;wH$BGK*lR76QslZWIOp~t=Nt|qlHR*ftp8O?kvpYMZ>>qr*&K?e z;h1xx)@t-pP2yT>6U7)stv_jHof!j=+a6wQO;hY+B&-g_L@T8uGvH0PYK)?%#%?>#hVr4;GC zn>i=O7_inN=WPD`ssQ#+q8j!2?uw?h_inxc!QEVDUg%pL00000NkvXXu0mjfOrG(I diff --git a/src/main/resources/assets/hbm/textures/blocks/taint_low.png b/src/main/resources/assets/hbm/textures/blocks/taint_low.png deleted file mode 100644 index 48ee862429fbae41851dd346cf09aeee4ce63bd3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 431 zcmV;g0Z{&lP)UR$yT5Dk+cT?UrK3;2&}ab5fG8V#|t6M&-|guQi_Q&-ilL7^Ap55hrRCDldUy) z??FU{h|GDO*g;~97-OK;x_V5lb;cNtvc?#p-@EMdJn??N0RU>%dyj*e7a9>6X1=i! zk#Wx9^?E@>mO>E$GvnyJBZROT#uyNh1)6i7kH_QZPz15zxA+3s75sWR=ef`33qX&9 znNdnHL}WgPtIT`+j|P}|O<&J?m#Voj#$rz?%_F5WpU)?*>oVFPBDZthZK_%&IYb24 zbuA|E{jw55m^tT}Qd(=%4gLJ#YOOQpy!_>yX9!^`&>qv8+Z_OawHBq6udCZZ^;(I@ Z`~_C`7nQcRm}vk2002ovPDHLkV1kfk!ifL? diff --git a/src/main/resources/assets/hbm/textures/blocks/test_bb_bork.png b/src/main/resources/assets/hbm/textures/blocks/test_bb_bork.png deleted file mode 100644 index 411d7960f53fb93d708a447237710de40df849b7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 427 zcmV;c0aX5pP)y-EW?6otR+?yPI&1Naj~ZF~eth@=rUiXsStq=_J@Y(o%2 zAZXq|Y%EfWMbN?`1Pk*HZWZiJE7@c+8;h8~-AzPqGce4#_d9b>sQY={<)78CZ47|( z)9jzc#axn1zSL{bzwnl@1i~_V=d6irwvmoRI&J2bR{_u_O-L7N2+Jgut@8BxF(#Id z9J~u`kS^5Fbe&YTil%F*b|+8_3@waeYr4+y?m8!j8^~sxv&$D+UoCbv=Y7L8uUJ?n znjS(ojRCf+6iRjitr}i&k3i$`+2*1Aj;j=V(M1xm@YtY$2E*TWmCHeVh26*k(ve)` z-vCI&!h=CR3!|%YRhQ1s#|2poCK%bXs}$u*opPlP!2Z?}N84*-lsOnM0JzIV z0nmlv3zUz*yXU_6{w5xn#=eOmK|n~RMR|;%m`e__J*~tH2+y6-ux&E=(y!u4^$j3E VuApH1>{ome)q7){1E^l43Z{ti`b7e&&ow;SMDO;WHMlp4#S->oppe zr|^XwxwY>%Pn)t!^W2QHD|Q_)OBTNV%B=JQdowd%(X$lI34-B@-<6L{xofJmTqE)O sgpvaSk2;y%&Odl!m@0Glarr-nlBxCv>-V@k0J?+0)78&qol`;+0Dl!lVgLXD diff --git a/src/main/resources/assets/hbm/textures/blocks/test_bomb.png b/src/main/resources/assets/hbm/textures/blocks/test_bomb.png deleted file mode 100644 index f9b425a24c9ed544c78f9760e4d3d91027cd971e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 254 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ=4@yqg0@pd`}n05DWjgJvW68C~z?U{XajidEvyve*LutW{fiR7IBmLb~RY8|M<;; z=|x3v&{2=1OpPhiMa*qtX9_J&n5=a`?OSnn?Zf654fnjy$G#9b__EHw*JWSS0!Klk t@K22o*gnWyKgF=&rA?1@-G@d)zrrKaDt7-`Zw<7X!PC{xWt~$(69BX8S%Clm diff --git a/src/main/resources/assets/hbm/textures/blocks/test_conductor.png b/src/main/resources/assets/hbm/textures/blocks/test_conductor.png deleted file mode 100644 index c1b14c7080dfbe4f2edf5642c3c3dc7663028c0a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf&fPIq z{^T o=Um^$%yQv%@xPfz&cFY|5T0hKypmC11<(x)p00i_>zopr0NLt8W&i*H diff --git a/src/main/resources/assets/hbm/textures/blocks/test_container.png b/src/main/resources/assets/hbm/textures/blocks/test_container.png deleted file mode 100644 index 3d3f7d32993128432e20088cebfad6fc7d4e4a53..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 255 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ=4@yqg0@p0#6sm5DWjM-Ht*H20To^|NDnC3mcg2d?9BQ&GcHoI)C3}5s{ZQUJ2gE zOXcoN;ZJC~Ww=4rE8sQT9}BPJsd5)In>e+O9|&B;GBr=(plZOQ0C~>2N^=&3vDM6< u!m{0#LT=By}Z;C1rt33 zJ=4@yqg0@pFi#i95DWjMrvt?r6gXT0zwOUlU8wVrXG+=rCyLt^*M9q*PL<&nKm<9imgis TH{5Cmw1L6X)z4*}Q$iB}q|{6d diff --git a/src/main/resources/assets/hbm/textures/blocks/test_ticker.png b/src/main/resources/assets/hbm/textures/blocks/test_ticker.png deleted file mode 100644 index 4f3c430f982e6c5c2d6a548f7553d19f8d3b315d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61SBU+%rFB|jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ+nVO$@hV3JUv|;LoEFFc6;(MC~zG4@qhWQm}645l(hcX2zIB;3~P z{`=~t!AzGo=09vVyia-C&OOoKlWY@Pj;0=iCbyizt5@c`LdyP0cL5D$@O1TaS?83{ F1ORLxL?ZwI diff --git a/src/main/resources/assets/hbm/textures/blocks/waste_earth_side.png b/src/main/resources/assets/hbm/textures/blocks/waste_earth_side.png deleted file mode 100644 index eabad09e5ae1360234dcba61afa5b5435e074fa5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 454 zcmV;%0XhDOP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02p*dSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;VI^GGzb&0XIoRK~y+TWsuEk!cY)}@9X#q1$SL_U#QSW z$ihV-bY%=_H9w*un&3tQfsicRxa-^XvnPyc8|F^VIrDq3+wb>fSr$d{`SWeJ+r?s$ zW!dR;LQj%pwOYk-yj(8l^Z918afic!a9!6`RUMDV*>tjAufs5;tnd4_ZRtfeIaH=; z>YAn@>3Y3JQA8*3ZnwiT`FuWiU3a-$puX=1K>%6Y%VSe}8_E2ymtM z#1H@V@ropB85r%9Fcc^Tw@OQeDk^}{)Nzb+Eel9DVC`-bEMRjK8&8&k4R;VXuQimR zsEM};sN;GR>D*R;5DT{RU>eJ);~4>O#|;MVQ(*wqEfUK w9t@B^tfZKLQ7K9gxEELhur6nGjAzryH*`BVSato%umAu607*qoM6N<$g0|AR$^ZZW diff --git a/src/main/resources/assets/hbm/textures/blocks/waste_earth_top.png b/src/main/resources/assets/hbm/textures/blocks/waste_earth_top.png deleted file mode 100644 index 625f45be7b3bd9207e448af97385e4ed5891550a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 608 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 delta 1615 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 Vf~%PmL0bR-002ovPDHLkV1lXnZSDX7 diff --git a/src/main/resources/assets/hbm/textures/items/gun_ar15.png b/src/main/resources/assets/hbm/textures/items/gun_ar15.png deleted file mode 100644 index 032404fcc8e7c99faecb4ec4eec24fc11c71b4e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf1p=5Jlg{LLjtYrBmTj4!GO&Ds+StsSPPyq>_#>M^LIX z27~XA-fn{n)nU)zN+1Y`O(hYGq{4BLsg|92k3a0ftt!uR_h&fEvg;)se3K;qXPsS9 zxYzZ1Ql!QjyP|NP=QF@AnGe<8YvDTZ}P761*`1 z!2M!@wN@ob;({Q+7=zZ@)pbo(RcbPUh`0xThKM+8t!kPEtu>zK5k*lyHz?@fFbH^@ zYedAwaoqQxmdpM;`U;)o>$^on6hNA$?s>Ih9)t&F1<~c3D4QRb1AZ S!|yu)00001u@(!oh^_y>P_g@RilcW}%({v-Tj&*7Lm2;GD( zl^mdpM=+D=6sXn)h4!1i1l}jl3xQA0ttkB7j0ns1bn^d2L6RgiO(SBV=aFFv;Q-qW zFvbYy902FC++62HwXSO)O#be7j+aZcj$B^sHF-gEYVu8nydms zg~RX9?7RkvRxrj0rIgR}8~|%AQc9$h^nEX)005=b?8RXi7{`$;%dpmpw-o@Ys+xt{ vwiVuc(llk7rg(*Axa+#jUwZ~wg1#~jv!`IRUyK(g00000NkvXXu0mjfsj7g9 diff --git a/src/main/resources/assets/hbm/textures/items/gun_bf.png b/src/main/resources/assets/hbm/textures/items/gun_bf.png deleted file mode 100644 index 67bb9a89f4d405feafba37bcf0c513a8641030a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 328 zcmV-O0k{5%P)1pw7==FtV@U9<$&(>If(gb`(cr=7C_PZ8opGt~Wyf z==)xZqL6B;q?#((nnZnsT%Io69&Z5Tc@Ds`Eb6m0sSwT1IdyzKvaTxt-g|)Ub&N3* z-=Zi)Yc17ONqw&G*4d?>aU2yumSvnyC-yIU0Im<$O#$Ajq={mZwr#&0_U<^tFh~f2 z5CY>kDy_8uG);rGR{aQw5NoY6#>hO+bX`ZR2w<&M-vUy_fuk9~Ikz24#00001UlY06G3VNqH4A*T0v0edHk&_i z%{nnbs^sWV)4y}mgpS=c{$5l3E`{x1_1^t5N0!tF>2ER-3+}io2Bdz!k!W~5yEMIC zB!O$@m(J6>dzW?zHE7(*I)3re;tXvu1&2v*s;jGo8Gghm*lVqSb=5&Am+3w?%Ykj@ zwcjqBnqt6s;PvgztP4W=7{bqOxxAS5isJOmm%Uc^8*?%2u+U@(aJ{*+`(k@hy>-4s zng4v=^Apd>=*>CxC-%>$A0JJt62u=_3GM2;$Zi}}?>f)za!c_%XQ00sJYD@<);T3K F0RRF~esll; diff --git a/src/main/resources/assets/hbm/textures/items/gun_bolt_action.png b/src/main/resources/assets/hbm/textures/items/gun_bolt_action.png deleted file mode 100644 index a5e4409af92df8775bf55d6b2cf9c191f01c4aac..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfhgfBHnh!$Yh*l}&6DvN-%alXwqi zTN$*(tGWzWOI$-(i%f0bg-3#OIAM*lW*ZZ_O=|6g0;%}uEipICSmt_sYVbVRD@ zdPx$G;)~-A4GsTeVq$oJAc8khDTP5?T>S9%{QCu`giRV68ygc3xAFEg%~RsJ+5OpI z(ewq32I>E+es|Z1A2_gn`~D5PnldI>DK>xF)5OPcB+734VTKjkfsSJEboFyt=akR{ E0RL7@l>h($ diff --git a/src/main/resources/assets/hbm/textures/items/gun_bolt_action_saturnite.png b/src/main/resources/assets/hbm/textures/items/gun_bolt_action_saturnite.png deleted file mode 100644 index 6c84794619f770fd2f74ef56c2e162ab09fb52b6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 210 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vflx4Zf#u@^F7k3kx$4ggMXPkW^4qJow?!QSLdPSa=hFpyJBq0~uO%y^7U^a&BLQ zOcXPgg&ebxsLQ0NFi8 A`Tzg` diff --git a/src/main/resources/assets/hbm/textures/items/gun_calamity.png b/src/main/resources/assets/hbm/textures/items/gun_calamity.png deleted file mode 100644 index a5ec308bcfaced78165a74bcccad32ffd049bf33..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 281 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfMnkR-`#X<`!F(H%i>L4LVy~KC$MB#p86mKTbfCg)G^Zg4mvlkCFr(CGcgl{0p>2rSs@=EZsM_p#4g znJ3O*bjapS_Ax$nA>HtpNFzgrl_b-Z33WZk1slGbf4}Fisru%3Uump;G7qCm&`*m# cwojAemM$xNuFA7>BG7LPp00i_>zopr0D)R<#Q*>R diff --git a/src/main/resources/assets/hbm/textures/items/gun_calamity_dual.png b/src/main/resources/assets/hbm/textures/items/gun_calamity_dual.png deleted file mode 100644 index 3f6d18f4204166156cbb1428a008723ed5e20cee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 306 zcmV-20nPr2P)dfwq7~p*OoD1+D)wXS_>pB4#V^Y_3>8ZBZLaM4lDTVi*d7c@^vA7Zgyz*iz zR!UKpB~P5}Iv8V;Qi>QOLI`4vOw)Af|=H@DUnAq19Xp=p|*7>@wCa_4njcaT5T7cT987)EJ;Q~&?~07*qoM6N<$ Eg5yAbZ2$lO diff --git a/src/main/resources/assets/hbm/textures/items/gun_coilgun.png b/src/main/resources/assets/hbm/textures/items/gun_coilgun.png deleted file mode 100644 index 5c130d10963b9331ac31134f9c52517161628143..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 341 zcmV-b0jmCqP)s^l9Igqb{UsPIb`HJH zbp(&=nC_UO;x(8VTJ&rk=MPtPuu3Q#JbHKe1P zLubzV%V50nxn8)mfmDEplUD!)kja$3HE0D9dhvW~sbO~mz}3Q~Zw<&~%G8NCp5&qq z(9w%wcSBN`0EAA|D#;GOp5)>;h~3L;A+@pAo}rS$q&!Cfb}whV3IKSC9z`Rdl>R1n zsYfQ$ZAY<;XJYS!pSpOGA}P#0^VFGFGe=DTfcwuIGWk)}Z|Ad}e&Y!v*H`-HaJ$*o nzO*qxX<&&BK^F&uhPG@d3W9`ex|{D`2;5t4arf_N z6o-a5A;}>jx^%gIECoUoEeBrG@VgdAPIb_xk|!dOa-5n%iUqaNJknfB%FaM>}Wa z^LcFB=Je!ozCw`w?RBZFt)eI~l9?Q-R0>VgNT<`(>vdFB4XOOuLC_?b$&t-wd1_zc z-d@n{b`f9i3!s{`!3row%T7)@p;V-V-}m%7`{al68CbXaCA8EMZY*aY1@IDWo-?iOQ)QjeKW7@ xH_N1Z60WF9p8s-huPoaGQKw5P z*&n!8Zn64g`1}vU2Z_gjts-l;HZ4h?vqU)S?LIFT8|6x2hG|c;7CF6NT^-l3rdtMb92RdK9y8#gZUtSGg5tnJ@L<$!+;_^SpoC|A`$d zIx-^bV_J_FvK)|bzHAczu9D6A`IgsKNj(fTY_U=g=3Jg*%%G{taBJJ&!oAgp#B6vD zud2W77<>KIUi((YxKzcK1q_!>64x$$|2wwgsY1(w&o<27x7=s*`!}e*HQL}UB)E1} e)>i}bYtl2hy_`gAs@4PD%HZkh=d#Wzp$P!Kvst(R diff --git a/src/main/resources/assets/hbm/textures/items/gun_emp.png b/src/main/resources/assets/hbm/textures/items/gun_emp.png deleted file mode 100644 index b4be7d1f73915533a67494e07dbfe1b7d66de9bb..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf{PSsPG$3GNg;E}J8}DAV z>cV&1E!Py37!DZl7#vG!JX1V9AYtuU7P;esuXiyq^cenNd+%p7BU0#4{igXFre>^V zWcYk%k?O0`tS15!RhFu@C@b+ltK`ehjdJRG65{_xZMn+A7td`O Yd27=IpXBXa4)hj-r>mdKI;Vst07^@2JOBUy diff --git a/src/main/resources/assets/hbm/textures/items/gun_emp_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_emp_ammo.png deleted file mode 100644 index 15ca8e10fb1e0dcd4bca3320085fa06219c8bac1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 360 zcmV-u0hj)XP)1pw6ox-HT`~m%IzSGf+jQ;$N`^owqzyDAC3p&S2swa{ z(HoSG-m3!y1TunvLAZl0*RrEhh$i#&{_p+2%!4aW61$L6R{q;si&E-h@1Q89tgN*- zmjd9N0bn{k0FdW-ph@~-V^*!`>*bB_&yu^3r?y9kEPxCE-tzhU5I7Se!&(av#JTN9 zFlN;Vc6eA_uOp2{&q4o9AJ7G9Jts{aWx2#T(?;u_frH7Uo~-qp{eFir4)}e<#!wuf z^&FrTZ?~@ioKE)ujK{|~!1nRLVzF+3kHego9C)k7IEuoxbs@6?ikk;?HI3K5A^4u0B6PyptatsYbg10000P)NklLJ|^cY@S1ym_z}-KxuG#ja|McD14wS#24rp z0)iGcpiY6oTd;D~Zhn-4?nsvWEYGJm1H41lTHgA17cWXF1^{CWzXI6-fRvKQalD(o z_aGwCG|lEspta_B9^dP_ehs3O;;%oZO`F8bhpOU_{eA*j>f~Oc_a4?-{yd$;_vM1? z?S=?hD^@%X#u(1B3`8UjRmI2i8AVY%8QQiLivZxahdj?gL?RZNB+0D#DMFNUP7K3< zvMkv-CjcOXfDpo51=9`Yq_yV0?*RZ^*R4lbl9ZAGAWhQ=WV0gV|IKUq0WyYg#Vf8J Qwg3PC07*qoM6N<$g7IR6H2?qr diff --git a/src/main/resources/assets/hbm/textures/items/gun_euthanasia_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_euthanasia_ammo.png deleted file mode 100644 index 7a26309eb284a1cc2603954ed9820532da8678c4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 156 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfv2ipQiH3A>r(#$UcT?NenY)GA!_%!l<-4eEtW< z1dB(NOrd4zdJArTpCw&!diLi!u4ns{+U$a&L@%F^WJ&&J8Ui$)!PC{xWt~$(695vs BGSvV8 diff --git a/src/main/resources/assets/hbm/textures/items/gun_fatman.png b/src/main/resources/assets/hbm/textures/items/gun_fatman.png deleted file mode 100644 index 07bade5d1c75fec500fde209c3ece4d2163c5db1..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{1qucL5ULAh?3y^w370~qEv>0#LT=By}Z;C1rt33 zJ$^?EDy zT9$4lw9cqqV9E*2fuG@6mGNY%c^w8|Xn|Y?jUy^9LenIVa@+qx&g5ByiO)?RDvw{lA0>0#3}YHdLT;GDxb7uakv04R#W z1Egs>H#zxx;Ze=ZB3ZO;tHkDEficDdeEnVsik1wfCS_TU`@ZjI+ErDJTu|V_100MY z%d#0LvDQ-8wHgZq1o+8w0M7gUsuBfo&GX=H-?y6rFvj?IC2!yRS&0}#3rvu%>#)`? z!T`Hhung2N48(Cvk|Y8AGV(X3Qz>(?I-h*5&G`c~~M_$0000T;K!TC!sPKzS^fO&f7|O8P4=_i6mIoH{Pwm; z-*v1LQjQmfct$k{FnzBLR?d9%VDI+KSub|=70N_TTY8dJzNtf{TWEpCuN_lTYVR`} z@HmHES|)bAl(Ar5`nKsyA}29UiJSEIzWJo2%c`E6nmsreJ<5Yb*1W#8$NO8Y{?U0B q&wVCUzOUae`FzgV&oQMru5r_uBidYCwjKdGo59o7&t;ucLK6VYhh6Xh diff --git a/src/main/resources/assets/hbm/textures/items/gun_hk69.png b/src/main/resources/assets/hbm/textures/items/gun_hk69.png deleted file mode 100644 index a7dabb154e83de8a5c0e832cd953753b703e7571..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4JHQr5IP}Q`y&tayW`hw4bcMF-SyxuixI4(LBrjV9q%zSrO_tgKNl%)TK zn)*(DpCLz1EAaR$Sl?@OlW&9sS=em*_9CtlI@tVHs+ zd(0QU*M7V=`(T`6i~5b+hE=n6t&5z-`o6Z%%C(^*CDc@rqvPn^Sdr2l(nGe=kwW(#eJo*fuY6k{4ame{KaEAKiKQ%t4Xn| Z;_pd#_H9s?{tomQgQu&X%Q~loCIGofb4CCF diff --git a/src/main/resources/assets/hbm/textures/items/gun_hp.png b/src/main/resources/assets/hbm/textures/items/gun_hp.png deleted file mode 100644 index 9c65ba2e28f422a851339ce65e2703d10f9bcffd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 318 zcmV-E0m1%>P)NklfD2@ls@gSB>6)(IY; zpME9xUyAM8wc$C50tjz!oQO~#DwQOO^E{8DC;-^)c0^GGK$d0dq`(Bes}EIIwAMNi zp)AX;F$_br))UFZ*b>LF(^?NC#+ZrZtY9oL#sHA#`5?18nfxKob0s2O`0e9;(laaQ z?^wOo!12QS_1PngF@f*2)&P|I7xkwJ#)!yZlB=bHR?>g=MVP?9?6aNY8x81fJDj~j QwEzGB07*qoM6N<$g0z5*+yDRo diff --git a/src/main/resources/assets/hbm/textures/items/gun_hp_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_hp_ammo.png deleted file mode 100644 index 4c7f3acf5535fd774fc6698f26b59e5ccc071996..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf#%_UtGgSUIn&Mw-qZKF>rFZQ)a;w!mR2s&vgILBAK05b#f`2ehy8ZouID*m z(YLf~&St*3#W6ppOj@~<@y0gZhIOw?PDZWvc7MNDe|J-|Cx@f_`qx#Ta&HScY3yz~ z^=Xc&du7JF`0g~pi#1w1x)~+f7BW=4FP#u{>CX4ROT`5*GaQllx~lx5eogSE#c|>Z gvzC22`JW;Gn~wRSQ-LzxK*ut8y85}Sb4q9e0P;3l5&!@I diff --git a/src/main/resources/assets/hbm/textures/items/gun_immolator.png b/src/main/resources/assets/hbm/textures/items/gun_immolator.png deleted file mode 100644 index 26e05d4d6e5f863711f861b67e01ac15e03be575..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 335 zcmV-V0kHmwP)1-g^ zt5cLx=(>(lin1)VpUREA-X01-k|Y9P+qRrcj=P!NM+X8B$FYp3BME|_A7nfoiSPRo zhM@#O&yho4Und(mghNDRq^nC2Y~Ck4U=D|e0g&r z^;%&Jbqv#B_3}wk6x&{_!6u7nsTo6^dabCdnxiWV$8okMfBxt1CIItUrgd7BUC1I@ hc3ZMtNUvgBz5ra0Vi6Y=-dz9y002ovPDHLkV1jhwj3od7 diff --git a/src/main/resources/assets/hbm/textures/items/gun_immolator_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_immolator_ammo.png deleted file mode 100644 index 33069873c59c18755d900641668ca74f443918d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf zOMUy*&o=l6NSD?~NUY0g-0?`5FFc{QHLtF2&Bd@^AC(I?eqcRmCYNDSr+Ac=2ME6I l*`u*81wJw%o7yKopKHo$4YEg0o8z2Y-U={TD|^@lUw9 z*~uk~QOM#fI2?@{ha)9d@4WO~ngsH^PrgEws;WE_lZAzd_`dHaL$c6ptyRuBrb3j6 z_@XE%%Mz`%5)uD;{0=~V@6=9%adXo&a0K%wNirE4;^xc#oUZGL&9)kZg|$|NX00`K zU6V4CEZ*b`H$2A}vj%C~b|WMoA6RRZh_EWR` z_S~Hv{&~jE{|s<*vhQd4s%y5VxO#XQ?rk*~XZiKB`i@MJ41xu~*d!ScLjbNH-zME1 ea(jBPHppL>M~cEJ38s$#0000As=6u|L+!UdWo2nHc1*ToDsNSzAB&8e>a8h)dGigv6Y zqC>^O!A*!L2AYC8RCpcISc6K^x7=~Z``x<-4^Cp-LjWeje615sv3Y+$&=3irn~7PHw5Yb~qQs(NOWQev$YV~h+212M+PXfzUIi~!ZcQXr?5 m%;$3!i$$&65&}@XT*MF3VyXP7$zkLG0000Eak- z(VLvGK<&mhyI=Mzt7athv~K?Me{wR1@TOWlA;d}5PZy(mXwr`kWf2Y zb7({Qc{#SA7^d%s8lAUGe!7$@p`xlP8MNv9bvBLAWO%z;K`SsRkp8A8Gqe@B_$} znDKvZ;)RRTn^tS<-96l4DlpMhxm$Z>hhahC<^>(erHpzP?mYM~zp;@q&!h0AoZFnl q2L77gzuFh>DB<^fPXJi!@W59KXF0`I-X2B zg-qKbgrNI}rwj&L09;?q8gDn+1lHlF$J>>wpDtS+0E{P7y}!F5j$@)IBG2=6Mgi06 z0O0s&NKq7~EK91Y!a0ZcUcZVqoe@Mt-*`quv=&K{1Zyp6ny&5|Bh+w`>;ka;aX^-3 z09b2TF3wpjFHL6$waAbWB4Pl%_xk>F!OrFgRpsIJtg}Nzr11w%_U35;{?$qp^Nn?Ap@`D2?otL)d?Gq+k(V;MG7KDD12VLqpiop%Gr zEJxw=!w%2toCS9%&K34KH+?n3j=kF(esA<^Xw+D$ar%<8K1pTcVWndd)*M1tCPS^@Q*F6#+S~^7Lt^B* zOnmp&Ixgrtb4>JlxC!U3)GR~KqnOjB*X+?OfRS=PMqJ@)~l(;+o;pUx0{{q6I9lWUhJN|e5tSGj91 s5@XhgDaShw(1!_50W{x>slu6lks_&>u%QJgNB;Ikz8U*nWzxhYax zNtFL2iXs52s#@&5ST+BG+qMNbPU1HObzLifrfC?*5o_&|gkVhokR%DtIhAFZ*IHw( z#TeuJzNhOtwV6Of{9Sm7hQaXFmhSob{KUC00000NkvXX Hu0mjfRC|Qs diff --git a/src/main/resources/assets/hbm/textures/items/gun_mirv.png b/src/main/resources/assets/hbm/textures/items/gun_mirv.png deleted file mode 100644 index 7c03eff97baaa941164a3f791e0d3a2a7ceea4a8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfiBSW_CuWinkO*Fca&K-#;mdKI;Vst00B&JF8}}l diff --git a/src/main/resources/assets/hbm/textures/items/gun_moist_nugget.png b/src/main/resources/assets/hbm/textures/items/gun_moist_nugget.png deleted file mode 100644 index ae84c07f163ec59f10e742ed4e263d91069dc144..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 479 zcmV<50U-W~P)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E-^5z3JSmg00B=)L_t(IPkoYUPQx$|g>!&5ZPLJz*;|$t zvEPRsBz6Rd{SHxU%!;o25a z)Z7xwvXL`GfUxSlKTj7ww&0-a9~t` zUbp)8Jn7o|PHLZfnFIa;KxII@9A$R8)VG_}o+}>{JF5~vG6F)aCQ`xCeAk~JVUh&W zhIyVhM+k{P=)vP8bH|_xjv~O*xZ?pt4?qA;7JCMSCIZ07uHOf<_O(Cbz+u%*2`-76l4doG)Hk7dtzTKXT%~?s}0Q>YA$g zXG=;21o;&Ol8>B`IKJ_>*qSe;CoIdCik#_@NPex9?{XycYX22Wm6y}`+7lOCyE&n10^mX)U?rtgu+mq2%_)bw*1H{#4Dq=Y8pz*Pazopr0D$sv5C8xG diff --git a/src/main/resources/assets/hbm/textures/items/gun_osipr.png b/src/main/resources/assets/hbm/textures/items/gun_osipr.png deleted file mode 100644 index f45a4069d6f07d3e3b500b4ed496b5d34c00c68b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 335 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(HTz{ z#}Etur4wxVnhkhbcQQG7_;~Or7%EKjnOW4-7rVRcU7^)igT2#dr=OhW%q95t!%zK6 z{`Rhpe@@+ndyYPp<}yt~&4UNI&dthD zWLoofPWR#~75z(AzMi^EZ^HLD-whWhc8d8v=Gd}!dF8&zopr0I`33)&Kwi diff --git a/src/main/resources/assets/hbm/textures/items/gun_osipr_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_osipr_ammo.png deleted file mode 100644 index 24e644f4408c82b20fe7935cc6fd4c1f893a3663..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 270 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 zJwt=FTwDi$it0RF978Ppm-cStJ)pqD;;1=sf=0%Q8FsT%X6iir!JYAE;wP`dvk$8$ z&HUTs#i}K`B4j~OqnE++ErxAh@2%bXtm}T@&PUeIZ3D8uF0YVgaj20!-e(x%^%2ae z_;uiyWb!43L!!wX8%-Dl)_>4t3(*Q#>9CY(DpyF|@k`8p;>UX&i`y3hUBck$>gTe~ HDWM4f2Yy}# diff --git a/src/main/resources/assets/hbm/textures/items/gun_osipr_ammo2.png b/src/main/resources/assets/hbm/textures/items/gun_osipr_ammo2.png deleted file mode 100644 index 313abf55653b680ee688dea2ce936499622ee970..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 299 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(F#u& z#}EturTrVZ4jb^eFrS=tRHFHLU+gdLR=>Y%>k{{Sd<{J3u}RZNR&L*9Kle?YC*paU zAMek@|4u%R;7F zhrJ;S>}Ohi;f{FK!2jF!1=EZJufJV=TYGqNSS$5cBQ!T@GNw3CB?;1UTZf5Xw^>bP0l+XkKc&Tws diff --git a/src/main/resources/assets/hbm/textures/items/gun_panzerschreck.png b/src/main/resources/assets/hbm/textures/items/gun_panzerschreck.png deleted file mode 100644 index d9c5fc51d8845c5222c3eac854d2be894adf849b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 327 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf{m z5X%m>BopIB(uWQJ!MT&?KfL{%&31pz+MXL*6&Zw$j%z2|Dl;=PAKrd`z2uGx*UlnK z;avyr+wYf{5qU$RuI~SdhBvZ{cy8Dn{k=c`T-Y&o{W_4P0=XP9#vpB5*jx@Ia!1V3 zYhaBCI~?W~QMKda2WiLY4|q~%D9XIi;o%a>;o;$#aHFs&f{9`^d)kSk(&r_+ zZj~D?s%R8waNSt^hslkvOl${tXBi_i^O0zfKKr_Vjk_CC9Q@i2b2B_D&&f)Cpn4t{ O5)7WMelF{r5}E*D0e}Pm diff --git a/src/main/resources/assets/hbm/textures/items/gun_pm.png b/src/main/resources/assets/hbm/textures/items/gun_pm.png deleted file mode 100644 index a32ee6a14d72780b631b3fbf76b91633bcbc6e95..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 271 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 zJwt=FTwDi$it0UG978Ppm-ZX-9Z=w5o>{?Yto^?}F)Ey^Yc_+Ib*GG zLV25lq`0d0OpalnYNE1(vPC^67*DGFskM-SlSQ&qdy`POLqo8tz#ElBNzX6$XK!Gc zaHBL#C_Lhes#ceZh?3vy3m>}fTIE%=PQ5X&&F_Vk7+2+zm}v$pYR{^z3kN!d!PC{x JWt~$(69CR;R}}yN diff --git a/src/main/resources/assets/hbm/textures/items/gun_pm_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_pm_ammo.png deleted file mode 100644 index 9309fa68f8f869b721cb5a8fc466eea9891310bf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfo#q#c3%JA|go&%DR5cYkMrGu7O4U0t z`P@H0pZ~yq)oPC{H^Nh}J zSu@+vHCB9c`VN-KuHF!lR`yKF;gfNz+Qy{C2{TrlQ&@VEk>Qwxi0*FFdtNZ=e5_>C5JfzdHkr5`Z3M@O1TaS?83{1OQZeZ>9hM diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver.png b/src/main/resources/assets/hbm/textures/items/gun_revolver.png deleted file mode 100644 index f7d5507514988eb4f957881e6a3c9ff520fd488d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 291 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$@hV3rg*wIhFJJ7?c2@UV8G*I>{Yg4k-xXQucP}}E)C-g8##7M@^NbZQ&Cw| z(N%NK_NL%P{SblVJ@WIWCNzJa=frVEDbR8C5uRw3G>$CQv>!|dryt>A)T>yp;TbX^ zNI9{&b;=1_>7pe*C}084E0?0o}*o>FVdQ&MBb@0E~TQ8~^|S diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_ammo.png deleted file mode 100644 index 77b64a54eefd8770c0068bd9e329066288ab9eee..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 378 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBuf-vKbiP>*~8u&e3978Ppmj)Yh9dZzuvm#XL>80$+RxC{E z+P9*f@=l84_`xuLqT1Y4F8K-UEKHRSQt}fLrg~Z2RGt`oUZ6BFBG26X=G?o+EdoD| zyRH3yQ;y~IQ@4m~PK$VXjk6jJ~q=8zJxvWf(h>;ji%STf?_T`3BA$Z zZ8F0})TP}oLTK{07M7*43oV{*ogTMvw%_#X-#>&ygiQZk&0g|yg4x@^Tl3FL?qC*( VRMp^diU)-#NbFJAbu8X@ z)BpWv-kdvRKlS-erjCxf*`3P{SuVd8)nhm%RdQ{s7~_7Yv}FM&7AdlP`u0Kc(cb0j zUc0{6x@);S_IhFuV?;~NHHLfD495yt6nrn={9LzZiHhfyC~k+#CW*2g9ourHc@H~m z+pDDXYgfwZ2G5`G*c?JbH}l!`6@45F44p%YzL-wmrB!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXZEKj`94t1EKe85 z5DWjg69f5L6nI>0**Q7QpUh`2c)RX#+LwtkNDq(IfdWCjvZUn7x&mn{ND0 aI?mqycUgCKU!wugl?*~g10?g978Ppmj<8aZ8qR3wQ|ynk!+L{Fg6Hk zOJtkkXko~BiY;$mYhaLqZ}-yW3CHVxh#x-l#U<|d&+RfSzLz%`x^0;KibeHJ>W1RJ z_QVFI3%i9j3GMlwvUcgZ*DG?PSDjKzZI)`TlyN`lu-UWLZlZQzZ~Zg{RmQ~5Cnj!7 zdcRyRUFzXJUm Ty5qMB(3=dNu6{1-oD!M<;M{#h diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_gold.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_gold.png deleted file mode 100644 index 0e6008a26cbb966af6d790584da0a2a5cfe28f8e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXZEKj`94rhv!{z= zh=u>szKgsK3OuYg9j7NL3a1sg9@d&F-V}5zsZ(D3ZKgi2%NK6fc~1?kq|KIyXr%A? zrR=oEEo7%qpy~&=kedzW2 zw@z02=nnCt`!^@Da7S#J)+nG1BDMYo>|mU-_F3t@H5vbb&SCI$^>bP0l+XkKKxkOZ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_gold_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_gold_ammo.png deleted file mode 100644 index fe6b2515482b05e21b6c62ff353393cede6b6c1f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 316 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBuf-vKbiP>*~f)_nq978PpmrmZxd&oebb^gr8Hc_QOC9N5a zO_m89Y6%1AV-vj2DNT1eCA!As+R_JH&vqTiHaU{QDH8l(gV}!eCzo#=UEE@m zdaop)+_xUSwk*)eH)O~?Ckx4uV7tDYCL-ODgzKF(O*_yXuT22WQ% Jmvv4FO#m6GdvgE) diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_inverted.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_inverted.png deleted file mode 100644 index 1c99257002bd63e39554bcdc9f1022d1a95e4f54..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 205 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vfc&TY*q;$SvWq3pA+6(My`G*~+b@yWHtX_t z1|aa}_V)h935q@^W|dxXkw|fMk(7{-=rC*Hj6I;5EcdvXonOM!kmVg~i6JX%>whjT vuK%8#!aNM!qB9&t+&?}rY{@y>%+J6O8s$@xnBd3*bPt24tDnm{r-UW|3+zA< diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_iron.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_iron.png deleted file mode 100644 index 82974cc4cee5f6968a57db4b23b5ea2c8420bad8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXZEKj`94t1G*1`D z5DWjMeY<%Z40v2N3yV5m2n@auxS7d0z$K}%=YUA$i2@IgkLrqoM}wafzdPC2QMa&3 z;_=@PYgnZBd>3(AAlAthrJ8m_$nw43cXNXB z)C52M!1=o8YL_KT%Xw-sz1qy;y1~y@H@V!s<~$oGm&UVG4y-~V#i^N&Uh@C| diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_iron_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_iron_ammo.png deleted file mode 100644 index bc25af3a44d0751ca50b5a1b461215d300f6d226..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 364 zcmV-y0h9iTP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!2kdb!2!6DYwZ940Rc%wK~y+TrBg8q zgfI{suNT2z*ocibVrgS(XYUL29d`DXTKNIN#?DG?{DqAV$gxXuoLufs?go|(n=qN3 zO$;Ff{=rS=pYc!-1c9(Di`T<27`(WElY+Xgk)|o)I2IJL{1GRDaU5aWHo`E3>$*%N zx8CAGFwe8mG!3?GgX1_@*Ok>!Yx0N|FD4$xfvT#I=Q)TlNs^CBUdBi_Mp1-mnoyP{ z_I>Ai-}hQ`weLWYn5Ky=%djj96X{5_?|}Ru1=LR4w(vZU%~cbU#~4}y!c~&D1Oy!k zwQ-sbdGIZK-xozu2+Cd8aaMbmKhyJcNSQ2OQ=sDcW)**aXW$Oa>Dy=E{SycP0000< KMNUMnLSTYsFqLBf diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_lead.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_lead.png deleted file mode 100644 index 4ecd5014bcd8166869ea3a2cbaa15ec29af5fa43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 271 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|YVTQIDsK zV~B``p!9NcfG{odWkqZ3&@|+GIKQspN4KIPOnUGh|G6Rbu1Uz4$*#;-Kn`pQ>p$ zm7n`)E)75AdO#;TfW`3GwqB2a-Hy#nU5kwj8rhBpO73`QB_bywb*Av(eKtj)yBIuO L{an^LB{Ts5n9Nn+ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_lead_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_lead_ammo.png deleted file mode 100644 index a123c69877f8b4b563e7bd3bd92b17bfc3892524..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfBPVAd^j@!b2ak9Q$vu5p)Q+mCvQMY4NS(;i~mwaK&WZIT4C%~jxrrYOi zz&X#cU{&JHnR8_u>X~g5(>%40Z&i9Dv?uw2XB1-$pD+W%j%hjz-L9DVY%{*lHQ}Zt zt7L|&h0NLo>ta`2zR4lD&|jEkzsylLvDYhIHVQIa_n*G(b%7 diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare.png deleted file mode 100644 index 8b7241860d68c6f554076d354ef2d9ce83ea0ce2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfCpe$-`^(YaBu|#1pIja=+US884{0x)cpeo8f=_JL`41> z8yNhNk7?VnV@HC-ffiSOu8I#27#BA+F&&<3UH%~HgkGZJG0|eJITCXFE6-lAcy45~ z@gRe;;@Qv9HUEKn4PthFZF_iodpytO>vLQ$HeYWzBk=ftOiT_B5JZ>?vl=<~{7-L_ fm^^<52O~pBKrE|aiOCzFgBd(s{an^LB{Ts5^lV&~ diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare2.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare2.png deleted file mode 100644 index 6f440b5b6f8b346af604df16e313daf9f4dc58f1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf^%my^%}n=SqwtA z?poI$yIiA7aM7xd))JRYe3g`11di=rc~XyIfsXej6V;Z6jvFG=-b`J+%BW%8>ks$z qt@4)VpR@e6FJAZfF}u(6_b{Gd44mYAEVLi!Yz9wPKbLh*2~7Ys+FZ*3 diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare2_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare2_ammo.png deleted file mode 100644 index eb58a2cd72f804d03dfc646aea00da53363f359f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 301 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfpUo{A;>(%Hj~- zsf_SM5I-cMAKD<66a5^rb;9oJ}jx? z>T1AqFq7fTglC>zJZx3lc&4wnPk!(yCCQ?!#=d##Qsw3~Ey5o)!@>@|+`m5hZ+#@^ u^8doKzW-JCG&XbgxYm=yadTE7Bg5@UWh>O{mi+_zm%-E3&t;ucLK6TMp>bpY diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_nightmare_ammo.png deleted file mode 100644 index 75fc19a3bd191d93c90a94a7e169e67252916df0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBuf-vKbiP>*~g6BP5978Ppmrl0kYc>#YX_sl>4%o3|;nIZ< zbz&wn?^yVhDTdLjOXWP%=}tz=M3pTyW%JU+EjM3#)h8GIH(Kt(wzr!zrOI>HPkO@m zde^GgR-vIw;~nIcc@8hIIUg$0x>{3!ze3+w`gq`FlamsQE9ceDTKhEMqR{kI#E{>bsMgAU6WcWa__g6xEIqqC%$Dt9+v``epdeE>@>Xez4p@VrP0}`vEfsK z7(7oXvv(LWZOD~o@VzW^tooKpa!h(R~A3+;12F1Pxb=6!QkoY=d#Wz Gp$Pz>S!8|y diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_pip.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_pip.png deleted file mode 100644 index f524b1d6b6079dc0e27bfeef0f64d36f6cc17f75..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 323 zcmV-J0lfZ+P)Jjy&x~Jejm8PixBuOGqJ=Q+NaV(za;W!Rynp$_JqwIYsio#mg6=Tdh z$x%wF%T)I9@e@QTCCjp0LN23Tt)r9@*LCrIpQ@^?TfiAIjw5Z`GEEa_$nCM>IF@;y zaU2KW8)Vxynx?VrJHR-O02pHc2*Z%3X{_D+YXX2Mip29g0Lrp_{Jp?ep`s{~VHhMy z5;>Rbc7pH1}K(y9U2f^n60IjuXt^a0zq8D7n VhR8hKa2o&s002ovPDHLkV1iamhZX<; diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_pip_alt.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_pip_alt.png deleted file mode 100644 index dd888d23b20e4aa455ce55b55400dd1e09ae93cc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf#|)3{t2-#f|q6e|WEmN{|x z^!*6}Or^2zdp&m*`|VzLSb|xgwPp!}A`3%XBEtfm)9vqTcP?3^aV3h|;j+nRH37lg z+h(tS&vUgyU$hYrKk~Qbc9XmgK~)17a+-ScPRBtRZ=^) z=Ev&BzyA$4TXX-vqShy>VCr@|ZI1iImWAJHMnpIw90aZH=S2@Zjk;*!U)El{{1}Hv^2(+JE`taguS}g#DevX{&z6YWvjqM7=K2QY OVFpiEKbLh*2~7Z(Gi8zh diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_schrabidium.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_schrabidium.png deleted file mode 100644 index a1e4a87ed67802030e9555db5bd7fde3b92f81fa..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 265 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Ea{HEjtmSN`?>!lvI6;>1s;*b z3=DjSK$uZf!>a)(C{f}XQ4*Y=R#Ki=l*&+$n3-3imzP?iV4`QBXZEKj`94rhyQhm| zh=u>szKgsK3Op{72lCw#IHnaEs3*@lHFLs+Zx@8@=WTR5}x{iiMwmH(Sk%7PxEtM?!3tMx$^?(BnD4cKbLh* G2~7Y*~f}cEH978Ppmrge1YcddN`~QtYu8DcZ2BV#u zEM7lTlU7bID4yPO@~AL_xWdG_&Jzqaeq7?8nPKR#<>dT*-@ew`)O9H+{V{%${;%={ zpNoj#thVG`ajfjwZA=DF3Kp#8+SF5Ex4G@koSyKCXO>UWm@DKS>=JO?kTHQRU=qij zycesuE)_N`V)$0w@wiaT$aG`w#aO)w%Y{V*_SxS)`Na5>aJjXDui{~W*x3ET{m09T zbAu&rNOxJN-Fct0M#nq%-H$nwHcDjc9?{semCZyciJ`Iok=YKwYFvn!c{GHwY shR@p)Jd-;%+Q;df)C>FdxtuNTdH!S%W}b6~K;JWXy85}Sb4q9e01bwU4FCWD diff --git a/src/main/resources/assets/hbm/textures/items/gun_revolver_silver.png b/src/main/resources/assets/hbm/textures/items/gun_revolver_silver.png deleted file mode 100644 index b9900ddffcea786212b6600840aeed5fd5b6d6de..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 292 zcmV+<0o(qGP)v6 z2u1}hD+9|AajYGaB5qEv_@x8)`+l5r@44_#t=DG(P%4sdGse9Lf}NOVol2#OZn2ICI^00006FfMEs|Ff6n>Ne-8YoI{lWY+M~)xyW13h zfvEZBI7$d#)+#|%fMIW>06gEl5(EKNl4L7{Z(r;jY+;%vx2KPlAh@2B6}G!gVcWK_ zEK79yE%6&fDT5iCH30ncCk~Hy0XRFkD%2JLuIGsBiyK8Ik$ybYF}BlENGUbHPCV7o z8WEaaXEvE52S}-_nqAKk!`?{I8W8}q$s8>)7Vfn&L4Fna*Aj!c9+Iv{S>1TxE2T$V zjw$_*^qmbuU+{mt!Ls&`_5_eY#sgoeRRKtSh7tFd50!=&Qb>IRTlI8IbP)Nkl8_KwZ}XzmB`UDu6w^Na1|@(3PEI}XVLa#Gb$RTbWQM1)bPH QCjbBd07*qoM6N<$g5w#4T>t<8 diff --git a/src/main/resources/assets/hbm/textures/items/gun_rpg_new.png b/src/main/resources/assets/hbm/textures/items/gun_rpg_new.png deleted file mode 100644 index f707e524265c4df78e0d0d3f1f65271331cffd5d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 300 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(MnGj z#}EtuVHXC`vFX%uZx$FgU?b)3%_%!R*kD zBT`L@42O^GVrgYQykrNhT8iZ{CT(k&ILM}!PC{xWt~$(69Cn)XT1Ob diff --git a/src/main/resources/assets/hbm/textures/items/gun_skystinger.png b/src/main/resources/assets/hbm/textures/items/gun_skystinger.png deleted file mode 100644 index ef3ff8c9d8702480670c92242ac87485e96c6fce..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 324 zcmV-K0lWT*P)Px#{YgYYR5(v#WPk!QGqeAvPMuJW&KsJPxPndy?hac<>f?)tt0CLGX!#akb^GysO zmw*i6$a%-`+N2AoAs7-MLq0F40E=_1iT}^KMH8<}@H(%tvGITV#V=r&;PMVm13;SV z>+2yd2`c@M%R59TU0mKF+5lviAbW=-1JJ#rn00`GWCLKaqt|tv0hIB`G5|U20|4p} WgR-Fo@?ih~002ovPDHLkV1fWQvxi3j diff --git a/src/main/resources/assets/hbm/textures/items/gun_spark.png b/src/main/resources/assets/hbm/textures/items/gun_spark.png deleted file mode 100644 index d308afeef5434915d73e037dd3ba48999887ddc8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 374 zcmV-+0g3*JP)%IG0Yv5p;8?Q@fBvy zZ?V?$y0hXT$?2g_qLlg)<^g&uX8gVDAvgQSK8aGwr3r^6`j_qXRR{3+(jyE*nkO}K zo3mJJS-Na;--G8xA-)9wtSv7%fVbQP?RI<6e0703+QV8)tJM+%6;fT_J%~ay&HU8Z zNOL9?8qQIvI;E7$=kuQ)nTeD>vD4`QptTlKN~g6JnWIQ42d-OV07*qoM6N<$g8d?$-2eap diff --git a/src/main/resources/assets/hbm/textures/items/gun_spark_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_spark_ammo.png deleted file mode 100644 index 150780fcb1caae1901bd94ef1d811d7b03ae59bc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 234 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#VfAdmLK(&tTPFn-39wr9hW~gazvbGD g=Rdc7JN}q=$vZ!*q+FmO9Jz~7s z(#0W;_B1I1UCH3->gTe~DWM4f0fAA1 diff --git a/src/main/resources/assets/hbm/textures/items/gun_stinger.png b/src/main/resources/assets/hbm/textures/items/gun_stinger.png deleted file mode 100644 index 4e89b8215beaa4cfe359c738cfd8ca386cd5ed2a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 315 zcmV-B0mS}^P)Px#^+`lQR5(v#WPk!QGqeAvPMu6eG$Ixaqb)&QD ziGPjL5DW>BA&2{pfyLK#^8N3Bse{)gc%9eS*!X|z)6HO);PMVm13;SV>+2!WoM!SL zmv@Lxy12YUv;oL2LG}(w2B3Q-K11RH>WdL&42LLFWfU?6-sI~wA N002ovPDHLkV1mvyhKB$E diff --git a/src/main/resources/assets/hbm/textures/items/gun_super_shotgun.png b/src/main/resources/assets/hbm/textures/items/gun_super_shotgun.png deleted file mode 100644 index c8c8f39cb7c4375bfab7500791eebfdc62da9b71..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 290 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 zJwt=FTwDi$iY9rwIEGmGFP-4X*Py_|QrXeT>3;6d!P)Nr{|l#ha^o-scFnGH9xvXw&gSC)@{56R<)wc^XJM+!Lf1=%PyJI+G3ICy51`xa zx_-YethE?pXfzrJi-=Kr!-+6?&cftGQG~S?Yb~e;w`;lH`o&;4 z5d<}~)bGTu+7oz{e^|exw(pt{;jl{bq7B!wVHLeEV4JkI*O{xwR7S)76(OGM?wAzcLU$} W(|A!waJtF>0000io(c+Q+!&K zFZ_rk%9QrZ)9k>1sO!4))cf)M!F!)V2#+Dz*`xP9Ip=WBG0!uq%Can{-a`X`zVEXT z0^>LWP}lX(8UVCyn*fTUpsFeWhG97PF9A;>rze=~ZVRvLiio_8dkX-FF%o0MKnAgP zw}7T;QdyR4+jfB1u$LQH7+{*F3|^a9(6%^jAR@cb!tmNeRZ-R5djN;(iSLkh+yp%aT00+ncvg8CEdI&bo zkcr6?gOym`%z*x?U?+;Gc;hdBPwzd$f2e7iu=efU?}OGlc<)!6WT~UpIw+-3O7XUP zVi*QKyEgeYN&wLJedfLAlx+d1>w0|!(RuU0IF1-&0NA%(vQjdZ=<#q207X$yRTTj5 z$HNb1HUV(yEwC{rO0sAGFijKAImAdzB;BIH{qsvG%MxpCWFo`PZXhtgNBf$=_a*|$ z7DXOV;Ccf?e+z*IdGT}XJkgzsY=J@5C$0G~p zJ@;^Vv5T+a`RAW^*%(S=*&9?mHM*D@w&n7F-fsSnt*ENW>wVbgO*$PXZu8$|V%YP& z;(g!*r;^>#4xyon=ZohQvv;sn&upB<_-kMPgQ=ZTrrno$T~cI2jQ1FAyq2^!Hl3eA xkn>*kBa1rYe8uwg^%GXlYx}PL_jJutdF`Vq8r(0gRsj9W;OXk;vd$@?2>|oOc%=XU diff --git a/src/main/resources/assets/hbm/textures/items/gun_xvl1456.png b/src/main/resources/assets/hbm/textures/items/gun_xvl1456.png deleted file mode 100644 index 6507efa708f5058739e9dafcea4294f852e7852c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 336 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 zJca`vY<7dnkbVF3&PyyS{wgm+VZFA0SXS%%Hd+q@f zyB9pPk#veQf1ssk^x%~o4966TC!No4yY_k2`O@1?$mW`54ix{Pk zEthNwwAitssfj6K^Nblc{=ayUu|U9y&sEWm$B3onBJaTf4~}LYPY;g<>84P@k3a00 Z8N^x-mviT{2m?LC;OXk;vd$@?2>^g5b#nj! diff --git a/src/main/resources/assets/hbm/textures/items/gun_xvl1456_ammo.png b/src/main/resources/assets/hbm/textures/items/gun_xvl1456_ammo.png deleted file mode 100644 index 77ed27a29e077bc22eb13841aa872a7a1b372f7b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 335 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 zJv8BcI2AUXx;2k2x^dNt18ZL}R_)2OKdC-{ z%7nWidvuKdn4if@`zC(*ndCCxAg_&ciVs)czj#KWA!@ZF%ekF;Z_lr`eK-BurcMT ZE_x&DZI7M&LZDw5JYD@<);T3K0RRpVe6j!l diff --git a/src/main/resources/assets/hbm/textures/items/gun_zomg.png b/src/main/resources/assets/hbm/textures/items/gun_zomg.png deleted file mode 100644 index b0e443d764a6348dae172ae8209ebe3c9f76e2d9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 310 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(PmE< z#}Etur4tOr4lD3DM@nqoxM4$z2DkeA#v&QkprD4;%BHmkFgKi zuvpxn`u$Uz^SAmAiRNBRn-H|>@%9(*QgRngOq1}^EcKSDIuov#+t}g2vF`cDP!D~D zL*j=7nvO_Ra~$|rXxla+E+b8G#%Fb@%M3FT;#zBxq$D`1+CIdlDK29)5w?>%*!iVS zzwCmKg?vl-g*EFfMb|9|j4u{=dm$~stls?&_c#0IIWnzZ^?=T2@O1TaS?83{1OQ<0 Ba325w