From 781cf7a9b8667f224d51645bf30d8546de614d3a Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Mon, 27 Jul 2015 14:15:23 -0400 Subject: [PATCH] Stage 1 of 1.2 --- src/main/api/java/morph/api/Ability.java | 208 -------- src/main/api/java/morph/api/Api.java | 170 ------ .../api/FactoryRegistry.java | 113 ---- .../minefactoryreloaded/api/HarvestType.java | 44 -- .../api/IFactoryGrindable.java | 35 -- .../api/IFactoryHarvestable.java | 71 --- .../api/ILiquidDrinkHandler.java | 8 - .../minefactoryreloaded/api/MobDrop.java | 21 - .../minefactoryreloaded/api/ValuedItem.java | 72 --- .../arc/bloodarsenal/client/ClientProxy.java | 19 +- .../renderer/block/RenderBloodTNTPrimed.java | 103 ++++ .../client/renderer/block/ShaderHelper.java | 185 ------- .../renderer/item/ItemRenderGatling.java | 86 --- .../renderer/model/ModelEnergyGatling.java | 168 ------ .../projectile/RenderEntityBloodBall.java | 88 --- .../RenderEntityGatlingProjectile.java | 61 --- .../arc/bloodarsenal/common/BloodArsenal.java | 19 +- .../common/BloodArsenalConfig.java | 10 +- .../common/BloodArsenalRecipes.java | 10 +- .../arc/bloodarsenal/common/CommonProxy.java | 9 +- .../common/block/BlockBloodTNT.java | 8 +- .../block/fluid/MoltenBloodInfusedIron.java | 62 --- .../common/entity/EntityBloodTNT.java | 7 + .../common/entity/ModEntities.java | 11 - .../entity/projectile/EntityBloodBall.java | 65 --- .../projectile/EntityGatlingProjectile.java | 501 ------------------ .../common/gui/ConfigGuiFactory.java | 1 - .../common/items/BucketHandler.java | 115 ---- .../common/items/ItemBloodBall.java | 37 -- .../common/items/ItemBloodMoney.java | 2 +- .../bloodarsenal/common/items/ModItems.java | 4 - .../common/items/MoltenBucket.java | 249 --------- .../common/items/armor/VampireCostume.java | 11 +- .../common/items/book/BloodBurnedTome.java | 30 ++ .../common/items/orb/TransparentOrb.java | 6 +- .../common/items/tool/BoundBow.java | 21 +- .../common/items/tool/BoundIgniter.java | 9 +- .../common/items/tool/BoundShears.java | 7 +- .../common/items/tool/EnergyGatling.java | 196 ------- .../common/items/tool/ToolCapabilities.java | 2 - .../common/tinkers/BloodArsenalModifiers.java | 5 - .../common/tinkers/BloodArsenalTinkers.java | 369 ++++--------- .../common/tinkers/ModSoulbound.java | 70 ++- .../common/tinkers/PartHelper.java | 149 ------ .../common/tinkers/RecipeHelper.java | 230 -------- .../common/tinkers/TConCastingRecipe.java | 25 - .../common/tinkers/TConEvents.java | 32 +- .../common/tinkers/TextureDerived.java | 96 ---- .../common/tinkers/TextureLiquidLava.java | 56 -- .../tinkers/TextureResourcePackBase.java | 135 +++-- .../TextureResourcePackBloodInfusedIron.java | 315 ++++++----- .../assets/bloodarsenal/lang/en_US.lang | 33 +- .../bloodarsenal/models/EnergyGatling.png | Bin 870 -> 0 bytes .../models/armor/EnergyGatling.png | Bin 870 -> 0 bytes .../models/armor/EnergyGatling2.png | Bin 732 -> 0 bytes .../assets/bloodarsenal/shaders/beam.frag | 12 - .../blocks/molten_blood_infused_iron_flow.png | Bin 0 -> 11808 bytes .../molten_blood_infused_iron_flow.png.mcmeta | 5 + .../molten_blood_infused_iron_still.png | Bin 0 -> 12474 bytes ...molten_blood_infused_iron_still.png.mcmeta | 45 ++ .../textures/items/blood_ball.png | Bin 372 -> 0 bytes .../textures/items/burned_tome.png | Bin 0 -> 586 bytes .../textures/items/energy_gatling.png | Bin 488 -> 0 bytes .../modifiers/soulbound_arrow_effect.png | Bin 0 -> 169 bytes .../items/modifiers/soulbound_axe_effect.png | Bin 0 -> 237 bytes .../modifiers/soulbound_battleaxe_effect.png | Bin 0 -> 256 bytes .../modifiers/soulbound_battlesign_effect.png | Bin 0 -> 281 bytes .../items/modifiers/soulbound_bolt_effect.png | Bin 0 -> 192 bytes .../items/modifiers/soulbound_bow_effect.png | Bin 0 -> 198 bytes .../modifiers/soulbound_bow_effect_1.png | Bin 0 -> 202 bytes .../modifiers/soulbound_bow_effect_2.png | Bin 0 -> 202 bytes .../modifiers/soulbound_bow_effect_3.png | Bin 0 -> 202 bytes .../modifiers/soulbound_crossbow_effect.png | Bin 0 -> 217 bytes .../modifiers/soulbound_cutlass_effect.png | Bin 0 -> 271 bytes .../modifiers/soulbound_dagger_effect.png | Bin 0 -> 529 bytes .../modifiers/soulbound_excavator_effect.png | Bin 0 -> 589 bytes .../soulbound_fishingrod_effect1.png | Bin 0 -> 155 bytes .../soulbound_fishingrod_effect2.png | Bin 0 -> 166 bytes .../modifiers/soulbound_frypan_effect.png | Bin 0 -> 357 bytes .../modifiers/soulbound_hammer_effect.png | Bin 0 -> 258 bytes .../modifiers/soulbound_javelin_effect.png | Bin 0 -> 241 bytes .../modifiers/soulbound_knife_effect.png | Bin 0 -> 275 bytes .../modifiers/soulbound_lumberaxe_effect.png | Bin 0 -> 421 bytes .../modifiers/soulbound_pickaxe_effect.png | Bin 0 -> 313 bytes .../soulbound_pickmattock_effect.png | Bin 0 -> 2956 bytes .../modifiers/soulbound_rapier_effect.png | Bin 0 -> 230 bytes .../modifiers/soulbound_scythe_effect.png | Bin 0 -> 212 bytes .../modifiers/soulbound_shovel_effect.png | Bin 0 -> 243 bytes .../modifiers/soulbound_shuriken_effect.png | Bin 0 -> 279 bytes .../modifiers/soulbound_sword_effect.png | Bin 0 -> 222 bytes .../arrow/blood_infused_iron_arrow_head.png | Bin 195 -> 0 bytes .../arrow/blood_infused_iron_arrow_shaft.png | Bin 168 -> 0 bytes .../axe/blood_infused_iron_axe_handle.png | Bin 165 -> 0 bytes .../axe/blood_infused_iron_axe_head.png | Bin 212 -> 0 bytes .../blood_infused_iron_axe_head_broken.png | Bin 198 -> 0 bytes .../blood_infused_iron_battleaxe_back.png | Bin 173 -> 0 bytes .../blood_infused_iron_battleaxe_backhead.png | Bin 214 -> 0 bytes .../blood_infused_iron_battleaxe_binding.png | Bin 173 -> 0 bytes .../blood_infused_iron_battleaxe_front.png | Bin 202 -> 0 bytes ...blood_infused_iron_battleaxe_fronthead.png | Bin 202 -> 0 bytes ...nfused_iron_battleaxe_fronthead_broken.png | Bin 239 -> 0 bytes .../blood_infused_iron_battleaxe_handle.png | Bin 194 -> 0 bytes .../blood_infused_iron_battleaxe_head.png | Bin 214 -> 0 bytes ...ood_infused_iron_battleaxe_head_broken.png | Bin 239 -> 0 bytes .../blood_infused_iron_battlesign_handle.png | Bin 187 -> 0 bytes .../blood_infused_iron_battlesign_head.png | Bin 287 -> 0 bytes ...od_infused_iron_battlesign_head_broken.png | Bin 329 -> 0 bytes .../blood_infused_iron_sword_accessory.png | Bin 195 -> 0 bytes .../blood_infused_iron_sword_blade.png | Bin 185 -> 0 bytes .../blood_infused_iron_sword_blade_broken.png | Bin 216 -> 0 bytes .../blood_infused_iron_sword_handle.png | Bin 171 -> 0 bytes .../blood_infused_iron_chisel_handle.png | Bin 371 -> 0 bytes .../chisel/blood_infused_iron_chisel_head.png | Bin 606 -> 0 bytes .../blood_infused_iron_chisel_head_broken.png | Bin 297 -> 0 bytes .../blood_infused_iron_cleaver_guard.png | Bin 622 -> 0 bytes .../blood_infused_iron_cleaver_handle.png | Bin 373 -> 0 bytes .../blood_infused_iron_cleaver_head.png | Bin 516 -> 0 bytes ...blood_infused_iron_cleaver_head_broken.png | Bin 302 -> 0 bytes .../blood_infused_iron_cleaver_shield.png | Bin 676 -> 0 bytes .../blood_infused_iron_cutlass_blade.png | Bin 285 -> 0 bytes ...lood_infused_iron_cutlass_blade_broken.png | Bin 294 -> 0 bytes .../blood_infused_iron_cutlass_guard.png | Bin 163 -> 0 bytes .../blood_infused_iron_cutlass_handle.png | Bin 179 -> 0 bytes .../blood_infused_iron_dagger_accessory.png | Bin 565 -> 0 bytes .../blood_infused_iron_dagger_blade.png | Bin 602 -> 0 bytes ...blood_infused_iron_dagger_blade_broken.png | Bin 326 -> 0 bytes .../blood_infused_iron_dagger_handle.png | Bin 392 -> 0 bytes .../blood_infused_iron_excavator_binding.png | Bin 622 -> 0 bytes .../blood_infused_iron_excavator_grip.png | Bin 765 -> 0 bytes .../blood_infused_iron_excavator_handle.png | Bin 350 -> 0 bytes .../blood_infused_iron_excavator_head.png | Bin 567 -> 0 bytes ...ood_infused_iron_excavator_head_broken.png | Bin 325 -> 0 bytes .../blood_infused_iron_frypan_handle.png | Bin 172 -> 0 bytes .../frypan/blood_infused_iron_frypan_head.png | Bin 314 -> 0 bytes .../blood_infused_iron_frypan_head_broken.png | Bin 346 -> 0 bytes .../hammer/blood_infused_iron_hammer_back.png | Bin 201 -> 0 bytes .../blood_infused_iron_hammer_front.png | Bin 194 -> 0 bytes .../blood_infused_iron_hammer_handle.png | Bin 163 -> 0 bytes ...lood_infused_iron_hammer_handle_broken.png | Bin 208 -> 0 bytes .../hammer/blood_infused_iron_hammer_head.png | Bin 274 -> 0 bytes ...blood_infused_iron_longsword_accessory.png | Bin 194 -> 0 bytes .../blood_infused_iron_longsword_blade.png | Bin 172 -> 0 bytes ...od_infused_iron_longsword_blade_broken.png | Bin 196 -> 0 bytes .../blood_infused_iron_longsword_handle.png | Bin 171 -> 0 bytes .../blood_infused_iron_lumberaxe_binding.png | Bin 642 -> 0 bytes .../blood_infused_iron_lumberaxe_handle.png | Bin 376 -> 0 bytes .../blood_infused_iron_lumberaxe_head.png | Bin 536 -> 0 bytes ...ood_infused_iron_lumberaxe_head_broken.png | Bin 359 -> 0 bytes .../blood_infused_iron_lumberaxe_shield.png | Bin 677 -> 0 bytes .../blood_infused_iron_mattock_back.png | Bin 195 -> 0 bytes .../blood_infused_iron_mattock_handle.png | Bin 174 -> 0 bytes .../blood_infused_iron_mattock_head.png | Bin 238 -> 0 bytes ...blood_infused_iron_mattock_head_broken.png | Bin 216 -> 0 bytes .../parts/blood_infused_iron_arrowhead.png | Bin 2925 -> 0 bytes .../parts/blood_infused_iron_axe_head.png | Bin 2908 -> 0 bytes .../blood_infused_iron_battlesign_head.png | Bin 2932 -> 0 bytes .../parts/blood_infused_iron_binding.png | Bin 2947 -> 0 bytes .../tinkers/parts/blood_infused_iron_bolt.png | Bin 226 -> 0 bytes .../parts/blood_infused_iron_bow_limb.png | Bin 278 -> 0 bytes .../parts/blood_infused_iron_chisel_head.png | Bin 2941 -> 0 bytes .../parts/blood_infused_iron_chunk.png | Bin 2995 -> 0 bytes .../parts/blood_infused_iron_crossbar.png | Bin 2866 -> 0 bytes .../blood_infused_iron_crossbow_body.png | Bin 324 -> 0 bytes .../blood_infused_iron_crossbow_limb.png | Bin 244 -> 0 bytes .../blood_infused_iron_excavator_head.png | Bin 2998 -> 0 bytes .../parts/blood_infused_iron_frypan_head.png | Bin 3008 -> 0 bytes .../parts/blood_infused_iron_full_guard.png | Bin 2890 -> 0 bytes .../parts/blood_infused_iron_hammer_head.png | Bin 2955 -> 0 bytes .../parts/blood_infused_iron_knife_blade.png | Bin 2855 -> 0 bytes .../parts/blood_infused_iron_large_guard.png | Bin 2914 -> 0 bytes .../blood_infused_iron_large_sword_blade.png | Bin 2919 -> 0 bytes .../parts/blood_infused_iron_largeplate.png | Bin 2916 -> 0 bytes .../blood_infused_iron_lumberaxe_head.png | Bin 2901 -> 0 bytes .../parts/blood_infused_iron_medium_guard.png | Bin 2904 -> 0 bytes .../parts/blood_infused_iron_pickaxe_head.png | Bin 2958 -> 0 bytes .../tinkers/parts/blood_infused_iron_rod.png | Bin 2950 -> 0 bytes .../parts/blood_infused_iron_scythe_head.png | Bin 2941 -> 0 bytes .../parts/blood_infused_iron_shovel_head.png | Bin 2925 -> 0 bytes .../parts/blood_infused_iron_shuriken.png | Bin 322 -> 0 bytes .../parts/blood_infused_iron_sword_blade.png | Bin 2890 -> 0 bytes .../parts/blood_infused_iron_toughbind.png | Bin 2978 -> 0 bytes .../parts/blood_infused_iron_toughrod.png | Bin 2907 -> 0 bytes .../blood_infused_iron_pickaxe_accessory.png | Bin 165 -> 0 bytes .../blood_infused_iron_pickaxe_handle.png | Bin 171 -> 0 bytes .../blood_infused_iron_pickaxe_head.png | Bin 264 -> 0 bytes ...blood_infused_iron_pickaxe_head_broken.png | Bin 236 -> 0 bytes ...ood_infused_iron_pickmattock_accessory.png | Bin 165 -> 0 bytes .../blood_infused_iron_pickmattock_back.png | Bin 195 -> 0 bytes .../blood_infused_iron_pickmattock_handle.png | Bin 174 -> 0 bytes .../blood_infused_iron_pickmattock_head.png | Bin 2866 -> 0 bytes ...d_infused_iron_pickmattock_head_broken.png | Bin 2828 -> 0 bytes .../blood_infused_iron_rapier_accessory.png | Bin 181 -> 0 bytes .../blood_infused_iron_rapier_blade.png | Bin 172 -> 0 bytes ...blood_infused_iron_rapier_blade_broken.png | Bin 152 -> 0 bytes .../blood_infused_iron_rapier_handle.png | Bin 163 -> 0 bytes .../blood_infused_iron_scythe_accessory.png | Bin 168 -> 0 bytes .../blood_infused_iron_scythe_binding.png | Bin 170 -> 0 bytes .../blood_infused_iron_scythe_handle.png | Bin 279 -> 0 bytes .../scythe/blood_infused_iron_scythe_head.png | Bin 233 -> 0 bytes .../blood_infused_iron_scythe_head_broken.png | Bin 219 -> 0 bytes .../blood_infused_iron_bow_bottom.png | Bin 210 -> 0 bytes .../blood_infused_iron_bow_bottom_1.png | Bin 210 -> 0 bytes .../blood_infused_iron_bow_bottom_2.png | Bin 211 -> 0 bytes .../blood_infused_iron_bow_bottom_3.png | Bin 205 -> 0 bytes .../shortbow/blood_infused_iron_bow_top.png | Bin 212 -> 0 bytes .../shortbow/blood_infused_iron_bow_top_1.png | Bin 212 -> 0 bytes .../shortbow/blood_infused_iron_bow_top_2.png | Bin 219 -> 0 bytes .../shortbow/blood_infused_iron_bow_top_3.png | Bin 209 -> 0 bytes .../blood_infused_iron_shovel_handle.png | Bin 170 -> 0 bytes .../shovel/blood_infused_iron_shovel_head.png | Bin 227 -> 0 bytes .../blood_infused_iron_shovel_head_broken.png | Bin 223 -> 0 bytes 211 files changed, 630 insertions(+), 3791 deletions(-) delete mode 100644 src/main/api/java/morph/api/Ability.java delete mode 100644 src/main/api/java/morph/api/Api.java delete mode 100644 src/main/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java delete mode 100644 src/main/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java delete mode 100644 src/main/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java delete mode 100644 src/main/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java delete mode 100644 src/main/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java delete mode 100644 src/main/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java delete mode 100644 src/main/api/java/powercrystals/minefactoryreloaded/api/ValuedItem.java create mode 100644 src/main/java/com/arc/bloodarsenal/client/renderer/block/RenderBloodTNTPrimed.java delete mode 100644 src/main/java/com/arc/bloodarsenal/client/renderer/block/ShaderHelper.java delete mode 100644 src/main/java/com/arc/bloodarsenal/client/renderer/item/ItemRenderGatling.java delete mode 100644 src/main/java/com/arc/bloodarsenal/client/renderer/model/ModelEnergyGatling.java delete mode 100644 src/main/java/com/arc/bloodarsenal/client/renderer/projectile/RenderEntityBloodBall.java delete mode 100644 src/main/java/com/arc/bloodarsenal/client/renderer/projectile/RenderEntityGatlingProjectile.java delete mode 100644 src/main/java/com/arc/bloodarsenal/common/block/fluid/MoltenBloodInfusedIron.java delete mode 100644 src/main/java/com/arc/bloodarsenal/common/entity/ModEntities.java delete mode 100644 src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityBloodBall.java delete mode 100644 src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityGatlingProjectile.java delete mode 100644 src/main/java/com/arc/bloodarsenal/common/items/BucketHandler.java delete mode 100644 src/main/java/com/arc/bloodarsenal/common/items/ItemBloodBall.java delete mode 100644 src/main/java/com/arc/bloodarsenal/common/items/MoltenBucket.java create mode 100644 src/main/java/com/arc/bloodarsenal/common/items/book/BloodBurnedTome.java delete mode 100644 src/main/java/com/arc/bloodarsenal/common/items/tool/EnergyGatling.java delete mode 100644 src/main/java/com/arc/bloodarsenal/common/tinkers/PartHelper.java delete mode 100644 src/main/java/com/arc/bloodarsenal/common/tinkers/RecipeHelper.java delete mode 100644 src/main/java/com/arc/bloodarsenal/common/tinkers/TConCastingRecipe.java delete mode 100644 src/main/java/com/arc/bloodarsenal/common/tinkers/TextureDerived.java delete mode 100644 src/main/java/com/arc/bloodarsenal/common/tinkers/TextureLiquidLava.java delete mode 100644 src/main/resources/assets/bloodarsenal/models/EnergyGatling.png delete mode 100644 src/main/resources/assets/bloodarsenal/models/armor/EnergyGatling.png delete mode 100644 src/main/resources/assets/bloodarsenal/models/armor/EnergyGatling2.png delete mode 100644 src/main/resources/assets/bloodarsenal/shaders/beam.frag create mode 100644 src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_flow.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_flow.png.mcmeta create mode 100644 src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_still.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_still.png.mcmeta delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/blood_ball.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/burned_tome.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/energy_gatling.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_arrow_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_axe_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_battleaxe_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_battlesign_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bolt_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect_1.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect_2.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect_3.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_crossbow_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_cutlass_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_dagger_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_excavator_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_fishingrod_effect1.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_fishingrod_effect2.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_frypan_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_hammer_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_javelin_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_knife_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_lumberaxe_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_pickaxe_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_pickmattock_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_rapier_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_scythe_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_shovel_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_shuriken_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_sword_effect.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/arrow/blood_infused_iron_arrow_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/arrow/blood_infused_iron_arrow_shaft.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/axe/blood_infused_iron_axe_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/axe/blood_infused_iron_axe_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/axe/blood_infused_iron_axe_head_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_back.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_backhead.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_binding.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_front.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_fronthead.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_fronthead_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_head_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/battlesign/blood_infused_iron_battlesign_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/battlesign/blood_infused_iron_battlesign_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/battlesign/blood_infused_iron_battlesign_head_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_accessory.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_blade.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_blade_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/chisel/blood_infused_iron_chisel_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/chisel/blood_infused_iron_chisel_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/chisel/blood_infused_iron_chisel_head_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_guard.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_head_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_shield.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_blade.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_blade_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_guard.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/dagger/blood_infused_iron_dagger_accessory.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/dagger/blood_infused_iron_dagger_blade.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/dagger/blood_infused_iron_dagger_blade_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/dagger/blood_infused_iron_dagger_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_binding.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_grip.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_head_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/frypan/blood_infused_iron_frypan_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/frypan/blood_infused_iron_frypan_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/frypan/blood_infused_iron_frypan_head_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_back.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_front.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_handle_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_accessory.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_blade.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_blade_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_binding.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_head_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_shield.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_back.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_head_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_arrowhead.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_axe_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_battlesign_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_binding.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_bolt.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_bow_limb.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_chisel_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_chunk.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_crossbar.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_crossbow_body.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_crossbow_limb.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_excavator_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_frypan_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_full_guard.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_hammer_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_knife_blade.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_large_guard.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_large_sword_blade.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_largeplate.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_lumberaxe_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_medium_guard.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_pickaxe_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_rod.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_scythe_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_shovel_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_shuriken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_sword_blade.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_toughbind.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_toughrod.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_accessory.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_head_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_accessory.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_back.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_head_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_accessory.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_blade.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_blade_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_accessory.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_binding.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_head_broken.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_bottom.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_bottom_1.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_bottom_2.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_bottom_3.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top_1.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top_2.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top_3.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/shovel/blood_infused_iron_shovel_handle.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/shovel/blood_infused_iron_shovel_head.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/items/tinkers/shovel/blood_infused_iron_shovel_head_broken.png diff --git a/src/main/api/java/morph/api/Ability.java b/src/main/api/java/morph/api/Ability.java deleted file mode 100644 index 36a75e9..0000000 --- a/src/main/api/java/morph/api/Ability.java +++ /dev/null @@ -1,208 +0,0 @@ -package morph.api; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -/** - * - * Abstract ability class. - * Think of it like the Entity class, extend it to make your own types. - * Some abilities may seem more like traits, but let's just call it an ability for simplicity's sake. - * Please take note that entities inherit their superclass' abilities. - * @author iChun - * - */ -public abstract class Ability -{ - /** - * Ability parent field. Will be null for instances used in registration. Ability is then cloned and parent assigned later on. - */ - private EntityLivingBase parent; - - /** - * Flag for Ability activity. If true, tick/postRender/kill will notbe called. - */ - public boolean inactive; - - /** - * Basic constructor (but you didn't really need me to tell you that ;D ) - */ - public Ability() - { - parent = null; - } - - /** - * Function for mod mob support, with args. - */ - public Ability parse(String[] args) { return this; } - - /** - * Since parent is private it needs a setter. - * @param newParent - */ - public void setParent(EntityLivingBase ent) - { - parent = ent; - } - - /** - * Get's the parent entity for this ability - * @return Entity the ability takes effect on - */ - public EntityLivingBase getParent() - { - return parent; - } - - /** - * Each ability has to return a String type. - * This is used for comparison, saving, as well as construction/loading of Ability. - * Think of it like the way Minecraft registers entities. - * @return Ability type - */ - public abstract String getType(); - - /** - * Ticks every world tick, basically an ability onUpdate, similar to Entity's onUpdate. - * Will only tick if getParent() is not null. - * Please remember that getParent is not necessarily a player. - */ - public abstract void tick(); - - /** - * Called when the ability is finally removed when the parent demorphs or morphs into a state that does not have this ability type. - * This will NOT be called if the parent morphs into another morph that has this type of ability. - */ - public abstract void kill(); - - /** - * Creates a copy of this ability for use with parents. - * As previously stated before the ability instance used during registration is a base so it needs to be cloned for use with parents. - */ - public abstract Ability clone(); - - /** - * Return true for this if you need an inactive copy of this morph in-between morph states (abilities of the next morph are only swapped over when morph is complete) - * Currently used for AbilitySwim to adjust the fog render. - * @return requiresInactiveClone - */ - public boolean requiresInactiveClone() - { - return false; - } - - /** - * Saving of ability to NBTTagCompound. - * Mainly used for synching Abilities between the client-server for mod mobs which do not use the API to add abilities. - * The ability type (getType()) is appended to nbt before function is called. - * Not actually used. - * @param NBTTagCompound saveData - */ - public abstract void save(NBTTagCompound tag); - - /** - * Loading of ability from NBTTagCompound. - * Mainly used to load custom fields from NBT. - * Not actually used. - * @param NBTTagCompound saveData - */ - public abstract void load(NBTTagCompound tag); - - /** - * Rendering to be done post-render. - * EG: Used by AbilitySwim to render air bubbles whilst on land. - */ - @SideOnly(Side.CLIENT) - public abstract void postRender(); - - /** - * Icon location for ability. Can be null. - * Mod's default icons are 32x32. Can be any resolution though. - * @return resourcelocation for icon - */ - @SideOnly(Side.CLIENT) - public abstract ResourceLocation getIcon(); - - @SideOnly(Side.CLIENT) - public boolean entityHasAbility(EntityLivingBase living) - { - return true; - } - - /** - * Registers the ability so the mod can look up the class when attempting to load Ability save data. - * Call this no later than PostInit. - * @param ability type - * @param AbilityClass - */ - public static void registerAbility(String name, Class clz) - { - try { - Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("registerAbility", String.class, Class.class).invoke(null, name, clz); - } catch (Exception e) { - } - } - - /** - * Maps abilities to an Entity. - * Adds on to the previous ability list, so this allows you to add abilities to Entity classes which already have abilities mapped. - * However, only one ability of the same type is allowed for each entity. This method will overwrite abilities of the same type that were already mapped. - * This will also register new abilities which were not registered before (just in case). - * Call this no later than PostInit. - * @param entClass - * @param abilities - */ - public static void mapAbilities(Class entClass, Ability...abilities) - { - try { - Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("mapAbilities", Class.class, Ability[].class).invoke(null, entClass, abilities); - } catch (Exception e) { - } - } - - /** - * Superman's kryptonite. - * @param Entity class to remove ability from - * @param Ability type - */ - public static void removeAbility(Class entClass, String type) - { - try { - Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("removeAbility", Class.class, String.class).invoke(null, entClass, type); - } catch (Exception e) { - } - } - - /** - * Checks to see if the entity class has a mapped ability type. - * @param entClass - * @param Ability type - * @return Entity class has ability type - */ - public static boolean hasAbility(Class entClass, String type) - { - try { - return (Boolean)Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("hasAbility", Class.class, String.class).invoke(null, entClass, type); - } catch (Exception e) { - return false; - } - } - - /** - * Creates an ability by type. - * Check out AbilityHandler to see each Ability type and the parse function in their respective classes for the arguments. - * @return - */ - public static Ability createNewAbilityByType(String type, String[] arguments) - { - try { - return (Ability)Class.forName("morph.common.ability.AbilityHandler").getDeclaredMethod("createNewAbilityByType", String.class, String[].class).invoke(null, type, arguments); - } catch (Exception e) { - return null; - } - } -} diff --git a/src/main/api/java/morph/api/Api.java b/src/main/api/java/morph/api/Api.java deleted file mode 100644 index 1cfb49d..0000000 --- a/src/main/api/java/morph/api/Api.java +++ /dev/null @@ -1,170 +0,0 @@ -package morph.api; - -import net.minecraft.client.entity.AbstractClientPlayer; -import net.minecraft.client.model.ModelBase; -import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayerMP; -import net.minecraft.util.ResourceLocation; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; - -public final class Api -{ - /** - * Returns if a player is has a morph. If morph progress < 1.0F, player is mid-morphing. - * Players demorphing are considered as a player with a morph until the demorph is complete. - * @param Player Username - * @param Clientside (false for Serverside) - */ - public static boolean hasMorph(String playerName, boolean isClient) - { - try { - return (Boolean)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("hasMorph", String.class, boolean.class).invoke(null, playerName, isClient); - } catch (Exception e) { - return false; - } - } - - /** - * Returns morph progression of a player. Time per morph is 80 ticks. - * If player does not have a morph, 1.0F will be returned. - * @param Player Username - * @param Clientside (false for Serverside) - */ - public static float morphProgress(String playerName, boolean isClient) - { - try { - return (Float)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("morphProgress", String.class, boolean.class).invoke(null, playerName, isClient); - } catch (Exception e) { - return 1.0F; - } - } - - /** - * Returns previous entity instance used to render the morph. - * If player does not have a previous morph state, null will be returned. - * @param Player Username - * @param Clientside (false for Serverside) - */ - public static EntityLivingBase getPrevMorphEntity(String playerName, boolean isClient) - { - try { - return (EntityLivingBase)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("getPrevMorphEntity", String.class, boolean.class).invoke(null, playerName, isClient); - } catch (Exception e) { - return null; - } - } - - /** - * Returns entity instance used to render the morph. - * If player does not have a morph, null will be returned. - * @param Player Username - * @param Clientside (false for Serverside) - */ - public static EntityLivingBase getMorphEntity(String playerName, boolean isClient) - { - try { - return (EntityLivingBase)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("getMorphEntity", String.class, boolean.class).invoke(null, playerName, isClient); - } catch (Exception e) { - return null; - } - } - - /** - * Blacklists an entity from being morphed into. - * Previously saved morphs of the classtype will not be removed. - * @param Class (extends EntityLivingBase) - */ - public static void blacklistEntity(Class clz) - { - try { - Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("blacklistEntity", Class.class).invoke(null, clz); - } catch (Exception e) { - } - } - - /** - * Forces a player to morph into an EntityLivingBase, also adds said entity to the morph list. - * Called Serverside only. - * @param player - * @param living - * @return morphSuccessful - */ - public static boolean forceMorph(EntityPlayerMP player, EntityLivingBase living) - { - try { - return (Boolean)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("forceMorph", EntityPlayerMP.class, EntityLivingBase.class).invoke(null, player, living); - } catch (Exception e) { - return false; - } - } - - /** - * Forces a player to demorph. - * Called Serverside only. - * @param player - */ - public static void forceDemorph(EntityPlayerMP player) - { - try { - Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("forceDemorph", EntityPlayerMP.class).invoke(null, player); - } catch (Exception e) { - } - } - - /** - * Checks if the entity passed on is a Morph. - * If it is, the player name will be passed, else null. - * @param EntityLivingBase instance - * @param Clientside (false for Serverside) - */ - public static String isEntityAMorph(EntityLivingBase living, boolean isClient) - { - try { - return (String)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("isEntityAMorph", EntityLivingBase.class, boolean.class).invoke(null, living, isClient); - } catch (Exception e) { - return null; - } - } - - /** - * Allows the rendering of the next player rendered. - * Prevents Morph from cancelling the player render event to render the morphed entity. - */ - public static void allowNextPlayerRender() - { - try { - Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("allowNextPlayerRender").invoke(null); - } catch (Exception e) { - } - } - - /** - * Returns the black grainy morph skin that overlays the player when the player is morphing - * @return Morph Skin Resource Location - */ - @SideOnly(Side.CLIENT) - public static ResourceLocation getMorphSkinTexture() - { - try { - return (ResourceLocation)Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("getMorphSkinTexture").invoke(null); - } catch (Exception e) { - return AbstractClientPlayer.locationStevePng; - } - } - - /** - * Assign a specific arm to a model for rendering in First Person. - * @param model Model which arm you are registering for - * @param arm The arm in a ModelRenderer form. - */ - @SideOnly(Side.CLIENT) - public static void registerArmForModel(ModelBase model, ModelRenderer arm) - { - try { - Class.forName("morph.common.core.ApiHandler").getDeclaredMethod("registerArmForModel", ModelBase.class, ModelRenderer.class).invoke(null, model, arm); - } catch (Exception e) { - } - } -} diff --git a/src/main/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java deleted file mode 100644 index 8eff88d..0000000 --- a/src/main/api/java/powercrystals/minefactoryreloaded/api/FactoryRegistry.java +++ /dev/null @@ -1,113 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import cpw.mods.fml.common.Loader; -import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.event.FMLInterModComms.IMCMessage; - -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; - -/** - * @author PowerCrystals - * - * Class used to register plants and other farming-related things with MFR. Will do nothing if MFR does not exist. - * - */ -public class FactoryRegistry -{ - /* - * This may be called at any time during pre-init, init or post-init, assuming all blocks and items - * that are being accessed from the registry have been appropriately registered. - * Possible messages: - * - * // Registration: - * addLaserPreferredOre | NBTTag with an ItemStack saved on it, with the color on the "value" attribute, - * | A ValuedItem with item and value set. - * registerAutoSpawnerBlacklist | The String identifier of an entity, - * | A subclass of EntityLivingBase. - * registerFertilizable | An instance of IFactoryFertilizable. - * registerFertilizer | An instance of IFactoryFertilizer. - * registerFruitLog | The String identifier of a block. - * registerGrindable | An instance of IFactoryGrindable. - * registerGrinderBlacklist | A subclass of EntityLivingBase. - * registerHarvestable | An instance of IFactoryHarvestable. - * registerLaserOre | NBTTag with an ItemStack saved on it, with the weight on the "value" attribute, - * | A ValuedItem with item and value set. - * registerLiquidDrinkHandler | A ValuedItem with key and object set; ILiquidDrinkHandler expected. - * registerMobEggHandler | An instance of IMobEggHandler. - * registerPickableFruit | An instance of IFactoryFruit. - * registerPlantable | An instance of IFactoryPlantable. - * registerRanchable | An instance of IFactoryRanchable. - * registerRedNetLogicCircuit | An instance of IRedNetLogicCircuit. - * registerRubberTreeBiome | The biomeName field of a biome to white list for rubber trees to spawn in. - * registerSafariNetBlacklist | A subclass of EntityLivingBase. - * registerSafariNetHandler | An instance of ISafariNetHandler. - * registerSludgeDrop | NBTTag with an ItemStack saved on it, with the weight on the "value" attribute, - * | A ValuedItem with item and value set. - * registerSpawnHandler | An instance of IMobSpawnHandler. - * registerVillagerTradeMob | An instance of IRandomMobProvider. - * - * // Simple implementations: - * { Harvestables - * registerHarvestable_Standard | The String identifier of a block. - * registerHarvestable_Log | The String identifier of a block. - * registerHarvestable_Leaves | The String identifier of a block. - * registerHarvestable_Vine | The String identifier of a block. - * registerHarvestable_Shrub | The String identifier of a block. - * registerHarvestable_Mushroom | The String identifier of a block. - * registerHarvestable_Crop | An ItemStack of a block, with a damage value indicating the meta value to harvest at. - * | A ValuedItem with value and object set; Block expected. - * registerHarvestable_Gourd | An NBTTag with the stem and fruit attributes, both String identifiers of blocks. - * } - * { Plantables - * registerPlantable_Standard | An NBTTag with the seed (Item, String identifier), and - * crop (Block, String identifier) attributes set, optionally - * also having the meta (Integer, placed metadata value) attribute set. - * No special checks for location, just sustainability. - * registerPlantable_Crop | An NBTTag with the seed (Item, String identifier), and - * crop (Block, String identifier) attributes set, optionally - * also having the meta (Integer, placed metadata value) attribute set. - * Will automatically hoe dirt and grass into farmland when planting. - * registerPlantable_Sapling | An NBTTag with the sapling (Block, String identifier), and optionally - * the seed (Item, String identifier) attributes set. - * } - * { Fertilizer - * registerFertilizer | An NBTTag with the fert (Item, String identifier), meta (Integer), and - * type (Integer, index into FertilizerType.values()) attributes set. - * } - * { Fertilizables - * registerFertilizable_Grass | The String identifier of a block. Will bonemeal the block and expect - * tall grass be planted above and around it, must be IGrowable. Works with - * the GrowPlant and Grass type fertilizers, not recommended for crop plants. - * registerFertilizable_Gourd | The String identifier of a block. Must be IGrowable, and expects identical - * behavior to vanilla stems. Works with the GrowPlant fertilizers. - * registerFertilizable_Crop | An NBTTag with the plant (Block, String identifier, IGrowable), and - * meta (Integer, max growth phase) attributes set, optionally also having - * the type (Integer, index into FertilizerType) attribute set. - * registerFertilizable_Cocoa | An NBTTag with the plant (Block, String identifier), and optionally also - * the type (Integer, index into FertilizerType) attributes set. - * Expects metadata of the block to exactly match cocoa pods. - * registerFertilizable_Standard | An NBTTag with the plant (Block, String identifier, IGrowable), and - * optionally also the type (Integer, index into FertilizerType) attributes set. - * Expects the block to change when successfully grown (e.g., saplings). - * } - */ - public static void sendMessage(String message, Object value) - { - if (!Loader.isModLoaded("MineFactoryReloaded") || - Loader.instance().activeModContainer() == null) - return; - try - { - Method m = FMLInterModComms.class.getDeclaredMethod("enqueueMessage", Object.class, String.class, IMCMessage.class); - m.setAccessible(true); - Constructor c = IMCMessage.class.getDeclaredConstructor(String.class, Object.class); - c.setAccessible(true); - m.invoke(null, Loader.instance().activeModContainer(), "MineFactoryReloaded", c.newInstance(message, value)); - } - catch(Exception e) - { - e.printStackTrace(); - } - } -} diff --git a/src/main/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java deleted file mode 100644 index a56208e..0000000 --- a/src/main/api/java/powercrystals/minefactoryreloaded/api/HarvestType.java +++ /dev/null @@ -1,44 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -/** - * @author PowerCrystals - * - * Determines what algorithm the Harvester uses when it encounters this IFactoryHarvestable in the world. - */ -public enum HarvestType -{ - /** - * Just break the single block - no special action needed. e.g. Carrots, flowers, wheat. - */ - Normal, - /** - * Search for harvestable blocks adjacent to this block but leave this block. e.g. Pumpkin, melon - */ - Gourd, - /** - * Search for identical blocks above. - */ - Column, - /** - * Search for identical blocks above but leave the bottom one for the future. e.g. Cactus, sugarcane. - */ - LeaveBottom, - /** - * This block is the base of a tree and the harvester should enter tree-cutting mode. - */ - Tree, - /** - * This block is the base of the tree and the harvester should enter tree-cutting mode. - * The tree is searched for in the negative y axis instead. - */ - TreeFlipped, - /** - * This block is part of a tree as above. - */ - TreeLeaf, - /** - * This block is part of a tree as above, but fruits are cut before logs. e.g. cocoa - * The tree is not searched for. - */ - TreeFruit -} diff --git a/src/main/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java deleted file mode 100644 index edfb8c9..0000000 --- a/src/main/api/java/powercrystals/minefactoryreloaded/api/IFactoryGrindable.java +++ /dev/null @@ -1,35 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import java.util.List; -import java.util.Random; - -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.world.World; - -/** - * @author PowerCrystals - * - * Defines a grindable entity for the Grinder. - */ -public interface IFactoryGrindable -{ - /** - * @return The class that this grindable instance is handling. This must be a subtype of EntityLivingBase or the entity will never - * be noticed by the Grinder. - */ - public Class getGrindableEntity(); - - /** - * @param world The world this entity is in. - * @param entity The entity instance being ground. - * @param random A Random instance. - * @return The drops generated when this entity is killed. - */ - public List grind(World world, EntityLivingBase entity, Random random); - - /** - * @param entity The entity instance being ground. - * @return Whether this entity has been fully processed or not. - */ - public boolean processEntity(EntityLivingBase entity); -} diff --git a/src/main/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java deleted file mode 100644 index d4e620a..0000000 --- a/src/main/api/java/powercrystals/minefactoryreloaded/api/IFactoryHarvestable.java +++ /dev/null @@ -1,71 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import java.util.List; -import java.util.Map; -import java.util.Random; - -import net.minecraft.block.Block; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -/** - * @author PowerCrystals - * - * Defines a harvestable block for the Harvester. - */ -public interface IFactoryHarvestable -{ - /** - * @return The block this harvestable instance is managing. - */ - public Block getPlant(); - - /** - * @return The type of harvest the Harvester should perform on this block. - */ - public HarvestType getHarvestType(); - - /** - * @return Whether or not the Harvester should break the block when harvesting. If false, no changes will be performed by the Harvester itself. - */ - public boolean breakBlock(); - - /** - * @param world The world this block is in. - * @param harvesterSettings The harvester's current settings. Do not modify these. - * @param x The X coordinate of the block being harvested. - * @param y The Y coordinate of the block being harvested. - * @param z The Z coordinate of the block being harvested. - * @return True if this block can be harvested. - */ - public boolean canBeHarvested(World world, Map harvesterSettings, int x, int y, int z); - - /** - * @param world The world this block is in. - * @param rand A Random instance to use when generating drops. - * @param harvesterSettings The harvester's current settings. Do not modify these. - * @param x The X coordinate of the block being harvested. - * @param y The Y coordinate of the block being harvested. - * @param z The Z coordinate of the block being harvested. - * @return The drops generated by breaking this block. For a default implementation, calling Block.getBlockDropped() is usually sufficient. - */ - public List getDrops(World world, Random rand, Map harvesterSettings, int x, int y, int z); - - /** - * Called before the block is going to be harvested. Usually empty. - * @param world The world this block is in. - * @param x The X coordinate of the block being harvested. - * @param y The Y coordinate of the block being harvested. - * @param z The Z coordinate of the block being harvested. - */ - public void preHarvest(World world, int x, int y, int z); - - /** - * Called after the block is going to be harvested. Used to re-till soil, for example. - * @param world The world this block is in. - * @param x The X coordinate of the block being harvested. - * @param y The Y coordinate of the block being harvested. - * @param z The Z coordinate of the block being harvested. - */ - public void postHarvest(World world, int x, int y, int z); -} diff --git a/src/main/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java deleted file mode 100644 index 31eba00..0000000 --- a/src/main/api/java/powercrystals/minefactoryreloaded/api/ILiquidDrinkHandler.java +++ /dev/null @@ -1,8 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.entity.EntityLivingBase; - -public interface ILiquidDrinkHandler -{ - public void onDrink(EntityLivingBase player); -} diff --git a/src/main/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java deleted file mode 100644 index 7f5dd7c..0000000 --- a/src/main/api/java/powercrystals/minefactoryreloaded/api/MobDrop.java +++ /dev/null @@ -1,21 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; -import net.minecraft.util.WeightedRandom; - -public class MobDrop extends WeightedRandom.Item -{ - private ItemStack _stack; - - public MobDrop(int weight, ItemStack stack) - { - super(weight); - _stack = stack; - } - - public ItemStack getStack() - { - if(_stack == null) return null; - return _stack.copy(); - } -} diff --git a/src/main/api/java/powercrystals/minefactoryreloaded/api/ValuedItem.java b/src/main/api/java/powercrystals/minefactoryreloaded/api/ValuedItem.java deleted file mode 100644 index 3d075fa..0000000 --- a/src/main/api/java/powercrystals/minefactoryreloaded/api/ValuedItem.java +++ /dev/null @@ -1,72 +0,0 @@ -package powercrystals.minefactoryreloaded.api; - -import net.minecraft.item.ItemStack; - -public class ValuedItem -{ - public final int value; - public final ItemStack item; - public final String key; - public final Object object; - - public ValuedItem(int v, ItemStack i) - { - value = v; - item = i; - key = null; - object = null; - } - - public ValuedItem(String v, Object i) - { - value = -1; - item = null; - key = v; - object = i; - } - - /** - * Presently unused but included so that if they do get used in the future, - * people including this in their jar and loading before MFR don't destroy everyone - */ - - public ValuedItem(int v, Object i) - { - value = v; - item = null; - key = null; - object = i; - } - - public ValuedItem(String v, ItemStack i) - { - value = -1; - item = i; - key = v; - object = null; - } - - public ValuedItem(int v, String k, ItemStack i) - { - value = v; - item = i; - key = k; - object = null; - } - - public ValuedItem(int v, String k, Object i) - { - value = v; - item = null; - key = k; - object = i; - } - - public ValuedItem(int v, String k, ItemStack i, Object o) - { - value = v; - item = i; - key = k; - object = o; - } -} diff --git a/src/main/java/com/arc/bloodarsenal/client/ClientProxy.java b/src/main/java/com/arc/bloodarsenal/client/ClientProxy.java index 7eb0850..1c90a03 100644 --- a/src/main/java/com/arc/bloodarsenal/client/ClientProxy.java +++ b/src/main/java/com/arc/bloodarsenal/client/ClientProxy.java @@ -4,17 +4,11 @@ import com.arc.bloodarsenal.common.BloodArsenalConfig; import com.arc.bloodarsenal.common.CommonProxy; import com.arc.bloodarsenal.common.block.ModBlocks; import com.arc.bloodarsenal.common.entity.EntityBloodTNT; -import com.arc.bloodarsenal.common.entity.mob.EntityBloodHound; -import com.arc.bloodarsenal.common.entity.projectile.EntityBloodBall; -import com.arc.bloodarsenal.common.entity.projectile.EntityGatlingProjectile; import com.arc.bloodarsenal.common.items.ModItems; import com.arc.bloodarsenal.common.items.sigil.SigilUtils; import com.arc.bloodarsenal.common.misc.VersionChecker; import com.arc.bloodarsenal.client.renderer.block.*; -import com.arc.bloodarsenal.client.renderer.entity.RenderEntityBloodHound; -import com.arc.bloodarsenal.client.renderer.item.ItemRenderGatling; import com.arc.bloodarsenal.client.renderer.item.RenderBow; -import com.arc.bloodarsenal.client.renderer.projectile.RenderEntityGatlingProjectile; import com.arc.bloodarsenal.client.renderer.block.TilePortableAltarRenderer; import com.arc.bloodarsenal.client.renderer.block.item.TilePortableAltarItemRenderer; import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser; @@ -23,9 +17,6 @@ import com.arc.bloodarsenal.common.tinkers.IClientCode; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; -import net.minecraft.client.model.ModelWolf; -import net.minecraft.client.renderer.entity.RenderSnowball; -import net.minecraft.client.renderer.entity.RenderTNTPrimed; import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.world.World; @@ -46,20 +37,15 @@ public class ClientProxy extends CommonProxy @Override public void registerRenders() { - MinecraftForgeClient.registerItemRenderer(ModItems.energy_gatling, new ItemRenderGatling()); MinecraftForgeClient.registerItemRenderer(ModItems.bound_bow, new RenderBow()); - RenderingRegistry.registerEntityRenderingHandler(EntityGatlingProjectile.class, new RenderEntityGatlingProjectile()); - RenderingRegistry.registerEntityRenderingHandler(EntityBloodTNT.class, new RenderTNTPrimed()); - RenderingRegistry.registerEntityRenderingHandler(EntityBloodBall.class, new RenderSnowball(ModItems.blood_ball)); + RenderingRegistry.registerEntityRenderingHandler(EntityBloodTNT.class, new RenderBloodTNTPrimed()); // RenderingRegistry.registerEntityRenderingHandler(EntityBloodHound.class, new RenderEntityBloodHound(new ModelWolf(), new ModelWolf(), 0.5F)); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.life_infuser), new RenderTileLifeInfuser()); ClientRegistry.bindTileEntitySpecialRenderer(TilePortableAltar.class, new TilePortableAltarRenderer()); ClientRegistry.bindTileEntitySpecialRenderer(TileLifeInfuser.class, new TileLifeInfuserRenderer()); - - ShaderHelper.initShaders(); } @Override @@ -85,5 +71,6 @@ public class ClientProxy extends CommonProxy MinecraftForgeClient.registerItemRenderer(ItemBlock.getItemFromBlock(ModBlocks.portable_altar), new TilePortableAltarItemRenderer()); } - public void executeClientCode(IClientCode clientCode) {} + @Override + public void executeClientCode(IClientCode clientCode) {clientCode.executeClientCode();} } diff --git a/src/main/java/com/arc/bloodarsenal/client/renderer/block/RenderBloodTNTPrimed.java b/src/main/java/com/arc/bloodarsenal/client/renderer/block/RenderBloodTNTPrimed.java new file mode 100644 index 0000000..f039294 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/client/renderer/block/RenderBloodTNTPrimed.java @@ -0,0 +1,103 @@ +package com.arc.bloodarsenal.client.renderer.block; + +import com.arc.bloodarsenal.common.block.ModBlocks; +import com.arc.bloodarsenal.common.entity.EntityBloodTNT; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.entity.Entity; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; + +@SideOnly(Side.CLIENT) +public class RenderBloodTNTPrimed extends Render +{ + private RenderBlocks blockRenderer = new RenderBlocks(); + + public RenderBloodTNTPrimed() + { + this.shadowSize = 0.5F; + } + + /** + * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then + * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic + * (Render 1.0F) + { + f2 = 1.0F; + } + + f2 *= f2; + f2 *= f2; + float f3 = 1.0F + f2 * 0.3F; + GL11.glScalef(f3, f3, f3); + } + + f2 = (1.0F - ((float)p_76986_1_.fuse - p_76986_9_ + 1.0F) / 100.0F) * 0.8F; + this.bindEntityTexture(p_76986_1_); + this.blockRenderer.renderBlockAsItem(ModBlocks.blood_tnt, 0, p_76986_1_.getBrightness(p_76986_9_)); + + if (p_76986_1_.fuse / 5 % 2 == 0) + { + GL11.glDisable(GL11.GL_TEXTURE_2D); + GL11.glDisable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_BLEND); + GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_DST_ALPHA); + GL11.glColor4f(1.0F, 1.0F, 1.0F, f2); + this.blockRenderer.renderBlockAsItem(ModBlocks.blood_tnt, 0, 1.0F); + GL11.glColor4f(1.0F, 1.0F, 1.0F, 1.0F); + GL11.glDisable(GL11.GL_BLEND); + GL11.glEnable(GL11.GL_LIGHTING); + GL11.glEnable(GL11.GL_TEXTURE_2D); + } + + GL11.glPopMatrix(); + } + + /** + * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture. + */ + protected ResourceLocation getEntityTexture(EntityBloodTNT p_110775_1_) + { + return TextureMap.locationBlocksTexture; + } + + /** + * Returns the location of an entity's texture. Doesn't seem to be called unless you call Render.bindEntityTexture. + */ + protected ResourceLocation getEntityTexture(Entity p_110775_1_) + { + return this.getEntityTexture((EntityBloodTNT)p_110775_1_); + } + + /** + * Actually renders the given argument. This is a synthetic bridge method, always casting down its argument and then + * handing it off to a worker function which does the actual work. In all probabilty, the class Render is generic + * (Render> 16 & 255) / 255.0F; - float f3 = (float)(i >> 8 & 255) / 255.0F; - float f4 = (float)(i & 255) / 255.0F; - GL11.glColor3f(f2, f3, f4); - GL11.glPushMatrix(); - this.func_77026_a(tessellator, ItemPotion.func_94589_d("overlay")); - GL11.glPopMatrix(); - GL11.glColor3f(1.0F, 1.0F, 1.0F); - } - - this.func_77026_a(tessellator, iicon); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); - } - } - - private void func_77026_a(Tessellator par1Tessellator, IIcon par2IIcon) - { - float f = par2IIcon.getMinU(); - float f1 = par2IIcon.getMaxU(); - float f2 = par2IIcon.getMinV(); - float f3 = par2IIcon.getMaxV(); - float f4 = 1.0F; - float f5 = 0.5F; - float f6 = 0.25F; - GL11.glRotatef(180.0F - this.renderManager.playerViewY, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-this.renderManager.playerViewX, 1.0F, 0.0F, 0.0F); - par1Tessellator.startDrawingQuads(); - par1Tessellator.setNormal(0.0F, 1.0F, 0.0F); - par1Tessellator.addVertexWithUV((double)(0.0F - f5), (double)(0.0F - f6), 0.0D, (double)f, (double)f3); - par1Tessellator.addVertexWithUV((double)(f4 - f5), (double)(0.0F - f6), 0.0D, (double)f1, (double)f3); - par1Tessellator.addVertexWithUV((double)(f4 - f5), (double)(f4 - f6), 0.0D, (double)f1, (double)f2); - par1Tessellator.addVertexWithUV((double)(0.0F - f5), (double)(f4 - f6), 0.0D, (double)f, (double)f2); - par1Tessellator.draw(); - } - - @Override - protected ResourceLocation getEntityTexture(Entity entity) - { - return new ResourceLocation("bloodarsenal", "textures/items/blood_ball.png"); - } -} diff --git a/src/main/java/com/arc/bloodarsenal/client/renderer/projectile/RenderEntityGatlingProjectile.java b/src/main/java/com/arc/bloodarsenal/client/renderer/projectile/RenderEntityGatlingProjectile.java deleted file mode 100644 index a779296..0000000 --- a/src/main/java/com/arc/bloodarsenal/client/renderer/projectile/RenderEntityGatlingProjectile.java +++ /dev/null @@ -1,61 +0,0 @@ -package com.arc.bloodarsenal.client.renderer.projectile; - -import com.arc.bloodarsenal.common.BloodArsenalConfig; -import com.arc.bloodarsenal.common.entity.projectile.EntityGatlingProjectile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.Tessellator; -import net.minecraft.client.renderer.entity.Render; -import net.minecraft.entity.Entity; -import net.minecraft.entity.IProjectile; -import net.minecraft.util.ResourceLocation; -import org.lwjgl.opengl.GL11; -import org.lwjgl.opengl.GL12; - -@SideOnly(Side.CLIENT) -public class RenderEntityGatlingProjectile extends Render -{ - public void renderEntityGatling(Entity entity, double par2, double par4, double par6, float par8, float par9) - { - GL11.glPushMatrix(); - GL11.glTranslatef((float) par2, (float) par4, (float) par6); - GL11.glEnable(GL12.GL_RESCALE_NORMAL); - GL11.glScalef(0.1F, 0.1F, 0.1F); - bindTexture(getEntityTexture(entity)); - Tessellator var12 = Tessellator.instance; - GL11.glRotatef(180.0F - renderManager.playerViewY, 0.0F, 1.0F, 0.0F); - GL11.glRotatef(-renderManager.playerViewX, 1.0F, 0.0F, 0.0F); - var12.startDrawingQuads(); - var12.setNormal(0.0F, 1.0F, 0.0F); - var12.addVertexWithUV(-0.5F, -0.25F, 0.0D, 0, 1); - var12.addVertexWithUV(0.5F, -0.25F, 0.0D, 1, 1); - var12.addVertexWithUV(0.5F, 0.75F, 0.0D, 1, 0); - var12.addVertexWithUV(-0.5F, 0.75F, 0.0D, 0, 0); - var12.draw(); - GL11.glDisable(GL12.GL_RESCALE_NORMAL); - GL11.glPopMatrix(); - } - - @Override - public void doRender(Entity par1Entity, double par2, double par4, double par6, float par8, float par9) - { - if (par1Entity instanceof IProjectile) - { - renderEntityGatling(par1Entity, par2, par4, par6, par8, par9); - } - } - - @Override - protected ResourceLocation getEntityTexture(Entity entity) - { - if (BloodArsenalConfig.isRedGood) - { - if (entity instanceof EntityGatlingProjectile) - { - return new ResourceLocation("bloodarsenal", "textures/entities/energyGatlingProjectile2.png"); - } - } - - return new ResourceLocation("bloodarsenal", "textures/entities/energyGatlingProjectile.png"); - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java b/src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java index a801d90..becfe9e 100644 --- a/src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java +++ b/src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java @@ -1,16 +1,13 @@ package com.arc.bloodarsenal.common; -import com.arc.bloodarsenal.common.entity.ModEntities; import com.arc.bloodarsenal.common.entity.ModLivingDropsEvent; import com.arc.bloodarsenal.common.gui.GuiHandler; import com.arc.bloodarsenal.common.items.ModItems; import com.arc.bloodarsenal.common.items.sigil.holding.AHPacketHandler; -import com.arc.bloodarsenal.common.tinkers.BloodArsenalModifiers; -import com.arc.bloodarsenal.common.tinkers.BloodArsenalTinkers; -import com.arc.bloodarsenal.common.tinkers.RecipeHelper; import com.arc.bloodarsenal.common.misc.CommandDownloadMod; import com.arc.bloodarsenal.common.potion.PotionBloodArsenal; import com.arc.bloodarsenal.common.rituals.RitualRegistry; +import com.arc.bloodarsenal.common.tinkers.BloodArsenalTinkers; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; @@ -33,7 +30,7 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Calendar; -@Mod(modid = BloodArsenal.MODID, version = BloodArsenal.VERSION, name = "Blood Arsenal", dependencies = "required-after:AWWayofTime;after:NotEnoughItems;after:Baubles;after:TConstruct;after:Waila", guiFactory = "com.arc.bloodarsenal.common.gui.ConfigGuiFactory") +@Mod(modid = BloodArsenal.MODID, version = BloodArsenal.VERSION, name = "Blood Arsenal", dependencies = "required-after:AWWayofTime;after:NotEnoughItems;after:Baubles;after:guideapi;after:TConstruct;after:Waila", guiFactory = "com.arc.bloodarsenal.common.gui.ConfigGuiFactory") public class BloodArsenal { public final static String MODID = "BloodArsenal"; @@ -86,8 +83,6 @@ public class BloodArsenal ModItems.init(); - ModEntities.init(); - Potion[] potionTypes; for (Field f : Potion.class.getDeclaredFields()) @@ -160,12 +155,14 @@ public class BloodArsenal if (BloodArsenalConfig.tinkersIntegration) { logger.info("Loaded Tinker's Construct integration"); - - BloodArsenalTinkers.init(); - BloodArsenalModifiers.init(); - RecipeHelper.addRecipes(); + BloodArsenalTinkers.INSTANCE.init(); } } + + if (Loader.isModLoaded("guideapi")) + { + + } } @Mod.EventHandler diff --git a/src/main/java/com/arc/bloodarsenal/common/BloodArsenalConfig.java b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalConfig.java index 701ad78..bc24479 100644 --- a/src/main/java/com/arc/bloodarsenal/common/BloodArsenalConfig.java +++ b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalConfig.java @@ -29,14 +29,16 @@ public class BloodArsenalConfig public static boolean ritualDisabledEnchantment; // Block Settings - public static String[] blocksToBeDisabled = {}; + public static String[] blocksToBeDisabled; // Item Settings - public static String[] itemsToBeDisabled = {}; + public static String[] itemsToBeDisabled; - //ModSettings + //Mod Settings public static boolean baublesIntegration; public static boolean tinkersIntegration; + public static int bloodInfusedWoodID; + public static int bloodInfusedIronID; //LP Settings public static int sigilSwimmingCost; @@ -91,6 +93,8 @@ public class BloodArsenalConfig baublesIntegration = config.get(modSettings, "Enable Baubles integration?", true).getBoolean(baublesIntegration); tinkersIntegration = config.get(modSettings, "Enable TConstruct integration?", true).getBoolean(tinkersIntegration); + bloodInfusedWoodID = config.get(modSettings, "Material ID for Blood Infused Wood; Default: 250", 250).getInt(bloodInfusedWoodID); + bloodInfusedIronID = config.get(modSettings, "Material ID for Blood Infused Iron; Defualt: 251", 251).getInt(bloodInfusedIronID); sigilSwimmingCost = config.get(lpSettings, "Sigil of Swimming cost; Default: 150", 150).getInt(sigilSwimmingCost); sigilDivinityCost = config.get(lpSettings, "Sigil of Divinity cost; Default: 1000000", 1000000).getInt(sigilDivinityCost); diff --git a/src/main/java/com/arc/bloodarsenal/common/BloodArsenalRecipes.java b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalRecipes.java index 41ac515..bf549a7 100644 --- a/src/main/java/com/arc/bloodarsenal/common/BloodArsenalRecipes.java +++ b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalRecipes.java @@ -22,14 +22,13 @@ public class BloodArsenalRecipes AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModBlocks.blood_infused_wood), new ItemStack(Blocks.log), 2, 3000, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModBlocks.blood_infused_iron_block), new ItemStack(Blocks.iron_block), 3, 54000, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.item_blood_cake), new ItemStack(Items.cake), 3, 10000, 5, 5, false); - AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_infused_iron), new ItemStack(Items.iron_ingot), 2, 6000, 5, 5, false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_infused_iron), new ItemStack(Items.iron_ingot), 3, 6000, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_orange), new ItemStack(Items.dye, 1, 14), 1, 200, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_infused_diamond_active), new ItemStack(ModItems.blood_infused_diamond_unactive), 4, 80000, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.soul_fragment), new ItemStack(ModItems.heart), 4, 75000, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_cookie), new ItemStack(Items.cookie), 1, 2000, 5, 5, false); AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_infused_glowstone_dust), new ItemStack(Items.glowstone_dust), 3, 5000, 5, 5, false); - AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_ball), new ItemStack(Items.snowball), 2, 500, 5, 5, false); - AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_money), new ItemStack(Items.paper), 4, 10000, 5, 5, false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_money), new ItemStack(Items.paper), 3, 10000, 5, 5, false); } public static void registerBindingRecipes() @@ -39,7 +38,6 @@ public class BloodArsenalRecipes BindingRegistry.registerRecipe(new ItemStack(ModItems.bound_shears), new ItemStack(Items.shears)); BindingRegistry.registerRecipe(new ItemStack(ModItems.blood_infused_diamond_bound), new ItemStack(ModItems.blood_infused_diamond_active)); BindingRegistry.registerRecipe(new ItemStack(ModItems.bound_igniter), new ItemStack(Items.flint_and_steel)); - //Temporary if (BloodArsenal.isHalloween()) { BindingRegistry.registerRecipe(new ItemStack(ModItems.vampire_cape), new ItemStack(Items.leather_chestplate)); @@ -66,8 +64,8 @@ public class BloodArsenalRecipes addOreDictBloodOrbRecipe(new ItemStack(ModBlocks.blood_stained_ice, 8), "aaa", "aba", "aaa", 'a', Blocks.ice, 'b', apprenticeOrb); addOreDictBloodOrbRecipe(new ItemStack(ModBlocks.blood_stained_glass, 8), "aaa", "aba", "aaa", 'a', Blocks.glass, 'b', apprenticeOrb); - addOreDictBloodOrbRecipe(new ItemStack(ModBlocks.life_infuser), "aba", "aca", "ada", 'a', ModItems.blood_infused_iron, 'b', masterOrb, 'c', WayofTime.alchemicalWizardry.ModBlocks.blockAltar, 'd', new ItemStack(ModItems.blood_infused_diamond_bound)); - addOreDictBloodOrbRecipe(new ItemStack(ModBlocks.lp_materializer), "aba", "bcb", "aba", 'a', ModItems.blood_infused_iron, 'b', imbuedSlate, 'c', masterOrb); + addOreDictBloodOrbRecipe(new ItemStack(ModBlocks.life_infuser), "aba", "aca", "ada", 'a', ModItems.blood_infused_iron, 'b', magicianOrb, 'c', WayofTime.alchemicalWizardry.ModBlocks.blockAltar, 'd', Items.bucket); + addOreDictBloodOrbRecipe(new ItemStack(ModBlocks.lp_materializer), "aba", "bcb", "aba", 'a', ModItems.blood_infused_iron, 'b', imbuedSlate, 'c', magicianOrb); addOreDictBloodOrbRecipe(new ItemStack(ModBlocks.compacter), "aaa", "bcb", "ded", 'a', ModBlocks.blood_infused_planks, 'b', ModItems.blood_infused_diamond_bound, 'c', Blocks.piston, 'd', ModBlocks.blood_infused_iron_block, 'e', archmageOrb); addOreDictBloodOrbRecipe(new ItemStack(ModItems.blood_infused_axe_iron), "aaa", "aba", "cdc", 'a', ModItems.blood_infused_iron, 'b', ModItems.blood_infused_axe_wood, 'c', ModItems.amorphic_catalyst, 'd', magicianOrb); addOreDictBloodOrbRecipe(new ItemStack(ModItems.blood_infused_pickaxe_iron), "aaa", "aba", "cdc", 'a', ModItems.blood_infused_iron, 'b', ModItems.blood_infused_pickaxe_wood, 'c', ModItems.amorphic_catalyst, 'd', magicianOrb); diff --git a/src/main/java/com/arc/bloodarsenal/common/CommonProxy.java b/src/main/java/com/arc/bloodarsenal/common/CommonProxy.java index ea36c94..446e985 100644 --- a/src/main/java/com/arc/bloodarsenal/common/CommonProxy.java +++ b/src/main/java/com/arc/bloodarsenal/common/CommonProxy.java @@ -1,9 +1,6 @@ package com.arc.bloodarsenal.common; import com.arc.bloodarsenal.common.entity.EntityBloodTNT; -import com.arc.bloodarsenal.common.entity.mob.EntityBloodHound; -import com.arc.bloodarsenal.common.entity.projectile.EntityBloodBall; -import com.arc.bloodarsenal.common.entity.projectile.EntityGatlingProjectile; import com.arc.bloodarsenal.common.tinkers.IClientCode; import cpw.mods.fml.common.registry.EntityRegistry; import net.minecraft.world.World; @@ -31,9 +28,9 @@ public class CommonProxy public void registerEntityTrackers() { - EntityRegistry.registerModEntity(EntityGatlingProjectile.class, "gatlingProjectile", 0, BloodArsenal.instance, 128, 5, true); - EntityRegistry.registerModEntity(EntityBloodTNT.class, "bloodTNT", 1, BloodArsenal.instance, 64, 5, true); - EntityRegistry.registerModEntity(EntityBloodBall.class, "bloodBall", 2, BloodArsenal.instance, 128, 5, true); + int entityID = EntityRegistry.findGlobalUniqueEntityId(); + EntityRegistry.registerGlobalEntityID(EntityBloodTNT.class, "bloodTNT", entityID); + EntityRegistry.registerModEntity(EntityBloodTNT.class, "bloodTNT", entityID, BloodArsenal.instance, 64, 100, true); // EntityRegistry.registerModEntity(EntityBloodHound.class, "BloodHound", 3, BloodArsenal.instance, 96, 3, true); } diff --git a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTNT.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTNT.java index 5fe32c1..3dca310 100644 --- a/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTNT.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTNT.java @@ -4,7 +4,7 @@ import com.arc.bloodarsenal.common.entity.EntityBloodTNT; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; -import net.minecraft.block.material.Material; +import net.minecraft.block.BlockTNT; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; @@ -17,7 +17,7 @@ import net.minecraft.world.World; import java.util.Random; -public class BlockBloodTNT extends Block +public class BlockBloodTNT extends BlockTNT { @SideOnly(Side.CLIENT) private IIcon top; @@ -26,7 +26,7 @@ public class BlockBloodTNT extends Block public BlockBloodTNT() { - super(Material.tnt); + super(); setHardness(0.0F); setStepSound(soundTypeGrass); } @@ -80,7 +80,7 @@ public class BlockBloodTNT extends Block @Override public void onBlockDestroyedByPlayer(World par1World, int par2, int par3, int par4, int par5) { - spawnTNT(par1World, par2, par3, par4, par5, (EntityLivingBase) null); + spawnTNT(par1World, par2, par3, par4, par5, null); } public void spawnTNT(World par1World, int par2, int par3, int par4, int par5, EntityLivingBase par6EntityLivingBase) diff --git a/src/main/java/com/arc/bloodarsenal/common/block/fluid/MoltenBloodInfusedIron.java b/src/main/java/com/arc/bloodarsenal/common/block/fluid/MoltenBloodInfusedIron.java deleted file mode 100644 index 7521398..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/block/fluid/MoltenBloodInfusedIron.java +++ /dev/null @@ -1,62 +0,0 @@ -package com.arc.bloodarsenal.common.block.fluid; - -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.util.IIcon; -import net.minecraftforge.fluids.BlockFluidClassic; -import net.minecraftforge.fluids.Fluid; - -public class MoltenBloodInfusedIron extends BlockFluidClassic -{ - private IIcon stillIcon; - private IIcon flowingIcon; - private String stillIconTexture; - private String flowIconTexture; - - public MoltenBloodInfusedIron(Fluid fluid, String unlocalizedName, String stillIconTexture, String flowIconTexture) - { - super(fluid, Material.lava); - setResistance(100.0F); - setLightLevel(1.0F); - setCreativeTab(BloodArsenal.BA_TAB); - setBlockName(unlocalizedName); - - this.stillIconTexture = (BloodArsenal.MODID + ":" + stillIconTexture); - this.flowIconTexture = (BloodArsenal.MODID + ":" + flowIconTexture); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerBlockIcons(IIconRegister icon) - { - this.stillIcon = icon.registerIcon(this.stillIconTexture); - this.flowingIcon = icon.registerIcon(this.flowIconTexture); - - getFluid().setIcons(this.stillIcon, this.flowingIcon); - } - - public IIcon getStillIcon() - { - return this.stillIcon; - } - - public IIcon getFlowingIcon() - { - return this.flowingIcon; - } - - @Override - @SideOnly(Side.CLIENT) - public IIcon func_149735_b(int side, int meta) - { - if (side <= 1) - { - return this.stillIcon; - } - - return this.flowingIcon; - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/entity/EntityBloodTNT.java b/src/main/java/com/arc/bloodarsenal/common/entity/EntityBloodTNT.java index 7a03ab0..96cb8a1 100644 --- a/src/main/java/com/arc/bloodarsenal/common/entity/EntityBloodTNT.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/EntityBloodTNT.java @@ -35,18 +35,22 @@ public class EntityBloodTNT extends Entity tntPlacedBy = par8EntityLivingBase; } + @Override public void entityInit() {} + @Override public boolean canTriggerWalking() { return false; } + @Override public boolean canBeCollidedWith() { return !isDead; } + @Override public void onUpdate() { prevPosX = posX; @@ -84,16 +88,19 @@ public class EntityBloodTNT extends Entity worldObj.createExplosion(this, posX, posY, posZ, f, true); } + @Override protected void writeEntityToNBT(NBTTagCompound par1) { par1.setByte("Fuse", (byte) fuse); } + @Override protected void readEntityFromNBT(NBTTagCompound par1) { fuse = par1.getByte("Fuse"); } + @Override @SideOnly(Side.CLIENT) public float getShadowSize() { diff --git a/src/main/java/com/arc/bloodarsenal/common/entity/ModEntities.java b/src/main/java/com/arc/bloodarsenal/common/entity/ModEntities.java deleted file mode 100644 index 14e617e..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/entity/ModEntities.java +++ /dev/null @@ -1,11 +0,0 @@ -package com.arc.bloodarsenal.common.entity; - -public class ModEntities -{ - public static void init() - { - int id = 0; - - - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityBloodBall.java b/src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityBloodBall.java deleted file mode 100644 index b9f63f3..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityBloodBall.java +++ /dev/null @@ -1,65 +0,0 @@ -package com.arc.bloodarsenal.common.entity.projectile; - -import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.entity.projectile.EntityThrowable; -import net.minecraft.server.MinecraftServer; -import net.minecraft.util.DamageSource; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; - -public class EntityBloodBall extends EntityThrowable -{ - public EntityBloodBall(World world) - { - super(world); - } - - public EntityBloodBall(World world, EntityLivingBase entity) - { - super(world, entity); - } - - public EntityBloodBall(World world, double so, double me, double thing) - { - super(world, so, me, thing); - } - - protected void onImpact(MovingObjectPosition object) - { - if (object.entityHit != null) - { - byte b0 = 1; - - object.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), (float)b0); - EntityLivingBase thrower = this.getThrower(); - - if (thrower instanceof EntityPlayer) - { - String throwerName = thrower.getCommandSenderName(); - World worldSave = MinecraftServer.getServer().worldServers[0]; - LifeEssenceNetwork data = (LifeEssenceNetwork) worldSave.loadItemData(LifeEssenceNetwork.class, throwerName); - - if (data == null) - { - data = new LifeEssenceNetwork(throwerName); - worldSave.setItemData(throwerName, data); - } - - SoulNetworkHandler.addCurrentEssenceToMaximum(throwerName, 50, data.maxOrb); - } - } - - for (int i = 0; i < 8; ++i) - { - this.worldObj.spawnParticle("snowballpoof", this.posX, this.posY, this.posZ, 0.0D, 0.0D, 0.0D); - } - - if (!this.worldObj.isRemote) - { - this.setDead(); - } - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityGatlingProjectile.java b/src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityGatlingProjectile.java deleted file mode 100644 index c7f4992..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityGatlingProjectile.java +++ /dev/null @@ -1,501 +0,0 @@ -package com.arc.bloodarsenal.common.entity.projectile; - -import cpw.mods.fml.common.registry.IThrowableEntity; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.entity.Entity; -import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.IProjectile; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.util.*; -import net.minecraft.world.World; - -import java.util.Iterator; -import java.util.List; - -public class EntityGatlingProjectile extends Entity implements IProjectile, IThrowableEntity -{ - protected int xTile = -1; - protected int yTile = -1; - protected int zTile = -1; - protected int inTile = 0; - protected int inData = 0; - protected boolean inGround = false; - public EntityLivingBase shootingEntity; - protected int ticksInAir = 0; - protected int maxTicksInAir = 600; - private int ricochetCounter = 0; - private boolean scheduledForDeath = false; - protected int projectileDamage = 8; - - public EntityGatlingProjectile(World par1World) - { - super(par1World); - setSize(0.5F, 0.5F); - maxTicksInAir = 600; - } - - public EntityGatlingProjectile(World par1World, EntityLivingBase par2EntityPlayer, int damage) - { - super(par1World); - shootingEntity = par2EntityPlayer; - float par3 = 0.8F; - setSize(0.5F, 0.5F); - setLocationAndAngles(par2EntityPlayer.posX, par2EntityPlayer.posY + par2EntityPlayer.getEyeHeight(), par2EntityPlayer.posZ, par2EntityPlayer.rotationYaw, par2EntityPlayer.rotationPitch); - posX -= MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * 0.16F; - posY -= 0.2D; - posZ -= MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * 0.16F; - setPosition(posX, posY, posZ); - yOffset = 0.0F; - motionX = -MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI); - motionZ = MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI); - motionY = -MathHelper.sin(rotationPitch / 180.0F * (float) Math.PI); - setThrowableHeading(motionX, motionY, motionZ, par3 * 1.5F, 1.0F); - projectileDamage = damage; - maxTicksInAir = 600; - } - - public EntityGatlingProjectile(World par1World, EntityLivingBase par2EntityPlayer, int damage, int maxTicksInAir, double posX, double posY, double posZ, float rotationYaw, float rotationPitch) - { - super(par1World); - shootingEntity = par2EntityPlayer; - float par3 = 0.8F; - setSize(0.5F, 0.5F); - setLocationAndAngles(posX, posY, posZ, rotationYaw, rotationPitch); - posX -= MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * 0.16F; - posY -= 0.2D; - posZ -= MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * 0.16F; - setPosition(posX, posY, posZ); - yOffset = 0.0F; - motionX = -MathHelper.sin(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI); - motionZ = MathHelper.cos(rotationYaw / 180.0F * (float) Math.PI) * MathHelper.cos(rotationPitch / 180.0F * (float) Math.PI); - motionY = -MathHelper.sin(rotationPitch / 180.0F * (float) Math.PI); - setThrowableHeading(motionX, motionY, motionZ, par3 * 1.5F, 1.0F); - projectileDamage = damage; - } - - public EntityGatlingProjectile(World par1World, EntityLivingBase par2EntityLivingBase, EntityLivingBase par3EntityLivingBase, float par4, float par5, int damage, int maxTicksInAir) - { - super(par1World); - renderDistanceWeight = 10.0D; - shootingEntity = par2EntityLivingBase; - posY = par2EntityLivingBase.posY + (double) par2EntityLivingBase.getEyeHeight() - 0.10000000149011612D; - double d0 = par3EntityLivingBase.posX - par2EntityLivingBase.posX; - double d1 = par3EntityLivingBase.boundingBox.minY + (double) (par3EntityLivingBase.height / 1.5F) - posY; - double d2 = par3EntityLivingBase.posZ - par2EntityLivingBase.posZ; - double d3 = (double) MathHelper.sqrt_double(d0 * d0 + d2 * d2); - - if (d3 >= 1.0E-7D) - { - float f2 = (float) (Math.atan2(d2, d0) * 180.0D / Math.PI) - 90.0F; - float f3 = (float) (-(Math.atan2(d1, d3) * 180.0D / Math.PI)); - double d4 = d0 / d3; - double d5 = d2 / d3; - setLocationAndAngles(par2EntityLivingBase.posX + d4, posY, par2EntityLivingBase.posZ + d5, f2, f3); - yOffset = 0.0F; - float f4 = (float) d3 * 0.2F; - setThrowableHeading(d0, d1, d2, par4, par5); - } - - projectileDamage = damage; - } - - @Override - protected void entityInit() - { - dataWatcher.addObject(16, 0); - } - - @Override - public void setThrowableHeading(double var1, double var3, double var5, float var7, float var8) - { - float var9 = MathHelper.sqrt_double(var1 * var1 + var3 * var3 + var5 * var5); - var1 /= var9; - var3 /= var9; - var5 /= var9; - var1 += rand.nextGaussian() * 0.007499999832361937D * var8; - var3 += rand.nextGaussian() * 0.007499999832361937D * var8; - var5 += rand.nextGaussian() * 0.007499999832361937D * var8; - var1 *= var7; - var3 *= var7; - var5 *= var7; - motionX = var1; - motionY = var3; - motionZ = var5; - float var10 = MathHelper.sqrt_double(var1 * var1 + var5 * var5); - prevRotationYaw = rotationYaw = (float) (Math.atan2(var1, var5) * 180.0D / Math.PI); - prevRotationPitch = rotationPitch = (float) (Math.atan2(var3, var10) * 180.0D / Math.PI); - } - - @Override - @SideOnly(Side.CLIENT) - public void setPositionAndRotation2(double par1, double par3, double par5, float par7, float par8, int par9) - { - setPosition(par1, par3, par5); - setRotation(par7, par8); - } - - @Override - @SideOnly(Side.CLIENT) - public void setVelocity(double par1, double par3, double par5) - { - motionX = par1; - motionY = par3; - motionZ = par5; - - if (prevRotationPitch == 0.0F && prevRotationYaw == 0.0F) - { - float var7 = MathHelper.sqrt_double(par1 * par1 + par5 * par5); - prevRotationYaw = rotationYaw = (float) (Math.atan2(par1, par5) * 180.0D / Math.PI); - prevRotationPitch = rotationPitch = (float) (Math.atan2(par3, var7) * 180.0D / Math.PI); - prevRotationPitch = rotationPitch; - prevRotationYaw = rotationYaw; - setLocationAndAngles(posX, posY, posZ, rotationYaw, rotationPitch); - } - } - - @Override - public void onUpdate() - { - super.onUpdate(); - - if (ticksInAir > maxTicksInAir) - { - setDead(); - } - - if (shootingEntity == null) - { - List players = worldObj.getEntitiesWithinAABB(EntityPlayer.class, AxisAlignedBB.getBoundingBox(posX - 1, posY - 1, posZ - 1, posX + 1, posY + 1, posZ + 1)); - Iterator i = players.iterator(); - double closestDistance = Double.MAX_VALUE; - EntityPlayer closestPlayer = null; - - while (i.hasNext()) - { - EntityPlayer e = (EntityPlayer) i.next(); - double distance = e.getDistanceToEntity(this); - - if (distance < closestDistance) - { - closestPlayer = e; - } - } - - if (closestPlayer != null) - { - shootingEntity = closestPlayer; - } - } - - if (prevRotationPitch == 0.0F && prevRotationYaw == 0.0F) - { - float var1 = MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ); - prevRotationYaw = rotationYaw = (float) (Math.atan2(motionX, motionZ) * 180.0D / Math.PI); - prevRotationPitch = rotationPitch = (float) (Math.atan2(motionY, var1) * 180.0D / Math.PI); - } - - Block var16 = worldObj.getBlock(xTile, yTile, zTile); - - if (var16 != null) - { - var16.setBlockBoundsBasedOnState(worldObj, xTile, yTile, zTile); - AxisAlignedBB var2 = var16.getCollisionBoundingBoxFromPool(worldObj, xTile, yTile, zTile); - - if (var2 != null && var2.isVecInside(Vec3.createVectorHelper(posX, posY, posZ))) - { - inGround = true; - } - } - - if (inGround) - { - Block var18 = worldObj.getBlock(xTile, yTile, zTile); - int var19 = worldObj.getBlockMetadata(xTile, yTile, zTile); - - if (var18.equals(Block.getBlockById(inTile)) && var19 == inData){} - } - else - { - ++ticksInAir; - - if (ticksInAir > 1 && ticksInAir < 3) - { - for (int particles = 0; particles < 3; particles++) - { - doFiringParticles(); - } - } - - Vec3 var17 = Vec3.createVectorHelper(posX, posY, posZ); - Vec3 var3 = Vec3.createVectorHelper(posX + motionX, posY + motionY, posZ + motionZ); - MovingObjectPosition var4 = worldObj.func_147447_a(var17, var3, true, false, false); - var17 = Vec3.createVectorHelper(posX, posY, posZ); - var3 = Vec3.createVectorHelper(posX + motionX, posY + motionY, posZ + motionZ); - - if (var4 != null) - { - var3 = Vec3.createVectorHelper(var4.hitVec.xCoord, var4.hitVec.yCoord, var4.hitVec.zCoord); - } - - Entity var5 = null; - List var6 = worldObj.getEntitiesWithinAABBExcludingEntity(this, boundingBox.addCoord(motionX, motionY, motionZ).expand(1.0D, 1.0D, 1.0D)); - double var7 = 0.0D; - Iterator var9 = var6.iterator(); - float var11; - - while (var9.hasNext()) - { - Entity var10 = (Entity) var9.next(); - - if (var10.canBeCollidedWith() && (var10 != shootingEntity || ticksInAir >= 5)) - { - var11 = 0.3F; - AxisAlignedBB var12 = var10.boundingBox.expand(var11, var11, var11); - MovingObjectPosition var13 = var12.calculateIntercept(var17, var3); - - if (var13 != null) - { - double var14 = var17.distanceTo(var13.hitVec); - - if (var14 < var7 || var7 == 0.0D) - { - var5 = var10; - var7 = var14; - } - } - } - } - - if (var5 != null) - { - var4 = new MovingObjectPosition(var5); - } - - if (var4 != null) - { - onImpact(var4); - - if (scheduledForDeath) - { - setDead(); - } - } - - posX += motionX; - posY += motionY; - posZ += motionZ; - MathHelper.sqrt_double(motionX * motionX + motionZ * motionZ); - setPosition(posX, posY, posZ); - } - } - - public void doFiringParticles() - { - worldObj.spawnParticle("mobSpellAmbient", posX + smallGauss(0.1D), posY + smallGauss(0.1D), posZ + smallGauss(0.1D), 0.5D, 0.5D, 0.5D); - worldObj.spawnParticle("flame", posX, posY, posZ, gaussian(motionX), gaussian(motionY), gaussian(motionZ)); - } - - @Override - public void writeEntityToNBT(NBTTagCompound par1NBTTagCompound) - { - par1NBTTagCompound.setShort("xTile", (short) xTile); - par1NBTTagCompound.setShort("yTile", (short) yTile); - par1NBTTagCompound.setShort("zTile", (short) zTile); - par1NBTTagCompound.setByte("inTile", (byte) inTile); - par1NBTTagCompound.setByte("inData", (byte) inData); - par1NBTTagCompound.setByte("inGround", (byte) (inGround ? 1 : 0)); - par1NBTTagCompound.setInteger("ticksInAir", ticksInAir); - par1NBTTagCompound.setInteger("maxTicksInAir", maxTicksInAir); - par1NBTTagCompound.setInteger("projectileDamage", projectileDamage); - } - - @Override - public void readEntityFromNBT(NBTTagCompound par1NBTTagCompound) - { - xTile = par1NBTTagCompound.getShort("xTile"); - yTile = par1NBTTagCompound.getShort("yTile"); - zTile = par1NBTTagCompound.getShort("zTile"); - inTile = par1NBTTagCompound.getByte("inTile") & 255; - inData = par1NBTTagCompound.getByte("inData") & 255; - inGround = par1NBTTagCompound.getByte("inGround") == 1; - ticksInAir = par1NBTTagCompound.getInteger("ticksInAir"); - maxTicksInAir = par1NBTTagCompound.getInteger("maxTicksInAir"); - projectileDamage = par1NBTTagCompound.getInteger("projectileDamage"); - } - - @Override - protected boolean canTriggerWalking() - { - return false; - } - - @Override - @SideOnly(Side.CLIENT) - public float getShadowSize() - { - return 0.0F; - } - - @Override - public boolean canAttackWithItem() - { - return false; - } - - public void onImpact(MovingObjectPosition mop) - { - if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.ENTITY && mop.entityHit != null) - { - if (mop.entityHit == shootingEntity) - { - return; - } - - onImpact(mop.entityHit); - } - else if (mop.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) - { - groundImpact(mop.sideHit); - worldObj.createExplosion(shootingEntity, posX, posY, posZ, (float) 0.2, true); - } - } - - public void onImpact(Entity mop) - { - if (mop == shootingEntity && ticksInAir > 3) - { - shootingEntity.attackEntityFrom(DamageSource.causeMobDamage(shootingEntity), 1); - setDead(); - } - else - { - doDamage(projectileDamage + d6(), mop); - worldObj.createExplosion(shootingEntity, posX, posY, posZ, (float) 0.2, true); - } - - spawnHitParticles("magicCrit", 8); - setDead(); - } - - private int d6() - { - return rand.nextInt() + 5; - } - - protected void spawnHitParticles(String string, int i) - { - for (int particles = 0; particles < i; particles++) - { - worldObj.spawnParticle(string, posX, posY - (string == "portal" ? 1 : 0), posZ, gaussian(motionX), gaussian(motionY), gaussian(motionZ)); - } - } - - protected void doDamage(int i, Entity mop) - { - mop.attackEntityFrom(getDamageSource(), i); - } - - public DamageSource getDamageSource() - { - return DamageSource.causeMobDamage(shootingEntity); - } - - public void groundImpact(int sideHit) - { - ricochet(sideHit); - } - - public double smallGauss(double d) - { - return (worldObj.rand.nextFloat() - 0.5D) * d; - } - - public double gaussian(double d) - { - return d + d * ((rand.nextFloat() - 0.5D) / 4); - } - - private void ricochet(int sideHit) - { - switch (sideHit) - { - case 0: - case 1: - // topHit, bottomHit, reflect Y - motionY = motionY * -1; - break; - - case 2: - case 3: - // westHit, eastHit, reflect Z - motionZ = motionZ * -1; - break; - - case 4: - case 5: - // southHit, northHit, reflect X - motionX = motionX * -1; - break; - } - - ricochetCounter++; - - if (ricochetCounter > getRicochetMax()) - { - scheduledForDeath = true; - - for (int particles = 0; particles < 4; particles++) - { - switch (sideHit) - { - case 0: - worldObj.spawnParticle("smoke", posX, posY, posZ, gaussian(0.1D), -gaussian(0.1D), gaussian(0.1D)); - break; - - case 1: - worldObj.spawnParticle("smoke", posX, posY, posZ, gaussian(0.1D), gaussian(0.1D), gaussian(0.1D)); - break; - - case 2: - worldObj.spawnParticle("smoke", posX, posY, posZ, gaussian(0.1D), gaussian(0.1D), -gaussian(0.1D)); - break; - - case 3: - worldObj.spawnParticle("smoke", posX, posY, posZ, gaussian(0.1D), gaussian(0.1D), gaussian(0.1D)); - break; - - case 4: - worldObj.spawnParticle("smoke", posX, posY, posZ, -gaussian(0.1D), gaussian(0.1D), gaussian(0.1D)); - break; - - case 5: - worldObj.spawnParticle("smoke", posX, posY, posZ, gaussian(0.1D), gaussian(0.1D), gaussian(0.1D)); - break; - } - } - } - } - - private int getRicochetMax() - { - return 3; - } - - @Override - public Entity getThrower() - { - return shootingEntity; - } - - @Override - public void setThrower(Entity entity) - { - if (entity instanceof EntityLivingBase) - { - shootingEntity = (EntityLivingBase) entity; - } - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGuiFactory.java b/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGuiFactory.java index cedd9cf..e38bc52 100644 --- a/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGuiFactory.java +++ b/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGuiFactory.java @@ -8,7 +8,6 @@ import java.util.Set; public class ConfigGuiFactory implements IModGuiFactory { - @Override public void initialize(Minecraft minecraftInstance) {} diff --git a/src/main/java/com/arc/bloodarsenal/common/items/BucketHandler.java b/src/main/java/com/arc/bloodarsenal/common/items/BucketHandler.java deleted file mode 100644 index 4db0d33..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/items/BucketHandler.java +++ /dev/null @@ -1,115 +0,0 @@ -package com.arc.bloodarsenal.common.items; - -import cpw.mods.fml.common.eventhandler.Event; -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.block.Block; -import net.minecraft.init.Blocks; -import net.minecraft.item.ItemStack; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; -import net.minecraftforge.event.entity.player.FillBucketEvent; -import net.minecraftforge.fluids.FluidContainerRegistry; -import net.minecraftforge.fluids.FluidRegistry; -import net.minecraftforge.fluids.FluidStack; - -import java.util.HashMap; -import java.util.Map; - -public class BucketHandler -{ - private static BucketHandler INSTANCE = new BucketHandler(); - private static HashMap FILLED_BUCKETS = new HashMap(); - - public static BucketHandler getInstance() - { - return INSTANCE; - } - - public static void addBuckets() - { - MoltenBucket bucket = new MoltenBucket(null); - GameRegistry.registerItem(bucket, "extra.bucket"); - - int bucketVol = 1000; - ItemStack emptyBucketStack = FluidContainerRegistry.EMPTY_BUCKET.copy(); - - - - FluidStack fluidStack = FluidRegistry.getFluidStack("molten.blood.infused.iron", bucketVol); - - if (fluidStack != null) - { - int bucketId = 1; - - bucket.addTextureMapping(bucketId, fluidStack.getFluid().getName(), "bucket_fill_blood_infused_iron"); - - ItemStack bucketStack = new ItemStack(bucket, 1, bucketId); - - FILLED_BUCKETS.put(fluidStack.getFluid().getBlock(), bucketStack); - - FluidContainerRegistry.registerFluidContainer(fluidStack, bucketStack, emptyBucketStack); - } - } - - public void fillEvent(FillBucketEvent event) - { - World world = event.world; - MovingObjectPosition pos = event.target; - - Block block = world.getBlock(pos.blockX, pos.blockY, pos.blockZ); - - ItemStack bucketStack = getFilledBucket(block); - - if (bucketStack == null) - { - return; - } - - world.setBlockToAir(pos.blockX, pos.blockY, pos.blockZ); - - event.result = bucketStack; - event.setResult(Event.Result.ALLOW); - } - - public static HashMap getAllBuckets() - { - return FILLED_BUCKETS; - } - - public static ItemStack getFilledBucket(Block fluidBlock) - { - return FILLED_BUCKETS.get(fluidBlock); - } - - public static ItemStack getFilledBucket(String fluidName) - { - Block fluidBlock = FluidRegistry.getFluid(fluidName).getBlock(); - return FILLED_BUCKETS.get(fluidBlock).copy(); - } - - public static boolean isAvailableBucket(int fluidBlockId) - { - return FILLED_BUCKETS.containsKey(Integer.valueOf(fluidBlockId)); - } - - public static boolean isAvailableBucket(String fluidName) - { - Block fluidBlock = FluidRegistry.getFluid(fluidName).getBlock(); - return FILLED_BUCKETS.containsKey(fluidBlock); - } - - public static Block getBlock(ItemStack bucketStack) - { - Block block = Blocks.air; - for (Map.Entry entry : FILLED_BUCKETS.entrySet()) - { - ItemStack stack = entry.getValue(); - if (stack.isItemEqual(bucketStack)) - { - block = entry.getKey(); - break; - } - } - return block; - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodBall.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodBall.java deleted file mode 100644 index c15c814..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodBall.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.arc.bloodarsenal.common.items; - -import com.arc.bloodarsenal.common.BloodArsenal; -import com.arc.bloodarsenal.common.entity.projectile.EntityBloodBall; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.world.World; - -public class ItemBloodBall extends Item -{ - public ItemBloodBall() - { - setUnlocalizedName("blood_ball"); - setTextureName("BloodArsenal:blood_ball"); - setMaxStackSize(16); - setCreativeTab(BloodArsenal.BA_TAB); - } - - @Override - public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) - { - if (!player.capabilities.isCreativeMode) - { - --itemStack.stackSize; - } - - world.playSoundAtEntity(player, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); - - if (!world.isRemote) - { - world.spawnEntityInWorld(new EntityBloodBall(world, player)); - } - - return itemStack; - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodMoney.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodMoney.java index f4f7a14..6d9f87e 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodMoney.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodMoney.java @@ -21,7 +21,7 @@ import java.util.List; public class ItemBloodMoney extends Item { - private static final int[] MONEY_MULTIPLIER = new int[]{1, 4, 16, 64}; + private final int[] MONEY_MULTIPLIER = new int[]{1, 4, 16, 64}; @SideOnly(Side.CLIENT) private IIcon[] icons; diff --git a/src/main/java/com/arc/bloodarsenal/common/items/ModItems.java b/src/main/java/com/arc/bloodarsenal/common/items/ModItems.java index b2c2fc7..0e0fad6 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/ModItems.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ModItems.java @@ -57,14 +57,12 @@ public class ModItems public static Item vampire_greaves; public static Item vampire_boots; public static Item vampire_ring; - public static Item energy_gatling; public static Item sigil_of_swimming; public static Item sigil_of_ender; public static Item blood_infused_glowstone_dust; public static Item self_sacrifice_amulet; public static Item sacrifice_amulet; public static Item sigil_of_divinity; - public static Item blood_ball; public static Item wolf_hide; public static Item blood_money; public static Item blood_burned_string; @@ -125,12 +123,10 @@ public class ModItems vampire_cape = registerItem(new VampireCostume(1), "vampire_cape"); vampire_greaves = registerItem(new VampireCostume(2), "vampire_greaves"); vampire_boots = registerItem(new VampireCostume(3), "vampire_boots"); - energy_gatling = registerItem(new EnergyGatling(), "energy_gatling"); sigil_of_swimming = registerItem(new SigilSwimming(), "sigil_of_swimming"); sigil_of_ender = registerItem(new SigilEnder(), "sigil_of_ender"); blood_infused_glowstone_dust = registerItem(new ItemBloodArsenal(), "blood_infused_glowstone_dust"); sigil_of_divinity = registerItem(new SigilDivinity(), "sigil_of_divinity"); - blood_ball = registerItem(new ItemBloodBall(), "blood_ball"); wolf_hide = registerItem(new ItemBloodArsenal(), "wolf_hide"); blood_money = registerItem(new ItemBloodMoney(), "blood_money"); blood_burned_string = registerItem(new ItemReed(ModBlocks.block_burned_string), "blood_burned_string"); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/MoltenBucket.java b/src/main/java/com/arc/bloodarsenal/common/items/MoltenBucket.java deleted file mode 100644 index d537fb2..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/items/MoltenBucket.java +++ /dev/null @@ -1,249 +0,0 @@ -package com.arc.bloodarsenal.common.items; - -import com.arc.bloodarsenal.common.BloodArsenal; -import com.google.common.collect.HashBiMap; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.init.Blocks; -import net.minecraft.init.Items; -import net.minecraft.item.Item; -import net.minecraft.item.ItemBucket; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.MovingObjectPosition; -import net.minecraft.world.World; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class MoltenBucket extends ItemBucket -{ - private IIcon _filling = null; - private Block _fluidBlock = null; - private int _capacity = 1000; - private HashBiMap fluidNames = HashBiMap.create(); - private HashMap textures = new HashMap(); - private HashMap icons = new HashMap(); - protected static final String pathToTextures = BloodArsenal.MODID + ":" + "bucket/"; - - - public MoltenBucket(Block fluidBlock) - { - super(fluidBlock); - this._fluidBlock = fluidBlock; - setUnlocalizedName("extratic.bucket"); - setCreativeTab(BloodArsenal.BA_TAB ); - setContainerItem(Items.bucket); - setTextureName("minecraft:bucket_empty"); - setMaxDamage(0); - setHasSubtypes(true); - } - - @Override - @SideOnly(Side.CLIENT) - public boolean requiresMultipleRenderPasses() - { - return true; - } - - @Override - public int getRenderPasses(int damage) - { - return 2; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister register) - { - this.itemIcon = register.registerIcon(getIconString()); - - - this._filling = register.registerIcon(pathToTextures + "bucket_fill_fblood_infused_iron"); - - for (Map.Entry entry : this.textures.entrySet()) - { - IIcon filling = register.registerIcon(pathToTextures + entry.getValue()); - - this.icons.put(entry.getKey(), filling); - } - } - - @Override - public IIcon getIcon(ItemStack itemStack, int pass) - { - int index = itemStack.getItemDamage(); - - if ((pass == 0) || (index <= 0)) - { - - return this.itemIcon; - } - - IIcon icon = this.icons.get(Integer.valueOf(index)); - - if (icon != null) - { - return icon; - } - - return this.itemIcon; - } - - @Override - public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) - { - if ((itemStack == null) || (itemStack.getItem() != this)) - { - return itemStack; - } - - int index = itemStack.getItemDamage(); - String fluidName = this.fluidNames.get(Integer.valueOf(index)); - - if (fluidName == null) - { - return itemStack; - } - - Block block = BucketHandler.getBlock(itemStack); - - boolean isAir = block == null; - - MovingObjectPosition movingobjectposition = getMovingObjectPositionFromPlayer(world, player, isAir); - - if (movingobjectposition == null) - { - return itemStack; - } - - if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) - { - int xCoord = movingobjectposition.blockX; - int yCoord = movingobjectposition.blockY; - int zCoord = movingobjectposition.blockZ; - - if (!world.canMineBlock(player, xCoord, yCoord, zCoord)) - { - return itemStack; - } - - if (block == Blocks.air) - { - return new ItemStack(getContainerItem()); - } - - if (movingobjectposition.sideHit == 0) - { - yCoord--; - } - - if (movingobjectposition.sideHit == 1) - { - yCoord++; - } - - if (movingobjectposition.sideHit == 2) - { - zCoord--; - } - - if (movingobjectposition.sideHit == 3) - { - zCoord++; - } - - if (movingobjectposition.sideHit == 4) - { - xCoord--; - } - - if (movingobjectposition.sideHit == 5) - { - xCoord++; - } - - if (!player.canPlayerEdit(xCoord, yCoord, zCoord, movingobjectposition.sideHit, itemStack)) - { - return itemStack; - } - Material material = world.getBlock(xCoord, yCoord, zCoord).getMaterial(); - - if (world.isAirBlock(xCoord, yCoord, zCoord) && !material.isSolid()) - { - if (!world.isRemote && !material.isSolid() && !material.isLiquid()) - { - world.func_147480_a(xCoord, yCoord, zCoord, true); - } - - world.setBlock(xCoord, yCoord, zCoord, block, 0, 3); - - if (!player.capabilities.isCreativeMode) - { - return new ItemStack(getContainerItem()); - } - } - } - return itemStack; - } - - @Override - public boolean tryPlaceContainedLiquid(World world, int xCoord, int yCoord, int zCoord) - { - return false; - } - - public void setCapcity(int capacity) - { - this._capacity = capacity; - } - - @Override - public String getUnlocalizedName(ItemStack itemStack) - { - if (itemStack == null) - { - return getUnlocalizedName(); - } - - int index = itemStack.getItemDamage(); - String fluidName = this.fluidNames.get(Integer.valueOf(index)); - - if (fluidName == null) - { - return getUnlocalizedName(); - } - - return "item.ba.bucket.filled." + fluidName; - } - - public void addTextureMapping(int id, String fluidName, String texture) - { - this.fluidNames.put(id, fluidName); - this.textures.put(id, texture); - } - - @Override - public void getSubItems(Item item, CreativeTabs tab, List itemStackList) - { - if (!this.fluidNames.isEmpty()) - { - for (Map.Entry subItem : this.fluidNames.entrySet()) - { - int entryId = subItem.getKey().intValue(); - ItemStack bucketStack = new ItemStack(this, 1, entryId); - itemStackList.add(bucketStack); - } - } - else - { - itemStackList.add(new ItemStack(this, 1, 0)); - } - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/items/armor/VampireCostume.java b/src/main/java/com/arc/bloodarsenal/common/items/armor/VampireCostume.java index 6d70004..c0edd80 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/armor/VampireCostume.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/armor/VampireCostume.java @@ -21,11 +21,14 @@ import net.minecraft.world.World; public class VampireCostume extends ItemArmor { - private static IIcon chestIcon; - private static IIcon leggingsIcon; - private static IIcon bootsIcon; + @SideOnly(Side.CLIENT) + private IIcon chestIcon; + @SideOnly(Side.CLIENT) + private IIcon leggingsIcon; + @SideOnly(Side.CLIENT) + private IIcon bootsIcon; - private static final boolean tryComplexRendering = true; + private boolean tryComplexRendering = true; public VampireCostume(int armorType) { diff --git a/src/main/java/com/arc/bloodarsenal/common/items/book/BloodBurnedTome.java b/src/main/java/com/arc/bloodarsenal/common/items/book/BloodBurnedTome.java new file mode 100644 index 0000000..9f27e51 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/common/items/book/BloodBurnedTome.java @@ -0,0 +1,30 @@ +package com.arc.bloodarsenal.common.items.book; + +import WayofTime.alchemicalWizardry.api.items.ShapelessBloodOrbRecipe; +import amerifrance.guideapi.api.GuideRegistry; +import amerifrance.guideapi.api.abstraction.CategoryAbstract; +import amerifrance.guideapi.api.base.Book; +import amerifrance.guideapi.api.util.BookBuilder; +import com.arc.bloodarsenal.common.items.ModItems; +import cpw.mods.fml.common.registry.GameRegistry; +import net.minecraft.item.ItemStack; +import net.minecraftforge.oredict.OreDictionary; + +import java.util.ArrayList; +import java.util.List; + +public class BloodBurnedTome +{ + public static Book burnedTome; + public static List categories = new ArrayList(); + private final static String R_LOC = "BloodArsenal:book/images/"; + + public static void registerTome() + { + BookBuilder bookBuilder = new BookBuilder(); + bookBuilder.setCategories(categories).setUnlocBookTitle("guide.bloodArsenal.book.title").setUnlocWelcomeMessage("guide.bloodArsenal.book.welcomeMessage").setUnlocDisplayName("guide.bloodArsenal.book.name").setAuthor("An Arc Mage").setItemTexture("BloodArsenal:textures/items/burned_tome"); + burnedTome = bookBuilder.build(); + GuideRegistry.registerBook(burnedTome); + GameRegistry.addRecipe(new ShapelessBloodOrbRecipe(GuideRegistry.getItemStackForBook(burnedTome), ModItems.glass_shard, new ItemStack(WayofTime.alchemicalWizardry.ModItems.apprenticeBloodOrb, 1, OreDictionary.WILDCARD_VALUE))); + } +} diff --git a/src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java b/src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java index 3814160..8a5bfa0 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java @@ -44,11 +44,11 @@ public class TransparentOrb extends EnergyBattery return; } - int maxEssence = this.getMaxEssence(); - int section = maxEssence / 23; + int maxEssence = SoulNetworkHandler.getMaximumForOrbTier(SoulNetworkHandler.getCurrentMaxOrb(SoulNetworkHandler.getOwnerName(itemStack))); + int section = maxEssence / 44; int currentEssence = SoulNetworkHandler.getCurrentEssence(SoulNetworkHandler.getOwnerName(itemStack)); - if (currentEssence != 0) + if (currentEssence > 0) { int metaToBe = (currentEssence / section); itemStack.setItemDamage(metaToBe); diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundBow.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundBow.java index 9c7c14a..fad4d08 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundBow.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundBow.java @@ -27,11 +27,16 @@ import java.util.List; public class BoundBow extends ItemBow implements IBindable { - private static IIcon active; - private static IIcon active_1; - private static IIcon active_2; - private static IIcon active_3; - private static IIcon passive; + @SideOnly(Side.CLIENT) + private IIcon active; + @SideOnly(Side.CLIENT) + private IIcon active_1; + @SideOnly(Side.CLIENT) + private IIcon active_2; + @SideOnly(Side.CLIENT) + private IIcon active_3; + @SideOnly(Side.CLIENT) + private IIcon passive; private int energyUsed; @@ -319,4 +324,10 @@ public class BoundBow extends ItemBow implements IBindable return passive; } } + + @Override + public boolean isItemTool(ItemStack stack) + { + return true; + } } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundIgniter.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundIgniter.java index 4c6b622..a2d9208 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundIgniter.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundIgniter.java @@ -22,9 +22,11 @@ import java.util.List; public class BoundIgniter extends Item implements IBindable { private int energyUsed; - - private static IIcon active; - private static IIcon passive; + + @SideOnly(Side.CLIENT) + private IIcon active; + @SideOnly(Side.CLIENT) + private IIcon passive; public BoundIgniter() { @@ -167,7 +169,6 @@ public class BoundIgniter extends Item implements IBindable } par1ItemStack.setItemDamage(0); - return; } public void setActivated(ItemStack par1ItemStack, boolean newActivated) diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundShears.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundShears.java index c37ee6e..d55f7ec 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundShears.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundShears.java @@ -33,8 +33,10 @@ public class BoundShears extends ItemShears implements IBindable { private int energyUsed; - private static IIcon active; - private static IIcon passive; + @SideOnly(Side.CLIENT) + private IIcon active; + @SideOnly(Side.CLIENT) + private IIcon passive; public BoundShears() { @@ -287,6 +289,5 @@ public class BoundShears extends ItemShears implements IBindable } par1ItemStack.setItemDamage(0); - return; } } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/EnergyGatling.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/EnergyGatling.java deleted file mode 100644 index 8682b3a..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/EnergyGatling.java +++ /dev/null @@ -1,196 +0,0 @@ -package com.arc.bloodarsenal.common.items.tool; - -import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.common.BloodArsenal; -import com.arc.bloodarsenal.common.entity.projectile.EntityGatlingProjectile; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.Entity; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; -import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; -import net.minecraft.world.World; - -import java.util.List; - -public class EnergyGatling extends EnergyItems implements IBindable -{ - private int energyUsed; - - private static IIcon activeIcon; - private static IIcon passiveIcon; - - private static int damage; - - public EnergyGatling() - { - super(); - setMaxStackSize(1); - setUnlocalizedName("energy_gatling"); - setCreativeTab(BloodArsenal.BA_TAB); - setEnergyUsed(200); - setFull3D(); - } - - public void setEnergyUsed(int i) - { - energyUsed = i; - } - - public int getEnergyUsed() - { - return energyUsed; - } - - @Override - public boolean isFull3D() - { - return true; - } - - @Override - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) - { - EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); - - if (par3EntityPlayer.isSneaking()) - { - setActivated(par1ItemStack, !getActivated(par1ItemStack)); - par1ItemStack.stackTagCompound.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 100); - return par1ItemStack; - } - - if (!getActivated(par1ItemStack)) - { - return par1ItemStack; - } - - if (!par3EntityPlayer.capabilities.isCreativeMode) - { - syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()); - } - - if (!par2World.isRemote) - { - par2World.spawnEntityInWorld(new EntityGatlingProjectile(par2World, par3EntityPlayer, damage)); - } - - par2World.playSoundAtEntity(par3EntityPlayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); - - return par1ItemStack; - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - itemIcon = iconRegister.registerIcon("BloodArsenal:energy_gatling"); - activeIcon = iconRegister.registerIcon("BloodArsenal:energy_gatling"); - passiveIcon = iconRegister.registerIcon("AlchemicalWizardry:SheathedItem"); - } - - @Override - public IIcon getIcon(ItemStack stack, int renderPass, EntityPlayer player, ItemStack usingItem, int useRemaining) - { - if (stack.stackTagCompound == null) - { - stack.setTagCompound(new NBTTagCompound()); - } - - NBTTagCompound tag = stack.stackTagCompound; - - if (tag.getBoolean("isActive")) - { - return activeIcon; - } - else - { - return passiveIcon; - } - } - - public void setActivated(ItemStack par1ItemStack, boolean newActivated) - { - NBTTagCompound itemTag = par1ItemStack.stackTagCompound; - - if (itemTag == null) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - itemTag.setBoolean("isActive", newActivated); - } - - public boolean getActivated(ItemStack par1ItemStack) - { - NBTTagCompound itemTag = par1ItemStack.stackTagCompound; - - if (itemTag == null) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - return itemTag.getBoolean("isActive"); - } - - @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) - { - par3List.add(StatCollector.translateToLocal("tooltip.tool.energy_gatling")); - - if (!(par1ItemStack.stackTagCompound == null)) - { - if (par1ItemStack.stackTagCompound.getBoolean("isActive")) - { - par3List.add("Activated"); - } else - { - par3List.add("Deactivated"); - } - - if (!par1ItemStack.stackTagCompound.getString("ownerName").equals("")) - { - par3List.add("Current owner: " + par1ItemStack.stackTagCompound.getString("ownerName")); - } - } - } - - @Override - public void onUpdate(ItemStack par1ItemStack, World par2World, Entity par3Entity, int par4, boolean par5) - { - if (!(par3Entity instanceof EntityPlayer)) - { - return; - } - - EntityPlayer par3EntityPlayer = (EntityPlayer) par3Entity; - - if (par1ItemStack.stackTagCompound == null) - { - par1ItemStack.setTagCompound(new NBTTagCompound()); - } - - if (par2World.getWorldTime() % 100 == par1ItemStack.stackTagCompound.getInteger("worldTimeDelay") && par1ItemStack.stackTagCompound.getBoolean("isActive")) - { - if (!par3EntityPlayer.capabilities.isCreativeMode) - { - EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 500); - } - } - - if (par1ItemStack.stackTagCompound.getBoolean("isActive")) - { - if (par3EntityPlayer.getActivePotionEffect(Potion.moveSlowdown) != null) - { - par3EntityPlayer.removePotionEffect(Potion.moveSlowdown.id); - } - par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.moveSlowdown.id, 2, 1)); - } - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/ToolCapabilities.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/ToolCapabilities.java index 9f91c2b..87da55c 100644 --- a/src/main/java/com/arc/bloodarsenal/common/items/tool/ToolCapabilities.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/ToolCapabilities.java @@ -17,8 +17,6 @@ import java.util.Arrays; public final class ToolCapabilities { - public int count; - public static Material[] materialsPick = new Material[]{ Material.rock, Material.iron, Material.ice, Material.glass, Material.piston, Material.anvil }; public static Material[] materialsShovel = new Material[]{ Material.grass, Material.ground, Material.sand, Material.snow, Material.craftedSnow, Material.clay }; public static Material[] materialsAxe = new Material[]{ Material.coral, Material.leaves, Material.plants, Material.wood }; diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalModifiers.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalModifiers.java index d49eb51..11ffb85 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalModifiers.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalModifiers.java @@ -6,11 +6,6 @@ import tconstruct.library.crafting.ModifyBuilder; public class BloodArsenalModifiers { - public static void init() - { - initModifiers(); - } - public static void initModifiers() { ItemStack masterOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.masterBloodOrb, 1, OreDictionary.WILDCARD_VALUE); diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalTinkers.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalTinkers.java index aad079b..f06c131 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalTinkers.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalTinkers.java @@ -1,11 +1,10 @@ package com.arc.bloodarsenal.common.tinkers; import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenalConfig; import com.arc.bloodarsenal.common.block.ModBlocks; import com.arc.bloodarsenal.common.items.ModItems; -import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.event.FMLInterModComms; -import cpw.mods.fml.common.registry.GameRegistry; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.item.ItemStack; @@ -16,303 +15,125 @@ import net.minecraftforge.fluids.Fluid; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; import tconstruct.library.TConstructRegistry; -import tconstruct.library.client.TConstructClientRegistry; -import tconstruct.library.crafting.*; -import tconstruct.library.tools.ToolMaterial; +import tconstruct.library.crafting.FluidType; +import tconstruct.library.crafting.Smeltery; import tconstruct.smeltery.TinkerSmeltery; -import tconstruct.tools.TinkerTools; -import tconstruct.weaponry.TinkerWeaponry; - -import java.util.ListIterator; public class BloodArsenalTinkers { - public static PartHelper ARROWHEAD; - public static PartHelper AXE_HEAD; - public static PartHelper BATTLE_SIGN_HEAD; - public static PartHelper BINDING; - public static PartHelper BOLT; - public static PartHelper BOW_LIMB; - public static PartHelper CHISEL_HEAD; - public static PartHelper CHUNK; - public static PartHelper CROSSBAR; - public static PartHelper CROSSBOW_BODY; - public static PartHelper CROSSBOW_LIMB; - public static PartHelper EXCAVATOR_HEAD; - public static PartHelper FISHING_ROD; - public static PartHelper FRYPAN_HEAD; - public static PartHelper FULL_GUARD; - public static PartHelper HAMMER_HEAD; - public static PartHelper KNIFE_BLADE; - public static PartHelper LARGE_GUARD; - public static PartHelper LARGE_SWORD_BLADE; - public static PartHelper LARGEPLATE; - public static PartHelper LUMBERAXE_HEAD; - public static PartHelper MEDIUM_GUARD; - public static PartHelper PICKAXE_HEAD; - public static PartHelper SCYTHE_HEAD; - public static PartHelper SHOVEL_HEAD; - public static PartHelper SHURIKEN; - public static PartHelper SWORD_BLADE; - public static PartHelper TOOLROD; - public static PartHelper TOUGHBIND; - public static PartHelper TOUGHROD; + public final static BloodArsenalTinkers INSTANCE = new BloodArsenalTinkers(); - public static Fluid bloodInfusedIron = new Fluid("molten.bloodInfusedIron").setDensity(3000).setViscosity(6000).setTemperature(1300); + public static Fluid bloodInfusedIronFluid; - public static void init() + public BloodArsenalTinkers() {} + + public void init() { -// addMaterials(); - - addParts(); - addLifeInfusedIronMaterial(); - addLiquids(); - - MinecraftForge.EVENT_BUS.register(new TConEvents()); + addBloodInfusedWoodMaterial(); + addBloodInfusedIronMaterial(); + BloodArsenalModifiers.initModifiers(); } - public static void addLifeInfusedIronMaterial() + public void addBloodInfusedWoodMaterial() { - if (ModItems.itemsNotToBeRegistered.contains(ModItems.blood_infused_iron) && ModBlocks.blocksNotToBeRegistered.contains(ModBlocks.blood_infused_iron_block)) + if (ModBlocks.blood_infused_planks != null) { - return; + int id = BloodArsenalConfig.bloodInfusedWoodID; + + if (id > 0) + { + NBTTagCompound tag = new NBTTagCompound(); + tag.setInteger("Id", id); + tag.setString("Name", "BloodInfusedWood"); + tag.setString("localizationString", "material.bloodarsenal.blood_infused_wood"); + tag.setInteger("Durability", 123); + tag.setInteger("MiningSpeed", 450); + tag.setInteger("HarvestLevel", 1); + tag.setInteger("Attack", 1); + tag.setFloat("HandleModifier", 1.25F); + tag.setInteger("Reinforced", 0); + tag.setFloat("Bow_ProjectileSpeed", 3.2F); + tag.setInteger("Bow_DrawSpeed", 15); + tag.setFloat("Projectile_Mass", 0.62F); + tag.setFloat("Projectile_Fragility", 0.5F); + tag.setString("Style", EnumChatFormatting.RED.toString()); + tag.setInteger("Color", 13178385); + FMLInterModComms.sendMessage("TConstruct", "addMaterial", tag); + ItemStack itemstack = new ItemStack(ModBlocks.blood_infused_planks); + tag = new NBTTagCompound(); + tag.setInteger("MaterialId", id); + NBTTagCompound item = new NBTTagCompound(); + itemstack.writeToNBT(item); + tag.setTag("Item", item); + tag.setInteger("Value", 2); + FMLInterModComms.sendMessage("TConstruct", "addPartBuilderMaterial", tag); + tag = new NBTTagCompound(); + tag.setInteger("MaterialId", id); + tag.setInteger("Value", 2); + item = new NBTTagCompound(); + itemstack.writeToNBT(item); + tag.setTag("Item", item); + FMLInterModComms.sendMessage("TConstruct", "addMaterialItem", tag); + } } - - final int id = 250; - - - - NBTTagCompound tag = new NBTTagCompound(); - tag.setInteger("Id", id); - - final ToolMaterial material = new ToolMaterial("blood_infused_iron", "material.blood_infused_iron", 550, 1800, 3, 3, 1.5F, 0, 0.0F, EnumChatFormatting.DARK_RED.toString(), 16777215); - -/* tag.setString("Name", "Blood Infused Iron"); - tag.setString("localizationString", "material.blood_infused_iron"); - tag.setInteger("Durability", 550); - tag.setInteger("MiningSpeed", 1800); - tag.setInteger("HarvestLevel", 3); - tag.setInteger("Attack", 3); - tag.setFloat("HandleModifier", 1.5F); - tag.setInteger("Reinforced", 0); - tag.setFloat("Bow_ProjectileSpeed", 3.0F); - tag.setInteger("Bow_DrawSpeed", 40); - tag.setFloat("Projectile_Mass", 4.7F); - tag.setFloat("Projectile_Fragility", 0.2F); - tag.setString("Style", EnumChatFormatting.BLACK.toString()); - tag.setInteger("Color", 16777215); - FMLInterModComms.sendMessage("TConstruct", "addMaterial", tag); - - FluidRegistry.registerFluid(bloodInfusedIron); - - FluidType.registerFluidType(bloodInfusedIron.getName(), ModBlocks.blood_infused_iron_block, 0, 850, bloodInfusedIron, true); - Smeltery.addMelting(new ItemStack(ModBlocks.blood_infused_iron_block, 1), ModBlocks.blood_infused_iron_block, 0, 850, new FluidStack(bloodInfusedIron, 1296)); - Smeltery.addMelting(new ItemStack(ModItems.blood_infused_iron, 1, 0), ModBlocks.blood_infused_iron_block, 0, 850, new FluidStack(bloodInfusedIron, 144)); - - ItemStack ingotcast = new ItemStack(TinkerSmeltery.metalPattern, 1, 0); - TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(ModBlocks.blood_infused_iron_block, 1), new FluidStack(bloodInfusedIron, 1296), null, true, 100); - TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(ModItems.blood_infused_iron, 1), new FluidStack(bloodInfusedIron, 144), ingotcast, false, 50); - - tag = new NBTTagCompound(); - tag.setString("FluidName", bloodInfusedIron.getName()); - tag.setInteger("MaterialId", id); - FMLInterModComms.sendMessage("TConstruct", "addPartCastingMaterial", tag); - - tag = new NBTTagCompound(); - tag.setInteger("MaterialId", id); - tag.setTag("Item", new ItemStack(ModItems.blood_infused_iron, 1, 0).writeToNBT(new NBTTagCompound())); - tag.setInteger("Value", 2); - FMLInterModComms.sendMessage("TConstruct", "addMaterialItem", tag); - */ - TConstructRegistry.addtoolMaterial(id, material); - TConstructRegistry.addDefaultToolPartMaterial(id); - TConstructRegistry.addBowMaterial(id, 40, 1.2F); - TConstructRegistry.addArrowMaterial(id, 4.7F, 0.2F); - - BloodArsenal.proxy.executeClientCode(new IClientCode() - { - @SideOnly(Side.CLIENT) - public void executeClientCode() - { - if (FMLCommonHandler.instance().getSide().isClient()) { - TConstructClientRegistry.addMaterialRenderMapping(id, "tinker", material.name().toLowerCase(), true); - } - } - }); - - FluidRegistry.registerFluid(bloodInfusedIron); - - FluidType.registerFluidType(bloodInfusedIron.getName(), ModBlocks.blood_infused_iron_block, 0, 850, bloodInfusedIron, true); - Smeltery.addMelting(new ItemStack(ModBlocks.blood_infused_iron_block, 1), ModBlocks.blood_infused_iron_block, 0, 850, new FluidStack(bloodInfusedIron, 1296)); - Smeltery.addMelting(new ItemStack(ModItems.blood_infused_iron, 1, 0), ModBlocks.blood_infused_iron_block, 0, 850, new FluidStack(bloodInfusedIron, 144)); - - ItemStack ingotcast = new ItemStack(TinkerSmeltery.metalPattern, 1, 0); - TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(ModBlocks.blood_infused_iron_block, 1), new FluidStack(bloodInfusedIron, 1296), null, true, 100); - TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(ModItems.blood_infused_iron, 1), new FluidStack(bloodInfusedIron, 144), ingotcast, false, 50); - - tag = new NBTTagCompound(); - tag.setString("FluidName", bloodInfusedIron.getName()); - tag.setInteger("MaterialId", id); - FMLInterModComms.sendMessage("TConstruct", "addPartCastingMaterial", tag); - - tag = new NBTTagCompound(); - tag.setInteger("MaterialId", id); - tag.setTag("Item", new ItemStack(ModItems.blood_infused_iron, 1, 0).writeToNBT(new NBTTagCompound())); - tag.setInteger("Value", 2); - FMLInterModComms.sendMessage("TConstruct", "addMaterialItem", tag); - - BloodArsenal.proxy.executeClientCode(new IClientCode() - { - @SideOnly(Side.CLIENT) - public void executeClientCode() - { - new TextureResourcePackBloodInfusedIron("blood_infused_iron").register(); - } - }); } - public static void addLiquids() + public void addBloodInfusedIronMaterial() { - LiquidCasting tb = TConstructRegistry.getTableCasting(); - for (ListIterator iterator = tb.getCastingRecipes().listIterator(); iterator.hasNext();) + if (ModBlocks.blood_infused_iron_block != null && ModItems.blood_infused_iron != null) { - CastingRecipe castingRecipe = iterator.next(); + int id = BloodArsenalConfig.bloodInfusedIronID; - if ((castingRecipe != null) && (castingRecipe.getClass() == CastingRecipe.class) && (castingRecipe.output != null) && (castingRecipe.output.getItem() == TinkerWeaponry.partBolt) && (castingRecipe.cast != null) && (castingRecipe.cast.getItem() == TinkerTools.toolRod)) + if (id > 0) { - int materialID = ToolBuilder.instance.getMaterialID(castingRecipe.cast); - - if (materialID > 0) + NBTTagCompound tag = new NBTTagCompound(); + tag.setInteger("Id", id); + tag.setString("Name", "BloodInfusedIron"); + tag.setString("localizationString", "material.bloodarsenal.blood_infused_iron"); + tag.setInteger("Durability", 459); + tag.setInteger("MiningSpeed", 700); + tag.setInteger("HarvestLevel", 3); + tag.setInteger("Attack", 3); + tag.setFloat("HandleModifier", 1.4F); + tag.setInteger("Reinforced", 0); + tag.setFloat("Bow_ProjectileSpeed", 5.1F); + tag.setInteger("Bow_DrawSpeed", 52); + tag.setFloat("Projectile_Mass", 3.1F); + tag.setFloat("Projectile_Fragility", 0.7F); + tag.setString("Style", EnumChatFormatting.DARK_RED.toString()); + tag.setInteger("Color", 16777215); + FMLInterModComms.sendMessage("TConstruct", "addMaterial", tag); + FluidRegistry.registerFluid(bloodInfusedIronFluid); + FluidType.registerFluidType(bloodInfusedIronFluid.getName(), ModBlocks.blood_infused_iron_block, 0, 850, bloodInfusedIronFluid, true); + Smeltery.addMelting(new ItemStack(ModBlocks.blood_infused_iron_block, 1), ModBlocks.blood_infused_iron_block, 0, 850, new FluidStack(bloodInfusedIronFluid, 1296)); + Smeltery.addMelting(new ItemStack(ModItems.blood_infused_iron, 1, 0), ModBlocks.blood_infused_iron_block, 0, 850, new FluidStack(bloodInfusedIronFluid, 144)); + ItemStack ingotcast = new ItemStack(TinkerSmeltery.metalPattern, 1, 0); + TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(ModBlocks.blood_infused_iron_block, 1), new FluidStack(bloodInfusedIronFluid, 1296), null, true, 100); + TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(ModItems.blood_infused_iron, 1), new FluidStack(bloodInfusedIronFluid, 144), ingotcast, false, 50); + tag = new NBTTagCompound(); + tag.setString("FluidName", bloodInfusedIronFluid.getName()); + tag.setInteger("MaterialId", id); + FMLInterModComms.sendMessage("TConstruct", "addPartCastingMaterial", tag); + tag = new NBTTagCompound(); + tag.setInteger("MaterialId", id); + tag.setTag("Item", (new ItemStack(ModItems.blood_infused_iron, 1, 0)).writeToNBT(new NBTTagCompound())); + tag.setInteger("Value", 2); + FMLInterModComms.sendMessage("TConstruct", "addMaterialItem", tag); + BloodArsenal.proxy.executeClientCode(new IClientCode() { - if (materialID == 250) + @SideOnly(Side.CLIENT) + public void executeClientCode() { - iterator.set(new TConCastingRecipe(castingRecipe)); + (new TextureResourcePackBloodInfusedIron("BloodInfusedIron")).register(); } - } + }); } } } - public static void addMaterials() + static { - TConstructRegistry.addToolMaterial(250, "Blood Infused Iron", "blood_infused_iron", 3, 550, 1800, 3, 1.5F, 0, 0.0F, "Blood Infused Iron", 0xab0000); - - TConstructClientRegistry.addMaterialRenderMapping(250, "BloodArsenal", "Blood Infused Iron", true); - - TConstructRegistry.addBowMaterial(250, 40, 1.2F); - - TConstructRegistry.addArrowMaterial(250, 4.7F, 0.2F); - } - - public static void addParts() - { - initParts(); - -// addMaterialToToolParts(250, "blood.infused.iron", "blood_infused_iron"); - - registerParts(); - } - - private static void initParts() - { - ARROWHEAD = new PartHelper("arrowhead", 0, ""); - AXE_HEAD = new PartHelper("axe.head", 0, ""); - BATTLE_SIGN_HEAD = new PartHelper("battle.sign", 0, ""); - BINDING = new PartHelper("binding", 0, ""); - BOLT = new PartHelper("bolt", 0, ""); - BOW_LIMB = new PartHelper("bow.limb", 0, ""); - CHISEL_HEAD = new PartHelper("chisel.head", 0, ""); - CHUNK = new PartHelper("chunk", 0, ""); - CROSSBAR = new PartHelper("crossbar", 0, ""); - CROSSBOW_BODY = new PartHelper("crossbow.body", 0, ""); - CROSSBOW_LIMB = new PartHelper("crossbow.limb", 0, ""); - EXCAVATOR_HEAD = new PartHelper("excavator.head", 0, ""); - FISHING_ROD = new PartHelper("fishing.rod", 0, ""); - FRYPAN_HEAD = new PartHelper("frypan.head", 0, ""); - FULL_GUARD = new PartHelper("full.guard", 0, ""); - HAMMER_HEAD = new PartHelper("hammer.head", 0, ""); - KNIFE_BLADE = new PartHelper("knife.blade", 0, ""); - LARGE_GUARD = new PartHelper("large.guard", 0, ""); - LARGE_SWORD_BLADE = new PartHelper("large.sword.blade", 0, ""); - LARGEPLATE = new PartHelper("largeplate", 0, ""); - LUMBERAXE_HEAD = new PartHelper("lumberaxe.head", 0, ""); - MEDIUM_GUARD = new PartHelper("medium.guard", 0, ""); - PICKAXE_HEAD = new PartHelper("pickaxe.head", 0, ""); - SCYTHE_HEAD = new PartHelper("scythe.head", 0, ""); - SHOVEL_HEAD = new PartHelper("shovel.head", 0, ""); - SHURIKEN = new PartHelper("shuriken", 0, ""); - SWORD_BLADE = new PartHelper("sword.blade", 0, ""); - TOOLROD = new PartHelper("toolrod", 0, ""); - TOUGHBIND = new PartHelper("toughbind", 0, ""); - TOUGHROD = new PartHelper("toughrod", 0, ""); - } - - private static void addMaterialToToolParts(int materialID, String unlocalizedName, String texture) - { - ARROWHEAD.addMaterial(materialID, unlocalizedName, texture + "_arrowhead"); - AXE_HEAD.addMaterial(materialID, unlocalizedName, texture + "_axe_head"); - BATTLE_SIGN_HEAD.addMaterial(materialID, unlocalizedName, texture + "_battlesign_head"); - BINDING.addMaterial(materialID, unlocalizedName, texture + "_binding"); - BOLT.addMaterial(materialID, unlocalizedName, texture + "_bolt"); - BOW_LIMB.addMaterial(materialID, unlocalizedName, texture + "_bow_limb"); - CHISEL_HEAD.addMaterial(materialID, unlocalizedName, texture + "_chisel_head"); - CHUNK.addMaterial(materialID, unlocalizedName, texture + "_chunk"); - CROSSBAR.addMaterial(materialID, unlocalizedName, texture + "_crossbar"); - CROSSBOW_BODY.addMaterial(materialID, unlocalizedName, texture + "_crossbow_body"); - CROSSBOW_LIMB.addMaterial(materialID, unlocalizedName, texture + "_crossbow_limb"); - EXCAVATOR_HEAD.addMaterial(materialID, unlocalizedName, texture + "_excavator_head"); - FISHING_ROD.addMaterial(materialID, unlocalizedName, texture + "_fishingrod"); - FRYPAN_HEAD.addMaterial(materialID, unlocalizedName, texture + "_frypan_head"); - FULL_GUARD.addMaterial(materialID, unlocalizedName, texture + "_full_guard"); - HAMMER_HEAD.addMaterial(materialID, unlocalizedName, texture + "_hammer_head"); - KNIFE_BLADE.addMaterial(materialID, unlocalizedName, texture + "_knife_blade"); - LARGE_GUARD.addMaterial(materialID, unlocalizedName, texture + "_large_guard"); - LARGE_SWORD_BLADE.addMaterial(materialID, unlocalizedName, texture + "_large_sword_blade"); - LARGEPLATE.addMaterial(materialID, unlocalizedName, texture + "_largeplate"); - LUMBERAXE_HEAD.addMaterial(materialID, unlocalizedName, texture + "_lumberaxe_head"); - MEDIUM_GUARD.addMaterial(materialID, unlocalizedName, texture + "_medium_guard"); - PICKAXE_HEAD.addMaterial(materialID, unlocalizedName, texture + "_pickaxe_head"); - SCYTHE_HEAD.addMaterial(materialID, unlocalizedName, texture + "_scythe_head"); - SHOVEL_HEAD.addMaterial(materialID, unlocalizedName, texture + "_shovel_head"); - SHURIKEN.addMaterial(materialID, unlocalizedName, texture + "_shuriken"); - SWORD_BLADE.addMaterial(materialID, unlocalizedName, texture + "_sword_blade"); - TOOLROD.addMaterial(materialID, unlocalizedName, texture + "_rod"); - TOUGHBIND.addMaterial(materialID, unlocalizedName, texture + "_toughbind"); - TOUGHROD.addMaterial(materialID, unlocalizedName, texture + "_toughrod"); - } - - private static void registerParts() - { - GameRegistry.registerItem(ARROWHEAD, "arrowhead"); - GameRegistry.registerItem(AXE_HEAD, "axeHead"); - GameRegistry.registerItem(BATTLE_SIGN_HEAD, "battleSign"); - GameRegistry.registerItem(BINDING, "binding"); - GameRegistry.registerItem(BOLT, "bolt"); - GameRegistry.registerItem(BOW_LIMB, "bowLimb"); - GameRegistry.registerItem(CHISEL_HEAD, "chiselHead"); - GameRegistry.registerItem(CHUNK, "chunk"); - GameRegistry.registerItem(CROSSBAR, "crossbar"); - GameRegistry.registerItem(CROSSBOW_BODY, "crossbowBody"); - GameRegistry.registerItem(CROSSBOW_LIMB, "crossbowLimb"); - GameRegistry.registerItem(EXCAVATOR_HEAD, "excavatorHead"); -// GameRegistry.registerItem(FISHING_ROD, "fishingRod"); - GameRegistry.registerItem(FRYPAN_HEAD, "frypanHead"); - GameRegistry.registerItem(FULL_GUARD, "fullGuard"); - GameRegistry.registerItem(HAMMER_HEAD, "hammerHead"); - GameRegistry.registerItem(KNIFE_BLADE, "knifeBlade"); - GameRegistry.registerItem(LARGE_GUARD, "largeGuard"); - GameRegistry.registerItem(LARGE_SWORD_BLADE, "largeSwordBlade"); - GameRegistry.registerItem(LARGEPLATE, "largeplate"); - GameRegistry.registerItem(LUMBERAXE_HEAD, "lumberaxeHead"); - GameRegistry.registerItem(MEDIUM_GUARD, "mediumGuard"); - GameRegistry.registerItem(PICKAXE_HEAD, "pickaxeHead"); - GameRegistry.registerItem(SCYTHE_HEAD, "scytheHead"); - GameRegistry.registerItem(SHOVEL_HEAD, "shovelHead"); - GameRegistry.registerItem(SHURIKEN, "shuriken"); - GameRegistry.registerItem(SWORD_BLADE, "swordBlade"); - GameRegistry.registerItem(TOOLROD, "toolrod"); - GameRegistry.registerItem(TOUGHBIND, "toughbind"); - GameRegistry.registerItem(TOUGHROD, "toughrod"); - BloodArsenal.logger.info("SOMETHING WORKED NOW DIDN'T IT?"); + MinecraftForge.EVENT_BUS.register(new TConEvents()); + bloodInfusedIronFluid = new Fluid("molten.blood_infused_iron").setDensity(3000).setViscosity(6000).setTemperature(1400); } } diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/ModSoulbound.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/ModSoulbound.java index 950f894..d72985c 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/ModSoulbound.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/ModSoulbound.java @@ -1,22 +1,30 @@ package com.arc.bloodarsenal.common.tinkers; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; import net.minecraftforge.oredict.OreDictionary; import tconstruct.library.modifier.IModifyable; +import tconstruct.library.tools.ToolCore; import tconstruct.modifiers.tools.ModBoolean; +import tconstruct.util.config.PHConstruct; + +import java.util.ArrayList; public class ModSoulbound extends ModBoolean { public int modifiersRequired = 1; + private String owner; public ModSoulbound(ItemStack[] items) { - super(items, 1, "Soulbound", "\u00a74", "Soulbound"); + super(items, 30, "Soulbound", EnumChatFormatting.DARK_RED.toString(), "Soulbound"); } @Override - public boolean matches (ItemStack[] input, ItemStack tool) + public boolean matches(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound().getCompoundTag("InfiTool"); @@ -26,24 +34,28 @@ public class ModSoulbound extends ModBoolean return false; ItemStack foundOrb = null; - ItemStack masterOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.masterBloodOrb, 1, OreDictionary.WILDCARD_VALUE); for (ItemStack stack : input) - { - if (stack == null) - continue; - if (stack.getItem() != masterOrb.getItem()) - continue; - if (foundOrb != null) - return false; + { + if (stack == null) + continue; + if (!(stack.getItem() instanceof IBloodOrb)) + continue; + if (!(((IBloodOrb) stack.getItem()).getOrbLevel() >= 4)) + continue; + if (SoulNetworkHandler.getOwnerName(stack).equals("")) + continue; + if (foundOrb != null) + return false; - foundOrb = stack; - } + foundOrb = stack; + } if (foundOrb == null) return false; - - // otherwise check if we have enough modfiers + if (tags.getBoolean(key)) + return false; + // otherwise check if we have enough modfiers else if (tags.getInteger("Modifiers") < modifiersRequired) return false; @@ -52,7 +64,7 @@ public class ModSoulbound extends ModBoolean } @Override - public void modify (ItemStack[] input, ItemStack tool) + public void modify(ItemStack[] input, ItemStack tool) { NBTTagCompound tags = tool.getTagCompound(); @@ -62,27 +74,33 @@ public class ModSoulbound extends ModBoolean int modifiers = tags.getCompoundTag("InfiTool").getInteger("Modifiers"); modifiers -= modifiersRequired; tags.getCompoundTag("InfiTool").setInteger("Modifiers", modifiers); - addModifierTip(tool, "\u00a74"); + addModifierTip(tool, EnumChatFormatting.DARK_RED + "Soulbound"); } tags.getCompoundTag("InfiTool").setBoolean(key, true); // find the battery in the input ItemStack inputBattery = null; - ItemStack masterOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.masterBloodOrb, 1, OreDictionary.WILDCARD_VALUE); for (ItemStack stack : input) - { - if (stack == null) - continue; - if (stack.getItem() != masterOrb.getItem()) - continue; + { + if (stack == null) + continue; + if (!(stack.getItem() instanceof IBloodOrb)) + continue; + if (!(((IBloodOrb) stack.getItem()).getOrbLevel() >= 4)) + continue; + if (SoulNetworkHandler.getOwnerName(stack).equals("")) + continue; + if (inputBattery != null) + return; - // we're guaranteed to only find one battery because more are prevented above - inputBattery = stack; - } + this.owner = SoulNetworkHandler.getOwnerName(stack); + // we're guaranteed to only find one battery because more are prevented above + inputBattery = stack; + } - tags.setString("Owner", ""); + tags.setString("Owner", owner); tags.setInteger(key, 1); } } diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/PartHelper.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/PartHelper.java deleted file mode 100644 index 0624243..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/PartHelper.java +++ /dev/null @@ -1,149 +0,0 @@ -package com.arc.bloodarsenal.common.tinkers; - -import com.arc.bloodarsenal.common.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.creativetab.CreativeTabs; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; -import net.minecraft.util.StatCollector; -import tconstruct.library.util.IToolPart; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -public class PartHelper extends Item implements IToolPart -{ - protected String defaultTexture; - protected int defaultMaterialID; - protected String unlocalizedPartName; - protected HashMap unlocalizedMaterialNames = new HashMap(); - protected HashMap textures = new HashMap(); - protected HashMap icons = new HashMap(); - protected static final String texturePath = "BloodArsenal".toLowerCase() + ":" + "tinkers/parts/"; - - public PartHelper(String defaultUnlocalizedPartName, int defaultMaterialID, String defaultTexture) - { - setCreativeTab(BloodArsenal.BA_TAB); - setMaxStackSize(64); - setMaxDamage(0); - setHasSubtypes(true); - - setUnlocalizedName("default." + defaultUnlocalizedPartName); - this.unlocalizedPartName = defaultUnlocalizedPartName; - this.defaultMaterialID = defaultMaterialID; - this.defaultTexture = (texturePath + defaultTexture); - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister icon) - { - this.itemIcon = icon.registerIcon(this.defaultTexture); - - for (Map.Entry texture : this.textures.entrySet()) - { - int materialID = texture.getKey().intValue(); - String textureName = texture.getValue(); - - IIcon _icon = icon.registerIcon(texturePath + textureName); - - this.icons.put(materialID, _icon); - } - } - - @Override - public int getMaterialID(ItemStack itemStack) - { - int damageValue = itemStack.getItemDamage(); - - if (damageValue >= 100) - { - return itemStack.getItemDamage(); - } - - return this.defaultMaterialID; - } - - public void addMaterial(int materialId, String unlocalizedName, String texture) - { - this.unlocalizedMaterialNames.put(materialId, unlocalizedName); - this.textures.put(materialId, texture); - } - - @Override - public IIcon getIconFromDamage(int damageValue) - { - if (this.icons.containsKey(damageValue)) - { - return this.icons.get(damageValue); - } - - return this.itemIcon; - } - - @Override - public void getSubItems(Item item, CreativeTabs tab, List itemStackList) - { - if (!this.unlocalizedMaterialNames.isEmpty()) - { - for (Map.Entry subItem : this.unlocalizedMaterialNames.entrySet()) - { - int materialId = subItem.getKey().intValue(); - itemStackList.add(new ItemStack(item, 1, materialId)); - } - } - else - { - itemStackList.add(new ItemStack(this, 1)); - } - } - - @Override - public String getUnlocalizedName(ItemStack itemStack) - { - int damageValue = itemStack.getItemDamage(); - - if (this.unlocalizedMaterialNames.containsKey(damageValue)) - { - return "item." + this.unlocalizedMaterialNames.get(damageValue) + "." + this.unlocalizedPartName; - } - - return getUnlocalizedName(); - } - - @Override - public String getItemStackDisplayName(ItemStack itemStack) - { - int damageValue = itemStack.getItemDamage(); - String displayName; -/* if (this.unlocalizedMaterialNames.containsKey(damageValue)) - { - String unlocalizedMaterialName = this.unlocalizedMaterialNames.get(damageValue); - if (StatCollector.canTranslate("part." + this.unlocalizedPartName) && StatCollector.canTranslate("material." + unlocalizedMaterialName)) - { - String localizedPartName = StatCollector.translateToLocal("part." + this.unlocalizedPartName); - String localizedMaterialName = StatCollector.translateToLocal("material." + unlocalizedMaterialName); - displayName = localizedPartName.replaceAll("@material@", localizedMaterialName); - } - else - { - displayName = getUnlocalizedName(itemStack) + ".name"; - } - } - else - { - displayName = getUnlocalizedName() + ".name"; - } -*/ - String unlocalizedMaterialName = this.unlocalizedMaterialNames.get(damageValue); - String localizedMaterialName = StatCollector.translateToLocal("material." + unlocalizedMaterialName); - String partName = StatCollector.translateToLocal("part." + this.unlocalizedPartName); - displayName = partName.replaceAll("@material@", localizedMaterialName); - - return displayName; - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/RecipeHelper.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/RecipeHelper.java deleted file mode 100644 index 52e94bd..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/RecipeHelper.java +++ /dev/null @@ -1,230 +0,0 @@ -package com.arc.bloodarsenal.common.tinkers; - -import com.arc.bloodarsenal.common.items.ModItems; -import cpw.mods.fml.common.registry.GameRegistry; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.IRecipe; -import net.minecraftforge.oredict.OreDictionary; -import tconstruct.library.TConstructRegistry; -import tconstruct.library.crafting.PatternBuilder; -import tconstruct.tools.TinkerTools; -import tconstruct.weaponry.TinkerWeaponry; - -import java.util.ArrayList; -import java.util.List; - -public class RecipeHelper -{ - private static Item pattern = TConstructRegistry.getItem("woodPattern"); - private static Item weaponPattern = TinkerWeaponry.woodPattern; - - private static final ItemStack toolRodPattern = TConstructRegistry.getItemStack("toolRodPattern"); - private static final ItemStack pickaxeHeadPattern = TConstructRegistry.getItemStack("pickaxeHeadPattern"); - private static final ItemStack shovelHeadPattern = TConstructRegistry.getItemStack("shovelHeadPattern"); - private static final ItemStack hatchetHeadPattern = TConstructRegistry.getItemStack("hatchetHeadPattern"); - private static final ItemStack swordBladePattern = TConstructRegistry.getItemStack("swordBladePattern"); - private static final ItemStack wideGuardPattern = TConstructRegistry.getItemStack("wideGuardPattern"); - private static final ItemStack handGuardPattern = TConstructRegistry.getItemStack("handGuardPattern"); - private static final ItemStack crossbarPattern = TConstructRegistry.getItemStack("crossbarPattern"); - private static final ItemStack bindingPattern = TConstructRegistry.getItemStack("bindingPattern"); - private static final ItemStack frypanHeadPattern = TConstructRegistry.getItemStack("frypanHeadPattern"); - private static final ItemStack signHeadPattern = TConstructRegistry.getItemStack("signHeadPattern"); - private static final ItemStack knifeBladePattern = TConstructRegistry.getItemStack("knifeBladePattern"); - private static final ItemStack chiselHeadPattern = TConstructRegistry.getItemStack("chiselHeadPattern"); - private static final ItemStack toughRodPattern = TConstructRegistry.getItemStack("toughRodPattern"); - private static final ItemStack toughBindingPattern = TConstructRegistry.getItemStack("toughBindingPattern"); - private static final ItemStack largePlatePattern = TConstructRegistry.getItemStack("largePlatePattern"); - private static final ItemStack broadAxeHeadPattern = TConstructRegistry.getItemStack("broadAxeHeadPattern"); - private static final ItemStack scytheHeadPattern = TConstructRegistry.getItemStack("scytheHeadPattern"); - private static final ItemStack excavatorHeadPattern = TConstructRegistry.getItemStack("excavatorHeadPattern"); - private static final ItemStack largeBladePattern = TConstructRegistry.getItemStack("largeBladePattern"); - private static final ItemStack hammerHeadPattern = TConstructRegistry.getItemStack("hammerHeadPattern"); - private static final ItemStack fullGuardPattern = TConstructRegistry.getItemStack("fullGuardPattern"); - private static final ItemStack arrowHeadPattern = new ItemStack(pattern, 1, 25); - private static final ItemStack crossbowBodyPattern = new ItemStack(weaponPattern, 1, 2); - private static final ItemStack crossbowLimbPattern = new ItemStack(weaponPattern, 1, 1); - private static final ItemStack shurikenPattern = new ItemStack(weaponPattern); - - private static PartHelper _ARROWHEAD = BloodArsenalTinkers.ARROWHEAD; - private static PartHelper _AXE_HEAD = BloodArsenalTinkers.AXE_HEAD; - private static PartHelper _BATTLE_SIGN_HEAD = BloodArsenalTinkers.BATTLE_SIGN_HEAD; - private static PartHelper _BINDING = BloodArsenalTinkers.BINDING; - private static PartHelper _BOLT = BloodArsenalTinkers.BOLT; - private static PartHelper _BOW_LIMB = BloodArsenalTinkers.BOW_LIMB; - private static PartHelper _CHISEL_HEAD = BloodArsenalTinkers.CHISEL_HEAD; - private static PartHelper _CHUNK = BloodArsenalTinkers.CHUNK; - private static PartHelper _CROSSBAR = BloodArsenalTinkers.CROSSBAR; - private static PartHelper _CROSSBOW_BODY = BloodArsenalTinkers.CROSSBOW_BODY; - private static PartHelper _CROSSBOW_LIMB = BloodArsenalTinkers.CROSSBOW_LIMB; - private static PartHelper _EXCAVATOR_HEAD = BloodArsenalTinkers.EXCAVATOR_HEAD; - private static PartHelper _FISHING_ROD = BloodArsenalTinkers.FISHING_ROD; - private static PartHelper _FRYPAN_HEAD = BloodArsenalTinkers.FRYPAN_HEAD; - private static PartHelper _FULL_GUARD = BloodArsenalTinkers.FULL_GUARD; - private static PartHelper _HAMMER_HEAD = BloodArsenalTinkers.HAMMER_HEAD; - private static PartHelper _KNIFE_BLADE = BloodArsenalTinkers.KNIFE_BLADE; - private static PartHelper _LARGE_GUARD = BloodArsenalTinkers.LARGE_GUARD; - private static PartHelper _LARGE_SWORD_BLADE = BloodArsenalTinkers.LARGE_SWORD_BLADE; - private static PartHelper _LARGEPLATE = BloodArsenalTinkers.LARGEPLATE; - private static PartHelper _LUMBERAXE_HEAD = BloodArsenalTinkers.LUMBERAXE_HEAD; - private static PartHelper _MEDIUM_GUARD = BloodArsenalTinkers.MEDIUM_GUARD; - private static PartHelper _PICKAXE_HEAD = BloodArsenalTinkers.PICKAXE_HEAD; - private static PartHelper _SCYTHE_HEAD = BloodArsenalTinkers.SCYTHE_HEAD; - private static PartHelper _SHOVEL_HEAD = BloodArsenalTinkers.SHOVEL_HEAD; - private static PartHelper _SHURIKEN = BloodArsenalTinkers.SHURIKEN; - private static PartHelper _SWORD_BLADE = BloodArsenalTinkers.SWORD_BLADE; - private static PartHelper _TOOLROD = BloodArsenalTinkers.TOOLROD; - private static PartHelper _TOUGHBIND = BloodArsenalTinkers.TOUGHBIND; - private static PartHelper _TOUGHROD = BloodArsenalTinkers.TOUGHROD; - - public static void addRecipes() - { - addPartRecipes(); - addToolRecipes(); - addCraftingRecipes(); - } - - public static void addCraftingRecipes() {} - - public static void addPartRecipes() - { - Item bloodIron = GameRegistry.findItem("BloodArsenal", "blood_infused_iron"); - - if (bloodIron != null) - { - ItemStack _bloodIron = new ItemStack(bloodIron); - - addPartBuilding(250); - unregisterMaterial(_bloodIron); - registerWithStation(new ItemStack(ModItems.blood_infused_iron, 1), "Blood Infused Iron", 250, new ItemStack(_CHUNK, 1, 250)); -// registerWithStation("Blood Infused Iron", "Blood Infused Iron", 250); - } - } - - private static void registerWithStation(String ingotName, String materialName, int materialID) - { - ArrayList ingots = OreDictionary.getOres(ingotName); - - if (!ingots.isEmpty()) - { - for (ItemStack ingot : ingots) - { - registerWithStation(ingot, materialName, materialID, new ItemStack(_CHUNK, 1, materialID)); - } - } - } - - private static void registerWithStation(ItemStack material, String materialName, int materialID, ItemStack chunk) - { - PatternBuilder.instance.registerFullMaterial(material, 2, materialName, chunk, new ItemStack(_TOOLROD, 1, materialID), materialID); - } - - private static void unregisterMaterial(ItemStack material) - { - List materials = PatternBuilder.instance.materials; - - for (int i = 0; i < materials.size(); i++) - { - PatternBuilder.ItemKey itemKey = materials.get(i); - if ((itemKey.item == material.getItem()) && (material.getItemDamage() == itemKey.damage)) - { - materials.remove(i); - } - } - } - - private static ItemStack getItemStackfromCraftingManager(String itemName) - { - List list = CraftingManager.getInstance().getRecipeList(); - - ItemStack itemStack = null; - - for (int i = 0; i < list.size(); i++) - { - IRecipe recipe = (IRecipe)list.get(i); - ItemStack currentItemStack = recipe.getRecipeOutput(); - if (currentItemStack != null) - { - Item item = currentItemStack.getItem(); - if (item != null) - { - String foundItemName = currentItemStack.getUnlocalizedName(); - if (foundItemName.equals(itemName)) - { - itemStack = currentItemStack; - break; - } - } - } - } - return itemStack; - } - - private static void addItemStackPartBuilding(ItemStack pattern, int materialID, ItemStack part) - { - TConstructRegistry.addPartMapping(pattern.getItem(), pattern.getItemDamage(), materialID, part); - } - - private static void addPartBuilding(int materialID) - { - addItemStackPartBuilding(toolRodPattern, materialID, new ItemStack(_TOOLROD, 1, materialID)); - addItemStackPartBuilding(pickaxeHeadPattern, materialID, new ItemStack(_PICKAXE_HEAD, 1, materialID)); - addItemStackPartBuilding(shovelHeadPattern, materialID, new ItemStack(_SHOVEL_HEAD, 1, materialID)); - addItemStackPartBuilding(hatchetHeadPattern, materialID, new ItemStack(_AXE_HEAD, 1, materialID)); - addItemStackPartBuilding(swordBladePattern, materialID, new ItemStack(_SWORD_BLADE, 1, materialID)); - addItemStackPartBuilding(wideGuardPattern, materialID, new ItemStack(_LARGE_GUARD, 1, materialID)); - addItemStackPartBuilding(handGuardPattern, materialID, new ItemStack(_MEDIUM_GUARD, 1, materialID)); - addItemStackPartBuilding(crossbarPattern, materialID, new ItemStack(_CROSSBAR, 1, materialID)); - addItemStackPartBuilding(bindingPattern, materialID, new ItemStack(_BINDING, 1, materialID)); - addItemStackPartBuilding(frypanHeadPattern, materialID, new ItemStack(_FRYPAN_HEAD, 1, materialID)); - addItemStackPartBuilding(signHeadPattern, materialID, new ItemStack(_BATTLE_SIGN_HEAD, 1, materialID)); - addItemStackPartBuilding(knifeBladePattern, materialID, new ItemStack(_KNIFE_BLADE, 1, materialID)); - addItemStackPartBuilding(chiselHeadPattern, materialID, new ItemStack(_CHISEL_HEAD, 1, materialID)); - addItemStackPartBuilding(toughRodPattern, materialID, new ItemStack(_TOUGHROD, 1, materialID)); - addItemStackPartBuilding(toughBindingPattern, materialID, new ItemStack(_TOUGHBIND, 1, materialID)); - addItemStackPartBuilding(largePlatePattern, materialID, new ItemStack(_LARGEPLATE, 1, materialID)); - addItemStackPartBuilding(broadAxeHeadPattern, materialID, new ItemStack(_LUMBERAXE_HEAD, 1, materialID)); - addItemStackPartBuilding(scytheHeadPattern, materialID, new ItemStack(_SCYTHE_HEAD, 1, materialID)); - addItemStackPartBuilding(excavatorHeadPattern, materialID, new ItemStack(_EXCAVATOR_HEAD, 1, materialID)); - addItemStackPartBuilding(largeBladePattern, materialID, new ItemStack(_LARGE_SWORD_BLADE, 1, materialID)); - addItemStackPartBuilding(hammerHeadPattern, materialID, new ItemStack(_HAMMER_HEAD, 1, materialID)); - addItemStackPartBuilding(fullGuardPattern, materialID, new ItemStack(_FULL_GUARD, 1, materialID)); - addItemStackPartBuilding(arrowHeadPattern, materialID, new ItemStack(_ARROWHEAD, 1, materialID)); - addItemStackPartBuilding(crossbowBodyPattern, materialID, new ItemStack(_CROSSBOW_BODY, 1, materialID)); - addItemStackPartBuilding(crossbowLimbPattern, materialID, new ItemStack(_CROSSBOW_LIMB, 1, materialID)); - addItemStackPartBuilding(shurikenPattern, materialID, new ItemStack(_SHURIKEN, 1, materialID)); - } - - public static void addToolRecipes() - { - TConstructRegistry.addToolRecipe(TinkerTools.battleaxe, _LUMBERAXE_HEAD, _TOUGHROD, _LUMBERAXE_HEAD, _TOUGHBIND); - TConstructRegistry.addToolRecipe(TinkerTools.battlesign, _BATTLE_SIGN_HEAD, _TOOLROD); - TConstructRegistry.addToolRecipe(TinkerTools.broadsword, _SWORD_BLADE, _TOOLROD, _LARGE_GUARD); - TConstructRegistry.addToolRecipe(TinkerTools.chisel, _CHISEL_HEAD, _TOOLROD); - TConstructRegistry.addToolRecipe(TinkerTools.cleaver, _LARGE_SWORD_BLADE, _TOUGHROD, _LARGEPLATE, _TOUGHROD); - TConstructRegistry.addToolRecipe(TinkerTools.cutlass, _SWORD_BLADE, _TOOLROD, _FULL_GUARD); - TConstructRegistry.addToolRecipe(TinkerTools.dagger, _KNIFE_BLADE, _TOOLROD, _CROSSBAR); - TConstructRegistry.addToolRecipe(TinkerTools.excavator, _EXCAVATOR_HEAD, _TOUGHROD, _LARGEPLATE, _TOUGHBIND); - TConstructRegistry.addToolRecipe(TinkerTools.frypan, _FRYPAN_HEAD, _TOOLROD); - TConstructRegistry.addToolRecipe(TinkerTools.hammer, _HAMMER_HEAD, _TOUGHROD, _LARGEPLATE, _LARGEPLATE); - TConstructRegistry.addToolRecipe(TinkerTools.hatchet, _AXE_HEAD, _TOOLROD); - TConstructRegistry.addToolRecipe(TinkerTools.longsword, _SWORD_BLADE, _TOOLROD, _MEDIUM_GUARD); - TConstructRegistry.addToolRecipe(TinkerTools.lumberaxe, _LUMBERAXE_HEAD, _TOUGHROD, _LARGEPLATE, _TOUGHBIND); - TConstructRegistry.addToolRecipe(TinkerTools.mattock, _AXE_HEAD, _TOOLROD, _SHOVEL_HEAD); - TConstructRegistry.addToolRecipe(TinkerTools.pickaxe, _PICKAXE_HEAD, _TOOLROD, _BINDING); - TConstructRegistry.addToolRecipe(TinkerTools.rapier, _SWORD_BLADE, _TOOLROD, _CROSSBAR); - TConstructRegistry.addToolRecipe(TinkerTools.scythe, _SCYTHE_HEAD, _TOUGHROD, _TOUGHBIND, _TOUGHROD); - TConstructRegistry.addToolRecipe(TinkerTools.shovel, _SHOVEL_HEAD, _TOOLROD); - TConstructRegistry.addToolRecipe(TinkerWeaponry.arrowAmmo, _ARROWHEAD, _TOOLROD, TinkerWeaponry.fletching); - TConstructRegistry.addToolRecipe(TinkerWeaponry.boltAmmo, _BOLT, TinkerWeaponry.fletching); - TConstructRegistry.addToolRecipe(TinkerWeaponry.crossbow, _TOUGHBIND, _CROSSBOW_LIMB, _CROSSBOW_BODY, TinkerWeaponry.bowstring); - TConstructRegistry.addToolRecipe(TinkerWeaponry.javelin, _ARROWHEAD, _TOUGHROD, _TOUGHROD); - TConstructRegistry.addToolRecipe(TinkerWeaponry.longbow, _BOW_LIMB, _LARGEPLATE, _BOW_LIMB, TinkerWeaponry.bowstring); - TConstructRegistry.addToolRecipe(TinkerWeaponry.shortbow, _TOOLROD, TinkerWeaponry.bowstring, _TOOLROD); - TConstructRegistry.addToolRecipe(TinkerWeaponry.shortbow, TinkerTools.toolRod, TinkerWeaponry.bowstring, _TOOLROD); - TConstructRegistry.addToolRecipe(TinkerWeaponry.shortbow, _TOOLROD, TinkerWeaponry.bowstring, TinkerTools.toolRod); - TConstructRegistry.addToolRecipe(TinkerWeaponry.shuriken, _SHURIKEN, _SHURIKEN, _SHURIKEN, _SHURIKEN); - TConstructRegistry.addToolRecipe(TinkerWeaponry.throwingknife, _KNIFE_BLADE, _TOOLROD); - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TConCastingRecipe.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TConCastingRecipe.java deleted file mode 100644 index bbe2a25..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/TConCastingRecipe.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.arc.bloodarsenal.common.tinkers; - -import net.minecraft.item.ItemStack; -import net.minecraftforge.fluids.FluidStack; -import tconstruct.library.client.FluidRenderProperties; -import tconstruct.library.crafting.CastingRecipe; - -public class TConCastingRecipe extends CastingRecipe -{ - public TConCastingRecipe(ItemStack replacement, FluidStack metal, ItemStack cast, boolean consume, int delay, FluidRenderProperties props) - { - super(replacement, metal, cast, consume, delay, props); - } - - public TConCastingRecipe(CastingRecipe recipe) - { - super(recipe.output.copy(), recipe.castingMetal.copy(), recipe.cast.copy(), recipe.consumeCast, recipe.coolTime, recipe.fluidRenderProperties); - } - - @Override - public boolean matches(FluidStack metal, ItemStack inputCast) - { - return (this.castingMetal != null) && (this.castingMetal.isFluidEqual(metal)) && (inputCast != null) && (this.cast != null) && (inputCast.getItem() == this.cast.getItem()) && ((this.cast.getItemDamage() == Short.MAX_VALUE)); - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java index 4141189..1a8458a 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java @@ -1,24 +1,22 @@ package com.arc.bloodarsenal.common.tinkers; +import cpw.mods.fml.common.eventhandler.SubscribeEvent; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraftforge.client.event.TextureStitchEvent; + public class TConEvents { -/* @SideOnly(Side.CLIENT) + @SideOnly(Side.CLIENT) @SubscribeEvent - public void handleStich(TextureStitchEvent.Pre event) { - if (event.map.getTextureType() != 0) { - return; - } - BloodArsenalTinkers.bloodInfusedIron.setIcons(event.map.registerIcon("TConIntegration.bedrock")); - - TextureAtlasSprite sprite = new TextureBedrockLava("extrautils:bedrockFluid", "lava_still"); - event.map.setTextureEntry("extrautils:bedrockFluid", sprite); - if (BloodArsenalTinkers.bloodInfusedIron != null) { - BloodArsenalTinkers.bloodInfusedIron.setIcons(sprite); - } - sprite = new TextureBedrockLava("extrautils:bedrockFluid_flowing", "lava_flow"); - if ((event.map.setTextureEntry("extrautils:bedrockFluid_flowing", sprite)) && - (BloodArsenalTinkers.bloodInfusedIron != null)) { - BloodArsenalTinkers.bloodInfusedIron.setFlowingIcon(sprite); + public void handleStich(TextureStitchEvent.Pre event) + { + if (event.map.getTextureType() == 0) + { + if (BloodArsenalTinkers.bloodInfusedIronFluid != null) + { + BloodArsenalTinkers.bloodInfusedIronFluid.setIcons(event.map.registerIcon("BloodArsenal:molten_blood_infused_iron_still"), event.map.registerIcon("BloodArsenal:molten_blood_infused_iron_flow")); + } } } -*/} +} diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureDerived.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureDerived.java deleted file mode 100644 index fec6c90..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureDerived.java +++ /dev/null @@ -1,96 +0,0 @@ -package com.arc.bloodarsenal.common.tinkers; - -import cpw.mods.fml.client.FMLClientHandler; -import net.minecraft.client.Minecraft; -import net.minecraft.client.renderer.texture.TextureAtlasSprite; -import net.minecraft.client.resources.IResource; -import net.minecraft.client.resources.IResourceManager; -import net.minecraft.client.resources.data.AnimationMetadataSection; -import net.minecraft.util.ResourceLocation; - -import javax.imageio.ImageIO; -import java.awt.image.BufferedImage; -import java.awt.image.DirectColorModel; -import java.io.IOException; - -public abstract class TextureDerived extends TextureAtlasSprite -{ - private final String baseIcon; - private final String basePath; - private final TextureMapType type; - - public static enum TextureMapType - { - BLOCK(0, "textures/blocks"), ITEM(1, "textures/items"); - - public final int textureMapType; - public final String basePath; - - private TextureMapType(int textureMapType, String basePath) - { - this.textureMapType = textureMapType; - this.basePath = basePath; - } - } - - public TextureDerived(String p_i1282_1_, String baseIcon, TextureMapType type) - { - super(p_i1282_1_); - this.baseIcon = baseIcon; - this.type = type; - this.basePath = type.basePath; - } - - public static DirectColorModel rgbBase = new DirectColorModel(32, 16711680, 65280, 255, -16777216); - protected DirectColorModel rgb = rgbBase; - - public int getLuminosity(int col) - { - return getLuminosity(this.rgb.getRed(col), this.rgb.getGreen(col), this.rgb.getBlue(col)); - } - - public int getLuminosity(int r, int g, int b) - { - return (int)(r * 0.2126F + g * 0.7152F + b * 0.0722F); - } - - public boolean hasCustomLoader(IResourceManager manager, ResourceLocation location) - { - return true; - } - - public abstract BufferedImage processImage(BufferedImage paramBufferedImage, AnimationMetadataSection paramAnimationMetadataSection); - - public boolean load(IResourceManager manager, ResourceLocation oldlocation) - { - ResourceLocation location = new ResourceLocation(this.baseIcon); - location = completeResourceLocation(location); - try - { - int mipmapLevels = Minecraft.getMinecraft().gameSettings.mipmapLevels; - int anisotropicFiltering = Minecraft.getMinecraft().gameSettings.anisotropicFiltering; - IResource iresource = manager.getResource(location); - BufferedImage[] abufferedimage = new BufferedImage[1 + mipmapLevels]; - abufferedimage[0] = ImageIO.read(iresource.getInputStream()); - AnimationMetadataSection animationmetadatasection = (AnimationMetadataSection)iresource.getMetadata("animation"); - abufferedimage[0] = processImage(abufferedimage[0], animationmetadatasection); - loadSprite(abufferedimage, animationmetadatasection, anisotropicFiltering > 1.0F); - } - catch (RuntimeException runtimeexception) - { - FMLClientHandler.instance().trackBrokenTexture(location, runtimeexception.getMessage()); - return true; - } - catch (IOException ioexception1) - { - FMLClientHandler.instance().trackMissingTexture(location); - return true; - } - return false; - } - - private ResourceLocation completeResourceLocation(ResourceLocation p_147634_1_) - { - return new ResourceLocation(p_147634_1_.getResourceDomain(), String.format("%s/%s%s", new Object[] { this.basePath, p_147634_1_.getResourcePath(), ".png" })); - } -} diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureLiquidLava.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureLiquidLava.java deleted file mode 100644 index 27185b8..0000000 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureLiquidLava.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.arc.bloodarsenal.common.tinkers; - -public abstract class TextureLiquidLava extends TextureDerived -{ - public TextureLiquidLava(String p_i1282_1_, String baseIcon) - { - super(p_i1282_1_, baseIcon, TextureDerived.TextureMapType.BLOCK); - } -/* - public BufferedImage processImage(BufferedImage image, AnimationMetadataSection animationmetadatasection) - { - int w = image.getWidth(); - int h = image.getHeight(); - - int[] pixels = new int[h * w]; - image.getRGB(0, 0, w, h, pixels, 0, w); - - double mean = 0.0D; - for (int i = 0; i < pixels.length; i++) - { - pixels[i] = getLuminosity(pixels[i]); - mean += pixels[i]; - } - mean /= pixels.length; - - BufferedImage bedrockImage = TextureResourcePackBloodInfusedIron.getBedrockImage(); - for (int i = 0; i < pixels.length; i++) - { - int x = i % w; - int y = (i - x) / w % w; - int sn = (i - x) / w / w; - - int dx = x * bedrockImage.getWidth() / w; - int dy = y * bedrockImage.getHeight() / w; - - int col = bedrockImage.getRGB(dx, dy); - - double f = pixels[i] / mean; - - int r = clamp(this.rgb.getRed(col) * f); - int g = clamp(this.rgb.getGreen(col) * f); - int b = clamp(this.rgb.getBlue(col) * f); - - pixels[i] = (0xFF000000 | r << 16 | g << 8 | b); - } - image.setRGB(0, 0, w, h, pixels, 0, w); - - return image; - } - - private int clamp(double v) - { - return MathHelper.func_76125_a((int) v, 0, 255); - } - */ -} diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBase.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBase.java index 34016d9..3544316 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBase.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBase.java @@ -1,6 +1,6 @@ package com.arc.bloodarsenal.common.tinkers; -import amerifrance.guideapi.util.LogHelper; +import com.arc.bloodarsenal.common.BloodArsenal; import com.google.common.base.Throwables; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.common.ObfuscationReflectionHelper; @@ -17,19 +17,16 @@ import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.InputStream; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Set; +import java.util.*; public abstract class TextureResourcePackBase implements IResourcePack, IResourceManagerReloadListener { public static List packs; - protected static DirectColorModel rgb = new DirectColorModel(32, 16711680, 65280, 255, -16777216); + protected static DirectColorModel rgb = new DirectColorModel(32, 16711680, '\uff00', 255, -16777216); protected final String name; public HashMap cachedImages = new HashMap(); protected IResourcePack delegate; - protected List resourcePacks = null; + protected List resourcePackz = null; public TextureResourcePackBase(String name) { @@ -37,172 +34,168 @@ public abstract class TextureResourcePackBase implements IResourcePack, IResourc this.delegate = FMLClientHandler.instance().getResourcePackFor("TConstruct"); } - public int brightness(int col) - { - return brightness(rgb.getRed(col), rgb.getGreen(col), rgb.getBlue(col)); + public int brightness(int col) { + return this.brightness(rgb.getRed(col), rgb.getGreen(col), rgb.getBlue(col)); } public int brightness(int r, int g, int b) { - return (int)(r * 0.2126F + g * 0.7152F + b * 0.0722F); + return (int)((float)r * 0.2126F + (float)g * 0.7152F + (float)b * 0.0722F); } public void register() { - List packs = getResourcePacks(); + List packs = this.getiResourcePacks(); packs.add(this); - ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(this); - LogHelper.info("Registered TConstruct Resource Pack (" + this.name + ") - " + getClass().getSimpleName()); + ((IReloadableResourceManager)Minecraft.getMinecraft().getResourceManager()).registerReloadListener(this); + BloodArsenal.logger.info("Registered TCon Resource Pack (" + this.name + ") - " + this.getClass().getSimpleName()); } - public List getResourcePacks() + public List getiResourcePacks() { - List packs1 = packs; - if (packs1 == null) { - packs1 = ObfuscationReflectionHelper.getPrivateValue(FMLClientHandler.class, FMLClientHandler.instance(), new String[]{"resourcePackList"}); + List packs1 = packs; + if(packs1 == null) + { + packs1 = (List)ObfuscationReflectionHelper.getPrivateValue(FMLClientHandler.class, FMLClientHandler.instance(), new String[]{"resourcePackList"}); } + return packs1; } public InputStream getStream(ResourceLocation location) { InputStream stream = null; + Iterator i$ = this.getPacks().iterator(); - for (IResourcePack iResourcePack : getPacks()) + while(i$.hasNext()) { - if (iResourcePack.resourceExists(location)) + IResourcePack iResourcePack = (IResourcePack)i$.next(); + if(iResourcePack.resourceExists(location)) { try { stream = iResourcePack.getInputStream(location); } - catch (IOException ignore) {} + catch (IOException var6) {} } } + return stream; } public List getPacks() { - if (this.resourcePacks == null) + if(this.resourcePackz == null) { - this.resourcePacks = new ArrayList(); - this.resourcePacks.add(this.delegate); - List t = Minecraft.getMinecraft().getResourcePackRepository().getRepositoryEntriesAll(); - for (ResourcePackRepository.Entry entry : t) + this.resourcePackz = new ArrayList(); + this.resourcePackz.add(this.delegate); + List t = Minecraft.getMinecraft().getResourcePackRepository().getRepositoryEntries(); + Iterator i$ = t.iterator(); + + while(i$.hasNext()) { + ResourcePackRepository.Entry entry = (ResourcePackRepository.Entry)i$.next(); IResourcePack resourcePack = entry.getResourcePack(); - if (resourcePack.getPackName().contains("tinker")) + if(resourcePack.getResourceDomains().contains("tinker")) { - this.resourcePacks.add(resourcePack); + this.resourcePackz.add(resourcePack); } } } - return this.resourcePacks; + + return this.resourcePackz; } - @Override public InputStream getInputStream(ResourceLocation p_110590_1_) throws IOException { - byte[] bytes = this.cachedImages.get(p_110590_1_); - if (bytes == null) + byte[] bytes = (byte[])this.cachedImages.get(p_110590_1_); + if(bytes == null) { - ResourceLocation location = new ResourceLocation("tinker", p_110590_1_.getResourceDomain().replace(this.name, "")); - InputStream inputStream = getStream(location); - if (inputStream == null) + ResourceLocation location = new ResourceLocation("tinker", p_110590_1_.getResourcePath().replace(this.name, "")); + InputStream inputStream = this.getStream(location); + if(inputStream == null) { - location = new ResourceLocation("tinker", p_110590_1_.getResourceDomain().replace(this.name, "iron")); - inputStream = getStream(location); + location = new ResourceLocation("tinker", p_110590_1_.getResourcePath().replace(this.name, "iron")); + inputStream = this.getStream(location); } - if (inputStream == null) + + if(inputStream == null) { - location = new ResourceLocation("tinker", p_110590_1_.getResourceDomain().replace(this.name, "stone")); - inputStream = getStream(location); + location = new ResourceLocation("tinker", p_110590_1_.getResourcePath().replace(this.name, "stone")); + inputStream = this.getStream(location); } - if (inputStream == null) + + if(inputStream == null) { return this.delegate.getInputStream(p_110590_1_); } + BufferedImage bufferedimage; try { bufferedimage = ImageIO.read(inputStream); } - catch (IOException err) + catch (IOException var9) { - throw Throwables.propagate(err); + throw Throwables.propagate(var9); } + BufferedImage image; try { - image = modifyImage(bufferedimage); + image = this.modifyImage(bufferedimage); } - catch (Throwable t) + catch (Throwable var8) { - t.printStackTrace(); + var8.printStackTrace(); return this.delegate.getInputStream(location); } + ByteArrayOutputStream stream = new ByteArrayOutputStream(); ImageIO.write(image, "PNG", stream); bytes = stream.toByteArray(); this.cachedImages.put(location, bytes); } + return new ByteArrayInputStream(bytes); } - public abstract BufferedImage modifyImage(BufferedImage paramBufferedImage); + public abstract BufferedImage modifyImage(BufferedImage var1); - @Override public boolean resourceExists(ResourceLocation p_110589_1_) { - if (!"tinker".equals(p_110589_1_.getResourceDomain())) + if(!"tinker".equals(p_110589_1_.getResourceDomain())) { return false; } - String resourcePath = p_110589_1_.getResourcePath(); - if ((!resourcePath.startsWith("textures/items/")) || (!resourcePath.endsWith(".png"))) + else { - return false; + String resourcePath = p_110589_1_.getResourcePath(); + return resourcePath.startsWith("textures/items/") && resourcePath.endsWith(".png")?(this.delegate.resourceExists(p_110589_1_)?false:(!resourcePath.contains(this.name)?false:this.delegate.resourceExists(new ResourceLocation("tinker", resourcePath.replace(this.name, "stone"))) || this.delegate.resourceExists(new ResourceLocation("tinker", resourcePath.replace(this.name, "iron"))) || this.delegate.resourceExists(new ResourceLocation("tinker", resourcePath.replace(this.name, ""))))):false; } - if (this.delegate.resourceExists(p_110589_1_)) - { - return false; - } - if (!resourcePath.contains(this.name)) - { - return false; - } - return (this.delegate.resourceExists(new ResourceLocation("tinker", resourcePath.replace(this.name, "stone")))) || (this.delegate.resourceExists(new ResourceLocation("tinker", resourcePath.replace(this.name, "iron")))) || (this.delegate.resourceExists(new ResourceLocation("tinker", resourcePath.replace(this.name, "")))); } - @Override - public Set getResourceDomains() - { + public Set getResourceDomains() { return this.delegate.getResourceDomains(); } - @Override public IMetadataSection getPackMetadata(IMetadataSerializer p_135058_1_, String p_135058_2_) throws IOException { return null; } - @Override public BufferedImage getPackImage() throws IOException { return null; } - @Override - public String getPackName() - { + public String getPackName() { return "BA_Delegate_Pack"; } - @Override public void onResourceManagerReload(IResourceManager p_110549_1_) { this.cachedImages.clear(); - this.resourcePacks = null; + this.resourcePackz = null; } } diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBloodInfusedIron.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBloodInfusedIron.java index d63ecd3..689659c 100644 --- a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBloodInfusedIron.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBloodInfusedIron.java @@ -6,6 +6,8 @@ import java.awt.image.BufferedImage; public class TextureResourcePackBloodInfusedIron extends TextureResourcePackBase { + static int[][] offsets = new int[][]{{0, 1}, {1, 1}, {1, 0}, {1, -1}, {0, -1}, {-1, -1}, {-1, 0}, {-1, 1}}; + public TextureResourcePackBloodInfusedIron(String name) { super(name); @@ -15,344 +17,335 @@ public class TextureResourcePackBloodInfusedIron extends TextureResourcePackBase { int w = image.getWidth(); int h = image.getHeight(); - image.getType(); - int[][] pixels = new int[w][h]; - int[][] base = new int[w][h]; - + boolean[][] base = new boolean[w][h]; int mean = 0; int div = 0; - for (int x = 0; x < w; x++) + + for(int n = 0; n < w; ++n) { - for (int y = 0; y < h; y++) + for(int baseSilhouette = 0; baseSilhouette < h; ++baseSilhouette) { - int c = image.getRGB(x, y); - pixels[x][y] = brightness(c); - boolean nottrans = (c != 0) && (rgb.getAlpha(c) > 64); - if (nottrans) + int interior1 = image.getRGB(n, baseSilhouette); + pixels[n][baseSilhouette] = this.brightness(interior1); + boolean baseCorners = interior1 != 0 && rgb.getAlpha(interior1) > 64; + if(baseCorners) { - base[x][y] = 1; - mean += pixels[x][y]; - div++; + base[n][baseSilhouette] = true; + mean += pixels[n][baseSilhouette]; + ++div; } } } + mean = mean / div * 2 / 4; - int n; - if (w >= 256) + byte var26; + if(w >= 256) { - n = 5; + var26 = 5; + } + else if(w >= 128) + { + var26 = 4; + } + else if(w >= 64) + { + var26 = 3; + } + else if(w >= 32) + { + var26 = 2; } else { - if (w >= 128) - { - n = 4; - } - else - { - if (w >= 64) - { - n = 3; - } - else - { - if (w >= 32) - { - n = 2; - } else - { - n = 1; - } - } - } + var26 = 1; } - int[][] baseSilhouette = contract(base, n); - - int[][] interior1 = contract(baseSilhouette, n); - - int[][] baseCorners = multI(mult(expand(getCorners(baseSilhouette), n), baseSilhouette), interior1); - int[][] baseCornersShift = orwise(orwise(shift(baseCorners, 0, -1), shift(baseCorners, -1, 0)), shift(baseCorners, -1, -1)); - - int[][] interior2 = contract(interior1, 2 * n); - - int[][] interior3 = contract(interior2, n); - int[][] interior4 = contract(interior3, n); - - int[][] interiorCorners = multI(mult(expand(getCorners(interior2), n), interior2), interior3); - int[][] interiorCornersShift = orwise(orwise(shift(interiorCorners, -1, 0), shift(interiorCorners, 0, -1)), shift(interiorCorners, -1, -1)); - - int trans = 0; - int gold = -398001; - int gold_highlight = -117; - int wood = -6455217; - int darkwood = -10071758; + boolean[][] var27 = this.contract(base, var26); + boolean[][] var28 = this.contract(var27, var26); + boolean[][] interior2 = this.contract(var28, 2 * var26); + boolean[][] interior3 = this.contract(interior2, var26); + boolean[][] interior4 = this.contract(interior3, var26); + boolean[][] interiorCorners = this.multI(this.mult(this.expand(this.getCorners(interior2), var26), interior2), interior3); + boolean[][] interiorCornersShift = this.orwise(this.orwise(this.shift(interiorCorners, -1, 0), this.shift(interiorCorners, 0, -1)), this.shift(interiorCorners, -1, -1)); + byte trans = 0; + int red = 16752029; + int pink_highlight = 16752029; + int iron = 16752029; + int darkiron = 13592423; int[][] outpixels = new int[w][w]; - for (int x = 0; x < w; x++) + + for(int x = 0; x < w; ++x) { - for (int y = 0; y < h; y++) + for(int y = 0; y < h; ++y) { - if (baseSilhouette[x][y] == 0) + if(!var27[x][y]) { - if (base[x][y] != 0) + if(base[x][y]) { - outpixels[x][y] = multPixel(darkwood, pixels[x][y] / 2); + outpixels[x][y] = this.multPixel(darkiron, pixels[x][y] / 2); } else { outpixels[x][y] = trans; } } - else if (interior1[x][y] == 0) + else if(interior2[x][y] && !interior3[x][y]) { - if (baseCorners[x][y] != 0) + if(interiorCorners[x][y]) { - if (baseCornersShift[x][y] != 0) + if(interiorCornersShift[x][y]) { - outpixels[x][y] = multPixel(gold, Math.max(pixels[x][y], mean)); + outpixels[x][y] = this.multPixel(red, Math.max(pixels[x][y], mean)); } else { - outpixels[x][y] = multPixel(gold_highlight, Math.max(pixels[x][y], mean) + 5); + outpixels[x][y] = this.multPixel(pink_highlight, Math.max(pixels[x][y], mean) + 5); } } else { - outpixels[x][y] = multPixel(darkwood, pixels[x][y]); - } - } - else if ((interior2[x][y] == 0) || (interior3[x][y] != 0)) - { - if ((interior3[x][y] != 0) && (interior4[x][y] == 0)) - { - outpixels[x][y] = multPixel(wood, pixels[x][y] * 3 / 4); - } - else - { - outpixels[x][y] = multPixel(wood, pixels[x][y]); - } - } - else if (interiorCorners[x][y] != 0) - { - if (interiorCornersShift[x][y] != 0) - { - outpixels[x][y] = multPixel(gold, Math.max(pixels[x][y], mean)); - } - else - { - outpixels[x][y] = multPixel(gold_highlight, Math.max(pixels[x][y], mean) + 5); + outpixels[x][y] = this.multPixel(red, pixels[x][y]); } } else { - outpixels[x][y] = multPixel(darkwood, pixels[x][y]); + outpixels[x][y] = this.multPixel(iron, pixels[x][y]); } + image.setRGB(x, y, outpixels[x][y]); } } + return image; } - private int[][] orwise(int[][] a, int[][] b) + private boolean[][] orwise(boolean[][] a, boolean[][] b) { - for (int i = 0; i < a.length; i++) + for(int i = 0; i < a.length; ++i) { - for (int j = 0; j < a[i].length; j++) + for(int j = 0; j < a[i].length; ++j) { a[i][j] |= b[i][j]; } } + return a; } - private int[][] mult(int[][] a, int[][] b) + private boolean[][] mult(boolean[][] a, boolean[][] b) { - for (int i = 0; i < a.length; i++) + for(int i = 0; i < a.length; ++i) { - for (int j = 0; j < a[i].length; j++) + for(int j = 0; j < a[i].length; ++j) { a[i][j] &= b[i][j]; } } + return a; } - private int[][] multI(int[][] a, int[][] b) + private boolean[][] multI(boolean[][] a, boolean[][] b) { - for (int i = 0; i < a.length; i++) + for(int i = 0; i < a.length; ++i) { - for (int j = 0; j < a[i].length; j++) + for(int j = 0; j < a[i].length; ++j) { - a[i][j] &= (b[i][j] == 0 ? 1 : 0); + a[i][j] &= !b[i][j]; } } + return a; } - private int[][] expand(int[][] base, int n) + private boolean[][] expand(boolean[][] base, int n) { - int[][] output = expand(base); - for (int i = 0; i < n - 1; i++) + boolean[][] output = this.expand(base); + + for(int i = 0; i < n - 1; ++i) { - output = expand(output); + output = this.expand(output); } + return output; } - private int[][] contract(int[][] base, int n) + private boolean[][] contract(boolean[][] base, int n) { - int[][] output = contract(base); - for (int i = 0; i < n - 1; i++) + boolean[][] output = this.contract(base); + + for(int i = 0; i < n - 1; ++i) { - output = contract(output); + output = this.contract(output); } + return output; } public int multPixel(int col, int b) { - return 0xFF000000 | clamp(rgb.getRed(col) * b / 255) << 16 | clamp(rgb.getGreen(col) * b / 255) << 8 | clamp(rgb.getBlue(col) * b / 255); + return -16777216 | this.clamp(rgb.getRed(col) * b / 255) << 16 | this.clamp(rgb.getGreen(col) * b / 255) << 8 | this.clamp(rgb.getBlue(col) * b / 255); } - private int clamp(int i) - { + private int clamp(int i) { return MathHelper.clamp_int(i, 0, 255); } - public boolean get(int[][] img, int x, int y) + public boolean get(boolean[][] img, int x, int y) { - return (x >= 0) && (y >= 0) && (x < img.length) && (y < img[x].length) && (img[x][y] != 0); + return x >= 0 && y >= 0 && x < img.length && y < img[x].length && img[x][y]; } - static int[][] offsets = { { 0, 1 }, { 1, 1 }, { 1, 0 }, { 1, -1 }, { 0, -1 }, { -1, -1 }, { -1, 0 }, { -1, 1 } }; - - public int[][] shift(int[][] img, int dx, int dy) + public boolean[][] shift(boolean[][] img, int dx, int dy) { int w = img.length; - int[][] img2 = new int[w][w]; - for (int x = Math.max(-dx, 0); x < Math.min(w, w + dx); x++) + boolean[][] img2 = new boolean[w][w]; + + for(int x = Math.max(-dx, 0); x < Math.min(w, w + dx); ++x) { - System.arraycopy(img[(x + dx)], Math.max(-dy, 0) + dy, img2[x], Math.max(-dy, 0), Math.min(w, w + dy) - Math.max(-dy, 0)); + System.arraycopy(img[x + dx], Math.max(-dy, 0) + dy, img2[x], Math.max(-dy, 0), Math.min(w, w + dy) - Math.max(-dy, 0)); } + return img2; } - public int[][] getCorners(int[][] img) + public boolean[][] getCorners(boolean[][] img) { int w = img.length; - int[][] img2 = new int[w][w]; - for (int x = 0; x < w; x++) + boolean[][] img2 = new boolean[w][w]; + + for(int x = 0; x < w; ++x) { - for (int y = 0; y < w; y++) + for(int y = 0; y < w; ++y) { - if (img[x][y] != 0) - { + if(img[x][y]) { int an = -1; int n = 0; - for (int[] offset : offsets) + int[][] arr$ = offsets; + int len$ = arr$.length; + + for(int i$ = 0; i$ < len$; ++i$) { - if (get(img, x + offset[0], y + offset[1])) + int[] offset = arr$[i$]; + if(this.get(img, x + offset[0], y + offset[1])) { - if (an == -1) + if(an == -1) { an = n; } + n = 0; } else { - n++; - if (n == 5) + ++n; + if(n == 5) { break; } } } - if (an != -1) + + if(an != -1) { n += an; } - if (n >= 5) + + if(n >= 5) { - img2[x][y] = 1; + img2[x][y] = true; } } } } + return img2; } - public int[][] contract(int[][] img) + public boolean[][] contract(boolean[][] img) { int w = img.length; - int[][] img2 = new int[w][w]; - for (int x = 0; x < w; x++) + boolean[][] img2 = new boolean[w][w]; + + int x; + for(x = 0; x < w; ++x) { System.arraycopy(img[x], 0, img2[x], 0, w); } - for (int x = 0; x < w; x++) + + for(x = 0; x < w; ++x) { - for (int y = 0; y < w; y++) + for(int y = 0; y < w; ++y) { - if (img[x][y] != 0) + if(img[x][y]) { - if ((x == 0) || (y == 0) || (x == w - 1) || (y == w - 1)) - { - img2[x][y] = 0; + if(x == 0 || y == 0 || x == w - 1 || y == w - 1) { + img2[x][y] = false; } } else { - if (x > 0) + if(x > 0) { - img2[(x - 1)][y] = 0; + img2[x - 1][y] = false; } - if (y > 0) + + if(y > 0) { - img2[x][(y - 1)] = 0; + img2[x][y - 1] = false; } - if (x < w - 1) + + if(x < w - 1) { - img2[(x + 1)][y] = 0; + img2[x + 1][y] = false; } - if (y < w - 1) + + if(y < w - 1) { - img2[x][(y + 1)] = 0; + img2[x][y + 1] = false; } } } } + return img2; } - public int[][] expand(int[][] img) + public boolean[][] expand(boolean[][] img) { int w = img.length; - int[][] img2 = new int[w][w]; - for (int x = 0; x < w; x++) + boolean[][] img2 = new boolean[w][w]; + + int x; + for(x = 0; x < w; ++x) { System.arraycopy(img[x], 0, img2[x], 0, w); } - for (int x = 0; x < w; x++) + + for(x = 0; x < w; ++x) { - for (int y = 0; y < w; y++) + for(int y = 0; y < w; ++y) { - if (img[x][y] != 0) - { - for (int[] offset : offsets) + if(img[x][y]) { + int[][] arr$ = offsets; + int len$ = arr$.length; + + for(int i$ = 0; i$ < len$; ++i$) { + int[] offset = arr$[i$]; int dx = x + offset[0]; int dy = y + offset[1]; - if ((dx >= 0) && (dy >= 0) && (dx < w) && (dy < w)) + if(dx >= 0 && dy >= 0 && dx < w && dy < w) { - img2[dx][dy] = 1; + img2[dx][dy] = true; } } } } } + return img2; } } diff --git a/src/main/resources/assets/bloodarsenal/lang/en_US.lang b/src/main/resources/assets/bloodarsenal/lang/en_US.lang index f91921b..53e05bd 100644 --- a/src/main/resources/assets/bloodarsenal/lang/en_US.lang +++ b/src/main/resources/assets/bloodarsenal/lang/en_US.lang @@ -219,36 +219,9 @@ ba.versioning.disabled=This feature is disabled. owner=Owner: #TConstruct Stuffs -material.blood_infused_iron=Blood Infused Iron +material.bloodarsenal.blood_infused_wood=Blood Infused Wood +material.bloodarsenal.blood_infused_iron=Blood Infused Iron -part.arrowhead=@material@ Arrowhead -part.axe.head=@material@ Axe Head -part.battle.sign=@material@ Battle Sign -part.binding=@material@ Binding -part.bolt=@material@ Bolt -part.bow.limb=@material@ Bow Limb -part.chisel.head=@material@ Chisel Head -part.chunk=@material@ Chunk -part.crossbar=@material@ Crossbar -part.crossbow.body=@material@ Crossbow Body -part.crossbow.limb=@material@ Crossbow Limb -part.excavator.head=@material@ Excavator Head -part.frypan.head=@material@ Pan Head -part.full.guard=@material@ Full Guard -part.hammer.head=@material@ Hammer Head -part.knife.blade=@material@ Knife Blade -part.large.guard=@material@ Large Guard -part.large.sword.blade=@material@ Large Sword Blade -part.largeplate=@material@ Large Plate -part.lumberaxe.head=@material@ Broad Axe Head -part.medium.guard=@material@ Medium Guard -part.pickaxe.head=@material@ Pickaxe Head -part.scythe.head=@material@ Scythe Head -part.shovel.head=@material@ Shovel Head -part.shuriken=@material@ Shuriken -part.sword.blade=@material@ Sword Blade -part.toolrod=@material@ Tool Rod -part.toughbind=@material@ Tough Binding -part.toughrod=@material@ Tough Rod +fluid.molten.blood_infused_iron=Molten Blood Infused Iron modifier.toolstation.Soulbound=Soulbound diff --git a/src/main/resources/assets/bloodarsenal/models/EnergyGatling.png b/src/main/resources/assets/bloodarsenal/models/EnergyGatling.png deleted file mode 100644 index 0367cd5406b7718c33c05cb62fd777791865037c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 870 zcmV-s1DX7ZP)WFU8GbZ8()Nlj2>E@cM*00PQML_t(&-tCx6iyc)I zg}=SetLom4i3s9QL2;sxxj6Gz7!nZ#AtVqKg&<_)KoCU1k)Yy_$Zt{c7pQ?2`u45I zd29!_X$VB5AE4FU3u;uS)?uxxz4xjE!2S0=wY#@JHco+8!#nnJc8|aipc{$M>}Gs-u~WdGmB6SNw%igp zD?z0o$mKOa7X0?l#Q-JHsF&A(Yy-C7AapK6To#-K^gP7NW$pnYj+tS({{m+vC=2fa z@=AEyc5yahGz>eM>w=dKtWv26;E7ZUjfNu}&;P=B9EySCdxe=sISNX4^vQV?J=$w` z1=jqMAO9zn^vq2^c~&fn^L9* zCIm?Y9|#IK9K7`N{QeT z`v*@*sRIm?MsoedHK2<Bx@g`S}vTnGc?&g+j%n(%!8A~c~- zYqrydu^y8Aig7$7#U7`TT*lqGp;U&vrM8O05mRKdJtRiQcRxRrWi`PD>u{Z%3(h&F zJaaJp#Sg!IcD(5Ro8K_ki7_A2iP47@%1CaNVgtT7uCH#ezx`u*CD8dbW`;VUwMMBk zQy!mMG|XEZ!d~|rd)+lum3hw0WyEVB`kpC|l(xJ;q#{CX6&1y)V}JW6UY|bWdtv<& zA$oA2>X^%fghrRTU4z^{VX^_|mp2)FZX;e3CPt|fF?v)2_ulv#5q1KH-^pzzXr#5m wShhIlQ9RpeL-L6#8Sgw-xWW~#aD@foZ^Tv{y`VW!IsgCw07*qoM6N<$f`ROY=l}o! diff --git a/src/main/resources/assets/bloodarsenal/models/armor/EnergyGatling.png b/src/main/resources/assets/bloodarsenal/models/armor/EnergyGatling.png deleted file mode 100644 index 0367cd5406b7718c33c05cb62fd777791865037c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 870 zcmV-s1DX7ZP)WFU8GbZ8()Nlj2>E@cM*00PQML_t(&-tCx6iyc)I zg}=SetLom4i3s9QL2;sxxj6Gz7!nZ#AtVqKg&<_)KoCU1k)Yy_$Zt{c7pQ?2`u45I zd29!_X$VB5AE4FU3u;uS)?uxxz4xjE!2S0=wY#@JHco+8!#nnJc8|aipc{$M>}Gs-u~WdGmB6SNw%igp zD?z0o$mKOa7X0?l#Q-JHsF&A(Yy-C7AapK6To#-K^gP7NW$pnYj+tS({{m+vC=2fa z@=AEyc5yahGz>eM>w=dKtWv26;E7ZUjfNu}&;P=B9EySCdxe=sISNX4^vQV?J=$w` z1=jqMAO9zn^vq2^c~&fn^L9* zCIm?Y9|#IK9K7`N{QeT z`v*@*sRIm?MsoedHK2<Bx@g`S}vTnGc?&g+j%n(%!8A~c~- zYqrydu^y8Aig7$7#U7`TT*lqGp;U&vrM8O05mRKdJtRiQcRxRrWi`PD>u{Z%3(h&F zJaaJp#Sg!IcD(5Ro8K_ki7_A2iP47@%1CaNVgtT7uCH#ezx`u*CD8dbW`;VUwMMBk zQy!mMG|XEZ!d~|rd)+lum3hw0WyEVB`kpC|l(xJ;q#{CX6&1y)V}JW6UY|bWdtv<& zA$oA2>X^%fghrRTU4z^{VX^_|mp2)FZX;e3CPt|fF?v)2_ulv#5q1KH-^pzzXr#5m wShhIlQ9RpeL-L6#8Sgw-xWW~#aD@foZ^Tv{y`VW!IsgCw07*qoM6N<$f`ROY=l}o! diff --git a/src/main/resources/assets/bloodarsenal/models/armor/EnergyGatling2.png b/src/main/resources/assets/bloodarsenal/models/armor/EnergyGatling2.png deleted file mode 100644 index 4015b08d3a1c6ab5e67e6f6bebec6498d57b40f2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 732 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_flow.png.mcmeta b/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_flow.png.mcmeta new file mode 100644 index 0000000..8e55e43 --- /dev/null +++ b/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_flow.png.mcmeta @@ -0,0 +1,5 @@ +{ + "animation": { + "frametime": 3 + } +} diff --git a/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_still.png b/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_still.png new file mode 100644 index 0000000000000000000000000000000000000000..cd0c0b7a0cebfa77869de8e8074d06644941a0b1 GIT binary patch literal 12474 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_still.png.mcmeta b/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_still.png.mcmeta new file mode 100644 index 0000000..7ceb363 --- /dev/null +++ b/src/main/resources/assets/bloodarsenal/textures/blocks/molten_blood_infused_iron_still.png.mcmeta @@ -0,0 +1,45 @@ +{ + "animation": { + "frametime": 2, + "frames": [ + 0, + 1, + 2, + 3, + 4, + 5, + 6, + 7, + 8, + 9, + 10, + 11, + 12, + 13, + 14, + 15, + 16, + 17, + 18, + 19, + 18, + 17, + 16, + 15, + 14, + 13, + 12, + 11, + 10, + 9, + 8, + 7, + 6, + 5, + 4, + 3, + 2, + 1 + ] + } +} \ No newline at end of file diff --git a/src/main/resources/assets/bloodarsenal/textures/items/blood_ball.png b/src/main/resources/assets/bloodarsenal/textures/items/blood_ball.png deleted file mode 100644 index 2eb01b100cbf869a0bc11d938d5e282b137007f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 372 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqkA%3iXr}#rpplG>o-U3d7N^fn+Us}NK;U?NtA-rI z)Cvbz*H^*{rH*%vHhcEGJzo#{a8q=GW8{!;l(4H@cAFKwfA}k{an^LB{Ts5xtEri diff --git a/src/main/resources/assets/bloodarsenal/textures/items/burned_tome.png b/src/main/resources/assets/bloodarsenal/textures/items/burned_tome.png new file mode 100644 index 0000000000000000000000000000000000000000..feb9e919444d822531711fe9579f44631d7199d0 GIT binary patch literal 586 zcmV-Q0=4~#P)#;xF>^#h?F2^9P@oTcEPr4%&n z-l;A{P+U5SNT)Q#Hkg`AnwtcPH@U|l-bx!|2YshAyuXKYp7T8Lk0X~YETvL9IIq=e zL;J>M;KNu9kuy$T6fs7Dw<8fOr6^V^w3K2io8{5?_>hQk5zLQ`(d_l;0#A;Qd6~&z zi%>W?;KlUxkcb4}HN(IM(xyqX*W=mA2~RT_LVyKWB0M-cVk?^k;8ml+TCFAuAQz8g zDMhE>r|x-ZprsUAYx;l|p$|Myr_p-gsbl`&adJY-QYxi$@i+is*F^)NU*8iF;fiHp z0Fh7#LxhjbCIB}I1wQQV{`TPJ!UFHt*RfkIY^CV>KDJU=B8Ui|T^E3>b8{pnCvmFP zfr)kBBL}3TQEuh)yxG~o>~u()CSBjB+-?JKy;!7OE)$DH_;PwmWqX^F;|zi{8xHF` zGc(*_%g7)x||xhld!RM|5h6ccl^luN~)n5(AO@^YeUjUAl<`S}E$) zDig^hd#kJGz&+2Cp(qC;cUM;Uw7<{yXq4*4#vj3vT?j;iCyWCBTBg}>_^d#q!2dQs Y0h+tL@rtEak-aeD9M-CoR&B5nIOPrrHA?c*f3AQy3+BZr&> z@+&mgs(QgNX{|3nmFTq@;}S;gc++7 z!%R(Y|EfJNEfaTfLdzVrl{YWca|Uf*DaWWg?_+1+l(xugjVvo~UTWg;p4`CUX!n|n z;a~hrR*jPeDjHpfg^W*5-aBod`3$q{SHcrMyB(3}V{-R%>UFPHjeovG+$Q;2Xdu_E z`7?`URF!=`Cg?BC7f(CeXH~>?izP(kWWW~nKh6f}Wm}gpJDjn2AkY%{%JyMi%i^WU zU-vdF+A!z-JcS=66^@#cOV91yJK_GlQ@=NGD1@vQexon9$ihkJSjLyu-AtiROaHZP z(kWP%lK-%wMQZyupMSH2`4xDQ8FKC&yCs$=QJCzXIzjU*gVjy#lXq>Dryc&wQBQXxZG@ zsdM(e(ZBhZ!jEDk!psP0*{!pY+ix6Qp3bE`Kt{rvH* c-tHvdxn*wt-RE-Cfv#ZiboFyt=akR{0BL+w?EnA( literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_battleaxe_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_battleaxe_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..7fd383fd004d518c13449a86df1d6ec35af3c9c7 GIT binary patch literal 256 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~yM!pON!u}>NT5)!r;B5V#p$;b4EYWj@VL$w>|VOb zpya8YN9xHY3*P51467!2*)muMwXHIlIpOAHGp1+%KAwJm`=67eSz@PZkw=eE&C01> zq7C6aCFf_fzPbM3_Dhe~=gug8_%`pi0fXV}sawykEk2|8;P<@a7DZpN*z Un)5MFfG%e6boFyt=akR{03I!4)c^nh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bolt_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bolt_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..9786cdc7f5abb091f9b04809fe23e50523848dbb GIT binary patch literal 192 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=DjSL74G){)!Z!AbW|YuPgg~b_r2smemraH-SRFo-U3d7N_4%*vNZ8L4bMfng^^B zJ&biGGjy00YO6CBeF<0~5>vk|HPf8upg@X(=k+Ob9QDKW<1)@IxOr#mr5uSQt0$B1 h|2!@KqTq)tKd*r5q+gY4l0btQJYD@<);T3K0RS&=K6(HE literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..72f5f4201c5cdd287a56d579c0bd09cd3a734657 GIT binary patch literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~yM&kk+h*(YbAUp@o-U3d7N_4%T*!OCfQQBR?OGd$ z4V~;SPTW*rj?mh>>Cp+*wO1amzx>iQj{CV|eT>tLi)Q?xVQRUbPo?Y*Km1N>IdHcEt&%0wzaTt~8@SQaQ8qeVA>gTe~DWM4fdFDXs literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect_1.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect_1.png new file mode 100644 index 0000000000000000000000000000000000000000..b9e6f586dae0cd436e1a227104a987024c902398 GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~yCknN+xz*A5kR4EPZ!4!i_^&o5?dbp-`?~8zrFDv zb^p)lZT}y}#Qd+dwERDL?axY|GykRg`u=;CZPQnO{{Ok5;eUTE&56&LO3s2*{jWd$ p!++D|d?u0NQwXe literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect_2.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect_2.png new file mode 100644 index 0000000000000000000000000000000000000000..b9e6f586dae0cd436e1a227104a987024c902398 GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~yCknN+xz*A5kR4EPZ!4!i_^&o5?dbp-`?~8zrFDv zb^p)lZT}y}#Qd+dwERDL?axY|GykRg`u=;CZPQnO{{Ok5;eUTE&56&LO3s2*{jWd$ p!++D|d?u0NQwXe literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect_3.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_bow_effect_3.png new file mode 100644 index 0000000000000000000000000000000000000000..b9e6f586dae0cd436e1a227104a987024c902398 GIT binary patch literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~yCknN+xz*A5kR4EPZ!4!i_^&o5?dbp-`?~8zrFDv zb^p)lZT}y}#Qd+dwERDL?axY|GykRg`u=;CZPQnO{{Ok5;eUTE&56&LO3s2*{jWd$ p!++D|d?u0NQwXe literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_crossbow_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_crossbow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..0a3aecd7db11409342377c65df73708ff989407e GIT binary patch literal 217 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=DjSL74G){)!Z!AbW|YuPgg~b_r2^?KL&*JwTx}PZ!4!i_^&o3s`^rpZU<<$amAT z0=;$rPng(!^?AY6vxlc=RsBB$myTk?75{!7K5*jn0gp+Wvv1t^XW!rXlYcSi%jA~K zwwp6##g2V&3TbeB^p&0Mq^h@s=Qrz(X2Jf(RT4c-f}9L%S37iNACb8Tw2{Hn)z4*} HQ$iB}tY1(= literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_cutlass_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_cutlass_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..bbc82736db85024b66ec1f0b48ea735c8e4a37cb GIT binary patch literal 271 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~yM(Bb?3`8qIDtZQJY5_^EKWb2w2`;jK)_Xg!l}|F zU*eRiFSIl<+W2{8wK*nnc9}>X5R(0+DYRH5A#wSc={k3RzPtZFT~cVlP0xAXXU=8t zbNA4Z4e5J!hxu9X%Zcu;Q{Ds?8)nz7&t{N2%y6J|R@aJ8XC-WJhb`VJwKnw9y8BNe z@^@D5F3FbIx^w&Yz^}RNQ@w-qzjHlYy7}$oZUdD+TlOgKpYUHm|9fZz!+zH5-+}IA N@O1TaS?83{1OPHJXTtyh literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_dagger_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_dagger_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..3d44555e8df330e8e374051740a1895b9df40bbb GIT binary patch literal 529 zcmV+s0`C2ZP)JP#OpyTmUBTmzCykk5qQ0Z4d?iX2xi?iU2eZC#Ysua3aCJD~qw1+%7H2c`7BA zWg&q57GS62;St}JubLLZB7$XEz2N|Iv%|RAVWdG<XHC??t7g)I4d(3l&<2Hjtr(;u4A|d0Q9J7!cHID`y4vGs#H+ylSwe&-ynNG~tq zs&ILRgCy-~DfFCZE4CUO244(^rL?DIYu)$1a3;FOf@P73uF+|7D7=%+%6ol%^8MhT z+{tFUCh=Mt?^g#P61O-xyUEeaE4rD8RuI56Gyrl>wurs zr=72Dk0=8GyVB&!{a)45`iETt!7&DUKmD^!AHcD5HUN6U4?rpzR&ep!8*Ys@F%6Ac z-Jw=@FbxgU&?uA}^njP(!p#t-p{dxfZaC&(W-}84%h*)v b`h))h{-D(N%c1Fw00000NkvXXu0mjf;pYS# literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_fishingrod_effect1.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_fishingrod_effect1.png new file mode 100644 index 0000000000000000000000000000000000000000..6c521a6e0d8f6a9fd40d77f3440d6da392e4103a GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~yM!1kr--46Bv44h)5S5w;&gI?1nXg0oBqz9{@b2O t_w_x=wp+QxW#2Oo#fASDPjpXbV7PdeqoGViDGaEG!PC{xWt~$(69D`4D$D=? literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_fishingrod_effect2.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_fishingrod_effect2.png new file mode 100644 index 0000000000000000000000000000000000000000..00e1051f4d23e05bb394cb9b0b39997de5b58de3 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~yM!34*i1{yH$Wj{PZ!4!i_^&o60D08PBi|%Z}e~S z`k%&!>*M{-{r_)o{73zC8i;v5IZ4C3B`H6^Hi7ZfGez&`zq>90wKI6S`njxgN@xNA D7Lzq- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_frypan_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_frypan_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..0dc3e44eae8abfa408e6477f53fbe489a821956d GIT binary patch literal 357 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~yM!1Av!mByFQCvTPZ!4!i_>=}?ae#nAkeb^XyzUv z(TSIS*DhFS&?;(G(x0-lS&P?K?vT)W$L63VRxhngGzCWO%l=)^mZ#mKnK)w?A%)x%X@JZ&^<#!J8tdz1H0= zU7sU&RH4fd+3)p=>&p>jI29xKb8>Kxv3*J~wvb!~{IO*#Hm6g+*&(`(N{`hCsj%Nub z9%e_^t=z5hantA1x24YM-V}IxMZ@Ub@Bb^x70Y|pPV{Bp1oSmdKI;Vst0EGOO AY5)KL literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_hammer_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_hammer_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..aba118c90e2e896d4f49764535efd9e9b3494ed7 GIT binary patch literal 258 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~yM!1Q%Ug+%Y@krTr;B5V#p$>GihRuu0aDM#OPeL$f)PZ!4!i_>o>Y~(%UAi(n6Q1hf{ zgX;8$LU#@>)_<^Cv5Z&mh*0i?8bmdKI;Vst0B#Lf@Bjb+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_knife_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_knife_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..349b303d6022c69b557de4cdd2b9dbe866025205 GIT binary patch literal 275 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=DjSL74G){)!Z!AbW|YuPgg~c1d0>>DcJ76F{K_o-U3d7N_4%+Q@m>K*06C>Qt74 zTMH6DsL37JD$Tz@(Wry{gV8+&=@f=WtIxrj6J>>DHG_VJw?DA`vXuFsteZdEhx85R zZOvO#zF2WGpJ3p-w#mHhdtr*uw1Y3^KUn)Zu3)7TpI+|n#_vs+)jd@TOZh@CFIbhm zqjDO{Y1U7%8~ipXzp?q0QSP(EtI@bgl#H%~He QInb>Pp00i_>zopr0C#!mnM0WwKM zK~y-)m6Wkc!%!54zbolrq*V%ng6Io~qpzUt;I0$|rwp$806u_IhAa-k#BPXl`#(lhgxuxCj3K{QrM0SGBr6Y26>6QdXip0Z?wB(w;LHaEt&P zZQPiH_2<~F| z3VJgfB%`dzrjp-$Qhf7j*ab^0h?OTCHEc})>M#GV3yzzd1pLiQ~9+^J*v%Tv^hiz{|*ck$w8>Sw2{%Ha95re0zpUXO@geCyt C^L*q0 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_pickmattock_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_pickmattock_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..f8590c2dd91162be467e4d0ab1989ba0013426de GIT binary patch literal 2956 zcmV;73v={|P)uJ@VVD_UC<6{NG_fI~0ue<-1QkJoA_k0xBC#Thg@9ne9*`iQ#9$Or zQF$}6R&?d%y_c8YA7_1QpS|}zXYYO1x&V;8{kgn!SPFnNo`4_X6{c}T{8k*B#$jdxfFg<9uYy1K45IaYvHg`_dOZM)Sy63ve6hvv z1)yUy0P^?0*fb9UASvow`@mQCp^4`uNg&9uGcn1|&Nk+9SjOUl{-OWr@Hh0;_l(8q z{wNRKos+;6rV8ldy0Owz(}jF`W(JeRp&R{qi2rfmU!TJ;gp(Kmm5I1s5m_f-n#TRsj}B0%?E`vOzxB2#P=n*a3EfYETOrKoe*ICqM@{4K9Go;5xVgZi5G4 z1dM~{UdP6d+Yd3o?MrAqM0Kc|iV92owdyL5UC#5<>aVCa44|hpM4E zs0sQWIt5*Tu0n&*J!lk~f_{hI!w5`*sjxDv4V%CW*ah~3!{C*0BD@;TgA3v9a1~q+ zAA{TB3-ERLHar49hi4Ih5D^-ph8Q6X#0?2VqLBoIkE}zAkxHZUgRb+f=nat zP#6>iMMoK->`~sRLq)(kHo*Vn{;LcG6+edD1=7D>9j^O?D{Qg|tCDK{ym)H7&wDr6*;uGTJg8GHjVbnL{!cWyUB7MT6o-VNo_w8Yq`2<5Ub)hw4L3rj}5@qxMs0 zWMyP6Wy582WNT#4$d1qunl{acmP#w5ouJ*Jy_Zv#bCKi7ZIf$}8d zZdVy&)LYdbX%I9R8VMQ|8r>Q*nyQ)sn)#Z|n)kKvS`4iu ztvy=3T65Yu+7a4Yv^%sXb>ww?bn(=Yu(!=O6^iuTp>)p_Y^{w=i z^lS773}6Fm1Fpe-gF!>Ip{*g$u-szvGhed;vo5pW&GpS$<~8QGEXWp~7V9lKEnZq0SaK{6Sl+dwSOr*Z zvFf(^Xl-N7w{EeXveC4Ov)N}e%%C!Y7^RFWwrE>d+x51mZQt2h+X?JW*!^a2WS?Sx z)P8cQ&Qi|OhNWW;>JChYI)@QQx?`Nj^#uJBl~d&PK+RZLOLos~K(b5>qmrMN0})tOkySZ3_W zICNY@+|jrX%s^&6b2i>5eqa0y%Z;^%^_=a@u3%4b9605ii3Ep)@`TAmhs0fpQ%O!q zl}XcFH*PieWwLj2ZSq`7V9Mc?h17`D)-+sNT-qs~3@?S(ldh7UlRlVXkWrK|vf6I- z?$tAVKYn8-l({mqQ$Q8{O!WzMg`0(=S&msXS#Pt$vrpzo=kRj+a`kh!z=6$;c zwT88(J6|n-WB%w`m$h~4pmp)YIh_ z3ETV2tjiAU!0h1dxU-n=E9e!)6|Z;4?!H=SSy{V>ut&IOq{_dl zbFb#!9eY1iCsp6Bajj|Hr?hX|zPbJE{X++w546-O*Ot`2Kgd0Jx6Z4syT zu9enWavU5N9)I?I-1m1*_?_rJ$vD~agVqoG+9++s?NEDe`%Fht$4F;X=in*dQ{7$m zU2Q)a|9JSc+Uc4zvS-T963!N$T{xF_ZuWe}`RNOZ7sk3{yB}PPym+f8xTpV;-=!;; zJuhGEb?H5K#o@~7t9DmUU1MD9xNd#Dz0azz?I)|B+WM{g+Xrk0I&awC=o(x)cy`EX z=)z6+o0o6-+`4{y+3mqQ%kSJBju{@g%f35#FZJHb`&swrA8dGtepviS>QUumrN{L@ z>;2q1Vm)$Z)P1z?N$8UYW2~{~zhwUMVZ87u`Dx{Z>O|9|`Q+&->FRy-Sjp7DHs zy69KwU-!MxeeuI@&cF4|M9z%AfP?@5 z`Tzg`fam}Kbua(`>RI+y?e7jT@qQ9J+u00v@9M??Vs0RI60puMM)00009a7bBm z000XU000XU0RWnu7ytkO2XskIMF-yp7#1fLr-Cka0001&Nkl3;>5`S0000o>Y~*b*5Ma43bTXFl zi!-BIX;ST*NgBO;8V4p_{`r8@?rFz_8BAfu+HTEyFPs?FJfqSlFIPF%{v>+W76KDpBG UbC`d~0-*H_p00i_>zopr0FO3NFaQ7m literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_scythe_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_scythe_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..f0a46f7347ca39c2bf94cdeb126bfd12547a1bb5 GIT binary patch literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~yCkooV#VUHjXn*La>AeGBj+t}G?2c?>$JUNL-quo zE)k(aCM^>B2YG)@YrJgg!n|mXEtlKD1_p+Gt0Kb~zXfdvTE^h%>gTe~DWM4fyG2U3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_shovel_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_shovel_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..00e5e3d09dca0ee88a7ba47e19ecb10f9e1a8306 GIT binary patch literal 243 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~yCkm~OU*M8L!eNDr;B5V#p$;bH}WzW3b62hJQ>UA zvE+WgeZzs1Vh?6@?3dIkWSlmKPtu8r^ADp^!lS!;FR#04zEIMnIZnd-yHlUS&dJKh zoL;m(@te9r=z8Tpo0haE9IHyi!#khwot<%S=Je*-~L~8%~M@x`n~h)z4*}Q$iB}>!Dcl literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_shuriken_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_shuriken_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..a4b2405dd97ee6d5368e9fd2bece5348577b053f GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~yCkoMVE>N0AwZ!eo-U3d7N@sP+9-NhfyZV2)ME+q zSyF5Xq5h8;EBe0$S=?ZgeyE~<{grpQ2Lr literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_sword_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/modifiers/soulbound_sword_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..d78e789510c6c28831fbdf6826ce39d131cdf417 GIT binary patch literal 222 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmP~s|KK%cA#*F{!Q>Xkp{6pntjk?B*|4E#k{|)Rs zX9eb{xf|a}n>6PyP}ST83;v&|vC3?-nyqv829I*Qv8q`=(<4R(gX_^>YJPoj1zOAC M>FVdQ&MBb@0F=H{{Qv*} literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/arrow/blood_infused_iron_arrow_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/arrow/blood_infused_iron_arrow_head.png deleted file mode 100644 index 347831a7a8e2a253dad30603fe3ee71e54a9ab45..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEfh%#`W!fP z;J|?i4;~*rup#wyJsTTa+sb}9!$~<_+veQ)e>pPpzrFt~mrdC-5_ouddE2DT^CmoJ jnxQS>c2GlNCj-MtDM=pX-Fv44&1Ud)^>bP0l+XkKtam+9 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/arrow/blood_infused_iron_arrow_shaft.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/arrow/blood_infused_iron_arrow_shaft.png deleted file mode 100644 index 4d6ee9db9956e232b9f4e8d5c0c0406dd08e95b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 168 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEEr~7xC0aB|KG1@|Gz%y zi@`$fGhKaY3ReYq!snbj^~=78XQq<6c^1c79!Z;@>Er|nR%e!!(Ewh3rUp-*|Ia^h{{Q@( zv-8z`f7M%Qb1zry`C%fTm6x`o@G)DAPVUQ~w$JkRi(VuuJ?UbfZ-4ma$v=O1R4Un@ z{l6R;`G5I|lLs>=9cD=rI3v)-G&Se!;)Doh2LC8S8*S;dO+d>SJYD@<);T3K0RXjn BMd<(l diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/axe/blood_infused_iron_axe_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/axe/blood_infused_iron_axe_head_broken.png deleted file mode 100644 index b47540eb495bfa66b6d207eb5f7509097da8ec47..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 198 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEJn5nE`b{rbO%rKN@MG{v?*e+ryE j%oy$}v;`V)U0`6C%BB?eAhU%VXgq_btDnm{r-UW|3M)E! diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_back.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_back.png deleted file mode 100644 index 12b8ba96edd0c936a0487a11fdb093bac7d36855..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 173 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkELn>?r}7!rJE2)0$J#pvxQ ve9XoS1kT4lKesRy=COIgAj7&ip@5mevR0)gB_ru6&^iWBS3j3^P6Er~7$OFC+KlUry|F2Im zR0}du@9r|{*tB6n-e#cC|EW?^|L?Z6{-6A|ret}4Q=mgA1H;oMt_yD(_LKlkVeoYI Kb6Mw<&;$T;-!m@& diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_front.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_front.png deleted file mode 100644 index c0b3b50654cb6cc6a4072f846d4b18e81fa6ca43..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEEr|n))YqPx_|%M{`~oW z^3oh#_3!^n!mj;4KUwXs`IG1W&%3NjV`F1$tN#7%;872w2RDxQ^OVKJJo#O{wC&jc rsZvq}&nM?FY`Xta{?}p#a|VVvjA|Dfa#)T4tzhtU^>bP0l+XkKP&P(o diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_fronthead.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_fronthead.png deleted file mode 100644 index ee58b9191816b17c85edc3881c5e2325d5e60fc4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 202 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEEr|n))YqPx_|%M{`~oW z^3oh#_3!^n!mj;4KUwXs`IG1W&%3NjV`F1$tN#7%;872w2RDxQ^OVKJJo#O{wC&jc rsZvq}&nM?FY`Xta{?}p#a|VVvjA|Dfa#)T4tzhtU^>bP0l+XkK6~0B` diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_fronthead_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_fronthead_broken.png deleted file mode 100644 index 5af2c26aa8bd1a960d3512e60d813712e37ee57b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEEsjz2A-ck{~x~b+`cZw zWqP{GlAi&^#&hz+qq`G1xb4m^($V3$z05Z`0SE$$iVm&nlbnBc&-HbNXKMe>ddRJ; ze7H4wyM)=^s@8`|YB72{3LmpE1Hs|f_Vp4Vu*|ON$O#87gD21b_scXaP7vYAV_-)e%j>U z{oeCBC#2cu<+UZt+dm39+~L1jE9CRfetAjHvTq`mJO8)+`SYK1WvYz9Y{M9b^4TjF gOQtd0oFyqC!SHOQVY**?2*_;=p00i_>zopr0DYx9LI3~& diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_head.png deleted file mode 100644 index 1dc08d108476799424b78d70a3d0f5d5726e103d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEi(`nz>Esjz2A-ck{~x~b+`cZw zWqP{GlAi&^#&hz+qq`G1xE0UdUgn#e00aR=MTb`PO_Vs>zONQ6Fyq$?!L};37`+{Z vkJ*@k!1?&+=N6{IJT^}lWLOs`6fiSb)~eK`WF$QWTF2n&>gTe~DWM4f1eQSd diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battleaxe/blood_infused_iron_battleaxe_head_broken.png deleted file mode 100644 index 32c9bc6bc7d2fb4c8a1ace87aa3eb326008a85f3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE7sn8b)5$3c3_L%7{y%)PVN7BHOz7Ue;zjY{@DH2 baV7@7(?T4+xxO!fW-@rX`njxgN@xNA4n#XF diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battlesign/blood_infused_iron_battlesign_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/battlesign/blood_infused_iron_battlesign_head.png deleted file mode 100644 index 9300ae7bf1ff921931f165f572c9909b62dd4101..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE_(Yjyv^VQ9F z8n_jzL?_KnOslI(YGS!5t#ji3;tj!DMOU{+r>@~BOmkf^x7u#u z``^<)^v52*_dC-`s{LW8wvlqj-|EzlVGVbAB^UH;Xx<7sn8b({FtB75&4oS1xq-E1gAM6B1UwjH_xj%goZUdNyhA?3r^?e`T@ zY!ON!hd)>yN;z}r%sVHJM|v-I^DQs@qReqqXst|2spb5KRui_)*7>Zo;4LUVdOO}P9faCDf%ls-#^?#W1{_e{c U>sFOr2J|6=r>mdKI;Vst0B_29@c;k- diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_accessory.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_accessory.png deleted file mode 100644 index b212ce3446d0b2f4db1ab24db1d819681592400b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEEr|n)@BZgPoMvrKY9M& zf0dnDil33aJ+o!of*p@a!o)oF5*K+!9Efq;R-Vx2Gja0bGXlv0K89{VO^NhvM?8RLGkCiCxvXD)8XRrR6R@OG=I?I>P_} diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_blade_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_blade_broken.png deleted file mode 100644 index dae2cb7a78769ccd025fae06a9ed534bc4acc132..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEYJBG#b?NEG~g?C$1d*57oHg<(Uk(MqRZmal*oGI+ZBxvXP5={ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/broadsword/blood_infused_iron_sword_handle.png deleted file mode 100644 index 3ea2ab05f6bb36dc4bbe0728b50507471136c1c7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEjdE^!G< z_0>P9_{I9+KTG{&-;7I7Skh-HWIhqKU3BoaKF@=9QPbi-25#-{t;lAU^kCSt==kTu zm)-Vk19H4JwQ%wVUw*o-^z@3_Y5#lg9-Hv_9J}A%<4Y}0woM7s+$Vl$Uqzopr07IX=$Owl>a(Le3Tn{Vv3>pj2qGzA`yL%V3B^kKuq{ z@A)Z&y}#`8H-7xSiA$*jK&jB|uyt0~8P4SZn9Jn^@NWk3F^%L*E!)%^REhr0&Jtd( zIVO}=LmE38O}PUkXKLxV+Ddx%R!KN;SvY1R1?t<^*!?w1+SkdwQ*TPb9Ru$Ff0M^B z@faqjN3%5Ox^=g%&T7zg%VU@vJ~Kzx(21h&RyT{Z42GDRUggN6MKRoCSWS;liuL>k zFvM!6*witD`u4TIuzv^7uLYUkdtHq5eFk7Y(q9BuR_#Nv7d}jV#NQa>P}2gh!Wp#n zPo&%dmL}fPd@e>J@}B9ZF?nB6ccK;+&(xzyJUM07*qoM6N<$f`t7KS^xk5 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/chisel/blood_infused_iron_chisel_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/chisel/blood_infused_iron_chisel_head_broken.png deleted file mode 100644 index d51370379c7b0fb6f8ecf902ce56e41c989d4d7e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 297 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEdwM%*n9q=E`i%!_z}|@_<0klMK7kXR^&RI|UB!+m!Lh z)O}sm`Ggba|Htoqqv!l&)pw1D4gs5YG>JDW+W-HrSyc3&_vg?5lb1-Q8T%N=@vd97 zsv=kI)HN%0^-H;KY{IOpk`fXUCocEA;hLey^P~wV-sV|X$0Nf0q+zMmhZqaiN#Y5N g?tBR<*VBMr>5+A|u`sxE80Z5APgg&ebxsLQ0L}qqoB#j- diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_guard.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_guard.png deleted file mode 100644 index 7aeee9fefce15a5b14f836328cad14f544ccd8b8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 622 zcmV-!0+IcRP)Xt-KeM{)s4NPD%2GScq3E5Yh&{9wc*(;Yg6I-KCp(G9h&>cR_6H(5 z)x|^i(AG=HRv=N)DLXilLKK79K}FeNb1K`I4!h&FrR(?dc)$1ie1Go??@0;ZC6g6T z#{mdwApk7XVptyTG$giHP1g`=5T=+3AutRB!!Qs+;C11}#3J2VcOtCm8pHCCd_GU1 zP@rC~10apy2k&V#2me8?{NP?nKy? zC!1d5zIl<&ZiJ3<5?}K>%F<6ZRyU@?>mS$gd|j##JrdN65o&OBgMUq2IJ-QH zn3I`t8{_df*X=LT%EAKbKz7<@i8D78qP;h}rWfl2Zl0Ls+S^|=hCh&Enof8BSt6|> zKJy(y`RxE$>4Q?c(#9;Adwwu4K%`Y16`uEc5`b2jp9%x~0n_yiytWny2LJ#707*qo IM6N<$f-!XoqyPW_ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_handle.png deleted file mode 100644 index 1ecb434c8201ccd92e04f8714c94b70fed00200d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 373 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEgec~qPYcVvTCr2?-Yo|=A%^X*jNb5G zJ2X@Fgh$Y1Q=cS;7cp%-)y;qZ?bKbSbG56=bv&QL{L=V{=FD$e$eP1iF|7`2IjZc3cO?)6Nw=!u)%Zvru PpwRPl^>bP0l+XkK^_!S~ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_head.png deleted file mode 100644 index d9542ace1b6e16176ae80d0d5f503f5d8f87a6cd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 516 zcmV+f0{i`mP)wI93W_`5Tmyq&Q_MM^2nL@`g{O%9o_4Y6~H$`UDbyX|5)oD@kwaG02 z9HlMFok0uC7d4WU1|Shs3;YGgWXh@@NFXnK zZEX-)7G%Gt;X(8TW&m`n&6;q+wE1Jf>a>u!e&pq29GxCM-=8Vi=+uO7qbu1p2rrod zGp^cU06y2Fny{<(ireTnr^~c(XKUo*p!ip~u}@?bR}rXcea0RS;7kNH;kHqmsylk6 z(tGE4(s!D$yJ-xgw9I+%lKuH3^&HelQeL=ex?8+HrGN<@V(R%&EF312A{P#o4~g0S zD*!@k11i{PszBsk_PX6^`P*_~?ePF@qc#o~!&%=qnkq2Jiy`;*q`gek)w^+d?8I)K znC%Z}j`v$Cf^d|!a9`3v(dB|7qO}*9ugf7aS5p@FPkaGJN$RT3f(E4k0000^IIbzopr0HK#^$^ZZW diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_shield.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cleaver/blood_infused_iron_cleaver_shield.png deleted file mode 100644 index 2bddda549e3ebb8ac4970c9e6a4c68cb0423fd39..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 676 zcmV;V0$crwP)Xe>!gf7F25(E(v z9cuTG97shP9XwSe=3#g#&Fzqe^Y2nOw^}lAdpnF?liu_P4?H}-=kxu2pNFrZ(*uut zyd)QsY-D~CTiv7Oq`=7h9;0z|%jODddm-B&q3=ORJLql_h^_9?-6Q}9Mg9iunU5;K zF@VuHmmTO$Z6AtqqT>kzr8!lRr2S^lZ{|_29nUEdfKE?&x!rCJ?s}e~ zF}y%TmepIbtokHL)!@)2iv~j(oSmJ;@An@L1OJ6>uHcbyprsDukKH2ijJ@ z7kC%G&OmAIz?u*UF3I`LWC<-5Ln@GQ`r!l;M%@xEaNve#M!Pau1WUPpy z_)j`RH#^Er87s{VBFzmVRo5oLcaOnV_BJ~u!fRGo-rhuT*jd{#1MuSN zHhs@NGqxy_F6MLvvf1pugFiM0TVbZRnobY8wgCde5dy;z0Dc21i2x0{RU)SV0000< KMNUMnLSTYysUYD1 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_blade.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_blade.png deleted file mode 100644 index 00441de85d6fff9a3da899b7721afc54ea00d9e3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 285 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEFVdQ&MBb@0OMV5Uh;kM>F1}G4v6p|2N+Y~8Tu j!|eSZJ`4Sie!%$rTJHa|r~k|aI-kMQ)z4*}Q$iB}Sf*;H diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_guard.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/cutlass/blood_infused_iron_cutlass_guard.png deleted file mode 100644 index b7021c37e3ab3648e203468fe7702c1533fba7b5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE^tVFTcA)6?o5lt=g*q z2q^&YJ)dANINeY^8Ksse%YaMFlv22^i|e{5rAS3^v07w27|(^JmIQkN?RJ|^r^9eK z1RxQ^o1Zuw{W=Fl%6`et!2N!o$>DcWckkb!`{WIik%7fDLTP;k-}4bt#F;OGmvo-w zWdAdhk-=koi|fhT931W9z8jKT&H>DYM|`7jvp_0>pKd<`AgA+4PGY?r&xIo;Hta6X zy)}Lx+~V4g43Bh*A4|4a?Ru-cPV}^r8Iw77OJ{0kneU@Lc(w`y6d%kP!P0Xh zdr38#!*u`%ZUUkGLBt)N3i$m%%D5Mc@nU?O;guEg{uaSef?4l;<~pKRw%$EYPFnDh zXp~`H2cYDe+!XK!YboWw@#FVRJRUlt}d#7%+Bm`rZAf$dU1 zKB3PwvI*~Q`m~vyy@Wy_LT%b7pMQ6~89yGRqY#KN(!0^Hxn!RM-sanjSg|Zq9|#{x({yy6=|mBE?IVRi zgvE*1v|db;O}=I3QQG=1N;{Fv!!YLxkb6_$>cf2$Kd&;n#tth>mjWT#lCpw#VKTdasmr*&zHrdBFh%~s}@-d&qI_)KGKk6yf~`1bSHqxm_ZvvXqhD1OVk@i9#J`Ozhx9iJbUx&C_2 zmZ&dx^9}WXT@lUNZW{9V?i;4^!a1CBtAo!Q_d6zNt;@cYq<)CozAZF2sPJx$LBhK7%WN@qPBI1%+!Jsbc z;vyY_&?#y#ThPG{RtE_cvoxAZMO*1L%9UP+o5&&^>A1I{fBML ze1XdCjCA7bv@KLBRsq;-ZU9Jlv$;X3SjEg2q!VB7?E(gH8a2l4cizo6Iq&YvSwy>4!%UqYmd{XnX8^FJUj^X6`9Wg+ zzIR>I81?&^Fijp#-%&beAQg>9d2(;DYZKy2XqvY=Kkp?p%?rg+%uJ1P>SO=_#V`yq zSCYJ4dPG`<+_$4Nw)aUUlK@zj1whz!z3;~_DwDxgrW3wPlaPa9nD->RQ1mKkm z7smFxoJArL06y>S^}&Wdf-kLtzOzDe$ly|Tk$*|kG%BBdOIS#`cDj8?t8E8sw#u>b zv$8-u0ie}t;kvGj4SfV(bI9Pvh=0SSk9m`P*t_BU=S?+;Bt0>zh}bUOWm=G`2YX_07*qo IM6N<$f~fWjDF6Tf diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_grip.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_grip.png deleted file mode 100644 index 1a481b7db545105a1bfd962f4f43caf0f935f079..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 765 zcmV?l2Gt)B^n~J*5oq~pVk@m$L5?ypv7hwo> z8D05-l6YYk(TAuZl3+wBR-mC_j%{h7rg{7r)4FYjw80fzXa zvZDv}y6*H5K8BWYXQ$HEKS{hM8#S!58eY{sLZXoUGP%wq2FB+wiCg5jjI{Mn;?7Rh z%?Y@ysu;V^4uDYx@XI(#9K=Sxa?EX`#FNV7m-CEFFQKk&^6t|&rX6NBS2jtJQ&=~} z$;-+iG!exh|ArUuzr~edB`ZT@==~B?(G6t3tfxCl9H?OxNtX0YwtHik%BqSPzVT=W zoF4RI`O6HDn;|nrcn2)_tr%ltGq^IW`r5H*65|7ti0L8#Vwy;jJ&Bo#2!c^yd2*TU z-WX99upPD`B$C_vW{KygBlxW(jwPmvjJ~))ru>xgH&x7!&FgSNhC7$twD-+oIh%u+ zCSpmppoUc)b`_Qq8tf*^-n<6}FwQQ6$wfI_c5T^vI!PA4ZU5HOg$*z=%wqvNCJ z`EBO%^~M_ng4Rr5di;RqnUfzrz42c2$)|;9hsj%^!zZ6j=BeSTDKLy=kF=OQQDpYf z-lLK?DsD=|`CA?@cziMZ58DFiBL@x~Sg?H6v4S0GvN6VijZ<~izyB`@yH@X9_wRqt zvD_uCCEMoQ`L9`2bR;|MLr}tn)0dP_rmfldp!VtgdS5oSwk=D&CG}QJFzopr0H^TfB5bwOpT{gedkN4i^`}@7e_X!+y zzqiGx>znJ0`XrUn(z%>4pLLakX4tHgR7U%dOmeTbR@2v_(dd;yCD06KvsrYLYT1L| z??*Tp+`ik4yQbuQ`23RrA8u{}@OWf|prWwX^hZeMPWpWhb`!X(Zd~5+kpcfG6lm~z zjY)!vqDf}>=kYHJXD@NN;r!oksy3czivt4|_)cdhvMdu+6w%WuDGi#H^YP8 z`O?B*n}`gl+Hw6u(Ge4T`+Q{2!TQ{LKC0Ws#+OvUVk(8-8SwUHcUzEjCASg)+-j@= z;51((&^7Cr5u3qeLbjOb%B;t2aJ5IiGH`V)v5|gCf2@y*(VMozfv#EG__hi9V|~1u zT44CueksD=^PJ|36(jz)n8ot5MC%IxT74^yKza9T(SK*Mt2~Y#Zh!y)002ovPDHLk FV1ftP{Fnd$ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/excavator/blood_infused_iron_excavator_head_broken.png deleted file mode 100644 index efecddf447ed1786a2d19091051ef3fa0d9b465c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 325 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkElenGMMeMp(^LPd zM}HQv-1)!l&!7J%x6RBsyV&gV<+M$v#s&rk5}!U#UO%(3k&z*Blj-qbDd{CZLl`_= L{an^LB{Ts5W&ARp diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/frypan/blood_infused_iron_frypan_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/frypan/blood_infused_iron_frypan_head.png deleted file mode 100644 index 7ee974b3dce3d81bc87a0bab11c46f85c0ff397c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 314 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEfkMYUT^vI!PT!rZDAuAN&{khFTSKk6 zRJe5V-7~yz<{eb7XnT97!F$G=h<-x<}@j%-bto z_;(s}`!2qnf;W;BCpK}`tj#_V9#q#dhg(UBUD)NbTQ-A3K2O?v*NMBFc<$d8>%BH( z&E2)a?z`m=+Nfn;%;>!*A+l3XV9k`KpjWHoVpvMGu??+O#PR)966u(Lq)2s)#YuYwIE29w#4$zm}~~G?3XSfAN&rg z_J!xOdvrC;=2*IQ_3o_byC=Ury>=`h$~%{bA@}lxY~M`XgMs2QKkD{QTK3ZWpR!|+ z$m-(z-{*5$35N1AKR1ZEQ+`$U#`OK!N)GExb1w%-e`dO8deQu{`5E=E(L1~!oNrbx jI*k3bhe<~BYV$aPA^fH5|tDnm{r-UW|6T*bI diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_back.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_back.png deleted file mode 100644 index 36af317e887371220936f22c970455e73d36d06a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 201 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEEr|n)}AL>CQqLK_us}C z{N%|$V*>+&Gkrzxso(CzdpJ(#Y n{>*=sR>nKp}rm7sn8b)5$3cOcI|y|8L)TzW&dN z4xQsJJ#|s i_a_?7x!evuU}LcHS5$1@rDF{=n!(f6&t;ucLK6Uz+&`26 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_handle.png deleted file mode 100644 index 49d813e85046ae6aa881b75ffd4e4e57fe8ab040..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 163 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEEr|n*2A(pIJy7Z&z<_U zzH82%dgr=-{}<0{U!KOs#^#pd``o@RMdd03!-iwFM%L|%o&xnUc)I$ztaD0e0swA> BEZqPA diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_handle_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_handle_broken.png deleted file mode 100644 index cea0a290325c98da1a3ff354337f803123c8e9ae..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 208 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE0aDsbkJmb xTf6a(!eZk+|30_(1s*+c;6TTk&N&Rs4B1Qd-!7@qJP5Ri!PC{xWt~$(697HENM!&3 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/hammer/blood_infused_iron_hammer_head.png deleted file mode 100644 index 6d288e0fb1ca1d484b00a56b09b53480474f2681..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEO`(TFlC7R+Er|n*2N864T8rEo;?50 zpFIEnkBJjif_Z-a{O><;^6z>p?brXGdrtnREbTT)vF*>FDUwXaFG|A1F0vUU3ft^V hKp{&{7sn8b)5$3c%o3kI|8L(o^Tb6P zZL3*|Gw08@neCsR`ggvP`gi%8qKjv-&rO@bn38>L+ATN6UPcDb5bMmKOX}%BLl`_= L{an^LB{Ts5Uga>4 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_blade_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_blade_broken.png deleted file mode 100644 index 6a00b40aa013e48d257ee098b820569d2d56da68..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEEsjzW{FRq|F>_PdE)Av zGw1#1on5|p(?9=-lYjTW;hJP3{ps`Kj5M{QH9;29G91`+zB+C!PC{xWt~$(69AWLL+Stk diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/longsword/blood_infused_iron_longsword_handle.png deleted file mode 100644 index ad2c3d29f3e1bf1ec2d193c93f07ed3f55fa2136..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 171 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEzopr0OP_hBme*a diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_binding.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_binding.png deleted file mode 100644 index 501ca2441ded113d2c66ed495d6111395ea3250e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 642 zcmV-|0)737P)1qLZhUHqo{0zhaft*E`jX4Lr|9@ zih>~Mu*0+cU`gV6Zr9PqtdE0Nn2E#9(pY@}+V4(zS(@;7DIz8LmJ7 zl2&iDDnPyw?DzWtIQ;N6_8a{?fBF`H&kG-_4pXc*lF1~3AYilE7@zz|^U+gemX+id zm&m=3AlvPvaVbGAGrP6}v)Rnu>pkV5a5#)fmmuKnW^OFN3FjV~MLWxpAm7B^@+b;X z6zTOi`8hqz-kA^+KQ{5~MF6#04M0?PfwNam6B7=1@vO67z$IrX9#ns=$;PV_}=f5qD*T^{`&L zMPPD~#$Tf(<_9a6sNDXi=q^eOPlT9CtN6O_eiaN*C=^JfzL()$+ASc8BBMQ9Nj=_4 zhfY_Nw?Dw;OVjF&B0G2uK@boG0hLNs^@N^FXONW^9Xeg{qFzsn-Of49RatCgfCD^1 zk|eU(EQLa$D!^3qKIZv>Zq c@Q~ZXZ@eeZ{#%HHVgLXD07*qoM6N<$f^kwC>Hq)$ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_handle.png deleted file mode 100644 index d7fe792231945d594af189bb86d3b019743a0450..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 376 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEInLH^g?F^-)$l>OJ-7 z`VG>PHQUSY?fial*7`s4CtBL(zU<+*UOdTM<_P1yPm=17-{_adrc^U!vaerZ+QEG1 z#Kc{C44*6+BlacClvLPd!~WpmFEjgtNf$r-d?c>p>BlN8^@{x~&plf!)(3xI3VK@o zoNl&oVM&d0i{Vq zK~y-)t&>YAL}3)if5S8$3uDS+8lw@LDGZ_{F(qUrvaqm}-H=4t%<3*ZvYL&ZorMi0 zMWd7^@)$P8qsgQ3E@m)>rmh9woqM@t;lKJi-~FBQKj(bcfR3s=%ayammaClarh_uT zPBdx|G2>65S^`{^Bmf$`UU?@PHF!LpRD$1N0WSD_6g4&iU~*>Sa=A#;gY0EC9Cdci zxAK+Pg3kv)*zc#uY^LNgL-tJcYg-Wg9`6ltyFHHWeobDLBn1YzjmI^`($w(%#RHME zk#CNKZ2|9p#@|8-t%J7VCgw&(f_$7)Cx(XJLK&dPY}UX+$~v0++|+khD;IO4%gPL{ zEwxmJ$7D4qR%z55qPJ#@`RpKFlOMg$3{_hXBa4<^b>#OHk1~q5DpB6R4921(ycD zePhaWrds&ghEV+JmE>y@YjJ?k(vik~x-n1R!TI6M$1}c)@e)h?WRkZ;D7D7F{8Z}d a|E6~%nw7fz?-vgM0000 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_head_broken.png deleted file mode 100644 index 8de3bea724f6603f123dab62487559698123cd2d..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 359 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE4R)L)J} zd+fY!)b32vu6mg9*6#n@hbGzoxpQaaPL{oYQP2Hk;<2&-p#K>>UHx3vIVCg!0Nx;q A`~Uy| diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_shield.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/lumberaxe/blood_infused_iron_lumberaxe_shield.png deleted file mode 100644 index 1aa04f146c18cd76780c45dabff920cc3e7c1edc..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 677 zcmV;W0$TlvP)8@$as4=0tB%=)lb`qCYfQ#exhOc!E&(E=CYoy=e7j_%imYy)p<7 zF^DC-=w<6&DJ6#xl(Z~DvT!r4FwSA*wt|kDkb|uk>n_Lo^SnClcc15Ze$T@>dVy*F z9)V~807;g3H`W3`(}6ek`4$;409lps{3!9+EY&2)&E}vGRx)d$EGMDA{S`y?VbnNx9v0APEC^k^V=hww=sY+-g>%OqmbKkB&P3eMNn1^J zMNt^;g5fThk3;kiE48pW<*FUX;NYN*lZUEUR^_@PnTVT81@=3)B5cOK=>z~LPQuJ< zNNXY5gY5{a%TAJsxbffm%9Wmm>I@V`0jR+@hhPl2=#hCiovNumzF1_ur-Ash5>UdS zC<=bRpK>B$f0WijY<$}w_cDi}8~iIARtEsfj~B?2$NItkhXH;9p)AlyIHc+?00000 LNkvXXu0mjf$9FG= diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_back.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_back.png deleted file mode 100644 index 896b503fcabd799aba78e90e2eccf7fce1ac8153..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 195 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEEr~7N`+{@cl#CX|JO^* z?+iK1X=nH3c8!%b_tCORCjO4azgC<*d^v5Csj-29fyAfJlh;ZzOyaj$`P6LUWuP$( Mp00i_>zopr0AYhMg#Z8m diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_head.png deleted file mode 100644 index 4aff8ab01d7faba09efb9a2491852a7765e9eed1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 238 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEEr|j2A-ck{~J%>22u6% zOkUbYwjD58f91lD{Xx#m%N2c&NJS`Wc3!o%;I;VwQF(D}u5Rw`Tt|$#3u%ZPoDn=8uR%7%Qb8MiyS?tA;J2B afnkoGc6~)f*)pIr7(8A5T-G@yGywoJVODDZ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/mattock/blood_infused_iron_mattock_head_broken.png deleted file mode 100644 index 22e59204957598cae76691f36591af4a0f16e34f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 216 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEEwh3rUp-*|Ia^h{=fWm z8)3z>qLU`^oc!~LX9rKB(lu2eFM?MwqhZoy;W@o$ReO%KG>Y2WH>)u-H*1KCAAX&G zU*cKapA!ZD9=p43Vk%zRcI^M<$jA!jGLaspNsJ6rX30iyJEms?EoAU?^>bP0l+XkK D1F=LQ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_arrowhead.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_arrowhead.png deleted file mode 100644 index 0ebb07a1b4f28b2f6016895f629469522b546c73..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2925 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 ei2wf!(FQM5nrJdKJEWxm0000 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_binding.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_binding.png deleted file mode 100644 index 10adb6a6a095d0599456f4a91e2a8a3437c3158c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2947 zcmV-}3w-p6P)|D^_ww@lRz|vCuzLs)$;-`! zo*{AqUjza0dRV*yaMRE;fKCVhpQKsoe1Yhg01=zBIT!& zC1$=TK@rP|Ibo3vKKm@PqnO#LJhq6%Ij6Hz*<$V$@wQAMN5qJ)hzm2hoGcOF60t^# zFqJFfH{#e-4l@G)6iI9sa9D{VHW4w29}?su;^hF~NC{tY+*d5%WDCTXa!E_i;d2ub z1#}&jF5T4HnnCyEWTkKf0>c0%E1Ah>(_PY1)0w;+02c53Su*0<(nUqKG_|(0G&D0Z z{i;y^b@OjZ+}lNZ8Th$p5Uu}MTtq^NHl z*T1?CO*}7&0ztZsv2j*bmJyf3G7=Z`5B*PvzoDiKdLpOAxi2$L0#SX*@cY_n(^h55xYX z#km%V()bZjV~l{*bt*u9?FT3d5g^g~#a;iSZ@&02Abxq_DwB(I|L-^bXThc7C4-yr zInE_0gw7K3GZ**7&k~>k0Z0NWkO#^@9q0fwx1%qjZ=)yBuQ3=5 z4Wo^*!gyjLF-e%Um=erBOdIALW)L%unZshS@>qSW9o8Sq#0s#5*edK%>{;v(b^`kb zN5rY%%y90wC>#%$kE_5P!JWYk;U;klcqzOl-UjcFXXA75rT9jCH~u<)0>40zCTJ7v z2qAyk54cquI@7b&LHdZ`+zlTss6bJ7%PQ)z$cROu4wBhpu-r)01)S~6}jY?%U? zgEALn#wiFzo#H}aQ8rT=DHkadR18&{>P1bW7E`~Y4p3)hWn`DhhRJ5j*2tcg9i<^O zEt(fCg;q*CP8+7ZTcWhYX$fb^_9d-LhL+6BEtPYWVlfK zTBusSTASKKb%HuWJzl+By+?gkLq)?+BTu761jmyXF)a;mc z^>(B7bo*HQ1NNg1st!zt28YLv>W*y3CdWx9U8f|cqfXDAO`Q48?auQqHZJR2&bcD4 z9Ip>EY~kKEPV6Wm+eXFV)D)_R=tM0@&p?(!V*Qu1PXHG9o^TY0bZ?)4%0 z1p8F`JoeS|<@=<@RE7GY07EYX@lwd>4oW|Yi!o+Su@M`;WuSK8LKk71XR(_ zRKHM1xJ5XYX`fk>`6eqY>qNG6HZQwBM=xi4&Sb88?zd}EYguc1@>KIS<&CX#T35dw zS|7K*XM_5Nf(;WJJvJWRMA($P>8E^?{IdL4o5MGE7bq2MEEwP7v8AO@qL5!WvekBL z-8R%V?zVyL=G&{be=K4bT`e{#t|)$A!YaA?jp;X)-+bB;zhj`(vULAW%ue3U;av{9 z4wp%n<(7@__S@Z2PA@Mif3+uO&y|X06?J#o zSi8M;ejj_^(0<4Lt#wLu#dYrva1Y$6_o(k^&}yhSh&h;f@JVA>W8b%oZ=0JGnu?n~ z9O4}sJsfnnx7n(>`H13?(iXTy*fM=I`sj`CT)*pTHEgYKqqP+u1IL8No_-(u{qS+0 z<2@%BCt82d{Gqm;(q7a7b>wu+b|!X?c13m#p7cK1({0<`{-e>4hfb-UsyQuty7Ua; zOu?B?XLHZaol8GAb3Wnxcu!2v{R_`T4=x`(GvqLI{-*2AOSimkUAw*F_TX^n z@STz9kDQ$NC=!KfXWC z8h`dn#xL(D3Z9UkR7|Q&Hcy#Notk!^zVUSB(}`#4&lYA1f0h2V_PNgUAAWQEt$#LR zcH#y9#i!p(Udq2b^lI6wp1FXzN3T;~FU%Lck$-deE#qz9yYP3D3t8{6?<+s(e(3(_ z^YOu_)K8!O1p}D#{JO;G(*OVf24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV z0GgZ_00007bV*G`2i^-66+0cVuA?~s007HLL_t(I%k7gP4#GeXMgJ1~RI(aT+|rep z-T_;W-~=3@XTT#c9HB`O7!tw-R(B;ewI4xB+R_9_1%{ujnauvYnZK(@Vu(f)6mD65)O}VV!PHV$Q60K2G_bGoHqx$~^+yRayYyTCRZ#@72002ovPDHLkV1f`?h^PPn diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_bolt.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_bolt.png deleted file mode 100644 index 982fbe42ecd0d8de12df71676fd979ccdea6ca61..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 226 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=DjSL74G){)!Z!AbW|YuPgg~W-$gfscm5zra+;5PZ!4!i_>o}Z{%z+5MaHqewt=b zM0{BR=k-$@nQtcVWy&nlj;PmW-F-yw!TWa)4nBX-@GvM_)$`uxJKep80aw$vZ+Rr4 z?5!yv*m2^@)r9!)dH0+{<0aPqDCnEL^^M()e(T9Whthc%EYn*Aj{Vk+S^LLcIAqh@ QW}wv!p00i_>zopr08|K52LJ#7 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_bow_limb.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_bow_limb.png deleted file mode 100644 index 6dd436904d286d379bc967cdfc9caf2b94c96e31..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 278 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=DjSL74G){)!Z!AbW|YuPgg~W>HZ~1%*4J=YT?sJzX3_EKc8@xRLj;f`IG%rC&_e z>4p_dPR)>LX!F!r$aBC=vZ0N4!qZ7jAubY@fp;P;U(R~Gzy3h`|5d4xAMVXh%KPh} z$=YzO$~?dK_U5^bTg4cXdEAc~x-FTqWXio;3&pSbiZV zI2t26E`56zQ|S|YbB^|Afv1m`e{tZx`j0Do!~TQkUxw`HH*YDhN?Mm&G`EUTWJT8D U8_%=<0G-R=>FVdQ&MBb@07?{X=l}o! diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_chisel_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_chisel_head.png deleted file mode 100644 index 82edc2c0b2cd29b7bfd1ab0e1ee93ca664fdf932..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2941 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 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_chunk.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_chunk.png deleted file mode 100644 index 7d09da480539fdc21a6999f583daae61f18e4249..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2995 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 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_crossbar.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_crossbar.png deleted file mode 100644 index 60a338565b7a8e85967f8b49fafb698d905ad1ff..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2866 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 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_crossbow_limb.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_crossbow_limb.png deleted file mode 100644 index 46c1aba987c192e8e51d3d89171e3499f301a38a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=DjSL74G){)!Z!AbW|YuPgg~W>HZiiPu^svw=d5o-U3d7N?UFBtA6=&R;Tn!-x8q zqTToQrKThR!NKJlO>O2pd@@a!2Lztk*@0>G?KzDb!q@%T|N3pTn_JGTL@D#yzo#5d zuu9DGPfz_jUrGJD{QS=!f6Y`nyL|H|k85XI&NQ-0++>@;9Kh4ydiB80hDQbp$GKgW c*Tyg~9IY~m3w^cP2Iv?DPgg&ebxsLQ08n>XRsaA1 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_excavator_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_excavator_head.png deleted file mode 100644 index f29640c204c82ec4bb63295c9621a5228053c8f4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2998 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 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_frypan_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_frypan_head.png deleted file mode 100644 index e7e2c1461c09eafe8afe5c049649576c7e7eaf48..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3008 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 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_hammer_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_hammer_head.png deleted file mode 100644 index 727a2fb5a7ae0b6f6076a4c4753567a0132549b3..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2955 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 Bjj{j$ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_knife_blade.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_knife_blade.png deleted file mode 100644 index 75a372c97adfd63761497857626f29201aa1cfe6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2855 zcmV+?3)u9DP)|D^_ww@lRz|vCuzLs)$;-`! zo*{AqUjza0dRV*yaMRE;fKCVhpQKsoe1Yhg01=zBIT!& zC1$=TK@rP|Ibo3vKKm@PqnO#LJhq6%Ij6Hz*<$V$@wQAMN5qJ)hzm2hoGcOF60t^# zFqJFfH{#e-4l@G)6iI9sa9D{VHW4w29}?su;^hF~NC{tY+*d5%WDCTXa!E_i;d2ub z1#}&jF5T4HnnCyEWTkKf0>c0%E1Ah>(_PY1)0w;+02c53Su*0<(nUqKG_|(0G&D0Z z{i;y^b@OjZ+}lNZ8Th$p5Uu}MTtq^NHl z*T1?CO*}7&0ztZsv2j*bmJyf3G7=Z`5B*PvzoDiKdLpOAxi2$L0#SX*@cY_n(^h55xYX z#km%V()bZjV~l{*bt*u9?FT3d5g^g~#a;iSZ@&02Abxq_DwB(I|L-^bXThc7C4-yr zInE_0gw7K3GZ**7&k~>k0Z0NWkO#^@9q0fwx1%qjZ=)yBuQ3=5 z4Wo^*!gyjLF-e%Um=erBOdIALW)L%unZshS@>qSW9o8Sq#0s#5*edK%>{;v(b^`kb zN5rY%%y90wC>#%$kE_5P!JWYk;U;klcqzOl-UjcFXXA75rT9jCH~u<)0>40zCTJ7v z2qAyk54cquI@7b&LHdZ`+zlTss6bJ7%PQ)z$cROu4wBhpu-r)01)S~6}jY?%U? zgEALn#wiFzo#H}aQ8rT=DHkadR18&{>P1bW7E`~Y4p3)hWn`DhhRJ5j*2tcg9i<^O zEt(fCg;q*CP8+7ZTcWhYX$fb^_9d-LhL+6BEtPYWVlfK zTBusSTASKKb%HuWJzl+By+?gkLq)?+BTu761jmyXF)a;mc z^>(B7bo*HQ1NNg1st!zt28YLv>W*y3CdWx9U8f|cqfXDAO`Q48?auQqHZJR2&bcD4 z9Ip>EY~kKEPV6Wm+eXFV)D)_R=tM0@&p?(!V*Qu1PXHG9o^TY0bZ?)4%0 z1p8F`JoeS|<@=<@RE7GY07EYX@lwd>4oW|Yi!o+Su@M`;WuSK8LKk71XR(_ zRKHM1xJ5XYX`fk>`6eqY>qNG6HZQwBM=xi4&Sb88?zd}EYguc1@>KIS<&CX#T35dw zS|7K*XM_5Nf(;WJJvJWRMA($P>8E^?{IdL4o5MGE7bq2MEEwP7v8AO@qL5!WvekBL z-8R%V?zVyL=G&{be=K4bT`e{#t|)$A!YaA?jp;X)-+bB;zhj`(vULAW%ue3U;av{9 z4wp%n<(7@__S@Z2PA@Mif3+uO&y|X06?J#o zSi8M;ejj_^(0<4Lt#wLu#dYrva1Y$6_o(k^&}yhSh&h;f@JVA>W8b%oZ=0JGnu?n~ z9O4}sJsfnnx7n(>`H13?(iXTy*fM=I`sj`CT)*pTHEgYKqqP+u1IL8No_-(u{qS+0 z<2@%BCt82d{Gqm;(q7a7b>wu+b|!X?c13m#p7cK1({0<`{-e>4hfb-UsyQuty7Ua; zOu?B?XLHZaol8GAb3Wnxcu!2v{R_`T4=x`(GvqLI{-*2AOSimkUAw*F_TX^n z@STz9kDQ$NC=!KfXWC z8h`dn#xL(D3Z9UkR7|Q&Hcy#Notk!^zVUSB(}`#4&lYA1f0h2V_PNgUAAWQEt$#LR zcH#y9#i!p(Udq2b^lI6wp1FXzN3T;~FU%Lck$-deE#qz9yYP3D3t8{6?<+s(e(3(_ z^YOu_)K8!O1p}D#{JO;G(*OVf24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV z0GgZ_00007bV*G`2i^-6784%;yVB+W003`EL_t(I%VYfi|33pIfQf-ZFz^PjAajg0 zjIk>E|Kct@pw4~xz(|q{{=c~Ue^zufLoz=<>0W?oKDlKJ!`zP_85kv$8HqN47|l2h zAXYP014z+~VF0O`F`|)CLYXmb>C*o&HZkddaWpS5003QmN7~yUG`9c%002ovPDHLk FV1lfWT)zMS diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_large_guard.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_large_guard.png deleted file mode 100644 index c69da763f931e25137f06dfda89b044aeac2c07b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2914 zcmV-o3!U_dP)|D^_ww@lRz|vCuzLs)$;-`! zo*{AqUjza0dRV*yaMRE;fKCVhpQKsoe1Yhg01=zBIT!& zC1$=TK@rP|Ibo3vKKm@PqnO#LJhq6%Ij6Hz*<$V$@wQAMN5qJ)hzm2hoGcOF60t^# zFqJFfH{#e-4l@G)6iI9sa9D{VHW4w29}?su;^hF~NC{tY+*d5%WDCTXa!E_i;d2ub z1#}&jF5T4HnnCyEWTkKf0>c0%E1Ah>(_PY1)0w;+02c53Su*0<(nUqKG_|(0G&D0Z z{i;y^b@OjZ+}lNZ8Th$p5Uu}MTtq^NHl z*T1?CO*}7&0ztZsv2j*bmJyf3G7=Z`5B*PvzoDiKdLpOAxi2$L0#SX*@cY_n(^h55xYX z#km%V()bZjV~l{*bt*u9?FT3d5g^g~#a;iSZ@&02Abxq_DwB(I|L-^bXThc7C4-yr zInE_0gw7K3GZ**7&k~>k0Z0NWkO#^@9q0fwx1%qjZ=)yBuQ3=5 z4Wo^*!gyjLF-e%Um=erBOdIALW)L%unZshS@>qSW9o8Sq#0s#5*edK%>{;v(b^`kb zN5rY%%y90wC>#%$kE_5P!JWYk;U;klcqzOl-UjcFXXA75rT9jCH~u<)0>40zCTJ7v z2qAyk54cquI@7b&LHdZ`+zlTss6bJ7%PQ)z$cROu4wBhpu-r)01)S~6}jY?%U? zgEALn#wiFzo#H}aQ8rT=DHkadR18&{>P1bW7E`~Y4p3)hWn`DhhRJ5j*2tcg9i<^O zEt(fCg;q*CP8+7ZTcWhYX$fb^_9d-LhL+6BEtPYWVlfK zTBusSTASKKb%HuWJzl+By+?gkLq)?+BTu761jmyXF)a;mc z^>(B7bo*HQ1NNg1st!zt28YLv>W*y3CdWx9U8f|cqfXDAO`Q48?auQqHZJR2&bcD4 z9Ip>EY~kKEPV6Wm+eXFV)D)_R=tM0@&p?(!V*Qu1PXHG9o^TY0bZ?)4%0 z1p8F`JoeS|<@=<@RE7GY07EYX@lwd>4oW|Yi!o+Su@M`;WuSK8LKk71XR(_ zRKHM1xJ5XYX`fk>`6eqY>qNG6HZQwBM=xi4&Sb88?zd}EYguc1@>KIS<&CX#T35dw zS|7K*XM_5Nf(;WJJvJWRMA($P>8E^?{IdL4o5MGE7bq2MEEwP7v8AO@qL5!WvekBL z-8R%V?zVyL=G&{be=K4bT`e{#t|)$A!YaA?jp;X)-+bB;zhj`(vULAW%ue3U;av{9 z4wp%n<(7@__S@Z2PA@Mif3+uO&y|X06?J#o zSi8M;ejj_^(0<4Lt#wLu#dYrva1Y$6_o(k^&}yhSh&h;f@JVA>W8b%oZ=0JGnu?n~ z9O4}sJsfnnx7n(>`H13?(iXTy*fM=I`sj`CT)*pTHEgYKqqP+u1IL8No_-(u{qS+0 z<2@%BCt82d{Gqm;(q7a7b>wu+b|!X?c13m#p7cK1({0<`{-e>4hfb-UsyQuty7Ua; zOu?B?XLHZaol8GAb3Wnxcu!2v{R_`T4=x`(GvqLI{-*2AOSimkUAw*F_TX^n z@STz9kDQ$NC=!KfXWC z8h`dn#xL(D3Z9UkR7|Q&Hcy#Notk!^zVUSB(}`#4&lYA1f0h2V_PNgUAAWQEt$#LR zcH#y9#i!p(Udq2b^lI6wp1FXzN3T;~FU%Lck$-deE#qz9yYP3D3t8{6?<+s(e(3(_ z^YOu_)K8!O1p}D#{JO;G(*OVf24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV z0GgZ_00007bV*G`2i^-678C|6k?i3B0062fSYU|?XBP-euY;p~mGgk6x#&(HAx#ohnn!r~0bm?$qWN+>hV{rHh#R&+GOi>t@} zONdAeKp;wJTQR0BUCJ;kI-23a!FB&%Ts`)mWEU9N2f+(lPxww>i_@% M07*qoM6N<$f>Z2zssI20 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_large_sword_blade.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_large_sword_blade.png deleted file mode 100644 index 98730a6fb892335311cfede78b8c53b600665f34..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2919 zcmV-t3z+nYP)|D^_ww@lRz|vCuzLs)$;-`! zo*{AqUjza0dRV*yaMRE;fKCVhpQKsoe1Yhg01=zBIT!& zC1$=TK@rP|Ibo3vKKm@PqnO#LJhq6%Ij6Hz*<$V$@wQAMN5qJ)hzm2hoGcOF60t^# zFqJFfH{#e-4l@G)6iI9sa9D{VHW4w29}?su;^hF~NC{tY+*d5%WDCTXa!E_i;d2ub z1#}&jF5T4HnnCyEWTkKf0>c0%E1Ah>(_PY1)0w;+02c53Su*0<(nUqKG_|(0G&D0Z z{i;y^b@OjZ+}lNZ8Th$p5Uu}MTtq^NHl z*T1?CO*}7&0ztZsv2j*bmJyf3G7=Z`5B*PvzoDiKdLpOAxi2$L0#SX*@cY_n(^h55xYX z#km%V()bZjV~l{*bt*u9?FT3d5g^g~#a;iSZ@&02Abxq_DwB(I|L-^bXThc7C4-yr zInE_0gw7K3GZ**7&k~>k0Z0NWkO#^@9q0fwx1%qjZ=)yBuQ3=5 z4Wo^*!gyjLF-e%Um=erBOdIALW)L%unZshS@>qSW9o8Sq#0s#5*edK%>{;v(b^`kb zN5rY%%y90wC>#%$kE_5P!JWYk;U;klcqzOl-UjcFXXA75rT9jCH~u<)0>40zCTJ7v z2qAyk54cquI@7b&LHdZ`+zlTss6bJ7%PQ)z$cROu4wBhpu-r)01)S~6}jY?%U? zgEALn#wiFzo#H}aQ8rT=DHkadR18&{>P1bW7E`~Y4p3)hWn`DhhRJ5j*2tcg9i<^O zEt(fCg;q*CP8+7ZTcWhYX$fb^_9d-LhL+6BEtPYWVlfK zTBusSTASKKb%HuWJzl+By+?gkLq)?+BTu761jmyXF)a;mc z^>(B7bo*HQ1NNg1st!zt28YLv>W*y3CdWx9U8f|cqfXDAO`Q48?auQqHZJR2&bcD4 z9Ip>EY~kKEPV6Wm+eXFV)D)_R=tM0@&p?(!V*Qu1PXHG9o^TY0bZ?)4%0 z1p8F`JoeS|<@=<@RE7GY07EYX@lwd>4oW|Yi!o+Su@M`;WuSK8LKk71XR(_ zRKHM1xJ5XYX`fk>`6eqY>qNG6HZQwBM=xi4&Sb88?zd}EYguc1@>KIS<&CX#T35dw zS|7K*XM_5Nf(;WJJvJWRMA($P>8E^?{IdL4o5MGE7bq2MEEwP7v8AO@qL5!WvekBL z-8R%V?zVyL=G&{be=K4bT`e{#t|)$A!YaA?jp;X)-+bB;zhj`(vULAW%ue3U;av{9 z4wp%n<(7@__S@Z2PA@Mif3+uO&y|X06?J#o zSi8M;ejj_^(0<4Lt#wLu#dYrva1Y$6_o(k^&}yhSh&h;f@JVA>W8b%oZ=0JGnu?n~ z9O4}sJsfnnx7n(>`H13?(iXTy*fM=I`sj`CT)*pTHEgYKqqP+u1IL8No_-(u{qS+0 z<2@%BCt82d{Gqm;(q7a7b>wu+b|!X?c13m#p7cK1({0<`{-e>4hfb-UsyQuty7Ua; zOu?B?XLHZaol8GAb3Wnxcu!2v{R_`T4=x`(GvqLI{-*2AOSimkUAw*F_TX^n z@STz9kDQ$NC=!KfXWC z8h`dn#xL(D3Z9UkR7|Q&Hcy#Notk!^zVUSB(}`#4&lYA1f0h2V_PNgUAAWQEt$#LR zcH#y9#i!p(Udq2b^lI6wp1FXzN3T;~FU%Lck$-deE#qz9yYP3D3t8{6?<+s(e(3(_ z^YOu_)K8!O1p}D#{JO;G(*OVf24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV z0GgZ_00007bV*G`2i^-678Es2K&oaG1LjVxCRsDwfd4P< zlBF4*5*a0w8SQFo|0nbFlcbq}fq{YX|NsB+qzp^0utY)#oV{@tV!(jrMgS>0o<3ZL RP~ZRn002ovPDHLkV1ln_fUW=l diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_largeplate.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_largeplate.png deleted file mode 100644 index 40cbff21e7a1586cfb791d97105991509fa2e333..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2916 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 Ef&`b95C8xG diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_rod.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_rod.png deleted file mode 100644 index 274675d6e715ee89a56e7183c37868ad5d59bab7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2950 zcmV;13wiX3P)|D^_ww@lRz|vCuzLs)$;-`! zo*{AqUjza0dRV*yaMRE;fKCVhpQKsoe1Yhg01=zBIT!& zC1$=TK@rP|Ibo3vKKm@PqnO#LJhq6%Ij6Hz*<$V$@wQAMN5qJ)hzm2hoGcOF60t^# zFqJFfH{#e-4l@G)6iI9sa9D{VHW4w29}?su;^hF~NC{tY+*d5%WDCTXa!E_i;d2ub z1#}&jF5T4HnnCyEWTkKf0>c0%E1Ah>(_PY1)0w;+02c53Su*0<(nUqKG_|(0G&D0Z z{i;y^b@OjZ+}lNZ8Th$p5Uu}MTtq^NHl z*T1?CO*}7&0ztZsv2j*bmJyf3G7=Z`5B*PvzoDiKdLpOAxi2$L0#SX*@cY_n(^h55xYX z#km%V()bZjV~l{*bt*u9?FT3d5g^g~#a;iSZ@&02Abxq_DwB(I|L-^bXThc7C4-yr zInE_0gw7K3GZ**7&k~>k0Z0NWkO#^@9q0fwx1%qjZ=)yBuQ3=5 z4Wo^*!gyjLF-e%Um=erBOdIALW)L%unZshS@>qSW9o8Sq#0s#5*edK%>{;v(b^`kb zN5rY%%y90wC>#%$kE_5P!JWYk;U;klcqzOl-UjcFXXA75rT9jCH~u<)0>40zCTJ7v z2qAyk54cquI@7b&LHdZ`+zlTss6bJ7%PQ)z$cROu4wBhpu-r)01)S~6}jY?%U? zgEALn#wiFzo#H}aQ8rT=DHkadR18&{>P1bW7E`~Y4p3)hWn`DhhRJ5j*2tcg9i<^O zEt(fCg;q*CP8+7ZTcWhYX$fb^_9d-LhL+6BEtPYWVlfK zTBusSTASKKb%HuWJzl+By+?gkLq)?+BTu761jmyXF)a;mc z^>(B7bo*HQ1NNg1st!zt28YLv>W*y3CdWx9U8f|cqfXDAO`Q48?auQqHZJR2&bcD4 z9Ip>EY~kKEPV6Wm+eXFV)D)_R=tM0@&p?(!V*Qu1PXHG9o^TY0bZ?)4%0 z1p8F`JoeS|<@=<@RE7GY07EYX@lwd>4oW|Yi!o+Su@M`;WuSK8LKk71XR(_ zRKHM1xJ5XYX`fk>`6eqY>qNG6HZQwBM=xi4&Sb88?zd}EYguc1@>KIS<&CX#T35dw zS|7K*XM_5Nf(;WJJvJWRMA($P>8E^?{IdL4o5MGE7bq2MEEwP7v8AO@qL5!WvekBL z-8R%V?zVyL=G&{be=K4bT`e{#t|)$A!YaA?jp;X)-+bB;zhj`(vULAW%ue3U;av{9 z4wp%n<(7@__S@Z2PA@Mif3+uO&y|X06?J#o zSi8M;ejj_^(0<4Lt#wLu#dYrva1Y$6_o(k^&}yhSh&h;f@JVA>W8b%oZ=0JGnu?n~ z9O4}sJsfnnx7n(>`H13?(iXTy*fM=I`sj`CT)*pTHEgYKqqP+u1IL8No_-(u{qS+0 z<2@%BCt82d{Gqm;(q7a7b>wu+b|!X?c13m#p7cK1({0<`{-e>4hfb-UsyQuty7Ua; zOu?B?XLHZaol8GAb3Wnxcu!2v{R_`T4=x`(GvqLI{-*2AOSimkUAw*F_TX^n z@STz9kDQ$NC=!KfXWC z8h`dn#xL(D3Z9UkR7|Q&Hcy#Notk!^zVUSB(}`#4&lYA1f0h2V_PNgUAAWQEt$#LR zcH#y9#i!p(Udq2b^lI6wp1FXzN3T;~FU%Lck$-deE#qz9yYP3D3t8{6?<+s(e(3(_ z^YOu_)K8!O1p}D#{JO;G(*OVf24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV z0GgZ_00007bV*G`2i^-6790nZPgZ{b007QOL_t(I%cWB-4udcleQh`Za+;~x*_nwc z)?`;8A;EAC40jlc3dHV!!ZAmfCE)Ewbu@ zGNo{D8fNr~^YJ_@F5{3KA&^N40N_jNc4ALTu+5fz9HEb@u10%pn$Qk_Cna1zV9_no zZ_uU*IYQv76kI=GeU9shyX4cwV?&|D^_ww@lRz|vCuzLs)$;-`! zo*{AqUjza0dRV*yaMRE;fKCVhpQKsoe1Yhg01=zBIT!& zC1$=TK@rP|Ibo3vKKm@PqnO#LJhq6%Ij6Hz*<$V$@wQAMN5qJ)hzm2hoGcOF60t^# zFqJFfH{#e-4l@G)6iI9sa9D{VHW4w29}?su;^hF~NC{tY+*d5%WDCTXa!E_i;d2ub z1#}&jF5T4HnnCyEWTkKf0>c0%E1Ah>(_PY1)0w;+02c53Su*0<(nUqKG_|(0G&D0Z z{i;y^b@OjZ+}lNZ8Th$p5Uu}MTtq^NHl z*T1?CO*}7&0ztZsv2j*bmJyf3G7=Z`5B*PvzoDiKdLpOAxi2$L0#SX*@cY_n(^h55xYX z#km%V()bZjV~l{*bt*u9?FT3d5g^g~#a;iSZ@&02Abxq_DwB(I|L-^bXThc7C4-yr zInE_0gw7K3GZ**7&k~>k0Z0NWkO#^@9q0fwx1%qjZ=)yBuQ3=5 z4Wo^*!gyjLF-e%Um=erBOdIALW)L%unZshS@>qSW9o8Sq#0s#5*edK%>{;v(b^`kb zN5rY%%y90wC>#%$kE_5P!JWYk;U;klcqzOl-UjcFXXA75rT9jCH~u<)0>40zCTJ7v z2qAyk54cquI@7b&LHdZ`+zlTss6bJ7%PQ)z$cROu4wBhpu-r)01)S~6}jY?%U? zgEALn#wiFzo#H}aQ8rT=DHkadR18&{>P1bW7E`~Y4p3)hWn`DhhRJ5j*2tcg9i<^O zEt(fCg;q*CP8+7ZTcWhYX$fb^_9d-LhL+6BEtPYWVlfK zTBusSTASKKb%HuWJzl+By+?gkLq)?+BTu761jmyXF)a;mc z^>(B7bo*HQ1NNg1st!zt28YLv>W*y3CdWx9U8f|cqfXDAO`Q48?auQqHZJR2&bcD4 z9Ip>EY~kKEPV6Wm+eXFV)D)_R=tM0@&p?(!V*Qu1PXHG9o^TY0bZ?)4%0 z1p8F`JoeS|<@=<@RE7GY07EYX@lwd>4oW|Yi!o+Su@M`;WuSK8LKk71XR(_ zRKHM1xJ5XYX`fk>`6eqY>qNG6HZQwBM=xi4&Sb88?zd}EYguc1@>KIS<&CX#T35dw zS|7K*XM_5Nf(;WJJvJWRMA($P>8E^?{IdL4o5MGE7bq2MEEwP7v8AO@qL5!WvekBL z-8R%V?zVyL=G&{be=K4bT`e{#t|)$A!YaA?jp;X)-+bB;zhj`(vULAW%ue3U;av{9 z4wp%n<(7@__S@Z2PA@Mif3+uO&y|X06?J#o zSi8M;ejj_^(0<4Lt#wLu#dYrva1Y$6_o(k^&}yhSh&h;f@JVA>W8b%oZ=0JGnu?n~ z9O4}sJsfnnx7n(>`H13?(iXTy*fM=I`sj`CT)*pTHEgYKqqP+u1IL8No_-(u{qS+0 z<2@%BCt82d{Gqm;(q7a7b>wu+b|!X?c13m#p7cK1({0<`{-e>4hfb-UsyQuty7Ua; zOu?B?XLHZaol8GAb3Wnxcu!2v{R_`T4=x`(GvqLI{-*2AOSimkUAw*F_TX^n z@STz9kDQ$NC=!KfXWC z8h`dn#xL(D3Z9UkR7|Q&Hcy#Notk!^zVUSB(}`#4&lYA1f0h2V_PNgUAAWQEt$#LR zcH#y9#i!p(Udq2b^lI6wp1FXzN3T;~FU%Lck$-deE#qz9yYP3D3t8{6?<+s(e(3(_ z^YOu_)K8!O1p}D#{JO;G(*OVf24YJ`L;wH)0002_L%V+f000SaNLh0L01FcU01FcV z0GgZ_00007bV*G`2i^-6792XvCmL=5006~FL_t(I%VYfi|33pIfQf-ZFboV}LFO0|NsCLq$*5e+DGiuwe6-fqf9fpo8mB z4ARihVCX0*fw_hervWhF;-3aFXydH^Fhdq>*@6-tjL0d`Si_isfq{WRTv!~#uoqX4 n{kP)hhiirfBI9UMrrZDkeVIA|$eL=O00000NkvXXu0mjf_tk}U diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_shovel_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_shovel_head.png deleted file mode 100644 index d206b4f1371ab59fcd167e2b25cdf5cf82535504..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2925 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 XoM~Sp`4w%r00000NkvXXu0mjfw5)}E diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_shuriken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_shuriken.png deleted file mode 100644 index 7d99153cdc601a7d4b68389aeb11b55b5adb25fd..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 322 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 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_toughbind.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/parts/blood_infused_iron_toughbind.png deleted file mode 100644 index 77674e91fc17c94c42e4fa6064f5aa013ddf1147..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2978 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 FV1g5cdf@;7 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_accessory.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_accessory.png deleted file mode 100644 index e0432fd944c44c1ecbb0b7a83790395da7a608c5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEbLh}fkGCZE{-7`wuKV{t<+jhZXMwX{W*Xm|B`F~x!SnOy$?HCx3=GjVrpLb-2zB42`+qqy@;~p-pZ^z2pYu2&AaT2E{``Y|-Q9|R zj`6xV*Zuo%aDBrAV}`RQ{|ndDNQ4;~{CQvTZ_XYD<0sGm&(~FF|IX(q{-EGu{qEY| z50ZSI>~J}GveSs!#Kc6y+vdii$vVywZj8(zz#!6QV#|H(Z2-`L44$rjF6*2UngI3v BU=#oV diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickaxe/blood_infused_iron_pickaxe_head_broken.png deleted file mode 100644 index cd28c19a1e151db940da8a575b4ddcea99dfdc3a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 236 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEE1A!_w050FNT~ftVsIZSHrXVnI9&Y>(=9*Z%I{cgb-$d9riU4s~raH%4AY ZhSnbKjX%%ne*ijy!PC{xWt~$(695%TO)UTb diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_accessory.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_accessory.png deleted file mode 100644 index cd20e7c0e62185a1ed9ecd611e76679482764274..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 165 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkElgOmCr|!KfBO8t z{o_oJi#aFG|Bs*2-JKX#V#0hzU=okT|BuSa$3H)xQhj*B{Qv)7u37WH?a!b8Gf$Yh jI6F5Nh4-jwYB4gf#tS=c5K{x%&A{O4>gTe~DWM4fq0K-X diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_handle.png deleted file mode 100644 index 362cefb3e03626206dc7d42a782f67f858ff45ad..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 174 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEEr~7N`+{@cl#CX|JO^* z?+iK1X=nH3c8!%b_tCORCjO4azgC<*d^v5Csj-29fyAfJlh;ZzOyaj$`P6LUWuP$( Mp00i_>zopr0FJOS4FCWD diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/pickmattock/blood_infused_iron_pickmattock_head.png deleted file mode 100644 index 13da2886ea9ceba15b1df189fc8b1064c1013da7..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2866 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 U;*@Rc6QF4fp00i_>zopr0KiN*OaK4? diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_blade.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_blade.png deleted file mode 100644 index c8c45d1094dca35b1db35dbaa6902a3e50a2135f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 172 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE12Z^&;RG2IRAfsqtAgO z2M!!4Sg~_vqmZ)%&(EL#>*txg{BL0Nq$KRx3dJo3Er}u*_!tbP0l+XkKB^fi! diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_blade_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/rapier/blood_infused_iron_rapier_blade_broken.png deleted file mode 100644 index a09554e0de86fcf89ed58ac3e9fdd6a237d1787f..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 152 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEYOe^ppdGki(`nz>Er|n)-8<7H*fkU{ps_6 p_1g^2b^rb^ZcC6dnzbc^gW-~MxgcIlg*LTg4dD_NfJpBMq;*ui*Y(T*9T1EZ>k74F6pk4+~S3j3^P69Xj-1^HPnK z_Ur!!hAB(ij{R@!Y@I44^`H0W&y(BlPMH7yzkzYf1Stm1BsBr$|J(mKp}Ha7sn8b)5!@EtUXV%N`%G!{r`1d z{*!6_Jd>CE7484mZ{qo3lX>a?R4J(^(g`Qd`|o=eXrRN$Ae|>H{$E-w31|d^r>mdK II;Vst02~%DcmMzZ diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_handle.png deleted file mode 100644 index 6404a0dbd966fce493b2f4348651fb2d617621e4..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEuKI z_Mc^Xf*wx#9nd6yx#j!5H}hsiO#EPdQ$v(b*-c}ga*R#VoSN+DE!P+--oKp7{9vn& z?=^*Y>;`$-e6u+*a;V2}@xQQMGupb%B0wVd7(M TyWRqzdl@`k{an^LB{Ts5I-+D? diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_head.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_head.png deleted file mode 100644 index 57d4df926d5cc40e7b3040c70278cad39326e6df..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 233 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE8WiufkI`TE{-77Y z<_o;c469CwG{rjWeRt$KtCa2$$~eO*q5EPgv;V^CCsV_YTwAuWHnL~^C3Dx0`s_wx Va&d(XjUdl3c)I$ztaD0e0svo6O1l66 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/scythe/blood_infused_iron_scythe_head_broken.png deleted file mode 100644 index d25f63d9a93e7589e5a572ecf3f9816d7ecabe51..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE9=PV@-`RPFY?3GIGP0XYsco~C?V=;7zMvE{t&$A1T!H@-jn-q-ZU-Me$UI~aL188@ug zZul9n;GpQIX;C*roP!Uvw@v9VWHLBwyk1n$y2z|Er|n)+_8ci;DjHr>Fj1 z?(tc~a_9fHKYv^#54GqO6rC1p+bM5vH0S@1i4%2hcW#wj&Fzji(`nz>Er|n)+_8ci;DjHr>Fj1 z?(tc~a_9fHKYv^#54GqO6rC1p+bM5vH0S@1i4%2hcW#wj&Fz#&jg1ShkILzakm^ewTO6xl`|4_wPT?;sg;MP6mdUgTe~DWM4f&s{_A diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top_1.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top_1.png deleted file mode 100644 index 0ea6e4331744003731bd5a5b6db4833fa52c3d6e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 212 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEm^ewTO6xl`|4_wPT?;sg;MP6mdUgTe~DWM4fxFbWr diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top_2.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shortbow/blood_infused_iron_bow_top_2.png deleted file mode 100644 index f784d5309f0bbe4f2e258e4f5f1ca66aaa9a8853..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 219 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE;rq+XZj<-L&acSv)NzTlc%mg4X`2I1`BYKy}x@Uim_xJSd zFga{;?(Yvl*LOhfk;>|>Id|%v>;C=cS)3rk!^yy4a$NaRqe-VL&`t(VS3j3^P6pirEri(`nz>Er~7i~}AXj@#zksgEfN zmbXnxQCwnp@Ob;fC)0F!p4r*)fPnh;oWukmF!=s4(PCT4%X+t%S&355>;80HE`4ra scjRreW>L|9-k(4J8}~E?8mKTZxL=gH=*{gr1!xn4r>mdKI;Vst0Jc~`wEzGB diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shovel/blood_infused_iron_shovel_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shovel/blood_infused_iron_shovel_handle.png deleted file mode 100644 index 000880eeadc6a86263a8e9a781d7f543bdd8291b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 170 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEbikZ1t&5|+o#QFdB(SGm#i4OE&-j diff --git a/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shovel/blood_infused_iron_shovel_head_broken.png b/src/main/resources/assets/bloodarsenal/textures/items/tinkers/shovel/blood_infused_iron_shovel_head_broken.png deleted file mode 100644 index 87a1123349ef43742c029ff94b75cc5fb24d3f5c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkEEr~7i~}BBNzQfu{u_Mz z*)K0CDIp;-!{efjw$-eIUGwKF&YUlwCn2n9rhj8otK;Ox#)npuWPsemCh9+aOb}yh z`}61jMPjgTe~DWM4fk19x`