From 65163a6ca3bbba196848d1d3dde3ae61022f018a Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Sat, 27 Dec 2014 21:16:05 -0500 Subject: [PATCH] 1.1.3 Update --- .../com/arc/bloodarsenal/BloodArsenal.java | 17 +- .../arc/bloodarsenal/BloodArsenalConfig.java | 34 +- .../bloodarsenal/BloodArsenalEventHooks.java | 94 +- .../arc/bloodarsenal/BloodArsenalRecipes.java | 42 +- .../com/arc/bloodarsenal/ClientProxy.java | 41 +- .../com/arc/bloodarsenal/CommonProxy.java | 13 +- .../{blocks => block}/BlockBloodCake.java | 2 +- .../BlockBloodInfusedDiamond.java | 2 +- .../BlockBloodInfusedGlowstone.java | 2 +- .../BlockBloodInfusedPlanks.java | 2 +- .../BlockBloodInfusedWood.java | 2 +- .../{blocks => block}/BlockBloodLamp.java | 2 +- .../BlockBloodStainedGlass.java | 2 +- .../BlockBloodStainedIce.java | 2 +- .../BlockBloodStainedPackedIce.java | 2 +- .../{blocks => block}/BlockBloodStone.java | 8 +- .../{blocks => block}/BlockBloodTNT.java | 2 +- .../{blocks => block}/BlockBloodTorch.java | 2 +- .../{blocks => block}/BlockInfusedIron.java | 2 +- .../BlockInfusedIronDoor.java | 5 +- .../BlockInfusedWoodenDoor.java | 2 +- .../block/BlockPortableAltar.java | 278 +++++ .../{blocks => block}/ModBlocks.java | 8 +- .../blocks/BlockBloodInfusedRedstoneLamp.java | 80 -- .../entity/ModLivingDropsEvent.java | 12 +- .../entity/projectile/EntityBloodBall.java | 66 + .../projectile/EntityEnderSigilPearl.java | 72 ++ .../bloodarsenal/gui/BindingRecipeNEI.java | 56 - .../com/arc/bloodarsenal/gui/ConfigGui.java | 3 +- .../items/ItemAmorphicCatalyst.java | 25 - .../bloodarsenal/items/ItemBloodArsenal.java | 100 ++ .../arc/bloodarsenal/items/ItemBloodBall.java | 36 + .../items/ItemBloodInfusedGlowstoneDust.java | 15 - .../items/ItemCreativeDagger.java | 106 -- .../com/arc/bloodarsenal/items/ItemHeart.java | 50 - .../bloodarsenal/items/ItemOrangeJuice.java | 15 - .../bloodarsenal/items/ItemSoulFragment.java | 25 - .../com/arc/bloodarsenal/items/ModItems.java | 112 +- .../items/armor/VampireCostume.java | 2 +- .../bloodarsenal/items/bauble/ItemBauble.java | 2 +- .../items/bauble/SacrificeAmulet.java | 130 ++ .../items/bauble/SelfSacrificeAmulet.java | 130 ++ .../bloodarsenal/items/block/BloodDoor.java | 3 +- .../items/block/BloodDoorWood.java | 3 +- .../items/block/BloodStoneBlock.java | 6 +- .../items/sigil/SigilDivinity.java | 190 +++ .../bloodarsenal/items/sigil/SigilEnder.java | 32 +- .../items/sigil/SigilSwimming.java | 2 +- .../items/tinkers/BloodArsenalTinkers.java | 45 +- .../items/tinkers/PartHelper.java | 14 +- .../items/tinkers/RecipeHelper.java | 8 +- .../bloodarsenal/items/tool/InfusedIron.java | 29 - .../items/tool/InfusedIronSword.java | 1 - .../bloodarsenal/items/tool/InfusedStick.java | 26 - .../items/tool/InfusedWoodSword.java | 1 - .../bloodarsenal/potion/PotionBleeding.java | 13 + .../bloodarsenal/potion/PotionSoulBurn.java | 31 + .../bloodarsenal/potion/PotionSwimming.java | 13 + .../potion/PotionVampiricAura.java | 5 +- .../block/TilePortableAltarRenderer.java | 232 ++++ .../item/TilePortableAltarItemRenderer.java | 67 + .../{ => item}/ItemRenderGatling.java | 4 +- .../{ => model}/ModelEnergyGatling.java | 2 +- .../model/ModelPortableBloodAltar.java | 75 ++ .../{ => model}/ModelVampireCostume.java | 2 +- .../projectile/RenderEntityBloodBall.java | 89 ++ .../RenderEntityGatlingProjectile.java | 2 +- .../tileentity/PacketHandler.java | 187 +++ .../tileentity/TileBloodArsenal.java | 39 - .../tileentity/TilePortableAltar.java | 1075 +++++++++++++++++ .../container/ContainerPortableAltar.java | 91 ++ .../assets/bloodarsenal/lang/en_US.lang | 15 +- .../blood_infused_redstone_lamp_off.png | Bin 829 -> 0 bytes .../blocks/blood_infused_redstone_lamp_on.png | Bin 894 -> 0 bytes .../textures/blocks/blood_stone_5.png | Bin 0 -> 616 bytes .../textures/entity/entitytntprimed.png | Bin 345 -> 0 bytes .../textures/gui/bindingRitual.png | Bin 1011 -> 0 bytes .../textures/gui/blood_chest_medium.png | Bin 3818 -> 0 bytes .../textures/gui/blood_chest_small.png | Bin 3677 -> 0 bytes .../arrow/blood_infused_iron_arrow_head.png | Bin 195 -> 188 bytes .../blood_infused_iron_battleaxe_handle.png | Bin 194 -> 170 bytes .../textures/items/blood_ball.png | Bin 0 -> 372 bytes .../textures/items/crossbow/_crossbow.xcf | Bin 0 -> 2758 bytes .../textures/items/crossbow/_crossbow_1.xcf | Bin 0 -> 3212 bytes .../textures/items/crossbow/_crossbow_2.xcf | Bin 0 -> 3035 bytes .../textures/items/crossbow/_crossbow_3.xcf | Bin 0 -> 3117 bytes .../items/crossbow/_crossbow_3_meh.xcf | Bin 0 -> 3013 bytes .../items/crossbow/_crossbow_binding.png | Bin 0 -> 246 bytes .../items/crossbow/_crossbow_body.png | Bin 0 -> 319 bytes .../textures/items/crossbow/_crossbow_bow.png | Bin 0 -> 315 bytes .../items/crossbow/_crossbow_bow_1.png | Bin 0 -> 291 bytes .../items/crossbow/_crossbow_bow_2.png | Bin 0 -> 304 bytes .../items/crossbow/_crossbow_bow_3.png | Bin 0 -> 289 bytes .../items/crossbow/_crossbow_string.png | Bin 0 -> 248 bytes .../items/crossbow/_crossbow_string_1.png | Bin 0 -> 282 bytes .../items/crossbow/_crossbow_string_2.png | Bin 0 -> 282 bytes .../items/crossbow/_crossbow_string_3.png | Bin 0 -> 280 bytes .../crossbow/beheading_crossbow_effect.png | Bin 0 -> 229 bytes .../textures/items/crossbow/complete.xcf | Bin 0 -> 7899 bytes .../textures/items/crossbow/complete_1.xcf | Bin 0 -> 2816 bytes .../textures/items/crossbow/complete_2.xcf | Bin 0 -> 2728 bytes .../textures/items/crossbow/complete_3.xcf | Bin 0 -> 2580 bytes .../crossbow/diamond_crossbow_effect.png | Bin 0 -> 207 bytes .../crossbow/emerald_crossbow_effect.png | Bin 0 -> 206 bytes .../crossbow/emerald_crossbow_effect_1.png | Bin 0 -> 223 bytes .../crossbow/emerald_crossbow_effect_2.png | Bin 0 -> 201 bytes .../crossbow/emerald_crossbow_effect_3.png | Bin 0 -> 193 bytes .../items/crossbow/flux_crossbow_effect.png | Bin 0 -> 254 bytes .../items/crossbow/lapis_crossbow_effect.png | Bin 0 -> 209 bytes .../items/crossbow/lava_crossbow_effect.png | Bin 0 -> 193 bytes .../crossbow/necrotic_crossbow_effect.png | Bin 0 -> 239 bytes .../items/crossbow/piston_crossbow_effect.png | Bin 0 -> 274 bytes .../items/crossbow/quartz_crossbow_effect.png | Bin 0 -> 209 bytes .../crossbow/quartz_crossbow_effect_1.png | Bin 0 -> 209 bytes .../crossbow/quartz_crossbow_effect_2.png | Bin 0 -> 260 bytes .../crossbow/quartz_crossbow_effect_3.png | Bin 0 -> 253 bytes .../crossbow/redstone_crossbow_effect.png | Bin 0 -> 154 bytes .../crossbow/redstone_crossbow_effect_1.png | Bin 0 -> 154 bytes .../crossbow/redstone_crossbow_effect_2.png | Bin 0 -> 166 bytes .../crossbow/redstone_crossbow_effect_3.png | Bin 0 -> 160 bytes .../crossbow/reinforced_crossbow_effect.png | Bin 0 -> 200 bytes .../items/crossbow/silk_crossbow_effect.png | Bin 0 -> 178 bytes .../items/crossbow/smite_crossbow_effect.png | Bin 0 -> 229 bytes .../items/crossbow/spider_crossbow_effect.png | Bin 0 -> 223 bytes .../blood_infused_iron_fishingrod.png | Bin 0 -> 244 bytes .../blood_infused_iron_fishingrod_bobber.png | Bin 0 -> 150 bytes .../blood_infused_iron_fishingrod_flail.png | Bin 0 -> 183 bytes .../parts/blood_infused_iron_arrowhead.png | Bin 0 -> 2925 bytes .../parts/blood_infused_iron_axe_head.png | Bin 0 -> 2908 bytes .../blood_infused_iron_battlesign_head.png | Bin 0 -> 2932 bytes .../parts/blood_infused_iron_binding.png | Bin 0 -> 2947 bytes .../parts/blood_infused_iron_chisel_head.png | Bin 0 -> 2922 bytes .../items/parts/blood_infused_iron_chunk.png | Bin 0 -> 2995 bytes .../parts/blood_infused_iron_crossbar.png | Bin 0 -> 2866 bytes .../blood_infused_iron_excavator_head.png | Bin 0 -> 2998 bytes .../parts/blood_infused_iron_frypan_head.png | Bin 0 -> 3008 bytes .../parts/blood_infused_iron_full_guard.png | Bin 0 -> 2890 bytes .../parts/blood_infused_iron_hammer_head.png | Bin 0 -> 2955 bytes .../parts/blood_infused_iron_knife_blade.png | Bin 0 -> 2855 bytes .../parts/blood_infused_iron_large_guard.png | Bin 0 -> 2914 bytes .../blood_infused_iron_large_sword_blade.png | Bin 0 -> 2919 bytes .../parts/blood_infused_iron_largeplate.png | Bin 0 -> 2916 bytes .../blood_infused_iron_lumberaxe_head.png | Bin 0 -> 2901 bytes .../blood_infused_iron_medium_guard.png} | Bin 4928 -> 2904 bytes .../parts/blood_infused_iron_pickaxe_head.png | Bin 0 -> 2958 bytes .../items/parts/blood_infused_iron_rod.png | Bin 0 -> 2950 bytes .../parts/blood_infused_iron_scythe_head.png | Bin 0 -> 2941 bytes .../parts/blood_infused_iron_shovel_head.png | Bin 0 -> 2925 bytes .../parts/blood_infused_iron_sword_blade.png | Bin 0 -> 2890 bytes .../parts/blood_infused_iron_toughbind.png | Bin 0 -> 2978 bytes .../parts/blood_infused_iron_toughrod.png | Bin 0 -> 2907 bytes .../textures/items/sacrifice_amulet.png | Bin 0 -> 420 bytes .../textures/items/self_sacrifice_amulet.png | Bin 0 -> 403 bytes .../items/sigil_of_divinity_activated.png | Bin 0 -> 670 bytes .../items/sigil_of_divinity_deactivated.png | Bin 0 -> 696 bytes .../bloodarsenal/textures/items/wolf_hide.png | Bin 0 -> 331 bytes .../bloodarsenal/textures/misc/potions.png | Bin 1448 -> 1947 bytes .../bloodarsenal/textures/models/altar.png | Bin 0 -> 6601 bytes 158 files changed, 3273 insertions(+), 632 deletions(-) rename src/main/java/com/arc/bloodarsenal/{blocks => block}/BlockBloodCake.java (99%) rename src/main/java/com/arc/bloodarsenal/{blocks => block}/BlockBloodInfusedDiamond.java (93%) rename src/main/java/com/arc/bloodarsenal/{blocks => block}/BlockBloodInfusedGlowstone.java (95%) rename src/main/java/com/arc/bloodarsenal/{blocks => block}/BlockBloodInfusedPlanks.java (93%) rename src/main/java/com/arc/bloodarsenal/{blocks => block}/BlockBloodInfusedWood.java (96%) rename src/main/java/com/arc/bloodarsenal/{blocks => block}/BlockBloodLamp.java (93%) rename src/main/java/com/arc/bloodarsenal/{blocks => block}/BlockBloodStainedGlass.java (96%) rename src/main/java/com/arc/bloodarsenal/{blocks => block}/BlockBloodStainedIce.java (99%) rename src/main/java/com/arc/bloodarsenal/{blocks => block}/BlockBloodStainedPackedIce.java (94%) rename src/main/java/com/arc/bloodarsenal/{blocks => block}/BlockBloodStone.java (89%) rename src/main/java/com/arc/bloodarsenal/{blocks => block}/BlockBloodTNT.java (99%) rename src/main/java/com/arc/bloodarsenal/{blocks => block}/BlockBloodTorch.java (92%) rename src/main/java/com/arc/bloodarsenal/{blocks => block}/BlockInfusedIron.java (93%) rename src/main/java/com/arc/bloodarsenal/{blocks => block}/BlockInfusedIronDoor.java (97%) rename src/main/java/com/arc/bloodarsenal/{blocks => block}/BlockInfusedWoodenDoor.java (99%) create mode 100644 src/main/java/com/arc/bloodarsenal/block/BlockPortableAltar.java rename src/main/java/com/arc/bloodarsenal/{blocks => block}/ModBlocks.java (91%) delete mode 100644 src/main/java/com/arc/bloodarsenal/blocks/BlockBloodInfusedRedstoneLamp.java create mode 100644 src/main/java/com/arc/bloodarsenal/entity/projectile/EntityBloodBall.java create mode 100644 src/main/java/com/arc/bloodarsenal/entity/projectile/EntityEnderSigilPearl.java delete mode 100644 src/main/java/com/arc/bloodarsenal/gui/BindingRecipeNEI.java delete mode 100644 src/main/java/com/arc/bloodarsenal/items/ItemAmorphicCatalyst.java create mode 100644 src/main/java/com/arc/bloodarsenal/items/ItemBloodArsenal.java create mode 100644 src/main/java/com/arc/bloodarsenal/items/ItemBloodBall.java delete mode 100644 src/main/java/com/arc/bloodarsenal/items/ItemBloodInfusedGlowstoneDust.java delete mode 100644 src/main/java/com/arc/bloodarsenal/items/ItemCreativeDagger.java delete mode 100644 src/main/java/com/arc/bloodarsenal/items/ItemHeart.java delete mode 100644 src/main/java/com/arc/bloodarsenal/items/ItemOrangeJuice.java delete mode 100644 src/main/java/com/arc/bloodarsenal/items/ItemSoulFragment.java create mode 100644 src/main/java/com/arc/bloodarsenal/items/bauble/SacrificeAmulet.java create mode 100644 src/main/java/com/arc/bloodarsenal/items/bauble/SelfSacrificeAmulet.java create mode 100644 src/main/java/com/arc/bloodarsenal/items/sigil/SigilDivinity.java delete mode 100644 src/main/java/com/arc/bloodarsenal/items/tool/InfusedIron.java delete mode 100644 src/main/java/com/arc/bloodarsenal/items/tool/InfusedStick.java create mode 100644 src/main/java/com/arc/bloodarsenal/potion/PotionSoulBurn.java create mode 100644 src/main/java/com/arc/bloodarsenal/renderer/block/TilePortableAltarRenderer.java create mode 100644 src/main/java/com/arc/bloodarsenal/renderer/block/item/TilePortableAltarItemRenderer.java rename src/main/java/com/arc/bloodarsenal/renderer/{ => item}/ItemRenderGatling.java (95%) rename src/main/java/com/arc/bloodarsenal/renderer/{ => model}/ModelEnergyGatling.java (99%) create mode 100644 src/main/java/com/arc/bloodarsenal/renderer/model/ModelPortableBloodAltar.java rename src/main/java/com/arc/bloodarsenal/renderer/{ => model}/ModelVampireCostume.java (99%) create mode 100644 src/main/java/com/arc/bloodarsenal/renderer/projectile/RenderEntityBloodBall.java rename src/main/java/com/arc/bloodarsenal/renderer/{ => projectile}/RenderEntityGatlingProjectile.java (97%) create mode 100644 src/main/java/com/arc/bloodarsenal/tileentity/PacketHandler.java delete mode 100644 src/main/java/com/arc/bloodarsenal/tileentity/TileBloodArsenal.java create mode 100644 src/main/java/com/arc/bloodarsenal/tileentity/TilePortableAltar.java create mode 100644 src/main/java/com/arc/bloodarsenal/tileentity/container/ContainerPortableAltar.java delete mode 100644 src/main/resources/assets/bloodarsenal/textures/blocks/blood_infused_redstone_lamp_off.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/blocks/blood_infused_redstone_lamp_on.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/blocks/blood_stone_5.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/entity/entitytntprimed.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/gui/bindingRitual.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/gui/blood_chest_medium.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/gui/blood_chest_small.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/blood_ball.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow.xcf create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_1.xcf create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_2.xcf create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_3.xcf create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_3_meh.xcf create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_binding.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_body.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_bow.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_bow_1.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_bow_2.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_bow_3.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_string.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_string_1.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_string_2.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_string_3.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/beheading_crossbow_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/complete.xcf create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/complete_1.xcf create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/complete_2.xcf create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/complete_3.xcf create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/diamond_crossbow_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/emerald_crossbow_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/emerald_crossbow_effect_1.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/emerald_crossbow_effect_2.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/emerald_crossbow_effect_3.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/flux_crossbow_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/lapis_crossbow_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/lava_crossbow_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/necrotic_crossbow_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/piston_crossbow_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/quartz_crossbow_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/quartz_crossbow_effect_1.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/quartz_crossbow_effect_2.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/quartz_crossbow_effect_3.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/redstone_crossbow_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/redstone_crossbow_effect_1.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/redstone_crossbow_effect_2.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/redstone_crossbow_effect_3.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/reinforced_crossbow_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/silk_crossbow_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/smite_crossbow_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/crossbow/spider_crossbow_effect.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/fishingrod/blood_infused_iron_fishingrod.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/fishingrod/blood_infused_iron_fishingrod_bobber.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/fishingrod/blood_infused_iron_fishingrod_flail.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_arrowhead.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_axe_head.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_battlesign_head.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_binding.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_chisel_head.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_chunk.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_crossbar.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_excavator_head.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_frypan_head.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_full_guard.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_hammer_head.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_knife_blade.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_large_guard.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_large_sword_blade.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_largeplate.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_lumberaxe_head.png rename src/main/resources/assets/bloodarsenal/textures/{gui/blood_chest_large.png => items/parts/blood_infused_iron_medium_guard.png} (53%) create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_pickaxe_head.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_rod.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_scythe_head.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_shovel_head.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_sword_blade.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_toughbind.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_toughrod.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/sacrifice_amulet.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/self_sacrifice_amulet.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/sigil_of_divinity_activated.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/sigil_of_divinity_deactivated.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/wolf_hide.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/models/altar.png diff --git a/src/main/java/com/arc/bloodarsenal/BloodArsenal.java b/src/main/java/com/arc/bloodarsenal/BloodArsenal.java index 8f39cf4..0809c0e 100644 --- a/src/main/java/com/arc/bloodarsenal/BloodArsenal.java +++ b/src/main/java/com/arc/bloodarsenal/BloodArsenal.java @@ -3,6 +3,8 @@ package com.arc.bloodarsenal; import com.arc.bloodarsenal.entity.ModLivingDropsEvent; import com.arc.bloodarsenal.gui.GuiHandler; import com.arc.bloodarsenal.items.ModItems; +import com.arc.bloodarsenal.items.bauble.SacrificeAmulet; +import com.arc.bloodarsenal.items.bauble.SelfSacrificeAmulet; import com.arc.bloodarsenal.items.bauble.VampireRing; import com.arc.bloodarsenal.items.tinkers.BloodArsenalTinkers; import com.arc.bloodarsenal.items.tinkers.RecipeHelper; @@ -19,7 +21,7 @@ import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import com.arc.bloodarsenal.blocks.ModBlocks; +import com.arc.bloodarsenal.block.ModBlocks; import net.minecraft.item.ItemArmor; import net.minecraft.potion.Potion; import net.minecraft.util.DamageSource; @@ -32,12 +34,10 @@ import java.io.File; import java.lang.reflect.Field; import java.lang.reflect.Modifier; -@Mod(modid="BloodArsenal", version="1.1.0", name="Blood Arsenal", dependencies="required-after:AWWayofTime;after:NotEnoughItems;after:Baubles;after:TConstruct", guiFactory = "com.arc.bloodarsenal.gui.ConfigGuiFactory") +@Mod(modid="BloodArsenal", version="1.1.3", name="Blood Arsenal", dependencies="required-after:AWWayofTime;after:NotEnoughItems;after:Baubles;after:TConstruct", guiFactory = "com.arc.bloodarsenal.gui.ConfigGuiFactory") public class BloodArsenal { public static String MODID = "BloodArsenal"; - public static String VERSION = "1.1.0"; - public static String NAME = "Blood Arsenal"; @SidedProxy(clientSide = "com.arc.bloodarsenal.ClientProxy", serverSide = "com.arc.bloodarsenal.CommonProxy") public static CommonProxy proxy; @@ -129,8 +129,8 @@ public class BloodArsenal proxy.registerEvents(); vampiricAura = new PotionVampiricAura(BloodArsenalConfig.vampiricAuraID, false, 0).setIconIndex(0, 0).setPotionName("Vampiric Aura"); - bleeding = new PotionVampiricAura(BloodArsenalConfig.bleedingID, false, 0).setIconIndex(0, 0).setPotionName("Bleeding"); - swimming = new PotionVampiricAura(BloodArsenalConfig.swimmingID, false, 0).setIconIndex(0, 0).setPotionName("Swimming"); + bleeding = new PotionVampiricAura(BloodArsenalConfig.bleedingID, false, 0).setIconIndex(1, 0).setPotionName("Bleeding"); + swimming = new PotionVampiricAura(BloodArsenalConfig.swimmingID, false, 0).setIconIndex(2, 0).setPotionName("Swimming"); } @Mod.EventHandler @@ -142,7 +142,12 @@ public class BloodArsenal logger.info("Loaded Baubles integration"); ModItems.vampire_ring = new VampireRing(); + ModItems.self_sacrifice_amulet = new SelfSacrificeAmulet(); + ModItems.sacrifice_amulet = new SacrificeAmulet(); + GameRegistry.registerItem(ModItems.vampire_ring, "vampire_ring"); + GameRegistry.registerItem(ModItems.self_sacrifice_amulet, "self_sacrifice_amulet"); + GameRegistry.registerItem(ModItems.sacrifice_amulet, "sacrifice_amulet"); } else { diff --git a/src/main/java/com/arc/bloodarsenal/BloodArsenalConfig.java b/src/main/java/com/arc/bloodarsenal/BloodArsenalConfig.java index 030f84d..755b623 100644 --- a/src/main/java/com/arc/bloodarsenal/BloodArsenalConfig.java +++ b/src/main/java/com/arc/bloodarsenal/BloodArsenalConfig.java @@ -1,8 +1,12 @@ package com.arc.bloodarsenal; +import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipe; +import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; +import net.minecraft.item.ItemStack; import net.minecraftforge.common.config.Configuration; import java.io.File; +import java.util.List; public class BloodArsenalConfig { @@ -13,6 +17,7 @@ public class BloodArsenalConfig public static String ritualBlacklist = "Ritual Blacklist"; public static String toolSetting = "Tool Settings"; public static String modSettings = "Mod Settings"; + public static String lpSettings = "LP Settings"; public static String misc = "Miscellaneous"; // Config Options @@ -21,6 +26,10 @@ public class BloodArsenalConfig public static int swimmingID; public static int vampiricAuraID; + // Ritual Blacklist + public static boolean ritualDisabledMidas; + public static boolean ritualDisabledWither; + // Tool Settings public static boolean diamondToolsAllowed; @@ -28,9 +37,9 @@ public class BloodArsenalConfig public static boolean baublesIntegration; public static boolean tinkersIntegration; - // Ritual Blacklist - public static boolean ritualDisabledMidas; - public static boolean ritualDisabledWither; + //LP Settings + public static int sigilSwimmingCost; + public static int sigilDivinityCost; // Miscellaneous public static boolean isRedGood; @@ -56,26 +65,37 @@ public class BloodArsenalConfig public static void syncConfig() { config.addCustomCategoryComment(potionId, "Change potion ID's here if you have conflicts"); + config.addCustomCategoryComment(ritualBlacklist, "Blacklist rituals that you don't want/like"); config.addCustomCategoryComment(toolSetting, "Settings for various tools"); - config.addCustomCategoryComment(modSettings, "Disable mod integration here"); - config.addCustomCategoryComment(ritualBlacklist, "Blacklist rituals that you don't want/like"); + config.addCustomCategoryComment(modSettings, "Disable mod integration"); + config.addCustomCategoryComment(lpSettings, "Change the LP costs for things"); config.addCustomCategoryComment(misc, "Random stuffs"); vampiricAuraID = config.get(potionId, "Vampiric Aura", 50).getInt(vampiricAuraID); bleedingID = config.get(potionId, "Bleeding", 51).getInt(bleedingID); swimmingID = config.get(potionId, "Swimming", 52).getInt(swimmingID); + ritualDisabledWither = config.get(ritualBlacklist, "Ritual of Withering", false).getBoolean(ritualDisabledWither); + ritualDisabledMidas = config.get(ritualBlacklist, "Midas Touch", false).getBoolean(ritualDisabledMidas); + diamondToolsAllowed = config.get(toolSetting, "Are Infused Diamond tools allowed", true).getBoolean(diamondToolsAllowed); baublesIntegration = config.get(modSettings, "Disable Baubles integration?", false).getBoolean(baublesIntegration); tinkersIntegration = config.get(modSettings, "Disable TConstruct integration?", false).getBoolean(tinkersIntegration); - ritualDisabledWither = config.get(ritualBlacklist, "Ritual of Withering", false).getBoolean(ritualDisabledWither); - ritualDisabledMidas = config.get(ritualBlacklist, "Midas Touch", false).getBoolean(ritualDisabledMidas); + 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); isRedGood = config.get(misc, "Is RED > PURPLE?", false, "Purple is always better than Red. But I won't tell you how to live your life. Even if it is incorrectly.").getBoolean(isRedGood); cakeIsLie = config.get(misc, "The cake is a lie", false, "The cake is a lie").getBoolean(cakeIsLie); config.save(); } + + public static void lpDouble(AltarRecipe altarRecipe) + { + List recipeList = AltarRecipeRegistry.altarRecipes; + int recipeCost = altarRecipe.getLiquidRequired(); + int newCost = recipeCost * 2; + } } diff --git a/src/main/java/com/arc/bloodarsenal/BloodArsenalEventHooks.java b/src/main/java/com/arc/bloodarsenal/BloodArsenalEventHooks.java index 4d66d59..86e34e2 100644 --- a/src/main/java/com/arc/bloodarsenal/BloodArsenalEventHooks.java +++ b/src/main/java/com/arc/bloodarsenal/BloodArsenalEventHooks.java @@ -1,14 +1,25 @@ package com.arc.bloodarsenal; +import baubles.common.container.InventoryBaubles; +import baubles.common.lib.PlayerHandler; +import baubles.common.network.PacketHandler; +import baubles.common.network.PacketSyncBauble; +import com.arc.bloodarsenal.items.ModItems; +import com.arc.bloodarsenal.items.bauble.SacrificeAmulet; +import com.arc.bloodarsenal.items.bauble.SelfSacrificeAmulet; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.block.material.Material; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.item.ItemStack; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; +import net.minecraft.util.ChatComponentText; import net.minecraftforge.event.entity.living.LivingAttackEvent; +import net.minecraftforge.event.entity.living.LivingDeathEvent; import net.minecraftforge.event.entity.living.LivingEvent; import net.minecraftforge.event.entity.player.PlayerEvent; @@ -21,13 +32,13 @@ public class BloodArsenalEventHooks { EntityLivingBase entityAttacked = event.entityLiving; Entity entityAttacking = event.source.getSourceOfDamage(); + float damageDone = event.ammount; if (entityAttacking != null && entityAttacking instanceof EntityLivingBase) { if (((EntityLivingBase) entityAttacking).isPotionActive(BloodArsenal.vampiricAura)) { - float damage = entityAttacked.getMaxHealth() - entityAttacked.getHealth(); - float drainedHealth = damage / 4; + float drainedHealth = damageDone / 4; ((EntityLivingBase) entityAttacking).setHealth(((EntityLivingBase) entityAttacking).getHealth() + drainedHealth); } @@ -46,6 +57,85 @@ public class BloodArsenalEventHooks } } } + + if (entityAttacked instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer) entityAttacked; + InventoryBaubles inv = PlayerHandler.getPlayerBaubles(player); + + for (int i = 0; i < inv.getSizeInventory(); i++) + { + ItemStack stack = inv.getStackInSlot(i); + + if (stack != null && stack.getItem() == ModItems.self_sacrifice_amulet) + { + SelfSacrificeAmulet selfSacrificeAmulet = (SelfSacrificeAmulet) ModItems.self_sacrifice_amulet; + int lpReceived = (int) damageDone; + boolean shouldExecute = selfSacrificeAmulet.getStoredLP(stack) < 10000; + + if (shouldExecute) + { + PotionEffect regenEffect = player.getActivePotionEffect(Potion.regeneration); + + if (regenEffect != null && regenEffect.getAmplifier() >= 2) + { + selfSacrificeAmulet.setStoredLP(stack, Math.min(selfSacrificeAmulet.getStoredLP(stack) + lpReceived / 2, 10000)); + } + else + { + selfSacrificeAmulet.setStoredLP(stack, Math.min(selfSacrificeAmulet.getStoredLP(stack) + lpReceived, 10000)); + } + } + + if (player instanceof EntityPlayerMP) + { + PacketHandler.INSTANCE.sendTo(new PacketSyncBauble(player, i), (EntityPlayerMP) player); + } + } + } + } + } + + public void こんちは(EntityPlayer player) + { + player.addChatMessage(new ChatComponentText("こんにちは!")); + } + + @SubscribeEvent + public void onLivingDeath(LivingDeathEvent event) + { + Entity killer = event.source.getEntity(); + EntityLivingBase victim = event.entityLiving; + + if (killer instanceof EntityPlayer) + { + EntityPlayer player = (EntityPlayer) killer; + InventoryBaubles inv = PlayerHandler.getPlayerBaubles(player); + + for (int i = 0; i < inv.getSizeInventory(); i++) + { + ItemStack stack = inv.getStackInSlot(i); + + if (stack != null && stack.getItem() == ModItems.sacrifice_amulet) + { + SacrificeAmulet sacrificeAmulet = (SacrificeAmulet) ModItems.sacrifice_amulet; + float victimHealth = victim.getMaxHealth(); + boolean healthGood = victimHealth > 4.0F; + int lpReceived = healthGood ? 200 : 50; + boolean shouldExecute = sacrificeAmulet.getStoredLP(stack) < 10000; + + if (shouldExecute) + { + sacrificeAmulet.setStoredLP(stack, Math.min(sacrificeAmulet.getStoredLP(stack) + lpReceived, 10000)); + } + + if (player instanceof EntityPlayerMP) + { + PacketHandler.INSTANCE.sendTo(new PacketSyncBauble(player, i), (EntityPlayerMP) player); + } + } + } + } } @SubscribeEvent diff --git a/src/main/java/com/arc/bloodarsenal/BloodArsenalRecipes.java b/src/main/java/com/arc/bloodarsenal/BloodArsenalRecipes.java index fc4977e..65d8c6b 100644 --- a/src/main/java/com/arc/bloodarsenal/BloodArsenalRecipes.java +++ b/src/main/java/com/arc/bloodarsenal/BloodArsenalRecipes.java @@ -3,11 +3,13 @@ package com.arc.bloodarsenal; import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry; import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe; -import com.arc.bloodarsenal.blocks.ModBlocks; +import com.arc.bloodarsenal.block.ModBlocks; import com.arc.bloodarsenal.items.ModItems; +import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.init.Blocks; import net.minecraft.init.Items; +import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; @@ -17,13 +19,16 @@ public class BloodArsenalRecipes { AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModBlocks.blood_tnt), new ItemStack(Blocks.tnt), 3, 5000, 5, 5, false); 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), 2, 72000, 5, 5, false); - AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModBlocks.blood_cake), new ItemStack(Items.cake), 4, 10000, 5, 5, false); - AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_infused_iron), new ItemStack(Items.iron_ingot), 2, 8000, 5, 5, false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModBlocks.blood_infused_iron_block), new ItemStack(Blocks.iron_block), 3, 72000, 5, 5, false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModBlocks.blood_torch), new ItemStack(Blocks.torch), 2, 1000, 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), 3, 8000, 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, 50000, 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, 10000, 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, 2500, 5, 5, false); + AltarRecipeRegistry.registerAltarRecipe(new ItemStack(ModItems.blood_ball), new ItemStack(Items.snowball), 2, 500, 5, 5, false); } public static void registerBindingRecipes() @@ -47,15 +52,16 @@ public class BloodArsenalRecipes ItemStack reinforcedSlate = new ItemStack(WayofTime.alchemicalWizardry.ModItems.reinforcedSlate); ItemStack imbuedSlate = new ItemStack(WayofTime.alchemicalWizardry.ModItems.imbuedSlate); ItemStack demonicSlate = new ItemStack(WayofTime.alchemicalWizardry.ModItems.demonicSlate); + ItemStack etherealSlate = new ItemStack(WayofTime.alchemicalWizardry.ModItems.baseItems, 1, 27); ItemStack weakOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.weakBloodOrb, 1, craftingConstant); ItemStack apprenticeOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.apprenticeBloodOrb, 1, craftingConstant); ItemStack magicianOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.magicianBloodOrb, 1, craftingConstant); ItemStack masterOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.masterBloodOrb, 1, craftingConstant); - + ItemStack archmageOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.archmageBloodOrb, 1, craftingConstant); + ItemStack transcendentOrb = new ItemStack(WayofTime.alchemicalWizardry.ModItems.transcendentBloodOrb, 1, craftingConstant); GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.blood_stained_ice, 8), "aaa", "aba", "aaa", 'a', Blocks.ice, 'b', apprenticeOrb)); GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModBlocks.blood_stained_glass, 8), "aaa", "aba", "aaa", 'a', Blocks.glass, 'b', apprenticeOrb)); - GameRegistry.addRecipe(new ShapedBloodOrbRecipe(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)); GameRegistry.addRecipe(new ShapedBloodOrbRecipe(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)); GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.blood_infused_shovel_iron), "aaa", "aba", "cdc", 'a', ModItems.blood_infused_iron, 'b', ModItems.blood_infused_shovel_wood, 'c', ModItems.amorphic_catalyst, 'd', magicianOrb)); @@ -68,18 +74,25 @@ public class BloodArsenalRecipes GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.blood_infused_sword_diamond), "aaa", "aba", "cdc", 'a', ModItems.blood_infused_diamond_bound, 'b', ModItems.blood_infused_sword_iron, 'c', ModItems.amorphic_catalyst, 'd', masterOrb)); GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.soul_booster), "aaa", "aba", "aca", 'a', ModItems.soul_fragment, 'b', Blocks.beacon, 'c', magicianOrb)); GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.soul_nullifier), "aaa", "aba", "aca", 'a', ModItems.soul_fragment, 'b', WayofTime.alchemicalWizardry.ModItems.armourInhibitor, 'c', magicianOrb)); - GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.vampire_ring),"ab ", "bcb", " b ", 'a', ModItems.blood_infused_diamond_bound, 'b', Blocks.stone, 'c', masterOrb)); GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.sigil_of_swimming), "aba", "cdc", "aea", 'a', Items.water_bucket, 'b', Items.bucket, 'c', Items.lava_bucket, 'd', WayofTime.alchemicalWizardry.ModItems.voidSigil, 'e', apprenticeOrb)); +// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.self_sacrifice_amulet), "aaa", "aba", "caa", 'a', Items.string, 'b', weakOrb, 'c', WayofTime.alchemicalWizardry.ModBlocks.runeOfSelfSacrifice)); +// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.sacrifice_amulet), "aaa", "aba", "caa", 'a', Items.string, 'b', weakOrb, 'c', WayofTime.alchemicalWizardry.ModBlocks.runeOfSacrifice)); + GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.sigil_of_ender), "aba", "cdc", "efe", 'a', Blocks.obsidian, 'b', Items.ender_eye, 'c', Items.ender_pearl, 'd', imbuedSlate, 'e', Blocks.ender_chest, 'f', magicianOrb)); + GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.sigil_of_divinity), "aba", "cde", "fgf", 'a', ModBlocks.blood_infused_glowstone, 'b', new ItemStack(Items.golden_apple, 1, 1), 'c', Items.nether_star, 'd', WayofTime.alchemicalWizardry.ModItems.sigilOfElementalAffinity, 'e', ModItems.blood_infused_diamond_bound, 'f', ModItems.amorphic_catalyst, 'g', transcendentOrb)); GameRegistry.addRecipe(new ItemStack(ModBlocks.blood_stone), "aaa", "aaa", "aaa", 'a', blankSlate); GameRegistry.addRecipe(new ItemStack(ModBlocks.blood_stone, 1, 1), "aaa", "aaa", "aaa", 'a', reinforcedSlate); GameRegistry.addRecipe(new ItemStack(ModBlocks.blood_stone, 1, 2), "aaa", "aaa", "aaa", 'a', imbuedSlate); GameRegistry.addRecipe(new ItemStack(ModBlocks.blood_stone, 1, 3), "aaa", "aaa", "aaa", 'a', demonicSlate); + GameRegistry.addRecipe(new ItemStack(ModBlocks.blood_stone, 1, 4), "aaa", "aaa", "aaa", 'a', etherealSlate); GameRegistry.addRecipe(new ItemStack(ModBlocks.blood_infused_iron_block), "aaa", "aaa", "aaa", 'a', ModItems.blood_infused_iron); GameRegistry.addRecipe(new ItemStack(ModBlocks.blood_door_wood), "aa", "aa", "aa", 'a', ModBlocks.blood_infused_planks); GameRegistry.addRecipe(new ItemStack(ModBlocks.blood_stained_ice_packed), "aa", "aa", 'a', ModBlocks.blood_stained_ice); GameRegistry.addRecipe(new ItemStack(ModBlocks.blood_door_wood), "aa", "aa", "aa", 'a', ModBlocks.blood_infused_planks); GameRegistry.addRecipe(new ItemStack(ModBlocks.blood_door_iron), "aa", "aa", "aa", 'a', ModItems.blood_infused_iron); + GameRegistry.addRecipe(new ItemStack(ModBlocks.blood_infused_glowstone), "aa", "aa", 'a', ModItems.blood_infused_glowstone_dust); + GameRegistry.addRecipe(new ItemStack(ModBlocks.blood_lamp), "aba", "bcb", "aba", 'a', ModItems.blood_infused_iron, 'b', ModBlocks.blood_stained_glass, 'c', ModBlocks.blood_infused_glowstone); + GameRegistry.addRecipe(new ItemStack(ModBlocks.blood_infused_diamond_block), "aaa", "aaa", "aaa", 'a', ModItems.blood_infused_diamond_bound); GameRegistry.addRecipe(new ItemStack(ModItems.blood_infused_stick), "a", "a", 'a', ModBlocks.blood_infused_planks); GameRegistry.addRecipe(new ItemStack(ModItems.blood_infused_pickaxe_wood), "aaa", " b ", " b ", 'a', ModBlocks.blood_infused_planks, 'b', ModItems.blood_infused_stick); GameRegistry.addRecipe(new ItemStack(ModItems.blood_infused_axe_wood), "aa ", "ab ", " b ", 'a', ModBlocks.blood_infused_planks, 'b', ModItems.blood_infused_stick); @@ -96,5 +109,18 @@ public class BloodArsenalRecipes GameRegistry.addShapelessRecipe(new ItemStack(ModItems.blood_infused_iron, 9), ModBlocks.blood_infused_iron_block); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.orange_juice), ModItems.blood_orange, Items.glass_bottle); GameRegistry.addShapelessRecipe(new ItemStack(ModItems.juice_and_cookies), Items.cookie, ModItems.orange_juice); + + if (Loader.isModLoaded("Baubles")) + { +// GameRegistry.addRecipe(new ShapedBloodOrbRecipe(new ItemStack(ModItems.vampire_ring),"ab ", "bcb", " b ", 'a', ModItems.blood_infused_diamond_bound, 'b', Blocks.stone, 'c', masterOrb)); +// GameRegistry.addRecipe(new ItemStack(ModItems.self_sacrifice_amulet), "a", 'a', new ItemStack(Items.slime_ball)); + + } + + { + ItemStack flintSteel = new ItemStack(ModItems.bound_flint_and_steel, 1, craftingConstant); + +// GameRegistry.addRecipe(new ItemStack(ModBlocks.blood_torch, 2), "a", "b", 'a', flintSteel, 'b', ModItems.blood_infused_stick); + } } } diff --git a/src/main/java/com/arc/bloodarsenal/ClientProxy.java b/src/main/java/com/arc/bloodarsenal/ClientProxy.java index c344c49..cad016a 100644 --- a/src/main/java/com/arc/bloodarsenal/ClientProxy.java +++ b/src/main/java/com/arc/bloodarsenal/ClientProxy.java @@ -1,34 +1,67 @@ package com.arc.bloodarsenal; +import WayofTime.alchemicalWizardry.client.ClientEventHandler; +import com.arc.bloodarsenal.block.ModBlocks; +import com.arc.bloodarsenal.entity.EntityBloodTNT; +import com.arc.bloodarsenal.entity.projectile.EntityBloodBall; +import com.arc.bloodarsenal.entity.projectile.EntityEnderSigilPearl; import com.arc.bloodarsenal.entity.projectile.EntityGatlingProjectile; import com.arc.bloodarsenal.items.ModItems; -import com.arc.bloodarsenal.renderer.ItemRenderGatling; -import com.arc.bloodarsenal.renderer.RenderEntityGatlingProjectile; +import com.arc.bloodarsenal.renderer.item.ItemRenderGatling; +import com.arc.bloodarsenal.renderer.projectile.RenderEntityBloodBall; +import com.arc.bloodarsenal.renderer.projectile.RenderEntityGatlingProjectile; +import com.arc.bloodarsenal.renderer.block.TilePortableAltarRenderer; +import com.arc.bloodarsenal.renderer.block.item.TilePortableAltarItemRenderer; +import com.arc.bloodarsenal.tileentity.TilePortableAltar; +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.ModelBiped; +import cpw.mods.fml.common.FMLCommonHandler; +import net.minecraft.client.renderer.entity.RenderSnowball; +import net.minecraft.client.renderer.entity.RenderTNTPrimed; +import net.minecraft.init.Items; +import net.minecraft.item.ItemBlock; import net.minecraft.world.World; import net.minecraftforge.client.MinecraftForgeClient; public class ClientProxy extends CommonProxy { + public static int renderPass; + public static int altarRenderType; + @Override public void registerRenders() { MinecraftForgeClient.registerItemRenderer(ModItems.energy_gatling, new ItemRenderGatling()); RenderingRegistry.registerEntityRenderingHandler(EntityGatlingProjectile.class, new RenderEntityGatlingProjectile()); + RenderingRegistry.registerEntityRenderingHandler(EntityBloodTNT.class, new RenderTNTPrimed()); + RenderingRegistry.registerEntityRenderingHandler(EntityBloodBall.class, new RenderSnowball(ModItems.blood_ball)); + RenderingRegistry.registerEntityRenderingHandler(EntityEnderSigilPearl.class, new RenderSnowball(Items.ender_pearl)); + + ClientRegistry.bindTileEntitySpecialRenderer(TilePortableAltar.class, new TilePortableAltarRenderer()); } + @Override public void registerEntities() { } + @Override public void registerEvents() { + FMLCommonHandler.instance().bus().register(new ClientEventHandler()); } + @Override public World getClientWorld() { - return null; + return FMLClientHandler.instance().getClient().theWorld; + } + + @Override + public void initRendering() + { + MinecraftForgeClient.registerItemRenderer(ItemBlock.getItemFromBlock(ModBlocks.portable_altar), new TilePortableAltarItemRenderer()); } } diff --git a/src/main/java/com/arc/bloodarsenal/CommonProxy.java b/src/main/java/com/arc/bloodarsenal/CommonProxy.java index af5c81f..97eba6a 100644 --- a/src/main/java/com/arc/bloodarsenal/CommonProxy.java +++ b/src/main/java/com/arc/bloodarsenal/CommonProxy.java @@ -1,6 +1,7 @@ package com.arc.bloodarsenal; -import net.minecraft.client.model.ModelBiped; +import com.arc.bloodarsenal.tileentity.TilePortableAltar; +import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.world.World; public class CommonProxy @@ -22,4 +23,14 @@ public class CommonProxy { return null; } + + public void registerTileEntities() + { + GameRegistry.registerTileEntity(TilePortableAltar.class, "containerPortableAltar"); + } + + public void initRendering() + { + //TODO Auto-generated stub + } } diff --git a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodCake.java b/src/main/java/com/arc/bloodarsenal/block/BlockBloodCake.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/blocks/BlockBloodCake.java rename to src/main/java/com/arc/bloodarsenal/block/BlockBloodCake.java index ad03c72..fdbb05d 100644 --- a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodCake.java +++ b/src/main/java/com/arc/bloodarsenal/block/BlockBloodCake.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.blocks; +package com.arc.bloodarsenal.block; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import com.arc.bloodarsenal.BloodArsenalConfig; diff --git a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodInfusedDiamond.java b/src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedDiamond.java similarity index 93% rename from src/main/java/com/arc/bloodarsenal/blocks/BlockBloodInfusedDiamond.java rename to src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedDiamond.java index c828019..8a056d8 100644 --- a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodInfusedDiamond.java +++ b/src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedDiamond.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.blocks; +package com.arc.bloodarsenal.block; import com.arc.bloodarsenal.BloodArsenal; import net.minecraft.block.Block; diff --git a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodInfusedGlowstone.java b/src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedGlowstone.java similarity index 95% rename from src/main/java/com/arc/bloodarsenal/blocks/BlockBloodInfusedGlowstone.java rename to src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedGlowstone.java index 9211e19..ef1f11f 100644 --- a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodInfusedGlowstone.java +++ b/src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedGlowstone.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.blocks; +package com.arc.bloodarsenal.block; import com.arc.bloodarsenal.BloodArsenal; import com.arc.bloodarsenal.items.ModItems; diff --git a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodInfusedPlanks.java b/src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedPlanks.java similarity index 93% rename from src/main/java/com/arc/bloodarsenal/blocks/BlockBloodInfusedPlanks.java rename to src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedPlanks.java index 7c6b986..23df570 100644 --- a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodInfusedPlanks.java +++ b/src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedPlanks.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.blocks; +package com.arc.bloodarsenal.block; import com.arc.bloodarsenal.BloodArsenal; import net.minecraft.block.Block; diff --git a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodInfusedWood.java b/src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedWood.java similarity index 96% rename from src/main/java/com/arc/bloodarsenal/blocks/BlockBloodInfusedWood.java rename to src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedWood.java index bf1304c..d74259c 100644 --- a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodInfusedWood.java +++ b/src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedWood.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.blocks; +package com.arc.bloodarsenal.block; import com.arc.bloodarsenal.BloodArsenal; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodLamp.java b/src/main/java/com/arc/bloodarsenal/block/BlockBloodLamp.java similarity index 93% rename from src/main/java/com/arc/bloodarsenal/blocks/BlockBloodLamp.java rename to src/main/java/com/arc/bloodarsenal/block/BlockBloodLamp.java index e73b8b6..87fbb3f 100644 --- a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodLamp.java +++ b/src/main/java/com/arc/bloodarsenal/block/BlockBloodLamp.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.blocks; +package com.arc.bloodarsenal.block; import com.arc.bloodarsenal.BloodArsenal; import net.minecraft.block.Block; diff --git a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodStainedGlass.java b/src/main/java/com/arc/bloodarsenal/block/BlockBloodStainedGlass.java similarity index 96% rename from src/main/java/com/arc/bloodarsenal/blocks/BlockBloodStainedGlass.java rename to src/main/java/com/arc/bloodarsenal/block/BlockBloodStainedGlass.java index a7830dd..eb868c8 100644 --- a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodStainedGlass.java +++ b/src/main/java/com/arc/bloodarsenal/block/BlockBloodStainedGlass.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.blocks; +package com.arc.bloodarsenal.block; import com.arc.bloodarsenal.BloodArsenal; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodStainedIce.java b/src/main/java/com/arc/bloodarsenal/block/BlockBloodStainedIce.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/blocks/BlockBloodStainedIce.java rename to src/main/java/com/arc/bloodarsenal/block/BlockBloodStainedIce.java index 902f458..ce64c38 100644 --- a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodStainedIce.java +++ b/src/main/java/com/arc/bloodarsenal/block/BlockBloodStainedIce.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.blocks; +package com.arc.bloodarsenal.block; import com.arc.bloodarsenal.BloodArsenal; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodStainedPackedIce.java b/src/main/java/com/arc/bloodarsenal/block/BlockBloodStainedPackedIce.java similarity index 94% rename from src/main/java/com/arc/bloodarsenal/blocks/BlockBloodStainedPackedIce.java rename to src/main/java/com/arc/bloodarsenal/block/BlockBloodStainedPackedIce.java index 68f55f4..94747c6 100644 --- a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodStainedPackedIce.java +++ b/src/main/java/com/arc/bloodarsenal/block/BlockBloodStainedPackedIce.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.blocks; +package com.arc.bloodarsenal.block; import com.arc.bloodarsenal.BloodArsenal; import net.minecraft.block.Block; diff --git a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodStone.java b/src/main/java/com/arc/bloodarsenal/block/BlockBloodStone.java similarity index 89% rename from src/main/java/com/arc/bloodarsenal/blocks/BlockBloodStone.java rename to src/main/java/com/arc/bloodarsenal/block/BlockBloodStone.java index f1bbd65..2bcd1c5 100644 --- a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodStone.java +++ b/src/main/java/com/arc/bloodarsenal/block/BlockBloodStone.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.blocks; +package com.arc.bloodarsenal.block; import com.arc.bloodarsenal.BloodArsenal; import cpw.mods.fml.relauncher.Side; @@ -19,6 +19,7 @@ public class BlockBloodStone extends Block private IIcon blood_stone_2; private IIcon blood_stone_3; private IIcon blood_stone_4; + private IIcon blood_stone_5; public BlockBloodStone() { @@ -38,6 +39,7 @@ public class BlockBloodStone extends Block blood_stone_2 = iconRegister.registerIcon("BloodArsenal:blood_stone_2"); blood_stone_3 = iconRegister.registerIcon("BloodArsenal:blood_stone_3"); blood_stone_4 = iconRegister.registerIcon("BloodArsenal:blood_stone_4"); + blood_stone_5 = iconRegister.registerIcon("BloodArsenal:blood_stone_5"); } @SideOnly(Side.CLIENT) @@ -49,6 +51,7 @@ public class BlockBloodStone extends Block par3List.add(new ItemStack(par1Item, 1, 1)); par3List.add(new ItemStack(par1Item, 1, 2)); par3List.add(new ItemStack(par1Item, 1, 3)); + par3List.add(new ItemStack(par1Item, 1, 4)); } else { @@ -74,6 +77,9 @@ public class BlockBloodStone extends Block case 3: return blood_stone_4; + case 4: + return blood_stone_5; + default: return blood_stone_1; } diff --git a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodTNT.java b/src/main/java/com/arc/bloodarsenal/block/BlockBloodTNT.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/blocks/BlockBloodTNT.java rename to src/main/java/com/arc/bloodarsenal/block/BlockBloodTNT.java index cafe94d..dc68817 100644 --- a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodTNT.java +++ b/src/main/java/com/arc/bloodarsenal/block/BlockBloodTNT.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.blocks; +package com.arc.bloodarsenal.block; import com.arc.bloodarsenal.BloodArsenal; import com.arc.bloodarsenal.entity.EntityBloodTNT; diff --git a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodTorch.java b/src/main/java/com/arc/bloodarsenal/block/BlockBloodTorch.java similarity index 92% rename from src/main/java/com/arc/bloodarsenal/blocks/BlockBloodTorch.java rename to src/main/java/com/arc/bloodarsenal/block/BlockBloodTorch.java index a773710..f0cfade 100644 --- a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodTorch.java +++ b/src/main/java/com/arc/bloodarsenal/block/BlockBloodTorch.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.blocks; +package com.arc.bloodarsenal.block; import com.arc.bloodarsenal.BloodArsenal; import net.minecraft.block.BlockTorch; diff --git a/src/main/java/com/arc/bloodarsenal/blocks/BlockInfusedIron.java b/src/main/java/com/arc/bloodarsenal/block/BlockInfusedIron.java similarity index 93% rename from src/main/java/com/arc/bloodarsenal/blocks/BlockInfusedIron.java rename to src/main/java/com/arc/bloodarsenal/block/BlockInfusedIron.java index 646ad14..fe5ee70 100644 --- a/src/main/java/com/arc/bloodarsenal/blocks/BlockInfusedIron.java +++ b/src/main/java/com/arc/bloodarsenal/block/BlockInfusedIron.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.blocks; +package com.arc.bloodarsenal.block; import com.arc.bloodarsenal.BloodArsenal; import net.minecraft.block.Block; diff --git a/src/main/java/com/arc/bloodarsenal/blocks/BlockInfusedIronDoor.java b/src/main/java/com/arc/bloodarsenal/block/BlockInfusedIronDoor.java similarity index 97% rename from src/main/java/com/arc/bloodarsenal/blocks/BlockInfusedIronDoor.java rename to src/main/java/com/arc/bloodarsenal/block/BlockInfusedIronDoor.java index 9ba0632..c125712 100644 --- a/src/main/java/com/arc/bloodarsenal/blocks/BlockInfusedIronDoor.java +++ b/src/main/java/com/arc/bloodarsenal/block/BlockInfusedIronDoor.java @@ -1,7 +1,5 @@ -package com.arc.bloodarsenal.blocks; +package com.arc.bloodarsenal.block; -import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import com.arc.bloodarsenal.BloodArsenal; import com.arc.bloodarsenal.items.ModItems; import com.arc.bloodarsenal.tileentity.TileOwned; @@ -14,7 +12,6 @@ import net.minecraft.client.renderer.IconFlipped; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; -import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.*; import net.minecraft.world.IBlockAccess; diff --git a/src/main/java/com/arc/bloodarsenal/blocks/BlockInfusedWoodenDoor.java b/src/main/java/com/arc/bloodarsenal/block/BlockInfusedWoodenDoor.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/blocks/BlockInfusedWoodenDoor.java rename to src/main/java/com/arc/bloodarsenal/block/BlockInfusedWoodenDoor.java index 9f4b9bc..588a89f 100644 --- a/src/main/java/com/arc/bloodarsenal/blocks/BlockInfusedWoodenDoor.java +++ b/src/main/java/com/arc/bloodarsenal/block/BlockInfusedWoodenDoor.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.blocks; +package com.arc.bloodarsenal.block; import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockPortableAltar.java b/src/main/java/com/arc/bloodarsenal/block/BlockPortableAltar.java new file mode 100644 index 0000000..bfa160d --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/block/BlockPortableAltar.java @@ -0,0 +1,278 @@ +package com.arc.bloodarsenal.block; + +import WayofTime.alchemicalWizardry.ModItems; +import WayofTime.alchemicalWizardry.api.items.IAltarManipulator; +import WayofTime.alchemicalWizardry.common.items.EnergyBattery; +import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding; +import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.tileentity.TilePortableAltar; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.block.Block; +import net.minecraft.block.BlockContainer; +import net.minecraft.block.material.Material; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.world.World; + +import java.util.Random; + +public class BlockPortableAltar extends BlockContainer +{ + @SideOnly(Side.CLIENT) + private static IIcon topIcon; + @SideOnly(Side.CLIENT) + private static IIcon sideIcon1; + @SideOnly(Side.CLIENT) + private static IIcon sideIcon2; + @SideOnly(Side.CLIENT) + private static IIcon bottomIcon; + + public BlockPortableAltar() + { + super(Material.rock); + setHardness(2.0F); + setResistance(5.0F); + setCreativeTab(BloodArsenal.BA_TAB); + setBlockName("portable_altar"); + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) + { + this.topIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_Top"); + this.sideIcon1 = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_SideType1"); + this.sideIcon2 = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_SideType2"); + this.bottomIcon = iconRegister.registerIcon("AlchemicalWizardry:BloodAltar_Bottom"); + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int side, int meta) + { + switch (side) + { + case 0: + return bottomIcon; + case 1: + return topIcon; + default: + return sideIcon2; + } + } + + @Override + public boolean hasComparatorInputOverride() + { + return true; + } + + @Override + public int getComparatorInputOverride(World world, int x, int y, int z, int meta) + { + TileEntity tile = world.getTileEntity(x, y, z); + + if (tile instanceof TilePortableAltar) + { + ItemStack stack = ((TilePortableAltar) tile).getStackInSlot(0); + + if (stack != null && stack.getItem() instanceof EnergyBattery) + { + EnergyBattery bloodOrb = (EnergyBattery) stack.getItem(); + int maxEssence = bloodOrb.getMaxEssence(); + int currentEssence = bloodOrb.getCurrentEssence(stack); + int level = currentEssence * 15 / maxEssence; + return ((int) (Math.min(15, level))) % 16; + } + } + + return 0; + } + + @Override + public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are) + { + TilePortableAltar tileEntity = (TilePortableAltar) world.getTileEntity(x, y, z); + + if (tileEntity == null || player.isSneaking()) + { + return false; + } + + ItemStack playerItem = player.getCurrentEquippedItem(); + + if (playerItem != null) + { + if (playerItem.getItem().equals(ModItems.divinationSigil)) + { + if (player.worldObj.isRemote) + { + world.markBlockForUpdate(x, y, z); + } else + { + tileEntity.sendChatInfoToPlayer(player); + } + + return true; + } else if (playerItem.getItem().equals(ModItems.itemSeerSigil)) + { + if (player.worldObj.isRemote) + { + world.markBlockForUpdate(x, y, z); + } else + { + tileEntity.sendMoreChatInfoToPlayer(player); + } + + return true; + }else if(playerItem.getItem() instanceof IAltarManipulator) + { + return false; + } + else if (playerItem.getItem().equals(ModItems.sigilOfHolding)) + { + ItemStack item = ((SigilOfHolding) playerItem.getItem()).getCurrentItem(playerItem); + + if (item != null && item.getItem().equals(ModItems.divinationSigil)) + { + if (player.worldObj.isRemote) + { + world.markBlockForUpdate(x, y, z); + } else + { + tileEntity.sendChatInfoToPlayer(player); + } + + return true; + } else if (item != null && item.getItem().equals(ModItems.itemSeerSigil)) + { + if (player.worldObj.isRemote) + { + world.markBlockForUpdate(x, y, z); + } else + { + tileEntity.sendMoreChatInfoToPlayer(player); + } + + return true; + } + } + } + + if (tileEntity.getStackInSlot(0) == null && playerItem != null) + { + ItemStack newItem = playerItem.copy(); + newItem.stackSize = 1; + --playerItem.stackSize; + tileEntity.setInventorySlotContents(0, newItem); + tileEntity.startCycle(); + } else if (tileEntity.getStackInSlot(0) != null && playerItem == null) + { + player.inventory.addItemStackToInventory(tileEntity.getStackInSlot(0)); + tileEntity.setInventorySlotContents(0, null); + tileEntity.setActive(); + } + world.markBlockForUpdate(x, y, z); + return true; + } + + @Override + public void breakBlock(World world, int x, int y, int z, Block par5, int par6) + { + dropItems(world, x, y, z); + super.breakBlock(world, x, y, z, par5, par6); + } + + private void dropItems(World world, int x, int y, int z) + { + Random rand = new Random(); + TileEntity tileEntity = world.getTileEntity(x, y, z); + + if (!(tileEntity instanceof IInventory)) + { + return; + } + + IInventory inventory = (IInventory) tileEntity; + + for (int i = 0; i < inventory.getSizeInventory(); i++) + { + ItemStack item = inventory.getStackInSlot(i); + + if (item != null && item.stackSize > 0) + { + float rx = rand.nextFloat() * 0.8F + 0.1F; + float ry = rand.nextFloat() * 0.8F + 0.1F; + float rz = rand.nextFloat() * 0.8F + 0.1F; + EntityItem entityItem = new EntityItem(world, + x + rx, y + ry, z + rz, + new ItemStack(item.getItem(), item.stackSize, item.getItemDamage())); + + if (item.hasTagCompound()) + { + entityItem.getEntityItem().setTagCompound((NBTTagCompound) item.getTagCompound().copy()); + } + + float factor = 0.05F; + entityItem.motionX = rand.nextGaussian() * factor; + entityItem.motionY = rand.nextGaussian() * factor + 0.2F; + entityItem.motionZ = rand.nextGaussian() * factor; + world.spawnEntityInWorld(entityItem); + item.stackSize = 0; + } + } + } + + @Override + public boolean renderAsNormalBlock() + { + return false; + } + + @Override + public int getRenderType() + { + return -1; + } + + @Override + public boolean isOpaqueCube() + { + return false; + } + + @Override + public boolean hasTileEntity() + { + return true; + } + + @Override + public void randomDisplayTick(World world, int x, int y, int z, Random rand) + { + TilePortableAltar tileEntity = (TilePortableAltar) world.getTileEntity(x, y, z); + + if (!tileEntity.isActive()) + { + return; + } + + if (rand.nextInt(3) != 0) + { + return; + } + } + + @Override + public TileEntity createNewTileEntity(World var1, int var2) + { + return new TilePortableAltar(); + } +} diff --git a/src/main/java/com/arc/bloodarsenal/blocks/ModBlocks.java b/src/main/java/com/arc/bloodarsenal/block/ModBlocks.java similarity index 91% rename from src/main/java/com/arc/bloodarsenal/blocks/ModBlocks.java rename to src/main/java/com/arc/bloodarsenal/block/ModBlocks.java index e73ed1f..f2bc88a 100644 --- a/src/main/java/com/arc/bloodarsenal/blocks/ModBlocks.java +++ b/src/main/java/com/arc/bloodarsenal/block/ModBlocks.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.blocks; +package com.arc.bloodarsenal.block; import com.arc.bloodarsenal.items.block.BloodStoneBlock; import cpw.mods.fml.common.registry.GameRegistry; @@ -19,9 +19,9 @@ public class ModBlocks public static Block blood_cake; public static Block blood_torch; public static Block blood_infused_glowstone; - public static Block blood_infused_redstone_lamp; public static Block blood_lamp; public static Block blood_infused_diamond_block; + public static BlockPortableAltar portable_altar; public static void init() { @@ -38,9 +38,9 @@ public class ModBlocks blood_cake = new BlockBloodCake(); blood_torch = new BlockBloodTorch(); blood_infused_glowstone = new BlockBloodInfusedGlowstone(); - blood_infused_redstone_lamp = new BlockBloodInfusedRedstoneLamp(); blood_lamp = new BlockBloodLamp(); blood_infused_diamond_block = new BlockBloodInfusedDiamond(); + portable_altar = new BlockPortableAltar(); } public static void registerBlocksInPre() @@ -58,8 +58,8 @@ public class ModBlocks GameRegistry.registerBlock(ModBlocks.blood_cake, "blood_cake"); GameRegistry.registerBlock(ModBlocks.blood_torch, "blood_torch"); GameRegistry.registerBlock(ModBlocks.blood_infused_glowstone, "blood_infused_glowstone"); - GameRegistry.registerBlock(ModBlocks.blood_infused_redstone_lamp, "blood_infused_redstone_lamp"); GameRegistry.registerBlock(ModBlocks.blood_lamp, "blood_lamp"); GameRegistry.registerBlock(ModBlocks.blood_infused_diamond_block, "blood_infused_diamond_block"); + GameRegistry.registerBlock(ModBlocks.portable_altar, "portable_altar"); } } diff --git a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodInfusedRedstoneLamp.java b/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodInfusedRedstoneLamp.java deleted file mode 100644 index 77e5178..0000000 --- a/src/main/java/com/arc/bloodarsenal/blocks/BlockBloodInfusedRedstoneLamp.java +++ /dev/null @@ -1,80 +0,0 @@ -package com.arc.bloodarsenal.blocks; - -import com.arc.bloodarsenal.BloodArsenal; -import net.minecraft.block.Block; -import net.minecraft.block.material.Material; -import net.minecraft.world.World; - -import java.util.Random; - -public class BlockBloodInfusedRedstoneLamp extends Block -{ - private boolean isOn = false; - - public BlockBloodInfusedRedstoneLamp() - { - super(Material.redstoneLight); - - setBlockName("blood_infused_redstone_lamp"); - setBlockTextureName("BloodArsenal:blood_infused_redstone_lamp_off"); - setHardness(0.5F); - setResistance(0.75F); - setStepSound(soundTypeGlass); - - setCreativeTab(BloodArsenal.BA_TAB); - - if (isOn) - { - setLightLevel(1.0F); - setBlockTextureName("BloodArsenal:blood_infused_redstone_lamp_on"); - } - } - - public void onBlockAdded(World world, int x, int y, int z) - { - if (!world.isRemote) - { - if (isOn && !world.isBlockIndirectlyGettingPowered(x, y, z)) - { - world.scheduleBlockUpdate(x, y, z, this, 4); - } - else if (!isOn && world.isBlockIndirectlyGettingPowered(x, y, z)) - { - isOn = true; - } - } - } - - public void onNeighborBlockChange(World world, int x, int y, int z, Block block) - { - if (!world.isRemote) - { - if (isOn && !world.isBlockIndirectlyGettingPowered(x, y, z)) - { - world.scheduleBlockUpdate(x, y, z, this, 4); - } - else if (!isOn && world.isBlockIndirectlyGettingPowered(x, y, z)) - { - isOn = true; - } - } - } - - public void updateTick(World world, int x, int y, int z, Random random) - { - if (!world.isRemote && isOn && !world.isBlockIndirectlyGettingPowered(x, y, z)) - { - isOn = true; - setLightLevel(1.0F); - setBlockTextureName("BloodArsenal:blood_infused_redstone_lamp_on"); - world.scheduleBlockUpdate(x, y, z, this, 4); - } - else - { - isOn = false; - setLightLevel(0.0F); - setBlockTextureName("BloodArsenal:blood_infused_redstone_lamp_off"); - world.scheduleBlockUpdate(x, y, z, this, 4); - } - } -} diff --git a/src/main/java/com/arc/bloodarsenal/entity/ModLivingDropsEvent.java b/src/main/java/com/arc/bloodarsenal/entity/ModLivingDropsEvent.java index 2714705..ea3549e 100644 --- a/src/main/java/com/arc/bloodarsenal/entity/ModLivingDropsEvent.java +++ b/src/main/java/com/arc/bloodarsenal/entity/ModLivingDropsEvent.java @@ -4,6 +4,7 @@ import com.arc.bloodarsenal.items.ModItems; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.passive.EntityVillager; +import net.minecraft.entity.passive.EntityWolf; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.potion.Potion; import net.minecraft.potion.PotionEffect; @@ -16,10 +17,11 @@ public class ModLivingDropsEvent @SubscribeEvent public void onEntityDrop(LivingDropsEvent event) { + rand = Math.random(); + if (event.source.getDamageType().equals("player")) { PotionEffect effect = event.entityLiving.getActivePotionEffect(Potion.weakness); - rand = Math.random(); if (event.entityLiving instanceof EntityZombie) { @@ -51,5 +53,13 @@ public class ModLivingDropsEvent } } } + + if (event.entityLiving instanceof EntityWolf) + { + if (rand < 0.4F) + { + event.entityLiving.dropItem(ModItems.wolf_hide, 1); + } + } } } diff --git a/src/main/java/com/arc/bloodarsenal/entity/projectile/EntityBloodBall.java b/src/main/java/com/arc/bloodarsenal/entity/projectile/EntityBloodBall.java new file mode 100644 index 0000000..fae7ee0 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/entity/projectile/EntityBloodBall.java @@ -0,0 +1,66 @@ +package com.arc.bloodarsenal.entity.projectile; + +import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import WayofTime.alchemicalWizardry.common.items.EnergyBattery; +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/entity/projectile/EntityEnderSigilPearl.java b/src/main/java/com/arc/bloodarsenal/entity/projectile/EntityEnderSigilPearl.java new file mode 100644 index 0000000..fae5da4 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/entity/projectile/EntityEnderSigilPearl.java @@ -0,0 +1,72 @@ +package com.arc.bloodarsenal.entity.projectile; + +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.item.EntityEnderPearl; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.util.DamageSource; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.event.entity.living.EnderTeleportEvent; + +public class EntityEnderSigilPearl extends EntityEnderPearl +{ + public EntityEnderSigilPearl(World par1World, EntityLivingBase par2EntityLivingBase) + { + super(par1World, par2EntityLivingBase); + this.setSize(0.01F, 0.01F); + } + + public EntityEnderSigilPearl(World par1World) + { + super(par1World); + } + + public EntityEnderSigilPearl(World par1World, double par2, double par4, double par6) + { + super(par1World, par2, par4, par6); + } + + @Override + protected float func_70182_d() + { + return 1.2F; + } + + @Override + protected float getGravityVelocity() + { + return 0.03F; + } + + @Override + protected void onImpact(MovingObjectPosition par1MovingObjectPosition) + { + if (par1MovingObjectPosition.entityHit != null) + { + par1MovingObjectPosition.entityHit.attackEntityFrom(DamageSource.causeThrownDamage(this, this.getThrower()), 0); + } + + for (int i = 0; i < 32; ++i) + { + this.worldObj.spawnParticle("portal", this.posX, this.posY + this.rand.nextDouble() * 2.0D, this.posZ, this.rand.nextGaussian(), 0.0D, this.rand.nextGaussian()); + } + if (!this.worldObj.isRemote) + { + if (this.getThrower() != null && this.getThrower() instanceof EntityPlayerMP) + { + EntityPlayerMP entityplayermp = (EntityPlayerMP)this.getThrower(); + if (entityplayermp.worldObj == this.worldObj) + { + EnderTeleportEvent event = new EnderTeleportEvent(entityplayermp, this.posX, this.posY, this.posZ, 5); + if (!MinecraftForge.EVENT_BUS.post(event)) + { + this.getThrower().setPositionAndUpdate(event.targetX, event.targetY, event.targetZ); + this.getThrower().fallDistance = 0.0F; + } + } + } + this.setDead(); + } + } +} diff --git a/src/main/java/com/arc/bloodarsenal/gui/BindingRecipeNEI.java b/src/main/java/com/arc/bloodarsenal/gui/BindingRecipeNEI.java deleted file mode 100644 index 63f860d..0000000 --- a/src/main/java/com/arc/bloodarsenal/gui/BindingRecipeNEI.java +++ /dev/null @@ -1,56 +0,0 @@ -package com.arc.bloodarsenal.gui; - -import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRecipe; -import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry; -import codechicken.nei.NEIServerUtils; -import codechicken.nei.PositionedStack; -import codechicken.nei.recipe.TemplateRecipeHandler; -import net.minecraft.item.ItemStack; - -public class BindingRecipeNEI extends TemplateRecipeHandler -{ - public class CachedBindingRecipe extends CachedRecipe - { - PositionedStack input; - PositionedStack output; - - public CachedBindingRecipe(BindingRecipe recipe) - { - input = new PositionedStack(recipe.requiredItem, 38, 2, false); - output = new PositionedStack(recipe.outputItem, 132, 32, false); - } - - @Override - public PositionedStack getIngredient() - { - return input; - } - - @Override - public PositionedStack getResult() - { - return output; - } - } - - @Override - public void loadCraftingRecipes(String outputId, Object... results) - { - if (outputId.equals("alchemicalwizardry.binding")) - { - - } - } - - @Override - public void loadCraftingRecipes(ItemStack result) - { - for(BindingRecipe recipe: BindingRegistry.bindingRecipes) - { - if(NEIServerUtils.areStacksSameTypeCrafting(recipe.outputItem, result)) - { - if (recipe != null && recipe.outputItem != null) arecipes.add(new CachedBindingRecipe(recipe)); - } - } - } -} diff --git a/src/main/java/com/arc/bloodarsenal/gui/ConfigGui.java b/src/main/java/com/arc/bloodarsenal/gui/ConfigGui.java index d24a95d..abec65a 100644 --- a/src/main/java/com/arc/bloodarsenal/gui/ConfigGui.java +++ b/src/main/java/com/arc/bloodarsenal/gui/ConfigGui.java @@ -23,10 +23,11 @@ public class ConfigGui extends GuiConfig { List list = new ArrayList(); // Adds sections declared in BloodArsenalConfig. toLowerCase() is used because the configuration class automatically does this, so must we. - list.add(new ConfigElement(config.getCategory(misc.toLowerCase()))); list.add(new ConfigElement(config.getCategory(potionId.toLowerCase()))); list.add(new ConfigElement(config.getCategory(ritualBlacklist.toLowerCase()))); list.add(new ConfigElement(config.getCategory(toolSetting.toLowerCase()))); + list.add(new ConfigElement(config.getCategory(lpSettings.toLowerCase()))); + list.add(new ConfigElement(config.getCategory(misc.toLowerCase()))); return list; } diff --git a/src/main/java/com/arc/bloodarsenal/items/ItemAmorphicCatalyst.java b/src/main/java/com/arc/bloodarsenal/items/ItemAmorphicCatalyst.java deleted file mode 100644 index d797e49..0000000 --- a/src/main/java/com/arc/bloodarsenal/items/ItemAmorphicCatalyst.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.arc.bloodarsenal.items; - -import com.arc.bloodarsenal.BloodArsenal; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import java.util.List; - -public class ItemAmorphicCatalyst extends Item -{ - public ItemAmorphicCatalyst() - { - super(); - setUnlocalizedName("amorphic_catalyst"); - setTextureName("BloodArsenal:amorphic_catalyst"); - setCreativeTab(BloodArsenal.BA_TAB); - } - - @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) - { - par3List.add("A coagulated mess"); - } -} diff --git a/src/main/java/com/arc/bloodarsenal/items/ItemBloodArsenal.java b/src/main/java/com/arc/bloodarsenal/items/ItemBloodArsenal.java new file mode 100644 index 0000000..ea30710 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/items/ItemBloodArsenal.java @@ -0,0 +1,100 @@ +package com.arc.bloodarsenal.items; + +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import com.arc.bloodarsenal.BloodArsenal; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.util.IIcon; + +import java.util.List; + +public class ItemBloodArsenal extends Item +{ + private static final String[] ITEM_NAMES = new String[] {"amorphic_catalyst", "blood_infused_stick", "blood_infused_iron", "soul_fragment", "orange_juice", "blood_infused_glowstone_dust", "wolf_hide"}; + + @SideOnly(Side.CLIENT) + private IIcon[] icons; + + public ItemBloodArsenal() + { + super(); + setCreativeTab(BloodArsenal.BA_TAB); + } + + @Override + public void registerIcons(IIconRegister iconRegister) + { +/* icons = new IIcon[ITEM_NAMES.length]; + + for (int i = 0; i < ITEM_NAMES.length; ++i) + { + icons[i] = iconRegister.registerIcon("BloodArsenal:" + ITEM_NAMES[i]); + } + + if (AlchemicalWizardry.wimpySettings) + { + ModItems.heart.setTextureName("BloodArsenal:heart2"); + } + else + { + ModItems.heart.setTextureName("BloodArsenal:heart"); + } + */ + + if (this.equals(ModItems.amorphic_catalyst)) + itemIcon = iconRegister.registerIcon("BloodArsenal:amorphic_catalyst"); + else if (this.equals(ModItems.blood_infused_iron)) + itemIcon = iconRegister.registerIcon("BloodArsenal:blood_infused_iron"); + else if (this.equals(ModItems.soul_fragment)) + itemIcon = iconRegister.registerIcon("BloodArsenal:soul_fragment"); + else if (this.equals(ModItems.heart)) + itemIcon = iconRegister.registerIcon("BloodArsenal:heart2"); + else if (this.equals(ModItems.blood_infused_stick)) + itemIcon = iconRegister.registerIcon("BloodArsenal:blood_infused_stick"); + else if (this.equals(ModItems.blood_cookie)) + itemIcon = iconRegister.registerIcon("BloodArsenal:blood_cookie"); + else if (this.equals(ModItems.orange_juice)) + itemIcon = iconRegister.registerIcon("BloodArsenal:orange_juice"); + else if (this.equals(ModItems.blood_infused_glowstone_dust)) + itemIcon = iconRegister.registerIcon("BloodArsenal:blood_infused_glowstone_dust"); + else if (this.equals(ModItems.wolf_hide)) + itemIcon = iconRegister.registerIcon("BloodArsenal:wolf_hide"); + } + + @Override + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) + { + if (this.equals(ModItems.amorphic_catalyst)) + { + par3List.add("A coagulated mess"); + } + if (this.equals(ModItems.blood_infused_stick)) + { + par3List.add("A stick infused with life!"); + } + if (this.equals(ModItems.blood_infused_iron)) + { + par3List.add("Mundane iron infused"); + par3List.add("with life essence"); + } + if (this.equals(ModItems.heart)) + { + if (AlchemicalWizardry.wimpySettings) + { + par3List.add("Bright red in color"); + } + else + { + par3List.add("Fresh from a body"); + } + } + if (this.equals(ModItems.soul_fragment)) + { + par3List.add("The raw essence of a soul"); + } + } +} diff --git a/src/main/java/com/arc/bloodarsenal/items/ItemBloodBall.java b/src/main/java/com/arc/bloodarsenal/items/ItemBloodBall.java new file mode 100644 index 0000000..e2f3acd --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/items/ItemBloodBall.java @@ -0,0 +1,36 @@ +package com.arc.bloodarsenal.items; + +import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.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); + } + + 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/items/ItemBloodInfusedGlowstoneDust.java b/src/main/java/com/arc/bloodarsenal/items/ItemBloodInfusedGlowstoneDust.java deleted file mode 100644 index 01b63c0..0000000 --- a/src/main/java/com/arc/bloodarsenal/items/ItemBloodInfusedGlowstoneDust.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.arc.bloodarsenal.items; - -import com.arc.bloodarsenal.BloodArsenal; -import net.minecraft.item.Item; - -public class ItemBloodInfusedGlowstoneDust extends Item -{ - public ItemBloodInfusedGlowstoneDust() - { - super(); - setUnlocalizedName("blood_infused_glowstone_dust"); - setTextureName("BloodArsenal:blood_infused_glowstone_dust"); - setCreativeTab(BloodArsenal.BA_TAB); - } -} diff --git a/src/main/java/com/arc/bloodarsenal/items/ItemCreativeDagger.java b/src/main/java/com/arc/bloodarsenal/items/ItemCreativeDagger.java deleted file mode 100644 index 6725f7c..0000000 --- a/src/main/java/com/arc/bloodarsenal/items/ItemCreativeDagger.java +++ /dev/null @@ -1,106 +0,0 @@ -package com.arc.bloodarsenal.items; - -import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; -import com.arc.bloodarsenal.BloodArsenal; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.tileentity.TileEntity; -import net.minecraft.world.World; -import net.minecraftforge.common.util.FakePlayer; - -public class ItemCreativeDagger extends Item -{ - public ItemCreativeDagger() - { - super(); - setTextureName("AlchemicalWizardry:SacrificialDagger"); - setMaxStackSize(1); - setCreativeTab(BloodArsenal.BA_TAB); - setFull3D(); - } - - public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) - { - if (par3EntityPlayer instanceof FakePlayer) - { - return par1ItemStack; - } - - double posX = par3EntityPlayer.posX; - double posY = par3EntityPlayer.posY; - double posZ = par3EntityPlayer.posZ; - par2World.playSoundEffect((double) ((float) posX + 0.5F), (double) ((float) posY + 0.5F), (double) ((float) posZ + 0.5F), "random.fizz", 0.5F, 2.6F + (par2World.rand.nextFloat() - par2World.rand.nextFloat()) * 0.8F); - float f = (float) 1.0F; - float f1 = f * 0.6F + 0.4F; - float f2 = f * f * 0.7F - 0.5F; - float f3 = f * f * 0.6F - 0.7F; - - for (int l = 0; l < 8; ++l) - { - par2World.spawnParticle("reddust", posX + Math.random() - Math.random(), posY + Math.random() - Math.random(), posZ + Math.random() - Math.random(), f1, f2, f3); - } - - if (!par2World.isRemote && SpellHelper.isFakePlayer(par2World, par3EntityPlayer)) - { - return par1ItemStack; - } - findAndFillAltar(par2World, par3EntityPlayer, Integer.MAX_VALUE); - return par1ItemStack; - } - - public void findAndFillAltar(World world, EntityPlayer player, int amount) - { - int posX = (int) Math.round(player.posX - 0.5f); - int posY = (int) player.posY; - int posZ = (int) Math.round(player.posZ - 0.5f); - TEAltar altarEntity = getAltar(world, posX, posY, posZ); - - if (altarEntity == null) - { - return; - } - - altarEntity.sacrificialDaggerCall(amount, false); - altarEntity.startCycle(); - } - - public TEAltar getAltar(World world, int x, int y, int z) - { - TileEntity tileEntity = null; - - for (int i = -2; i <= 2; i++) - { - for (int j = -2; j <= 2; j++) - { - for (int k = -2; k <= 1; k++) - { - tileEntity = world.getTileEntity(i + x, k + y, j + z); - - if ((tileEntity instanceof TEAltar)) - { - return (TEAltar) tileEntity; - } - } - - if ((tileEntity instanceof TEAltar)) - { - return (TEAltar) tileEntity; - } - } - - if ((tileEntity instanceof TEAltar)) - { - return (TEAltar) tileEntity; - } - } - - if ((tileEntity instanceof TEAltar)) - { - return (TEAltar) tileEntity; - } - - return null; - } -} diff --git a/src/main/java/com/arc/bloodarsenal/items/ItemHeart.java b/src/main/java/com/arc/bloodarsenal/items/ItemHeart.java deleted file mode 100644 index cd9a13b..0000000 --- a/src/main/java/com/arc/bloodarsenal/items/ItemHeart.java +++ /dev/null @@ -1,50 +0,0 @@ -package com.arc.bloodarsenal.items; - -import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import com.arc.bloodarsenal.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.renderer.texture.IIconRegister; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import java.util.List; - -public class ItemHeart extends Item -{ - public ItemHeart() - { - super(); - setMaxStackSize(1); - setUnlocalizedName("heart"); - setCreativeTab(BloodArsenal.BA_TAB); - } - - @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) - { - if (AlchemicalWizardry.wimpySettings) - { - par3List.add("Bright red in color"); - } - else - { - par3List.add("Fresh from a body"); - } - } - - @Override - @SideOnly(Side.CLIENT) - public void registerIcons(IIconRegister iconRegister) - { - if (AlchemicalWizardry.wimpySettings) - { - itemIcon = iconRegister.registerIcon("BloodArsenal:heart2"); - } - else - { - itemIcon = iconRegister.registerIcon("BloodArsenal:heart"); - } - } -} diff --git a/src/main/java/com/arc/bloodarsenal/items/ItemOrangeJuice.java b/src/main/java/com/arc/bloodarsenal/items/ItemOrangeJuice.java deleted file mode 100644 index 9d91bf5..0000000 --- a/src/main/java/com/arc/bloodarsenal/items/ItemOrangeJuice.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.arc.bloodarsenal.items; - -import com.arc.bloodarsenal.BloodArsenal; -import net.minecraft.item.Item; - -public class ItemOrangeJuice extends Item -{ - public ItemOrangeJuice() - { - super(); - setUnlocalizedName("orange_juice"); - setTextureName("BloodArsenal:orange_juice"); - setCreativeTab(BloodArsenal.BA_TAB); - } -} diff --git a/src/main/java/com/arc/bloodarsenal/items/ItemSoulFragment.java b/src/main/java/com/arc/bloodarsenal/items/ItemSoulFragment.java deleted file mode 100644 index 234bab9..0000000 --- a/src/main/java/com/arc/bloodarsenal/items/ItemSoulFragment.java +++ /dev/null @@ -1,25 +0,0 @@ -package com.arc.bloodarsenal.items; - -import com.arc.bloodarsenal.BloodArsenal; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import java.util.List; - -public class ItemSoulFragment extends Item -{ - public ItemSoulFragment() - { - super(); - setUnlocalizedName("soul_fragment"); - setTextureName("BloodArsenal:soul_fragment"); - setCreativeTab(BloodArsenal.BA_TAB); - } - - @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) - { - par3List.add("The raw essence"); - par3List.add("of a soul"); - } -} diff --git a/src/main/java/com/arc/bloodarsenal/items/ModItems.java b/src/main/java/com/arc/bloodarsenal/items/ModItems.java index 180a544..41ebb1e 100644 --- a/src/main/java/com/arc/bloodarsenal/items/ModItems.java +++ b/src/main/java/com/arc/bloodarsenal/items/ModItems.java @@ -2,9 +2,10 @@ package com.arc.bloodarsenal.items; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.blocks.ModBlocks; +import com.arc.bloodarsenal.block.ModBlocks; import com.arc.bloodarsenal.items.armor.VampireCostume; import com.arc.bloodarsenal.items.block.*; +import com.arc.bloodarsenal.items.sigil.SigilDivinity; import com.arc.bloodarsenal.items.sigil.SigilEnder; import com.arc.bloodarsenal.items.sigil.SigilSwimming; import com.arc.bloodarsenal.items.tool.*; @@ -54,10 +55,14 @@ public class ModItems public static Item vampire_boots; public static Item vampire_ring; public static Item energy_gatling; - public static Item creative_dagger; 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 void init() { @@ -67,14 +72,14 @@ public class ModItems blood_infused_axe_wood = new InfusedWoodAxe(); blood_infused_shovel_wood = new InfusedWoodShovel(); blood_infused_sword_wood = new InfusedWoodSword(); - amorphic_catalyst = new ItemAmorphicCatalyst(); - blood_infused_stick = new InfusedStick(); + amorphic_catalyst = new ItemBloodArsenal().setUnlocalizedName("amorphic_catalyst"); + blood_infused_stick = new ItemBloodArsenal().setUnlocalizedName("blood_infused_stick"); bound_sickle = new BoundSickle(AlchemicalWizardry.bloodBoundToolMaterial); blood_infused_pickaxe_iron = new InfusedIronPickaxe(); blood_infused_axe_iron = new InfusedIronAxe(); blood_infused_shovel_iron = new InfusedIronShovel(); blood_infused_sword_iron = new InfusedIronSword(); - blood_infused_iron = new InfusedIron(); + blood_infused_iron = new ItemBloodArsenal().setUnlocalizedName("blood_infused_iron"); bound_shears = new BoundShears(); blood_diamond = new InfusedDiamond().setUnlocalizedName("blood_diamond"); blood_infused_diamond_unactive = new InfusedDiamond().setUnlocalizedName("blood_infused_diamond_unactive"); @@ -84,69 +89,74 @@ public class ModItems blood_infused_axe_diamond = new InfusedDiamondAxe(); blood_infused_shovel_diamond = new InfusedDiamondShovel(); blood_infused_sword_diamond = new InfusedDiamondSword(); - heart = new ItemHeart(); - soul_fragment = new ItemSoulFragment(); + heart = new ItemBloodArsenal().setUnlocalizedName("heart"); + soul_fragment = new ItemBloodArsenal().setUnlocalizedName("soul_fragment"); item_blood_door_wood = new BloodDoor(Material.wood).setUnlocalizedName("item_blood_door_wood").setTextureName("BloodArsenal:item_blood_door_wood"); item_blood_door_iron = new BloodDoor(Material.iron).setUnlocalizedName("item_blood_door_iron").setTextureName("BloodArsenal:item_blood_door_iron"); bound_flint_and_steel = new BoundFlintAndSteel(); soul_booster = new ItemSoulBooster(); soul_nullifier = new ItemSoulNullifier(); blood_cookie = new ItemBloodCookie(); - orange_juice = new ItemOrangeJuice(); + orange_juice = new ItemBloodArsenal().setUnlocalizedName("orange_juice"); juice_and_cookies = new ItemJuiceAndCookies(); item_blood_cake = new ItemReed(ModBlocks.blood_cake).setUnlocalizedName("item_blood_cake").setTextureName("BloodArsenal:item_blood_cake").setCreativeTab(BloodArsenal.BA_TAB); vampire_cape = new VampireCostume(1).setUnlocalizedName("vampire_cape"); vampire_greaves = new VampireCostume(2).setUnlocalizedName("vampire_greaves"); vampire_boots = new VampireCostume(3).setUnlocalizedName("vampire_boots"); energy_gatling = new EnergyGatling(); - creative_dagger = new ItemCreativeDagger(); sigil_of_swimming = new SigilSwimming(); sigil_of_ender = new SigilEnder(); - blood_infused_glowstone_dust = new ItemBloodInfusedGlowstoneDust(); + blood_infused_glowstone_dust = new ItemBloodArsenal().setUnlocalizedName("blood_infused_glowstone_dust"); + sigil_of_divinity = new SigilDivinity(); + blood_ball = new ItemBloodBall(); + wolf_hide = new ItemBloodArsenal().setUnlocalizedName("wolf_hide"); } public static void registerItems() { - GameRegistry.registerItem(ModItems.bound_bow, "bound_bow"); - GameRegistry.registerItem(ModItems.blood_orange, "blood_orange"); - GameRegistry.registerItem(ModItems.blood_infused_pickaxe_wood, "blood_infused_pickaxe_wood"); - GameRegistry.registerItem(ModItems.blood_infused_axe_wood, "blood_infused_axe_wood"); - GameRegistry.registerItem(ModItems.blood_infused_shovel_wood, "blood_infused_shovel_wood"); - GameRegistry.registerItem(ModItems.blood_infused_sword_wood, "blood_infused_sword_wood"); - GameRegistry.registerItem(ModItems.amorphic_catalyst, "amorphic_catalyst"); - GameRegistry.registerItem(ModItems.blood_infused_stick, "blood_infused_stick"); - GameRegistry.registerItem(ModItems.bound_sickle, "bound_sickle"); - GameRegistry.registerItem(ModItems.blood_infused_pickaxe_iron, "blood_infused_pickaxe_iron"); - GameRegistry.registerItem(ModItems.blood_infused_axe_iron, "blood_infused_axe_iron"); - GameRegistry.registerItem(ModItems.blood_infused_shovel_iron, "blood_infused_shovel_iron"); - GameRegistry.registerItem(ModItems.blood_infused_sword_iron, "blood_infused_sword_iron"); - GameRegistry.registerItem(ModItems.blood_infused_iron, "blood_infused_iron"); - GameRegistry.registerItem(ModItems.bound_shears, "bound_shears"); - GameRegistry.registerItem(ModItems.blood_diamond, "blood_diamond"); - GameRegistry.registerItem(ModItems.blood_infused_diamond_unactive, "blood_infused_diamond_unactive"); - GameRegistry.registerItem(ModItems.blood_infused_diamond_active, "blood_infused_diamond_active"); - GameRegistry.registerItem(ModItems.blood_infused_diamond_bound, "blood_infused_diamond_bound"); - GameRegistry.registerItem(ModItems.blood_infused_pickaxe_diamond, "blood_infused_pickaxe_diamond"); - GameRegistry.registerItem(ModItems.blood_infused_axe_diamond, "blood_infused_axe_diamond"); - GameRegistry.registerItem(ModItems.blood_infused_shovel_diamond, "blood_infused_shovel_diamond"); - GameRegistry.registerItem(ModItems.blood_infused_sword_diamond, "blood_infused_sword_diamond"); - GameRegistry.registerItem(ModItems.heart, "heart"); - GameRegistry.registerItem(ModItems.soul_fragment, "soul_fragment"); - GameRegistry.registerItem(ModItems.item_blood_door_wood, "item_blood_door_wood"); - GameRegistry.registerItem(ModItems.item_blood_door_iron, "item_blood_door_iron"); - GameRegistry.registerItem(ModItems.bound_flint_and_steel, "bound_flint_and_steel"); - GameRegistry.registerItem(ModItems.soul_booster, "soul_booster"); - GameRegistry.registerItem(ModItems.soul_nullifier, "soul_nullfier"); - GameRegistry.registerItem(ModItems.blood_cookie, "blood_cookie"); - GameRegistry.registerItem(ModItems.orange_juice, "orange_juice"); - GameRegistry.registerItem(ModItems.juice_and_cookies, "juice_and_cookies"); - GameRegistry.registerItem(ModItems.vampire_cape, "vampire_cape"); - GameRegistry.registerItem(ModItems.vampire_greaves, "vampire_greaves"); - GameRegistry.registerItem(ModItems.vampire_boots, "vampire_boots"); - GameRegistry.registerItem(ModItems.energy_gatling, "energy_gatling"); - GameRegistry.registerItem(ModItems.creative_dagger, "creative_dagger"); - GameRegistry.registerItem(ModItems.sigil_of_swimming, "sigil_of_swimming"); - GameRegistry.registerItem(ModItems.sigil_of_ender, "sigil_of_ender"); - GameRegistry.registerItem(ModItems.blood_infused_glowstone_dust, "blood_infused_glowstone_dust"); + GameRegistry.registerItem(bound_bow, "bound_bow"); + GameRegistry.registerItem(blood_orange, "blood_orange"); + GameRegistry.registerItem(blood_infused_pickaxe_wood, "blood_infused_pickaxe_wood"); + GameRegistry.registerItem(blood_infused_axe_wood, "blood_infused_axe_wood"); + GameRegistry.registerItem(blood_infused_shovel_wood, "blood_infused_shovel_wood"); + GameRegistry.registerItem(blood_infused_sword_wood, "blood_infused_sword_wood"); + GameRegistry.registerItem(amorphic_catalyst, "amorphic_catalyst"); + GameRegistry.registerItem(blood_infused_stick, "blood_infused_stick"); + GameRegistry.registerItem(bound_sickle, "bound_sickle"); + GameRegistry.registerItem(blood_infused_pickaxe_iron, "blood_infused_pickaxe_iron"); + GameRegistry.registerItem(blood_infused_axe_iron, "blood_infused_axe_iron"); + GameRegistry.registerItem(blood_infused_shovel_iron, "blood_infused_shovel_iron"); + GameRegistry.registerItem(blood_infused_sword_iron, "blood_infused_sword_iron"); + GameRegistry.registerItem(blood_infused_iron, "blood_infused_iron"); + GameRegistry.registerItem(bound_shears, "bound_shears"); + GameRegistry.registerItem(blood_diamond, "blood_diamond"); + GameRegistry.registerItem(blood_infused_diamond_unactive, "blood_infused_diamond_unactive"); + GameRegistry.registerItem(blood_infused_diamond_active, "blood_infused_diamond_active"); + GameRegistry.registerItem(blood_infused_diamond_bound, "blood_infused_diamond_bound"); + GameRegistry.registerItem(blood_infused_pickaxe_diamond, "blood_infused_pickaxe_diamond"); + GameRegistry.registerItem(blood_infused_axe_diamond, "blood_infused_axe_diamond"); + GameRegistry.registerItem(blood_infused_shovel_diamond, "blood_infused_shovel_diamond"); + GameRegistry.registerItem(blood_infused_sword_diamond, "blood_infused_sword_diamond"); + GameRegistry.registerItem(heart, "heart"); + GameRegistry.registerItem(soul_fragment, "soul_fragment"); + GameRegistry.registerItem(item_blood_door_wood, "item_blood_door_wood"); + GameRegistry.registerItem(item_blood_door_iron, "item_blood_door_iron"); + GameRegistry.registerItem(item_blood_cake, "item_blood_cake"); + GameRegistry.registerItem(bound_flint_and_steel, "bound_flint_and_steel"); + GameRegistry.registerItem(soul_booster, "soul_booster"); + GameRegistry.registerItem(soul_nullifier, "soul_nullfier"); + GameRegistry.registerItem(blood_cookie, "blood_cookie"); + GameRegistry.registerItem(orange_juice, "orange_juice"); + GameRegistry.registerItem(juice_and_cookies, "juice_and_cookies"); + GameRegistry.registerItem(vampire_cape, "vampire_cape"); + GameRegistry.registerItem(vampire_greaves, "vampire_greaves"); + GameRegistry.registerItem(vampire_boots, "vampire_boots"); + GameRegistry.registerItem(energy_gatling, "energy_gatling"); + GameRegistry.registerItem(sigil_of_swimming, "sigil_of_swimming"); + GameRegistry.registerItem(sigil_of_ender, "sigil_of_ender"); + GameRegistry.registerItem(blood_infused_glowstone_dust, "blood_infused_glowstone_dust"); + GameRegistry.registerItem(sigil_of_divinity, "sigil_of_divinity"); + GameRegistry.registerItem(blood_ball, "blood_ball"); + GameRegistry.registerItem(wolf_hide, "wolf_hide"); } } diff --git a/src/main/java/com/arc/bloodarsenal/items/armor/VampireCostume.java b/src/main/java/com/arc/bloodarsenal/items/armor/VampireCostume.java index 56cef97..0a5d76f 100644 --- a/src/main/java/com/arc/bloodarsenal/items/armor/VampireCostume.java +++ b/src/main/java/com/arc/bloodarsenal/items/armor/VampireCostume.java @@ -2,7 +2,7 @@ package com.arc.bloodarsenal.items.armor; import com.arc.bloodarsenal.BloodArsenal; import com.arc.bloodarsenal.items.ModItems; -import com.arc.bloodarsenal.renderer.ModelVampireCostume; +import com.arc.bloodarsenal.renderer.model.ModelVampireCostume; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBiped; diff --git a/src/main/java/com/arc/bloodarsenal/items/bauble/ItemBauble.java b/src/main/java/com/arc/bloodarsenal/items/bauble/ItemBauble.java index fd23372..7b6a898 100644 --- a/src/main/java/com/arc/bloodarsenal/items/bauble/ItemBauble.java +++ b/src/main/java/com/arc/bloodarsenal/items/bauble/ItemBauble.java @@ -74,7 +74,7 @@ public abstract class ItemBauble extends Item implements IBauble @Override public void onWornTick(ItemStack stack, EntityLivingBase player) { - if(player.ticksExisted == 1) + if (player.ticksExisted == 1) { onEquippedOrLoadedIntoWorld(stack, player); } diff --git a/src/main/java/com/arc/bloodarsenal/items/bauble/SacrificeAmulet.java b/src/main/java/com/arc/bloodarsenal/items/bauble/SacrificeAmulet.java new file mode 100644 index 0000000..6c4856f --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/items/bauble/SacrificeAmulet.java @@ -0,0 +1,130 @@ +package com.arc.bloodarsenal.items.bauble; + +import WayofTime.alchemicalWizardry.api.items.IAltarManipulator; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import baubles.api.BaubleType; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +import java.util.List; + +public class SacrificeAmulet extends ItemBauble implements IAltarManipulator +{ + public SacrificeAmulet() + { + super(); + setUnlocalizedName("sacrifice_amulet"); + } + + @Override + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) + { + par3List.add("Collecting some blood!"); + + if (!(par1ItemStack.stackTagCompound == null)) + { + par3List.add("Stored LP: " + this.getStoredLP(par1ItemStack)); + } + } + + @Override + public void onWornTick(ItemStack par1ItemStack, EntityLivingBase player) + { + super.onWornTick(par1ItemStack, player); + } + + @Override + public BaubleType getBaubleType(ItemStack par1ItemStack) + { + return BaubleType.AMULET; + } + + @Override + public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) + { + if (world.isRemote) + { + return itemStack; + } + + MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, player, false); + + if (movingobjectposition == null) + { + return super.onItemRightClick(itemStack, world, player); + } + else + { + if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) + { + int x = movingobjectposition.blockX; + int y = movingobjectposition.blockY; + int z = movingobjectposition.blockZ; + + TileEntity tile = world.getTileEntity(x, y, z); + + if (!(tile instanceof TEAltar)) + { + return super.onItemRightClick(itemStack, world, player); + } + + TEAltar altar = (TEAltar)tile; + + if (!altar.isActive()) + { + int amount = this.getStoredLP(itemStack); + if (amount > 0) + { + int filledAmount = altar.fillMainTank(amount); + amount -= filledAmount; + this.setStoredLP(itemStack, amount); + + world.markBlockForUpdate(x, y, z); + } + } + } + } + + return itemStack; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) + { + this.itemIcon = iconRegister.registerIcon("BloodArsenal:sacrifice_amulet"); + } + + public void setStoredLP(ItemStack itemStack, int lp) + { + if (!itemStack.hasTagCompound()) + { + itemStack.setTagCompound(new NBTTagCompound()); + } + + NBTTagCompound tag = itemStack.getTagCompound(); + + tag.setInteger("storedLP", lp); + } + + public int getStoredLP(ItemStack itemStack) + { + if (!itemStack.hasTagCompound()) + { + itemStack.setTagCompound(new NBTTagCompound()); + } + + NBTTagCompound tag = itemStack.getTagCompound(); + + return tag.getInteger("storedLP"); + } +} diff --git a/src/main/java/com/arc/bloodarsenal/items/bauble/SelfSacrificeAmulet.java b/src/main/java/com/arc/bloodarsenal/items/bauble/SelfSacrificeAmulet.java new file mode 100644 index 0000000..93cb124 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/items/bauble/SelfSacrificeAmulet.java @@ -0,0 +1,130 @@ +package com.arc.bloodarsenal.items.bauble; + +import WayofTime.alchemicalWizardry.api.items.IAltarManipulator; +import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; +import baubles.api.BaubleType; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.renderer.texture.IIconRegister; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; +import net.minecraft.world.World; + +import java.util.List; + +public class SelfSacrificeAmulet extends ItemBauble implements IAltarManipulator +{ + public SelfSacrificeAmulet() + { + super(); + setUnlocalizedName("self_sacrifice_amulet"); + } + + @Override + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) + { + par3List.add("Collecting your blood!"); + + if (!(par1ItemStack.stackTagCompound == null)) + { + par3List.add("Stored LP: " + this.getStoredLP(par1ItemStack)); + } + } + + @Override + public void onWornTick(ItemStack par1ItemStack, EntityLivingBase player) + { + super.onWornTick(par1ItemStack, player); + } + + @Override + public BaubleType getBaubleType(ItemStack par1ItemStack) + { + return BaubleType.AMULET; + } + + @Override + public ItemStack onItemRightClick(ItemStack itemStack, World world, EntityPlayer player) + { + if (world.isRemote) + { + return itemStack; + } + + MovingObjectPosition movingobjectposition = this.getMovingObjectPositionFromPlayer(world, player, false); + + if (movingobjectposition == null) + { + return super.onItemRightClick(itemStack, world, player); + } + else + { + if (movingobjectposition.typeOfHit == MovingObjectPosition.MovingObjectType.BLOCK) + { + int x = movingobjectposition.blockX; + int y = movingobjectposition.blockY; + int z = movingobjectposition.blockZ; + + TileEntity tile = world.getTileEntity(x, y, z); + + if (!(tile instanceof TEAltar)) + { + return super.onItemRightClick(itemStack, world, player); + } + + TEAltar altar = (TEAltar)tile; + + if (!altar.isActive()) + { + int amount = this.getStoredLP(itemStack); + if (amount > 0) + { + int filledAmount = altar.fillMainTank(amount); + amount -= filledAmount; + this.setStoredLP(itemStack, amount); + + world.markBlockForUpdate(x, y, z); + } + } + } + } + + return itemStack; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) + { + this.itemIcon = iconRegister.registerIcon("BloodArsenal:self_sacrifice_amulet"); + } + + public void setStoredLP(ItemStack itemStack, int lp) + { + if (!itemStack.hasTagCompound()) + { + itemStack.setTagCompound(new NBTTagCompound()); + } + + NBTTagCompound tag = itemStack.getTagCompound(); + + tag.setInteger("storedLP", lp); + } + + public int getStoredLP(ItemStack itemStack) + { + if (!itemStack.hasTagCompound()) + { + itemStack.setTagCompound(new NBTTagCompound()); + } + + NBTTagCompound tag = itemStack.getTagCompound(); + + return tag.getInteger("storedLP"); + } +} diff --git a/src/main/java/com/arc/bloodarsenal/items/block/BloodDoor.java b/src/main/java/com/arc/bloodarsenal/items/block/BloodDoor.java index a69415c..fabe014 100644 --- a/src/main/java/com/arc/bloodarsenal/items/block/BloodDoor.java +++ b/src/main/java/com/arc/bloodarsenal/items/block/BloodDoor.java @@ -1,8 +1,7 @@ package com.arc.bloodarsenal.items.block; import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.blocks.ModBlocks; -import com.arc.bloodarsenal.tileentity.TileOwned; +import com.arc.bloodarsenal.block.ModBlocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/arc/bloodarsenal/items/block/BloodDoorWood.java b/src/main/java/com/arc/bloodarsenal/items/block/BloodDoorWood.java index 7ed4bc9..26f8efe 100644 --- a/src/main/java/com/arc/bloodarsenal/items/block/BloodDoorWood.java +++ b/src/main/java/com/arc/bloodarsenal/items/block/BloodDoorWood.java @@ -1,8 +1,7 @@ package com.arc.bloodarsenal.items.block; import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.blocks.ModBlocks; -import com.arc.bloodarsenal.tileentity.TileOwned; +import com.arc.bloodarsenal.block.ModBlocks; import net.minecraft.block.Block; import net.minecraft.block.material.Material; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/arc/bloodarsenal/items/block/BloodStoneBlock.java b/src/main/java/com/arc/bloodarsenal/items/block/BloodStoneBlock.java index 02ed341..31fe069 100644 --- a/src/main/java/com/arc/bloodarsenal/items/block/BloodStoneBlock.java +++ b/src/main/java/com/arc/bloodarsenal/items/block/BloodStoneBlock.java @@ -14,7 +14,7 @@ public class BloodStoneBlock extends ItemBlock public String getUnlocalizedName(ItemStack itemStack) { - String name = ""; + String name; switch (itemStack.getItemDamage()) { @@ -34,6 +34,10 @@ public class BloodStoneBlock extends ItemBlock name = "blood_stone_4"; break; + case 4: + name = "blood_stone_5"; + break; + default: name = "blood_stone"; } diff --git a/src/main/java/com/arc/bloodarsenal/items/sigil/SigilDivinity.java b/src/main/java/com/arc/bloodarsenal/items/sigil/SigilDivinity.java new file mode 100644 index 0000000..72c052c --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/items/sigil/SigilDivinity.java @@ -0,0 +1,190 @@ +package com.arc.bloodarsenal.items.sigil; + +import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; +import WayofTime.alchemicalWizardry.common.items.EnergyItems; +import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.BloodArsenalConfig; +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.world.World; + +import java.util.List; + +public class SigilDivinity extends EnergyItems implements ArmourUpgrade, IBindable +{ + @SideOnly(Side.CLIENT) + public IIcon activeIcon; + @SideOnly(Side.CLIENT) + public IIcon passiveIcon; + + public SigilDivinity() + { + super(); + setMaxStackSize(1); + setUnlocalizedName("sigil_of_divinity"); + setCreativeTab(BloodArsenal.BA_TAB); + setEnergyUsed(50000); + } + + @Override + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) + { + par3List.add("May the Divines protect you!"); + + if (!(par1ItemStack.stackTagCompound == null)) + { + if (par1ItemStack.stackTagCompound.getBoolean("isActive")) + { + par3List.add("Activated"); + } + else + { + par3List.add("Deactivated"); + } + + par3List.add("Current owner: " + par1ItemStack.stackTagCompound.getString("ownerName")); + } + } + + @Override + @SideOnly(Side.CLIENT) + public void registerIcons(IIconRegister iconRegister) + { + itemIcon = iconRegister.registerIcon("BloodArsenal:sigil_of_divinity_deactivated"); + activeIcon = iconRegister.registerIcon("BloodArsenal:sigil_of_divinity_activated"); + passiveIcon = iconRegister.registerIcon("BloodArsenal:sigil_of_divinity_deactivated"); + } + + @Override + @SideOnly(Side.CLIENT) + 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; + } + } + + @Override + @SideOnly(Side.CLIENT) + public IIcon getIconFromDamage(int par1) + { + if (par1 == 1) + { + return activeIcon; + } + else + { + return passiveIcon; + } + } + + @Override + public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) + { + EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); + + if (par3EntityPlayer.isSneaking()) + { + return par1ItemStack; + } + + if (par1ItemStack.stackTagCompound == null) + { + par1ItemStack.setTagCompound(new NBTTagCompound()); + } + + NBTTagCompound tag = par1ItemStack.stackTagCompound; + tag.setBoolean("isActive", !(tag.getBoolean("isActive"))); + + if (tag.getBoolean("isActive")) + { + par1ItemStack.setItemDamage(1); + tag.setInteger("worldTimeDelay", (int) (par2World.getWorldTime() - 1) % 200); + par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.field_76444_x.id, 2, 0)); + + if (!par3EntityPlayer.capabilities.isCreativeMode) + { + EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()); + } + } + else + { + par1ItemStack.setItemDamage(par1ItemStack.getMaxDamage()); + } + + return par1ItemStack; + } + + @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 (par1ItemStack.stackTagCompound.getBoolean("isActive")) + { + par3EntityPlayer.addPotionEffect(new PotionEffect(Potion.field_76444_x.id, 2, 4)); + } + + if (par2World.getWorldTime() % 200 == par1ItemStack.stackTagCompound.getInteger("worldTimeDelay") && par1ItemStack.stackTagCompound.getBoolean("isActive")) + { + if (!par3EntityPlayer.capabilities.isCreativeMode) + { + EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()); + } + } + } + + @Override + public void onArmourUpdate(World par1World, EntityPlayer par2EntityPlayer, ItemStack par3ItemStack) + { + if (par3ItemStack.stackTagCompound == null) + { + par3ItemStack.setTagCompound(new NBTTagCompound()); + } + + par2EntityPlayer.addPotionEffect(new PotionEffect(Potion.field_76444_x.id, 2, 0, true)); + } + + @Override + public boolean isUpgrade() + { + return true; + } + + @Override + public int getEnergyForTenSeconds() + { + return BloodArsenalConfig.sigilDivinityCost; + } +} diff --git a/src/main/java/com/arc/bloodarsenal/items/sigil/SigilEnder.java b/src/main/java/com/arc/bloodarsenal/items/sigil/SigilEnder.java index 168140c..fde1642 100644 --- a/src/main/java/com/arc/bloodarsenal/items/sigil/SigilEnder.java +++ b/src/main/java/com/arc/bloodarsenal/items/sigil/SigilEnder.java @@ -3,6 +3,8 @@ package com.arc.bloodarsenal.items.sigil; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.entity.projectile.EntityEnderSigilPearl; +import net.minecraft.entity.EntityLiving; import net.minecraft.entity.item.EntityEnderPearl; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -20,7 +22,6 @@ public class SigilEnder extends EnergyItems implements IBindable setUnlocalizedName("sigil_of_ender"); setTextureName("BloodArsenal:sigil_of_ender"); setCreativeTab(BloodArsenal.BA_TAB); - setEnergyUsed(1000); } @Override @@ -39,11 +40,6 @@ public class SigilEnder extends EnergyItems implements IBindable { EnergyItems.checkAndSetItemOwner(par1ItemStack, par3EntityPlayer); - par3EntityPlayer.displayGUIChest(par3EntityPlayer.getInventoryEnderChest()); - par2World.playSoundAtEntity(par3EntityPlayer, "mob.endermen.portal", 1F, 1F); - - EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 500); - if (par1ItemStack.stackTagCompound == null) { par1ItemStack.setTagCompound(new NBTTagCompound()); @@ -51,20 +47,20 @@ public class SigilEnder extends EnergyItems implements IBindable if (par3EntityPlayer.isSneaking() && !par3EntityPlayer.isSwingInProgress) { - if (!par3EntityPlayer.capabilities.isCreativeMode) - { - return par1ItemStack; - } - else - { - par2World.playSoundAtEntity(par3EntityPlayer, "mob.endermen.portal", 1F, 1F); + par2World.playSoundAtEntity(par3EntityPlayer, "random.bow", 0.5F, 0.4F / (itemRand.nextFloat() * 0.4F + 0.8F)); - if (!par2World.isRemote) - { - par2World.spawnEntityInWorld(new EntityEnderPearl(par2World, par3EntityPlayer)); - EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, getEnergyUsed()); - } + if (!par2World.isRemote) + { + par2World.spawnEntityInWorld(new EntityEnderSigilPearl(par2World, par3EntityPlayer)); + EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 300); } + + } + else if (!par3EntityPlayer.isSneaking()) + { + par3EntityPlayer.displayGUIChest(par3EntityPlayer.getInventoryEnderChest()); + par2World.playSoundAtEntity(par3EntityPlayer, "mob.endermen.portal", 1F, 1F); + EnergyItems.syphonBatteries(par1ItemStack, par3EntityPlayer, 200); } return par1ItemStack; diff --git a/src/main/java/com/arc/bloodarsenal/items/sigil/SigilSwimming.java b/src/main/java/com/arc/bloodarsenal/items/sigil/SigilSwimming.java index 5cd70a3..4268570 100644 --- a/src/main/java/com/arc/bloodarsenal/items/sigil/SigilSwimming.java +++ b/src/main/java/com/arc/bloodarsenal/items/sigil/SigilSwimming.java @@ -184,6 +184,6 @@ public class SigilSwimming extends EnergyItems implements ArmourUpgrade, IBindab @Override public int getEnergyForTenSeconds() { - return 150; + return BloodArsenalConfig.sigilSwimmingCost; } } diff --git a/src/main/java/com/arc/bloodarsenal/items/tinkers/BloodArsenalTinkers.java b/src/main/java/com/arc/bloodarsenal/items/tinkers/BloodArsenalTinkers.java index 807dbc0..bc64614 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tinkers/BloodArsenalTinkers.java +++ b/src/main/java/com/arc/bloodarsenal/items/tinkers/BloodArsenalTinkers.java @@ -1,7 +1,6 @@ package com.arc.bloodarsenal.items.tinkers; import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.BloodArsenalConfig; import cpw.mods.fml.common.registry.GameRegistry; import tconstruct.library.TConstructRegistry; import tconstruct.library.client.TConstructClientRegistry; @@ -12,10 +11,14 @@ public class BloodArsenalTinkers public static PartHelper AXE_HEAD; public static PartHelper BATTLE_SIGN_HEAD; public static PartHelper BINDING; + 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; @@ -28,6 +31,7 @@ public class BloodArsenalTinkers 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; @@ -37,29 +41,24 @@ public class BloodArsenalTinkers { if (BloodArsenal.isTinkersConstructLoaded) { - if (BloodArsenalConfig.tinkersIntegration) - { - TConstructRegistry.addToolMaterial(250, "Blood Infused Iron", 3, 550, 1800, 3, 1.5F, 0, 0.0F, "", ""); +// TConstructRegistry.addToolMaterial(250, "Blood Infused Iron", 3, 550, 1800, 3, 1.5F, 0, 0.0F, "", ""); + TConstructRegistry.addToolMaterial(250, "Blood Infused Iron", "blood_infused_iron", 3, 550, 1800, 3, 1.5F, 0, 0.0F, "Blood Infused Iron", 0xff0000); - TConstructClientRegistry.addMaterialRenderMapping(250, "BloodArsenal", "blood_infused_iron", true); + TConstructClientRegistry.addMaterialRenderMapping(250, "BloodArsenal", "blood_infused_iron", true); - TConstructRegistry.addBowMaterial(250, 500, 40, 1.2F); + TConstructRegistry.addBowMaterial(250, 40, 1.2F); - TConstructRegistry.addArrowMaterial(250, 4.7F, 0.2F, 100.0F); - } + TConstructRegistry.addArrowMaterial(250, 4.7F, 0.2F); } } public static void addParts() { - if (BloodArsenalConfig.tinkersIntegration) - { - initParts(); + initParts(); - addMaterialToParts(250, "blood.infused.iron", "blood_infused_iron"); + addMaterialToToolParts(250, "blood.infused.iron", "blood_infused_iron"); - registerParts(); - } + registerParts(); } private static void initParts() @@ -68,10 +67,14 @@ public class BloodArsenalTinkers AXE_HEAD = new PartHelper("axe.head", 0, ""); BATTLE_SIGN_HEAD = new PartHelper("battle.sign", 0, ""); BINDING = new PartHelper("binding", 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, ""); @@ -84,22 +87,27 @@ public class BloodArsenalTinkers 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 addMaterialToParts(int materialID, String unlocalizedName, String texture) + 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"); + 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"); @@ -112,6 +120,7 @@ public class BloodArsenalTinkers 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"); @@ -124,10 +133,14 @@ public class BloodArsenalTinkers GameRegistry.registerItem(AXE_HEAD, "axeHead"); GameRegistry.registerItem(BATTLE_SIGN_HEAD, "battleSign"); GameRegistry.registerItem(BINDING, "binding"); + 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"); @@ -140,9 +153,11 @@ public class BloodArsenalTinkers 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?"); } } diff --git a/src/main/java/com/arc/bloodarsenal/items/tinkers/PartHelper.java b/src/main/java/com/arc/bloodarsenal/items/tinkers/PartHelper.java index c87de02..3c4dba4 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tinkers/PartHelper.java +++ b/src/main/java/com/arc/bloodarsenal/items/tinkers/PartHelper.java @@ -45,8 +45,8 @@ public class PartHelper extends Item implements IToolPart this.itemIcon = icon.registerIcon(this.defaultTexture); for (Map.Entry texture : this.textures.entrySet()) { - int materialID = (Integer)texture.getKey().intValue(); - String textureName = (String)texture.getValue(); + int materialID = texture.getKey().intValue(); + String textureName = texture.getValue(); IIcon _icon = icon.registerIcon(texturePath + textureName); @@ -74,7 +74,7 @@ public class PartHelper extends Item implements IToolPart { if (this.icons.containsKey(Integer.valueOf(damageValue))) { - return (IIcon)this.icons.get(Integer.valueOf(damageValue)); + return this.icons.get(Integer.valueOf(damageValue)); } return this.itemIcon; } @@ -85,7 +85,7 @@ public class PartHelper extends Item implements IToolPart { for (Map.Entry subItem : this.unlocalizedMaterialNames.entrySet()) { - int materialId = (Integer)subItem.getKey().intValue(); + int materialId = subItem.getKey().intValue(); itemStackList.add(new ItemStack(item, 1, materialId)); } } @@ -101,7 +101,7 @@ public class PartHelper extends Item implements IToolPart if (this.unlocalizedMaterialNames.containsKey(Integer.valueOf(damageValue))) { - return "item." + (String)this.unlocalizedMaterialNames.get(Integer.valueOf(damageValue)) + "." + this.unlocalizedPartName; + return "item." + this.unlocalizedMaterialNames.get(Integer.valueOf(damageValue)) + "." + this.unlocalizedPartName; } return getUnlocalizedName(); } @@ -113,8 +113,8 @@ public class PartHelper extends Item implements IToolPart if (this.unlocalizedMaterialNames.containsKey(Integer.valueOf(damageValue))) { - String unlocalizedMaterialName = (String)this.unlocalizedMaterialNames.get(Integer.valueOf(damageValue)); - if ((StatCollector.canTranslate("part." + this.unlocalizedPartName)) && (StatCollector.canTranslate("material." + unlocalizedMaterialName))) + String unlocalizedMaterialName = this.unlocalizedMaterialNames.get(Integer.valueOf(damageValue)); + if (StatCollector.canTranslate("part." + this.unlocalizedPartName) && StatCollector.canTranslate("material." + unlocalizedMaterialName)) { String localizedPartName = StatCollector.translateToLocal("part." + this.unlocalizedPartName); String localizedMaterialName = StatCollector.translateToLocal("material." + unlocalizedMaterialName); diff --git a/src/main/java/com/arc/bloodarsenal/items/tinkers/RecipeHelper.java b/src/main/java/com/arc/bloodarsenal/items/tinkers/RecipeHelper.java index 1183c71..ab7de3e 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tinkers/RecipeHelper.java +++ b/src/main/java/com/arc/bloodarsenal/items/tinkers/RecipeHelper.java @@ -41,16 +41,21 @@ public class RecipeHelper 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 crossbowBodyPattern = TConstructRegistry.getItemStack("crossbowBodyPattern"); private static final ItemStack arrowHeadPattern = new ItemStack(pattern, 1, 25); 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 _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; @@ -63,6 +68,7 @@ public class RecipeHelper 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; @@ -117,7 +123,7 @@ public class RecipeHelper List materials = PatternBuilder.instance.materials; for (int i = 0; i < materials.size(); i++) { - PatternBuilder.ItemKey itemKey = (PatternBuilder.ItemKey)materials.get(i); + PatternBuilder.ItemKey itemKey = materials.get(i); if ((itemKey.item == material.getItem()) && (material.getItemDamage() == itemKey.damage)) { materials.remove(i); diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedIron.java b/src/main/java/com/arc/bloodarsenal/items/tool/InfusedIron.java deleted file mode 100644 index 3429d39..0000000 --- a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedIron.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.arc.bloodarsenal.items.tool; - -import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.items.ModItems; -import cpw.mods.fml.common.event.FMLInterModComms; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; -import net.minecraft.nbt.NBTTagCompound; - -import java.util.List; - -public class InfusedIron extends Item -{ - public InfusedIron() - { - super(); - setUnlocalizedName("blood_infused_iron"); - setTextureName("BloodArsenal:blood_infused_iron"); - setCreativeTab(BloodArsenal.BA_TAB); - } - - @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) - { - par3List.add("Mundane iron infused"); - par3List.add("with life essence"); - } -} diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedIronSword.java b/src/main/java/com/arc/bloodarsenal/items/tool/InfusedIronSword.java index 8dd03af..a59f02b 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedIronSword.java +++ b/src/main/java/com/arc/bloodarsenal/items/tool/InfusedIronSword.java @@ -65,7 +65,6 @@ public class InfusedIronSword extends ItemSword implements IBindable } } - par2EntityLivingBase.addPotionEffect(new PotionEffect(Potion.weakness.id, 60, 2)); return true; } diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedStick.java b/src/main/java/com/arc/bloodarsenal/items/tool/InfusedStick.java deleted file mode 100644 index 221c43b..0000000 --- a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedStick.java +++ /dev/null @@ -1,26 +0,0 @@ -package com.arc.bloodarsenal.items.tool; - -import com.arc.bloodarsenal.BloodArsenal; -import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; - -import java.util.List; - -public class InfusedStick extends Item -{ - public InfusedStick() - { - super(); - setUnlocalizedName("blood_infused_stick"); - setTextureName("BloodArsenal:blood_infused_stick"); - setCreativeTab(BloodArsenal.BA_TAB); - } - - @Override - public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) - { - par3List.add("It's a stick"); - par3List.add("infused with life!"); - } -} diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedWoodSword.java b/src/main/java/com/arc/bloodarsenal/items/tool/InfusedWoodSword.java index 38b2ef6..09dc02d 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedWoodSword.java +++ b/src/main/java/com/arc/bloodarsenal/items/tool/InfusedWoodSword.java @@ -64,7 +64,6 @@ public class InfusedWoodSword extends ItemSword implements IBindable } } - par2EntityLivingBase.addPotionEffect(new PotionEffect(Potion.weakness.id, 60, 2)); return true; } diff --git a/src/main/java/com/arc/bloodarsenal/potion/PotionBleeding.java b/src/main/java/com/arc/bloodarsenal/potion/PotionBleeding.java index 5dfeb02..d72be76 100644 --- a/src/main/java/com/arc/bloodarsenal/potion/PotionBleeding.java +++ b/src/main/java/com/arc/bloodarsenal/potion/PotionBleeding.java @@ -1,9 +1,15 @@ package com.arc.bloodarsenal.potion; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class PotionBleeding extends Potion { + private static final ResourceLocation resourceLocation = new ResourceLocation("bloodarsenal", "textures/misc/potions.png"); + public PotionBleeding(int par1, boolean par2, int par3) { super(par1, par2, par3); @@ -15,4 +21,11 @@ public class PotionBleeding extends Potion super.setIconIndex(par1, par2); return this; } + + @SideOnly(Side.CLIENT) + public int getStatusIconIndex() + { + Minecraft.getMinecraft().renderEngine.bindTexture(resourceLocation); + return super.getStatusIconIndex(); + } } diff --git a/src/main/java/com/arc/bloodarsenal/potion/PotionSoulBurn.java b/src/main/java/com/arc/bloodarsenal/potion/PotionSoulBurn.java new file mode 100644 index 0000000..0b67260 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/potion/PotionSoulBurn.java @@ -0,0 +1,31 @@ +package com.arc.bloodarsenal.potion; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; +import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; + +public class PotionSoulBurn extends Potion +{ + private static final ResourceLocation resourceLocation = new ResourceLocation("bloodarsenal", "textures/misc/potions.png"); + + public PotionSoulBurn(int par1, boolean par2, int par3) + { + super(par1, par2, par3); + } + + @Override + public Potion setIconIndex(int par1, int par2) + { + super.setIconIndex(par1, par2); + return this; + } + + @SideOnly(Side.CLIENT) + public int getStatusIconIndex() + { + Minecraft.getMinecraft().renderEngine.bindTexture(resourceLocation); + return super.getStatusIconIndex(); + } +} diff --git a/src/main/java/com/arc/bloodarsenal/potion/PotionSwimming.java b/src/main/java/com/arc/bloodarsenal/potion/PotionSwimming.java index d1dd092..633cee3 100644 --- a/src/main/java/com/arc/bloodarsenal/potion/PotionSwimming.java +++ b/src/main/java/com/arc/bloodarsenal/potion/PotionSwimming.java @@ -1,9 +1,15 @@ package com.arc.bloodarsenal.potion; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.client.Minecraft; import net.minecraft.potion.Potion; +import net.minecraft.util.ResourceLocation; public class PotionSwimming extends Potion { + private static final ResourceLocation resourceLocation = new ResourceLocation("bloodarsenal", "textures/misc/potions.png"); + public PotionSwimming(int par1, boolean par2, int par3) { super(par1, par2, par3); @@ -15,4 +21,11 @@ public class PotionSwimming extends Potion super.setIconIndex(par1, par2); return this; } + + @SideOnly(Side.CLIENT) + public int getStatusIconIndex() + { + Minecraft.getMinecraft().renderEngine.bindTexture(resourceLocation); + return super.getStatusIconIndex(); + } } diff --git a/src/main/java/com/arc/bloodarsenal/potion/PotionVampiricAura.java b/src/main/java/com/arc/bloodarsenal/potion/PotionVampiricAura.java index 934078b..30bc6c6 100644 --- a/src/main/java/com/arc/bloodarsenal/potion/PotionVampiricAura.java +++ b/src/main/java/com/arc/bloodarsenal/potion/PotionVampiricAura.java @@ -8,7 +8,7 @@ import net.minecraft.util.ResourceLocation; public class PotionVampiricAura extends Potion { - private static final ResourceLocation resourceLocation = new ResourceLocation("BloodArsenal", "textures/misc/potions.png"); + private static final ResourceLocation resourceLocation = new ResourceLocation("bloodarsenal", "textures/misc/potions.png"); public PotionVampiricAura(int par1, boolean par2, int par3) { @@ -22,11 +22,10 @@ public class PotionVampiricAura extends Potion return this; } -/* @SideOnly(Side.CLIENT) + @SideOnly(Side.CLIENT) public int getStatusIconIndex() { Minecraft.getMinecraft().renderEngine.bindTexture(resourceLocation); return super.getStatusIconIndex(); } - */ } diff --git a/src/main/java/com/arc/bloodarsenal/renderer/block/TilePortableAltarRenderer.java b/src/main/java/com/arc/bloodarsenal/renderer/block/TilePortableAltarRenderer.java new file mode 100644 index 0000000..b5a9ece --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/renderer/block/TilePortableAltarRenderer.java @@ -0,0 +1,232 @@ +package com.arc.bloodarsenal.renderer.block; + +import com.arc.bloodarsenal.renderer.model.ModelPortableBloodAltar; +import com.arc.bloodarsenal.tileentity.TilePortableAltar; +import net.minecraft.client.renderer.entity.RenderItem; +import net.minecraft.client.renderer.entity.RenderManager; +import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; +import net.minecraft.entity.item.EntityItem; +import net.minecraft.item.ItemBlock; +import net.minecraft.item.ItemStack; +import net.minecraft.tileentity.TileEntity; +import net.minecraftforge.common.util.ForgeDirection; +import org.lwjgl.opengl.GL11; + +public class TilePortableAltarRenderer extends TileEntitySpecialRenderer +{ + private ModelPortableBloodAltar modelBloodAltar = new ModelPortableBloodAltar(); + private final RenderItem customRenderItem; + + public TilePortableAltarRenderer() + { + customRenderItem = new RenderItem() + { + @Override + public boolean shouldBob() + { + return false; + } + }; + customRenderItem.setRenderManager(RenderManager.instance); + } + + @Override + public void renderTileEntityAt(TileEntity tileEntity, double d0, double d1, double d2, float f) + { + modelBloodAltar.renderBloodAltar((TilePortableAltar) tileEntity, d0, d1, d2); + modelBloodAltar.renderBloodLevel((TilePortableAltar) tileEntity, d0, d1, d2); + + if (tileEntity instanceof TilePortableAltar) + { + TilePortableAltar tileAltar = (TilePortableAltar) tileEntity; + GL11.glPushMatrix(); + + if (tileAltar.getStackInSlot(0) != null) + { + float scaleFactor = getGhostItemScaleFactor(tileAltar.getStackInSlot(0)); + float rotationAngle = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL); + EntityItem ghostEntityItem = new EntityItem(tileAltar.getWorldObj()); + ghostEntityItem.hoverStart = 0.0F; + ghostEntityItem.setEntityItemStack(tileAltar.getStackInSlot(0)); + float displacement = 0.2F; + + if (ghostEntityItem.getEntityItem().getItem() instanceof ItemBlock) + { + GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + displacement + 0.7F, (float) d2 + 0.5F); + } + else + { + GL11.glTranslatef((float) d0 + 0.5F, (float) d1 + displacement + 0.6F, (float) d2 + 0.5F); + } + GL11.glScalef(scaleFactor, scaleFactor, scaleFactor); + GL11.glRotatef(rotationAngle, 0.0F, 1.0F, 0.0F); + customRenderItem.doRender(ghostEntityItem, 0, 0, 0, 0, 0); + } + + GL11.glPopMatrix(); + } + } + + private float getGhostItemScaleFactor(ItemStack itemStack) + { + float scaleFactor = 1.0F; + + if (itemStack != null) + { + if (itemStack.getItem() instanceof ItemBlock) + { + switch (customRenderItem.getMiniBlockCount(itemStack, (byte) 1)) + { + case 1: + return 0.90F; + + case 2: + return 0.90F; + + case 3: + return 0.90F; + + case 4: + return 0.90F; + + case 5: + return 0.80F; + + default: + return 0.90F; + } + } + else + { + switch (customRenderItem.getMiniItemCount(itemStack, (byte) 1)) + { + case 1: + return 0.65F; + + case 2: + return 0.65F; + + case 3: + return 0.65F; + + case 4: + return 0.65F; + + default: + return 0.65F; + } + } + } + + return scaleFactor; + } + + private void translateGhostItemByOrientation(ItemStack ghostItemStack, double x, double y, double z, ForgeDirection forgeDirection) + { + if (ghostItemStack != null) + { + if (ghostItemStack.getItem() instanceof ItemBlock) + { + switch (forgeDirection) + { + case DOWN: + { + GL11.glTranslatef((float) x + 0.5F, (float) y + 2.7F, (float) z + 0.5F); + return; + } + + case UP: + { + GL11.glTranslatef((float) x + 0.5F, (float) y + 0.25F, (float) z + 0.5F); + return; + } + + case NORTH: + { + GL11.glTranslatef((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.7F); + return; + } + + case SOUTH: + { + GL11.glTranslatef((float) x + 0.5F, (float) y + 0.5F, (float) z + 0.3F); + return; + } + + case EAST: + { + GL11.glTranslatef((float) x + 0.3F, (float) y + 0.5F, (float) z + 0.5F); + return; + } + + case WEST: + { + GL11.glTranslatef((float) x + 0.70F, (float) y + 0.5F, (float) z + 0.5F); + return; + } + + case UNKNOWN: + { + return; + } + + default: + { + return; + } + } + } + else + { + switch (forgeDirection) + { + case DOWN: + { + GL11.glTranslatef((float) x + 0.5F, (float) y + 0.6F, (float) z + 0.5F); + return; + } + + case UP: + { + GL11.glTranslatef((float) x + 0.5F, (float) y + 0.20F, (float) z + 0.5F); + return; + } + + case NORTH: + { + GL11.glTranslatef((float) x + 0.5F, (float) y + 0.4F, (float) z + 0.7F); + return; + } + + case SOUTH: + { + GL11.glTranslatef((float) x + 0.5F, (float) y + 0.4F, (float) z + 0.3F); + return; + } + + case EAST: + { + GL11.glTranslatef((float) x + 0.3F, (float) y + 0.4F, (float) z + 0.5F); + return; + } + + case WEST: + { + GL11.glTranslatef((float) x + 0.70F, (float) y + 0.4F, (float) z + 0.5F); + return; + } + + case UNKNOWN: + { + return; + } + + default: + { + return; + } + } + } + } + } +} diff --git a/src/main/java/com/arc/bloodarsenal/renderer/block/item/TilePortableAltarItemRenderer.java b/src/main/java/com/arc/bloodarsenal/renderer/block/item/TilePortableAltarItemRenderer.java new file mode 100644 index 0000000..f907c8c --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/renderer/block/item/TilePortableAltarItemRenderer.java @@ -0,0 +1,67 @@ +package com.arc.bloodarsenal.renderer.block.item; + +import com.arc.bloodarsenal.renderer.model.ModelPortableBloodAltar; +import cpw.mods.fml.client.FMLClientHandler; +import net.minecraft.client.renderer.RenderBlocks; +import net.minecraft.item.ItemStack; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.IItemRenderer; +import org.lwjgl.opengl.GL11; + +public class TilePortableAltarItemRenderer implements IItemRenderer +{ + private ModelPortableBloodAltar modelBloodAltar; + + public TilePortableAltarItemRenderer() + { + modelBloodAltar = new ModelPortableBloodAltar(); + } + + @Override + public boolean handleRenderType(ItemStack item, ItemRenderType type) + { + return true; + } + + @Override + public boolean shouldUseRenderHelper(ItemRenderType type, ItemStack item, ItemRendererHelper helper) + { + return true; + } + + @Override + public void renderItem(ItemRenderType type, ItemStack item, Object... data) + { + float scale = 0.08f; + switch (type) + { + case ENTITY: + renderBloodAltar((RenderBlocks) data[0], item, 0, 0, 0, scale); + break; + case EQUIPPED: + renderBloodAltar((RenderBlocks) data[0], item, 0, 0, 0.5f, scale); + break; + case EQUIPPED_FIRST_PERSON: + renderBloodAltar((RenderBlocks) data[0], item, +0.5f, 0.5f, +0.5f, scale); + break; + case INVENTORY: + renderBloodAltar((RenderBlocks) data[0], item, -0.5f, -0.75f, -0.5f, scale); + break; + + default: + return; + } + } + + private void renderBloodAltar(RenderBlocks render, ItemStack item, float x, float y, float z, float scale) + { + GL11.glPushMatrix(); + GL11.glTranslatef(x, y, z); + GL11.glScalef(scale, scale, scale); + GL11.glRotatef(180f, 0f, 1f, 0f); + ResourceLocation test = new ResourceLocation("bloodarsenal:textures/models/altar.png"); + FMLClientHandler.instance().getClient().renderEngine.bindTexture(test); + modelBloodAltar.renderBloodAltar(); + GL11.glPopMatrix(); + } +} diff --git a/src/main/java/com/arc/bloodarsenal/renderer/ItemRenderGatling.java b/src/main/java/com/arc/bloodarsenal/renderer/item/ItemRenderGatling.java similarity index 95% rename from src/main/java/com/arc/bloodarsenal/renderer/ItemRenderGatling.java rename to src/main/java/com/arc/bloodarsenal/renderer/item/ItemRenderGatling.java index 71fb63c..9cce1af 100644 --- a/src/main/java/com/arc/bloodarsenal/renderer/ItemRenderGatling.java +++ b/src/main/java/com/arc/bloodarsenal/renderer/item/ItemRenderGatling.java @@ -1,7 +1,7 @@ -package com.arc.bloodarsenal.renderer; +package com.arc.bloodarsenal.renderer.item; -import com.arc.bloodarsenal.BloodArsenal; import com.arc.bloodarsenal.BloodArsenalConfig; +import com.arc.bloodarsenal.renderer.model.ModelEnergyGatling; import net.minecraft.client.Minecraft; import net.minecraft.entity.Entity; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/arc/bloodarsenal/renderer/ModelEnergyGatling.java b/src/main/java/com/arc/bloodarsenal/renderer/model/ModelEnergyGatling.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/renderer/ModelEnergyGatling.java rename to src/main/java/com/arc/bloodarsenal/renderer/model/ModelEnergyGatling.java index 6652d58..d3ba78b 100644 --- a/src/main/java/com/arc/bloodarsenal/renderer/ModelEnergyGatling.java +++ b/src/main/java/com/arc/bloodarsenal/renderer/model/ModelEnergyGatling.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.renderer; +package com.arc.bloodarsenal.renderer.model; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/arc/bloodarsenal/renderer/model/ModelPortableBloodAltar.java b/src/main/java/com/arc/bloodarsenal/renderer/model/ModelPortableBloodAltar.java new file mode 100644 index 0000000..397b595 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/renderer/model/ModelPortableBloodAltar.java @@ -0,0 +1,75 @@ +package com.arc.bloodarsenal.renderer.model; + +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import com.arc.bloodarsenal.tileentity.TilePortableAltar; +import cpw.mods.fml.client.FMLClientHandler; +import net.minecraft.client.model.ModelBase; +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.client.model.AdvancedModelLoader; +import net.minecraftforge.client.model.IModelCustom; +import org.lwjgl.opengl.GL11; + +public class ModelPortableBloodAltar extends ModelBase +{ + private static final ResourceLocation altar_texture = new ResourceLocation("bloodarsenal:textures/models/altar.png"); + + private IModelCustom modelBloodAltar; + + public ModelPortableBloodAltar() + { + modelBloodAltar = AdvancedModelLoader.loadModel(new ResourceLocation("alchemicalwizardry:models/bloodaltar-fixeUV.obj")); + } + + public void renderBloodAltar() + { + modelBloodAltar.renderAll(); + } + + public void renderBloodAltar(TilePortableAltar altar, double x, double y, double z) + { + float scale = 0.1f; + // Push a blank matrix onto the stack + GL11.glPushMatrix(); + // Move the object into the correct position on the block (because the OBJ's origin is the center of the object) + GL11.glTranslatef((float) x + 0.5f, (float) y, (float) z + 0.5f); + // Scale our object to about half-size in all directions (the OBJ file is a little large) + GL11.glScalef(scale, scale, scale); + // Bind the texture, so that OpenGL properly textures our block. + FMLClientHandler.instance().getClient().renderEngine.bindTexture(altar_texture); + // Render the object, using modelTutBox.renderAll(); + this.renderBloodAltar(); + // Pop this matrix from the stack. + GL11.glPopMatrix(); + } + + public void renderBloodLevel(TilePortableAltar altar, double x, double y, double z) + { + GL11.glPushMatrix(); + float level = altar.getFluidAmount(); + GL11.glTranslatef((float) x , (float) y + 0.6499f + 0.12f * (level / altar.getCapacity()), (float) z); + FMLClientHandler.instance().getClient().renderEngine.bindTexture(TextureMap.locationBlocksTexture); + renderBloodLevel(AlchemicalWizardry.lifeEssenceFluid.getStillIcon()); + GL11.glPopMatrix(); + } + + public void renderBloodLevel(IIcon icon) + { + Tessellator tessellator = Tessellator.instance; + + double minU = (double) icon.getInterpolatedU(0); + double maxU = (double) icon.getInterpolatedU(16); + double minV = (double) icon.getInterpolatedV(0); + double maxV = (double) icon.getInterpolatedV(16); + + tessellator.startDrawingQuads(); + tessellator.setNormal(0, 1, 0); + tessellator.addVertexWithUV(1, 0, 1, maxU, maxV); + tessellator.addVertexWithUV(1, 0, 0, maxU, minV); + tessellator.addVertexWithUV(0, 0, 0, minU, minV); + tessellator.addVertexWithUV(0, 0, 1, minU, maxV); + tessellator.draw(); + } +} diff --git a/src/main/java/com/arc/bloodarsenal/renderer/ModelVampireCostume.java b/src/main/java/com/arc/bloodarsenal/renderer/model/ModelVampireCostume.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/renderer/ModelVampireCostume.java rename to src/main/java/com/arc/bloodarsenal/renderer/model/ModelVampireCostume.java index ff7ba31..3265b7f 100644 --- a/src/main/java/com/arc/bloodarsenal/renderer/ModelVampireCostume.java +++ b/src/main/java/com/arc/bloodarsenal/renderer/model/ModelVampireCostume.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.renderer; +package com.arc.bloodarsenal.renderer.model; import net.minecraft.client.model.ModelBiped; import net.minecraft.client.model.ModelRenderer; diff --git a/src/main/java/com/arc/bloodarsenal/renderer/projectile/RenderEntityBloodBall.java b/src/main/java/com/arc/bloodarsenal/renderer/projectile/RenderEntityBloodBall.java new file mode 100644 index 0000000..b1f91cf --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/renderer/projectile/RenderEntityBloodBall.java @@ -0,0 +1,89 @@ +package com.arc.bloodarsenal.renderer.projectile; + +import net.minecraft.client.renderer.Tessellator; +import net.minecraft.client.renderer.entity.Render; +import net.minecraft.client.renderer.texture.TextureMap; +import net.minecraft.entity.Entity; +import net.minecraft.entity.projectile.EntityPotion; +import net.minecraft.item.Item; +import net.minecraft.item.ItemPotion; +import net.minecraft.potion.PotionHelper; +import net.minecraft.util.IIcon; +import net.minecraft.util.ResourceLocation; +import org.lwjgl.opengl.GL11; +import org.lwjgl.opengl.GL12; + +public class RenderEntityBloodBall extends Render +{ + private Item field_94151_a; + private int field_94150_f; + + public RenderEntityBloodBall(Item item, int par2) + { + this.field_94151_a = item; + this.field_94150_f = par2; + } + + public RenderEntityBloodBall(Item item) + { + this(item, 0); + } + + public void doRender(Entity entity, double so, double me, double thing, float dont, float know) + { + IIcon iicon = this.field_94151_a.getIconFromDamage(this.field_94150_f); + + if (iicon != null) + { + GL11.glPushMatrix(); + GL11.glTranslatef((float)so, (float)me, (float)thing); + GL11.glEnable(GL12.GL_RESCALE_NORMAL); + GL11.glScalef(0.5F, 0.5F, 0.5F); + this.bindEntityTexture(entity); + Tessellator tessellator = Tessellator.instance; + + if (iicon == ItemPotion.func_94589_d("bottle_splash")) + { + int i = PotionHelper.func_77915_a(((EntityPotion) entity).getPotionDamage(), false); + float f2 = (float)(i >> 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/renderer/RenderEntityGatlingProjectile.java b/src/main/java/com/arc/bloodarsenal/renderer/projectile/RenderEntityGatlingProjectile.java similarity index 97% rename from src/main/java/com/arc/bloodarsenal/renderer/RenderEntityGatlingProjectile.java rename to src/main/java/com/arc/bloodarsenal/renderer/projectile/RenderEntityGatlingProjectile.java index e9663b9..ab731dc 100644 --- a/src/main/java/com/arc/bloodarsenal/renderer/RenderEntityGatlingProjectile.java +++ b/src/main/java/com/arc/bloodarsenal/renderer/projectile/RenderEntityGatlingProjectile.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.renderer; +package com.arc.bloodarsenal.renderer.projectile; import com.arc.bloodarsenal.BloodArsenalConfig; import com.arc.bloodarsenal.entity.projectile.EntityGatlingProjectile; diff --git a/src/main/java/com/arc/bloodarsenal/tileentity/PacketHandler.java b/src/main/java/com/arc/bloodarsenal/tileentity/PacketHandler.java new file mode 100644 index 0000000..a0dbc70 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/tileentity/PacketHandler.java @@ -0,0 +1,187 @@ +package com.arc.bloodarsenal.tileentity; + +import com.arc.bloodarsenal.BloodArsenal; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.network.FMLEmbeddedChannel; +import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec; +import cpw.mods.fml.common.network.FMLOutboundHandler; +import cpw.mods.fml.common.network.NetworkRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import io.netty.buffer.ByteBuf; +import io.netty.channel.ChannelHandlerContext; +import io.netty.channel.SimpleChannelInboundHandler; +import net.minecraft.entity.player.EntityPlayerMP; +import net.minecraft.network.Packet; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.world.World; + +import java.util.EnumMap; + +public enum PacketHandler +{ + INSTANCE; + + private EnumMap channels; + + private PacketHandler() + { + // request a channel pair for IronChest from the network registry + // Add the IronChestCodec as a member of both channel pipelines + this.channels = NetworkRegistry.INSTANCE.newChannel("BloodArsenal", new TilePortableAltarCodec()); + if (FMLCommonHandler.instance().getSide() == Side.CLIENT) + { + addClientHandler(); + } + } + + @SideOnly(Side.CLIENT) + private void addClientHandler() + { + FMLEmbeddedChannel clientChannel = this.channels.get(Side.CLIENT); + + String tileAltarCodec = clientChannel.findChannelHandlerNameForType(TilePortableAltarCodec.class); + clientChannel.pipeline().addAfter(tileAltarCodec, "TlePortableAltarHandler", new TilePortableAltarMessageHandler()); + } + + private static class TilePortableAltarMessageHandler extends SimpleChannelInboundHandler + { + @Override + protected void channelRead0(ChannelHandlerContext ctx, TilePortableAltarMessage msg) throws Exception + { + World world = BloodArsenal.proxy.getClientWorld(); + TileEntity te = world.getTileEntity(msg.x, msg.y, msg.z); + if (te instanceof TilePortableAltar) + { + TilePortableAltar altar = (TilePortableAltar) te; + + altar.handlePacketData(msg.items, msg.fluids, msg.capacity); + } + } + } + + public static class BAMessage + { + int index; + } + + public static class TilePortableAltarMessage extends BAMessage + { + int x; + int y; + int z; + + int[] items; + int[] fluids; + int capacity; + } + + private class TilePortableAltarCodec extends FMLIndexedMessageToMessageCodec + { + public TilePortableAltarCodec() + { + addDiscriminator(0, TilePortableAltarMessage.class); + } + + @Override + public void encodeInto(ChannelHandlerContext ctx, BAMessage msg, ByteBuf target) throws Exception + { + target.writeInt(msg.index); + + target.writeInt(((TilePortableAltarMessage) msg).x); + target.writeInt(((TilePortableAltarMessage) msg).y); + target.writeInt(((TilePortableAltarMessage) msg).z); + + target.writeBoolean(((TilePortableAltarMessage) msg).items != null); + if (((TilePortableAltarMessage) msg).items != null) + { + int[] items = ((TilePortableAltarMessage) msg).items; + for (int j = 0; j < items.length; j++) + { + int i = items[j]; + target.writeInt(i); + } + } + + target.writeBoolean(((TilePortableAltarMessage) msg).fluids != null); + if (((TilePortableAltarMessage) msg).fluids != null) + { + int[] fluids = ((TilePortableAltarMessage) msg).fluids; + for (int j = 0; j < fluids.length; j++) + { + int i = fluids[j]; + target.writeInt(i); + } + } + + target.writeInt(((TilePortableAltarMessage) msg).capacity); + } + + @Override + public void decodeInto(ChannelHandlerContext ctx, ByteBuf dat, BAMessage msg) + { + int index = dat.readInt(); + + ((TilePortableAltarMessage) msg).x = dat.readInt(); + ((TilePortableAltarMessage) msg).y = dat.readInt(); + ((TilePortableAltarMessage) msg).z = dat.readInt(); + boolean hasStacks = dat.readBoolean(); + + ((TilePortableAltarMessage) msg).items = new int[TilePortableAltar.sizeInv * 3]; + if (hasStacks) + { + ((TilePortableAltarMessage) msg).items = new int[TilePortableAltar.sizeInv * 3]; + for (int i = 0; i < ((TilePortableAltarMessage) msg).items.length; i++) + { + ((TilePortableAltarMessage) msg).items[i] = dat.readInt(); + } + } + + boolean hasFluids = dat.readBoolean(); + ((TilePortableAltarMessage) msg).fluids = new int[6]; + if (hasFluids) + { + for (int i = 0; i < ((TilePortableAltarMessage) msg).fluids.length; i++) + { + ((TilePortableAltarMessage) msg).fluids[i] = dat.readInt(); + } + } + + ((TilePortableAltarMessage) msg).capacity = dat.readInt(); + } + } + + public static Packet getPacket(TilePortableAltar tileAltar) + { + TilePortableAltarMessage msg = new TilePortableAltarMessage(); + msg.index = 0; + msg.x = tileAltar.xCoord; + msg.y = tileAltar.yCoord; + msg.z = tileAltar.zCoord; + msg.items = tileAltar.buildIntDataList(); + msg.fluids = tileAltar.buildFluidList(); + msg.capacity = tileAltar.getCapacity(); + + return INSTANCE.channels.get(Side.SERVER).generatePacketFrom(msg); + } + + public void sendTo(Packet message, EntityPlayerMP player) + { + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.PLAYER); + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(player); + this.channels.get(Side.SERVER).writeAndFlush(message); + } + + public void sendToAll(Packet message) + { + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.ALL); + this.channels.get(Side.SERVER).writeAndFlush(message); + } + + public void sendToAllAround(Packet message, NetworkRegistry.TargetPoint point) + { + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGET).set(FMLOutboundHandler.OutboundTarget.ALLAROUNDPOINT); + this.channels.get(Side.SERVER).attr(FMLOutboundHandler.FML_MESSAGETARGETARGS).set(point); + this.channels.get(Side.SERVER).writeAndFlush(message); + } +} diff --git a/src/main/java/com/arc/bloodarsenal/tileentity/TileBloodArsenal.java b/src/main/java/com/arc/bloodarsenal/tileentity/TileBloodArsenal.java deleted file mode 100644 index 5cd0a19..0000000 --- a/src/main/java/com/arc/bloodarsenal/tileentity/TileBloodArsenal.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.arc.bloodarsenal.tileentity; - -import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.network.NetworkManager; -import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; -import net.minecraft.tileentity.TileEntity; - -public class TileBloodArsenal extends TileEntity -{ - public void readFromNBT(NBTTagCompound nbttagcompound) - { - super.readFromNBT(nbttagcompound); - readCustomNBT(nbttagcompound); - } - - public void readCustomNBT(NBTTagCompound nbttagcompound) {} - - public void writeToNBT(NBTTagCompound nbttagcompound) - { - super.writeToNBT(nbttagcompound); - writeCustomNBT(nbttagcompound); - } - - public void writeCustomNBT(NBTTagCompound nbttagcompound) {} - - public Packet getDescriptionPacket() - { - NBTTagCompound nbttagcompound = new NBTTagCompound(); - writeCustomNBT(nbttagcompound); - return new S35PacketUpdateTileEntity(xCoord, yCoord, zCoord, -999, nbttagcompound); - } - - public void onDataPacket(NetworkManager net, S35PacketUpdateTileEntity pkt) - { - super.onDataPacket(net, pkt); - readCustomNBT(pkt.func_148857_g()); - } -} diff --git a/src/main/java/com/arc/bloodarsenal/tileentity/TilePortableAltar.java b/src/main/java/com/arc/bloodarsenal/tileentity/TilePortableAltar.java new file mode 100644 index 0000000..73dea7a --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/tileentity/TilePortableAltar.java @@ -0,0 +1,1075 @@ +package com.arc.bloodarsenal.tileentity; + +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipe; +import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; +import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; +import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; +import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.AltarUpgradeComponent; +import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars; +import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; +import net.minecraft.block.Block; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.inventory.IInventory; +import net.minecraft.item.Item; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.nbt.NBTTagList; +import net.minecraft.network.Packet; +import net.minecraft.potion.Potion; +import net.minecraft.potion.PotionEffect; +import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.ChatComponentText; +import net.minecraftforge.common.util.Constants; +import net.minecraftforge.common.util.ForgeDirection; +import net.minecraftforge.fluids.*; + +import java.util.List; + +public class TilePortableAltar extends TileEntity implements IInventory, IFluidTank, IFluidHandler, IBloodAltar +{ + public static final int sizeInv = 1; + private ItemStack[] inv; + private int resultID; + private int resultDamage; + private int upgradeLevel; + protected FluidStack fluid; + public int capacity; + private boolean isActive; + private int liquidRequired; //mB + private boolean canBeFilled; + private int consumptionRate; + private int drainRate; + private float consumptionMultiplier; + private float efficiencyMultiplier; + private float sacrificeEfficiencyMultiplier; + private float selfSacrificeEfficiencyMultiplier; + private float capacityMultiplier; + private float orbCapacityMultiplier; + private float dislocationMultiplier; + private int accelerationUpgrades; + private boolean isUpgraded; + private boolean isResultBlock; + private int bufferCapacity; + protected FluidStack fluidOutput; + protected FluidStack fluidInput; + private int progress; + private int hasChanged = 0; + + private int lockdownDuration; + private int demonBloodDuration; + + public TilePortableAltar() + { + this.inv = new ItemStack[1]; + resultID = 0; + resultDamage = 0; + this.capacity = FluidContainerRegistry.BUCKET_VOLUME * 10; + fluid = new FluidStack(AlchemicalWizardry.lifeEssenceFluid, 0); + fluidOutput = new FluidStack(AlchemicalWizardry.lifeEssenceFluid, 0); + fluidInput = new FluidStack(AlchemicalWizardry.lifeEssenceFluid, 0); + bufferCapacity = FluidContainerRegistry.BUCKET_VOLUME; + isActive = false; + consumptionRate = 0; + drainRate = 0; + consumptionMultiplier = 0; + efficiencyMultiplier = 0; + capacityMultiplier = 1; + isUpgraded = false; + upgradeLevel = 0; + isResultBlock = false; + progress = 0; + this.lockdownDuration = 0; + this.demonBloodDuration = 0; + } + + /** + * + * @return Amount filled + */ + public int fillMainTank(int amount) //TODO + { + int filledAmount = Math.min(capacity - fluid.amount, amount); + fluid.amount += filledAmount; + + return filledAmount; + } + + public int getRSPowerOutput() + { + return 5; + } + + public void addToDemonBloodDuration(int dur) + { + this.demonBloodDuration++; + } + + public boolean hasDemonBlood() + { + return this.demonBloodDuration > 0; + } + + public void decrementDemonBlood() + { + this.demonBloodDuration = Math.max(0, this.demonBloodDuration - 1); + } + + @Override + public void readFromNBT(NBTTagCompound par1NBTTagCompound) + { + super.readFromNBT(par1NBTTagCompound); + NBTTagList tagList = par1NBTTagCompound.getTagList("Inventory", Constants.NBT.TAG_COMPOUND); + + for (int i = 0; i < tagList.tagCount(); i++) + { + NBTTagCompound tag = (NBTTagCompound) tagList.getCompoundTagAt(i); + int slot = tag.getByte("Slot"); + + if (slot >= 0 && slot < inv.length) + { + inv[slot] = ItemStack.loadItemStackFromNBT(tag); + } + } + + resultID = par1NBTTagCompound.getInteger("resultID"); + resultDamage = par1NBTTagCompound.getInteger("resultDamage"); + + if (!par1NBTTagCompound.hasKey("Empty")) + { + FluidStack fluid = this.fluid.loadFluidStackFromNBT(par1NBTTagCompound); + + if (fluid != null) + { + setMainFluid(fluid); + } + + FluidStack fluidOut = new FluidStack(AlchemicalWizardry.lifeEssenceFluid, par1NBTTagCompound.getInteger("outputAmount")); + + if (fluidOut != null) + { + setOutputFluid(fluidOut); + } + + FluidStack fluidIn = new FluidStack(AlchemicalWizardry.lifeEssenceFluid, par1NBTTagCompound.getInteger("inputAmount")); + + if (fluidIn != null) + { + setInputFluid(fluidIn); + } + } + + upgradeLevel = par1NBTTagCompound.getInteger("upgradeLevel"); + isActive = par1NBTTagCompound.getBoolean("isActive"); + liquidRequired = par1NBTTagCompound.getInteger("liquidRequired"); + canBeFilled = par1NBTTagCompound.getBoolean("canBeFilled"); + isUpgraded = par1NBTTagCompound.getBoolean("isUpgraded"); + consumptionRate = par1NBTTagCompound.getInteger("consumptionRate"); + drainRate = par1NBTTagCompound.getInteger("drainRate"); + consumptionMultiplier = par1NBTTagCompound.getFloat("consumptionMultiplier"); + efficiencyMultiplier = par1NBTTagCompound.getFloat("efficiencyMultiplier"); + selfSacrificeEfficiencyMultiplier = par1NBTTagCompound.getFloat("selfSacrificeEfficiencyMultiplier"); + sacrificeEfficiencyMultiplier = par1NBTTagCompound.getFloat("sacrificeEfficiencyMultiplier"); + capacityMultiplier = par1NBTTagCompound.getFloat("capacityMultiplier"); + orbCapacityMultiplier = par1NBTTagCompound.getFloat("orbCapacityMultiplier"); + dislocationMultiplier = par1NBTTagCompound.getFloat("dislocationMultiplier"); + capacity = par1NBTTagCompound.getInteger("capacity"); + bufferCapacity = par1NBTTagCompound.getInteger("bufferCapacity"); + progress = par1NBTTagCompound.getInteger("progress"); + isResultBlock = par1NBTTagCompound.getBoolean("isResultBlock"); + lockdownDuration = par1NBTTagCompound.getInteger("lockdownDuration"); + accelerationUpgrades = par1NBTTagCompound.getInteger("accelerationUpgrades"); + demonBloodDuration = par1NBTTagCompound.getInteger("demonBloodDuration"); + } + + public void setMainFluid(FluidStack fluid) + { + this.fluid = fluid; + } + + public void setOutputFluid(FluidStack fluid) + { + this.fluidOutput = fluid; + } + + public void setInputFluid(FluidStack fluid) + { + this.fluidInput = fluid; + } + + @Override + public void writeToNBT(NBTTagCompound par1NBTTagCompound) + { + super.writeToNBT(par1NBTTagCompound); + NBTTagList itemList = new NBTTagList(); + + for (int i = 0; i < inv.length; i++) + { + ItemStack stack = inv[i]; + + if (inv[i] != null) + { + NBTTagCompound tag = new NBTTagCompound(); + tag.setByte("Slot", (byte) i); + inv[i].writeToNBT(tag); + itemList.appendTag(tag); + } + } + + par1NBTTagCompound.setInteger("resultID", resultID); + par1NBTTagCompound.setInteger("resultDamage", resultDamage); + par1NBTTagCompound.setTag("Inventory", itemList); + + if (fluid != null) + { + fluid.writeToNBT(par1NBTTagCompound); + } + else + { + par1NBTTagCompound.setString("Empty", ""); + } + + if (fluidOutput != null) + { + par1NBTTagCompound.setInteger("outputAmount", fluidOutput.amount); + } + + if (fluidInput != null) + { + par1NBTTagCompound.setInteger("inputAmount", fluidInput.amount); + } + + par1NBTTagCompound.setInteger("upgradeLevel", upgradeLevel); + par1NBTTagCompound.setBoolean("isActive", isActive); + par1NBTTagCompound.setInteger("liquidRequired", liquidRequired); + par1NBTTagCompound.setBoolean("canBeFilled", canBeFilled); + par1NBTTagCompound.setBoolean("isUpgraded", isUpgraded); + par1NBTTagCompound.setInteger("consumptionRate", consumptionRate); + par1NBTTagCompound.setInteger("drainRate", drainRate); + par1NBTTagCompound.setFloat("consumptionMultiplier", consumptionMultiplier); + par1NBTTagCompound.setFloat("efficiencyMultiplier", efficiencyMultiplier); + par1NBTTagCompound.setFloat("sacrificeEfficiencyMultiplier", sacrificeEfficiencyMultiplier); + par1NBTTagCompound.setFloat("selfSacrificeEfficiencyMultiplier", selfSacrificeEfficiencyMultiplier); + par1NBTTagCompound.setBoolean("isResultBlock", isResultBlock); + par1NBTTagCompound.setFloat("capacityMultiplier", capacityMultiplier); + par1NBTTagCompound.setFloat("orbCapacityMultiplier", orbCapacityMultiplier); + par1NBTTagCompound.setFloat("dislocationMultiplier", dislocationMultiplier); + par1NBTTagCompound.setInteger("capacity", capacity); + par1NBTTagCompound.setInteger("progress", progress); + par1NBTTagCompound.setInteger("bufferCapacity", bufferCapacity); + par1NBTTagCompound.setInteger("lockdownDuration", lockdownDuration); + par1NBTTagCompound.setInteger("accelerationUpgrades", this.accelerationUpgrades); + par1NBTTagCompound.setInteger("demonBloodDuration", demonBloodDuration); + } + + @Override + public int getSizeInventory() + { + return inv.length; + } + + @Override + public ItemStack getStackInSlot(int slot) + { + return inv[slot]; + } + + @Override + public ItemStack decrStackSize(int slot, int amt) + { + ItemStack stack = getStackInSlot(slot); + + if (stack != null) + { + if (stack.stackSize <= amt) + { + setInventorySlotContents(slot, null); + } + else + { + stack = stack.splitStack(amt); + + if (stack.stackSize == 0) + { + setInventorySlotContents(slot, null); + } + } + } + + return stack; + } + + @Override + public ItemStack getStackInSlotOnClosing(int slot) + { + ItemStack stack = getStackInSlot(slot); + + if (stack != null) + { + setInventorySlotContents(slot, null); + } + + return stack; + } + + @Override + public void setInventorySlotContents(int slot, ItemStack itemStack) + { + inv[slot] = itemStack; + this.worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + + if (itemStack != null && itemStack.stackSize > getInventoryStackLimit()) + { + itemStack.stackSize = getInventoryStackLimit(); + } + } + + @Override + public String getInventoryName() + { + return "TilePortableAltar"; + } + + @Override + public boolean hasCustomInventoryName() + { + return false; + } + + @Override + public int getInventoryStackLimit() + { + return 64; + } + + @Override + public boolean isUseableByPlayer(EntityPlayer entityPlayer) + { + return worldObj.getTileEntity(xCoord, yCoord, zCoord) == this && entityPlayer.getDistanceSq(xCoord + 0.5, yCoord + 0.5, zCoord + 0.5) < 64; + } + + @Override + public void openInventory() + { + } + + @Override + public void closeInventory() + { + } + + //IFluidTank methods + @Override + public FluidStack getFluid() + { + return fluid; + } + + public FluidStack getInputFluid() + { + return fluidInput; + } + + public FluidStack getOutputFluid() + { + return fluidOutput; + } + + @Override + public int getFluidAmount() + { + if (fluid == null) + { + return 0; + } + + return fluid.amount; + } + + @Override + public int getCapacity() + { + return capacity; + } + + @Override + public int getCurrentBlood() + { + return getFluidAmount(); + } + + @Override + public int getTier() + { + return upgradeLevel; + } + + @Override + public int getProgress() + { + return progress; + } + + @Override + public float getSacrificeMultiplier() + { + return sacrificeEfficiencyMultiplier; + } + + @Override + public float getSelfSacrificeMultiplier() + { + return selfSacrificeEfficiencyMultiplier; + } + + @Override + public float getOrbMultiplier() + { + return orbCapacityMultiplier; + } + + @Override + public float getDislocationMultiplier() + { + return dislocationMultiplier; + } + + @Override + public int getBufferCapacity() + { + return bufferCapacity; + } + + @Override + public FluidTankInfo getInfo() + { + return new FluidTankInfo(this); + } + + @Override + public int fill(FluidStack resource, boolean doFill) + { + TileEntity tile = this; + + if (resource == null) + { + return 0; + } + + if (resource.fluidID != (new FluidStack(AlchemicalWizardry.lifeEssenceFluid, 1)).fluidID) + { + return 0; + } + + if (!doFill) + { + if (fluidInput == null) + { + return Math.min(bufferCapacity, resource.amount); + } + + if (!fluidInput.isFluidEqual(resource)) + { + return 0; + } + + return Math.min(bufferCapacity - fluidInput.amount, resource.amount); + } + + if (fluidInput == null) + { + fluidInput = new FluidStack(resource, Math.min(bufferCapacity, resource.amount)); + if (tile != null) + { + FluidEvent.fireEvent(new FluidEvent.FluidFillingEvent(fluidInput, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, this)); + } + + return fluidInput.amount; + } + + if (!fluidInput.isFluidEqual(resource)) + { + return 0; + } + + int filled = bufferCapacity - fluidInput.amount; + + if (resource.amount < filled) + { + fluidInput.amount += resource.amount; + filled = resource.amount; + } + else + { + fluidInput.amount = bufferCapacity; + } + + if (tile != null) + { + FluidEvent.fireEvent(new FluidEvent.FluidFillingEvent(fluidInput, tile.getWorldObj(), tile.xCoord, tile.yCoord, tile.zCoord, this)); + } + + return filled; + } + + @Override + public FluidStack drain(int maxDrain, boolean doDrain) + { + if (fluidOutput == null) + { + return null; + } + + int drained = maxDrain; + + if (fluidOutput.amount < drained) + { + drained = fluidOutput.amount; + } + + FluidStack stack = new FluidStack(fluidOutput, drained); + + if (doDrain) + { + fluidOutput.amount -= drained; + + if (fluidOutput.amount <= 0) + { + fluidOutput = null; + } + + if (this != null) + { + FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(fluidOutput, this.worldObj, this.xCoord, this.yCoord, this.zCoord, this)); + } + } + + if (fluidOutput == null) + { + fluidOutput = new FluidStack(AlchemicalWizardry.lifeEssenceFluid, 0); + } + + if (worldObj != null) + { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + + return stack; + } + + //Logic for the actual block is under here + @Override + public void updateEntity() + { + this.decrementDemonBlood(); + + if (this.hasDemonBlood() && !worldObj.isRemote) + { + SpellHelper.sendIndexedParticleToAllAround(worldObj, xCoord, yCoord, zCoord, 20, worldObj.provider.dimensionId, 1, xCoord, yCoord, zCoord); + } + + if (this.lockdownDuration > 0) + { + this.lockdownDuration--; + } + + if (!worldObj.isRemote && worldObj.getWorldTime() % 20 == 0) + { + { + Block block = worldObj.getBlock(xCoord + 1, yCoord, zCoord); + block.onNeighborBlockChange(worldObj, xCoord + 1, yCoord, zCoord, block); + block = worldObj.getBlock(xCoord - 1, yCoord, zCoord); + block.onNeighborBlockChange(worldObj, xCoord - 1, yCoord, zCoord, block); + block = worldObj.getBlock(xCoord, yCoord + 1, zCoord); + block.onNeighborBlockChange(worldObj, xCoord, yCoord + 1, zCoord, block); + block = worldObj.getBlock(xCoord, yCoord - 1, zCoord); + block.onNeighborBlockChange(worldObj, xCoord, yCoord - 1, zCoord, block); + block = worldObj.getBlock(xCoord, yCoord, zCoord + 1); + block.onNeighborBlockChange(worldObj, xCoord, yCoord, zCoord + 1, block); + block = worldObj.getBlock(xCoord, yCoord, zCoord - 1); + block.onNeighborBlockChange(worldObj, xCoord, yCoord, zCoord - 1, block); + } + + if (AlchemicalWizardry.lockdownAltar) + { + List list = SpellHelper.getPlayersInRange(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 15, 15); + boolean hasHighRegen = false; + for (EntityPlayer player : list) + { + PotionEffect regenEffect = player.getActivePotionEffect(Potion.regeneration); + if (regenEffect != null && regenEffect.getAmplifier() >= 2) + { + this.lockdownDuration += 20; + } + } + } + + if (AlchemicalWizardry.causeHungerWithRegen) + { + List list = SpellHelper.getPlayersInRange(worldObj, xCoord + 0.5, yCoord + 0.5, zCoord + 0.5, 15, 15); + for (EntityPlayer player : list) + { + PotionEffect regenEffect = player.getActivePotionEffect(Potion.regeneration); + if (regenEffect != null && regenEffect.getAmplifier() > 0) + { + player.addPotionEffect(new PotionEffect(Potion.hunger.id, 40, regenEffect.getAmplifier() * 2 - 2)); + } + } + } + } + + if(worldObj.getWorldTime() % Math.max(20 - this.accelerationUpgrades, 1) == 0) + { + int syphonMax = (int) (20 * this.dislocationMultiplier); + int fluidInputted = 0; + int fluidOutputted = 0; + fluidInputted = Math.min(syphonMax, -this.fluid.amount + capacity); + fluidInputted = Math.min(this.fluidInput.amount, fluidInputted); + this.fluid.amount += fluidInputted; + this.fluidInput.amount -= fluidInputted; + fluidOutputted = Math.min(syphonMax, this.bufferCapacity - this.fluidOutput.amount); + fluidOutputted = Math.min(this.fluid.amount, fluidOutputted); + this.fluidOutput.amount += fluidOutputted; + this.fluid.amount -= fluidOutputted; + } + + if (worldObj.getWorldTime() % 100 == 0) + { + startCycle(); + } + + if (!isActive) + { + return; + } + + if (getStackInSlot(0) == null) + { + return; + } + + int worldTime = (int) (worldObj.getWorldTime() % 24000); + + if (worldObj.isRemote) + { + return; + } + + if (worldTime % 1 == 0) + { + if (!canBeFilled) + { + if (fluid != null && fluid.amount >= 1) + { + int stackSize = getStackInSlot(0).stackSize; + int liquidDrained = Math.min((int) (upgradeLevel >= 2 ? consumptionRate * (1 + consumptionMultiplier) : consumptionRate), fluid.amount); + + if (liquidDrained > (liquidRequired * stackSize - progress)) + { + liquidDrained = liquidRequired * stackSize - progress; + } + + fluid.amount = fluid.amount - liquidDrained; + progress += liquidDrained; + + if (worldTime % 4 == 0) + { + SpellHelper.sendIndexedParticleToAllAround(worldObj, xCoord, yCoord, zCoord, 20, worldObj.provider.dimensionId, 1, xCoord, yCoord, zCoord); + } + + if (progress >= liquidRequired * stackSize) + { + ItemStack result = null; + result = AltarRecipeRegistry.getItemForItemAndTier(this.getStackInSlot(0), this.upgradeLevel); + if (result != null) + { + result.stackSize *= stackSize; + } + + setInventorySlotContents(0, result); + progress = 0; + + for (int i = 0; i < 8; i++) + { + SpellHelper.sendIndexedParticleToAllAround(worldObj, xCoord, yCoord, zCoord, 20, worldObj.provider.dimensionId, 4, xCoord + 0.5f, yCoord + 1.0f, zCoord + 0.5f); + } + this.isActive = false; + } + } + else if (progress > 0) + { + progress -= (int) (efficiencyMultiplier * drainRate); + + if (worldTime % 2 == 0) + { + SpellHelper.sendIndexedParticleToAllAround(worldObj, xCoord, yCoord, zCoord, 20, worldObj.provider.dimensionId, 2, xCoord, yCoord, zCoord); + } + } + } + else + { + ItemStack returnedItem = getStackInSlot(0); + + if (!(returnedItem.getItem() instanceof IBloodOrb)) + { + return; + } + + IBloodOrb item = (IBloodOrb) (returnedItem.getItem()); + NBTTagCompound itemTag = returnedItem.stackTagCompound; + + if (itemTag == null) + { + return; + } + + String ownerName = itemTag.getString("ownerName"); + + if (ownerName.equals("")) + { + return; + } + + if (fluid != null && fluid.amount >= 1) + { + int liquidDrained = Math.min((int) (upgradeLevel >= 2 ? consumptionRate * (1 + consumptionMultiplier) : consumptionRate), fluid.amount); + + int drain = SoulNetworkHandler.addCurrentEssenceToMaximum(ownerName, liquidDrained, (int) (item.getMaxEssence() * this.orbCapacityMultiplier)); + + fluid.amount = fluid.amount - drain; + + if (worldTime % 4 == 0) + { + SpellHelper.sendIndexedParticleToAllAround(worldObj, xCoord, yCoord, zCoord, 20, worldObj.provider.dimensionId, 3, xCoord, yCoord, zCoord); + } + } + } + if (worldObj != null) + { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + } + } + + public void setActive() + { + isActive = false; + } + + public boolean isActive() + { + return isActive; + } + + public void sacrificialDaggerCall(int amount, boolean isSacrifice) + { + if (!isSacrifice && this.lockdownDuration > 0) + { + int amt = (int) Math.min(bufferCapacity - fluidInput.amount, (isSacrifice ? 1 + sacrificeEfficiencyMultiplier : 1 + selfSacrificeEfficiencyMultiplier) * amount); + fluidInput.amount += amt; + } + else + { + fluid.amount += Math.min(capacity - fluid.amount, (isSacrifice ? 1 + sacrificeEfficiencyMultiplier : 1 + selfSacrificeEfficiencyMultiplier) * amount); + } + } + + @Override + public Packet getDescriptionPacket() + { + return PacketHandler.getPacket(this); + } + + public void handlePacketData(int[] intData, int[] fluidData, int capacity) + { + if (intData == null) + { + return; + } + + if (intData.length == 3) + { + for (int i = 0; i < 1; i++) + { + if (intData[i * 3 + 2] != 0) + { + ItemStack is = new ItemStack(Item.getItemById(intData[i * 3]), intData[i * 3 + 2], intData[i * 3 + 1]); + inv[i] = is; + } + else + { + inv[i] = null; + } + } + } + + FluidStack flMain = new FluidStack(fluidData[0], fluidData[1]); + FluidStack flIn = new FluidStack(fluidData[2], fluidData[3]); + FluidStack flOut = new FluidStack(fluidData[4], fluidData[5]); + + this.setMainFluid(flMain); + this.setInputFluid(flIn); + this.setOutputFluid(flOut); + + this.capacity = capacity; + } + + public int[] buildIntDataList() + { + int[] sortList = new int[1 * 3]; + int pos = 0; + + for (ItemStack is : inv) + { + if (is != null) + { + sortList[pos++] = Item.getIdFromItem(is.getItem()); + sortList[pos++] = is.getItemDamage(); + sortList[pos++] = is.stackSize; + } + else + { + sortList[pos++] = 0; + sortList[pos++] = 0; + sortList[pos++] = 0; + } + } + + return sortList; + } + + public void startCycle() + { + if (worldObj != null) + { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + + this.checkAndSetAltar(); + + if (fluid == null || fluid.amount <= 0) + { + return; + } + + if (getStackInSlot(0) == null) + { + return; + } + + if (!isActive) + { + progress = 0; + } + + if (AltarRecipeRegistry.isRequiredItemValid(getStackInSlot(0), upgradeLevel)) + { + AltarRecipe recipe = AltarRecipeRegistry.getAltarRecipeForItemAndTier(getStackInSlot(0), upgradeLevel); + this.isActive = true; + this.liquidRequired = recipe.getLiquidRequired(); + this.canBeFilled = recipe.getCanBeFilled(); + this.consumptionRate = recipe.getConsumptionRate(); + this.drainRate = recipe.drainRate; + return; + } + + isActive = false; + } + + public void checkAndSetAltar() + { + boolean checkUpgrade = true; + int upgradeState = UpgradedAltars.isAltarValid(worldObj, xCoord, yCoord, zCoord); + + if (upgradeState <= 1) + { + upgradeLevel = 1; + isUpgraded = false; + this.consumptionMultiplier = 0; + this.efficiencyMultiplier = 1; + this.sacrificeEfficiencyMultiplier = 0; + this.selfSacrificeEfficiencyMultiplier = 0; + this.capacityMultiplier = 1; + this.orbCapacityMultiplier = 1; + this.dislocationMultiplier = 1; + this.accelerationUpgrades = 0; + return; + } + + AltarUpgradeComponent upgrades = UpgradedAltars.getUpgrades(worldObj, xCoord, yCoord, zCoord, upgradeState); + + if (upgrades == null) + { + upgradeLevel = 1; + isUpgraded = false; + this.consumptionMultiplier = 0; + this.efficiencyMultiplier = 1; + this.sacrificeEfficiencyMultiplier = 0; + this.selfSacrificeEfficiencyMultiplier = 0; + this.capacityMultiplier = 1; + this.orbCapacityMultiplier = 1; + this.dislocationMultiplier = 1; + this.upgradeLevel = upgradeState; + this.accelerationUpgrades = 0; + return; + } + + this.isUpgraded = checkUpgrade; + this.upgradeLevel = upgradeState; + this.consumptionMultiplier = (float) (0.20 * upgrades.getSpeedUpgrades()); + this.efficiencyMultiplier = (float) Math.pow(0.85, upgrades.getSpeedUpgrades()); + this.sacrificeEfficiencyMultiplier = (float) (0.10 * upgrades.getSacrificeUpgrades()); + this.selfSacrificeEfficiencyMultiplier = (float) (0.10 * upgrades.getSelfSacrificeUpgrades()); + this.capacityMultiplier = (float) ((1 * Math.pow(1.10, upgrades.getBetterCapacitiveUpgrades()) + 0.20 * upgrades.getAltarCapacitiveUpgrades())); + this.dislocationMultiplier = (float) (Math.pow(1.2, upgrades.getDisplacementUpgrades())); + this.orbCapacityMultiplier = (float) (1 + 0.02 * upgrades.getOrbCapacitiveUpgrades()); + this.capacity = (int) (FluidContainerRegistry.BUCKET_VOLUME * 10 * capacityMultiplier); + this.bufferCapacity = (int) (FluidContainerRegistry.BUCKET_VOLUME * 1 * capacityMultiplier); + this.accelerationUpgrades = upgrades.getAccelerationUpgrades(); + + if (this.fluid.amount > this.capacity) + { + this.fluid.amount = this.capacity; + } + + if (this.fluidOutput.amount > this.bufferCapacity) + { + this.fluidOutput.amount = this.bufferCapacity; + } + + if (this.fluidInput.amount > this.bufferCapacity) + { + this.fluidInput.amount = this.bufferCapacity; + } + + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + + @Override + public boolean isItemValidForSlot(int slot, ItemStack itemstack) + { + return slot == 0; + } + + @Override + public int fill(ForgeDirection from, FluidStack resource, boolean doFill) + { + //TODO + if (resource == null) + { + return 0; + } + + resource = resource.copy(); + int totalUsed = 0; + int used = this.fill(resource, doFill); + resource.amount -= used; + totalUsed += used; + this.startCycle(); + return totalUsed; + } + + @Override + public FluidStack drain(ForgeDirection from, FluidStack resource, boolean doDrain) + { + if (resource == null) + { + return null; + } + + if (!resource.isFluidEqual(fluidOutput)) + { + return null; + } + + return drain(from, resource.amount, doDrain); + } + + @Override + public FluidStack drain(ForgeDirection from, int maxEmpty, boolean doDrain) + { + return this.drain(maxEmpty, doDrain); + } + + @Override + public boolean canFill(ForgeDirection from, Fluid fluid) + { + //I changed this, since fluidstack != fluid... :p dunno if it was a accident? so you might wanna check this + return this.fluidInput != null && this.fluid.getFluid().equals(fluidInput.getFluid()); + } + + @Override + public boolean canDrain(ForgeDirection from, Fluid fluid) + { + return true; + } + + @Override + public FluidTankInfo[] getTankInfo(ForgeDirection from) + { + FluidTank compositeTank = new FluidTank(capacity); + compositeTank.setFluid(fluid); + return new FluidTankInfo[]{compositeTank.getInfo()}; + } + + public int[] buildFluidList() + { + int[] sortList = new int[6]; + + if (this.fluid == null) + { + sortList[0] = AlchemicalWizardry.lifeEssenceFluid.getID(); + sortList[1] = 0; + } + else + { + sortList[0] = this.fluid.fluidID; + sortList[1] = this.fluid.amount; + } + + if (this.fluidInput == null) + { + sortList[2] = AlchemicalWizardry.lifeEssenceFluid.getID(); + sortList[3] = 0; + } + else + { + sortList[2] = this.fluidInput.fluidID; + sortList[3] = this.fluidInput.amount; + } + + if (this.fluidOutput == null) + { + sortList[4] = AlchemicalWizardry.lifeEssenceFluid.getID(); + sortList[5] = 0; + } + else + { + sortList[4] = this.fluidOutput.fluidID; + sortList[5] = this.fluidOutput.amount; + } + + return sortList; + } + + public void sendChatInfoToPlayer(EntityPlayer player) + { + player.addChatMessage(new ChatComponentText("Altar's Current Essence: " + this.fluid.amount + "LP")); + player.addChatMessage(new ChatComponentText("Altar's Current Tier: " + UpgradedAltars.isAltarValid(worldObj, xCoord, yCoord, zCoord))); + player.addChatMessage(new ChatComponentText("Capacity: " + this.getCapacity() + "LP")); + } + + public void sendMoreChatInfoToPlayer(EntityPlayer player) + { + if (getStackInSlot(0) != null) + { + int stackSize = getStackInSlot(0).stackSize; + player.addChatMessage(new ChatComponentText("Altar's Progress: " + progress + "LP/" + liquidRequired * stackSize + "LP")); + player.addChatMessage(new ChatComponentText("Consumption rate: " + (int) (consumptionRate * (1 + consumptionMultiplier)) + "LP/t")); + } + player.addChatMessage(new ChatComponentText("Altar's Current Essence: " + this.fluid.amount + "LP")); + player.addChatMessage(new ChatComponentText(" Input tank: " + this.fluidInput.amount + "LP")); + player.addChatMessage(new ChatComponentText(" Output tank: " + this.fluidOutput.amount + "LP")); + } +} diff --git a/src/main/java/com/arc/bloodarsenal/tileentity/container/ContainerPortableAltar.java b/src/main/java/com/arc/bloodarsenal/tileentity/container/ContainerPortableAltar.java new file mode 100644 index 0000000..7d9a44b --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/tileentity/container/ContainerPortableAltar.java @@ -0,0 +1,91 @@ +package com.arc.bloodarsenal.tileentity.container; + +import com.arc.bloodarsenal.tileentity.TilePortableAltar; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.entity.player.InventoryPlayer; +import net.minecraft.inventory.Container; +import net.minecraft.inventory.Slot; +import net.minecraft.item.ItemStack; + +public class ContainerPortableAltar extends Container +{ + protected TilePortableAltar tileEntity; + + public ContainerPortableAltar(InventoryPlayer inventoryPlayer, TilePortableAltar te) + { + tileEntity = te; + + for (int i = 0; i < 3; i++) + { + for (int j = 0; j < 3; j++) + { + addSlotToContainer(new Slot(tileEntity, j + i * 3, 62 + j * 18, 17 + i * 18)); + } + } + + bindPlayerInventory(inventoryPlayer); + } + + @Override + public boolean canInteractWith(EntityPlayer entityplayer) + { + return tileEntity.isUseableByPlayer(entityplayer); + } + + protected void bindPlayerInventory(InventoryPlayer inventoryPlayer) + { + for (int i = 0; i < 3; i++) + { + for (int j = 0; j < 9; j++) + { + addSlotToContainer(new Slot(inventoryPlayer, j + i * 9 + 9, 8 + j * 18, 84 + i * 18)); + } + } + + for (int i = 0; i < 9; i++) + { + addSlotToContainer(new Slot(inventoryPlayer, i, 8 + i * 18, 142)); + } + } + + @Override + public ItemStack transferStackInSlot(EntityPlayer player, int slot) + { + ItemStack stack = null; + Slot slotObject = (Slot) inventorySlots.get(slot); + if (slotObject != null && slotObject.getHasStack()) + { + ItemStack stackInSlot = slotObject.getStack(); + stack = stackInSlot.copy(); + if (slot < 9) + { + if (!this.mergeItemStack(stackInSlot, 0, 35, true)) + { + return null; + } + } + else if (!this.mergeItemStack(stackInSlot, 0, 9, false)) + { + return null; + } + + if (stackInSlot.stackSize == 0) + { + slotObject.putStack(null); + } + else + { + slotObject.onSlotChanged(); + } + + if (stackInSlot.stackSize == stack.stackSize) + { + return null; + } + + slotObject.onPickupFromSlot(player, stackInSlot); + } + + return stack; + } +} diff --git a/src/main/resources/assets/bloodarsenal/lang/en_US.lang b/src/main/resources/assets/bloodarsenal/lang/en_US.lang index b4ebb92..0b35844 100644 --- a/src/main/resources/assets/bloodarsenal/lang/en_US.lang +++ b/src/main/resources/assets/bloodarsenal/lang/en_US.lang @@ -6,6 +6,7 @@ tile.blood_stone.blood_stone_1.name=Blank Blood Stone tile.blood_stone.blood_stone_2.name=Reinforced Blood Stone tile.blood_stone.blood_stone_3.name=Imbued Blood Stone tile.blood_stone.blood_stone_4.name=Demonic Blood Stone +tile.blood_stone.blood_stone_5.name=Ethereal Blood Stone tile.blood_tnt.name=Blood TNT tile.blood_stained_glass.name=Blood Stained Glass tile.blood_stained_ice.name=Blood Stained Ice @@ -17,9 +18,9 @@ tile.blood_door_wood.name=Blood Infused Wooden Door tile.blood_door_iron.name=Blood Infused Iron Door tile.blood_torch.name=Blood Torch tile.blood_infused_glowstone.name=Blood Infused Glowstone -tile.blood_infused_redstone_lamp.name=Blood Infused Redstone Lamp tile.blood_lamp.name=Blood Lamp tile.blood_infused_diamond_block.name=Blood Infused Diamond Block +tile.portable_altar.name=Portable Altar [WIP] #Items item.bound_bow.name=Bound Bow @@ -51,7 +52,7 @@ item.item_blood_door_iron.name=Blood Infused Iron Door [WIP] item.bound_flint_and_steel.name=Bound Flint and Steel item.soul_fragment.name=Soul Fragment item.soul_booster.name=Soul Booster -item.soul_nullifier.name=Soul Nullifier [WIP] +item.soul_nullifier.name=Soul Nullifier item.blood_cookie.name=Blood Cookie item.orange_juice.name=Orange Juice item.juice_and_cookies.name=Juice and Cookies @@ -61,11 +62,17 @@ item.vampire_boots.name=Vampire Boots item.vampire_ring.name=Vampire Ring item.energy_gatling.name=Energy Gatling [WIP] item.sigil_of_swimming.name=Sigil of Swimming -item.sigil_of_ender.name=Ender Sigil [WIP] +item.sigil_of_ender.name=Ender Sigil item.blood_infused_glowstone_dust.name=Blood Infused Glowstone Dust +item.sacrifice_amulet.name=Amulet of Sacrifice +item.self_sacrifice_amulet.name=Amulet of Self Sacrifice +item.sigil_of_divinity.name=Sigil of Divinity +item.blood_ball.name=Blood Ball +item.item_blood_cake.name=Blood Cake +item.wolf_hide.name=Wolf Hide #TConstruct Stuffs -material.bloodinfusediron=Blood Infused Iron +material.blood_infused_iron.name=Blood Infused Iron part.arrowhead=@material@ Arrowhead part.axe.head=@material@ Axe Head diff --git a/src/main/resources/assets/bloodarsenal/textures/blocks/blood_infused_redstone_lamp_off.png b/src/main/resources/assets/bloodarsenal/textures/blocks/blood_infused_redstone_lamp_off.png deleted file mode 100644 index 6e71cb1c2444f1519c4c86373a289b3a59b1b115..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 829 zcmV-D1H$}?P)62)27qL+AJNcnPA$gu}K`zb^&qZf8dD3Wk>i& zwks#DfF=&CU4^PunxH_t&?ZY3JF%S~&Np^Agl%v`;ypj_`{?t$dSVNDY6_q!3V{&( zm-(kw0?1k!0wKr;Az!XvrKT9%%;wP)1%RFE7GGc9VFQIP%2x=4AZul22Q)>Y?bzH< zP3{yg@S^YWQF)V5w})w@Ub{MdpIWZOqs9p(A<=ehG(|yr<@|PL2~$w5q^d%Q;=#sosJYGx=HChw^xfebpqG4jF2^u|zN1Z=uB~_LNg6oTUT5}3N zzBpk{Rar@z+$yYdd-dX*44hzyEX$mFHv4vi-x1WTEcc2R`9MyyQ{Ce6*yFqUF91YQ zL}8@>fSgpd`>{e6#di7j@AF>@c$Ym^qDg%&E6y(W-db^2jXn3O$&&LD8D4HPzLeO?>0wGw- z7rD7vAt7r_{1M9ulbmj{tfwgH*1xo`5w2G@S&6AcU6;ear<giM>IWr*4N& ztRi!g%tAsZ8JGF$_+W;R9!>e_^f#7s3w(C<1|>0NHym>8ci3;%dFpm3g%YJyn%h_2 z0pQs8-@MVEjCj9Prqy~$ae0YPFI}S~ru64i957}rrtopOLTfNvs#GexWzNqsuyo`8 zStM|6n`}Zy3?~41nuH&h7>tHgt6O|nI?qw_jLA^&VD|^UaZb?`h4`yt95^<-Y;fc| zB-3doT@QCU_`3-ahkyLaVW-KFYjePutd*hd*s~D-Po4h))bl+zTr+hP00000NkvXX Hu0mjfxYBg| diff --git a/src/main/resources/assets/bloodarsenal/textures/blocks/blood_infused_redstone_lamp_on.png b/src/main/resources/assets/bloodarsenal/textures/blocks/blood_infused_redstone_lamp_on.png deleted file mode 100644 index a0f36d536a99856de9ea001100d9f8b5ef0afd7a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 894 zcmV-^1A+XBP)=9z1#vR+>&Wauvu|ttP#e-ScEBy4UmrPVHwF#qr^#PwmqOr zT%0pJ%!lcNi4XosCKA&a%{1AI+hQD%C{s3Nh;GKL+IFp(!Y#K@F8B7*S|1v5k0zey z?|kQc-}#QPx!zL(P-F?iwD>P|H&z7jH~KJ4i*2hbTW-MV1f^(;{f(c*NU;ZQIm!b})bV7(Zt+ENB`4lhG(fK2I*6=S1umf}RE*R}>7> zqN1)!8Jm21gz7?(YNwOR@8)=Y?ixQ-$vn8E)3g{LcqjOxO#9ZtaiPdF3AD`gILIGiOy{Dwe z5)G=#f~MhLT;TZ~J83j05D98cq$D*XKO3n z#}1Kt=UskZx9N-wgKeRmzr+r86QACN-H`B1xR-W8z)s!fQqI7xxQG7z`-okcK}n=> z3_U@ODDvFoWe&(P-Tl3^71o*6vtQ%aIkygEV&m?v1{h5GQqG@LUL5HrQS`IL*eYrS*}VFP0JZtYTaBwq{Fs( zb=Pj}LIFgPxW2^EM67(qlc!$d$@cBkI-T^4KFfGCN{3~kZSryfkxmg#clGdFR;Ow2 z9v*n}3|qY3f1@0D`4v3-_mM9ax&6r(5D4&4Ft`!rV0Zxk@F45OBKnuJ}lB)UG$nsB*@PFU=Z`IpE U7N&B5K>z>%07*qoM6N<$f^j*c^#A|> diff --git a/src/main/resources/assets/bloodarsenal/textures/blocks/blood_stone_5.png b/src/main/resources/assets/bloodarsenal/textures/blocks/blood_stone_5.png new file mode 100644 index 0000000000000000000000000000000000000000..9a1f9532f21fa83fa1db36fdfb0c0b2c2f12edef GIT binary patch literal 616 zcmV-u0+;=XP) z7_qVOca4dmu)xkQ7$yv%;0u6x_uX^0#nA0yWoIp3o}YsxU;qG;1Zd`@fHG56NdWdE z_Ot_w-ped9hbph?5ouOHl4+)4D1cQ4KmaqNcdPocUJtFkxZ6Art&Pvmw%aK)S~H1c z5MU-VKi%EItec%bJnY@}Uk>~}I~!W-i-pLb**HyOYf1h&JUnO(W|xnTe@{;jo}Om% z-Q(jh&j3;?DM~UjBLJlP(>TiAfibg3ytqS}NzcqzrOY{EAxXO0ZV3!P2fl5$JMskp zIRbPi2{Mv&3Bb+S*$8~Tz5RD|^zr`w=W4ajXi{XBJ0t++Br{os-n&GpA{s!lnfW{q zRm;pGK?*Q)hZ#r%N=jfd1HjCy^*Tvam6`1svrrX*?*4X~K5Vx)t5vT8IhkD_AJ6VX z)tlbkJt6>@q;&Urp3H(&<}lAB6X@iR&1S4h_ZiqX1jv+({CanHeR8sk7=V(#Z#D(| zTCE21#jKl2QWf7{T#y{AVw#rI)FN`RKotOyl$>nCkP($xRRPH(N_t){ckatfNCaRO zWVz4d2ojkBUX^<9k|cF^xeK6~xq}2iNmW&~Z}<-tpEUgtg{T<-0000k#U{`1TnP=c__dO#RuXpEKO$HOoG&`219Z=7Aro+VKX{ m{~ru~_vg#zwwH?yr}y`E9~QlCXa5%HV+K!GKbLh*2~7Z-iH}GC diff --git a/src/main/resources/assets/bloodarsenal/textures/gui/bindingRitual.png b/src/main/resources/assets/bloodarsenal/textures/gui/bindingRitual.png deleted file mode 100644 index bc5a1654d5a91849a115cab30ba96d23f158faa1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1011 zcmeAS@N?(olHy`uVBq!ia0y~yU<5K5893O0R7}x|G$6&6|H(?D8gCb z5m^k>u^xmOo%TQ10t&L1c>21s-{WCq)MhWJiU;asZt!$*45_&F_U^&n*$yHN58bzf z&NO@GAZ(}LD=)&7%aFQp`htwPN7$P`D(qX|ke<2cb9%z!n_B-On9eQS#PVD3$tIm| z_UbrbTrGkPNzwe!VfKQ!awmb`i0D}X_ z^%OGxJw7co=ltI~`!}0sE$iI1PInhWz@%lFd_U*RDF)hm(3XjTiGhRRf$RarTifp1 zC@+1IDmKTE;WgX6L#K569D_BVt?=-DTAdVmg)D!VhkBdV|Sln zwt?7P&{)p!=ZZ=1^hF#8LMt`9+;MrFh`?xAWb^lSL+GoM2%eZD^vvcS$Cc7p7nd)!`~UHL?h`)ni#6xrG3nxM=L(f4lw&m+YL^1T zG+@;3P%vkj8T?1)-tk_CXCn4MQr?PjP5c3|ygi2LuVu`cD%pXNgW@t|w=yMgIxsYF z7b#D$JbM0N?Yw&&EUG{bGyvm1eNkNy-FQ|r@!aFJ2V_JVzH;99uId32@Tb~Y!Vr>;|1q}U3c@s vnlFD~Dv_iHmZFcVP|{Q1UvF!w>&v>E?oK*oBy`njxgN@xNA0Hh@+ diff --git a/src/main/resources/assets/bloodarsenal/textures/gui/blood_chest_medium.png b/src/main/resources/assets/bloodarsenal/textures/gui/blood_chest_medium.png deleted file mode 100644 index 65179f2a98efe9dd2ec5767084150ef3f11fc6a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3818 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 diff --git a/src/main/resources/assets/bloodarsenal/textures/gui/blood_chest_small.png b/src/main/resources/assets/bloodarsenal/textures/gui/blood_chest_small.png deleted file mode 100644 index 2fdb824efcb80fa10626b46874f548ffd7e92fcf..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3677 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 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/arrow/blood_infused_iron_arrow_head.png b/src/main/resources/assets/bloodarsenal/textures/items/arrow/blood_infused_iron_arrow_head.png index 347831a7a8e2a253dad30603fe3ee71e54a9ab45..49878686b0859f0d23ca7287ed3d61ceacbc25c9 100644 GIT binary patch delta 154 zcmX@ixQB6qR{ehlAY8C_`D6wL2F?PH$YKTtZeb8+WSBKa0w~B{;_2(kevd~&P|j+% zNY)adkf*1MV~EA+4nJa0`PlBg3pY5H=O_Iuo7OlC?ucfAS% z3I%w&IEGl9PChYh^6&Y&>fh%#`W!fP;J|?i4;~*rup#wyJsTTa+sb}9!$~<_+veQ) ze>pPpzrFt~mrdC-5_ouddE2DT^CmoJnxQS>CUsClVkZN`NhwJl<=uOy0}W^JboFyt I=akR{0RBWdYXATM diff --git a/src/main/resources/assets/bloodarsenal/textures/items/battleaxe/blood_infused_iron_battleaxe_handle.png b/src/main/resources/assets/bloodarsenal/textures/items/battleaxe/blood_infused_iron_battleaxe_handle.png index 19319b5a083f38a27bc89b67be6471d764690c42..823e6b9215b23a9c0efd5aff20905eea283a8408 100644 GIT binary patch delta 93 zcmX@axQcN?NSKJIw8P$0KN%Pp%spKkLo7}wCrGe5Gwk5x{y$$y{rmi!v&%Pc`X~MA x^MCc*X`4*@Z~5q-`wCBmV#Z delta 117 zcmV-*0E+*r0m1>0RBjCxEWp~N$^ZZWPf0{UR5;6HU>F5M0JsSY|Ie0_`;SYWiI8SL zZf=HSA3x$$!-!9_Dpd3Nj~^LHcJ>rGx&Maz{Qn85WgIY@Fo-U3d7N^fn+Us}NK;U?NtA-rI z)Cvbz*H^*{rH*%vHhcEGJzo#{a8q=GW8{!;l(4H@cAFKwfA}k{an^LB{Ts5xtEri literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow.xcf b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow.xcf new file mode 100644 index 0000000000000000000000000000000000000000..baecc712a6e354dfdef4b22ce806548177b3ee18 GIT binary patch literal 2758 zcmeHJJ8u&~5T3j93pO7?!~H_VL*hX5eLT3Va8AUt!*N5Bs+v7d^Nw`mL(x7QL>&3l(AApw(XgsOdVr zPSf9A%dIxNdZ*dxI;)8&cD-8FDXo_hx&~~hr8St=t})f?&aVNR9`^RDb-(R78~Q9L zkFHZHUGbpp_Z`1o-*bCx-)S^@ZvQesw*FZ)(af519x`6F)vBtD&~jAPC*XPmm*sx$YFqSTH8I#AR(Rh!kNx;$T^I7FQDWlhwF7tr**pwdH6c0z%$QWekVmKNJO8^J}L)bJP(nuf`ki;?;$k>>-CCX`; zW4#barIv6fXr8@J#DIf=v|giUp4*#X)35aR6_I_=dF~8UwD_rA6Z)`V`;~3eMuQ zjo=jKfP%7g3eO3&>3jln@HzM&?(fX*>&efiDGTWSeDVTPcm>Rpc>%9s!iM|~;H$vb literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_1.xcf b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_1.xcf new file mode 100644 index 0000000000000000000000000000000000000000..9de2a1db22cbe7bb6fa91c46a6ab5eb5cd8d7817 GIT binary patch literal 3212 zcmeHJJ5L)y5S}|5KhJ>(LJIP5q!dsXfdnL!;V(pKgNz@?DSjXy&kBhm59uTtOOaAt zoqrG{D=i(Vj)FEnAQE|ju{YoB?P4RGnj%?yZoiqGx!s%nZuV@ax|ZE8l(S{0QX;ew zC5&%F3nXP(7agJK)f5cP(FVYIb&3 z&jsVoAfvM7Hfqj#)~OX%OD@OP%VoE;ez`!7zHSOFS3@}uF*{$a=2b>$Y-W0H9>2xK z#iuiKbBha47Up?OHRBT!eIG#qQSxPIOn*~@daF3|t%#?aUaQ&c zXe#d*dfqbuNhr*bNrll-st>38u+@h%eRvp{@1z^B#SN%sEI|L9}pciG1FO-h)qeLBmYPuquDvxhtq|B!oC-Nd!N#*g&nl(#@?7k zUH1D2<`bMxf$c{=!2uySpA7Izk|ElcXqdW!cIh2&gx)D;%H1Bv-1P=1wmhpzc2nef zz-tU!^os&|$skws>s4FyJL@?-ttG`2QR?_@iV&l=-v%)ZjC7ETNXVgn6BWDDe#4V7#WB%|Fh!EOJ_5lz0p9&z%HXUZIWj}?lHptpQqyu1 zWg=BZrPl;+vStAjcdSQTE|53QS`>8M;;$9b>ji7$AFkTsA6ZY(P%A;*RuBn{y%=4z zg20dXaWVqaPf)u>fsgmN(`tiOA(NA^2Ejh8-1F!;_iO<0CBTU9qa<+8m9p3GK~Ga> zkFWpk+)=!+F%gF(P$Q5Z`Cj8C7Bm4v8s#7bNdsGbA}M>1w@vRW^Ki7EhsB+nE}n9I zyha@Se5!NP%LNTnk3y5SrDj=w&L`|KA0p@uJ#dLjoOkGX6eC&s$U8jtQ2KtzBIzBU zo_hEwkms^N=iVttnV}w`ws*K0s;H<@GQ19Ajj;5_=ojuw#Pu{zXPy9N@^-z=|EuWb z;zd{&~w6WZL0xgv);14YmoQ@z43jz literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_2.xcf b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_2.xcf new file mode 100644 index 0000000000000000000000000000000000000000..4aedfb9ef5a3497a49d0c22ce65c2f948eec2283 GIT binary patch literal 3035 zcmeHJJ5L)y5S~51ZBU3H5Q!95qyQ;KCIS*msgUvuB5Gv(I8O3QwnLyoLTMtMMB_5W z{e(1WkgTM1M|TwbhEymIINO_V?)KmeBrOH3HMif)?A)$rznwk9tTpxBVnwf*)iR+? zDPjB=A_N}OkmUNe^XDwUGmt3cDP&e*9`^*}*U?WIcx~3K6^wG$XqhFL2!25e?ap4c zthXCgv$U9As2IgYwb9ZSye``^whDS~Dd)9Yz_M~JB6RDP(7><%8*u1uyICljbwghc z=7MqWHlwm--`CBKZq|$2rZt!T0 zA82t1ZC!ssX+!kG}B2;s>Pegw?#3R(hy=inA5h;JdSsX(xFjMYAl+q5q0 zSrT%>6HP{GXuA|4My~Ci9)d&>;DPNyA&2-+5vVSEd^Jix*-H}tR$@uN*m+%n9`oKJ zHJQXDr|45OvL(+wl9YK^#;6mjdLq$ z9yKBZVELzJ*l$LG82pmW7({6+W{1Cl+d*UlXm9voi}dQ5DP!>x`o`UyqP$^>=&~1vE;+ z8X{JBbrSFUjrS69HBHdDC4rf-BWvej6<4{~@M|QKE&}o~A)`usebOT&`vqUe!4@+k zXG4rM>m^*}cTGxs(FHBNtWdCGkTU&t+?L*8eVRsHToZ#M>M}Erh>p7`S?9Rj*^~l0 zwvRm|xD?CU(*GB9;$Z*=ed&f`9E?sw0%X;mA>exYoXtxAbd z?uyFz9;zgvSwz*gzV;t;1ztjpp|bO`!0h(`{#&d!F>Tta=FL*tY+6OA2zH59?AAf0 zWZ3nJRb16q%4VTnsW*+4pi4K+oxG9FWP@@ASQDmI4Bfe6Xk<734S49j-N+ZLnrW;> zYe9K%l~U-^uWMGzuxf=@C7Z|B%VoRN8gGzCUsi>h*`XYVgqg2a^CBX&l+CPf;Frtg zo@Lk9bDK{$H`peM^aX+bOr$<1N`8y9=%Zues6X5;H0!p#Q{UURTTT42?I)Q=&17$x z8R%V-`C5n)F9;Cr7nG0h&FbRsS=K1t!C&ksz0o1XY1HY-J=s-BLaUM2 zp`MGoI_!8LV0Zp@In?Po4qlO8oIc6vo;qOZ&mgxtr)Osl62Hj2=gt|A z5}8;b&*|=lA`)?oBxi`RQkb_B^c(XM@uVvC9UqtpJaTq#cQJ{@%P?y)=@gKWi5L?# zl;;CNvR&c_K00D%B(6Tb7g&`9I&n_|B(;ZNn$8Sk-+-2>kZ;_9YL}H5AZ&Pf7~g>P_#qx3;c+~{ X8YDi%lL3BsLws+H7MOo;=mY%))4PAD literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_3_meh.xcf b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_3_meh.xcf new file mode 100644 index 0000000000000000000000000000000000000000..a23324357231517181b10d40a36ae544c0fc3f52 GIT binary patch literal 3013 zcmeHJKX21e5I_Hk<2nf~YC%FQmSAXyR0*VoEJ##hMPlFsq^aW?lC)|X(JoZ##=;7t zM+UwC5)mvOkdVTZjgR2DZIZ_P&VDa6r5T|TaMtttz5D0$yYoG}USr$dtJdtAS9b_B zCkErI7>a`1JchaU>Et#K-~|jFBZqNaVAi_^{WZ*UF5Kq5M#XjV?vA$s7D2AiVrzH5 z?%1uZy0@`pE!N!XR()&7UW}*wj=Ns53(JL=E&xR#T7v2N1*TGNPX}ze*V?XBy{2my z<+H%tzlbS#`F7LWwY_F_(`m8&R;|`@cEM77ELy6HXk2lVPsTXCjDZI5gEgo_&&B8&!Ogb1TJLcH3v zB;DcnzN{qir!UBOB7h7ONiyOy1$@CX+N@)d)-lQGj1DP9YDez@=rrn)GV-xugHEr<3#D_4*&5H&_>+1WQVz5K;Dc|V>7~g;6HG^`xDl#R+%|8b z2XL27I<1Co`*Y2_xP!z^T&DAUb0~5uFRSkOxq{3u0?0s7cjos=o*D8Qb%&}_eVh+I zDi1dmD}#nU>MSle2B@)tAB8;keG0<>{o{xQK^O!uQ~V<+QNR)%_BeooPzgr?Y3zxe zN`?YY>`|jZ5WWd;YQ+lh5gfxB5+6s`F&xLxq<#V|csTqY?eE*$r^#{2Wv<~9;PThS zNY=Ud6JWW*e@?Qrau3_B7nRL=qtbfrfR6%5NPY(gSWf%Rx+3)XLt=;cuVa#bOw1OP Yc?%$)34Z3>`Iq^~iU;(SU!zDr02U+KFaQ7m literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_binding.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_binding.png new file mode 100644 index 0000000000000000000000000000000000000000..e4ffa75ada473a17fc14423414cda281b5b7e76c GIT binary patch literal 246 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^M$O zpo3@EJfH|?fk$L90|Vb-5N14{zaj-F$X?><>&kwQi&IR->UGEMpFp89PZ!4!i_>c- z9ppV=z`?xMZ&L5)M27PdRc#pNznREh8=7@B{LUxmrp>(!|JHSAR9E%{nmvhPWANO{ zx|9F5p3))}QBRLgih_YNJMaDeC+MkUyjOYBk*MtGpF7Np&*eU3U$FI=?S$;J~ZUQe8tUh)3v>g4Bh3_h>zwBtKgc*KAwD^g7Jw9sl!!Ikd!Z*RMsc1Gu%<;Q#O zmsO6xcVC*>Wph68x~bjFH#}X7Zs>M;e68hYn6Zpg@lx)e0PQZrXDyRrj`B~A$ex%g zxoXv|r5F6Q`J!&zQdC-+{3qP)jE?VRh6B>-$K-{LyA9pqu2q#U6`j4?66h5MPgg&e IbxsLQ0E60i^#A|> literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_bow.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_bow.png new file mode 100644 index 0000000000000000000000000000000000000000..e7e9d8929890a6779bd33a7bdacc77311bf68daf GIT binary patch literal 315 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^M$O zpo3@EJfH|?fk$L90|Vb-5N14{zaj-F$X?><>&kwQi&IRF?+2IfIiS#PPZ!4!i_>!_ zZsa|zAmSpQH>1JOhP8V`lln(4AIIZddUtj?@BhWi956vEaEi;shpX04e)n(gxdLX( z=l`0`?p2?W{kUr#LkGt>%QahQS7dxH0SxxsR}J0>>F2oGvCO_p?K&0npL*P zZb&+w+qwPP45yxn*QBnOZhUWjcz)>C)mih!W literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_bow_1.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_bow_1.png new file mode 100644 index 0000000000000000000000000000000000000000..54702314cc4bcfc2983abdc42e7fab48785428b6 GIT binary patch literal 291 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^O1` z@N!aVK2U_Sz$3Dlfr0NZ2s0kfUy%Y7WH0gbb!ETDDa*koKkv{%cA(H=PZ!4!i_=Rd zALKovz{7Iw{E}v;-+{N>k+%|aPdl|2o%^~} z$IxxbaT%wIE8lC`1zwuUAOGmFU{y^WV_q6#z}0{A&aPQDMN9dV<@F%0U@y%;uZK4N z+j5hCq#LhJ3v)m7$t*W?YTSV$^WD39RN`+vt_}@uSXLVQoblbc`?< e%H`k5KVW(}FU+Ks$s`r%Tn0~9KbLh*2~7axh-feX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_bow_2.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_bow_2.png new file mode 100644 index 0000000000000000000000000000000000000000..de61cb12f07df672d3fccc9d08e26d40b8e486f4 GIT binary patch literal 304 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^O1` z@N!aVK2U_Sz$3Dlfr0NZ2s0kfUy%Y7WH0gbb!ETDDa$FwsVK%{02JEb>Eak-aeC=w zN5R7eJS^dJCvnIL3$`k7vNCh93L7xgGC48)39$E7Ke@Q~Zgp1L`SNW#cLFq774(ul zH5JVtFw9u?(j@-6sKXQS8kX#}%UM>P`aJs}pS(lh)#$m*2hJ!xm-(_{iqKlqwkgHS zwjSG-t8?1v`^hx1G%?!^G5Nc%b*(xT+kCv*({96VZ~ss10@qbvnp*7JdgilD8pDHk sk2(LXRQP>d!pK9Dv19k;+wu=s-!g@n>~wfz4Rkw$r>mdKI;Vst0C}rwJ^%m! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_bow_3.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_bow_3.png new file mode 100644 index 0000000000000000000000000000000000000000..cbb09ec3a683e50bd791268c655badcc98f24719 GIT binary patch literal 289 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^O1` z@N!aVK2U_Sz$3Dlfr0NZ2s0kfUy%Y7WH0gbb!ETDDa*mH@{fCR7EoxRr;B5V#p$(^ z90gkpcwFmem^RAwTyfI9!XT!^z-=hNxKm*fQ`L#M21dT!xewnX{rS<%6hG4w#C5Io zsLlC|e>czEIkU%g+3zi(Tk`^>4`+HVSarfO*!vSBza&GsV|*#%DjY)Ktxn co71a*;#P3+m83r#fR1JGboFyt=akR{02HZalK=n! literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_string.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_string.png new file mode 100644 index 0000000000000000000000000000000000000000..a3b44903a74e30594a0ceef9bad284cae8f74ed1 GIT binary patch literal 248 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^O1` z@N!aVK2U_Sz$3Dlfr0NZ2s0kfUy%Y7WH0gbb!ETDDa*m8zeD=tYM@Ysr;B5V#p$CH zHwqq5;9-91<8-jWfK%Im<@SXNey-&nt}ReMis-0!-2LB|Or{q_&MbBf)v z-^#{hyLx4E-TTroGtkSi=VOS3pzZGSR{X*SpFf0_pS#QSe2(t7(3;cp&1LUDS>w;4 lIO9QHWOcV-B;Mle>k)La4N1=gG-(!)TeUD!6`@--~wu;Nh*#6m1QHBGb zvNuZzB)hCFW!qn_esteK%k&ljmOFcXJ04mvrD=-Lp6|)V!h(jMOMfrI@%T||jHLT#A?EEKuHBt#{Z68=ac&h(fO}g2< V-XOAvPafz>22WQ%mvv4FO#qvmXTJad literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_string_2.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_string_2.png new file mode 100644 index 0000000000000000000000000000000000000000..8826593418987ec7a3ba045d2cc2decbede0c414 GIT binary patch literal 282 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^O1` z@N!aVK2U_Sz$3Dlfr0NZ2s0kfUy%Y7WH0gbb!ETDDa$Fv*j#a%4=6Ot)5S5w;`Gr; z8+nf^2srcpY7Q_^@HxcAbI{D>jpIWR`x?O$g00V@7ajh#`!eJIX}3%#sW2=xKYPDy z=>qe!IbVVudIYy#OD)cBPdR6)++r~E{BgSsC5@#DOIhCkeS4<=ZBX&{pWR<>=;cOV zQavD{Jj*l4(^L6hM{WDPFOna3?^og6`sh6~!vV|deNUFu@B0$pu=U&2!phYA5{Au^ WC6;&9^!EZ?$>8bg=d#Wzp$P!7+-qI{ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_string_3.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/_crossbow_string_3.png new file mode 100644 index 0000000000000000000000000000000000000000..e2b87421e1e0586e3252e77b604b9e3f6986473f GIT binary patch literal 280 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^O1` z@N!aVK2U_Sz$3Dlfr0NZ2s0kfUy%Y7WH0gbb!ETDDa*lc#C2cI8Yncw)5S5w;`GtU z8+ln2d04Km*KTQGS|}8?fMb_pp*&0VNm;9(jsMjv-A`P4*Qd+;XLm}thY-UK-Dgif z-12$%HElw%TXwFd*i4_g?(DT5n!Ov|n=fZs)fL2*)N^0m{&M)q{(CbVLhEPWl(Kkk z*X0?MbNNyK2KOHf1rdKjKV6-^kddK9VAl<`lPQ9C4^-dJpZz3cgVn{g{e?_clgo{Q T4=*_gbR&bOtDnm{r-UW|Lqca9 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/beheading_crossbow_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/beheading_crossbow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..18b1650658405bbe8afcfd941dbdadb748aa7199 GIT binary patch literal 229 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2r>x#lX83n6iW4UaSX9I zot&`1%;3_OpZ?pPomvq4|D+kqvYCyIjfw6@|NmE!Y+6$RV%R)m`(Js6_uu3<uw$;|V-&-;AM^E~r@%noG_ywrAh&tThNc7I0D!rn#vv$!-3x5seRZvE}T z6TE;o;tJrpjH}7R$@e+%Zv_kwL2Xy|!0w?;*U-W2UXTRinrzG+8r`31%Z=>M?u`aF z4i4=Z**|iyZKDER2ZsiBx5b`}skRKV$s3A7bYK}#f4uGC2t^O)UfR7UJ3Q33$+rdK z=yF7l*7fpm_E1}Pc+a;pIm(X=4(2k4?m0;52T3kvsVL)6J+%A4f!$t2q%rnn{3-lx z-n{vlSUkS@>7J*b;+WU8zla!F1pBWL97htK7pa>QsYjGU?~1J2h%6mIf=WmPGPCBG z$l8-4>o9h&`6)#Pq_#i1f8Xc^lY_d)Q4Pp!I=E^*oV;}&4j{orc>N+gv>9FaQg~C;^+-Z9Q7q4l!y#PC;_q`)27iBP=uoDucOWyI+3*Y>Z@FBM{@=)j0X@v) za=DlR-D`nn5App)E&^RkX@M`X-z-{3Wg~Q29hWCM;NwEaME-I|2V%9*@r%pHJH7#$ z-cd0Tn({Ly;&4hLQfZZXDesEoZpXj47ogO?s}U?AsZ@jKr_>v+)KhQxg{@)g4R3w! z`EZze!{2(LE4-e1!xajZn^r5m%_``I6O<|>pbF4HGAu(J#{U%E^`GY<@$Vteql`cG zvn>~Yyt96*dc(tfe-ZzxUoNFp&9ZNZ-5zB$OYJ)|E$s~8PFW)rV&&*g-di&$(sB!N zkdIKL_3=ERH>s#XkBZqO4B-u5G#k)@m|+T zky_#)AHkchIU&3Wct0Gn^4-w9_kj?EBYXh=2_KS?r^&NY8F`h)-B#1-A-=!JNKIlX zt>)|OBUWa;=w^A;M6s64w?=`We$CO*U2mDlyk?ewg+f5@nxp1hp?rk+yeVcVQXfK; zwa|o2QBf3%qUG&TDvBQ74g`v#+qd@~j#5#y1gxirilW=2hkO1xPJBKp(Vp?X9xCeb z6s4djRW78cDCHD@KvAktIO(LQC{+R$i&0UkkaA-0?jt^*l2mNp))*DVsOT{_jkbez z0+S*Z3%psF6p3i+wF@HS%rm*s{9rM;-mACb^H;%pwRu8o~1 z#Acmis%j6lb4F_KZtrFwL+#x?-5}UNd@v#3qd<=^{PxA3ixjwc`{Hd1^jy4c-6kgx zA9w;WVVLdHvC|YdeeLu$3dBxd`|~w&0`Y+-z#Jf{nBWXdb^$=*IwJplI_*EzLtZPj z!C0v*?4W~g3;M5^?=P|t{Gm7K(Sko?|0`12!g*#(LHdbevMFqlEfN>KACr9loj3bY z)2049&Iuw`|C@k841NJui2Xb4m-ai^v;@a7ZmHjJN?@ch=KA-~WfiJ5HXJiuc!O+->#$@DSf$#5+X4*gRT@ z+j%^*7DU*BhkAnun-%a+FkzcS5f7N5h?z>+J6%G(gij zA=e2xj&)LwgB&Fl<71E;yY3pavbC+sTlV%!fbHndG!+% z?oa(^;}K-JjhEUCuT*}%Ob6Z8pmr(17v-lx)&G53!*9qN7Nb}#dQp>d(JpGmvJ~-f zcZ;@N6e$*M%`O!&#kq*01ni1{Tq$DLUn$zUZAcl+0Rf|3EMmTyCqe~5GALFLtCf#j zZ6X-PcACS6=+vg&V^(@Kd!8OpO+XeD6!=#IU&FFqD(A4WlxImXOI@QW_n@pe% zywwcL82|1qV;-Xa2eWE76Z1%`$U%dR<+hKigy{f|gnx43;woD8x23dIYW=GcEsi-X zj!Cb%FRsOdqBUE6@xC}-Gp)HqEY6Kc9JQht46y()>52`=q2@B64p{Bsc#9PamNT+o z^U(Y(Qu8S^vsJZ=vIDkD$-PS z`sd;5dlQ;Ed`-w1uq-LYrWf}d9LePdM!x&vKz4X9zD_*(((n+u9_gG$18B?5X-~LA zyfgd`k%rmxRjSC}?ke&-|$apoQJ z+B4QkL=Qa|p!Xp0{unBke4loETr1K1xU;wVflpWDSg9)6K;v#}n)49fTTEI_?=Ph_ zeat@AEF9A<^CzR6vPyuvTx4{YLJX5y1iE+M%3fN0ozLb zU7f2-fG2stE~N@56=I}3E_G($8QHyz<<7}9y@P|9J%{MyN(Ho$#@)8o5ALFXu2rAO zFz(UTewDmk?#BW3p$E5@mv-@u6otd<-|^koiwO)dP+zNQV5OoFp>el0e`5W^=2Dt_ zy+JP;&EI6dR;;v08c<7HbCRA*Yw2qFIQ_wesi_NdAEY5!O3z)GlC+-29(GFBN+pfS zL`zrZ04y@1ge=8_iDrs3T6!vt35hha+EA(hv{5ibqe+n@jV7%tlDv}Ck}#UQeP(?8 z%$3_o8ckj~GcHLz38UjQnxt&9as|L5BaJE^7#*k4gZ+w-pM2FmHaFJ zf4cwa+~MS-s;wHwA4?sqs~r>x&a93BM2#)(8Tgq-k*lyMdX-qCj!ha~>Hsbs13XgU e{0@EW>nhGC(vOd}ILBu+w#adixhSZljX` literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/complete_1.xcf b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/complete_1.xcf new file mode 100644 index 0000000000000000000000000000000000000000..58524bc74a6dcdda328c5766ee4ffcbcbbf0046b GIT binary patch literal 2816 zcmeHIO=}xh6ut9dS&?O$Hf|{-0hMOqAZ+B~r1fe@z>5xarCq}iY*|u8ZOM3?G?o^j zArK6+aS@c_MGb+{g}ZDQqN0>8?45}z_CLs?flx@B*cy3W&l$}anYeUSLZMH*xp&Sx z_n!CeyNt?}g~iOBLMc^F!i7Fx^x$(&>_)SeseUO`+oVxn{)hk?!hW5RPu_iL`I|73k zg^jO?RUetgVTz?+ek?B+Gt;xhYVq9(QguEs5}3R#g_(?e#+`|L7)kZ{Lw$a_&mZpd zUxUwF@fd_d4UV`wMtiS(>I;z{?;BkG^OKm4bBd%zOQpq6El;PgDL-}LJgostOWly* znheWP>l)6cr-r0MS_%j0kVhg>P_syp{j!>6ifsNPS_7Dt{ZRBg*76UZ<$-nb4-_0t z^z4BAk$>Rhzd`HBA)f|6UoLxtA67t-6y1BZ#x%<>Xtvk-{=BhZl zlaydp-j=|TA+Up87@tI(%nvzf5>RJn)!`)oBejd9p+PnVrYUNR*c7$>EwQ(3&4#G` zWWCW?-+E$G)ZSWeh^^ZYZBW!^tQ~B@_#{#^jdM2(OEuS>t$lWLwl=pizE~|&?NycL0>yh{ z@Vm%~w~NvY{(KS}e8l&pnC$@xn)vnv?LA{JxQFl2K}(v_-rL*IH&8Q8UbIAZns_HG z1ezkPb~6SHIc)B#;Puw@}KoGgn%Xo_&4&lZ!_m1DN2#$z1a5zJKa#I`T-nV>H?%n?X zeE<3TQ|M1NT|%K>_%Emu3XOt>PzIcEt^duC0WiZpG<)l&B$32W8m5V<<1f^}Cy-41 Z`(lRibad72^;VBP2tY$Oo`D^P{R_&V$ff`Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/complete_2.xcf b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/complete_2.xcf new file mode 100644 index 0000000000000000000000000000000000000000..abb570949b6fb8b0e500a3ea22b818d91ff82739 GIT binary patch literal 2728 zcmeHIKWH0g6o2=fEIGDJ)7A~8#h|nu9Ex1II7vMnHqCOSlg4rcS(a2${c(M68l%B9 zxER4L0(B@_1X;CqIVw7IkT-(}(%8+5!Hd!qODBE#z55d^;${nh(ocH#e((SHz3*|C z%NKWI57XILHebjP)^(p4zYS6pJl+M(ZvJuc2@~)lCE&_a6K=!LR3#Hl8o0 za+!E;H@^)P!LHDHA+`mfc>*7C@@_Vs-DgAB6=a0R(YD~ zQ0_xGmns%hen)6Av9fj>zxDO?FA{5O>v!(nxy?3zDZde^t3)%uAg~c=!Gmk!t}ouh zVKUi2f6wh@V)wQ(rOd~lv#a0-Rv5&$B|)=3=D2G<2BW!4c>WTOUcw8P@LRx~D_9W# zuE8sqj!!+2pQ7mFVBhc+KTYdIjpZ+CvO!TAZ`hP%xIkljgEnZ5L~@=+$-(0!Ha<)a zY%)@vSxyOeIVCV4364*GgM4NaXqMoz#gxPp0 zL928?zmg&sXe3EWII5B02hYSGP;Ihgz1@a-fdM|-E#xiIy8W*hA?JnQlSvusrO`RlxvUOc z(S?q(6)vlDs6Od{jr6ldh0E&WPKE2}4algYS9DkGG}zlgUY8*u$GT;;F=<>@b84Ec zDH_UZr*_S(*{2$p)qqV+XeeuPS&c)ri48W=PHQHY)yB5Tb+j5})X_}M73~^(JIL!Y zB;?pALM9Rp-XzUY2-5@wl1n%UNNf@AoPEQW65JZkSU8z4e7DcqH#JuuaB**i@A@Fv zA?7Ol)wC|`9wE+$Ti}O#)&u(4JFOx=qywCb=~X_+8Pwn|+_<0KEt}?6`N#WP`O-FC zc`G}m92b65UBTBbSdp)N6zmvXiKM1=k?&c)MrwP8CUtxamA2ZOJi=>wXj7fqJ*6j_ z=$1myY@(BTuh(osc#79{oycz2drkPlLC{70qO5N!nTb@y+r|n*^ZXH_| zzww1DHi@j`zQw*y8)+08TK&O*%_Deo-k~*+$f0-+$SIxU2QOr7R)Va*`^d@}@Lmkj zKd3_V2slEHB`v;a>%spg{7>AW#FX+u!cuiVge1dKkb`NIA%F`8_^U9xGdUwe-ZX|h pjY<)WjB8Q>LNE)&v6W*uhk(xG!ksVn6Vma9OSl4F)A$f8@;O#$v`PQ~ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/complete_3.xcf b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/complete_3.xcf new file mode 100644 index 0000000000000000000000000000000000000000..3517fb2efa2b509ecff1f7c6b53812b2fd0428c1 GIT binary patch literal 2580 zcmeHI&ube;6n;A^$*wHZG)+SYnp%g?#4?RdXgBzs(pgjZ%ty&UWyF2~fXg9T}lUoUtj{P*>``(Y4 zd2ckb?6q~{VYzBl?OKH}u0+E44Tz@U<4wrq$`5Dnu>fC#Bp{5hN0|NIg8vHUD;Cnu z*=t3sGG}ertDp#Wjb@$Aty;x!8Z~?MW_q@2l^eCjhB2$AxecpSG_vzqH7)@Qk?AHv zOP7SkcH_l>LmxWp#j;(ujD>hDkXx6L5jXc~-QG0pdij%z!|{!3)v0Vg-ylc-lNvGO zpq>+GOQ0+KR5TJ0z-2T5mPYUK<;2S3+(Scp1~AkXJ`eVyI9YkdCXHVlcfdP zp|42DOe6scmmy8*H+YNj8Mua%rd_+g_3i@mm(`j1f4k23&c#FjDMIlcQD^;^aZZ2A z`Xq$~)IcwwsD)ookGZIY)8qYpkl{YPJu+*B@Dv0*j`!iA6@pWC@C#7ya*jOb$ipN5 zq;tqQ@}0x&ZO*aHIoPb_!wx2R9By-te9&PBKMz&q$U)O{@W}n#I^Z0+)`8=I3?0tF zW-S-CFu~)%;T*Z3#SVTB>RmiQxgC6L?6@x6yOio3v#+Xi zS9$T#NPZrHc!%g*^6POf`3>vyd^mN?X+}HrrMjHz#5*__%gcO_B3^^5aQ$9+qv1HE z#%K3Rc6}8O$^3fV;)PySRrsBWM(QX6@s3fI)OX`ts>6Dk^mc+m4?i)Yt@px50Ou|8 zsNEAi(fkvSUyJC(>-CyiQ=>nid!X80uSq)BQKK{OqyC_qp0;~E z&+WP{9F_O)AeuyOx9{@Ps*&G@uF*5MKNz@wGlI_DLBGo$LlvUa(Ct2W9+5=%o^g&* zxGp&b)`coHnW8gSy7Wlm)`#wc|4;d!>ZMdyO`{1ZXee=K#<)_ zCP#NOF=B*@RM(O34U19)@+BnyaN*k^bzlKw0wSQNlq36afRG`{1V|x$l6=oJ`4<`} BhdBTM literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/diamond_crossbow_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/diamond_crossbow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..6da1a0de398893ce10fd6faa793c826b65fbe5f9 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2$)&ls&IY)6!Q0UaSX9I zotz*srQ!IU2lht3MgjLtUfcKYJXrtLck{o=OK<-8`trZQtO-?aDe2zf>4qO7q>MIj xd@%g;^F!yuH7higPu8hlOM8_i$EqyHz_8$^Mu+)d8yld}44$rjF6*2UngDLcN1Olv literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/emerald_crossbow_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/emerald_crossbow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..7e1af109c59567f8821e6d90043c10eba8423407 GIT binary patch literal 206 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2v`WtcUZmyDCFnq;uvCa zIypgtb#Vh%!$ghHgFOEqzS+8>YDUL4tpg1Q3mv&vC8|h%c%tj9>d(-o*yAECaOT7O wgD%q=9o=R$CLU(p5ia4$WoVOVSirz=_>I7vx<3Z(K$96fUHx3vIVCg!0CdzqS^xk5 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/emerald_crossbow_effect_1.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/emerald_crossbow_effect_1.png new file mode 100644 index 0000000000000000000000000000000000000000..84376d9d5e69fa945fa0f830c351164904714a23 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2r9_`R;;)P6pHtBaSX9I zotz-Sy10R>VWLLpK^_qJFDU^8*A~4>RJye2KMx}tPak)bghbOqwuu=G%!em$=b385 zDA8shl!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2v{mvc7J~l6!P?RaSX9I zotz-Sy0{@vVa7vyXM@A_r+5+)5(@s@acXpYyXk-V-~FHD?+S=5;i~s-t literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/emerald_crossbow_effect_3.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/emerald_crossbow_effect_3.png new file mode 100644 index 0000000000000000000000000000000000000000..7a086ec5acaeb43c3a46d1247d0c6473e071d877 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2w3qc)SWmF6ms-*aSX9I zotz-Sy10R>VWLLpL7x8)-)vn`HKSvj)`5nDg^t{91|QjMDo+QT6mEE_H0fYc^ZyfU i29uUZ`bY4{Ffg1nwVAu=l=5LU;Lc(-}5KP ziKU!%vI^vRzfLFl#<^3cHhlY(+7^GC^Od{Ahes!Kfo7!gfIu7TAD;c&{-=9HpFQ9a pBynI)P0{bfMJD}Cfexk&40nR{G?*8kG6uSY!PC{xWt~$(69C{gUAh1O literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/lapis_crossbow_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/lapis_crossbow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..478f04a040780c8af335d6d6dbe7ce17e858d27b GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2pAd09nAj)6bkfoaSX9I zot&V+T#y<5_xYuDzs?^30;j%bYvwSubzh%vER&k>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2pB52h58l(g&aLy978Nl zzwO&7$e_T(RR3SsXo7TMd+XFNwOcREL--HmO8tn4Gv2%A0PmU`Ix|udIlCvWWbayJ iGganf;1v7wml;n~n@fM(dUhqyFa}RoKbLh*2~7a%bUX_H literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/necrotic_crossbow_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/necrotic_crossbow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..9edc57e5319767c007fd9000da44241a9a8c9a88 GIT binary patch literal 239 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2aSX9I z{dVF;-U9|4EC){s?LYqBzVZ7HLyu%{%?-YjLv{-3{5YJJ?`Y(4>}BlfE(Rut%)n^V zs`qRM{4{H>vk0j8UXpornq}r@mHD1wG5*hYYF?iB#G94DFlfdSldP9)qR-#zhs^2k fsc!jObDVd=1Pj^U+NDQ!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2xzm_)+E0L3Qh8KaSX9I z{r18}PG?1dV;|pl&TXv~+rX>7q=<)of&jNTN6O?6X(ze7qS7~P7Sr?fn0!n;XkUEo z_vaQ5bSqC=rXSOvwEfSH`7=9abeOrOe46HeoO#`A;d7Q-t}!%tYn~2yP!uhg?83pg zx7;gnf@9NBM~7@RnI3>R#5(`4N&Uengm(QCM3tDk=T&0h!ZzRQnmUu(QOP%lUl P=sE^ZS3j3^P6FOC literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/quartz_crossbow_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/quartz_crossbow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..6ab7c23848a2e37310bfee633a22310e02815111 GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2&hWteRrM)6bkfoaSX9I zot&V+bfoI$|8xa*5Y_*6)BpOHKlJ9X83-DsJUaB0XZyOC^cQRN{`qfuJH7Ayul;G? xj{H~2c4HICRMWnYA$E%;IdMtrHw_0yhU}k~i(^ioS_d?o!PC{xWt~$(69DcQNn`*3 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/quartz_crossbow_effect_1.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/quartz_crossbow_effect_1.png new file mode 100644 index 0000000000000000000000000000000000000000..9dd3776f74f9125a524ebdaa587ffcb2d4ed8f2d GIT binary patch literal 209 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2&nVj7g}-|C=}@F;uvCa zIypgs=}6Vh|LF?sAgcfCrvLRXf9TC&GY~XNd35M0&-QgO=`Ysk{qx`Sc6#6YU;ER( x9r>@4?ZzgOsiu7)L+lnya^jNKZyFAa4B0;|7ss4FwGL=FgQu&X%Q~loCII`2NreCa literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/quartz_crossbow_effect_2.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/quartz_crossbow_effect_2.png new file mode 100644 index 0000000000000000000000000000000000000000..898f4021f52e392a550eb660d43e3c24bc1a19a9 GIT binary patch literal 260 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2xzD@8y21d3blB;IEGl9 zPEJq|I#PA>|8cc*PHWWuA5dsJdYf-j8Ur&k^Wh_{rzPjz*?Fko^{G;}NihPiQ~&SZ zvTau4{kE$-U8`Bx`)Bj)z4*}Q$iB}mp5N2 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/quartz_crossbow_effect_3.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/quartz_crossbow_effect_3.png new file mode 100644 index 0000000000000000000000000000000000000000..dc9f5b7b5452c5ad1e263827de775d37ae449a09 GIT binary patch literal 253 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2&fqr{k3b; zZfs99J$#qF|HSv?^wN*@Y`Yl0I4FB2ubKY$zxVO-i8&0yMH%;Z70petKg?TE^qdQ% rR^n82wd6^o2iK;)=2@K3z`(F2*I=`GcEfg{Ll`_={an^LB{Ts5-1J^m literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/redstone_crossbow_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/redstone_crossbow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..ebff98e756eb857be06d23ab53efe4658abef80a GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2*_AQ%f5R86q53EaSX9I uotz-C>481-;s1&&Dn)vhZ8$jl5W|KU++Wj|v>ySgV(@hJb6Mw<&;$T2KP-a) literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/redstone_crossbow_effect_1.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/redstone_crossbow_effect_1.png new file mode 100644 index 0000000000000000000000000000000000000000..e36d69794ccf6c52e8c227535c053333f05f8124 GIT binary patch literal 154 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2*_DxYWJi8g`_-P978Nl uCnrd3dSK6d_`l+cN|Byr8xGDs#IRuo_t*3#?MHyB7(8A5T-G@yGywnxhbzGV literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/redstone_crossbow_effect_2.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/redstone_crossbow_effect_2.png new file mode 100644 index 0000000000000000000000000000000000000000..5d6b61d0a93e895f2a1a4e5002fd94a17373c372 GIT binary patch literal 166 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2q^GP2sRP{3aNRzIEGl9 zPEL^6^uV6^a6KCkEMweSE7HUCN`2CQ9-jZ~Dy@tRtxTLh({Co80_tG!boFyt=akR{ E0EvJr!~g&Q literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/redstone_crossbow_effect_3.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/redstone_crossbow_effect_3.png new file mode 100644 index 0000000000000000000000000000000000000000..a34f368a52a1da2890705e2cdbdffd0f96d85efb GIT binary patch literal 160 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2q+4_^2_f53MqKHIEGl9 zPEL@x^uV6^aDA7lv0+bBpn=9^vzsqx$MiCMX6F1^P!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2x#$T?YT7%DCFVk;uvCa zIyph&Q-k2_1rwK@ub23J=c{hd51xcW%Pf!QDmL#!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2(qY!o)N4E3K@C2IEGl9 zPEK%OUY))4zwrd_u51|+ S%{&6s&EV!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2r|iOPvJ`k3Z;6wIEGl9 zPEI($Wb(A~-|5ccf9VQL8y0Y{IQ{XDdBDTu2M<#cZxp_|TCc|^);7C;pMlW?W~I4H z{~2Fk1uB`4D?E9b&G~xeP`gdK>A!wG)@SBd=T42AAo}=+e_%tP5ZmH}2nGgS1FbP0l+XkK^&U*Y literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/crossbow/spider_crossbow_effect.png b/src/main/resources/assets/bloodarsenal/textures/items/crossbow/spider_crossbow_effect.png new file mode 100644 index 0000000000000000000000000000000000000000..66bb964cd47777aabc09c60ddd5e41eda1d38ba1 GIT binary patch literal 223 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^K$v zTwzFmq1a>!6yYrJh%9Dc;5!V$jK}j=qyPokOFVsD+3#@)2r_G@*!*S%3dMW6IEGl9 zPEL?uU7QfX;8tXkX~^*>Js~0Chx+%~jWcD=1}E*2+;Ou)a$S7=(E~24o&^Xiw-xi- z8Q+lZFf;&y4HI55mdK II;Vst05r8k*Z=?k literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/fishingrod/blood_infused_iron_fishingrod.png b/src/main/resources/assets/bloodarsenal/textures/items/fishingrod/blood_infused_iron_fishingrod.png new file mode 100644 index 0000000000000000000000000000000000000000..0f44d5474ed9121d34ad83badf78ad4d0d96500e GIT binary patch literal 244 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqkA#p0&;KtM1c5@0o-U3d7N?UFBseDMs(-&fVg7%6 zW*`u@oF!aSb7K3?k}$D5Ws^+(9gBXgILmRMMSs;YgFUG~&i!X!@7i<2B-_Zqz#uf_ zz|m*t=btb5^(E7-NzY;1%*MvX#2|M~$Mr@Fv;CrXOgTe~DWM4fUS}xv literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/fishingrod/blood_infused_iron_fishingrod_flail.png b/src/main/resources/assets/bloodarsenal/textures/items/fishingrod/blood_infused_iron_fishingrod_flail.png new file mode 100644 index 0000000000000000000000000000000000000000..5e093b3a2ecd77c183acfd4c6184a00108111251 GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqkA#q}Fn_n^LZFa~r;B5V#p&b(307s%l+!2wo}V`P z_xS@r;L`VuMP8oGmyM0hx$fV8pC>yWJej7;^UTifN%g@A^Z)NxwEzGA;)x|f3=F|b Wc$wCo3+Mrw$KdJe=d#Wzp$Pz&Fgv&a literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_arrowhead.png b/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_arrowhead.png new file mode 100644 index 0000000000000000000000000000000000000000..0ebb07a1b4f28b2f6016895f629469522b546c73 GIT binary patch literal 2925 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 ei2wf!(FQM5nrJdKJEWxm0000 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_binding.png b/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_binding.png new file mode 100644 index 0000000000000000000000000000000000000000..10adb6a6a095d0599456f4a91e2a8a3437c3158c GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_chisel_head.png b/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_chisel_head.png new file mode 100644 index 0000000000000000000000000000000000000000..bffde59b7391b18d916bf31d433d902f708f9d5a GIT binary patch literal 2922 zcmV-w3zhVVP)|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^-74Jsac{*1K%006Q{L_t(I%hi)13d1lMg};pX+WDFKh#sJm zg&iPr&_e|(bAUnQdVq@hnfTb9;GY_#TU#2c_S_HoUS7!im58uM2X<<=!7&|lsTU7Q z45ChF1u#CxyaW=1SYwbFWHkXmUDcEMakpZPVelSn46SnlsH_Bo_f$l~kFEGGEA z{Z|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^-677Z8LA!Q2y008?*L_t(I%hi)1Zo@zjMc-6GCJu?@(3mW4 zZeRtKHwXFi9ezY3xJpVtlmJk9% z^uRz328`@5cXI&3^&B%vmP=RDNl$HnHLuc?Ns<7tsT$Z~`5Zy}764W+ufp;EzStHX$Ky~=r?J^N2Y{+_F;G<@SuVX1Zl$UbvgNvitq_g*KwHEFe?f^w%a&^PJm>&9Iod;nl^wOn@4k83N{Hpg2TmJvg^bJM}XM#$=ew_dS002ovPDHLkV1j;Ap$h;2 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_crossbar.png b/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_crossbar.png new file mode 100644 index 0000000000000000000000000000000000000000..60a338565b7a8e85967f8b49fafb698d905ad1ff GIT binary patch literal 2866 zcmV-23(fS2P)|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^-677h>MV6L73004SPL_t(I%VYfi|33pIfQf-ZFboV}!6s-V zAn>1ofq{WhLYWa+{Opah#JiwEQj+2Si@X2-zqtFKWG^sEC^L3Ef6h=LDakM^I+_8W zAuRYzfBo$n1H-<3|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^-677rMBs2Ugm0090;L_t(I%hgk%j>13?eRDa5sk#Jx2-Z>r z?gT}WAS!WtNd@-_1hu&zXo6|dx(dVzegIKR@N0^0f+WGdQ`gYaJ1(hWk`ePV^RjRD zjgUl}ctXo)P4HX?hH6-;S>%*%Pp+|pJ=}kR_BB}K%!~nxoZ8pWzW$#CZ{#6fFPRww zYb`Qk5U-cb+a_5_x9?)$I6Q|T_lpHLN^zqU&tb@cv#;M6y8=V)E9a~Al;q>Y1%ma{_!byzYzc?vq0i)#ArH2kftS; sd?h!%Qn&K851Kqs_kleAEwm>12B30;H(0#2djJ3c07*qoM6N<$f+-TIAOHXW literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_frypan_head.png b/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_frypan_head.png new file mode 100644 index 0000000000000000000000000000000000000000..e7e2c1461c09eafe8afe5c049649576c7e7eaf48 GIT binary patch literal 3008 zcmV;x3qSOUP)|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^-677!?tD9kzMxUdi@|62IF*t2pDk>wMhB^0tvNBv>+k zZMS~CyN+FwP-NNQX#;?hGdt~)gkzdgmE~*^16Qz16wR8Q9AunDu+$!B)>@;rUTkCV zpBbR8>%Rdij8)#YzF>Vhb5)ic(-dRvpq-Np`UM-C7bo$PMI*%s;-CP=T25!9Zq;pm zkW?5eW32!bS?1%$S^!RGGnqssBCGy_TKgLVR_X_OWPd9J^&aT}0000|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^-677-sZjj&_@005FnL_t(I%VYfi|33pIfQf-ZK(PTV=mN$X z#wh&%FYdzq$S9%Ac=pCw{05+FwBqMy&}3j>F!%9cNL#w}KLY~;BS8cHzqtF~il3i> zfq?;8GXtZ9G9$q-AVu@whz05!z$l^2cvxW o*vF3q4Pivj3#29_#-X2?0OChQhLtg`NB{r;07*qoM6N<$f+Lr1qW}N^ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_hammer_head.png b/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_hammer_head.png new file mode 100644 index 0000000000000000000000000000000000000000..727a2fb5a7ae0b6f6076a4c4753567a0132549b3 GIT binary patch literal 2955 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 Bjj{j$ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_knife_blade.png b/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_knife_blade.png new file mode 100644 index 0000000000000000000000000000000000000000..75a372c97adfd63761497857626f29201aa1cfe6 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_large_guard.png b/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_large_guard.png new file mode 100644 index 0000000000000000000000000000000000000000..c69da763f931e25137f06dfda89b044aeac2c07b GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_large_sword_blade.png b/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_large_sword_blade.png new file mode 100644 index 0000000000000000000000000000000000000000..98730a6fb892335311cfede78b8c53b600665f34 GIT binary patch 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_largeplate.png b/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_largeplate.png new file mode 100644 index 0000000000000000000000000000000000000000..40cbff21e7a1586cfb791d97105991509fa2e333 GIT binary patch literal 2916 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 P$1-@j`njxgN@xNA&WvJs delta 2317 zcmbW32~bn#7JzS9Y(&tZERGtGMZiFnQ4k4)r8Ni!ffAvGsYoq-)K)-DK*D-Mtqn_! zMe-y_K;P}z)6o~`E}!(y>Do1I6%<8Vn)o6)QejQ=mLZ7Fnu4a+oM zbTCSI+8uRO+IT|b#veQVQnh z=U5KMe1+9>0fm`OJ@cW!A*Fezi0c)3!g)qhjilXprc|lN@tTT}V4tT}D`t-Sl_sO+ z*j>3T0lQ0$gdGQb--jqVkSSCSLHf{62;{{8dbvb#>YcaTzCA>}B=7NQ3jEgAzZ))+ zCk2m#;lvbmLik7!$w1Vj00#WjD{&M%k?co zP^gr@-e+~|(IYO}H%zh*>s_>!Y$dG*8VEXXIGsKOuRUzSrCeX)I0O0oq=OENZo^8t z6&>CuOYLZfp~7U;M(S^ky9c@F=g6q0;oW$2C_cC1^RHtvC+)P!c7`X0p5w~@F|I$; zDn^F=B`vB0p!KLxCU&VjrP`$UVaKvfLz3H3TX@4uJn);4CHiTzCcu?Pd#+~xR9C~4 zHZvVd66WGzy=R6HR!{Hsbha9q`%3ApDszgbj?Cl_`iW;>e9Fosd%UB854eCZ2Ey-k z0>3;7ILK>dQ}QpHZ&4U~9o1m2FPasAF8wD${o&IHrGSvfB)JB;WcZ`)2>1uw_=m|B z)HdtJntX124AxSRP?t}@!*s&c&o7H3uB3L#L0tx7_InvuI-l$N!mQ+;{iJ;9X8m$Z z$YQj|B|={NC&tow5BtJSj$ay6RCIT4p`Y0B&3u{#XW&V-K0Kv;KiyuZZ?4nA`6q6C zi1}ck(#Pq`v8t6Uo=-zBZ%W*G!850BcZR}n`Xi05_o_XxR-X}_zb)#c#@ejyG5$>$ z46yiji--wn+RPBu7>SojHdYtfgh2dRyR{~^UW(=(RwgX||W-NM64$y*tFMvrjpu;R^Yj`xUq_Ji! z(H$pD2DH8rjP=i)0lE36q(&~R+rTYj2dR2Dj^O0v3C^=HY_yMhqN`=&1~u$&jf`_!#@`mWgY?=exU zmU#$X#?sp(Et!S3lA_6>i&d8mRtmJ~OGQgKA$lI4Io{NY#4IKSYQa%F;fmL)el4}t z?PLS1%q+BRjp+g!*>ZadV)pps^UOtn@lE(%B`QO_Xn|3EIIGc-QWxWn5J+YS{A`VC zU{hhrc8r-j%M{HjRDu2`{AJ3OE1Kafg3$#g6i}$KhT1d9q=LqG@IRqgEEX3Y4w&TR z)JVaE!bnbBj#bbI`0wdg<3*KHkB!s=V2s6!_+%_?IAJr34#0wWR_iUlD3O$ryp>_2 zCA%nUpVsu|6py%QgDSYs(XAxtXNmmy>3KofQ(n?LEYtjU8!(a%+ZTS8|J=RK`P|q{ z?F4ZPa4(iK5V=9!E0I_d6Q+)*S}-Tbq1^cNTlbF*Y9ftM(G!bGRp-CeLA;5qp?8~; z#bXZ8_6RG1-Tje@=)K#HC5sca6Z@6w{^XTuRde=wD{*{i&yj2~pJ8CQTIBUjB8`x3 zYr~>93Iqat`wLd!0A-`Z; J&3hkz`9GgA@P_~Z diff --git a/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_pickaxe_head.png b/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_pickaxe_head.png new file mode 100644 index 0000000000000000000000000000000000000000..f0bdd116c12b359b93047b5bf117bb4b9deed0c9 GIT binary patch literal 2958 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 Ef&`b95C8xG literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_rod.png b/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_rod.png new file mode 100644 index 0000000000000000000000000000000000000000..274675d6e715ee89a56e7183c37868ad5d59bab7 GIT binary patch literal 2950 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 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_shovel_head.png b/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_shovel_head.png new file mode 100644 index 0000000000000000000000000000000000000000..d206b4f1371ab59fcd167e2b25cdf5cf82535504 GIT binary patch literal 2925 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 XoM~Sp`4w%r00000NkvXXu0mjfw5)}E literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_sword_blade.png b/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_sword_blade.png new file mode 100644 index 0000000000000000000000000000000000000000..097556deee6943bef0e7eb00c8bad68deb24022c GIT binary patch literal 2890 zcmV-Q3$^r#P)|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^-679K1L#m&6{005FnL_t(I%VYfi|33pIfQf-ZK(PTV$Q)x0 zW1I^Azqkwc>$wjf7_l0_z`(%ZZ0?MqdC$gK|7S%ZDerv##!tJ49(0003a`4-1Cw>a{vGU07*qoM6N<$g8s~J3jhEB literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_toughbind.png b/src/main/resources/assets/bloodarsenal/textures/items/parts/blood_infused_iron_toughbind.png new file mode 100644 index 0000000000000000000000000000000000000000..77674e91fc17c94c42e4fa6064f5aa013ddf1147 GIT binary patch literal 2978 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 FV1g5cdf@;7 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/sacrifice_amulet.png b/src/main/resources/assets/bloodarsenal/textures/items/sacrifice_amulet.png new file mode 100644 index 0000000000000000000000000000000000000000..ae2f769d12a51c9e64bc919eb7dd0d669614266b GIT binary patch literal 420 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqkD$1b)PZwCzkournIRD+&iT2ysd*(pE(3#eQEFmI zYKlU6W=V#EyQgnJie4%^0|O(6r;B5V#p$V&71ted5NP|~*p)tktdy@GSy)DygsGMsFT2Tgce4sJ-fq_DlhFX zNpEdjdQE@p%@QszAtnZ{gJLqvG&vRLnI`k_Rh|o5a=m5ss;Xz7bv`FB2skCoSQe7S z8`c%iQa8<8Z|gCe(@p1#U2PeYd3Lp_8$_;+x@*r>Bb}dr%BxUOb+<3i!PY4`$M3v; z^`=jNVNw1=Coj7vJGZ;sQ_4M-{BL*6hSk}B=AD1C@A59YYd5kDA}fyf{7q%-@~lDc;Gr_I5Qm;PrQxpp&dzjw0o^_|*04CTwGPj=$VE(!((mZz(q J%Q~loCIDjbr6vFX literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/self_sacrifice_amulet.png b/src/main/resources/assets/bloodarsenal/textures/items/self_sacrifice_amulet.png new file mode 100644 index 0000000000000000000000000000000000000000..a7f4c737675b9045fe49d382a32267350d63e6c0 GIT binary patch literal 403 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`Y)RhkE)4%caKYZ?lYt_f1s;*b z3=G`DAk4@xYmNj^kiEpy*OmPqkD$1zf@gDVKTt?EGbEzKIX^cyHLnE7WngeFN=+_ypH?yNa>;9e5Il4hhKC#bf)m)RL{bYGg z>gJ!~;Y$TuULUbn+;(W`_77bqP1=H6F1WGqA6FBfrH=NUA!iE z?$L^s>I~bjAOH2W_Q2_C@mHG5<)2@C(Pq${@_xSJ+k(PLt@G8hRx>_3wM6z^o}9}6 rEz$O?X8urKvHZt&=TE1rGhd&Q?~yI>VVIw63JM!fS3j3^P6(#b literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/sigil_of_divinity_activated.png b/src/main/resources/assets/bloodarsenal/textures/items/sigil_of_divinity_activated.png new file mode 100644 index 0000000000000000000000000000000000000000..b9170ae65f76f4ab58872049d6808aee9108e8b9 GIT binary patch literal 670 zcmV;P0%84$P)WFU8GbZ8()Nlj2>E@cM*00II@L_t(I%bkhye{x#x3Jd4#Ts1!kv#u{v)B6#!S(Yw;v zY&P@jdDtXPtRD2iz#C@xzR&x<86_eBe7WC?f%>_-d6$2PXq0@Nxi%02zHQZT-q9~L zMjNs$LMcb<;CxU%xF^30s1d==qjff zAv0MP9~XrVMgpzPJymLrCkMb9!>#5a8;y2#-q@uchgb&+I4%ke5U9C%rRL@p00M)7 z1;9AZR(pl5_Ckff-^BQUG!60isTR~Qmn4Y^7>u^uSU&M#&2haHJUNXY92H<#a! zFKcaxvuIjiNPvhS;(79J8SotSeh%}KNb7=i_RoJ|`{AN^uK-OHDbCJTk19#(c!@B! zhqsQ!E3ed)LRGn1d76fKnua1mytWFU8GbZ8()Nlj2>E@cM*00JCIL_t(I%bk@7kNj6os0M6y^(x>Wu(Vj1oqaBp$htgD|fQ7l^eQcBbUP4(qqA0WqtUcdlY4H^8cAGq}v$pYx`PnJD zWe1ZOv`!eS)v~>!uzDcST7IcYYl+kW@XoQhUGVJH7qU!q@9_sJS%MFsfW4xy09uVt zC^bIOhZX4cJR*V%k=f}c>3ZaAqq*N zxc_8_=Ijx)PDy^Y06jbsi9L#L3BYb!5a9aa8Ll->lO&47q*&`|E^Vq|0vS-0Wsj}b zCC#}>if$is<-t3Q(TG4|a(w8H?17eVUu9o}!-rC=i&&ph$qm*;=4Os@X=Vx^1ZN%D z&)N4YaLn5j0)@%AR>rF8W*RK7}@Q7=j!DXBgt7R z_~8G13#)ggB}N5Uj8Pmt++V6ZuMoxHe23@*)AJA2h(iD8zSpbOq+YEiB0_ehkq^iI e<_E|0zxD&S)+AxFoI@x80000)$VPE|JQ$G Z{V10E{mk;M#y~$Zc)I$ztaD0e0swHZdfos4 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/misc/potions.png b/src/main/resources/assets/bloodarsenal/textures/misc/potions.png index 5ea397b5bdaee73691e486d1801cd2f2c8480b0a..cb8d63ddf749f9005be4a53769fc3cbdc2e02c0b 100644 GIT binary patch delta 1670 zcmV;126_3Y3!4v+90dSea;RpJF)@D(4G$U>1=hPR000LlNklihNm?rkpTeCGq)dlQpk z19g*d15kf>!m2iJ`04K5&mFF+cAZSGlrlF~*R47k9jdCKvASMNvXJETY^QVoqs(0{ zcAO34)nh%`eK&oo9J=$?%4LK9LIU_~yZ!Duxoo^y509lf-b^(=NSdu=+n~zvr9oNg zmooOGX7kkER_l+mozAbe3jTxbc4pQO((P_ORw;k&b~;I}eB{^#wO@N%dHu^?kbCz3 zK3gRL2?8!nz5eA3)6;L<)o46_sIJP$_UfU9$ue?mq+b>%2B)TW)+e@Yug7P%x2B$Y z`Orcc$@E;W_sjz`Gq2e)_+Ry^0mIuA`dxO+3j&(Cha??%8jW;GojwDG=Cn@cAs&2O=sj6p z|KNlFKA(Osy%Rf01I zP^KoT^i$`=!bCP`dd_KVAOaNn5RgU%hI|eBW>jNKu*IP5xYGq`2GD~OA zB#kI;AL@Au#Th~S^v^e0n~;p8^1=%2XxEg5bNWprdJ ziwmcdMx7H!9?Bix`hLzmm;f$Sog~ewS{SRU6XVPEQj&b=t#8htSLMXXvpM$96X_iN zX9lZ-oSHwAn_qTal4NY6Ug(!HpX6-LmH6xBeUfBuQ}EBNwE=7Q0CGA>C&_=Glf3u> zPXadf{~vnG8#7p~(mgSs!^gUL@bIw=RtGtG=5*fiqHA46_)ii*lJ53KV>wj@NisS- zlo!3{_U!-2of%$T$=)5)`Q@j-n(OcQVkR%&l_a^mYBYN#S0owQJZUG%j!j8m$A)_W zryr#PSnvPWlfc;Ua9;lY&*XpW_dX>ft1G#3=N0+fcXsB+&)$=%={>F@{3k6yk~)nn z_Zt~al4G5}=0|tDFE9M?d-KElevu@3#k*gZyKlQbf15j=Bw1c6JKBxinI_T2N6{YjErUjBdleCg(wsBV~R(|lq{prpxrb_GK;P)N? zJiZDbN%mE9Sxk~c$L4=B7@T_)FuJXomELNS7)=KUvkg#_M_^NprT-`SQgk-&_e?=$OD0Bmu0o120X| zO0t|}+gji*B^j*!KAz;nY^QVg<2m5Qq+s=j{}Y?<@^7^blR*L~82%gn1(2|zDw1*K Q9RL6T07*qoM6N<$f{+=1&;S4c delta 1205 zcmV;m1WNmx52y=}92Eg8b(rt~000DMK}|sb0I`n?{9y%=Au)dn9Tg=7j#mZm000Fg zNklxxiWEVJrC?}9O$5=} zs;E$Cp?zV!;|1|T)fbw0D^}{|M)XA2><{9kYx8Y&3dNQdhaFs1HXC2x~;xc zH?JPQa_SRt9?uvF~!5fNG$xT>R|&_GWN+W5&LBpuFq?taj?T@dNko?_QDBmFJ7? zb_J2)9e?;Acywy&YY*<){*fg0i;w%ZkAG~Y)!MDl`c);#U{Unz=$Bu;Gb^2B zc%aI$qtE5)M;?AQv)L%q`c)>$=0;<4l05SJ-{tVrf6aBb-jjdKp3Kr*eN~d4OzT(i z!jG9&>xO?X_NF9@Nv5XT?e9ng00000000000Fml3f50VFB*{0&#%>>}%85-W+l^#w zv93={G#abd&CdQnqIK?2v-zf9@0k2@lKRERPhPg|=4W^A{D4C1Th&coHPS5qv}<@G zNwRgQFV8P@^6ta42mf-_j$0&J=L4{*EH9j0?)L89_nsul{NiG=bUrtK{y>&i>RE}_ zw=&7uZf=$C{M^wD_YLOIp=Z)xbdn^aWw}M7^*;b3-ShSE;o~QA{m1Xg=tv{SPA?=$ zmU^{9m&04YuO=sN8y+oo%%}I%z;M|&*eg~>&y-urUU77~-Tt{u>wEx`WTw@6XOe*= z7n6)6S($FPe?hvX%xlmbi4gqDPirYl4PJLPM_>{i^is0Op;D7`ND1c z(%;vYfej;BTAWWBWzL7pL3ppGpa9bOU(7V^dSF zS*q)6hZ<#Hr>=`CMQ^39i{-i=-dGf~DRNav@1I-EJS05C8xG)`WindyQHT TVtBv^00000NkvXXu0mjfv#fTB diff --git a/src/main/resources/assets/bloodarsenal/textures/models/altar.png b/src/main/resources/assets/bloodarsenal/textures/models/altar.png new file mode 100644 index 0000000000000000000000000000000000000000..1f80efd83f00778629c63e75efcdbf26dcdbc3c4 GIT binary patch literal 6601 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 R@y$Of>dHDwRSH%i{{!{Va?k(( literal 0 HcmV?d00001