From 672c7803beeb5dc09538b05e43cdc0a539409354 Mon Sep 17 00:00:00 2001 From: Arcaratus Date: Wed, 1 Jul 2015 16:04:09 -0400 Subject: [PATCH] 1.1-13 Update --- build.gradle | 4 + build.properties | 12 +- .../{ => client}/ClientProxy.java | 43 ++- .../renderer/block/RenderTileLifeInfuser.java | 4 +- .../renderer/block/ShaderHelper.java | 2 +- .../block/TileLifeInfuserRenderer.java | 33 +- .../block/TilePortableAltarRenderer.java | 6 +- .../item/TilePortableAltarItemRenderer.java | 4 +- .../entity/RenderEntityBloodHound.java | 5 +- .../renderer/item/ItemRenderGatling.java | 6 +- .../{ => client}/renderer/item/RenderBow.java | 2 +- .../renderer/model/ModelEnergyGatling.java | 2 +- .../renderer/model/ModelLifeInfuser.java | 5 +- .../model/ModelPortableBloodAltar.java | 4 +- .../renderer/model/ModelVampireCostume.java | 2 +- .../projectile/RenderEntityBloodBall.java | 3 +- .../RenderEntityGatlingProjectile.java | 6 +- .../{ => common}/BloodArsenal.java | 41 +- .../{ => common}/BloodArsenalConfig.java | 5 +- .../{ => common}/BloodArsenalEventHooks.java | 14 +- .../{ => common}/BloodArsenalRecipes.java | 19 +- .../{ => common}/CommonProxy.java | 15 +- .../{ => common}/block/BlockBloodCake.java | 4 +- .../block/BlockBloodInfusedDiamond.java | 2 +- .../block/BlockBloodInfusedGlowstone.java | 4 +- .../block/BlockBloodInfusedPlanks.java | 2 +- .../block/BlockBloodInfusedWood.java | 2 +- .../{ => common}/block/BlockBloodLamp.java | 2 +- .../block/BlockBloodStainedGlass.java | 6 +- .../block/BlockBloodStainedIce.java | 8 +- .../block/BlockBloodStainedPackedIce.java | 2 +- .../{ => common}/block/BlockBloodStone.java | 2 +- .../{ => common}/block/BlockBloodTNT.java | 18 +- .../{ => common}/block/BlockBloodTorch.java | 2 +- .../{ => common}/block/BlockBurnedString.java | 4 +- .../{ => common}/block/BlockCompactedMRS.java | 29 +- .../{ => common}/block/BlockCompacter.java | 8 +- .../{ => common}/block/BlockInfusedIron.java | 2 +- .../block/BlockLPMaterializer.java | 50 ++- .../{ => common}/block/BlockLifeInfuser.java | 38 +- .../block/BlockPortableAltar.java | 30 +- .../{ => common}/block/ModBlocks.java | 16 +- .../block/fluid/MoltenBloodInfusedIron.java | 4 +- .../{ => common}/entity/EntityBloodTNT.java | 2 +- .../common/entity/ModEntities.java | 11 + .../entity/ModLivingDropsEvent.java | 4 +- .../entity/ai/AIAttackOnCollide.java | 2 +- .../{ => common}/entity/ai/AIFollowOwner.java | 2 +- .../entity/ai/AIHurtByTarget.java | 2 +- .../entity/ai/AILeapAtTarget.java | 2 +- .../entity/ai/AIOwnerHurtByTarget.java | 2 +- .../entity/ai/AIOwnerHurtTarget.java | 2 +- .../entity/mob/EntityBloodHound.java | 4 +- .../entity/projectile/EntityBloodBall.java | 3 +- .../projectile/EntityGatlingProjectile.java | 2 +- .../{ => common}/gui/ConfigGui.java | 7 +- .../{ => common}/gui/ConfigGuiFactory.java | 2 +- .../{ => common}/gui/GuiHandler.java | 8 +- .../{ => common}/items/BucketHandler.java | 2 +- .../{ => common}/items/ItemBloodArsenal.java | 5 +- .../{ => common}/items/ItemBloodBall.java | 6 +- .../{ => common}/items/ItemBloodCookie.java | 4 +- .../{ => common}/items/ItemBloodMoney.java | 4 +- .../{ => common}/items/ItemBloodOrange.java | 4 +- .../items/ItemJuiceAndCookies.java | 4 +- .../{ => common}/items/ItemSoulBooster.java | 6 +- .../{ => common}/items/ItemSoulNullifier.java | 4 +- .../{ => common}/items/ModItems.java | 46 ++- .../{ => common}/items/MoltenBucket.java | 4 +- .../{ => common}/items/armor/GlassArmor.java | 8 +- .../common/items/armor/LifeImbuedArmor.java | 277 ++++++++++++++ .../items/armor/VampireCostume.java | 10 +- .../bauble/EmpoweredSacrificeAmulet.java | 4 +- .../bauble/EmpoweredSelfSacrificeAmulet.java | 2 +- .../{ => common}/items/bauble/ItemBauble.java | 10 +- .../items/bauble/SacrificeAmulet.java | 3 +- .../items/bauble/SelfSacrificeAmulet.java | 3 +- .../items/bauble/VampireRing.java | 7 +- .../items/block/BloodStoneBlock.java | 2 +- .../items/block/CompactedMRSBlock.java | 6 +- .../items/block/PortableAltarBlock.java | 3 +- .../items/orb/TransparentOrb.java | 5 +- .../items/sigil/SigilDivinity.java | 5 +- .../{ => common}/items/sigil/SigilEnder.java | 7 +- .../items/sigil/SigilLightning.java | 11 +- .../items/sigil/SigilSwimming.java | 4 +- .../{ => common}/items/sigil/SigilUtils.java | 8 +- .../items/sigil/holding/AHPacketHandler.java | 2 +- .../sigil/holding/AHPacketProcessor.java | 2 +- .../holding/ContainerAugmentedHolding.java | 2 +- .../sigil/holding/GuiAugmentedHolding.java | 2 +- .../holding/InventoryAugmentedHolding.java | 2 +- .../sigil/holding/SigilAugmentedHolding.java | 5 +- .../{ => common}/items/tool/BoundBow.java | 4 +- .../{ => common}/items/tool/BoundIgniter.java | 6 +- .../{ => common}/items/tool/BoundShears.java | 6 +- .../{ => common}/items/tool/BoundSickle.java | 4 +- .../items/tool/EnergyGatling.java | 6 +- .../items/tool/GlassDaggerOfSacrifice.java | 9 +- .../items/tool/GlassSacrificialDagger.java | 6 +- .../common/items/tool/IFillable.java | 12 + .../items/tool/InfusedDiamond.java | 6 +- .../items/tool/InfusedDiamondAxe.java | 4 +- .../items/tool/InfusedDiamondPickaxe.java | 4 +- .../items/tool/InfusedDiamondShovel.java | 4 +- .../items/tool/InfusedDiamondSword.java | 4 +- .../items/tool/InfusedIronAxe.java | 4 +- .../items/tool/InfusedIronPickaxe.java | 4 +- .../items/tool/InfusedIronShovel.java | 4 +- .../items/tool/InfusedIronSword.java | 6 +- .../items/tool/InfusedWoodAxe.java | 4 +- .../items/tool/InfusedWoodPickaxe.java | 4 +- .../items/tool/InfusedWoodShovel.java | 4 +- .../items/tool/InfusedWoodSword.java | 6 +- .../items/tool/ToolCapabilities.java | 2 +- .../{ => common}/misc/CommandDownloadMod.java | 2 +- .../{ => common}/misc/ThreadDownloadMod.java | 2 +- .../misc/ThreadVersionChecker.java | 2 +- .../{ => common}/misc/VersionChecker.java | 6 +- .../potion/PotionBloodArsenal.java | 2 +- .../rituals/RitualEffectEnchant.java | 6 +- .../rituals/RitualEffectFishing.java | 6 +- .../rituals/RitualEffectMidas.java | 4 +- .../rituals/RitualEffectWithering.java | 2 +- .../{ => common}/rituals/RitualRegistry.java | 5 +- .../tileentity/FluidTankRestricted.java | 2 +- .../tileentity/PacketHandler.java | 4 +- .../tileentity/TileCompactedMRS.java | 2 +- .../tileentity/TileCompacter.java | 2 +- .../tileentity/TileLPMaterializer.java | 40 +- .../tileentity/TileLifeInfuser.java | 94 +++-- .../tileentity/TilePortableAltar.java | 6 +- .../container/ContainerPortableAltar.java | 4 +- .../tinkers/BloodArsenalModifiers.java | 2 +- .../tinkers/BloodArsenalTinkers.java | 156 +++++++- .../common/tinkers/IClientCode.java | 10 + .../tinkers/ModSoulbound.java | 8 +- .../{items => common}/tinkers/PartHelper.java | 6 +- .../tinkers/RecipeHelper.java | 6 +- .../common/tinkers/TConCastingRecipe.java | 25 ++ .../common/tinkers/TConEvents.java | 24 ++ .../common/tinkers/TextureDerived.java | 96 +++++ .../common/tinkers/TextureLiquidLava.java | 56 +++ .../tinkers/TextureResourcePackBase.java | 208 ++++++++++ .../TextureResourcePackBloodInfusedIron.java | 358 ++++++++++++++++++ .../arc/bloodarsenal/entity/ModEntities.java | 15 - .../items/armor/LifeImbuedArmor.java | 13 - .../assets/bloodarsenal/lang/en_US.lang | 12 +- .../models/armor/life_imbued_layer_1.png | Bin 0 -> 2171 bytes .../models/armor/life_imbued_layer_2.png | Bin 0 -> 950 bytes .../textures/blocks/lp_materializer.png | Bin 627 -> 0 bytes .../blocks/lp_materializer_output.png | Bin 0 -> 779 bytes .../textures/blocks/lp_materializer_side.png | Bin 0 -> 689 bytes .../textures/items/life_imbued_boots.png | Bin 0 -> 465 bytes .../textures/items/life_imbued_chestplate.png | Bin 0 -> 636 bytes .../textures/items/life_imbued_helmet.png | Bin 0 -> 458 bytes .../textures/items/life_imbued_leggings.png | Bin 0 -> 464 bytes src/main/resources/mcmod.info | 2 +- version/1.7.10.txt | 2 +- 159 files changed, 1778 insertions(+), 531 deletions(-) rename src/main/java/com/arc/bloodarsenal/{ => client}/ClientProxy.java (59%) rename src/main/java/com/arc/bloodarsenal/{ => client}/renderer/block/RenderTileLifeInfuser.java (94%) rename src/main/java/com/arc/bloodarsenal/{ => client}/renderer/block/ShaderHelper.java (99%) rename src/main/java/com/arc/bloodarsenal/{ => client}/renderer/block/TileLifeInfuserRenderer.java (83%) rename src/main/java/com/arc/bloodarsenal/{ => client}/renderer/block/TilePortableAltarRenderer.java (97%) rename src/main/java/com/arc/bloodarsenal/{ => client}/renderer/block/item/TilePortableAltarItemRenderer.java (94%) rename src/main/java/com/arc/bloodarsenal/{ => client}/renderer/entity/RenderEntityBloodHound.java (95%) rename src/main/java/com/arc/bloodarsenal/{ => client}/renderer/item/ItemRenderGatling.java (93%) rename src/main/java/com/arc/bloodarsenal/{ => client}/renderer/item/RenderBow.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => client}/renderer/model/ModelEnergyGatling.java (99%) rename src/main/java/com/arc/bloodarsenal/{ => client}/renderer/model/ModelLifeInfuser.java (96%) rename src/main/java/com/arc/bloodarsenal/{ => client}/renderer/model/ModelPortableBloodAltar.java (96%) rename src/main/java/com/arc/bloodarsenal/{ => client}/renderer/model/ModelVampireCostume.java (99%) rename src/main/java/com/arc/bloodarsenal/{ => client}/renderer/projectile/RenderEntityBloodBall.java (96%) rename src/main/java/com/arc/bloodarsenal/{ => client}/renderer/projectile/RenderEntityGatlingProjectile.java (91%) rename src/main/java/com/arc/bloodarsenal/{ => common}/BloodArsenal.java (81%) rename src/main/java/com/arc/bloodarsenal/{ => common}/BloodArsenalConfig.java (97%) rename src/main/java/com/arc/bloodarsenal/{ => common}/BloodArsenalEventHooks.java (96%) rename src/main/java/com/arc/bloodarsenal/{ => common}/BloodArsenalRecipes.java (96%) rename src/main/java/com/arc/bloodarsenal/{ => common}/CommonProxy.java (61%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockBloodCake.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockBloodInfusedDiamond.java (92%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockBloodInfusedGlowstone.java (85%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockBloodInfusedPlanks.java (87%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockBloodInfusedWood.java (95%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockBloodLamp.java (88%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockBloodStainedGlass.java (91%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockBloodStainedIce.java (96%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockBloodStainedPackedIce.java (91%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockBloodStone.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockBloodTNT.java (95%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockBloodTorch.java (85%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockBurnedString.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockCompactedMRS.java (87%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockCompacter.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockInfusedIron.java (92%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockLPMaterializer.java (80%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockLifeInfuser.java (86%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/BlockPortableAltar.java (92%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/ModBlocks.java (90%) rename src/main/java/com/arc/bloodarsenal/{ => common}/block/fluid/MoltenBloodInfusedIron.java (94%) rename src/main/java/com/arc/bloodarsenal/{ => common}/entity/EntityBloodTNT.java (98%) create mode 100644 src/main/java/com/arc/bloodarsenal/common/entity/ModEntities.java rename src/main/java/com/arc/bloodarsenal/{ => common}/entity/ModLivingDropsEvent.java (95%) rename src/main/java/com/arc/bloodarsenal/{ => common}/entity/ai/AIAttackOnCollide.java (99%) rename src/main/java/com/arc/bloodarsenal/{ => common}/entity/ai/AIFollowOwner.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/entity/ai/AIHurtByTarget.java (97%) rename src/main/java/com/arc/bloodarsenal/{ => common}/entity/ai/AILeapAtTarget.java (97%) rename src/main/java/com/arc/bloodarsenal/{ => common}/entity/ai/AIOwnerHurtByTarget.java (97%) rename src/main/java/com/arc/bloodarsenal/{ => common}/entity/ai/AIOwnerHurtTarget.java (97%) rename src/main/java/com/arc/bloodarsenal/{ => common}/entity/mob/EntityBloodHound.java (99%) rename src/main/java/com/arc/bloodarsenal/{ => common}/entity/projectile/EntityBloodBall.java (94%) rename src/main/java/com/arc/bloodarsenal/{ => common}/entity/projectile/EntityGatlingProjectile.java (99%) rename src/main/java/com/arc/bloodarsenal/{ => common}/gui/ConfigGui.java (89%) rename src/main/java/com/arc/bloodarsenal/{ => common}/gui/ConfigGuiFactory.java (93%) rename src/main/java/com/arc/bloodarsenal/{ => common}/gui/GuiHandler.java (74%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/BucketHandler.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/ItemBloodArsenal.java (95%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/ItemBloodBall.java (84%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/ItemBloodCookie.java (92%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/ItemBloodMoney.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/ItemBloodOrange.java (88%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/ItemJuiceAndCookies.java (92%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/ItemSoulBooster.java (96%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/ItemSoulNullifier.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/ModItems.java (87%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/MoltenBucket.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/armor/GlassArmor.java (83%) create mode 100644 src/main/java/com/arc/bloodarsenal/common/items/armor/LifeImbuedArmor.java rename src/main/java/com/arc/bloodarsenal/{ => common}/items/armor/VampireCostume.java (97%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/bauble/EmpoweredSacrificeAmulet.java (97%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/bauble/EmpoweredSelfSacrificeAmulet.java (99%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/bauble/ItemBauble.java (92%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/bauble/SacrificeAmulet.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/bauble/SelfSacrificeAmulet.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/bauble/VampireRing.java (91%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/block/BloodStoneBlock.java (95%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/block/CompactedMRSBlock.java (86%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/block/PortableAltarBlock.java (94%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/orb/TransparentOrb.java (92%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/sigil/SigilDivinity.java (97%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/sigil/SigilEnder.java (92%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/sigil/SigilLightning.java (96%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/sigil/SigilSwimming.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/sigil/SigilUtils.java (89%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/sigil/holding/AHPacketHandler.java (88%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/sigil/holding/AHPacketProcessor.java (95%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/sigil/holding/ContainerAugmentedHolding.java (99%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/sigil/holding/GuiAugmentedHolding.java (95%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/sigil/holding/InventoryAugmentedHolding.java (99%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/sigil/holding/SigilAugmentedHolding.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/BoundBow.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/BoundIgniter.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/BoundShears.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/BoundSickle.java (99%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/EnergyGatling.java (97%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/GlassDaggerOfSacrifice.java (96%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/GlassSacrificialDagger.java (97%) create mode 100644 src/main/java/com/arc/bloodarsenal/common/items/tool/IFillable.java rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/InfusedDiamond.java (94%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/InfusedDiamondAxe.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/InfusedDiamondPickaxe.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/InfusedDiamondShovel.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/InfusedDiamondSword.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/InfusedIronAxe.java (96%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/InfusedIronPickaxe.java (96%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/InfusedIronShovel.java (96%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/InfusedIronSword.java (94%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/InfusedWoodAxe.java (95%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/InfusedWoodPickaxe.java (95%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/InfusedWoodShovel.java (95%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/InfusedWoodSword.java (93%) rename src/main/java/com/arc/bloodarsenal/{ => common}/items/tool/ToolCapabilities.java (99%) rename src/main/java/com/arc/bloodarsenal/{ => common}/misc/CommandDownloadMod.java (97%) rename src/main/java/com/arc/bloodarsenal/{ => common}/misc/ThreadDownloadMod.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/misc/ThreadVersionChecker.java (95%) rename src/main/java/com/arc/bloodarsenal/{ => common}/misc/VersionChecker.java (94%) rename src/main/java/com/arc/bloodarsenal/{ => common}/potion/PotionBloodArsenal.java (94%) rename src/main/java/com/arc/bloodarsenal/{ => common}/rituals/RitualEffectEnchant.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/rituals/RitualEffectFishing.java (96%) rename src/main/java/com/arc/bloodarsenal/{ => common}/rituals/RitualEffectMidas.java (98%) rename src/main/java/com/arc/bloodarsenal/{ => common}/rituals/RitualEffectWithering.java (99%) rename src/main/java/com/arc/bloodarsenal/{ => common}/rituals/RitualRegistry.java (92%) rename src/main/java/com/arc/bloodarsenal/{ => common}/tileentity/FluidTankRestricted.java (94%) rename src/main/java/com/arc/bloodarsenal/{ => common}/tileentity/PacketHandler.java (99%) rename src/main/java/com/arc/bloodarsenal/{ => common}/tileentity/TileCompactedMRS.java (99%) rename src/main/java/com/arc/bloodarsenal/{ => common}/tileentity/TileCompacter.java (73%) rename src/main/java/com/arc/bloodarsenal/{ => common}/tileentity/TileLPMaterializer.java (94%) rename src/main/java/com/arc/bloodarsenal/{ => common}/tileentity/TileLifeInfuser.java (84%) rename src/main/java/com/arc/bloodarsenal/{ => common}/tileentity/TilePortableAltar.java (99%) rename src/main/java/com/arc/bloodarsenal/{ => common}/tileentity/container/ContainerPortableAltar.java (95%) rename src/main/java/com/arc/bloodarsenal/{items => common}/tinkers/BloodArsenalModifiers.java (91%) rename src/main/java/com/arc/bloodarsenal/{items => common}/tinkers/BloodArsenalTinkers.java (53%) create mode 100644 src/main/java/com/arc/bloodarsenal/common/tinkers/IClientCode.java rename src/main/java/com/arc/bloodarsenal/{items => common}/tinkers/ModSoulbound.java (90%) rename src/main/java/com/arc/bloodarsenal/{items => common}/tinkers/PartHelper.java (96%) rename src/main/java/com/arc/bloodarsenal/{items => common}/tinkers/RecipeHelper.java (98%) create mode 100644 src/main/java/com/arc/bloodarsenal/common/tinkers/TConCastingRecipe.java create mode 100644 src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java create mode 100644 src/main/java/com/arc/bloodarsenal/common/tinkers/TextureDerived.java create mode 100644 src/main/java/com/arc/bloodarsenal/common/tinkers/TextureLiquidLava.java create mode 100644 src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBase.java create mode 100644 src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBloodInfusedIron.java delete mode 100644 src/main/java/com/arc/bloodarsenal/entity/ModEntities.java delete mode 100644 src/main/java/com/arc/bloodarsenal/items/armor/LifeImbuedArmor.java create mode 100644 src/main/resources/assets/bloodarsenal/models/armor/life_imbued_layer_1.png create mode 100644 src/main/resources/assets/bloodarsenal/models/armor/life_imbued_layer_2.png delete mode 100644 src/main/resources/assets/bloodarsenal/textures/blocks/lp_materializer.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/blocks/lp_materializer_output.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/blocks/lp_materializer_side.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/life_imbued_boots.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/life_imbued_chestplate.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/life_imbued_helmet.png create mode 100644 src/main/resources/assets/bloodarsenal/textures/items/life_imbued_leggings.png diff --git a/build.gradle b/build.gradle index 6e97d50..f363499 100644 --- a/build.gradle +++ b/build.gradle @@ -59,6 +59,9 @@ repositories { minecraft { version = config.forge_version + "-" + config.mc_version runDir = "eclipse" + + replaceIn "BloodArsenal.java" + replace "@VERSION@", config.mod_version + config.build_number } dependencies { @@ -66,6 +69,7 @@ dependencies { compile "codechicken:CodeChickenCore:" + config.mc_version + "-" + config.ccc_version + ":dev" compile "codechicken:NotEnoughItems:" + config.mc_version + "-" + config.nei_version + ":dev" compile "codechicken:ForgeMultipart:" + config.mc_version + "-" + config.forgeMultipart_version + ":dev" +// compile "mcp.mobius.waila:Waila:" + config.waila_version + "_" + config.mc_version + ":dev" compile "mantle:Mantle:1.7.10-0.3.2.jenkins187:deobf" compile "tconstruct:TConstruct:" + config.mc_version + "-" + config.tconstruct_version + ":deobf" } diff --git a/build.properties b/build.properties index 54de011..43a7862 100644 --- a/build.properties +++ b/build.properties @@ -1,17 +1,15 @@ mod_name=BloodArsenal - package_group=com.arc.bloodarsenal mod_version=1.1 mc_version=1.7.10 - - ccLib_version=1.1.3.138 ccc_version=1.0.7.46 -nei_version=1.0.5.110 +nei_version=1.0.5.111 +tconstruct_version=1.8.5.build959 forgeMultipart_version=1.2.0.345 -tconstruct_version=1.8.5.build958 +waila_version=1.5.11-RC2-NONEI -forge_version=10.13.4.1448 -build_number=12 \ No newline at end of file +forge_version=10.13.4.1481 +build_number=13 diff --git a/src/main/java/com/arc/bloodarsenal/ClientProxy.java b/src/main/java/com/arc/bloodarsenal/client/ClientProxy.java similarity index 59% rename from src/main/java/com/arc/bloodarsenal/ClientProxy.java rename to src/main/java/com/arc/bloodarsenal/client/ClientProxy.java index 99e740f..7eb0850 100644 --- a/src/main/java/com/arc/bloodarsenal/ClientProxy.java +++ b/src/main/java/com/arc/bloodarsenal/client/ClientProxy.java @@ -1,22 +1,25 @@ -package com.arc.bloodarsenal; +package com.arc.bloodarsenal.client; -import com.arc.bloodarsenal.block.ModBlocks; -import com.arc.bloodarsenal.entity.EntityBloodTNT; -import com.arc.bloodarsenal.entity.mob.EntityBloodHound; -import com.arc.bloodarsenal.entity.projectile.EntityBloodBall; -import com.arc.bloodarsenal.entity.projectile.EntityGatlingProjectile; -import com.arc.bloodarsenal.items.ModItems; -import com.arc.bloodarsenal.items.sigil.SigilUtils; -import com.arc.bloodarsenal.misc.VersionChecker; -import com.arc.bloodarsenal.renderer.block.*; -import com.arc.bloodarsenal.renderer.entity.RenderEntityBloodHound; -import com.arc.bloodarsenal.renderer.item.ItemRenderGatling; -import com.arc.bloodarsenal.renderer.item.RenderBow; -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.TileLifeInfuser; -import com.arc.bloodarsenal.tileentity.TilePortableAltar; +import com.arc.bloodarsenal.common.BloodArsenalConfig; +import com.arc.bloodarsenal.common.CommonProxy; +import com.arc.bloodarsenal.common.block.ModBlocks; +import com.arc.bloodarsenal.common.entity.EntityBloodTNT; +import com.arc.bloodarsenal.common.entity.mob.EntityBloodHound; +import com.arc.bloodarsenal.common.entity.projectile.EntityBloodBall; +import com.arc.bloodarsenal.common.entity.projectile.EntityGatlingProjectile; +import com.arc.bloodarsenal.common.items.ModItems; +import com.arc.bloodarsenal.common.items.sigil.SigilUtils; +import com.arc.bloodarsenal.common.misc.VersionChecker; +import com.arc.bloodarsenal.client.renderer.block.*; +import com.arc.bloodarsenal.client.renderer.entity.RenderEntityBloodHound; +import com.arc.bloodarsenal.client.renderer.item.ItemRenderGatling; +import com.arc.bloodarsenal.client.renderer.item.RenderBow; +import com.arc.bloodarsenal.client.renderer.projectile.RenderEntityGatlingProjectile; +import com.arc.bloodarsenal.client.renderer.block.TilePortableAltarRenderer; +import com.arc.bloodarsenal.client.renderer.block.item.TilePortableAltarItemRenderer; +import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser; +import com.arc.bloodarsenal.common.tileentity.TilePortableAltar; +import com.arc.bloodarsenal.common.tinkers.IClientCode; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.client.registry.ClientRegistry; import cpw.mods.fml.client.registry.RenderingRegistry; @@ -49,7 +52,7 @@ public class ClientProxy extends CommonProxy RenderingRegistry.registerEntityRenderingHandler(EntityGatlingProjectile.class, new RenderEntityGatlingProjectile()); RenderingRegistry.registerEntityRenderingHandler(EntityBloodTNT.class, new RenderTNTPrimed()); RenderingRegistry.registerEntityRenderingHandler(EntityBloodBall.class, new RenderSnowball(ModItems.blood_ball)); - RenderingRegistry.registerEntityRenderingHandler(EntityBloodHound.class, new RenderEntityBloodHound(new ModelWolf(), new ModelWolf(), 0.5F)); +// RenderingRegistry.registerEntityRenderingHandler(EntityBloodHound.class, new RenderEntityBloodHound(new ModelWolf(), new ModelWolf(), 0.5F)); MinecraftForgeClient.registerItemRenderer(Item.getItemFromBlock(ModBlocks.life_infuser), new RenderTileLifeInfuser()); @@ -81,4 +84,6 @@ public class ClientProxy extends CommonProxy { MinecraftForgeClient.registerItemRenderer(ItemBlock.getItemFromBlock(ModBlocks.portable_altar), new TilePortableAltarItemRenderer()); } + + public void executeClientCode(IClientCode clientCode) {} } diff --git a/src/main/java/com/arc/bloodarsenal/renderer/block/RenderTileLifeInfuser.java b/src/main/java/com/arc/bloodarsenal/client/renderer/block/RenderTileLifeInfuser.java similarity index 94% rename from src/main/java/com/arc/bloodarsenal/renderer/block/RenderTileLifeInfuser.java rename to src/main/java/com/arc/bloodarsenal/client/renderer/block/RenderTileLifeInfuser.java index f17d564..5abd7f7 100644 --- a/src/main/java/com/arc/bloodarsenal/renderer/block/RenderTileLifeInfuser.java +++ b/src/main/java/com/arc/bloodarsenal/client/renderer/block/RenderTileLifeInfuser.java @@ -1,6 +1,6 @@ -package com.arc.bloodarsenal.renderer.block; +package com.arc.bloodarsenal.client.renderer.block; -import com.arc.bloodarsenal.renderer.model.ModelLifeInfuser; +import com.arc.bloodarsenal.client.renderer.model.ModelLifeInfuser; import cpw.mods.fml.client.FMLClientHandler; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/arc/bloodarsenal/renderer/block/ShaderHelper.java b/src/main/java/com/arc/bloodarsenal/client/renderer/block/ShaderHelper.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/renderer/block/ShaderHelper.java rename to src/main/java/com/arc/bloodarsenal/client/renderer/block/ShaderHelper.java index 11dce7d..a407dc6 100644 --- a/src/main/java/com/arc/bloodarsenal/renderer/block/ShaderHelper.java +++ b/src/main/java/com/arc/bloodarsenal/client/renderer/block/ShaderHelper.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.renderer.block; +package com.arc.bloodarsenal.client.renderer.block; import org.lwjgl.opengl.ARBFragmentShader; import org.lwjgl.opengl.ARBShaderObjects; diff --git a/src/main/java/com/arc/bloodarsenal/renderer/block/TileLifeInfuserRenderer.java b/src/main/java/com/arc/bloodarsenal/client/renderer/block/TileLifeInfuserRenderer.java similarity index 83% rename from src/main/java/com/arc/bloodarsenal/renderer/block/TileLifeInfuserRenderer.java rename to src/main/java/com/arc/bloodarsenal/client/renderer/block/TileLifeInfuserRenderer.java index f4c9a5c..1c6293f 100644 --- a/src/main/java/com/arc/bloodarsenal/renderer/block/TileLifeInfuserRenderer.java +++ b/src/main/java/com/arc/bloodarsenal/client/renderer/block/TileLifeInfuserRenderer.java @@ -1,7 +1,7 @@ -package com.arc.bloodarsenal.renderer.block; +package com.arc.bloodarsenal.client.renderer.block; -import com.arc.bloodarsenal.renderer.model.ModelLifeInfuser; -import com.arc.bloodarsenal.tileentity.TileLifeInfuser; +import com.arc.bloodarsenal.client.renderer.model.ModelLifeInfuser; +import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser; import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.entity.RenderItem; @@ -12,7 +12,6 @@ import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ResourceLocation; -import net.minecraftforge.common.util.ForgeDirection; import org.lwjgl.opengl.GL11; import org.lwjgl.opengl.GL12; @@ -55,11 +54,11 @@ public class TileLifeInfuserRenderer extends TileEntitySpecialRenderer if (tile.getStackInSlot(0) != null) { float scaleFactor = getGhostItemScaleFactor(tile.getStackInSlot(0)); - float rotationAngle = (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL); + float rotationAngle = Minecraft.getMinecraft().gameSettings.fancyGraphics ? (float) (720.0 * (System.currentTimeMillis() & 0x3FFFL) / 0x3FFFL) : 0; EntityItem ghostEntityItem = new EntityItem(tile.getWorldObj()); ghostEntityItem.hoverStart = 0.0F; ghostEntityItem.setEntityItemStack(tile.getStackInSlot(0)); - float displacement = 0.2F; + float displacement = 0.3F; if (ghostEntityItem.getEntityItem().getItem() instanceof ItemBlock) { @@ -103,22 +102,22 @@ public class TileLifeInfuserRenderer extends TileEntitySpecialRenderer switch (customRenderItem.getMiniBlockCount(itemStack, (byte) 1)) { case 1: - return 0.90F; + return 1.20F; case 2: - return 0.90F; + return 1.20F; case 3: - return 0.90F; + return 1.20F; case 4: - return 0.90F; + return 1.20F; case 5: - return 0.80F; + return 1.10F; default: - return 0.90F; + return 1.20F; } } else @@ -126,19 +125,19 @@ public class TileLifeInfuserRenderer extends TileEntitySpecialRenderer switch (customRenderItem.getMiniItemCount(itemStack, (byte) 1)) { case 1: - return 0.65F; + return 0.95F; case 2: - return 0.65F; + return 0.95F; case 3: - return 0.65F; + return 0.95F; case 4: - return 0.65F; + return 0.95F; default: - return 0.65F; + return 0.95F; } } } diff --git a/src/main/java/com/arc/bloodarsenal/renderer/block/TilePortableAltarRenderer.java b/src/main/java/com/arc/bloodarsenal/client/renderer/block/TilePortableAltarRenderer.java similarity index 97% rename from src/main/java/com/arc/bloodarsenal/renderer/block/TilePortableAltarRenderer.java rename to src/main/java/com/arc/bloodarsenal/client/renderer/block/TilePortableAltarRenderer.java index b5a9ece..d7081c4 100644 --- a/src/main/java/com/arc/bloodarsenal/renderer/block/TilePortableAltarRenderer.java +++ b/src/main/java/com/arc/bloodarsenal/client/renderer/block/TilePortableAltarRenderer.java @@ -1,7 +1,7 @@ -package com.arc.bloodarsenal.renderer.block; +package com.arc.bloodarsenal.client.renderer.block; -import com.arc.bloodarsenal.renderer.model.ModelPortableBloodAltar; -import com.arc.bloodarsenal.tileentity.TilePortableAltar; +import com.arc.bloodarsenal.client.renderer.model.ModelPortableBloodAltar; +import com.arc.bloodarsenal.common.tileentity.TilePortableAltar; import net.minecraft.client.renderer.entity.RenderItem; import net.minecraft.client.renderer.entity.RenderManager; import net.minecraft.client.renderer.tileentity.TileEntitySpecialRenderer; diff --git a/src/main/java/com/arc/bloodarsenal/renderer/block/item/TilePortableAltarItemRenderer.java b/src/main/java/com/arc/bloodarsenal/client/renderer/block/item/TilePortableAltarItemRenderer.java similarity index 94% rename from src/main/java/com/arc/bloodarsenal/renderer/block/item/TilePortableAltarItemRenderer.java rename to src/main/java/com/arc/bloodarsenal/client/renderer/block/item/TilePortableAltarItemRenderer.java index f907c8c..7da2523 100644 --- a/src/main/java/com/arc/bloodarsenal/renderer/block/item/TilePortableAltarItemRenderer.java +++ b/src/main/java/com/arc/bloodarsenal/client/renderer/block/item/TilePortableAltarItemRenderer.java @@ -1,6 +1,6 @@ -package com.arc.bloodarsenal.renderer.block.item; +package com.arc.bloodarsenal.client.renderer.block.item; -import com.arc.bloodarsenal.renderer.model.ModelPortableBloodAltar; +import com.arc.bloodarsenal.client.renderer.model.ModelPortableBloodAltar; import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.renderer.RenderBlocks; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/arc/bloodarsenal/renderer/entity/RenderEntityBloodHound.java b/src/main/java/com/arc/bloodarsenal/client/renderer/entity/RenderEntityBloodHound.java similarity index 95% rename from src/main/java/com/arc/bloodarsenal/renderer/entity/RenderEntityBloodHound.java rename to src/main/java/com/arc/bloodarsenal/client/renderer/entity/RenderEntityBloodHound.java index b718a89..396ad48 100644 --- a/src/main/java/com/arc/bloodarsenal/renderer/entity/RenderEntityBloodHound.java +++ b/src/main/java/com/arc/bloodarsenal/client/renderer/entity/RenderEntityBloodHound.java @@ -1,13 +1,12 @@ -package com.arc.bloodarsenal.renderer.entity; +package com.arc.bloodarsenal.client.renderer.entity; -import com.arc.bloodarsenal.entity.mob.EntityBloodHound; +import com.arc.bloodarsenal.common.entity.mob.EntityBloodHound; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.entity.RenderLiving; import net.minecraft.entity.Entity; import net.minecraft.entity.EntityLivingBase; -import net.minecraft.entity.passive.EntitySheep; import net.minecraft.util.ResourceLocation; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/arc/bloodarsenal/renderer/item/ItemRenderGatling.java b/src/main/java/com/arc/bloodarsenal/client/renderer/item/ItemRenderGatling.java similarity index 93% rename from src/main/java/com/arc/bloodarsenal/renderer/item/ItemRenderGatling.java rename to src/main/java/com/arc/bloodarsenal/client/renderer/item/ItemRenderGatling.java index 9cce1af..1207f67 100644 --- a/src/main/java/com/arc/bloodarsenal/renderer/item/ItemRenderGatling.java +++ b/src/main/java/com/arc/bloodarsenal/client/renderer/item/ItemRenderGatling.java @@ -1,7 +1,7 @@ -package com.arc.bloodarsenal.renderer.item; +package com.arc.bloodarsenal.client.renderer.item; -import com.arc.bloodarsenal.BloodArsenalConfig; -import com.arc.bloodarsenal.renderer.model.ModelEnergyGatling; +import com.arc.bloodarsenal.common.BloodArsenalConfig; +import com.arc.bloodarsenal.client.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/item/RenderBow.java b/src/main/java/com/arc/bloodarsenal/client/renderer/item/RenderBow.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/renderer/item/RenderBow.java rename to src/main/java/com/arc/bloodarsenal/client/renderer/item/RenderBow.java index 444cf80..4978f64 100644 --- a/src/main/java/com/arc/bloodarsenal/renderer/item/RenderBow.java +++ b/src/main/java/com/arc/bloodarsenal/client/renderer/item/RenderBow.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.renderer.item; +package com.arc.bloodarsenal.client.renderer.item; import cpw.mods.fml.relauncher.ReflectionHelper; import net.minecraft.client.renderer.ItemRenderer; diff --git a/src/main/java/com/arc/bloodarsenal/renderer/model/ModelEnergyGatling.java b/src/main/java/com/arc/bloodarsenal/client/renderer/model/ModelEnergyGatling.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/renderer/model/ModelEnergyGatling.java rename to src/main/java/com/arc/bloodarsenal/client/renderer/model/ModelEnergyGatling.java index d3ba78b..55d5193 100644 --- a/src/main/java/com/arc/bloodarsenal/renderer/model/ModelEnergyGatling.java +++ b/src/main/java/com/arc/bloodarsenal/client/renderer/model/ModelEnergyGatling.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.renderer.model; +package com.arc.bloodarsenal.client.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/ModelLifeInfuser.java b/src/main/java/com/arc/bloodarsenal/client/renderer/model/ModelLifeInfuser.java similarity index 96% rename from src/main/java/com/arc/bloodarsenal/renderer/model/ModelLifeInfuser.java rename to src/main/java/com/arc/bloodarsenal/client/renderer/model/ModelLifeInfuser.java index 73048a7..1c81e4e 100644 --- a/src/main/java/com/arc/bloodarsenal/renderer/model/ModelLifeInfuser.java +++ b/src/main/java/com/arc/bloodarsenal/client/renderer/model/ModelLifeInfuser.java @@ -1,10 +1,9 @@ -package com.arc.bloodarsenal.renderer.model; +package com.arc.bloodarsenal.client.renderer.model; -import com.arc.bloodarsenal.tileentity.TileLifeInfuser; +import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser; import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.model.ModelBase; import net.minecraft.client.model.ModelRenderer; -import net.minecraft.entity.Entity; import net.minecraft.util.ResourceLocation; import net.minecraftforge.client.model.IModelCustom; import org.lwjgl.opengl.GL11; diff --git a/src/main/java/com/arc/bloodarsenal/renderer/model/ModelPortableBloodAltar.java b/src/main/java/com/arc/bloodarsenal/client/renderer/model/ModelPortableBloodAltar.java similarity index 96% rename from src/main/java/com/arc/bloodarsenal/renderer/model/ModelPortableBloodAltar.java rename to src/main/java/com/arc/bloodarsenal/client/renderer/model/ModelPortableBloodAltar.java index 397b595..abfbce8 100644 --- a/src/main/java/com/arc/bloodarsenal/renderer/model/ModelPortableBloodAltar.java +++ b/src/main/java/com/arc/bloodarsenal/client/renderer/model/ModelPortableBloodAltar.java @@ -1,7 +1,7 @@ -package com.arc.bloodarsenal.renderer.model; +package com.arc.bloodarsenal.client.renderer.model; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import com.arc.bloodarsenal.tileentity.TilePortableAltar; +import com.arc.bloodarsenal.common.tileentity.TilePortableAltar; import cpw.mods.fml.client.FMLClientHandler; import net.minecraft.client.model.ModelBase; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/com/arc/bloodarsenal/renderer/model/ModelVampireCostume.java b/src/main/java/com/arc/bloodarsenal/client/renderer/model/ModelVampireCostume.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/renderer/model/ModelVampireCostume.java rename to src/main/java/com/arc/bloodarsenal/client/renderer/model/ModelVampireCostume.java index 3265b7f..2aa1d35 100644 --- a/src/main/java/com/arc/bloodarsenal/renderer/model/ModelVampireCostume.java +++ b/src/main/java/com/arc/bloodarsenal/client/renderer/model/ModelVampireCostume.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.renderer.model; +package com.arc.bloodarsenal.client.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/client/renderer/projectile/RenderEntityBloodBall.java similarity index 96% rename from src/main/java/com/arc/bloodarsenal/renderer/projectile/RenderEntityBloodBall.java rename to src/main/java/com/arc/bloodarsenal/client/renderer/projectile/RenderEntityBloodBall.java index b1f91cf..fdcbc0f 100644 --- a/src/main/java/com/arc/bloodarsenal/renderer/projectile/RenderEntityBloodBall.java +++ b/src/main/java/com/arc/bloodarsenal/client/renderer/projectile/RenderEntityBloodBall.java @@ -1,8 +1,7 @@ -package com.arc.bloodarsenal.renderer.projectile; +package com.arc.bloodarsenal.client.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; diff --git a/src/main/java/com/arc/bloodarsenal/renderer/projectile/RenderEntityGatlingProjectile.java b/src/main/java/com/arc/bloodarsenal/client/renderer/projectile/RenderEntityGatlingProjectile.java similarity index 91% rename from src/main/java/com/arc/bloodarsenal/renderer/projectile/RenderEntityGatlingProjectile.java rename to src/main/java/com/arc/bloodarsenal/client/renderer/projectile/RenderEntityGatlingProjectile.java index ab731dc..a779296 100644 --- a/src/main/java/com/arc/bloodarsenal/renderer/projectile/RenderEntityGatlingProjectile.java +++ b/src/main/java/com/arc/bloodarsenal/client/renderer/projectile/RenderEntityGatlingProjectile.java @@ -1,7 +1,7 @@ -package com.arc.bloodarsenal.renderer.projectile; +package com.arc.bloodarsenal.client.renderer.projectile; -import com.arc.bloodarsenal.BloodArsenalConfig; -import com.arc.bloodarsenal.entity.projectile.EntityGatlingProjectile; +import com.arc.bloodarsenal.common.BloodArsenalConfig; +import com.arc.bloodarsenal.common.entity.projectile.EntityGatlingProjectile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.Tessellator; diff --git a/src/main/java/com/arc/bloodarsenal/BloodArsenal.java b/src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java similarity index 81% rename from src/main/java/com/arc/bloodarsenal/BloodArsenal.java rename to src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java index 109e5f6..261efde 100644 --- a/src/main/java/com/arc/bloodarsenal/BloodArsenal.java +++ b/src/main/java/com/arc/bloodarsenal/common/BloodArsenal.java @@ -1,17 +1,16 @@ -package com.arc.bloodarsenal; +package com.arc.bloodarsenal.common; -import com.arc.bloodarsenal.entity.ModEntities; -import com.arc.bloodarsenal.entity.ModLivingDropsEvent; -import com.arc.bloodarsenal.gui.GuiHandler; -import com.arc.bloodarsenal.items.ModItems; -import com.arc.bloodarsenal.items.sigil.SigilUtils; -import com.arc.bloodarsenal.items.sigil.holding.AHPacketHandler; -import com.arc.bloodarsenal.items.tinkers.BloodArsenalModifiers; -import com.arc.bloodarsenal.items.tinkers.BloodArsenalTinkers; -import com.arc.bloodarsenal.items.tinkers.RecipeHelper; -import com.arc.bloodarsenal.misc.CommandDownloadMod; -import com.arc.bloodarsenal.potion.PotionBloodArsenal; -import com.arc.bloodarsenal.rituals.RitualRegistry; +import com.arc.bloodarsenal.common.entity.ModEntities; +import com.arc.bloodarsenal.common.entity.ModLivingDropsEvent; +import com.arc.bloodarsenal.common.gui.GuiHandler; +import com.arc.bloodarsenal.common.items.ModItems; +import com.arc.bloodarsenal.common.items.sigil.holding.AHPacketHandler; +import com.arc.bloodarsenal.common.tinkers.BloodArsenalModifiers; +import com.arc.bloodarsenal.common.tinkers.BloodArsenalTinkers; +import com.arc.bloodarsenal.common.tinkers.RecipeHelper; +import com.arc.bloodarsenal.common.misc.CommandDownloadMod; +import com.arc.bloodarsenal.common.potion.PotionBloodArsenal; +import com.arc.bloodarsenal.common.rituals.RitualRegistry; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Mod; @@ -23,7 +22,7 @@ import cpw.mods.fml.common.event.FMLServerStartingEvent; import cpw.mods.fml.common.network.NetworkRegistry; import net.minecraft.creativetab.CreativeTabs; import net.minecraft.item.Item; -import com.arc.bloodarsenal.block.ModBlocks; +import com.arc.bloodarsenal.common.block.ModBlocks; import net.minecraft.item.ItemArmor; import net.minecraft.potion.Potion; import net.minecraft.util.DamageSource; @@ -37,13 +36,13 @@ import java.lang.reflect.Field; import java.lang.reflect.Modifier; import java.util.Calendar; -@Mod(modid = BloodArsenal.MODID, version = BloodArsenal.VERSION, name = "Blood Arsenal", dependencies = "required-after:AWWayofTime;after:NotEnoughItems;after:Baubles;after:TConstruct", guiFactory = "com.arc.bloodarsenal.gui.ConfigGuiFactory") +@Mod(modid = BloodArsenal.MODID, version = BloodArsenal.VERSION, name = "Blood Arsenal", dependencies = "required-after:AWWayofTime;after:NotEnoughItems;after:Baubles;after:TConstruct;after:Waila", guiFactory = "com.arc.bloodarsenal.common.gui.ConfigGuiFactory") public class BloodArsenal { public final static String MODID = "BloodArsenal"; - public final static String VERSION = "1.1-12"; + public final static String VERSION = "@VERSION@"; - @SidedProxy(clientSide = "com.arc.bloodarsenal.ClientProxy", serverSide = "com.arc.bloodarsenal.CommonProxy") + @SidedProxy(clientSide = "com.arc.bloodarsenal.client.ClientProxy", serverSide = "com.arc.bloodarsenal.common.CommonProxy") public static CommonProxy proxy; @Mod.Instance("BloodArsenal") public static BloodArsenal instance; @@ -53,12 +52,12 @@ public class BloodArsenal public static Potion swimming; public static Item.ToolMaterial infusedWood = EnumHelper.addToolMaterial("InfusedWood", 1, 0, 5.0F, 1.0F, 0); - public static Item.ToolMaterial infusedIron = EnumHelper.addToolMaterial("InfusedIron", 4, 0, 11.0F, 4.0F, 0); - public static Item.ToolMaterial infusedDiamond = EnumHelper.addToolMaterial("InfusedDiamond", 6, 0, 17.0F, 9.0F, 0); - public static Item.ToolMaterial infusedNetherium = EnumHelper.addToolMaterial("InfusedNetherium", 9, 0, 31.0F, 18.0F, 0); + public static Item.ToolMaterial infusedIron = EnumHelper.addToolMaterial("InfusedIron", 3, 0, 11.0F, 4.0F, 0); + public static Item.ToolMaterial infusedDiamond = EnumHelper.addToolMaterial("InfusedDiamond", 5, 0, 17.0F, 9.0F, 0); + public static Item.ToolMaterial infusedNetherium = EnumHelper.addToolMaterial("InfusedNetherium", 8, 0, 31.0F, 18.0F, 0); public static ItemArmor.ArmorMaterial vampireArmor = EnumHelper.addArmorMaterial("VampireArmor", 0, new int[]{2, 7, 4, 2}, 0); - public static ItemArmor.ArmorMaterial lifeImbuedArmor = EnumHelper.addArmorMaterial("ImbuedArmor", 0, new int[]{4, 10, 8, 4}, 7); + public static ItemArmor.ArmorMaterial lifeImbuedArmor = EnumHelper.addArmorMaterial("ImbuedArmor", 0, new int[]{4, 13, 9, 4}, 8); public static ItemArmor.ArmorMaterial glassArmor = EnumHelper.addArmorMaterial("GlassArmor", 0, new int[]{1, 4, 3, 1}, 4); public static Logger logger = LogManager.getLogger(MODID); diff --git a/src/main/java/com/arc/bloodarsenal/BloodArsenalConfig.java b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalConfig.java similarity index 97% rename from src/main/java/com/arc/bloodarsenal/BloodArsenalConfig.java rename to src/main/java/com/arc/bloodarsenal/common/BloodArsenalConfig.java index a555807..701ad78 100644 --- a/src/main/java/com/arc/bloodarsenal/BloodArsenalConfig.java +++ b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalConfig.java @@ -1,8 +1,5 @@ -package com.arc.bloodarsenal; +package com.arc.bloodarsenal.common; -import com.arc.bloodarsenal.items.ModItems; -import net.minecraft.item.Item; -import net.minecraft.item.ItemStack; import net.minecraftforge.common.config.Configuration; import java.io.File; diff --git a/src/main/java/com/arc/bloodarsenal/BloodArsenalEventHooks.java b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalEventHooks.java similarity index 96% rename from src/main/java/com/arc/bloodarsenal/BloodArsenalEventHooks.java rename to src/main/java/com/arc/bloodarsenal/common/BloodArsenalEventHooks.java index c43294e..dc48652 100644 --- a/src/main/java/com/arc/bloodarsenal/BloodArsenalEventHooks.java +++ b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalEventHooks.java @@ -1,15 +1,15 @@ -package com.arc.bloodarsenal; +package com.arc.bloodarsenal.common; 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.armor.GlassArmor; -import com.arc.bloodarsenal.items.bauble.EmpoweredSacrificeAmulet; -import com.arc.bloodarsenal.items.bauble.EmpoweredSelfSacrificeAmulet; -import com.arc.bloodarsenal.items.bauble.SacrificeAmulet; -import com.arc.bloodarsenal.items.bauble.SelfSacrificeAmulet; +import com.arc.bloodarsenal.common.items.ModItems; +import com.arc.bloodarsenal.common.items.armor.GlassArmor; +import com.arc.bloodarsenal.common.items.bauble.EmpoweredSacrificeAmulet; +import com.arc.bloodarsenal.common.items.bauble.EmpoweredSelfSacrificeAmulet; +import com.arc.bloodarsenal.common.items.bauble.SacrificeAmulet; +import com.arc.bloodarsenal.common.items.bauble.SelfSacrificeAmulet; import cpw.mods.fml.client.event.ConfigChangedEvent; import cpw.mods.fml.common.Loader; import cpw.mods.fml.common.Optional; diff --git a/src/main/java/com/arc/bloodarsenal/BloodArsenalRecipes.java b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalRecipes.java similarity index 96% rename from src/main/java/com/arc/bloodarsenal/BloodArsenalRecipes.java rename to src/main/java/com/arc/bloodarsenal/common/BloodArsenalRecipes.java index 6cd21a7..8fb6c8a 100644 --- a/src/main/java/com/arc/bloodarsenal/BloodArsenalRecipes.java +++ b/src/main/java/com/arc/bloodarsenal/common/BloodArsenalRecipes.java @@ -1,22 +1,15 @@ -package com.arc.bloodarsenal; +package com.arc.bloodarsenal.common; import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipeRegistry; import WayofTime.alchemicalWizardry.api.bindingRegistry.BindingRegistry; import WayofTime.alchemicalWizardry.api.items.ShapedBloodOrbRecipe; -import baubles.api.BaublesApi; -import baubles.common.Baubles; -import baubles.common.Config; -import com.arc.bloodarsenal.block.ModBlocks; -import com.arc.bloodarsenal.items.ModItems; -import cpw.mods.fml.common.Loader; +import com.arc.bloodarsenal.common.block.ModBlocks; +import com.arc.bloodarsenal.common.items.ModItems; import cpw.mods.fml.common.Optional; -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.minecraft.item.crafting.CraftingManager; -import net.minecraft.item.crafting.ShapedRecipes; import net.minecraftforge.oredict.OreDictionary; import net.minecraftforge.oredict.ShapedOreRecipe; import net.minecraftforge.oredict.ShapelessOreRecipe; @@ -101,6 +94,7 @@ public class BloodArsenalRecipes addOreDictBloodOrbRecipe(new ItemStack(ModItems.glass_leggings), "aaa", "aba", "a a", 'a', ModItems.glass_shard, 'b', apprenticeOrb); addOreDictBloodOrbRecipe(new ItemStack(ModItems.glass_boots), "a a", "aba", 'a', ModItems.glass_shard, 'b', apprenticeOrb); addOreDictBloodOrbRecipe(new ItemStack(ModItems.transparent_orb), "aba", "bcb", "ded", 'a', ModBlocks.blood_stained_glass, 'b', Blocks.glass, 'c', transcendentOrb, 'd', ModItems.blood_burned_string, 'e', WayofTime.alchemicalWizardry.ModItems.divinationSigil); + addOreDictBloodOrbRecipe(new ItemStack(ModItems.life_imbued_helmet), "aba", "aca", "aaa", 'a', ModItems.blood_infused_iron, 'b', magicianOrb, 'c', Items.iron_chestplate); addOreDictRecipe(new ItemStack(ModBlocks.blood_stone), "aaa", "aaa", "aaa", 'a', blankSlate); addOreDictRecipe(new ItemStack(ModBlocks.blood_stone, 1, 1), "aaa", "aaa", "aaa", 'a', reinforcedSlate); @@ -112,6 +106,7 @@ public class BloodArsenalRecipes addOreDictRecipe(new ItemStack(ModBlocks.blood_infused_glowstone), "aa", "aa", 'a', ModItems.blood_infused_glowstone_dust); addOreDictRecipe(new ItemStack(ModBlocks.blood_lamp), "aba", "bcb", "aba", 'a', ModItems.blood_infused_iron, 'b', ModBlocks.blood_stained_glass, 'c', ModBlocks.blood_infused_glowstone); addOreDictRecipe(new ItemStack(ModBlocks.blood_infused_diamond_block), "aaa", "aaa", "aaa", 'a', ModItems.blood_infused_diamond_bound); + addOreDictRecipe(new ItemStack(ModBlocks.blood_torch), "a", "b", 'a', ModItems.bound_igniter, 'b', ModItems.blood_infused_stick); addOreDictRecipe(new ItemStack(ModItems.blood_infused_stick), "a", "a", 'a', ModBlocks.blood_infused_planks); addOreDictRecipe(new ItemStack(ModItems.blood_infused_pickaxe_wood), "aaa", " b ", " b ", 'a', ModBlocks.blood_infused_planks, 'b', ModItems.blood_infused_stick); addOreDictRecipe(new ItemStack(ModItems.blood_infused_axe_wood), "aa ", "ab ", " b ", 'a', ModBlocks.blood_infused_planks, 'b', ModItems.blood_infused_stick); @@ -149,8 +144,8 @@ public class BloodArsenalRecipes addOreDictBloodOrbRecipe(new ItemStack(ModItems.vampire_ring), "ab ", "bcb", " b ", 'a', ModItems.blood_infused_diamond_bound, 'b', Blocks.stone, 'c', masterOrb); addOreDictBloodOrbRecipe(new ItemStack(ModItems.sacrifice_amulet), "aaa", "aba", "caa", 'a', ModItems.blood_burned_string, 'b', weakOrb, 'c', Items.gold_ingot); addOreDictBloodOrbRecipe(new ItemStack(ModItems.self_sacrifice_amulet), "aaa", "aba", "caa", 'a', ModItems.blood_burned_string, 'b', weakOrb, 'c', Items.glowstone_dust); - addOreDictBloodOrbRecipe(new ItemStack(ModItems.empowered_self_sacrifice_amulet), "aba", "cdc", "ecf", 'a', ModItems.blood_infused_glowstone_dust, 'b', Items.blaze_rod, 'c', WayofTime.alchemicalWizardry.ModBlocks.runeOfSelfSacrifice, 'd', ModItems.self_sacrifice_amulet, 'e', Blocks.gold_block, 'f', ModItems.amorphic_catalyst); - addOreDictBloodOrbRecipe(new ItemStack(ModItems.empowered_sacrifice_amulet), "aba", "cdc", "ecf", 'a', ModItems.blood_infused_glowstone_dust, 'b', Items.blaze_rod, 'c', WayofTime.alchemicalWizardry.ModBlocks.runeOfSacrifice, 'd', ModItems.sacrifice_amulet, 'e', Blocks.glowstone, 'f', ModItems.amorphic_catalyst); + addOreDictBloodOrbRecipe(new ItemStack(ModItems.empowered_self_sacrifice_amulet), "aba", "cdc", "ecf", 'a', ModItems.blood_infused_glowstone_dust, 'b', Items.blaze_rod, 'c', WayofTime.alchemicalWizardry.ModBlocks.runeOfSelfSacrifice, 'd', ModItems.self_sacrifice_amulet, 'e', Blocks.glowstone, 'f', ModItems.amorphic_catalyst); + addOreDictBloodOrbRecipe(new ItemStack(ModItems.empowered_sacrifice_amulet), "aba", "cdc", "ecf", 'a', ModItems.blood_infused_glowstone_dust, 'b', Items.blaze_rod, 'c', WayofTime.alchemicalWizardry.ModBlocks.runeOfSacrifice, 'd', ModItems.sacrifice_amulet, 'e', Blocks.gold_block, 'f', ModItems.amorphic_catalyst); } public static void addOreDictRecipe(ItemStack output, Object... recipe) diff --git a/src/main/java/com/arc/bloodarsenal/CommonProxy.java b/src/main/java/com/arc/bloodarsenal/common/CommonProxy.java similarity index 61% rename from src/main/java/com/arc/bloodarsenal/CommonProxy.java rename to src/main/java/com/arc/bloodarsenal/common/CommonProxy.java index 27d8190..ea36c94 100644 --- a/src/main/java/com/arc/bloodarsenal/CommonProxy.java +++ b/src/main/java/com/arc/bloodarsenal/common/CommonProxy.java @@ -1,9 +1,10 @@ -package com.arc.bloodarsenal; +package com.arc.bloodarsenal.common; -import com.arc.bloodarsenal.entity.EntityBloodTNT; -import com.arc.bloodarsenal.entity.mob.EntityBloodHound; -import com.arc.bloodarsenal.entity.projectile.EntityBloodBall; -import com.arc.bloodarsenal.entity.projectile.EntityGatlingProjectile; +import com.arc.bloodarsenal.common.entity.EntityBloodTNT; +import com.arc.bloodarsenal.common.entity.mob.EntityBloodHound; +import com.arc.bloodarsenal.common.entity.projectile.EntityBloodBall; +import com.arc.bloodarsenal.common.entity.projectile.EntityGatlingProjectile; +import com.arc.bloodarsenal.common.tinkers.IClientCode; import cpw.mods.fml.common.registry.EntityRegistry; import net.minecraft.world.World; @@ -33,11 +34,13 @@ public class CommonProxy EntityRegistry.registerModEntity(EntityGatlingProjectile.class, "gatlingProjectile", 0, BloodArsenal.instance, 128, 5, true); EntityRegistry.registerModEntity(EntityBloodTNT.class, "bloodTNT", 1, BloodArsenal.instance, 64, 5, true); EntityRegistry.registerModEntity(EntityBloodBall.class, "bloodBall", 2, BloodArsenal.instance, 128, 5, true); - EntityRegistry.registerModEntity(EntityBloodHound.class, "BloodHound", 3, BloodArsenal.instance, 96, 3, true); +// EntityRegistry.registerModEntity(EntityBloodHound.class, "BloodHound", 3, BloodArsenal.instance, 96, 3, true); } public void initRendering() { //TODO Auto-generated stub } + + public void executeClientCode(IClientCode clientCode) {} } diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockBloodCake.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodCake.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/block/BlockBloodCake.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockBloodCake.java index 2be0889..5de58d0 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockBloodCake.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodCake.java @@ -1,7 +1,7 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import com.arc.bloodarsenal.BloodArsenalConfig; +import com.arc.bloodarsenal.common.BloodArsenalConfig; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedDiamond.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedDiamond.java similarity index 92% rename from src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedDiamond.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedDiamond.java index a24a531..ae1f87a 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedDiamond.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedDiamond.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedGlowstone.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedGlowstone.java similarity index 85% rename from src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedGlowstone.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedGlowstone.java index 006f631..e116104 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedGlowstone.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedGlowstone.java @@ -1,6 +1,6 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; -import com.arc.bloodarsenal.items.ModItems; +import com.arc.bloodarsenal.common.items.ModItems; import net.minecraft.block.BlockGlowstone; import net.minecraft.block.material.Material; import net.minecraft.item.Item; diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedPlanks.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedPlanks.java similarity index 87% rename from src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedPlanks.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedPlanks.java index be315a0..16fa6d3 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedPlanks.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedPlanks.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedWood.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedWood.java similarity index 95% rename from src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedWood.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedWood.java index aaab654..7ea879d 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockBloodInfusedWood.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodInfusedWood.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockBloodLamp.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodLamp.java similarity index 88% rename from src/main/java/com/arc/bloodarsenal/block/BlockBloodLamp.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockBloodLamp.java index 6e72468..7b05590 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockBloodLamp.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodLamp.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockBloodStainedGlass.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedGlass.java similarity index 91% rename from src/main/java/com/arc/bloodarsenal/block/BlockBloodStainedGlass.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedGlass.java index 90fc267..9d907dc 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockBloodStainedGlass.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedGlass.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -18,19 +18,23 @@ public class BlockBloodStainedGlass extends BlockBreakable setStepSound(soundTypeGlass); } + @Override @SideOnly(Side.CLIENT) public int getRenderBlockPass() { return 1; } + @Override public boolean renderAsNormalBlock() { return false; } + @Override public int quantityDropped(Random par1Random) {return 0;} + @Override protected boolean canSilkHarvest() {return true;} @Override diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockBloodStainedIce.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedIce.java similarity index 96% rename from src/main/java/com/arc/bloodarsenal/block/BlockBloodStainedIce.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedIce.java index ad87e37..9a9dd0a 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockBloodStainedIce.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedIce.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -32,18 +32,21 @@ public class BlockBloodStainedIce extends BlockBreakable setStepSound(soundTypeGlass); } + @Override @SideOnly(Side.CLIENT) public int getRenderBlockPass() { return 1; } + @Override @SideOnly(Side.CLIENT) public boolean shouldSideBeRendered(IBlockAccess par1IBlockAccess, int par2, int par3, int par4, int par5) { return super.shouldSideBeRendered(par1IBlockAccess, par2, par3, par4, 1 - par5); } + @Override public void harvestBlock(World par1World, EntityPlayer par2EntityPlayer, int par3, int par4, int par5, int par6) { par2EntityPlayer.addStat(StatList.mineBlockStatArray[Block.getIdFromBlock(this)], 1); @@ -81,11 +84,13 @@ public class BlockBloodStainedIce extends BlockBreakable } } + @Override public int quantityDropped(Random par1Random) { return 0; } + @Override public void updateTick(World par1World, int par2, int par3, int par4, Random par5) { if (par1World.getSavedLightValue(EnumSkyBlock.Block, par2, par3, par4) > 11 - getLightOpacity()) @@ -101,6 +106,7 @@ public class BlockBloodStainedIce extends BlockBreakable } } + @Override public int getMobilityFlag() { return 0; diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockBloodStainedPackedIce.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedPackedIce.java similarity index 91% rename from src/main/java/com/arc/bloodarsenal/block/BlockBloodStainedPackedIce.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedPackedIce.java index 283a595..4a7df24 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockBloodStainedPackedIce.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStainedPackedIce.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockBloodStone.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStone.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/block/BlockBloodStone.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStone.java index 3e72d75..3787405 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockBloodStone.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodStone.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockBloodTNT.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTNT.java similarity index 95% rename from src/main/java/com/arc/bloodarsenal/block/BlockBloodTNT.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTNT.java index 626560c..5fe32c1 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockBloodTNT.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTNT.java @@ -1,6 +1,6 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; -import com.arc.bloodarsenal.entity.EntityBloodTNT; +import com.arc.bloodarsenal.common.entity.EntityBloodTNT; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; @@ -30,13 +30,15 @@ public class BlockBloodTNT extends Block setHardness(0.0F); setStepSound(soundTypeGrass); } - + + @Override @SideOnly(Side.CLIENT) public IIcon getIcon(int par1, int par2) { return par1 == 0 ? bottom : (par1 == 1 ? top : blockIcon); } + @Override public void onBlockAdded(World par1World, int par2, int par3, int par4) { super.onBlockAdded(par1World, par2, par3, par4); @@ -48,6 +50,7 @@ public class BlockBloodTNT extends Block } } + @Override public void onNeighborBlockChange(World par1World, int par2, int par3, int par4, Block par5Block) { if (par1World.isBlockIndirectlyGettingPowered(par2, par3, par4)) @@ -56,12 +59,14 @@ public class BlockBloodTNT extends Block par1World.setBlockToAir(par2, par3, par4); } } - + + @Override public int quantityDropped(Random par1Random) { return 1; } + @Override public void onBlockDestroyedByExplosion(World par1World, int par2, int par3, int par4, Explosion par5Explosion) { if (!par1World.isRemote) @@ -72,6 +77,7 @@ public class BlockBloodTNT extends Block } } + @Override public void onBlockDestroyedByPlayer(World par1World, int par2, int par3, int par4, int par5) { spawnTNT(par1World, par2, par3, par4, par5, (EntityLivingBase) null); @@ -90,6 +96,7 @@ public class BlockBloodTNT extends Block } } + @Override public boolean onBlockActivated(World par1World, int par2, int par3, int par4, EntityPlayer par5, int par6, float par7, float par8, float par9) { if (par5.getCurrentEquippedItem() != null && par5.getCurrentEquippedItem().getItem() == Items.flint_and_steel) @@ -105,6 +112,7 @@ public class BlockBloodTNT extends Block } } + @Override public void onEntityCollidedWithBlock(World par1World, int par2, int par3, int par4, Entity par5Entity) { if (par5Entity instanceof EntityArrow && !par1World.isRemote) @@ -119,11 +127,13 @@ public class BlockBloodTNT extends Block } } + @Override public boolean canDropFromExplosion(Explosion par1Explosion) { return false; } + @Override @SideOnly(Side.CLIENT) public void registerBlockIcons(IIconRegister iconRegister) { diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockBloodTorch.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTorch.java similarity index 85% rename from src/main/java/com/arc/bloodarsenal/block/BlockBloodTorch.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTorch.java index 3cc45bd..f822877 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockBloodTorch.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBloodTorch.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; import net.minecraft.block.BlockTorch; diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockBurnedString.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockBurnedString.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/block/BlockBurnedString.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockBurnedString.java index 30cc845..b68f3c1 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockBurnedString.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockBurnedString.java @@ -1,6 +1,6 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; -import com.arc.bloodarsenal.items.ModItems; +import com.arc.bloodarsenal.common.items.ModItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockCompactedMRS.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockCompactedMRS.java similarity index 87% rename from src/main/java/com/arc/bloodarsenal/block/BlockCompactedMRS.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockCompactedMRS.java index 4cf7478..d7eeaa9 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockCompactedMRS.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockCompactedMRS.java @@ -1,9 +1,9 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; import WayofTime.alchemicalWizardry.api.rituals.Rituals; import WayofTime.alchemicalWizardry.common.block.BlockMasterStone; import WayofTime.alchemicalWizardry.common.items.ActivationCrystal; -import com.arc.bloodarsenal.tileentity.TileCompactedMRS; +import com.arc.bloodarsenal.common.tileentity.TileCompactedMRS; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; @@ -15,6 +15,7 @@ import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; import net.minecraft.tileentity.TileEntity; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.Explosion; import net.minecraft.world.World; @@ -178,6 +179,30 @@ public class BlockCompactedMRS extends BlockMasterStone } } + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) + { + Item item = getItem(world, x, y, z); + + if (item == null) + { + return null; + } + + TileEntity tile = world.getTileEntity(x, y, z); + + if (tile instanceof TileCompactedMRS) + { + ItemStack drop = new ItemStack(this); + NBTTagCompound tag = new NBTTagCompound(); + ((TileCompactedMRS) tile).writeNBTOnHarvest(tag); + drop.setTagCompound(tag); + return drop; + } + + return null; + } + @Override public TileEntity createNewTileEntity(World world, int meta) { diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockCompacter.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/block/BlockCompacter.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java index 912b0a0..e2bc70e 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockCompacter.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockCompacter.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; @@ -11,9 +11,9 @@ import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.AltarUpgradeCompone import WayofTime.alchemicalWizardry.common.bloodAltarUpgrade.UpgradedAltars; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; import WayofTime.alchemicalWizardry.common.tileEntity.TEMasterStone; -import com.arc.bloodarsenal.tileentity.TileCompactedMRS; -import com.arc.bloodarsenal.tileentity.TileCompacter; -import com.arc.bloodarsenal.tileentity.TilePortableAltar; +import com.arc.bloodarsenal.common.tileentity.TileCompactedMRS; +import com.arc.bloodarsenal.common.tileentity.TileCompacter; +import com.arc.bloodarsenal.common.tileentity.TilePortableAltar; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockInfusedIron.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockInfusedIron.java similarity index 92% rename from src/main/java/com/arc/bloodarsenal/block/BlockInfusedIron.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockInfusedIron.java index 6e2e254..b981ae1 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockInfusedIron.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockInfusedIron.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockLPMaterializer.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockLPMaterializer.java similarity index 80% rename from src/main/java/com/arc/bloodarsenal/block/BlockLPMaterializer.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockLPMaterializer.java index 53a2116..8cc55ce 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockLPMaterializer.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockLPMaterializer.java @@ -1,12 +1,15 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding; -import com.arc.bloodarsenal.tileentity.TileLPMaterializer; +import com.arc.bloodarsenal.common.tileentity.TileLPMaterializer; +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.init.Items; @@ -14,6 +17,8 @@ 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.IBlockAccess; import net.minecraft.world.World; import net.minecraftforge.fluids.FluidContainerRegistry; @@ -21,6 +26,11 @@ import java.util.Random; public class BlockLPMaterializer extends BlockContainer { + @SideOnly(Side.CLIENT) + private IIcon output; + @SideOnly(Side.CLIENT) + private IIcon side; + public BlockLPMaterializer() { super(Material.iron); @@ -28,6 +38,42 @@ public class BlockLPMaterializer extends BlockContainer setResistance(14.0F); } + @Override + @SideOnly(Side.CLIENT) + public IIcon getIcon(int par1, int par2) + { + return par1 == 0 || par1 == 1 ? output : side; + } + + @Override + @SideOnly(Side.CLIENT) + public int getRenderBlockPass() + { + return 1; + } + + @Override + @SideOnly(Side.CLIENT) + public boolean shouldSideBeRendered(IBlockAccess blockSide, int x, int y, int z, int side) + { + return true; + } + + @Override + public boolean isOpaqueCube() + { + return false; + } + + @Override + @SideOnly(Side.CLIENT) + public void registerBlockIcons(IIconRegister iconRegister) + { + blockIcon = iconRegister.registerIcon("BloodArsenal:lp_materializer_output"); + output = iconRegister.registerIcon("BloodArsenal:lp_materializer_output"); + side = iconRegister.registerIcon("BloodArsenal:lp_materializer_side"); + } + @Override public boolean onBlockActivated(World world, int x, int y, int z, EntityPlayer player, int idk, float what, float these, float are) { diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockLifeInfuser.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockLifeInfuser.java similarity index 86% rename from src/main/java/com/arc/bloodarsenal/block/BlockLifeInfuser.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockLifeInfuser.java index 39871cb..a6fc2d4 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockLifeInfuser.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockLifeInfuser.java @@ -1,8 +1,8 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; import WayofTime.alchemicalWizardry.ModItems; import WayofTime.alchemicalWizardry.common.items.sigil.SigilOfHolding; -import com.arc.bloodarsenal.tileentity.TileLifeInfuser; +import com.arc.bloodarsenal.common.tileentity.TileLifeInfuser; import net.minecraft.block.Block; import net.minecraft.block.BlockContainer; import net.minecraft.block.material.Material; @@ -78,13 +78,16 @@ public class BlockLifeInfuser extends BlockContainer } else if (playerItem.getItem().equals(ModItems.bucketLife)) { - if (!player.capabilities.isCreativeMode) + if (tileEntity.getFluid().amount <= tileEntity.capacity - FluidContainerRegistry.BUCKET_VOLUME) { - --playerItem.stackSize; - player.inventory.addItemStackToInventory(bucket); - } + if (!player.capabilities.isCreativeMode) + { + --playerItem.stackSize; + player.inventory.addItemStackToInventory(bucket); + } - tileEntity.fillMainTank(FluidContainerRegistry.BUCKET_VOLUME); + tileEntity.fillMainTank(FluidContainerRegistry.BUCKET_VOLUME); + } } else if (tileEntity.getStackInSlot(0) == null) { @@ -148,22 +151,6 @@ public class BlockLifeInfuser extends BlockContainer } } - @Override - public void randomDisplayTick(World world, int x, int y, int z, Random rand) - { - TileLifeInfuser tileEntity = (TileLifeInfuser) world.getTileEntity(x, y, z); - - if (!tileEntity.isActive()) - { - return; - } - - if (rand.nextInt(3) != 0) - { - return; - } - } - @Override public TileEntity createNewTileEntity(World world, int meta) { @@ -187,9 +174,4 @@ public class BlockLifeInfuser extends BlockContainer { return false; } - - @Override - public void registerBlockIcons(IIconRegister par1IconRegister) { - // NO-OP - } } diff --git a/src/main/java/com/arc/bloodarsenal/block/BlockPortableAltar.java b/src/main/java/com/arc/bloodarsenal/common/block/BlockPortableAltar.java similarity index 92% rename from src/main/java/com/arc/bloodarsenal/block/BlockPortableAltar.java rename to src/main/java/com/arc/bloodarsenal/common/block/BlockPortableAltar.java index a6cd381..570bef1 100644 --- a/src/main/java/com/arc/bloodarsenal/block/BlockPortableAltar.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/BlockPortableAltar.java @@ -1,10 +1,10 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.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.tileentity.TilePortableAltar; +import com.arc.bloodarsenal.common.tileentity.TilePortableAltar; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; @@ -15,10 +15,12 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.item.EntityItem; 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.tileentity.TileEntity; import net.minecraft.util.IIcon; +import net.minecraft.util.MovingObjectPosition; import net.minecraft.world.World; import java.util.ArrayList; @@ -310,6 +312,30 @@ public class BlockPortableAltar extends BlockContainer return true; } + @Override + public ItemStack getPickBlock(MovingObjectPosition target, World world, int x, int y, int z, EntityPlayer player) + { + Item item = getItem(world, x, y, z); + + if (item == null) + { + return null; + } + + TileEntity tile = world.getTileEntity(x, y, z); + + if (tile instanceof TilePortableAltar) + { + ItemStack drop = new ItemStack(this); + NBTTagCompound tag = new NBTTagCompound(); + ((TilePortableAltar) tile).writeNBTOnHarvest(tag); + drop.setTagCompound(tag); + return drop; + } + + return null; + } + @Override public void randomDisplayTick(World world, int x, int y, int z, Random rand) { diff --git a/src/main/java/com/arc/bloodarsenal/block/ModBlocks.java b/src/main/java/com/arc/bloodarsenal/common/block/ModBlocks.java similarity index 90% rename from src/main/java/com/arc/bloodarsenal/block/ModBlocks.java rename to src/main/java/com/arc/bloodarsenal/common/block/ModBlocks.java index 9e7dbd8..cc93092 100644 --- a/src/main/java/com/arc/bloodarsenal/block/ModBlocks.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/ModBlocks.java @@ -1,11 +1,11 @@ -package com.arc.bloodarsenal.block; +package com.arc.bloodarsenal.common.block; -import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.BloodArsenalConfig; -import com.arc.bloodarsenal.items.block.BloodStoneBlock; -import com.arc.bloodarsenal.items.block.CompactedMRSBlock; -import com.arc.bloodarsenal.items.block.PortableAltarBlock; -import com.arc.bloodarsenal.tileentity.*; +import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenalConfig; +import com.arc.bloodarsenal.common.items.block.BloodStoneBlock; +import com.arc.bloodarsenal.common.items.block.CompactedMRSBlock; +import com.arc.bloodarsenal.common.items.block.PortableAltarBlock; +import com.arc.bloodarsenal.common.tileentity.*; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; @@ -34,7 +34,7 @@ public class ModBlocks public static Block compacted_mrs; public static Block block_burned_string; - private static ArrayList blocksNotToBeRegistered = new ArrayList(); + public static ArrayList blocksNotToBeRegistered = new ArrayList(); public static void init() { diff --git a/src/main/java/com/arc/bloodarsenal/block/fluid/MoltenBloodInfusedIron.java b/src/main/java/com/arc/bloodarsenal/common/block/fluid/MoltenBloodInfusedIron.java similarity index 94% rename from src/main/java/com/arc/bloodarsenal/block/fluid/MoltenBloodInfusedIron.java rename to src/main/java/com/arc/bloodarsenal/common/block/fluid/MoltenBloodInfusedIron.java index a60d28b..7521398 100644 --- a/src/main/java/com/arc/bloodarsenal/block/fluid/MoltenBloodInfusedIron.java +++ b/src/main/java/com/arc/bloodarsenal/common/block/fluid/MoltenBloodInfusedIron.java @@ -1,6 +1,6 @@ -package com.arc.bloodarsenal.block.fluid; +package com.arc.bloodarsenal.common.block.fluid; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/arc/bloodarsenal/entity/EntityBloodTNT.java b/src/main/java/com/arc/bloodarsenal/common/entity/EntityBloodTNT.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/entity/EntityBloodTNT.java rename to src/main/java/com/arc/bloodarsenal/common/entity/EntityBloodTNT.java index 4eda6e9..7a03ab0 100644 --- a/src/main/java/com/arc/bloodarsenal/entity/EntityBloodTNT.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/EntityBloodTNT.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.entity; +package com.arc.bloodarsenal.common.entity; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/arc/bloodarsenal/common/entity/ModEntities.java b/src/main/java/com/arc/bloodarsenal/common/entity/ModEntities.java new file mode 100644 index 0000000..14e617e --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/common/entity/ModEntities.java @@ -0,0 +1,11 @@ +package com.arc.bloodarsenal.common.entity; + +public class ModEntities +{ + public static void init() + { + int id = 0; + + + } +} diff --git a/src/main/java/com/arc/bloodarsenal/entity/ModLivingDropsEvent.java b/src/main/java/com/arc/bloodarsenal/common/entity/ModLivingDropsEvent.java similarity index 95% rename from src/main/java/com/arc/bloodarsenal/entity/ModLivingDropsEvent.java rename to src/main/java/com/arc/bloodarsenal/common/entity/ModLivingDropsEvent.java index ea3549e..db3b147 100644 --- a/src/main/java/com/arc/bloodarsenal/entity/ModLivingDropsEvent.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/ModLivingDropsEvent.java @@ -1,6 +1,6 @@ -package com.arc.bloodarsenal.entity; +package com.arc.bloodarsenal.common.entity; -import com.arc.bloodarsenal.items.ModItems; +import com.arc.bloodarsenal.common.items.ModItems; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import net.minecraft.entity.monster.EntityZombie; import net.minecraft.entity.passive.EntityVillager; diff --git a/src/main/java/com/arc/bloodarsenal/entity/ai/AIAttackOnCollide.java b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIAttackOnCollide.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/entity/ai/AIAttackOnCollide.java rename to src/main/java/com/arc/bloodarsenal/common/entity/ai/AIAttackOnCollide.java index 3edc36b..7ea7c8e 100644 --- a/src/main/java/com/arc/bloodarsenal/entity/ai/AIAttackOnCollide.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIAttackOnCollide.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.entity.ai; +package com.arc.bloodarsenal.common.entity.ai; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/arc/bloodarsenal/entity/ai/AIFollowOwner.java b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIFollowOwner.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/entity/ai/AIFollowOwner.java rename to src/main/java/com/arc/bloodarsenal/common/entity/ai/AIFollowOwner.java index 95e001f..33e7585 100644 --- a/src/main/java/com/arc/bloodarsenal/entity/ai/AIFollowOwner.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIFollowOwner.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.entity.ai; +package com.arc.bloodarsenal.common.entity.ai; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAIBase; diff --git a/src/main/java/com/arc/bloodarsenal/entity/ai/AIHurtByTarget.java b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIHurtByTarget.java similarity index 97% rename from src/main/java/com/arc/bloodarsenal/entity/ai/AIHurtByTarget.java rename to src/main/java/com/arc/bloodarsenal/common/entity/ai/AIHurtByTarget.java index 8646795..0136f1d 100644 --- a/src/main/java/com/arc/bloodarsenal/entity/ai/AIHurtByTarget.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIHurtByTarget.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.entity.ai; +package com.arc.bloodarsenal.common.entity.ai; import net.minecraft.entity.EntityCreature; import net.minecraft.entity.ai.EntityAITarget; diff --git a/src/main/java/com/arc/bloodarsenal/entity/ai/AILeapAtTarget.java b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AILeapAtTarget.java similarity index 97% rename from src/main/java/com/arc/bloodarsenal/entity/ai/AILeapAtTarget.java rename to src/main/java/com/arc/bloodarsenal/common/entity/ai/AILeapAtTarget.java index ff1119c..19901ca 100644 --- a/src/main/java/com/arc/bloodarsenal/entity/ai/AILeapAtTarget.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AILeapAtTarget.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.entity.ai; +package com.arc.bloodarsenal.common.entity.ai; import net.minecraft.entity.EntityLiving; import net.minecraft.entity.EntityLivingBase; diff --git a/src/main/java/com/arc/bloodarsenal/entity/ai/AIOwnerHurtByTarget.java b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIOwnerHurtByTarget.java similarity index 97% rename from src/main/java/com/arc/bloodarsenal/entity/ai/AIOwnerHurtByTarget.java rename to src/main/java/com/arc/bloodarsenal/common/entity/ai/AIOwnerHurtByTarget.java index eced421..02c6d92 100644 --- a/src/main/java/com/arc/bloodarsenal/entity/ai/AIOwnerHurtByTarget.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIOwnerHurtByTarget.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.entity.ai; +package com.arc.bloodarsenal.common.entity.ai; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAITarget; diff --git a/src/main/java/com/arc/bloodarsenal/entity/ai/AIOwnerHurtTarget.java b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIOwnerHurtTarget.java similarity index 97% rename from src/main/java/com/arc/bloodarsenal/entity/ai/AIOwnerHurtTarget.java rename to src/main/java/com/arc/bloodarsenal/common/entity/ai/AIOwnerHurtTarget.java index 81cec03..0662d99 100644 --- a/src/main/java/com/arc/bloodarsenal/entity/ai/AIOwnerHurtTarget.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/ai/AIOwnerHurtTarget.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.entity.ai; +package com.arc.bloodarsenal.common.entity.ai; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.ai.EntityAITarget; diff --git a/src/main/java/com/arc/bloodarsenal/entity/mob/EntityBloodHound.java b/src/main/java/com/arc/bloodarsenal/common/entity/mob/EntityBloodHound.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/entity/mob/EntityBloodHound.java rename to src/main/java/com/arc/bloodarsenal/common/entity/mob/EntityBloodHound.java index 59947ad..06826e8 100644 --- a/src/main/java/com/arc/bloodarsenal/entity/mob/EntityBloodHound.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/mob/EntityBloodHound.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.entity.mob; +package com.arc.bloodarsenal.common.entity.mob; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -11,7 +11,6 @@ import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.*; import net.minecraft.entity.monster.EntityCreeper; import net.minecraft.entity.monster.EntityGhast; -import net.minecraft.entity.passive.EntityAnimal; import net.minecraft.entity.passive.EntityHorse; import net.minecraft.entity.passive.EntityTameable; import net.minecraft.entity.passive.EntityWolf; @@ -22,7 +21,6 @@ import net.minecraft.item.Item; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; -import net.minecraft.pathfinding.PathEntity; import net.minecraft.util.DamageSource; import net.minecraft.util.MathHelper; import net.minecraft.world.World; diff --git a/src/main/java/com/arc/bloodarsenal/entity/projectile/EntityBloodBall.java b/src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityBloodBall.java similarity index 94% rename from src/main/java/com/arc/bloodarsenal/entity/projectile/EntityBloodBall.java rename to src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityBloodBall.java index fae7ee0..b9f63f3 100644 --- a/src/main/java/com/arc/bloodarsenal/entity/projectile/EntityBloodBall.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityBloodBall.java @@ -1,8 +1,7 @@ -package com.arc.bloodarsenal.entity.projectile; +package com.arc.bloodarsenal.common.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; diff --git a/src/main/java/com/arc/bloodarsenal/entity/projectile/EntityGatlingProjectile.java b/src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityGatlingProjectile.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/entity/projectile/EntityGatlingProjectile.java rename to src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityGatlingProjectile.java index 6063126..c7f4992 100644 --- a/src/main/java/com/arc/bloodarsenal/entity/projectile/EntityGatlingProjectile.java +++ b/src/main/java/com/arc/bloodarsenal/common/entity/projectile/EntityGatlingProjectile.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.entity.projectile; +package com.arc.bloodarsenal.common.entity.projectile; import cpw.mods.fml.common.registry.IThrowableEntity; import cpw.mods.fml.relauncher.Side; diff --git a/src/main/java/com/arc/bloodarsenal/gui/ConfigGui.java b/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGui.java similarity index 89% rename from src/main/java/com/arc/bloodarsenal/gui/ConfigGui.java rename to src/main/java/com/arc/bloodarsenal/common/gui/ConfigGui.java index bbb551f..dde1f4d 100644 --- a/src/main/java/com/arc/bloodarsenal/gui/ConfigGui.java +++ b/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGui.java @@ -1,6 +1,6 @@ -package com.arc.bloodarsenal.gui; +package com.arc.bloodarsenal.common.gui; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.client.config.*; import net.minecraft.client.gui.GuiScreen; import net.minecraftforge.common.config.ConfigCategory; @@ -8,9 +8,8 @@ import net.minecraftforge.common.config.ConfigElement; import java.util.ArrayList; import java.util.List; -import java.util.regex.Pattern; -import static com.arc.bloodarsenal.BloodArsenalConfig.*; +import static com.arc.bloodarsenal.common.BloodArsenalConfig.*; public class ConfigGui extends GuiConfig { diff --git a/src/main/java/com/arc/bloodarsenal/gui/ConfigGuiFactory.java b/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGuiFactory.java similarity index 93% rename from src/main/java/com/arc/bloodarsenal/gui/ConfigGuiFactory.java rename to src/main/java/com/arc/bloodarsenal/common/gui/ConfigGuiFactory.java index 32a5cbc..cedd9cf 100644 --- a/src/main/java/com/arc/bloodarsenal/gui/ConfigGuiFactory.java +++ b/src/main/java/com/arc/bloodarsenal/common/gui/ConfigGuiFactory.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.gui; +package com.arc.bloodarsenal.common.gui; import cpw.mods.fml.client.IModGuiFactory; import net.minecraft.client.Minecraft; diff --git a/src/main/java/com/arc/bloodarsenal/gui/GuiHandler.java b/src/main/java/com/arc/bloodarsenal/common/gui/GuiHandler.java similarity index 74% rename from src/main/java/com/arc/bloodarsenal/gui/GuiHandler.java rename to src/main/java/com/arc/bloodarsenal/common/gui/GuiHandler.java index 83d657f..8c18d78 100644 --- a/src/main/java/com/arc/bloodarsenal/gui/GuiHandler.java +++ b/src/main/java/com/arc/bloodarsenal/common/gui/GuiHandler.java @@ -1,8 +1,8 @@ -package com.arc.bloodarsenal.gui; +package com.arc.bloodarsenal.common.gui; -import com.arc.bloodarsenal.items.sigil.holding.ContainerAugmentedHolding; -import com.arc.bloodarsenal.items.sigil.holding.GuiAugmentedHolding; -import com.arc.bloodarsenal.items.sigil.holding.InventoryAugmentedHolding; +import com.arc.bloodarsenal.common.items.sigil.holding.ContainerAugmentedHolding; +import com.arc.bloodarsenal.common.items.sigil.holding.GuiAugmentedHolding; +import com.arc.bloodarsenal.common.items.sigil.holding.InventoryAugmentedHolding; import cpw.mods.fml.common.network.IGuiHandler; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.world.World; diff --git a/src/main/java/com/arc/bloodarsenal/items/BucketHandler.java b/src/main/java/com/arc/bloodarsenal/common/items/BucketHandler.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/items/BucketHandler.java rename to src/main/java/com/arc/bloodarsenal/common/items/BucketHandler.java index b359d55..4db0d33 100644 --- a/src/main/java/com/arc/bloodarsenal/items/BucketHandler.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/BucketHandler.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.items; +package com.arc.bloodarsenal.common.items; import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.common.registry.GameRegistry; diff --git a/src/main/java/com/arc/bloodarsenal/items/ItemBloodArsenal.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodArsenal.java similarity index 95% rename from src/main/java/com/arc/bloodarsenal/items/ItemBloodArsenal.java rename to src/main/java/com/arc/bloodarsenal/common/items/ItemBloodArsenal.java index de0e512..17340ff 100644 --- a/src/main/java/com/arc/bloodarsenal/items/ItemBloodArsenal.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodArsenal.java @@ -1,10 +1,7 @@ -package com.arc.bloodarsenal.items; +package com.arc.bloodarsenal.common.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; diff --git a/src/main/java/com/arc/bloodarsenal/items/ItemBloodBall.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodBall.java similarity index 84% rename from src/main/java/com/arc/bloodarsenal/items/ItemBloodBall.java rename to src/main/java/com/arc/bloodarsenal/common/items/ItemBloodBall.java index f4c7f15..c15c814 100644 --- a/src/main/java/com/arc/bloodarsenal/items/ItemBloodBall.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodBall.java @@ -1,7 +1,7 @@ -package com.arc.bloodarsenal.items; +package com.arc.bloodarsenal.common.items; -import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.entity.projectile.EntityBloodBall; +import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.entity.projectile.EntityBloodBall; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/arc/bloodarsenal/items/ItemBloodCookie.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodCookie.java similarity index 92% rename from src/main/java/com/arc/bloodarsenal/items/ItemBloodCookie.java rename to src/main/java/com/arc/bloodarsenal/common/items/ItemBloodCookie.java index 9bff84f..637ffaf 100644 --- a/src/main/java/com/arc/bloodarsenal/items/ItemBloodCookie.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodCookie.java @@ -1,6 +1,6 @@ -package com.arc.bloodarsenal.items; +package com.arc.bloodarsenal.common.items; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/arc/bloodarsenal/items/ItemBloodMoney.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodMoney.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/items/ItemBloodMoney.java rename to src/main/java/com/arc/bloodarsenal/common/items/ItemBloodMoney.java index c94f59f..f4f7a14 100644 --- a/src/main/java/com/arc/bloodarsenal/items/ItemBloodMoney.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodMoney.java @@ -1,9 +1,9 @@ -package com.arc.bloodarsenal.items; +package com.arc.bloodarsenal.common.items; import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/com/arc/bloodarsenal/items/ItemBloodOrange.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodOrange.java similarity index 88% rename from src/main/java/com/arc/bloodarsenal/items/ItemBloodOrange.java rename to src/main/java/com/arc/bloodarsenal/common/items/ItemBloodOrange.java index 7ba1521..d2ef040 100644 --- a/src/main/java/com/arc/bloodarsenal/items/ItemBloodOrange.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ItemBloodOrange.java @@ -1,6 +1,6 @@ -package com.arc.bloodarsenal.items; +package com.arc.bloodarsenal.common.items; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/arc/bloodarsenal/items/ItemJuiceAndCookies.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemJuiceAndCookies.java similarity index 92% rename from src/main/java/com/arc/bloodarsenal/items/ItemJuiceAndCookies.java rename to src/main/java/com/arc/bloodarsenal/common/items/ItemJuiceAndCookies.java index 5b479e5..5735995 100644 --- a/src/main/java/com/arc/bloodarsenal/items/ItemJuiceAndCookies.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ItemJuiceAndCookies.java @@ -1,6 +1,6 @@ -package com.arc.bloodarsenal.items; +package com.arc.bloodarsenal.common.items; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemFood; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/arc/bloodarsenal/items/ItemSoulBooster.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemSoulBooster.java similarity index 96% rename from src/main/java/com/arc/bloodarsenal/items/ItemSoulBooster.java rename to src/main/java/com/arc/bloodarsenal/common/items/ItemSoulBooster.java index 78d0002..c2faa21 100644 --- a/src/main/java/com/arc/bloodarsenal/items/ItemSoulBooster.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ItemSoulBooster.java @@ -1,10 +1,8 @@ -package com.arc.bloodarsenal.items; +package com.arc.bloodarsenal.common.items; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; +import com.arc.bloodarsenal.common.BloodArsenal; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; diff --git a/src/main/java/com/arc/bloodarsenal/items/ItemSoulNullifier.java b/src/main/java/com/arc/bloodarsenal/common/items/ItemSoulNullifier.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/items/ItemSoulNullifier.java rename to src/main/java/com/arc/bloodarsenal/common/items/ItemSoulNullifier.java index f3544d0..91d3022 100644 --- a/src/main/java/com/arc/bloodarsenal/items/ItemSoulNullifier.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ItemSoulNullifier.java @@ -1,8 +1,8 @@ -package com.arc.bloodarsenal.items; +package com.arc.bloodarsenal.common.items; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.relauncher.ReflectionHelper; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/arc/bloodarsenal/items/ModItems.java b/src/main/java/com/arc/bloodarsenal/common/items/ModItems.java similarity index 87% rename from src/main/java/com/arc/bloodarsenal/items/ModItems.java rename to src/main/java/com/arc/bloodarsenal/common/items/ModItems.java index 8a36a31..b2c2fc7 100644 --- a/src/main/java/com/arc/bloodarsenal/items/ModItems.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/ModItems.java @@ -1,16 +1,17 @@ -package com.arc.bloodarsenal.items; +package com.arc.bloodarsenal.common.items; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.BloodArsenalConfig; -import com.arc.bloodarsenal.block.ModBlocks; -import com.arc.bloodarsenal.items.armor.GlassArmor; -import com.arc.bloodarsenal.items.armor.VampireCostume; -import com.arc.bloodarsenal.items.bauble.*; -import com.arc.bloodarsenal.items.orb.TransparentOrb; -import com.arc.bloodarsenal.items.sigil.*; -import com.arc.bloodarsenal.items.sigil.holding.SigilAugmentedHolding; -import com.arc.bloodarsenal.items.tool.*; +import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenalConfig; +import com.arc.bloodarsenal.common.block.ModBlocks; +import com.arc.bloodarsenal.common.items.armor.GlassArmor; +import com.arc.bloodarsenal.common.items.armor.LifeImbuedArmor; +import com.arc.bloodarsenal.common.items.armor.VampireCostume; +import com.arc.bloodarsenal.common.items.bauble.*; +import com.arc.bloodarsenal.common.items.orb.TransparentOrb; +import com.arc.bloodarsenal.common.items.sigil.*; +import com.arc.bloodarsenal.common.items.sigil.holding.SigilAugmentedHolding; +import com.arc.bloodarsenal.common.items.tool.*; import cpw.mods.fml.common.Optional; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.item.Item; @@ -79,8 +80,13 @@ public class ModItems public static Item glass_leggings; public static Item glass_boots; public static Item transparent_orb; + public static Item life_imbued_helmet; + public static Item life_imbued_chestplate; + public static Item life_imbued_leggings; + public static Item life_imbued_boots; + public static Item burned_tome; - private static ArrayList itemsNotToBeRegistered = new ArrayList(); + public static ArrayList itemsNotToBeRegistered = new ArrayList(); public static void init() { @@ -138,17 +144,21 @@ public class ModItems glass_leggings = registerItem(new GlassArmor(2), "glass_leggings"); glass_boots = registerItem(new GlassArmor(3), "glass_boots"); transparent_orb = registerItem(new TransparentOrb(30000000), "transparent_orb"); - - vampire_ring = new VampireRing(); - self_sacrifice_amulet = new SelfSacrificeAmulet(); - sacrifice_amulet = new SacrificeAmulet(); - empowered_sacrifice_amulet = new EmpoweredSacrificeAmulet(); - empowered_self_sacrifice_amulet = new EmpoweredSelfSacrificeAmulet(); + life_imbued_helmet = registerItem(new LifeImbuedArmor(0), "life_imbued_helmet"); + life_imbued_chestplate = registerItem(new LifeImbuedArmor(1), "life_imbued_chestplate"); + life_imbued_leggings = registerItem(new LifeImbuedArmor(2), "life_imbued_leggings"); + life_imbued_boots = registerItem(new LifeImbuedArmor(3), "life_imbued_boots"); } @Optional.Method(modid = "Baubles") public static void registerBaubles() { + vampire_ring = new VampireRing(); + self_sacrifice_amulet = new SelfSacrificeAmulet(); + sacrifice_amulet = new SacrificeAmulet(); + empowered_sacrifice_amulet = new EmpoweredSacrificeAmulet(); + empowered_self_sacrifice_amulet = new EmpoweredSelfSacrificeAmulet(); + GameRegistry.registerItem(vampire_ring, "vampire_ring"); GameRegistry.registerItem(self_sacrifice_amulet, "self_sacrifice_amulet"); GameRegistry.registerItem(sacrifice_amulet, "sacrifice_amulet"); diff --git a/src/main/java/com/arc/bloodarsenal/items/MoltenBucket.java b/src/main/java/com/arc/bloodarsenal/common/items/MoltenBucket.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/items/MoltenBucket.java rename to src/main/java/com/arc/bloodarsenal/common/items/MoltenBucket.java index 63d3d25..d537fb2 100644 --- a/src/main/java/com/arc/bloodarsenal/items/MoltenBucket.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/MoltenBucket.java @@ -1,6 +1,6 @@ -package com.arc.bloodarsenal.items; +package com.arc.bloodarsenal.common.items; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import com.google.common.collect.HashBiMap; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/arc/bloodarsenal/items/armor/GlassArmor.java b/src/main/java/com/arc/bloodarsenal/common/items/armor/GlassArmor.java similarity index 83% rename from src/main/java/com/arc/bloodarsenal/items/armor/GlassArmor.java rename to src/main/java/com/arc/bloodarsenal/common/items/armor/GlassArmor.java index 4988c2a..657825e 100644 --- a/src/main/java/com/arc/bloodarsenal/items/armor/GlassArmor.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/armor/GlassArmor.java @@ -1,7 +1,7 @@ -package com.arc.bloodarsenal.items.armor; +package com.arc.bloodarsenal.common.items.armor; -import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.items.ModItems; +import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.items.ModItems; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemArmor; @@ -28,7 +28,7 @@ public class GlassArmor extends ItemArmor @Override public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) { - if (this == ModItems.glass_helmet || this == ModItems.glass_chestplate || this == ModItems.glass_boots) + if (this != ModItems.glass_leggings) { return "BloodArsenal:models/armor/glass_layer_1.png"; } diff --git a/src/main/java/com/arc/bloodarsenal/common/items/armor/LifeImbuedArmor.java b/src/main/java/com/arc/bloodarsenal/common/items/armor/LifeImbuedArmor.java new file mode 100644 index 0000000..0e4b15a --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/common/items/armor/LifeImbuedArmor.java @@ -0,0 +1,277 @@ +package com.arc.bloodarsenal.common.items.armor; + +import WayofTime.alchemicalWizardry.AlchemicalWizardry; +import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.items.ModItems; +import com.arc.bloodarsenal.common.items.tool.IFillable; +import net.minecraft.creativetab.CreativeTabs; +import net.minecraft.enchantment.Enchantment; +import net.minecraft.enchantment.EnchantmentHelper; +import net.minecraft.entity.Entity; +import net.minecraft.entity.EntityLivingBase; +import net.minecraft.entity.player.EntityPlayer; +import net.minecraft.item.EnumRarity; +import net.minecraft.item.Item; +import net.minecraft.item.ItemArmor; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.DamageSource; +import net.minecraft.util.EnumChatFormatting; +import net.minecraft.util.MathHelper; +import net.minecraft.util.StatCollector; +import net.minecraft.world.World; +import net.minecraftforge.common.ISpecialArmor; + +import java.util.List; +import java.util.Random; + +public class LifeImbuedArmor extends ItemArmor implements ISpecialArmor, IFillable +{ + private int maxLP = 100000; + private String LP_STORED = "LPStored"; + public double absorbRatio = 0.5; + + public LifeImbuedArmor(int armorType) + { + super(BloodArsenal.lifeImbuedArmor, 0, armorType); + setCreativeTab(BloodArsenal.BA_TAB); + } + + /** IFillable */ + @Override + public int getMaxLP() + { + return maxLP; + } + + @Override + public void incrementLPStored(ItemStack itemStack, int incrementAmount) + { + setCurrentLPStored(itemStack, getLPStored(itemStack) + incrementAmount); + } + + @Override + public int getLPStored(ItemStack container) + { + if (container.stackTagCompound == null) + { + setCurrentLPStored(container, 0); + } + + return container.stackTagCompound.getInteger(LP_STORED); + } + + @Override + public void addInformation(ItemStack par1ItemStack, EntityPlayer par2EntityPlayer, List par3List, boolean par4) + { + par3List.add(StatCollector.translateToLocal("tooltip.armor.lifeImbuedArmor")); + par3List.add(StatCollector.translateToLocal("tooltip.fillable.currentAmount") + " " + EnumChatFormatting.RED + par1ItemStack.getTagCompound().getInteger(LP_STORED)); + } + + @Override + public String getArmorTexture(ItemStack stack, Entity entity, int slot, String type) + { + if (this != ModItems.life_imbued_leggings) + { + return "BloodArsenal:models/armor/life_imbued_layer_1.png"; + } + else + { + return "BloodArsenal:models/armor/life_imbued_layer_2.png"; + } + } + + @Override + public boolean getIsRepairable(ItemStack itemToRepair, ItemStack stack) + { + return false; + } + + @Override + public ItemStack onItemRightClick(ItemStack par1ItemStack, World par2World, EntityPlayer par3EntityPlayer) + { + return super.onItemRightClick(par1ItemStack, par2World, par3EntityPlayer); + } + + @Override + public int getMaxDamage(ItemStack stack) + { + return maxLP; + } + + @Override + public EnumRarity getRarity(ItemStack stack) + { + return EnumRarity.rare; + } + + @Override + public void setDamage(ItemStack stack, int damage) + { + super.setDamage(stack, 0); + } + + @Override + public boolean isDamaged(ItemStack stack) + { + return true; + } + + @Override + public int getDisplayDamage(ItemStack stack) + { + if (stack.stackTagCompound == null) + { + setCurrentLPStored(stack, 0); + } + + return maxLP - stack.stackTagCompound.getInteger(LP_STORED); + } + + @Override + public boolean showDurabilityBar(ItemStack stack) + { + return stack.stackTagCompound == null || !stack.stackTagCompound.getBoolean("CreativeTab"); + } + + @Override + public void getSubItems(Item item, CreativeTabs tab, List list) + { + list.add(setCurrentLPStored(new ItemStack(item, 1, 0), 0)); + list.add(setCurrentLPStored(new ItemStack(item, 1, 0), maxLP)); + } + + private ItemStack setCurrentLPStored(ItemStack itemStack, int amount) + { + if (itemStack.stackTagCompound == null) + { + itemStack.setTagCompound(new NBTTagCompound()); + } + + itemStack.getTagCompound().setInteger(LP_STORED, amount); + return itemStack; + } + + protected int getBaseAbsorption() + { + return 18; + } + + protected int getAbsorptionRatio() + { + switch (armorType) + { + case 0: + return 15; + case 1: + return 40; + case 2: + return 30; + case 3: + return 15; + } + + return 0; + } + + @Override + public int getArmorDisplay(EntityPlayer player, ItemStack armor, int slot) + { + if (getLPStored(armor) >= getLPPerDamage(armor)) + { + return Math.min(getBaseAbsorption(), 20) * getAbsorptionRatio() / 100; + } + return 0; + } + + @Override + public ArmorProperties getProperties(EntityLivingBase player, ItemStack armor, DamageSource source, double damage, int slot) + { + if (source.isUnblockable()) + { + int absorbMax = getLPPerDamage(armor) > 0 ? 25 * getLPStored(armor) / getLPPerDamage(armor) : 0; + return new ArmorProperties(0, absorbRatio * getArmorMaterial().getDamageReductionAmount(armorType) * 0.025, absorbMax); + } + + int absorbMax = getLPPerDamage(armor) > 0 ? 25 * getLPStored(armor) / getLPPerDamage(armor) : 0; + return new ArmorProperties(0, absorbRatio * getArmorMaterial().getDamageReductionAmount(armorType) * 0.05, absorbMax); + } + + @Override + public void damageArmor(EntityLivingBase entity, ItemStack armor, DamageSource source, int damage, int slot) + { + subtractLP(armor, damage * getLPPerDamage(armor), false); + } + + protected int getLPPerDamage(ItemStack stack) + { + int unbreakingLevel = MathHelper.clamp_int(EnchantmentHelper.getEnchantmentLevel(Enchantment.unbreaking.effectId, stack), 0, 4); + return 100 * (5 - unbreakingLevel) / 5; + } + + public int subtractLP(ItemStack container, int maxExtract, boolean simulate) + { + if (container.stackTagCompound == null) + { + setCurrentLPStored(container, 0); + } + + int stored = container.stackTagCompound.getInteger(LP_STORED); + int extract = Math.min(maxExtract, stored); + + if (!simulate) + { + stored -= extract; + container.stackTagCompound.setInteger(LP_STORED, stored); + } + + return extract; + } + + @Override + public void onArmorTick(World world, EntityPlayer player, ItemStack armor) + { + if (hasArmorSetItem(player, 0) && hasArmorSetItem(player, 1) && hasArmorSetItem(player, 2) && hasArmorSetItem(player, 3)) + { + if (player.getHealth() < player.getMaxHealth() && !player.isPotionActive(AlchemicalWizardry.customPotionInhibit)) + { + if (world.getWorldTime() % 50 == 0) + { + Random random = new Random(); + + if (random.nextInt(9) > 7) + { + LifeImbuedArmor thisArmor = (LifeImbuedArmor) armor.getItem(); + if (thisArmor.getLPStored(armor) >= 2000) + { + float healHealth = player.getMaxHealth() - player.getHealth(); + player.setHealth(player.getHealth() + healHealth); + player.onUpdate(); + thisArmor.subtractLP(armor, ((int) healHealth) * 200, false); + } + } + } + } + } + } + + public boolean hasArmorSetItem(EntityPlayer player, int i) + { + ItemStack stack = player.inventory.armorInventory[3 - i]; + + if (stack == null) + { + return false; + } + + switch (i) + { + case 0: return stack.getItem() == ModItems.life_imbued_helmet; + case 1: return stack.getItem() == ModItems.life_imbued_chestplate; + case 2: return stack.getItem() == ModItems.life_imbued_leggings; + case 3: return stack.getItem() == ModItems.life_imbued_boots; + } + + return false; + } +} diff --git a/src/main/java/com/arc/bloodarsenal/items/armor/VampireCostume.java b/src/main/java/com/arc/bloodarsenal/common/items/armor/VampireCostume.java similarity index 97% rename from src/main/java/com/arc/bloodarsenal/items/armor/VampireCostume.java rename to src/main/java/com/arc/bloodarsenal/common/items/armor/VampireCostume.java index dbaba57..6d70004 100644 --- a/src/main/java/com/arc/bloodarsenal/items/armor/VampireCostume.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/armor/VampireCostume.java @@ -1,8 +1,8 @@ -package com.arc.bloodarsenal.items.armor; +package com.arc.bloodarsenal.common.items.armor; -import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.items.ModItems; -import com.arc.bloodarsenal.renderer.model.ModelVampireCostume; +import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.items.ModItems; +import com.arc.bloodarsenal.client.renderer.model.ModelVampireCostume; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.model.ModelBiped; @@ -19,8 +19,6 @@ import net.minecraft.potion.PotionEffect; import net.minecraft.util.IIcon; import net.minecraft.world.World; -import java.util.Calendar; - public class VampireCostume extends ItemArmor { private static IIcon chestIcon; diff --git a/src/main/java/com/arc/bloodarsenal/items/bauble/EmpoweredSacrificeAmulet.java b/src/main/java/com/arc/bloodarsenal/common/items/bauble/EmpoweredSacrificeAmulet.java similarity index 97% rename from src/main/java/com/arc/bloodarsenal/items/bauble/EmpoweredSacrificeAmulet.java rename to src/main/java/com/arc/bloodarsenal/common/items/bauble/EmpoweredSacrificeAmulet.java index 923bfe7..27fe135 100644 --- a/src/main/java/com/arc/bloodarsenal/items/bauble/EmpoweredSacrificeAmulet.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/bauble/EmpoweredSacrificeAmulet.java @@ -1,6 +1,5 @@ -package com.arc.bloodarsenal.items.bauble; +package com.arc.bloodarsenal.common.items.bauble; -import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.items.EnergyItems; @@ -10,7 +9,6 @@ import baubles.api.BaubleType; import baubles.api.IBauble; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/arc/bloodarsenal/items/bauble/EmpoweredSelfSacrificeAmulet.java b/src/main/java/com/arc/bloodarsenal/common/items/bauble/EmpoweredSelfSacrificeAmulet.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/items/bauble/EmpoweredSelfSacrificeAmulet.java rename to src/main/java/com/arc/bloodarsenal/common/items/bauble/EmpoweredSelfSacrificeAmulet.java index 7f851e2..ffd0d45 100644 --- a/src/main/java/com/arc/bloodarsenal/items/bauble/EmpoweredSelfSacrificeAmulet.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/bauble/EmpoweredSelfSacrificeAmulet.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.items.bauble; +package com.arc.bloodarsenal.common.items.bauble; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; diff --git a/src/main/java/com/arc/bloodarsenal/items/bauble/ItemBauble.java b/src/main/java/com/arc/bloodarsenal/common/items/bauble/ItemBauble.java similarity index 92% rename from src/main/java/com/arc/bloodarsenal/items/bauble/ItemBauble.java rename to src/main/java/com/arc/bloodarsenal/common/items/bauble/ItemBauble.java index f268f5b..a1d5923 100644 --- a/src/main/java/com/arc/bloodarsenal/items/bauble/ItemBauble.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/bauble/ItemBauble.java @@ -1,22 +1,16 @@ -package com.arc.bloodarsenal.items.bauble; +package com.arc.bloodarsenal.common.items.bauble; import baubles.api.IBauble; import baubles.common.container.InventoryBaubles; import baubles.common.lib.PlayerHandler; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.common.Optional; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; -import net.minecraft.creativetab.CreativeTabs; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; -import net.minecraft.util.IIcon; import net.minecraft.world.World; -import java.util.List; - @Optional.Interface(iface = "baubles.api.IBauble", modid = "Baubles") public abstract class ItemBauble extends Item implements IBauble { diff --git a/src/main/java/com/arc/bloodarsenal/items/bauble/SacrificeAmulet.java b/src/main/java/com/arc/bloodarsenal/common/items/bauble/SacrificeAmulet.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/items/bauble/SacrificeAmulet.java rename to src/main/java/com/arc/bloodarsenal/common/items/bauble/SacrificeAmulet.java index 6f42245..2fe52f0 100644 --- a/src/main/java/com/arc/bloodarsenal/items/bauble/SacrificeAmulet.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/bauble/SacrificeAmulet.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.items.bauble; +package com.arc.bloodarsenal.common.items.bauble; import WayofTime.alchemicalWizardry.api.items.IAltarManipulator; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; @@ -12,7 +12,6 @@ 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.util.StatCollector; import net.minecraft.world.World; diff --git a/src/main/java/com/arc/bloodarsenal/items/bauble/SelfSacrificeAmulet.java b/src/main/java/com/arc/bloodarsenal/common/items/bauble/SelfSacrificeAmulet.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/items/bauble/SelfSacrificeAmulet.java rename to src/main/java/com/arc/bloodarsenal/common/items/bauble/SelfSacrificeAmulet.java index 08a24fc..9201506 100644 --- a/src/main/java/com/arc/bloodarsenal/items/bauble/SelfSacrificeAmulet.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/bauble/SelfSacrificeAmulet.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.items.bauble; +package com.arc.bloodarsenal.common.items.bauble; import WayofTime.alchemicalWizardry.api.items.IAltarManipulator; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; @@ -12,7 +12,6 @@ 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.util.StatCollector; import net.minecraft.world.World; diff --git a/src/main/java/com/arc/bloodarsenal/items/bauble/VampireRing.java b/src/main/java/com/arc/bloodarsenal/common/items/bauble/VampireRing.java similarity index 91% rename from src/main/java/com/arc/bloodarsenal/items/bauble/VampireRing.java rename to src/main/java/com/arc/bloodarsenal/common/items/bauble/VampireRing.java index d06b0bf..d17e7b7 100644 --- a/src/main/java/com/arc/bloodarsenal/items/bauble/VampireRing.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/bauble/VampireRing.java @@ -1,9 +1,9 @@ -package com.arc.bloodarsenal.items.bauble; +package com.arc.bloodarsenal.common.items.bauble; import baubles.api.BaubleType; import baubles.api.IBauble; -import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.BloodArsenalConfig; +import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenalConfig; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; @@ -11,7 +11,6 @@ import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.potion.PotionEffect; -import net.minecraft.util.IIcon; public class VampireRing extends ItemBauble implements IBauble { diff --git a/src/main/java/com/arc/bloodarsenal/items/block/BloodStoneBlock.java b/src/main/java/com/arc/bloodarsenal/common/items/block/BloodStoneBlock.java similarity index 95% rename from src/main/java/com/arc/bloodarsenal/items/block/BloodStoneBlock.java rename to src/main/java/com/arc/bloodarsenal/common/items/block/BloodStoneBlock.java index 4b827b8..af06940 100644 --- a/src/main/java/com/arc/bloodarsenal/items/block/BloodStoneBlock.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/block/BloodStoneBlock.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.items.block; +package com.arc.bloodarsenal.common.items.block; import net.minecraft.block.Block; import net.minecraft.item.ItemBlock; diff --git a/src/main/java/com/arc/bloodarsenal/items/block/CompactedMRSBlock.java b/src/main/java/com/arc/bloodarsenal/common/items/block/CompactedMRSBlock.java similarity index 86% rename from src/main/java/com/arc/bloodarsenal/items/block/CompactedMRSBlock.java rename to src/main/java/com/arc/bloodarsenal/common/items/block/CompactedMRSBlock.java index adcce92..bc991ac 100644 --- a/src/main/java/com/arc/bloodarsenal/items/block/CompactedMRSBlock.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/block/CompactedMRSBlock.java @@ -1,15 +1,11 @@ -package com.arc.bloodarsenal.items.block; +package com.arc.bloodarsenal.common.items.block; import WayofTime.alchemicalWizardry.api.rituals.Rituals; -import com.arc.bloodarsenal.block.BlockCompactedMRS; -import com.arc.bloodarsenal.block.ModBlocks; -import com.arc.bloodarsenal.tileentity.TileCompactedMRS; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.client.gui.GuiScreen; import net.minecraft.entity.player.EntityPlayer; -import net.minecraft.item.Item; import net.minecraft.item.ItemBlock; import net.minecraft.item.ItemStack; import net.minecraft.util.StatCollector; diff --git a/src/main/java/com/arc/bloodarsenal/items/block/PortableAltarBlock.java b/src/main/java/com/arc/bloodarsenal/common/items/block/PortableAltarBlock.java similarity index 94% rename from src/main/java/com/arc/bloodarsenal/items/block/PortableAltarBlock.java rename to src/main/java/com/arc/bloodarsenal/common/items/block/PortableAltarBlock.java index fdc4fc0..a8a514f 100644 --- a/src/main/java/com/arc/bloodarsenal/items/block/PortableAltarBlock.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/block/PortableAltarBlock.java @@ -1,6 +1,5 @@ -package com.arc.bloodarsenal.items.block; +package com.arc.bloodarsenal.common.items.block; -import WayofTime.alchemicalWizardry.api.rituals.Rituals; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/src/main/java/com/arc/bloodarsenal/items/orb/TransparentOrb.java b/src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java similarity index 92% rename from src/main/java/com/arc/bloodarsenal/items/orb/TransparentOrb.java rename to src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java index 8129f96..3814160 100644 --- a/src/main/java/com/arc/bloodarsenal/items/orb/TransparentOrb.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/orb/TransparentOrb.java @@ -1,5 +1,6 @@ -package com.arc.bloodarsenal.items.orb; +package com.arc.bloodarsenal.common.items.orb; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.items.EnergyBattery; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; @@ -45,7 +46,7 @@ public class TransparentOrb extends EnergyBattery int maxEssence = this.getMaxEssence(); int section = maxEssence / 23; - int currentEssence = this.getCurrentEssence(itemStack); + int currentEssence = SoulNetworkHandler.getCurrentEssence(SoulNetworkHandler.getOwnerName(itemStack)); if (currentEssence != 0) { diff --git a/src/main/java/com/arc/bloodarsenal/items/sigil/SigilDivinity.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilDivinity.java similarity index 97% rename from src/main/java/com/arc/bloodarsenal/items/sigil/SigilDivinity.java rename to src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilDivinity.java index 429103f..cae8aac 100644 --- a/src/main/java/com/arc/bloodarsenal/items/sigil/SigilDivinity.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilDivinity.java @@ -1,11 +1,10 @@ -package com.arc.bloodarsenal.items.sigil; +package com.arc.bloodarsenal.common.items.sigil; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.BloodArsenalConfig; +import com.arc.bloodarsenal.common.BloodArsenalConfig; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/com/arc/bloodarsenal/items/sigil/SigilEnder.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilEnder.java similarity index 92% rename from src/main/java/com/arc/bloodarsenal/items/sigil/SigilEnder.java rename to src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilEnder.java index c07b5e4..75e79e6 100644 --- a/src/main/java/com/arc/bloodarsenal/items/sigil/SigilEnder.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilEnder.java @@ -1,9 +1,10 @@ -package com.arc.bloodarsenal.items.sigil; +package com.arc.bloodarsenal.common.items.sigil; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenalConfig; +import com.arc.bloodarsenal.common.BloodArsenalConfig; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; @@ -84,7 +85,7 @@ public class SigilEnder extends EnergyItems implements IBindable, ISigil Vec3 vec3 = Vec3.createVectorHelper(ex, wy, zee); double distance = playerPrevPos.distanceTo(vec3); - if (EnergyItems.getCurrentEssence(itemStack.getTagCompound().getString("ownerName")) >= distance * BloodArsenalConfig.enderSigilTeleportMultiplier || player.capabilities.isCreativeMode) + if (SoulNetworkHandler.getCurrentEssence(itemStack.getTagCompound().getString("ownerName")) >= distance * BloodArsenalConfig.enderSigilTeleportMultiplier || player.capabilities.isCreativeMode) { for (int k = 0; k < 8; ++k) { diff --git a/src/main/java/com/arc/bloodarsenal/items/sigil/SigilLightning.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilLightning.java similarity index 96% rename from src/main/java/com/arc/bloodarsenal/items/sigil/SigilLightning.java rename to src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilLightning.java index 9ee2983..a0d67ca 100644 --- a/src/main/java/com/arc/bloodarsenal/items/sigil/SigilLightning.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilLightning.java @@ -1,9 +1,10 @@ -package com.arc.bloodarsenal.items.sigil; +package com.arc.bloodarsenal.common.items.sigil; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; +import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenalConfig; +import com.arc.bloodarsenal.common.BloodArsenalConfig; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; @@ -29,7 +30,7 @@ public class SigilLightning extends EnergyItems implements IBindable, ISigil { int mode = par1ItemStack.getItemDamage(); par3List.add(StatCollector.translateToLocal("tooltip.sigil.lightning")); - par3List.add(StatCollector.translateToLocal("tooltip.sigil.lightning2") + (mode + 1)); + par3List.add(StatCollector.translateToLocal("tooltip.sigil.lightning2") + " " + (mode + 1)); if (!(par1ItemStack.stackTagCompound == null)) { @@ -57,7 +58,7 @@ public class SigilLightning extends EnergyItems implements IBindable, ISigil if (world.isRemote) { int mode = itemStack.getItemDamage(); - IChatComponent chatComponent = new ChatComponentText(StatCollector.translateToLocal("tooltip.sigil.lightning2") + (mode + 1)); + IChatComponent chatComponent = new ChatComponentText(StatCollector.translateToLocal("tooltip.sigil.lightning2") + " " + (mode + 1)); player.addChatComponentMessage(chatComponent); } @@ -121,7 +122,7 @@ public class SigilLightning extends EnergyItems implements IBindable, ISigil break; } - if (EnergyItems.getCurrentEssence(itemStack.getTagCompound().getString("ownerName")) >= cost || player.capabilities.isCreativeMode) + if (SoulNetworkHandler.getCurrentEssence(itemStack.getTagCompound().getString("ownerName")) >= cost || player.capabilities.isCreativeMode) { switch (mode) { diff --git a/src/main/java/com/arc/bloodarsenal/items/sigil/SigilSwimming.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilSwimming.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/items/sigil/SigilSwimming.java rename to src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilSwimming.java index 961f525..cbb5747 100644 --- a/src/main/java/com/arc/bloodarsenal/items/sigil/SigilSwimming.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilSwimming.java @@ -1,10 +1,10 @@ -package com.arc.bloodarsenal.items.sigil; +package com.arc.bloodarsenal.common.items.sigil; import WayofTime.alchemicalWizardry.api.items.interfaces.ArmourUpgrade; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenalConfig; +import com.arc.bloodarsenal.common.BloodArsenalConfig; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/com/arc/bloodarsenal/items/sigil/SigilUtils.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilUtils.java similarity index 89% rename from src/main/java/com/arc/bloodarsenal/items/sigil/SigilUtils.java rename to src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilUtils.java index b48518e..3432020 100644 --- a/src/main/java/com/arc/bloodarsenal/items/sigil/SigilUtils.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/SigilUtils.java @@ -1,8 +1,8 @@ -package com.arc.bloodarsenal.items.sigil; +package com.arc.bloodarsenal.common.items.sigil; -import com.arc.bloodarsenal.items.sigil.holding.AHPacketHandler; -import com.arc.bloodarsenal.items.sigil.holding.AHPacketProcessor; -import com.arc.bloodarsenal.items.sigil.holding.SigilAugmentedHolding; +import com.arc.bloodarsenal.common.items.sigil.holding.AHPacketHandler; +import com.arc.bloodarsenal.common.items.sigil.holding.AHPacketProcessor; +import com.arc.bloodarsenal.common.items.sigil.holding.SigilAugmentedHolding; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/arc/bloodarsenal/items/sigil/holding/AHPacketHandler.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/AHPacketHandler.java similarity index 88% rename from src/main/java/com/arc/bloodarsenal/items/sigil/holding/AHPacketHandler.java rename to src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/AHPacketHandler.java index cb3bdd7..3524a3c 100644 --- a/src/main/java/com/arc/bloodarsenal/items/sigil/holding/AHPacketHandler.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/AHPacketHandler.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.items.sigil.holding; +package com.arc.bloodarsenal.common.items.sigil.holding; import cpw.mods.fml.common.network.NetworkRegistry; import cpw.mods.fml.common.network.simpleimpl.SimpleNetworkWrapper; diff --git a/src/main/java/com/arc/bloodarsenal/items/sigil/holding/AHPacketProcessor.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/AHPacketProcessor.java similarity index 95% rename from src/main/java/com/arc/bloodarsenal/items/sigil/holding/AHPacketProcessor.java rename to src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/AHPacketProcessor.java index 513a2fb..0e0f9a6 100644 --- a/src/main/java/com/arc/bloodarsenal/items/sigil/holding/AHPacketProcessor.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/AHPacketProcessor.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.items.sigil.holding; +package com.arc.bloodarsenal.common.items.sigil.holding; import cpw.mods.fml.common.network.simpleimpl.IMessage; import cpw.mods.fml.common.network.simpleimpl.IMessageHandler; diff --git a/src/main/java/com/arc/bloodarsenal/items/sigil/holding/ContainerAugmentedHolding.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/ContainerAugmentedHolding.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/items/sigil/holding/ContainerAugmentedHolding.java rename to src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/ContainerAugmentedHolding.java index 9a03168..1a7c9b6 100644 --- a/src/main/java/com/arc/bloodarsenal/items/sigil/holding/ContainerAugmentedHolding.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/ContainerAugmentedHolding.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.items.sigil.holding; +package com.arc.bloodarsenal.common.items.sigil.holding; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import cpw.mods.fml.common.FMLCommonHandler; diff --git a/src/main/java/com/arc/bloodarsenal/items/sigil/holding/GuiAugmentedHolding.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/GuiAugmentedHolding.java similarity index 95% rename from src/main/java/com/arc/bloodarsenal/items/sigil/holding/GuiAugmentedHolding.java rename to src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/GuiAugmentedHolding.java index 68c67ae..8590f69 100644 --- a/src/main/java/com/arc/bloodarsenal/items/sigil/holding/GuiAugmentedHolding.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/GuiAugmentedHolding.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.items.sigil.holding; +package com.arc.bloodarsenal.common.items.sigil.holding; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/arc/bloodarsenal/items/sigil/holding/InventoryAugmentedHolding.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/InventoryAugmentedHolding.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/items/sigil/holding/InventoryAugmentedHolding.java rename to src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/InventoryAugmentedHolding.java index 344c431..eb2111f 100644 --- a/src/main/java/com/arc/bloodarsenal/items/sigil/holding/InventoryAugmentedHolding.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/InventoryAugmentedHolding.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.items.sigil.holding; +package com.arc.bloodarsenal.common.items.sigil.holding; import WayofTime.alchemicalWizardry.api.items.interfaces.ISigil; import net.minecraft.entity.player.EntityPlayer; diff --git a/src/main/java/com/arc/bloodarsenal/items/sigil/holding/SigilAugmentedHolding.java b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/SigilAugmentedHolding.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/items/sigil/holding/SigilAugmentedHolding.java rename to src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/SigilAugmentedHolding.java index 1a23e16..8a825d9 100644 --- a/src/main/java/com/arc/bloodarsenal/items/sigil/holding/SigilAugmentedHolding.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/sigil/holding/SigilAugmentedHolding.java @@ -1,13 +1,12 @@ -package com.arc.bloodarsenal.items.sigil.holding; +package com.arc.bloodarsenal.common.items.sigil.holding; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import net.minecraft.entity.Entity; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraft.nbt.NBTTagList; -import net.minecraft.util.ChatComponentText; import net.minecraft.util.IIcon; import net.minecraft.util.MathHelper; import net.minecraft.util.StatCollector; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/BoundBow.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundBow.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/items/tool/BoundBow.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/BoundBow.java index 66a45ff..9c7c14a 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/BoundBow.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundBow.java @@ -1,8 +1,8 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/BoundIgniter.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundIgniter.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/items/tool/BoundIgniter.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/BoundIgniter.java index 382886b..4c6b622 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/BoundIgniter.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundIgniter.java @@ -1,8 +1,8 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; @@ -32,7 +32,7 @@ public class BoundIgniter extends Item implements IBindable setUnlocalizedName("bound_igniter"); setMaxStackSize(1); setCreativeTab(BloodArsenal.BA_TAB); - setEnergyUsed(50); + setEnergyUsed(100); } public void setEnergyUsed(int i) diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/BoundShears.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundShears.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/items/tool/BoundShears.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/BoundShears.java index 2986e1e..c37ee6e 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/BoundShears.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundShears.java @@ -1,9 +1,9 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.entity.mob.EntityBloodHound; +import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.entity.mob.EntityBloodHound; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/BoundSickle.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundSickle.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/items/tool/BoundSickle.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/BoundSickle.java index 9a54e96..f8b3f04 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/BoundSickle.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/BoundSickle.java @@ -1,9 +1,9 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import com.google.common.collect.Sets; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.common.eventhandler.Event; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/EnergyGatling.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/EnergyGatling.java similarity index 97% rename from src/main/java/com/arc/bloodarsenal/items/tool/EnergyGatling.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/EnergyGatling.java index 4a5506e..8682b3a 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/EnergyGatling.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/EnergyGatling.java @@ -1,9 +1,9 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.entity.projectile.EntityGatlingProjectile; +import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.entity.projectile.EntityGatlingProjectile; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/GlassDaggerOfSacrifice.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/GlassDaggerOfSacrifice.java similarity index 96% rename from src/main/java/com/arc/bloodarsenal/items/tool/GlassDaggerOfSacrifice.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/GlassDaggerOfSacrifice.java index 5de043a..318f85e 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/GlassDaggerOfSacrifice.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/GlassDaggerOfSacrifice.java @@ -1,18 +1,15 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; import WayofTime.alchemicalWizardry.common.IDemon; import WayofTime.alchemicalWizardry.common.demonVillage.demonHoard.demon.IHoardDemon; import WayofTime.alchemicalWizardry.common.items.EnergyItems; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.BloodArsenalConfig; +import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenalConfig; import com.google.common.collect.Multimap; -import cpw.mods.fml.relauncher.Side; -import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; import net.minecraft.block.material.Material; -import net.minecraft.client.renderer.texture.IIconRegister; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.SharedMonsterAttributes; import net.minecraft.entity.ai.attributes.AttributeModifier; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/GlassSacrificialDagger.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/GlassSacrificialDagger.java similarity index 97% rename from src/main/java/com/arc/bloodarsenal/items/tool/GlassSacrificialDagger.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/GlassSacrificialDagger.java index 58479fc..189363b 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/GlassSacrificialDagger.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/GlassSacrificialDagger.java @@ -1,12 +1,12 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.event.SacrificeKnifeUsedEvent; import WayofTime.alchemicalWizardry.api.sacrifice.PlayerSacrificeHandler; import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.BloodArsenalConfig; +import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenalConfig; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/com/arc/bloodarsenal/common/items/tool/IFillable.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/IFillable.java new file mode 100644 index 0000000..8a4399e --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/IFillable.java @@ -0,0 +1,12 @@ +package com.arc.bloodarsenal.common.items.tool; + +import net.minecraft.item.ItemStack; + +public interface IFillable +{ + int getMaxLP(); + + int getLPStored(ItemStack container); + + void incrementLPStored(ItemStack itemStack, int incrementAmount); +} diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedDiamond.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamond.java similarity index 94% rename from src/main/java/com/arc/bloodarsenal/items/tool/InfusedDiamond.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamond.java index a81edb3..0cb0ac1 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedDiamond.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamond.java @@ -1,7 +1,7 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; -import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.items.ModItems; +import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.items.ModItems; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedDiamondAxe.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondAxe.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/items/tool/InfusedDiamondAxe.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondAxe.java index a06adb2..a753c2b 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedDiamondAxe.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondAxe.java @@ -1,8 +1,8 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedDiamondPickaxe.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondPickaxe.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/items/tool/InfusedDiamondPickaxe.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondPickaxe.java index 7a7c507..e31f900 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedDiamondPickaxe.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondPickaxe.java @@ -1,8 +1,8 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedDiamondShovel.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondShovel.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/items/tool/InfusedDiamondShovel.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondShovel.java index 0b1bdd4..5597531 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedDiamondShovel.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondShovel.java @@ -1,8 +1,8 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedDiamondSword.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondSword.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/items/tool/InfusedDiamondSword.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondSword.java index 015bb58..440bf4a 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedDiamondSword.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedDiamondSword.java @@ -1,8 +1,8 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.Entity; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedIronAxe.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronAxe.java similarity index 96% rename from src/main/java/com/arc/bloodarsenal/items/tool/InfusedIronAxe.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronAxe.java index 9f76fa7..76ebd8b 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedIronAxe.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronAxe.java @@ -1,8 +1,8 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedIronPickaxe.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronPickaxe.java similarity index 96% rename from src/main/java/com/arc/bloodarsenal/items/tool/InfusedIronPickaxe.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronPickaxe.java index b54bc0b..6b05b99 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedIronPickaxe.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronPickaxe.java @@ -1,8 +1,8 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedIronShovel.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronShovel.java similarity index 96% rename from src/main/java/com/arc/bloodarsenal/items/tool/InfusedIronShovel.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronShovel.java index c97744a..40dec59 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedIronShovel.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronShovel.java @@ -1,8 +1,8 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedIronSword.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronSword.java similarity index 94% rename from src/main/java/com/arc/bloodarsenal/items/tool/InfusedIronSword.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronSword.java index a59f02b..d6fffbc 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedIronSword.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedIronSword.java @@ -1,8 +1,8 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.EntityLivingBase; @@ -10,8 +10,6 @@ import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.EnumRarity; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; import java.util.List; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedWoodAxe.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodAxe.java similarity index 95% rename from src/main/java/com/arc/bloodarsenal/items/tool/InfusedWoodAxe.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodAxe.java index f245a42..0ee04da 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedWoodAxe.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodAxe.java @@ -1,8 +1,8 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedWoodPickaxe.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodPickaxe.java similarity index 95% rename from src/main/java/com/arc/bloodarsenal/items/tool/InfusedWoodPickaxe.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodPickaxe.java index e1f9c5f..d7cfeae 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedWoodPickaxe.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodPickaxe.java @@ -1,8 +1,8 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedWoodShovel.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodShovel.java similarity index 95% rename from src/main/java/com/arc/bloodarsenal/items/tool/InfusedWoodShovel.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodShovel.java index 191b5db..ba14da2 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedWoodShovel.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodShovel.java @@ -1,8 +1,8 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.block.Block; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedWoodSword.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodSword.java similarity index 93% rename from src/main/java/com/arc/bloodarsenal/items/tool/InfusedWoodSword.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodSword.java index 09dc02d..c391297 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/InfusedWoodSword.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/InfusedWoodSword.java @@ -1,16 +1,14 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import WayofTime.alchemicalWizardry.api.items.interfaces.IBindable; import WayofTime.alchemicalWizardry.common.items.EnergyItems; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.entity.EntityLivingBase; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.item.ItemStack; import net.minecraft.item.ItemSword; -import net.minecraft.potion.Potion; -import net.minecraft.potion.PotionEffect; import net.minecraft.world.World; import java.util.List; diff --git a/src/main/java/com/arc/bloodarsenal/items/tool/ToolCapabilities.java b/src/main/java/com/arc/bloodarsenal/common/items/tool/ToolCapabilities.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/items/tool/ToolCapabilities.java rename to src/main/java/com/arc/bloodarsenal/common/items/tool/ToolCapabilities.java index 07df845..9f91c2b 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tool/ToolCapabilities.java +++ b/src/main/java/com/arc/bloodarsenal/common/items/tool/ToolCapabilities.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.items.tool; +package com.arc.bloodarsenal.common.items.tool; import net.minecraft.block.Block; import net.minecraft.block.material.Material; diff --git a/src/main/java/com/arc/bloodarsenal/misc/CommandDownloadMod.java b/src/main/java/com/arc/bloodarsenal/common/misc/CommandDownloadMod.java similarity index 97% rename from src/main/java/com/arc/bloodarsenal/misc/CommandDownloadMod.java rename to src/main/java/com/arc/bloodarsenal/common/misc/CommandDownloadMod.java index 445bb08..b36245b 100644 --- a/src/main/java/com/arc/bloodarsenal/misc/CommandDownloadMod.java +++ b/src/main/java/com/arc/bloodarsenal/common/misc/CommandDownloadMod.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.misc; +package com.arc.bloodarsenal.common.misc; import net.minecraft.command.CommandBase; import net.minecraft.command.ICommandSender; diff --git a/src/main/java/com/arc/bloodarsenal/misc/ThreadDownloadMod.java b/src/main/java/com/arc/bloodarsenal/common/misc/ThreadDownloadMod.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/misc/ThreadDownloadMod.java rename to src/main/java/com/arc/bloodarsenal/common/misc/ThreadDownloadMod.java index 02d754b..899ee42 100644 --- a/src/main/java/com/arc/bloodarsenal/misc/ThreadDownloadMod.java +++ b/src/main/java/com/arc/bloodarsenal/common/misc/ThreadDownloadMod.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.misc; +package com.arc.bloodarsenal.common.misc; import net.minecraft.client.Minecraft; import net.minecraft.util.*; diff --git a/src/main/java/com/arc/bloodarsenal/misc/ThreadVersionChecker.java b/src/main/java/com/arc/bloodarsenal/common/misc/ThreadVersionChecker.java similarity index 95% rename from src/main/java/com/arc/bloodarsenal/misc/ThreadVersionChecker.java rename to src/main/java/com/arc/bloodarsenal/common/misc/ThreadVersionChecker.java index d201f2c..dd8b250 100644 --- a/src/main/java/com/arc/bloodarsenal/misc/ThreadVersionChecker.java +++ b/src/main/java/com/arc/bloodarsenal/common/misc/ThreadVersionChecker.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.misc; +package com.arc.bloodarsenal.common.misc; import net.minecraftforge.common.MinecraftForge; diff --git a/src/main/java/com/arc/bloodarsenal/misc/VersionChecker.java b/src/main/java/com/arc/bloodarsenal/common/misc/VersionChecker.java similarity index 94% rename from src/main/java/com/arc/bloodarsenal/misc/VersionChecker.java rename to src/main/java/com/arc/bloodarsenal/common/misc/VersionChecker.java index d8d93d9..246cd1a 100644 --- a/src/main/java/com/arc/bloodarsenal/misc/VersionChecker.java +++ b/src/main/java/com/arc/bloodarsenal/common/misc/VersionChecker.java @@ -1,6 +1,6 @@ -package com.arc.bloodarsenal.misc; +package com.arc.bloodarsenal.common.misc; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.TickEvent; @@ -34,7 +34,7 @@ public class VersionChecker { EntityPlayer player = Minecraft.getMinecraft().thePlayer; int onlineBuild = Integer.parseInt(onlineVersion.split("1.1-")[1]); - int clientBuild = Integer.parseInt(BloodArsenal.VERSION.split("1.1-")[1]); + int clientBuild = Integer.parseInt(BloodArsenal.VERSION); if (onlineBuild > clientBuild) { diff --git a/src/main/java/com/arc/bloodarsenal/potion/PotionBloodArsenal.java b/src/main/java/com/arc/bloodarsenal/common/potion/PotionBloodArsenal.java similarity index 94% rename from src/main/java/com/arc/bloodarsenal/potion/PotionBloodArsenal.java rename to src/main/java/com/arc/bloodarsenal/common/potion/PotionBloodArsenal.java index 5cba2f0..55ed787 100644 --- a/src/main/java/com/arc/bloodarsenal/potion/PotionBloodArsenal.java +++ b/src/main/java/com/arc/bloodarsenal/common/potion/PotionBloodArsenal.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.potion; +package com.arc.bloodarsenal.common.potion; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; diff --git a/src/main/java/com/arc/bloodarsenal/rituals/RitualEffectEnchant.java b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectEnchant.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/rituals/RitualEffectEnchant.java rename to src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectEnchant.java index 249eb89..0b82c35 100644 --- a/src/main/java/com/arc/bloodarsenal/rituals/RitualEffectEnchant.java +++ b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectEnchant.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.rituals; +package com.arc.bloodarsenal.common.rituals; import WayofTime.alchemicalWizardry.ModBlocks; import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; @@ -6,11 +6,8 @@ import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; -import WayofTime.alchemicalWizardry.api.tile.IBloodAltar; -import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import WayofTime.alchemicalWizardry.common.tileEntity.TEAltar; import WayofTime.alchemicalWizardry.common.tileEntity.TEPedestal; -import net.minecraft.block.Block; import net.minecraft.enchantment.Enchantment; import net.minecraft.enchantment.EnchantmentHelper; import net.minecraft.entity.effect.EntityLightningBolt; @@ -24,7 +21,6 @@ import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; import net.minecraft.util.StatCollector; import net.minecraft.world.World; -import org.lwjgl.Sys; import java.util.ArrayList; import java.util.List; diff --git a/src/main/java/com/arc/bloodarsenal/rituals/RitualEffectFishing.java b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectFishing.java similarity index 96% rename from src/main/java/com/arc/bloodarsenal/rituals/RitualEffectFishing.java rename to src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectFishing.java index 38e7ab9..bdaeb27 100644 --- a/src/main/java/com/arc/bloodarsenal/rituals/RitualEffectFishing.java +++ b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectFishing.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.rituals; +package com.arc.bloodarsenal.common.rituals; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry; import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; @@ -7,18 +7,14 @@ import WayofTime.alchemicalWizardry.api.rituals.RitualEffect; import WayofTime.alchemicalWizardry.api.soulNetwork.LifeEssenceNetwork; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import net.minecraft.block.Block; -import net.minecraft.entity.Entity; import net.minecraft.init.Blocks; import net.minecraft.inventory.IInventory; import net.minecraft.server.MinecraftServer; import net.minecraft.tileentity.TileEntity; import net.minecraft.world.World; -import net.minecraftforge.common.FishingHooks; -import java.awt.geom.Area; import java.util.ArrayList; import java.util.List; -import java.util.Random; public class RitualEffectFishing extends RitualEffect { diff --git a/src/main/java/com/arc/bloodarsenal/rituals/RitualEffectMidas.java b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectMidas.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/rituals/RitualEffectMidas.java rename to src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectMidas.java index ea4b711..d8552da 100644 --- a/src/main/java/com/arc/bloodarsenal/rituals/RitualEffectMidas.java +++ b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectMidas.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.rituals; +package com.arc.bloodarsenal.common.rituals; import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; import WayofTime.alchemicalWizardry.api.rituals.RitualComponent; @@ -8,9 +8,7 @@ import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; import net.minecraft.entity.effect.EntityLightningBolt; import net.minecraft.entity.item.EntityItem; -import net.minecraft.init.Blocks; import net.minecraft.init.Items; -import net.minecraft.item.Item; import net.minecraft.item.ItemStack; import net.minecraft.server.MinecraftServer; import net.minecraft.util.AxisAlignedBB; diff --git a/src/main/java/com/arc/bloodarsenal/rituals/RitualEffectWithering.java b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectWithering.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/rituals/RitualEffectWithering.java rename to src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectWithering.java index 17964e2..20532b0 100644 --- a/src/main/java/com/arc/bloodarsenal/rituals/RitualEffectWithering.java +++ b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualEffectWithering.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.rituals; +package com.arc.bloodarsenal.common.rituals; import WayofTime.alchemicalWizardry.api.alchemy.energy.ReagentRegistry; import WayofTime.alchemicalWizardry.api.rituals.IMasterRitualStone; diff --git a/src/main/java/com/arc/bloodarsenal/rituals/RitualRegistry.java b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualRegistry.java similarity index 92% rename from src/main/java/com/arc/bloodarsenal/rituals/RitualRegistry.java rename to src/main/java/com/arc/bloodarsenal/common/rituals/RitualRegistry.java index 2717b19..3f7f29e 100644 --- a/src/main/java/com/arc/bloodarsenal/rituals/RitualRegistry.java +++ b/src/main/java/com/arc/bloodarsenal/common/rituals/RitualRegistry.java @@ -1,9 +1,8 @@ -package com.arc.bloodarsenal.rituals; +package com.arc.bloodarsenal.common.rituals; import WayofTime.alchemicalWizardry.api.rituals.Rituals; import WayofTime.alchemicalWizardry.common.renderer.AlchemyCircleRenderer; -import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.BloodArsenalConfig; +import com.arc.bloodarsenal.common.BloodArsenalConfig; import net.minecraft.util.ResourceLocation; public class RitualRegistry diff --git a/src/main/java/com/arc/bloodarsenal/tileentity/FluidTankRestricted.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/FluidTankRestricted.java similarity index 94% rename from src/main/java/com/arc/bloodarsenal/tileentity/FluidTankRestricted.java rename to src/main/java/com/arc/bloodarsenal/common/tileentity/FluidTankRestricted.java index b66786e..f520b54 100644 --- a/src/main/java/com/arc/bloodarsenal/tileentity/FluidTankRestricted.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/FluidTankRestricted.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.tileentity; +package com.arc.bloodarsenal.common.tileentity; import net.minecraftforge.fluids.FluidRegistry; import net.minecraftforge.fluids.FluidStack; diff --git a/src/main/java/com/arc/bloodarsenal/tileentity/PacketHandler.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/PacketHandler.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/tileentity/PacketHandler.java rename to src/main/java/com/arc/bloodarsenal/common/tileentity/PacketHandler.java index f294d02..ee1909e 100644 --- a/src/main/java/com/arc/bloodarsenal/tileentity/PacketHandler.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/PacketHandler.java @@ -1,6 +1,6 @@ -package com.arc.bloodarsenal.tileentity; +package com.arc.bloodarsenal.common.tileentity; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.common.FMLCommonHandler; import cpw.mods.fml.common.network.FMLEmbeddedChannel; import cpw.mods.fml.common.network.FMLIndexedMessageToMessageCodec; diff --git a/src/main/java/com/arc/bloodarsenal/tileentity/TileCompactedMRS.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompactedMRS.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/tileentity/TileCompactedMRS.java rename to src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompactedMRS.java index 606e5d5..5a5d1df 100644 --- a/src/main/java/com/arc/bloodarsenal/tileentity/TileCompactedMRS.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompactedMRS.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.tileentity; +package com.arc.bloodarsenal.common.tileentity; import WayofTime.alchemicalWizardry.api.Int3; import WayofTime.alchemicalWizardry.api.alchemy.energy.*; diff --git a/src/main/java/com/arc/bloodarsenal/tileentity/TileCompacter.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompacter.java similarity index 73% rename from src/main/java/com/arc/bloodarsenal/tileentity/TileCompacter.java rename to src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompacter.java index 4d7df2d..3acd085 100644 --- a/src/main/java/com/arc/bloodarsenal/tileentity/TileCompacter.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileCompacter.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.tileentity; +package com.arc.bloodarsenal.common.tileentity; import net.minecraft.tileentity.TileEntity; diff --git a/src/main/java/com/arc/bloodarsenal/tileentity/TileLPMaterializer.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLPMaterializer.java similarity index 94% rename from src/main/java/com/arc/bloodarsenal/tileentity/TileLPMaterializer.java rename to src/main/java/com/arc/bloodarsenal/common/tileentity/TileLPMaterializer.java index e92a394..94bbd40 100644 --- a/src/main/java/com/arc/bloodarsenal/tileentity/TileLPMaterializer.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLPMaterializer.java @@ -1,9 +1,9 @@ -package com.arc.bloodarsenal.tileentity; +package com.arc.bloodarsenal.common.tileentity; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; -import com.arc.bloodarsenal.BloodArsenalConfig; +import com.arc.bloodarsenal.common.BloodArsenalConfig; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.inventory.IInventory; import net.minecraft.item.Item; @@ -13,6 +13,7 @@ import net.minecraft.nbt.NBTTagList; import net.minecraft.network.Packet; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; +import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; @@ -21,14 +22,11 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid { private ItemStack[] inv; - public boolean isActive; - protected FluidStack fluid; public int capacity; private boolean canBeFilled; protected FluidStack fluidOutput; - private int drainRate; private int bufferCapacity; public TileLPMaterializer() @@ -39,7 +37,6 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid capacity = FluidContainerRegistry.BUCKET_VOLUME * 20; bufferCapacity = FluidContainerRegistry.BUCKET_VOLUME; - drainRate = 0; } @Override @@ -76,12 +73,10 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid } } - isActive = par1NBTTagCompound.getBoolean("isActive"); canBeFilled = par1NBTTagCompound.getBoolean("canBeFilled"); capacity = par1NBTTagCompound.getInteger("capacity"); bufferCapacity = par1NBTTagCompound.getInteger("bufferCapacity"); - drainRate = par1NBTTagCompound.getInteger("drainRate"); readCustomNBT(par1NBTTagCompound); } @@ -117,11 +112,9 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid } par1NBTTagCompound.setTag("Inventory", itemList); - par1NBTTagCompound.setBoolean("isActive", isActive); par1NBTTagCompound.setBoolean("canBeFilled", canBeFilled); par1NBTTagCompound.setInteger("capacity", capacity); - par1NBTTagCompound.setInteger("drainRate", drainRate); par1NBTTagCompound.setInteger("bufferCapacity", bufferCapacity); writeCustomNBT(par1NBTTagCompound); } @@ -151,14 +144,6 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid par1NBTTagCompound.setTag("Inventory", nbttaglist); } - public int fillMainTank(int amount) //TODO - { - int filledAmount = Math.min(capacity - fluid.amount, amount); - fluid.amount += filledAmount; - - return filledAmount; - } - @Override public int getSizeInventory() { @@ -258,7 +243,7 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid public void sendChatInfoToPlayer(EntityPlayer player) { - player.addChatMessage(new ChatComponentText("Contains: " + this.getFluidAmount() + "LP")); + player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.tile.contains") + " " + this.getFluidAmount() + "LP")); } @Override @@ -330,11 +315,20 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid public void updateEntity() { super.updateEntity(); - materialize(); + + if (worldObj.isBlockIndirectlyGettingPowered(xCoord, yCoord, zCoord)) + { + materialize(); + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } + else + { + worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); + } if (worldObj.getWorldTime() % 10 == 0) { - int syphonMax = 1000; + int syphonMax = 500; int fluidOutputted; fluidOutputted = Math.min(syphonMax, this.bufferCapacity - this.fluidOutput.amount); fluidOutputted = Math.min(this.fluid.amount, fluidOutputted); @@ -458,7 +452,7 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid if (this != null) { - FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(fluidOutput, this.worldObj, this.xCoord, this.yCoord, this.zCoord, this)); + FluidEvent.fireEvent(new FluidEvent.FluidDrainingEvent(fluidOutput, this.worldObj, this.xCoord, this.yCoord, this.zCoord, this, 1000)); } } @@ -484,7 +478,7 @@ public class TileLPMaterializer extends TileEntity implements IInventory, IFluid @Override public boolean canDrain(ForgeDirection from, Fluid fluid) { - return true; + return this.fluidOutput != null && this.fluid.getFluid().equals(fluidOutput.getFluid()); } @Override diff --git a/src/main/java/com/arc/bloodarsenal/tileentity/TileLifeInfuser.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLifeInfuser.java similarity index 84% rename from src/main/java/com/arc/bloodarsenal/tileentity/TileLifeInfuser.java rename to src/main/java/com/arc/bloodarsenal/common/tileentity/TileLifeInfuser.java index bc034cd..dcc493d 100644 --- a/src/main/java/com/arc/bloodarsenal/tileentity/TileLifeInfuser.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/TileLifeInfuser.java @@ -1,20 +1,18 @@ -package com.arc.bloodarsenal.tileentity; +package com.arc.bloodarsenal.common.tileentity; import WayofTime.alchemicalWizardry.AlchemicalWizardry; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; -import WayofTime.alchemicalWizardry.api.soulNetwork.SoulNetworkHandler; import WayofTime.alchemicalWizardry.common.spell.complex.effect.SpellHelper; +import com.arc.bloodarsenal.common.items.tool.IFillable; 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.NetworkManager; import net.minecraft.network.Packet; -import net.minecraft.network.play.server.S35PacketUpdateTileEntity; import net.minecraft.tileentity.TileEntity; import net.minecraft.util.ChatComponentText; +import net.minecraft.util.StatCollector; import net.minecraftforge.common.util.Constants; import net.minecraftforge.common.util.ForgeDirection; import net.minecraftforge.fluids.*; @@ -26,7 +24,6 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan public int ticksExisted = 0; public static int damageLastTick = 0; - public boolean isActive; public boolean tookLastTick = true; protected FluidStack fluid; @@ -39,7 +36,6 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan public TileLifeInfuser() { this.inv = new ItemStack[1]; - isActive = false; fluid = new FluidStack(AlchemicalWizardry.lifeEssenceFluid, 0); fluidInput = new FluidStack(AlchemicalWizardry.lifeEssenceFluid, 0); this.capacity = FluidContainerRegistry.BUCKET_VOLUME * 20; @@ -79,7 +75,6 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan } } - isActive = par1NBTTagCompound.getBoolean("isActive"); canBeFilled = par1NBTTagCompound.getBoolean("canBeFilled"); capacity = par1NBTTagCompound.getInteger("capacity"); } @@ -118,7 +113,6 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan } par1NBTTagCompound.setTag("Inventory", itemList); - par1NBTTagCompound.setBoolean("isActive", isActive); par1NBTTagCompound.setBoolean("canBeFilled", canBeFilled); par1NBTTagCompound.setInteger("capacity", capacity); } @@ -220,11 +214,11 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan { super.updateEntity(); - if (worldObj.getWorldTime() % 50 == 0) + if (worldObj.getWorldTime() % 10 == 0) { + int intakeMax = 500; int fluidInputted; - - fluidInputted = Math.min(300, -this.fluid.amount + capacity); + fluidInputted = Math.min(intakeMax, capacity - this.fluid.amount); fluidInputted = Math.min(this.fluidInput.amount, fluidInputted); this.fluid.amount += fluidInputted; this.fluidInput.amount -= fluidInputted; @@ -232,33 +226,48 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan if (++ticksExisted % 10 == 0) { - if (inv[0] != null && inv[0].getItemDamage() > 0) + if (inv[0] != null) { - int lpCost = 300; - int damage = inv[0].getItemDamage(); + if (inv[0].getItem() instanceof IFillable) + { + IFillable fillable = (IFillable) inv[0].getItem(); + int fillAmount = 200; - if (getFluidAmount() >= lpCost) - { - fluid.amount = fluid.amount - lpCost; - inv[0].setItemDamage(Math.max(0, damage - 1)); + if (fillable.getLPStored(inv[0]) < fillable.getMaxLP() && !(fillable.getLPStored(inv[0]) + fillAmount > fillable.getMaxLP()) && getFluidAmount() >= fillAmount) + { + fluid.amount = fluid.amount - fillAmount; + fillable.incrementLPStored(inv[0], fillAmount); + SpellHelper.sendIndexedParticleToAllAround(worldObj, xCoord, yCoord, zCoord, 20, worldObj.provider.dimensionId, 1, xCoord, yCoord, zCoord); + } } - else + else if (inv[0].getItemDamage() > 0) { - return; - } + int lpCost = 300; + int damage = inv[0].getItemDamage(); - processInput(); - markDirty(); + if (getFluidAmount() >= lpCost) + { + fluid.amount = fluid.amount - lpCost; + inv[0].setItemDamage(Math.max(0, damage - 1)); + } + else + { + return; + } - if (damageLastTick != 0 && damageLastTick != damage) - { - //Insert fancy particles here - SpellHelper.sendIndexedParticleToAllAround(worldObj, xCoord, yCoord, zCoord, 20, worldObj.provider.dimensionId, 1, xCoord, yCoord, zCoord); - tookLastTick = true; - } - else - { - tookLastTick = false; + processInput(); + markDirty(); + + if (damageLastTick != 0 && damageLastTick != damage) + { + //Insert fancy particles here + SpellHelper.sendIndexedParticleToAllAround(worldObj, xCoord, yCoord, zCoord, 20, worldObj.provider.dimensionId, 1, xCoord, yCoord, zCoord); + tookLastTick = true; + } + else + { + tookLastTick = false; + } } } else @@ -282,11 +291,6 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan worldObj.markBlockForUpdate(xCoord, yCoord, zCoord); } - public boolean isActive() - { - return isActive; - } - @Override public boolean isItemValidForSlot(int slot, ItemStack itemstack) { @@ -295,7 +299,7 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan public void sendChatInfoToPlayer(EntityPlayer player) { - player.addChatMessage(new ChatComponentText("Contains: " + this.getFluidAmount() + "LP")); + player.addChatMessage(new ChatComponentText(StatCollector.translateToLocal("message.tile.contains") + " " + this.getFluidAmount() + "LP")); } @Override @@ -380,7 +384,7 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan { for (int i = 0; i < getTanks().length; i++) { - int c = getFuelBurn(getTanks()[i].getFluid()); + int c = fluidAmount(); if ((c > 0) && (getTanks()[i].getFluidAmount() >= fluidAmount())) { @@ -393,12 +397,7 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan public int fluidAmount() { - return 100; - } - - public int getFuelBurn(FluidStack fluid) - { - return fluidAmount(); + return fluid.amount; } @Override @@ -502,8 +501,7 @@ public class TileLifeInfuser extends TileEntity implements IInventory, IFluidTan @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 //Sure thing! - return true; + return this.fluidInput != null && this.fluid.getFluid().equals(fluidInput.getFluid()) && this.fluid.amount > capacity; } @Override diff --git a/src/main/java/com/arc/bloodarsenal/tileentity/TilePortableAltar.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/TilePortableAltar.java similarity index 99% rename from src/main/java/com/arc/bloodarsenal/tileentity/TilePortableAltar.java rename to src/main/java/com/arc/bloodarsenal/common/tileentity/TilePortableAltar.java index 3159533..7c3d1c3 100644 --- a/src/main/java/com/arc/bloodarsenal/tileentity/TilePortableAltar.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/TilePortableAltar.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.tileentity; +package com.arc.bloodarsenal.common.tileentity; import WayofTime.alchemicalWizardry.AlchemicalWizardry; import WayofTime.alchemicalWizardry.api.altarRecipeRegistry.AltarRecipe; @@ -6,8 +6,6 @@ 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; @@ -263,8 +261,6 @@ public class TilePortableAltar extends TileEntity implements IInventory, IFluidT for (int i = 0; i < inv.length; i++) { - ItemStack stack = inv[i]; - if (inv[i] != null) { NBTTagCompound tag = new NBTTagCompound(); diff --git a/src/main/java/com/arc/bloodarsenal/tileentity/container/ContainerPortableAltar.java b/src/main/java/com/arc/bloodarsenal/common/tileentity/container/ContainerPortableAltar.java similarity index 95% rename from src/main/java/com/arc/bloodarsenal/tileentity/container/ContainerPortableAltar.java rename to src/main/java/com/arc/bloodarsenal/common/tileentity/container/ContainerPortableAltar.java index 7d9a44b..d248877 100644 --- a/src/main/java/com/arc/bloodarsenal/tileentity/container/ContainerPortableAltar.java +++ b/src/main/java/com/arc/bloodarsenal/common/tileentity/container/ContainerPortableAltar.java @@ -1,6 +1,6 @@ -package com.arc.bloodarsenal.tileentity.container; +package com.arc.bloodarsenal.common.tileentity.container; -import com.arc.bloodarsenal.tileentity.TilePortableAltar; +import com.arc.bloodarsenal.common.tileentity.TilePortableAltar; import net.minecraft.entity.player.EntityPlayer; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.inventory.Container; diff --git a/src/main/java/com/arc/bloodarsenal/items/tinkers/BloodArsenalModifiers.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalModifiers.java similarity index 91% rename from src/main/java/com/arc/bloodarsenal/items/tinkers/BloodArsenalModifiers.java rename to src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalModifiers.java index c772c57..d49eb51 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tinkers/BloodArsenalModifiers.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalModifiers.java @@ -1,4 +1,4 @@ -package com.arc.bloodarsenal.items.tinkers; +package com.arc.bloodarsenal.common.tinkers; import net.minecraft.item.ItemStack; import net.minecraftforge.oredict.OreDictionary; diff --git a/src/main/java/com/arc/bloodarsenal/items/tinkers/BloodArsenalTinkers.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalTinkers.java similarity index 53% rename from src/main/java/com/arc/bloodarsenal/items/tinkers/BloodArsenalTinkers.java rename to src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalTinkers.java index 8f8c088..aad079b 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tinkers/BloodArsenalTinkers.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/BloodArsenalTinkers.java @@ -1,9 +1,29 @@ -package com.arc.bloodarsenal.items.tinkers; +package com.arc.bloodarsenal.common.tinkers; -import com.arc.bloodarsenal.BloodArsenal; +import com.arc.bloodarsenal.common.BloodArsenal; +import com.arc.bloodarsenal.common.block.ModBlocks; +import com.arc.bloodarsenal.common.items.ModItems; +import cpw.mods.fml.common.FMLCommonHandler; +import cpw.mods.fml.common.event.FMLInterModComms; import cpw.mods.fml.common.registry.GameRegistry; +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; +import net.minecraft.item.ItemStack; +import net.minecraft.nbt.NBTTagCompound; +import net.minecraft.util.EnumChatFormatting; +import net.minecraftforge.common.MinecraftForge; +import net.minecraftforge.fluids.Fluid; +import net.minecraftforge.fluids.FluidRegistry; +import net.minecraftforge.fluids.FluidStack; import tconstruct.library.TConstructRegistry; import tconstruct.library.client.TConstructClientRegistry; +import tconstruct.library.crafting.*; +import tconstruct.library.tools.ToolMaterial; +import tconstruct.smeltery.TinkerSmeltery; +import tconstruct.tools.TinkerTools; +import tconstruct.weaponry.TinkerWeaponry; + +import java.util.ListIterator; public class BloodArsenalTinkers { @@ -38,11 +58,139 @@ public class BloodArsenalTinkers public static PartHelper TOUGHBIND; public static PartHelper TOUGHROD; + public static Fluid bloodInfusedIron = new Fluid("molten.bloodInfusedIron").setDensity(3000).setViscosity(6000).setTemperature(1300); + public static void init() { - addMaterials(); +// addMaterials(); addParts(); + addLifeInfusedIronMaterial(); + addLiquids(); + + MinecraftForge.EVENT_BUS.register(new TConEvents()); + } + + public static void addLifeInfusedIronMaterial() + { + if (ModItems.itemsNotToBeRegistered.contains(ModItems.blood_infused_iron) && ModBlocks.blocksNotToBeRegistered.contains(ModBlocks.blood_infused_iron_block)) + { + return; + } + + final int id = 250; + + + + NBTTagCompound tag = new NBTTagCompound(); + tag.setInteger("Id", id); + + final ToolMaterial material = new ToolMaterial("blood_infused_iron", "material.blood_infused_iron", 550, 1800, 3, 3, 1.5F, 0, 0.0F, EnumChatFormatting.DARK_RED.toString(), 16777215); + +/* tag.setString("Name", "Blood Infused Iron"); + tag.setString("localizationString", "material.blood_infused_iron"); + tag.setInteger("Durability", 550); + tag.setInteger("MiningSpeed", 1800); + tag.setInteger("HarvestLevel", 3); + tag.setInteger("Attack", 3); + tag.setFloat("HandleModifier", 1.5F); + tag.setInteger("Reinforced", 0); + tag.setFloat("Bow_ProjectileSpeed", 3.0F); + tag.setInteger("Bow_DrawSpeed", 40); + tag.setFloat("Projectile_Mass", 4.7F); + tag.setFloat("Projectile_Fragility", 0.2F); + tag.setString("Style", EnumChatFormatting.BLACK.toString()); + tag.setInteger("Color", 16777215); + FMLInterModComms.sendMessage("TConstruct", "addMaterial", tag); + + FluidRegistry.registerFluid(bloodInfusedIron); + + FluidType.registerFluidType(bloodInfusedIron.getName(), ModBlocks.blood_infused_iron_block, 0, 850, bloodInfusedIron, true); + Smeltery.addMelting(new ItemStack(ModBlocks.blood_infused_iron_block, 1), ModBlocks.blood_infused_iron_block, 0, 850, new FluidStack(bloodInfusedIron, 1296)); + Smeltery.addMelting(new ItemStack(ModItems.blood_infused_iron, 1, 0), ModBlocks.blood_infused_iron_block, 0, 850, new FluidStack(bloodInfusedIron, 144)); + + ItemStack ingotcast = new ItemStack(TinkerSmeltery.metalPattern, 1, 0); + TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(ModBlocks.blood_infused_iron_block, 1), new FluidStack(bloodInfusedIron, 1296), null, true, 100); + TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(ModItems.blood_infused_iron, 1), new FluidStack(bloodInfusedIron, 144), ingotcast, false, 50); + + tag = new NBTTagCompound(); + tag.setString("FluidName", bloodInfusedIron.getName()); + tag.setInteger("MaterialId", id); + FMLInterModComms.sendMessage("TConstruct", "addPartCastingMaterial", tag); + + tag = new NBTTagCompound(); + tag.setInteger("MaterialId", id); + tag.setTag("Item", new ItemStack(ModItems.blood_infused_iron, 1, 0).writeToNBT(new NBTTagCompound())); + tag.setInteger("Value", 2); + FMLInterModComms.sendMessage("TConstruct", "addMaterialItem", tag); + */ + TConstructRegistry.addtoolMaterial(id, material); + TConstructRegistry.addDefaultToolPartMaterial(id); + TConstructRegistry.addBowMaterial(id, 40, 1.2F); + TConstructRegistry.addArrowMaterial(id, 4.7F, 0.2F); + + BloodArsenal.proxy.executeClientCode(new IClientCode() + { + @SideOnly(Side.CLIENT) + public void executeClientCode() + { + if (FMLCommonHandler.instance().getSide().isClient()) { + TConstructClientRegistry.addMaterialRenderMapping(id, "tinker", material.name().toLowerCase(), true); + } + } + }); + + FluidRegistry.registerFluid(bloodInfusedIron); + + FluidType.registerFluidType(bloodInfusedIron.getName(), ModBlocks.blood_infused_iron_block, 0, 850, bloodInfusedIron, true); + Smeltery.addMelting(new ItemStack(ModBlocks.blood_infused_iron_block, 1), ModBlocks.blood_infused_iron_block, 0, 850, new FluidStack(bloodInfusedIron, 1296)); + Smeltery.addMelting(new ItemStack(ModItems.blood_infused_iron, 1, 0), ModBlocks.blood_infused_iron_block, 0, 850, new FluidStack(bloodInfusedIron, 144)); + + ItemStack ingotcast = new ItemStack(TinkerSmeltery.metalPattern, 1, 0); + TConstructRegistry.getBasinCasting().addCastingRecipe(new ItemStack(ModBlocks.blood_infused_iron_block, 1), new FluidStack(bloodInfusedIron, 1296), null, true, 100); + TConstructRegistry.getTableCasting().addCastingRecipe(new ItemStack(ModItems.blood_infused_iron, 1), new FluidStack(bloodInfusedIron, 144), ingotcast, false, 50); + + tag = new NBTTagCompound(); + tag.setString("FluidName", bloodInfusedIron.getName()); + tag.setInteger("MaterialId", id); + FMLInterModComms.sendMessage("TConstruct", "addPartCastingMaterial", tag); + + tag = new NBTTagCompound(); + tag.setInteger("MaterialId", id); + tag.setTag("Item", new ItemStack(ModItems.blood_infused_iron, 1, 0).writeToNBT(new NBTTagCompound())); + tag.setInteger("Value", 2); + FMLInterModComms.sendMessage("TConstruct", "addMaterialItem", tag); + + BloodArsenal.proxy.executeClientCode(new IClientCode() + { + @SideOnly(Side.CLIENT) + public void executeClientCode() + { + new TextureResourcePackBloodInfusedIron("blood_infused_iron").register(); + } + }); + } + + public static void addLiquids() + { + LiquidCasting tb = TConstructRegistry.getTableCasting(); + for (ListIterator iterator = tb.getCastingRecipes().listIterator(); iterator.hasNext();) + { + CastingRecipe castingRecipe = iterator.next(); + + if ((castingRecipe != null) && (castingRecipe.getClass() == CastingRecipe.class) && (castingRecipe.output != null) && (castingRecipe.output.getItem() == TinkerWeaponry.partBolt) && (castingRecipe.cast != null) && (castingRecipe.cast.getItem() == TinkerTools.toolRod)) + { + int materialID = ToolBuilder.instance.getMaterialID(castingRecipe.cast); + + if (materialID > 0) + { + if (materialID == 250) + { + iterator.set(new TConCastingRecipe(castingRecipe)); + } + } + } + } } public static void addMaterials() @@ -60,7 +208,7 @@ public class BloodArsenalTinkers { initParts(); - addMaterialToToolParts(250, "blood.infused.iron", "blood_infused_iron"); +// addMaterialToToolParts(250, "blood.infused.iron", "blood_infused_iron"); registerParts(); } diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/IClientCode.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/IClientCode.java new file mode 100644 index 0000000..a79ecf3 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/IClientCode.java @@ -0,0 +1,10 @@ +package com.arc.bloodarsenal.common.tinkers; + +import cpw.mods.fml.relauncher.Side; +import cpw.mods.fml.relauncher.SideOnly; + +public interface IClientCode +{ + @SideOnly(Side.CLIENT) + void executeClientCode(); +} diff --git a/src/main/java/com/arc/bloodarsenal/items/tinkers/ModSoulbound.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/ModSoulbound.java similarity index 90% rename from src/main/java/com/arc/bloodarsenal/items/tinkers/ModSoulbound.java rename to src/main/java/com/arc/bloodarsenal/common/tinkers/ModSoulbound.java index 87c4aa0..950f894 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tinkers/ModSoulbound.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/ModSoulbound.java @@ -1,16 +1,10 @@ -package com.arc.bloodarsenal.items.tinkers; +package com.arc.bloodarsenal.common.tinkers; -import WayofTime.alchemicalWizardry.api.items.interfaces.IBloodOrb; import net.minecraft.item.ItemStack; import net.minecraft.nbt.NBTTagCompound; import net.minecraftforge.oredict.OreDictionary; import tconstruct.library.modifier.IModifyable; -import tconstruct.library.modifier.ItemModifier; -import tconstruct.library.tools.ToolCore; import tconstruct.modifiers.tools.ModBoolean; -import tconstruct.modifiers.tools.ModInteger; - -import java.util.ArrayList; public class ModSoulbound extends ModBoolean { diff --git a/src/main/java/com/arc/bloodarsenal/items/tinkers/PartHelper.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/PartHelper.java similarity index 96% rename from src/main/java/com/arc/bloodarsenal/items/tinkers/PartHelper.java rename to src/main/java/com/arc/bloodarsenal/common/tinkers/PartHelper.java index 1733cdc..0624243 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tinkers/PartHelper.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/PartHelper.java @@ -1,7 +1,6 @@ -package com.arc.bloodarsenal.items.tinkers; +package com.arc.bloodarsenal.common.tinkers; -import com.arc.bloodarsenal.BloodArsenal; -import cpw.mods.fml.common.registry.GameRegistry; +import com.arc.bloodarsenal.common.BloodArsenal; import cpw.mods.fml.relauncher.Side; import cpw.mods.fml.relauncher.SideOnly; import net.minecraft.client.renderer.texture.IIconRegister; @@ -14,7 +13,6 @@ import tconstruct.library.util.IToolPart; import java.util.HashMap; import java.util.List; -import java.util.Locale; import java.util.Map; public class PartHelper extends Item implements IToolPart diff --git a/src/main/java/com/arc/bloodarsenal/items/tinkers/RecipeHelper.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/RecipeHelper.java similarity index 98% rename from src/main/java/com/arc/bloodarsenal/items/tinkers/RecipeHelper.java rename to src/main/java/com/arc/bloodarsenal/common/tinkers/RecipeHelper.java index 4ecd9c2..52e94bd 100644 --- a/src/main/java/com/arc/bloodarsenal/items/tinkers/RecipeHelper.java +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/RecipeHelper.java @@ -1,8 +1,6 @@ -package com.arc.bloodarsenal.items.tinkers; +package com.arc.bloodarsenal.common.tinkers; -import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.items.ModItems; -import cpw.mods.fml.common.Optional; +import com.arc.bloodarsenal.common.items.ModItems; import cpw.mods.fml.common.registry.GameRegistry; import net.minecraft.item.Item; import net.minecraft.item.ItemStack; diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TConCastingRecipe.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TConCastingRecipe.java new file mode 100644 index 0000000..bbe2a25 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/TConCastingRecipe.java @@ -0,0 +1,25 @@ +package com.arc.bloodarsenal.common.tinkers; + +import net.minecraft.item.ItemStack; +import net.minecraftforge.fluids.FluidStack; +import tconstruct.library.client.FluidRenderProperties; +import tconstruct.library.crafting.CastingRecipe; + +public class TConCastingRecipe extends CastingRecipe +{ + public TConCastingRecipe(ItemStack replacement, FluidStack metal, ItemStack cast, boolean consume, int delay, FluidRenderProperties props) + { + super(replacement, metal, cast, consume, delay, props); + } + + public TConCastingRecipe(CastingRecipe recipe) + { + super(recipe.output.copy(), recipe.castingMetal.copy(), recipe.cast.copy(), recipe.consumeCast, recipe.coolTime, recipe.fluidRenderProperties); + } + + @Override + public boolean matches(FluidStack metal, ItemStack inputCast) + { + return (this.castingMetal != null) && (this.castingMetal.isFluidEqual(metal)) && (inputCast != null) && (this.cast != null) && (inputCast.getItem() == this.cast.getItem()) && ((this.cast.getItemDamage() == Short.MAX_VALUE)); + } +} diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java new file mode 100644 index 0000000..4141189 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/TConEvents.java @@ -0,0 +1,24 @@ +package com.arc.bloodarsenal.common.tinkers; + +public class TConEvents +{ +/* @SideOnly(Side.CLIENT) + @SubscribeEvent + public void handleStich(TextureStitchEvent.Pre event) { + if (event.map.getTextureType() != 0) { + return; + } + BloodArsenalTinkers.bloodInfusedIron.setIcons(event.map.registerIcon("TConIntegration.bedrock")); + + TextureAtlasSprite sprite = new TextureBedrockLava("extrautils:bedrockFluid", "lava_still"); + event.map.setTextureEntry("extrautils:bedrockFluid", sprite); + if (BloodArsenalTinkers.bloodInfusedIron != null) { + BloodArsenalTinkers.bloodInfusedIron.setIcons(sprite); + } + sprite = new TextureBedrockLava("extrautils:bedrockFluid_flowing", "lava_flow"); + if ((event.map.setTextureEntry("extrautils:bedrockFluid_flowing", sprite)) && + (BloodArsenalTinkers.bloodInfusedIron != null)) { + BloodArsenalTinkers.bloodInfusedIron.setFlowingIcon(sprite); + } + } +*/} diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureDerived.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureDerived.java new file mode 100644 index 0000000..fec6c90 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureDerived.java @@ -0,0 +1,96 @@ +package com.arc.bloodarsenal.common.tinkers; + +import cpw.mods.fml.client.FMLClientHandler; +import net.minecraft.client.Minecraft; +import net.minecraft.client.renderer.texture.TextureAtlasSprite; +import net.minecraft.client.resources.IResource; +import net.minecraft.client.resources.IResourceManager; +import net.minecraft.client.resources.data.AnimationMetadataSection; +import net.minecraft.util.ResourceLocation; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.awt.image.DirectColorModel; +import java.io.IOException; + +public abstract class TextureDerived extends TextureAtlasSprite +{ + private final String baseIcon; + private final String basePath; + private final TextureMapType type; + + public static enum TextureMapType + { + BLOCK(0, "textures/blocks"), ITEM(1, "textures/items"); + + public final int textureMapType; + public final String basePath; + + private TextureMapType(int textureMapType, String basePath) + { + this.textureMapType = textureMapType; + this.basePath = basePath; + } + } + + public TextureDerived(String p_i1282_1_, String baseIcon, TextureMapType type) + { + super(p_i1282_1_); + this.baseIcon = baseIcon; + this.type = type; + this.basePath = type.basePath; + } + + public static DirectColorModel rgbBase = new DirectColorModel(32, 16711680, 65280, 255, -16777216); + protected DirectColorModel rgb = rgbBase; + + public int getLuminosity(int col) + { + return getLuminosity(this.rgb.getRed(col), this.rgb.getGreen(col), this.rgb.getBlue(col)); + } + + public int getLuminosity(int r, int g, int b) + { + return (int)(r * 0.2126F + g * 0.7152F + b * 0.0722F); + } + + public boolean hasCustomLoader(IResourceManager manager, ResourceLocation location) + { + return true; + } + + public abstract BufferedImage processImage(BufferedImage paramBufferedImage, AnimationMetadataSection paramAnimationMetadataSection); + + public boolean load(IResourceManager manager, ResourceLocation oldlocation) + { + ResourceLocation location = new ResourceLocation(this.baseIcon); + location = completeResourceLocation(location); + try + { + int mipmapLevels = Minecraft.getMinecraft().gameSettings.mipmapLevels; + int anisotropicFiltering = Minecraft.getMinecraft().gameSettings.anisotropicFiltering; + IResource iresource = manager.getResource(location); + BufferedImage[] abufferedimage = new BufferedImage[1 + mipmapLevels]; + abufferedimage[0] = ImageIO.read(iresource.getInputStream()); + AnimationMetadataSection animationmetadatasection = (AnimationMetadataSection)iresource.getMetadata("animation"); + abufferedimage[0] = processImage(abufferedimage[0], animationmetadatasection); + loadSprite(abufferedimage, animationmetadatasection, anisotropicFiltering > 1.0F); + } + catch (RuntimeException runtimeexception) + { + FMLClientHandler.instance().trackBrokenTexture(location, runtimeexception.getMessage()); + return true; + } + catch (IOException ioexception1) + { + FMLClientHandler.instance().trackMissingTexture(location); + return true; + } + return false; + } + + private ResourceLocation completeResourceLocation(ResourceLocation p_147634_1_) + { + return new ResourceLocation(p_147634_1_.getResourceDomain(), String.format("%s/%s%s", new Object[] { this.basePath, p_147634_1_.getResourcePath(), ".png" })); + } +} diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureLiquidLava.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureLiquidLava.java new file mode 100644 index 0000000..27185b8 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureLiquidLava.java @@ -0,0 +1,56 @@ +package com.arc.bloodarsenal.common.tinkers; + +public abstract class TextureLiquidLava extends TextureDerived +{ + public TextureLiquidLava(String p_i1282_1_, String baseIcon) + { + super(p_i1282_1_, baseIcon, TextureDerived.TextureMapType.BLOCK); + } +/* + public BufferedImage processImage(BufferedImage image, AnimationMetadataSection animationmetadatasection) + { + int w = image.getWidth(); + int h = image.getHeight(); + + int[] pixels = new int[h * w]; + image.getRGB(0, 0, w, h, pixels, 0, w); + + double mean = 0.0D; + for (int i = 0; i < pixels.length; i++) + { + pixels[i] = getLuminosity(pixels[i]); + mean += pixels[i]; + } + mean /= pixels.length; + + BufferedImage bedrockImage = TextureResourcePackBloodInfusedIron.getBedrockImage(); + for (int i = 0; i < pixels.length; i++) + { + int x = i % w; + int y = (i - x) / w % w; + int sn = (i - x) / w / w; + + int dx = x * bedrockImage.getWidth() / w; + int dy = y * bedrockImage.getHeight() / w; + + int col = bedrockImage.getRGB(dx, dy); + + double f = pixels[i] / mean; + + int r = clamp(this.rgb.getRed(col) * f); + int g = clamp(this.rgb.getGreen(col) * f); + int b = clamp(this.rgb.getBlue(col) * f); + + pixels[i] = (0xFF000000 | r << 16 | g << 8 | b); + } + image.setRGB(0, 0, w, h, pixels, 0, w); + + return image; + } + + private int clamp(double v) + { + return MathHelper.func_76125_a((int) v, 0, 255); + } + */ +} diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBase.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBase.java new file mode 100644 index 0000000..34016d9 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBase.java @@ -0,0 +1,208 @@ +package com.arc.bloodarsenal.common.tinkers; + +import amerifrance.guideapi.util.LogHelper; +import com.google.common.base.Throwables; +import cpw.mods.fml.client.FMLClientHandler; +import cpw.mods.fml.common.ObfuscationReflectionHelper; +import net.minecraft.client.Minecraft; +import net.minecraft.client.resources.*; +import net.minecraft.client.resources.data.IMetadataSection; +import net.minecraft.client.resources.data.IMetadataSerializer; +import net.minecraft.util.ResourceLocation; + +import javax.imageio.ImageIO; +import java.awt.image.BufferedImage; +import java.awt.image.DirectColorModel; +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Set; + +public abstract class TextureResourcePackBase implements IResourcePack, IResourceManagerReloadListener +{ + public static List packs; + protected static DirectColorModel rgb = new DirectColorModel(32, 16711680, 65280, 255, -16777216); + protected final String name; + public HashMap cachedImages = new HashMap(); + protected IResourcePack delegate; + protected List resourcePacks = null; + + public TextureResourcePackBase(String name) + { + this.name = name.toLowerCase(); + this.delegate = FMLClientHandler.instance().getResourcePackFor("TConstruct"); + } + + public int brightness(int col) + { + return brightness(rgb.getRed(col), rgb.getGreen(col), rgb.getBlue(col)); + } + + public int brightness(int r, int g, int b) + { + return (int)(r * 0.2126F + g * 0.7152F + b * 0.0722F); + } + + public void register() + { + List packs = getResourcePacks(); + packs.add(this); + ((IReloadableResourceManager) Minecraft.getMinecraft().getResourceManager()).registerReloadListener(this); + LogHelper.info("Registered TConstruct Resource Pack (" + this.name + ") - " + getClass().getSimpleName()); + } + + public List getResourcePacks() + { + List packs1 = packs; + if (packs1 == null) { + packs1 = ObfuscationReflectionHelper.getPrivateValue(FMLClientHandler.class, FMLClientHandler.instance(), new String[]{"resourcePackList"}); + } + return packs1; + } + + public InputStream getStream(ResourceLocation location) + { + InputStream stream = null; + + for (IResourcePack iResourcePack : getPacks()) + { + if (iResourcePack.resourceExists(location)) + { + try + { + stream = iResourcePack.getInputStream(location); + } + catch (IOException ignore) {} + } + } + return stream; + } + + public List getPacks() + { + if (this.resourcePacks == null) + { + this.resourcePacks = new ArrayList(); + this.resourcePacks.add(this.delegate); + List t = Minecraft.getMinecraft().getResourcePackRepository().getRepositoryEntriesAll(); + for (ResourcePackRepository.Entry entry : t) + { + IResourcePack resourcePack = entry.getResourcePack(); + if (resourcePack.getPackName().contains("tinker")) + { + this.resourcePacks.add(resourcePack); + } + } + } + return this.resourcePacks; + } + + @Override + public InputStream getInputStream(ResourceLocation p_110590_1_) throws IOException + { + byte[] bytes = this.cachedImages.get(p_110590_1_); + if (bytes == null) + { + ResourceLocation location = new ResourceLocation("tinker", p_110590_1_.getResourceDomain().replace(this.name, "")); + InputStream inputStream = getStream(location); + if (inputStream == null) + { + location = new ResourceLocation("tinker", p_110590_1_.getResourceDomain().replace(this.name, "iron")); + inputStream = getStream(location); + } + if (inputStream == null) + { + location = new ResourceLocation("tinker", p_110590_1_.getResourceDomain().replace(this.name, "stone")); + inputStream = getStream(location); + } + if (inputStream == null) + { + return this.delegate.getInputStream(p_110590_1_); + } + BufferedImage bufferedimage; + try + { + bufferedimage = ImageIO.read(inputStream); + } + catch (IOException err) + { + throw Throwables.propagate(err); + } + BufferedImage image; + try + { + image = modifyImage(bufferedimage); + } + catch (Throwable t) + { + t.printStackTrace(); + return this.delegate.getInputStream(location); + } + ByteArrayOutputStream stream = new ByteArrayOutputStream(); + ImageIO.write(image, "PNG", stream); + bytes = stream.toByteArray(); + this.cachedImages.put(location, bytes); + } + return new ByteArrayInputStream(bytes); + } + + public abstract BufferedImage modifyImage(BufferedImage paramBufferedImage); + + @Override + public boolean resourceExists(ResourceLocation p_110589_1_) + { + if (!"tinker".equals(p_110589_1_.getResourceDomain())) + { + return false; + } + String resourcePath = p_110589_1_.getResourcePath(); + if ((!resourcePath.startsWith("textures/items/")) || (!resourcePath.endsWith(".png"))) + { + return false; + } + if (this.delegate.resourceExists(p_110589_1_)) + { + return false; + } + if (!resourcePath.contains(this.name)) + { + return false; + } + return (this.delegate.resourceExists(new ResourceLocation("tinker", resourcePath.replace(this.name, "stone")))) || (this.delegate.resourceExists(new ResourceLocation("tinker", resourcePath.replace(this.name, "iron")))) || (this.delegate.resourceExists(new ResourceLocation("tinker", resourcePath.replace(this.name, "")))); + } + + @Override + public Set getResourceDomains() + { + return this.delegate.getResourceDomains(); + } + + @Override + public IMetadataSection getPackMetadata(IMetadataSerializer p_135058_1_, String p_135058_2_) throws IOException + { + return null; + } + + @Override + public BufferedImage getPackImage() throws IOException + { + return null; + } + + @Override + public String getPackName() + { + return "BA_Delegate_Pack"; + } + + @Override + public void onResourceManagerReload(IResourceManager p_110549_1_) + { + this.cachedImages.clear(); + this.resourcePacks = null; + } +} diff --git a/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBloodInfusedIron.java b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBloodInfusedIron.java new file mode 100644 index 0000000..d63ecd3 --- /dev/null +++ b/src/main/java/com/arc/bloodarsenal/common/tinkers/TextureResourcePackBloodInfusedIron.java @@ -0,0 +1,358 @@ +package com.arc.bloodarsenal.common.tinkers; + +import net.minecraft.util.MathHelper; + +import java.awt.image.BufferedImage; + +public class TextureResourcePackBloodInfusedIron extends TextureResourcePackBase +{ + public TextureResourcePackBloodInfusedIron(String name) + { + super(name); + } + + public BufferedImage modifyImage(BufferedImage image) + { + int w = image.getWidth(); + int h = image.getHeight(); + + image.getType(); + + int[][] pixels = new int[w][h]; + int[][] base = new int[w][h]; + + int mean = 0; + int div = 0; + for (int x = 0; x < w; x++) + { + for (int y = 0; y < h; y++) + { + int c = image.getRGB(x, y); + pixels[x][y] = brightness(c); + boolean nottrans = (c != 0) && (rgb.getAlpha(c) > 64); + if (nottrans) + { + base[x][y] = 1; + mean += pixels[x][y]; + div++; + } + } + } + mean = mean / div * 2 / 4; + int n; + if (w >= 256) + { + n = 5; + } + else + { + if (w >= 128) + { + n = 4; + } + else + { + if (w >= 64) + { + n = 3; + } + else + { + if (w >= 32) + { + n = 2; + } else + { + n = 1; + } + } + } + } + int[][] baseSilhouette = contract(base, n); + + int[][] interior1 = contract(baseSilhouette, n); + + int[][] baseCorners = multI(mult(expand(getCorners(baseSilhouette), n), baseSilhouette), interior1); + int[][] baseCornersShift = orwise(orwise(shift(baseCorners, 0, -1), shift(baseCorners, -1, 0)), shift(baseCorners, -1, -1)); + + int[][] interior2 = contract(interior1, 2 * n); + + int[][] interior3 = contract(interior2, n); + int[][] interior4 = contract(interior3, n); + + int[][] interiorCorners = multI(mult(expand(getCorners(interior2), n), interior2), interior3); + int[][] interiorCornersShift = orwise(orwise(shift(interiorCorners, -1, 0), shift(interiorCorners, 0, -1)), shift(interiorCorners, -1, -1)); + + int trans = 0; + int gold = -398001; + int gold_highlight = -117; + int wood = -6455217; + int darkwood = -10071758; + + int[][] outpixels = new int[w][w]; + for (int x = 0; x < w; x++) + { + for (int y = 0; y < h; y++) + { + if (baseSilhouette[x][y] == 0) + { + if (base[x][y] != 0) + { + outpixels[x][y] = multPixel(darkwood, pixels[x][y] / 2); + } + else + { + outpixels[x][y] = trans; + } + } + else if (interior1[x][y] == 0) + { + if (baseCorners[x][y] != 0) + { + if (baseCornersShift[x][y] != 0) + { + outpixels[x][y] = multPixel(gold, Math.max(pixels[x][y], mean)); + } + else + { + outpixels[x][y] = multPixel(gold_highlight, Math.max(pixels[x][y], mean) + 5); + } + } + else + { + outpixels[x][y] = multPixel(darkwood, pixels[x][y]); + } + } + else if ((interior2[x][y] == 0) || (interior3[x][y] != 0)) + { + if ((interior3[x][y] != 0) && (interior4[x][y] == 0)) + { + outpixels[x][y] = multPixel(wood, pixels[x][y] * 3 / 4); + } + else + { + outpixels[x][y] = multPixel(wood, pixels[x][y]); + } + } + else if (interiorCorners[x][y] != 0) + { + if (interiorCornersShift[x][y] != 0) + { + outpixels[x][y] = multPixel(gold, Math.max(pixels[x][y], mean)); + } + else + { + outpixels[x][y] = multPixel(gold_highlight, Math.max(pixels[x][y], mean) + 5); + } + } + else + { + outpixels[x][y] = multPixel(darkwood, pixels[x][y]); + } + image.setRGB(x, y, outpixels[x][y]); + } + } + return image; + } + + private int[][] orwise(int[][] a, int[][] b) + { + for (int i = 0; i < a.length; i++) + { + for (int j = 0; j < a[i].length; j++) + { + a[i][j] |= b[i][j]; + } + } + return a; + } + + private int[][] mult(int[][] a, int[][] b) + { + for (int i = 0; i < a.length; i++) + { + for (int j = 0; j < a[i].length; j++) + { + a[i][j] &= b[i][j]; + } + } + return a; + } + + private int[][] multI(int[][] a, int[][] b) + { + for (int i = 0; i < a.length; i++) + { + for (int j = 0; j < a[i].length; j++) + { + a[i][j] &= (b[i][j] == 0 ? 1 : 0); + } + } + return a; + } + + private int[][] expand(int[][] base, int n) + { + int[][] output = expand(base); + for (int i = 0; i < n - 1; i++) + { + output = expand(output); + } + return output; + } + + private int[][] contract(int[][] base, int n) + { + int[][] output = contract(base); + for (int i = 0; i < n - 1; i++) + { + output = contract(output); + } + return output; + } + + public int multPixel(int col, int b) + { + return 0xFF000000 | clamp(rgb.getRed(col) * b / 255) << 16 | clamp(rgb.getGreen(col) * b / 255) << 8 | clamp(rgb.getBlue(col) * b / 255); + } + + private int clamp(int i) + { + return MathHelper.clamp_int(i, 0, 255); + } + + public boolean get(int[][] img, int x, int y) + { + return (x >= 0) && (y >= 0) && (x < img.length) && (y < img[x].length) && (img[x][y] != 0); + } + + static int[][] offsets = { { 0, 1 }, { 1, 1 }, { 1, 0 }, { 1, -1 }, { 0, -1 }, { -1, -1 }, { -1, 0 }, { -1, 1 } }; + + public int[][] shift(int[][] img, int dx, int dy) + { + int w = img.length; + int[][] img2 = new int[w][w]; + for (int x = Math.max(-dx, 0); x < Math.min(w, w + dx); x++) + { + System.arraycopy(img[(x + dx)], Math.max(-dy, 0) + dy, img2[x], Math.max(-dy, 0), Math.min(w, w + dy) - Math.max(-dy, 0)); + } + return img2; + } + + public int[][] getCorners(int[][] img) + { + int w = img.length; + int[][] img2 = new int[w][w]; + for (int x = 0; x < w; x++) + { + for (int y = 0; y < w; y++) + { + if (img[x][y] != 0) + { + int an = -1; + int n = 0; + for (int[] offset : offsets) + { + if (get(img, x + offset[0], y + offset[1])) + { + if (an == -1) + { + an = n; + } + n = 0; + } + else + { + n++; + if (n == 5) + { + break; + } + } + } + if (an != -1) + { + n += an; + } + if (n >= 5) + { + img2[x][y] = 1; + } + } + } + } + return img2; + } + + public int[][] contract(int[][] img) + { + int w = img.length; + int[][] img2 = new int[w][w]; + for (int x = 0; x < w; x++) + { + System.arraycopy(img[x], 0, img2[x], 0, w); + } + for (int x = 0; x < w; x++) + { + for (int y = 0; y < w; y++) + { + if (img[x][y] != 0) + { + if ((x == 0) || (y == 0) || (x == w - 1) || (y == w - 1)) + { + img2[x][y] = 0; + } + } + else + { + if (x > 0) + { + img2[(x - 1)][y] = 0; + } + if (y > 0) + { + img2[x][(y - 1)] = 0; + } + if (x < w - 1) + { + img2[(x + 1)][y] = 0; + } + if (y < w - 1) + { + img2[x][(y + 1)] = 0; + } + } + } + } + return img2; + } + + public int[][] expand(int[][] img) + { + int w = img.length; + int[][] img2 = new int[w][w]; + for (int x = 0; x < w; x++) + { + System.arraycopy(img[x], 0, img2[x], 0, w); + } + for (int x = 0; x < w; x++) + { + for (int y = 0; y < w; y++) + { + if (img[x][y] != 0) + { + for (int[] offset : offsets) + { + int dx = x + offset[0]; + int dy = y + offset[1]; + if ((dx >= 0) && (dy >= 0) && (dx < w) && (dy < w)) + { + img2[dx][dy] = 1; + } + } + } + } + } + return img2; + } +} diff --git a/src/main/java/com/arc/bloodarsenal/entity/ModEntities.java b/src/main/java/com/arc/bloodarsenal/entity/ModEntities.java deleted file mode 100644 index 5b89dd6..0000000 --- a/src/main/java/com/arc/bloodarsenal/entity/ModEntities.java +++ /dev/null @@ -1,15 +0,0 @@ -package com.arc.bloodarsenal.entity; - -import com.arc.bloodarsenal.BloodArsenal; -import com.arc.bloodarsenal.entity.mob.EntityBloodHound; -import cpw.mods.fml.common.registry.EntityRegistry; - -public class ModEntities -{ - public static void init() - { - int id = 0; - - - } -} diff --git a/src/main/java/com/arc/bloodarsenal/items/armor/LifeImbuedArmor.java b/src/main/java/com/arc/bloodarsenal/items/armor/LifeImbuedArmor.java deleted file mode 100644 index 9124af7..0000000 --- a/src/main/java/com/arc/bloodarsenal/items/armor/LifeImbuedArmor.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.arc.bloodarsenal.items.armor; - -import com.arc.bloodarsenal.BloodArsenal; -import net.minecraft.item.ItemArmor; - -public class LifeImbuedArmor extends ItemArmor -{ - public LifeImbuedArmor(int armorType) - { - super(BloodArsenal.lifeImbuedArmor, 0, armorType); - setCreativeTab(BloodArsenal.BA_TAB); - } -} diff --git a/src/main/resources/assets/bloodarsenal/lang/en_US.lang b/src/main/resources/assets/bloodarsenal/lang/en_US.lang index 9972b8c..64d29f9 100644 --- a/src/main/resources/assets/bloodarsenal/lang/en_US.lang +++ b/src/main/resources/assets/bloodarsenal/lang/en_US.lang @@ -24,6 +24,7 @@ tile.lp_materializer.name=Life Essence Materializer tile.compacter.name=Soul Compacter tile.compacted_mrs.name=Compacted Master Ritual Stone tile.blood_cake.name=Blood Cake +tile.block_burned_string.name=Blood Burned String #Items item.bound_bow.name=Bound Bow @@ -91,6 +92,10 @@ item.glass_chestplate.name=Glass Chestplate item.glass_leggings.name=Glass Leggings item.glass_boots.name=Glass Boots item.transparent_orb.name=Transparent Orb +item.life_imbued_helmet.name=Life Imbued Helmet +item.life_imbued_chestplate.name=Life Imbued Chestplate +item.life_imbued_leggings.name=Life Imbued Leggings +item.life_imbued_boots.name=Life Imbued Boots #Death Texts death.attack.deathFromBlood=%1$s lost too much blood @@ -136,6 +141,7 @@ tooltip.sigil.lightning=Let 'er rip! tooltip.sigil.lightning2=Mode: tooltip.bloodMoney.money=Pay your debts in blood! tooltip.armor.glassArmor=More painful than it looks +tooltip.armor.lifeImbuedArmor=Living Armor tooltip.energybattery.currentLP=Current LP: tooltip.shiftinfo=Press &cSHIFT&7 for more info @@ -146,6 +152,8 @@ tooltip.currentEssence=Current Essence: tooltip.altarTier=Altar Tier: tooltip.capacity=Capacity: +tooltip.fillable.currentAmount=Stored LP: + tooltip.bauble.sacrifice=Collecting some life! tooltip.bauble.empowered_sacrifice=Collecting more life! tooltip.bauble.self_sacrifice=Collecting your life! @@ -173,6 +181,7 @@ message.enchant.noEnchantments=There are no enchantments to apply! message.enchant.notEnoughLP=You do not have enough LP! message.enchant.The enchantment is not valid for the item +message.tile.contains=Contains: #Miscs ba.versioning.update=Get the latest Blood Arsenal, NOW! @@ -184,9 +193,10 @@ ba.versioning.error=An error has occurred while downloading the mod! ba.versioning.downloadedAlready=You have the latest version already, delete the old BloodArsenal .jar and reload your game to update! ba.versioning.downloadingAlready=It's downloading! Be patient! ba.versioning.disabled=This feature is disabled. +owner=Owner: #TConstruct Stuffs -material.blood.infused.iron=Blood Infused Iron +material.blood_infused_iron=Blood Infused Iron part.arrowhead=@material@ Arrowhead part.axe.head=@material@ Axe Head diff --git a/src/main/resources/assets/bloodarsenal/models/armor/life_imbued_layer_1.png b/src/main/resources/assets/bloodarsenal/models/armor/life_imbued_layer_1.png new file mode 100644 index 0000000000000000000000000000000000000000..b6ccd03b7dafce64a0c47213496417c8fc6b2a23 GIT binary patch literal 2171 zcmV->2!!{EP)(6VTgzjSxcEQ{19;42FMi(c*YP}ivp!E{6QGtwvO@WC!YYIfOU>+K2K!rkH-Mk zT71vLIY%)JiTOU}#})$CIjnO8zE8~ei3h=t#{eVU-TY7?H_G#sxg51imon7bOKoQ- zu~LcA#zp|D2L=d(fGfw3lUlQei6cjtjK{y$0`7JlVE|SQ59<@#x6`nGJvEb)ENyJ0 z;CY-pcMgE5WRl_fdLritqlnMu&u1!`1mME)IK2(7PT2jSoJk=l1O*vwy#qf#k1|JtHDger=A< z$>oTRk8`!5K|J55_TohigMi$$7iEHgs_FO4=%^&E)d>+6FI%Q(PMna-&CNQmp+ScF z`t)=vMKouQ3^q0CWN)wB^(-*Z-7S;8Pp+m$0G*7-`OmIJbX4>ApTGsIoborr>!z@b0@Z8jthvu3i6kQV;LiC8O~;YuZ2oM0tD8j^I7~jY9JbrWj zynN#jxEVa>So^{YELpdX$TY1*`jyee7e zc>4M0d2RlDeQn`F{mY_7x}&~cf3=ECW=s?V6AN4wk;~`*x?e!xL>^Z zVsz^4S>IVpL4={vQA*BHa*n*UXjvK0yz~-B`umBAuwvOVP7V%|iz1xo5m)7GPY*ap zU@dcv;osfe*qM{}JdPheOqu7Q#xO4oxzyWB%J;t=61*9%ig0OUgiNVK!Z~8j;YuaO z$H%=j8#nU!bI*Cbr%(H0j83XDuFBxh5XEAVi6}zD5D5YXCnuScN|CClp#S`NCNdc& zRJmd;$BrH2;f)*Rfx0>=8pEeYkMhWd4f2!PT5-U^k3QmOPd_c~b#-EVpTWL9R&CrU z_oh;E$34J^;No!*!K$KBL?V%3cx+6JFdH8OWZjwT)s@c zSY&u?45vyg2tbvb2oKcMNX+xdOzV;>7Az2ed`}Mm57pKRz|i5t04%Ml5`e28fBfxA zVmE{;W$`$1-$#t0pvtlSej;nH{Vo*neIHMRtaBhj%=f7%D+5(5Fg!9sEFLEjk6%}t z6G4Cz;e}JD?yMg0kH$uoX)-Gs17UdWY7A-&Wu+1Y5v=bcK$&xdA{d}DiWmZX&*Q%z ze84>w6_U+n^;lOI?Tlg3>F?@7RSA5bf9=_W1(sG;3P4A7wS4%_JE#aD z5c7Qwb#;+17D*-&?BBD8WIX=e7+_MB{J;Q(Qi&<&7!hH(zn?-jODPN)wU$qNdeBUU zC=AIt$GQG~OtDDTIm*h*r7D?}iw6#Tt`$7>loUOWQwI+4VOJNCDnH+{`u+A~5%HY|vv@T!HII!(2M9rN*K?J8tLY0E&adzLn8w#L1 z+uCIC(4p(a%bEAyV?}MPd>4YLyk1|g*(16GA0 z0$AVYx0f%=4K_vk>Q#*!LsNCN%+`OA{bUeG!59@_zUN6ogv%lduqc_7K$Xuj87%>g x6%{fTMNH;$>H!PN%jFhw_qFk%p;@bS{0|Ex;E<+-3Wxvz002ovPDHLkV1f$kD;od+ literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/models/armor/life_imbued_layer_2.png b/src/main/resources/assets/bloodarsenal/models/armor/life_imbued_layer_2.png new file mode 100644 index 0000000000000000000000000000000000000000..c04c784e92bc9bf0cebddfb977df99980915d49d GIT binary patch literal 950 zcmV;n14;aeP)VGd000McNliru-v%5P9WZ+D@R$Gq14Btf zK~!ko?Uy}oR7VtspL1sJu6J!569vhLC^AJNMf3?M4Gmy0SRiD@!asojls0KeVSx~m zF#<$|_!T5L7#n}xy?Z}q=A`f@h0_H&k~jD1<`k!R=e+NnftHq*mX?;5mX?;5mX?;5 z{~L0&@blc9O@@G&5mZ@v`&PzT06kjh#K<>`i};Hd2_j=Z0sj!doAKfOdnUSFFdKUT z{Lw-!!f$WhpebQ7j(-NMo;zo1hNeUWOav!Fl@h(GB6v>^DEy&T1Mlg^NTbSBN-Vs4 zccOiwV#c>CD`Z!$V55;gfA=ok%a?Ik2F`K*-aS5>pT~*d%=qE{eZIVUbv!Ikn^6n~ zm>DWUNQwQAAF-6E%_v34^PIY>U^FGWySs!C#v&xO5TOo%CIm|77&wPaO;HyGQI*n+ z+Bu3mXJ|&LN-$$E95N0Osig=z`}?Gns6+_PQ8f*<2uXw>!eB5!dp&CJ>6md)6oe3H zRL4L7RT?vFZH=TV4Nx}?&ilV^TMiyS1|SD&RoQ;<0D1nL%DEHo0aX#yd$waFj&2;F zn`IQL)FSM}NY{I!2o5MxVvrIkrIR0mUIgzwr=4R{gb<_bK744&j5s|lD#C;+6WuO; zBv4lbM2Io+>+CG%Jqlzgp=KmACQ?E~Fu+C&mNz4ckb93Col6mF=ZLC^8NC?)er5x( zxUq4(d%#a~bJnCp9is@4sdDDvz=kQ2&&-GyK@Nk`x@KhF3xKF{s;clQ@%8Q7Y?mcF zPoA*n9N#T1QO8KCD*niGsu0MWW4OK!B3xKrW@BrM&9yZW@cr^KO^od(uprTly|SbzOFFM!*`U(_5&Bhyim;z$ zm~)&iOQIQH+`1(PMZxgtQ=3#}8(7)gJl34?pW2}5beNf+rwV~)eVs;x>1)^6di2Q5 zjM|KzD*YQb$e%r<5#g(a1qOLe^ZGRg%-*>}86!KZt5%s2E?pw)_o-gK{O|t){~|^) z5!5*v?@WFU8GbZ8()Nlj2>E@cM*00GxYL_t(I%Z-vjZWS>Q zL|=8=o}WkwD3L&7!6|b8D{z7wAVQHKApOkP?q>0w2zJcUnyP-))%y1EkWanycs}#o zJ3WHTWXwr*C(M}pj&BZ=%pSqd-XRk*sX%5DwSq(fErM>wF()s;$Yh(7^4vQ|1QtQf1fWaE>|GoZ zubGrgQsOm&k%`SoIU?`~e4!6B43Il60WdR}z>p{rUAmaqU?7ivp*YsR%ZWFU8GbZ8()Nlj2>E@cM*00M7GL_t(I%SDnsj$CCB zMbE9T-cSEbTO&Y7NS0-Zz=0h(bl}t>DGNYi1?+$o5VHqXK#p^d95}$^2qX^-Jw5OB zd+)0v=r)verJGbq=cx4C%a^$>gVV;Rh<_Kyg2^7H0=-t_M9iMd_-#vZG zpW}$GU%kp7U%%$#II={rWCDgu-E+CS*~ziX{+W~ydNP>cI`JI|MraEVRR;9u`{{4osNuh*7fN9h5;KW3LT z!ZNb}%1lDSS1ZbTO?!LGw(HP`7ccUsw{Q74&m1HEOG*$y0uGc?$V^sdv}SC(j&Gkl z!HyAp^XL(MDfCTqVlzXT|8tsQz{Z`=HyggXxZsE9&-rq-;$P2@UQnz@#>xNy002ov JPDHLkV1gPIPbB~V literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/blocks/lp_materializer_side.png b/src/main/resources/assets/bloodarsenal/textures/blocks/lp_materializer_side.png new file mode 100644 index 0000000000000000000000000000000000000000..d91dbcd5c107c34fe593324f2b1ed43fbfb28cde GIT binary patch literal 689 zcmV;i0#5yjP)45+M03B&m zSad^gZEa<4bN~PV002XBWnpw>WFU8GbZ8()Nlj2>E@cM*00I?BL_t(I%Z-vft`$cR zg}+nX(=+egAB2pA{T<*+t zca;O~lOz0mq)JLvM^#^yetq&JE>q&oyLbF?IB={LkD$8KBM2Y?X2z5=`*Gx}ape1l z5BY1J(eF>6#>=;F`Foye?z9L1A_51J8KXopLx6xJVL9`|qerCuviy8iE5}+1>2tG0 z2awP?hXfKH!H^Pjt(;mT|8_WlJ4uQxt)-M>ch84q*-xdM1~X4m&t|mV(_HK2u{9a+ zexAt&oFYh)Zg02me|hoZHBk71p1*qa6TK%%9M=`A?sWI-@r)aES<11PQOua#$^8t@ z-TAn#o0|->SrcGq*x3P(phtkzZ!%bx<)XSHpqOC*S>iJ1IbRe14^88En9ox;z=$AA zL`1Rw!JtX8_RbnXb0@cd_c3?RHyNz06*I#mOd@Ym;@BD~rJ8a+UDtidz}*=ohI8oo zZWk``q1I+*F_rSE_dea4rmNn2i3s%w33|$T{%|_o4)=@6j9n?@Z}xlsJe{~&*BtJA zT9#V@*gS7)?}NLSh>%CnC8m@ZB}z(c#}WJP{(UBiJEgEmi2(?AKGwQjS{qk)MFcq| zio^(vW^9LnXAd4=i#y-myT_Cg(=d=E1~c^ey%{9(`QDqHxwF~u^=`+Hj~{dQ;(~tw XT!IkQpYrzN00000NkvXXu0mjfW?(RL literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/life_imbued_boots.png b/src/main/resources/assets/bloodarsenal/textures/items/life_imbued_boots.png new file mode 100644 index 0000000000000000000000000000000000000000..a673170a43be1c499c4b4457f1f6439c3d36cd2d GIT binary patch literal 465 zcmV;?0WSWDP)H(5O-L^c1z*9=U zAK}V-O=dGBal6^DkFk5|YhByzW`iUqvl&<3>i}?B6gpch2vtQf9(OotRvI_S%yc&}C>N`^${9NW6q z#}EwQVlPH(JJX~AjuvF@Se9Yzav*l&x78iMY3u1HvD~?H8775d2Vqt;L zySut2f{36+c(SsBCqgKKwA*w6=I7@LE-vsK2P2cg7#!s3>MDWfp$vl?&%+M_>a7;} z;bB6pDHICWw*Ak+MHuoR2#7>z_&zEKXp0av8km+vEeuHj4cEojy7vuad|VxEZE<~d zMLwN|IM(%gT@U5+c);b&jm{*K9PjP%yi`(MfNHhMW-3J}f{J4d!1aAKkj<*!wHmeS zYqF-PA|L|ZxGuJBcRO$#hlx^2ecRrqdVbCy*Trcz@q&O{HcQg7IIdKfE01p+&Qen_EY5G2BO%TWY+TZ7KxvXw??*epO%;3{< W&iAyMGZtF_0000B;cZciQfl=~mvhfK9Jm*j9x{(~U3adyUa$Wh;JPmPeEyfPTCI}H z*9CkW0UlibOYfF#XZ2=fr7SCZw zIh|Ik*@Pfqlu9vHW#6)9fm4qGc#lLVd7k#-ab8Cwob`3N>Gfn7i_u9WxNI~;G8w53 z2K3@_N}i|hkq7_=U?9Rlp&$U;7Z>s}9O`j0sev(sBII^=b+uSjlgS9cL7^Z6k*|Qj z7y#ZTX9@fKY^K)qmsGan!bL0L~moPaH=9 zY}@8`GJi+(Cy{NnW+&3|7&EEt`##wPkGJIb1PZx;*?^P+R{#J207*qoM6N<$f+a1# A@c;k- literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/bloodarsenal/textures/items/life_imbued_leggings.png b/src/main/resources/assets/bloodarsenal/textures/items/life_imbued_leggings.png new file mode 100644 index 0000000000000000000000000000000000000000..1d020695670e86aaf6fe59f669e02fb3443f90a3 GIT binary patch literal 464 zcmV;>0WbcEP)Mi-MA39f)FRE z*UsGYrwgy?ZR*XY3lGd2Y3Pwm&?!#_zG0ej2{7(Ks2L> zAZB>0iz*%hO)2DUfZsq-Mcr|rTwZc(#;fs|x@pi3^l$8RH{PaiB7B?8c(Yi9w<(3s z*VhzPipY~!cm$|{BEl~b8h`Mr+%Z+$eLLWNN_;#!W0f;2)wN#QlD^O9d`hVwV8Blx zi%^@b_3Td50rmnE$Zap~IsgUSok45T3s?a|cZvvIzYJ8nyMM~r1~`c^#1K$32H{~y z&7GH{5fTFLVhp`=05Bg8!~V^USKZRw`8u2N`X7Ji*>Ml*_rEFIeba{k0000